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/ff_fragment_shader.cpp | |
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/ff_fragment_shader.cpp')
-rw-r--r-- | src/mesa/main/ff_fragment_shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index be382fa3ae9..f007ac3b40f 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -338,7 +338,7 @@ static GLbitfield get_fp_input_mask( struct gl_context *ctx ) fp_inputs |= VARYING_BIT_COL1; } - /* _NEW_TEXTURE */ + /* _NEW_TEXTURE_STATE */ fp_inputs |= (ctx->Texture._TexGenEnabled | ctx->Texture._TexMatEnabled) << VARYING_SLOT_TEX0; @@ -404,7 +404,7 @@ static GLuint make_state_key( struct gl_context *ctx, struct state_key *key ) memset(key, 0, sizeof(*key)); - /* _NEW_TEXTURE */ + /* _NEW_TEXTURE_OBJECT */ mask = ctx->Texture._EnabledCoordUnits; while (mask) { const int i = u_bit_scan(&mask); |