diff options
| author | Jason Ekstrand <[email protected]> | 2017-09-14 19:52:38 -0700 |
|---|---|---|
| committer | Jordan Justen <[email protected]> | 2017-10-20 12:49:17 -0700 |
| commit | 59fb59ad54d368683d5cc3b149f021452bddc05f (patch) | |
| tree | 734e742be190df8ae7a19a975c59ba7eeeded6eb /src/gallium/drivers/freedreno | |
| parent | 341529dbee5c2b17fdcb7990484a383459bed305 (diff) | |
nir: Get rid of nir_shader::stage
It's redundant with nir_shader::info::stage.
Acked-by: Timothy Arceri <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/gallium/drivers/freedreno')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_cmdline.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_nir.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c index cfcb807de31..b2aa9f063a7 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_cmdline.c @@ -399,7 +399,7 @@ int main(int argc, char **argv) v.key = key; v.shader = &s; - switch (nir->stage) { + switch (nir->info.stage) { case MESA_SHADER_FRAGMENT: s.type = v.type = SHADER_FRAGMENT; break; @@ -410,7 +410,7 @@ int main(int argc, char **argv) s.type = v.type = SHADER_COMPUTE; break; default: - errx(1, "unhandled shader stage: %d", nir->stage); + errx(1, "unhandled shader stage: %d", nir->info.stage); } info = "NIR compiler"; diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_nir.c index d30543d760f..ef7facff332 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c @@ -167,11 +167,11 @@ ir3_optimize_nir(struct ir3_shader *shader, nir_shader *s, OPT_V(s, nir_lower_regs_to_ssa); if (key) { - if (s->stage == MESA_SHADER_VERTEX) { + if (s->info.stage == MESA_SHADER_VERTEX) { OPT_V(s, nir_lower_clip_vs, key->ucp_enables); if (key->vclamp_color) OPT_V(s, nir_lower_clamp_color_outputs); - } else if (s->stage == MESA_SHADER_FRAGMENT) { + } else if (s->info.stage == MESA_SHADER_FRAGMENT) { OPT_V(s, nir_lower_clip_fs, key->ucp_enables); if (key->fclamp_color) OPT_V(s, nir_lower_clamp_color_outputs); |