diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 03:03:06 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-06-15 03:03:06 +0000 |
| commit | 8afe7de8deaf3c9613fd68b344de8c52b02b1879 (patch) | |
| tree | f600a192c9d0136faea8864a53eabc819eeb791f /src/mesa/drivers/x11 | |
| parent | 8bdd0dc8d0e9c9cb2c71fbdd4c77e982cfc0b350 (diff) | |
Implemented GL_NV_texture_rectangle extension.
Replace struct gl_texure_object's Dimension w/ Target field.
Added _EnabledUnits to struct gl_texture_attrib - the _ReallyEnabled
field is obsolete, but still present for now. This effectively
removes the 8-texture units limit, 32 units now possible, but unlikely!
New TEXTURE_1D/2D/3D/CUBE/RECT_BIT tokens for unit->_ReallyEnabled field.
Updated device drivers to use ctx->Texture._EnabledUnits.
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/xm_line.c | 6 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xm_tri.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_line.c b/src/mesa/drivers/x11/xm_line.c index ce70680901..989969d024 100644 --- a/src/mesa/drivers/x11/xm_line.c +++ b/src/mesa/drivers/x11/xm_line.c @@ -1,4 +1,4 @@ -/* $Id: xm_line.c,v 1.19 2002/06/15 02:38:17 brianp Exp $ */ +/* $Id: xm_line.c,v 1.20 2002/06/15 03:03:10 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -101,7 +101,7 @@ void xmesa_choose_point( GLcontext *ctx ) if (ctx->RenderMode == GL_RENDER && ctx->Point.Size == 1.0F && !ctx->Point.SmoothFlag && swrast->_RasterMask == 0 - && !ctx->Texture._ReallyEnabled + && !ctx->Texture._EnabledUnits && xmesa->xm_buffer->buffer != XIMAGE) { swrast->Point = draw_points_ANY_pixmap; } @@ -557,7 +557,7 @@ static swrast_line_func get_line_func( GLcontext *ctx ) if (ctx->RenderMode != GL_RENDER) return (swrast_line_func) NULL; if (ctx->Line.SmoothFlag) return (swrast_line_func) NULL; - if (ctx->Texture._ReallyEnabled) return (swrast_line_func) NULL; + if (ctx->Texture._EnabledUnits) 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 f0aef4c0ec..4b3f02677e 100644 --- a/src/mesa/drivers/x11/xm_tri.c +++ b/src/mesa/drivers/x11/xm_tri.c @@ -1,4 +1,4 @@ -/* $Id: xm_tri.c,v 1.23 2002/06/15 02:38:17 brianp Exp $ */ +/* $Id: xm_tri.c,v 1.24 2002/06/15 03:03:10 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1529,7 +1529,7 @@ static swrast_tri_func get_triangle_func( GLcontext *ctx ) if (ctx->RenderMode != GL_RENDER) return (swrast_tri_func) NULL; if (ctx->Polygon.SmoothFlag) return (swrast_tri_func) NULL; - if (ctx->Texture._ReallyEnabled) return (swrast_tri_func) NULL; + if (ctx->Texture._EnabledUnits) return (swrast_tri_func) NULL; if (swrast->_RasterMask & MULTI_DRAW_BIT) return (swrast_tri_func) NULL; if (xmesa->xm_buffer->buffer==XIMAGE) { |