Mesa (master): broadcom/vc5: Fix build failure frm nir_shader:: stage removal.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Oct 20 23:01:05 UTC 2017
Module: Mesa
Branch: master
Commit: f4ff8f74ee74b97b9b058f41e404eb41aa5e6359
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f4ff8f74ee74b97b9b058f41e404eb41aa5e6359
Author: Eric Anholt <eric at anholt.net>
Date: Fri Oct 20 15:53:18 2017 -0700
broadcom/vc5: Fix build failure frm nir_shader::stage removal.
Fixes: 59fb59ad54d3 ("nir: Get rid of nir_shader::stage")
---
src/gallium/drivers/vc5/vc5_program.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/vc5/vc5_program.c
index 80865a25a4..8e9af1ad8a 100644
--- a/src/gallium/drivers/vc5/vc5_program.c
+++ b/src/gallium/drivers/vc5/vc5_program.c
@@ -178,9 +178,9 @@ vc5_shader_state_create(struct pipe_context *pctx,
vc5_set_transform_feedback_outputs(so, &cso->stream_output);
if (V3D_DEBUG & (V3D_DEBUG_NIR |
- v3d_debug_flag_for_shader_stage(s->stage))) {
+ v3d_debug_flag_for_shader_stage(s->info.stage))) {
fprintf(stderr, "%s prog %d NIR:\n",
- gl_shader_stage_name(s->stage),
+ gl_shader_stage_name(s->info.stage),
so->program_id);
nir_print_shader(s, stderr);
fprintf(stderr, "\n");
@@ -197,7 +197,7 @@ vc5_get_compiled_shader(struct vc5_context *vc5, struct v3d_key *key)
struct hash_table *ht;
uint32_t key_size;
- if (s->stage == MESA_SHADER_FRAGMENT) {
+ if (s->info.stage == MESA_SHADER_FRAGMENT) {
ht = vc5->fs_cache;
key_size = sizeof(struct v3d_fs_key);
} else {
@@ -218,7 +218,7 @@ vc5_get_compiled_shader(struct vc5_context *vc5, struct v3d_key *key)
uint64_t *qpu_insts;
uint32_t shader_size;
- switch (s->stage) {
+ switch (s->info.stage) {
case MESA_SHADER_VERTEX:
shader->prog_data.vs = rzalloc(shader, struct v3d_vs_prog_data);
More information about the mesa-commit
mailing list