set MaxTextureImageUnits, MaxTextureCoordUnits

diff --git a/src/mesa/drivers/dri/gamma/gamma_context.c b/src/mesa/drivers/dri/gamma/gamma_context.c
index c617f69d0a3d0f5f8888bdf651d9f689ee1ac545..df9bc5b54fc12de64290f3ae2c34ea11ab9f6a2c 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_context.c
+++ b/src/mesa/drivers/dri/gamma/gamma_context.c
@@ -106,6 +106,8 @@ GLboolean gammaCreateContext( const __GLcontextModes *glVisual,
 
    ctx->Const.MaxTextureLevels = 13;  /* 4K by 4K?  Is that right? */
    ctx->Const.MaxTextureUnits = 1; /* Permedia 3 */
+   ctx->Const.MaxTextureImageUnits = 1;
+   ctx->Const.MaxTextureCoordUnits = 1;
 
    ctx->Const.MinLineWidth = 0.0;
    ctx->Const.MaxLineWidth = 255.0;

diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c
index 868ae028ef37839fd6b623ccde5e5828026a0ac5..f8fcc1f1f38af093f25cbd30950826e68fc160fa 100644 (file)
--- a/src/mesa/drivers/dri/i810/i810context.c
+++ b/src/mesa/drivers/dri/i810/i810context.c
@@ -204,6 +204,8 @@ i810CreateContext( const __GLcontextModes *mesaVis,
 
    ctx = imesa->glCtx;
    ctx->Const.MaxTextureUnits = 2;
+   ctx->Const.MaxTextureImageUnits = 2;
+   ctx->Const.MaxTextureCoordUnits = 2;
 
 
    /* FIXME: driCalcualteMaxTextureLevels assumes that mipmaps are tightly

diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c
index 1d1890976f065d62b5c276273be452b32da8da55..376a260c0ff58047a4c00d0a26113b2930d3be73 100644 (file)
--- a/src/mesa/drivers/dri/i830/i830_context.c
+++ b/src/mesa/drivers/dri/i830/i830_context.c
@@ -263,6 +263,8 @@ GLboolean i830CreateContext( const __GLcontextModes *mesaVis,
 
    ctx = imesa->glCtx;
    ctx->Const.MaxTextureUnits = 2;
+   ctx->Const.MaxTextureImageUnits = 2;
+   ctx->Const.MaxTextureCoordUnits = 2;
 
    /* FIXME: driCalcualteMaxTextureLevels assumes that mipmaps are tightly
     * FIXME: packed, but they're not in Intel graphics hardware.

diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c
index 3888d12cb91a6a089dd6d2afaa4878db123d56c4..75a6c32b5749055e68ca22ccec5265a753ea8281 100644 (file)
--- a/src/mesa/drivers/dri/mga/mga_xmesa.c
+++ b/src/mesa/drivers/dri/mga/mga_xmesa.c
@@ -411,11 +411,15 @@ mgaCreateContext( const __GLcontextModes *mesaVis,
    ctx = mmesa->glCtx;
    if ( mgaScreen->chipset == MGA_CARD_TYPE_G200 ) {
       ctx->Const.MaxTextureUnits = 1;
+      ctx->Const.MaxTextureImageUnits = 1;
+      ctx->Const.MaxTextureCoordUnits = 1;
       maxlevels = G200_TEX_MAXLEVELS;
 
    }
    else {
       ctx->Const.MaxTextureUnits = 2;
+      ctx->Const.MaxTextureImageUnits = 2;
+      ctx->Const.MaxTextureCoordUnits = 2;
       maxlevels = G400_TEX_MAXLEVELS;
    }
 

diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c
index 72906155072e3b2bf11518714e0aad001ac54297..a26c9dd340170e8a6ebc2a02f69cbadcb716d544 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_context.c
+++ b/src/mesa/drivers/dri/r128/r128_context.c
@@ -196,6 +196,8 @@ GLboolean r128CreateContext( const __GLcontextModes *glVisual,
     */
 
    ctx->Const.MaxTextureUnits = 2;
+   ctx->Const.MaxTextureImageUnits = 2;
+   ctx->Const.MaxTextureCoordUnits = 2;
 
    driCalculateMaxTextureLevels( rmesa->texture_heaps,
                                 rmesa->nr_heaps,

diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index 109e3d7d41aae49ad66151034f674a5c6588f6a2..5ab6b781cb00c200b4bb3cd3eb924addb6922537 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -338,6 +338,8 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
 
    ctx = rmesa->glCtx;
    ctx->Const.MaxTextureUnits = 2;
+   ctx->Const.MaxTextureImageUnits = 2;
+   ctx->Const.MaxTextureCoordUnits = 2;
 
    driCalculateMaxTextureLevels( rmesa->texture_heaps,
                                 rmesa->nr_heaps,

diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 0abf5b2e3e718dee6904f06e70e9887d38f7c25a..f2af26c6b6ef8e6efa1d7a3bc6bb43010a66133c 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -327,6 +327,8 @@ radeonCreateContext( const __GLcontextModes *glVisual,
 
    ctx = rmesa->glCtx;
    ctx->Const.MaxTextureUnits = 2;
+   ctx->Const.MaxTextureImageUnits = 2;
+   ctx->Const.MaxTextureCoordUnits = 2;
 
    driCalculateMaxTextureLevels( rmesa->texture_heaps,
                                 rmesa->nr_heaps,

diff --git a/src/mesa/drivers/dri/tdfx/tdfx_context.c b/src/mesa/drivers/dri/tdfx/tdfx_context.c
index 57ff4803a6d8394da02b79b6e6af458205b17ebb..8dba39b87073e84e975806871ce4451ffb212a1d 100644 (file)
--- a/src/mesa/drivers/dri/tdfx/tdfx_context.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_context.c
@@ -209,6 +209,8 @@ GLboolean tdfxCreateContext( const __GLcontextModes *mesaVis,
       ctx->Const.MaxTextureLevels = 9;
    }
    ctx->Const.MaxTextureUnits = TDFX_IS_BANSHEE( fxMesa ) ? 1 : 2;
+   ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits;
+   ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits;
 
    /* No wide points.
     */