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.

2 files changed, 6 insertions, 6 deletions

diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index 94a23d2d759..09fa23737f9 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.30 2002/06/15 02:38:17 brianp Exp $ */
+/* $Id: wmesa.c,v 1.31 2002/06/15 03:03:10 brianp Exp $ */
 
 /*
  * Windows (Win32) device driver for Mesa 3.4
@@ -3201,7 +3201,7 @@ static triangle_func choose_triangle_function( GLcontext *ctx )
     int depth = wmesa->cColorBits;
 
     if (ctx->Polygon.SmoothFlag)     return NULL;
-    if (ctx->Texture._ReallyEnabled)  return NULL;
+    if (ctx->Texture._EnabledUnits)  return NULL;
     if (!wmesa->db_flag) return NULL;
     if (ctx->swrast->_RasterMask & MULTI_DRAW_BIT) return NULL;
 
diff --git a/src/mesa/drivers/windows/wmesa_stereo.c b/src/mesa/drivers/windows/wmesa_stereo.c
index a4397c41bf1..fea0dc42292 100644
--- a/src/mesa/drivers/windows/wmesa_stereo.c
+++ b/src/mesa/drivers/windows/wmesa_stereo.c
@@ -421,7 +421,7 @@ extern points_func choose_points_function( GLcontext* ctx )
 {

    STARTPROFILE

    if (ctx->Point.Size==1.0 && !ctx->Point.SmoothFlag && ctx->_RasterMask==0

-       && !ctx->Texture._ReallyEnabled  && ctx->Visual->RGBAflag) {

+       && ctx->Texture._EnabledUnits == 0 && ctx->Visual->RGBAflag) {

    ENDPROFILE(choose_points_function)

       return fast_rgb_points;

    }

@@ -479,7 +479,7 @@ static line_func choose_line_function( GLcontext* ctx )
 	STARTPROFILE

    if (ctx->Line.Width==1.0 && !ctx->Line.SmoothFlag && !ctx->Line.StippleFlag

        && ctx->Light.ShadeModel==GL_FLAT && ctx->_RasterMask==0

-       && !ctx->Texture._ReallyEnabled && Current->rgb_flag) {

+       && ctx->Texture._EnabledUnits == 0 && Current->rgb_flag) {

    ENDPROFILE(choose_line_function)

       return fast_flat_rgb_line;

    }

@@ -590,7 +590,7 @@ static triangle_func choose_triangle_function( GLcontext *ctx )
 {

    if (ctx->Polygon.SmoothFlag)     return NULL;

    if (ctx->Polygon.StippleFlag)    return NULL;

-   if (ctx->Texture._ReallyEnabled)  return NULL;

+   if (ctx->Texture._EnabledUnits)  return NULL;

 

    if (ctx->_RasterMask==DEPTH_BIT

        && ctx->Depth.Func==GL_LESS

@@ -661,7 +661,7 @@ static polygon_func choose_polygon_function( GLcontext* ctx )
    STARTPROFILE

    if (!ctx->Polygon.SmoothFlag && !ctx->Polygon.StippleFlag

        && ctx->Light.ShadeModel==GL_FLAT && ctx->_RasterMask==0

-       && !ctx->Texture._ReallyEnabled && Current->rgb_flag==GL_TRUE) {

+       && ctx->Texture._EnabledUnits == 0 && Current->rgb_flag==GL_TRUE) {

       ENDPROFILE(choose_polygon_function)

       return fast_flat_rgb_polygon;

    }