diff options
| author | Marek Olšák <maraeo@gmail.com> | 2013-05-02 02:30:44 +0200 |
|---|---|---|
| committer | Marek Olšák <maraeo@gmail.com> | 2013-05-11 23:45:01 +0200 |
| commit | 5e78433eec94fcaa87bdcb2526ec0910a69ed347 (patch) | |
| tree | ebc6225aacfd5303bcab3422c2b57c8de53fe975 /src/mesa/drivers/dri/r200 | |
| parent | d27d29f1a67babd93091d34aae4c2784a8d62f31 (diff) | |
mesa: move max texture image unit constants to gl_program_constants
Const.MaxTextureImageUnits -> Const.FragmentProgram.MaxTextureImageUnits
Const.MaxVertexTextureImageUnits -> Const.VertexProgram.MaxTextureImageUnits
etc.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 4d62bc4af7e..036ff7560ad 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -306,7 +306,7 @@ GLboolean r200CreateContext( gl_api api, */ ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, "texture_units"); - ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; + ctx->Const.FragmentProgram.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxTextureUnits; diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 6f79610f85b..f812a15c62a 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -2237,7 +2237,7 @@ static GLboolean r200ValidateBuffers(struct gl_context *ctx) 0, RADEON_GEM_DOMAIN_VRAM); } - for (i = 0; i < ctx->Const.MaxTextureImageUnits; ++i) { + for (i = 0; i < ctx->Const.FragmentProgram.MaxTextureImageUnits; ++i) { radeonTexObj *t; if (!ctx->Texture.Unit[i]._ReallyEnabled) |