r600: increase max texture units to 16

This commit is contained in:
Andre Maasikas 2010-01-27 11:22:56 +02:00 committed by Alex Deucher
parent 0dab80fbfb
commit 77b7b3a1ab
2 changed files with 3 additions and 5 deletions

View file

@ -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);

View file

@ -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);