diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2023-04-25 19:44:38 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-26 05:51:39 +0000 |
| commit | b9ba2c272ac90544e182ff6fefd6837134d168c9 (patch) | |
| tree | 7755fdfbf69ee1ad50dacd1b33c5e9c957e33f09 | |
| parent | 4e8b532db31425f469c76f7de2aa4b6d6151b03b (diff) | |
| download | mesa-b9ba2c272ac90544e182ff6fefd6837134d168c9.tar.gz | |
glsl: remove ir_state_slot::swizzle
Same story as with the NIR counterpart in the previous commit.
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22620>
| -rw-r--r-- | src/compiler/glsl/builtin_variables.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/ir.h | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/lower_blend_equation_advanced.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 4aed31d8057..7af97dc2fc6 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -683,7 +683,6 @@ builtin_variable_generator::add_uniform(const glsl_type *type, if (type->is_array()) slots->tokens[1] = a; - slots->swizzle = element->swizzle; slots++; } } diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h index c1c5f36d86b..38ede7e4452 100644 --- a/src/compiler/glsl/ir.h +++ b/src/compiler/glsl/ir.h @@ -394,7 +394,6 @@ depth_layout_string(ir_depth_layout layout); */ struct ir_state_slot { gl_state_index16 tokens[STATE_LENGTH]; - int swizzle; }; diff --git a/src/compiler/glsl/lower_blend_equation_advanced.cpp b/src/compiler/glsl/lower_blend_equation_advanced.cpp index 7eebffdea7e..86ad6e296ca 100644 --- a/src/compiler/glsl/lower_blend_equation_advanced.cpp +++ b/src/compiler/glsl/lower_blend_equation_advanced.cpp @@ -490,7 +490,6 @@ lower_blend_equation_advanced(struct gl_linked_shader *sh, bool coherent) mode->data.how_declared = ir_var_hidden; mode->allocate_state_slots(1); ir_state_slot *slot0 = &mode->get_state_slots()[0]; - slot0->swizzle = SWIZZLE_XXXX; slot0->tokens[0] = STATE_ADVANCED_BLENDING_MODE; for (int i = 1; i < STATE_LENGTH; i++) slot0->tokens[i] = 0; |