Module: Mesa Branch: mesa_7_7_branch Commit: 77b7b3a1ab36f1dafa905dbe709d0d72dbc9d54d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=77b7b3a1ab36f1dafa905dbe709d0d72dbc9d54d
Author: Andre Maasikas <amaasi...@gmail.com> Date: Wed Jan 27 11:22:56 2010 +0200 r600: increase max texture units to 16 --- src/mesa/drivers/dri/r600/r600_context.c | 6 ++---- src/mesa/drivers/dri/r600/r600_tex.h | 2 +- 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 dbd2337..126de43 100644 --- a/src/mesa/drivers/dri/r600/r600_context.c +++ b/src/mesa/drivers/dri/r600/r600_context.c @@ -237,10 +237,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 fb0e1a0..0e3d328 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); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit