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/swrast/s_context.c | |
| parent | d27d29f1a67babd93091d34aae4c2784a8d62f31 (diff) | |
| download | external_mesa3d-5e78433eec94fcaa87bdcb2526ec0910a69ed347.zip external_mesa3d-5e78433eec94fcaa87bdcb2526ec0910a69ed347.tar.gz external_mesa3d-5e78433eec94fcaa87bdcb2526ec0910a69ed347.tar.bz2 | |
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/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index cd36a30..591fe57 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -459,7 +459,7 @@ _swrast_invalidate_state( struct gl_context *ctx, GLbitfield new_state ) swrast->BlendFunc = _swrast_validate_blend_func; if (new_state & _SWRAST_NEW_TEXTURE_SAMPLE_FUNC) - for (i = 0 ; i < ctx->Const.MaxTextureImageUnits ; i++) + for (i = 0 ; i < ctx->Const.FragmentProgram.MaxTextureImageUnits ; i++) swrast->TextureSample[i] = NULL; } @@ -473,7 +473,7 @@ _swrast_update_texture_samplers(struct gl_context *ctx) if (!swrast) return; /* pipe hack */ - for (u = 0; u < ctx->Const.MaxTextureImageUnits; u++) { + for (u = 0; u < ctx->Const.FragmentProgram.MaxTextureImageUnits; u++) { struct gl_texture_object *tObj = ctx->Texture.Unit[u]._Current; /* Note: If tObj is NULL, the sample function will be a simple * function that just returns opaque black (0,0,0,1). |