summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Maasikas <amaasikas@gmail.com>2010-01-27 11:22:56 +0200
committerAndre Maasikas <amaasikas@gmail.com>2010-01-27 11:22:56 +0200
commit07d47cb92d7401b7a5ed21a8f97949f4bd2f66bc (patch)
tree9b0b3f3d7d071486ca3c7a0cbab88bd22b18e06d
parentfb24c2678a3f5150a2316a08a37bacdb3b9d2687 (diff)
r600: increase max texture units to 16
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.c6
-rw-r--r--src/mesa/drivers/dri/r600/r600_tex.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index 68112c49dc..2ac0e7c11c 100644
--- 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 c2141ef5e5..1d75a2ecd6 100644
--- 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);