diff options
| author | Marek Olšák <[email protected]> | 2017-03-23 22:42:56 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-03-29 15:44:00 +0200 |
| commit | d68150f15d41756fa7153cd6b597ff52ec85a933 (patch) | |
| tree | 39148e97f68982d67585e715aad7cdea438681a3 /src/mesa/main/texenv.c | |
| parent | 226ff6aa30701fb1b4e69e07c5d76c4d9b5e5d77 (diff) | |
mesa: split _NEW_TEXTURE into _NEW_TEXTURE_OBJECT & _NEW_TEXTURE_STATE
No performance testing has been done, because it makes sense to make this
change regardless of that. Also, _NEW_TEXTURE is still used in many places,
but the obvious occurences are replaced here.
It's now possible to split _NEW_TEXTURE_OBJECT further.
Reviewed-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/main/texenv.c')
| -rw-r--r-- | src/mesa/main/texenv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index de49566ec42..ee5171c5c6a 100644 --- a/src/mesa/main/texenv.c +++ b/src/mesa/main/texenv.c @@ -77,7 +77,7 @@ set_env_mode(struct gl_context *ctx, } if (legal) { - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->EnvMode = mode; } else { @@ -93,7 +93,7 @@ set_env_color(struct gl_context *ctx, { if (TEST_EQ_4V(color, texUnit->EnvColorUnclamped)) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); COPY_4FV(texUnit->EnvColorUnclamped, color); texUnit->EnvColor[0] = CLAMP(color[0], 0.0F, 1.0F); texUnit->EnvColor[1] = CLAMP(color[1], 0.0F, 1.0F); @@ -151,14 +151,14 @@ set_combiner_mode(struct gl_context *ctx, case GL_COMBINE_RGB: if (texUnit->Combine.ModeRGB == mode) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->Combine.ModeRGB = mode; break; case GL_COMBINE_ALPHA: if (texUnit->Combine.ModeA == mode) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->Combine.ModeA = mode; break; default: @@ -249,7 +249,7 @@ set_combiner_source(struct gl_context *ctx, return; } - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); if (alpha) texUnit->Combine.SourceA[term] = param; @@ -331,7 +331,7 @@ set_combiner_operand(struct gl_context *ctx, return; } - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); if (alpha) texUnit->Combine.OperandA[term] = param; @@ -366,13 +366,13 @@ set_combiner_scale(struct gl_context *ctx, case GL_RGB_SCALE: if (texUnit->Combine.ScaleShiftRGB == shift) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->Combine.ScaleShiftRGB = shift; break; case GL_ALPHA_SCALE: if (texUnit->Combine.ScaleShiftA == shift) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->Combine.ScaleShiftA = shift; break; default: @@ -444,7 +444,7 @@ _mesa_TexEnvfv( GLenum target, GLenum pname, const GLfloat *param ) if (pname == GL_TEXTURE_LOD_BIAS_EXT) { if (texUnit->LodBias == param[0]) return; - FLUSH_VERTICES(ctx, _NEW_TEXTURE); + FLUSH_VERTICES(ctx, _NEW_TEXTURE_STATE); texUnit->LodBias = param[0]; } else { |