diff options
| author | Eric Anholt <[email protected]> | 2014-04-23 15:30:27 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-04-30 14:33:17 -0700 |
| commit | c703658b3965bf2e4f3593a0d54be03e8e8b1436 (patch) | |
| tree | b5b6b201cbc4816dec9b6f51c0da3570b50585a3 /src/mesa/drivers/x11 | |
| parent | 3dfe56c53bc7f37b65b72408fe3470ecfd218595 (diff) | |
mesa: Drop _EnabledUnits.
The field wasn't really valid, since we've got more than 32 units now. It
turns out it was mostly just used for checking != 0, or checking for fixed
function coordinates, though.
v2: Fix mis-conversion in xm_line.c (caught by Ken).
Reviewed-by: Matt Turner <[email protected]> (v1)
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/xm_line.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xm_tri.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c index 00307c71f72..056ebf1edb0 100644 --- a/src/mesa/drivers/x11/xm_line.c +++ b/src/mesa/drivers/x11/xm_line.c @@ -97,7 +97,7 @@ void xmesa_choose_point( struct gl_context *ctx ) if (ctx->RenderMode == GL_RENDER && ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag && swrast->_RasterMask == 0 - && !ctx->Texture._EnabledUnits + && ctx->Texture._MaxEnabledTexImageUnit == -1 && xmesa->xm_buffer->buffer != XIMAGE) { swrast->Point = draw_points_ANY_pixmap; } @@ -456,7 +456,7 @@ get_line_func(struct gl_context *ctx) return (swrast_line_func) NULL; if (ctx->RenderMode != GL_RENDER) return (swrast_line_func) NULL; if (ctx->Line.SmoothFlag) return (swrast_line_func) NULL; - if (ctx->Texture._EnabledUnits) return (swrast_line_func) NULL; + if (ctx->Texture._MaxEnabledTexImageUnit != -1) return (swrast_line_func) NULL; if (ctx->Light.ShadeModel != GL_FLAT) return (swrast_line_func) NULL; if (ctx->Line.StippleFlag) return (swrast_line_func) NULL; if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_line_func) NULL; diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c index aa9ffe5030c..e9ec67640dc 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -1015,7 +1015,7 @@ get_triangle_func(struct gl_context *ctx) return (swrast_tri_func) NULL; if (ctx->Polygon.SmoothFlag) return (swrast_tri_func) NULL; - if (ctx->Texture._EnabledUnits) + if (ctx->Texture._MaxEnabledTexImageUnit != -1) return (swrast_tri_func) NULL; if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL; |