r600: increase max texture units to 16

diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 68112c49dc362ecd04f2edce72125a228ff61e09..2ac0e7c11c8d2b0f58a220d414de78053227754a 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -248,10 +248,8 @@ static void r600InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
 {
        context_t *r600 = R700_CONTEXT(ctx);
 
-       ctx->Const.MaxTextureImageUnits =
-           driQueryOptioni(&r600->radeon.optionCache, "texture_image_units");
-       ctx->Const.MaxTextureCoordUnits =
-           driQueryOptioni(&r600->radeon.optionCache, "texture_coord_units");
+       ctx->Const.MaxTextureImageUnits = 16;
+       ctx->Const.MaxTextureCoordUnits = 8;
        ctx->Const.MaxTextureUnits =
            MIN2(ctx->Const.MaxTextureImageUnits,
                 ctx->Const.MaxTextureCoordUnits);

diff --git a/src/mesa/drivers/dri/r600/r600_tex.h b/src/mesa/drivers/dri/r600/r600_tex.h
index c2141ef5e5c87e50c64bd5848aa8f6eb7f0e5035..1d75a2ecd69cce309310bc2555785ceb3472565b 100644 (file)
--- a/src/mesa/drivers/dri/r600/r600_tex.h
+++ b/src/mesa/drivers/dri/r600/r600_tex.h
@@ -42,7 +42,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* Texel pitch is 8 alignment. */
 #define R700_TEXEL_PITCH_ALIGNMENT_MASK 0x7
 
-#define R700_MAX_TEXTURE_UNITS 8 /* TODO : should be 16, lets make it work, review later */
+#define R700_MAX_TEXTURE_UNITS 16
 
 extern void r600SetDepthTexMode(struct gl_texture_object *tObj);