Commit 23b70948 authored by Jason Ekstrand's avatar Jason Ekstrand Committed by Marge Bot

v3d: Only call nir_lower_io on shader_in/out

Gallium drivers should never see nir_var_uniform because gallium lowers
regular uniforms to a UBO.  No GL driver should ever see either
nir_var_mem_shared because that's lowered in GLSL IR.
Reviewed-by: Eric Anholt's avatarEric Anholt <>
Reviewed-by: Connor Abbott's avatarConnor Abbott <>
Part-of: <!5418>
parent 96d99f2e
......@@ -306,14 +306,12 @@ v3d_uncompiled_shader_create(struct pipe_context *pctx,
s = tgsi_to_nir(ir, pctx->screen, false);
nir_variable_mode lower_mode = nir_var_all & ~nir_var_uniform;
if (s->info.stage == MESA_SHADER_VERTEX ||
s->info.stage == MESA_SHADER_GEOMETRY) {
lower_mode &= ~(nir_var_shader_in | nir_var_shader_out);
NIR_PASS_V(s, nir_lower_io, lower_mode,
if (s->info.stage != MESA_SHADER_VERTEX &&
s->info.stage != MESA_SHADER_GEOMETRY) {
NIR_PASS_V(s, nir_lower_io,
nir_var_shader_in | nir_var_shader_out,
type_size, (nir_lower_io_options)0);
NIR_PASS_V(s, nir_lower_regs_to_ssa);
NIR_PASS_V(s, nir_normalize_cubemap_coords);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment