fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 00:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl/nir: Set sample_shading if a FS output ever shows up as an rvalue

Browse source 
If framebuffer fetch is used, we have to enable sample shading because
the fetched framebuffer value is per-sample.

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14020>
This commit is contained in:
Jason Ekstrand 2022-05-02 18:19:30 -05:00 • committed by Marge Bot
parent 3cf103f23d
commit 1124bee4ba
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/glsl/glsl_to_nir.cpp
View file

@ -81,6 +81,9 @@ public:
void create_function(ir_function_signature *ir); void create_function(ir_function_signature *ir);
/* True if we have any output rvalues */
bool has_output_rvalue;
private: private:
void add_instr(nir_instr *instr, unsigned num_components, unsigned bit_size); void add_instr(nir_instr *instr, unsigned num_components, unsigned bit_size);
nir_ssa_def *evaluate_rvalue(ir_rvalue *ir); nir_ssa_def *evaluate_rvalue(ir_rvalue *ir);
@ -271,6 +274,9 @@ glsl_to_nir(const struct gl_constants *consts,
if (var->data.mode == nir_var_shader_in && var->data.sample) if (var->data.mode == nir_var_shader_in && var->data.sample)
shader->info.fs.uses_sample_shading = true; shader->info.fs.uses_sample_shading = true;
} }
if (v1.has_output_rvalue)
shader->info.fs.uses_sample_shading = true;
} }
return shader; return shader;
@ -281,6 +287,7 @@ nir_visitor::nir_visitor(const struct gl_constants *consts, nir_shader *shader)
this->supports_std430 = consts->UseSTD430AsDefaultPacking; this->supports_std430 = consts->UseSTD430AsDefaultPacking;
this->shader = shader; this->shader = shader;
this->is_global = true; this->is_global = true;
this->has_output_rvalue = false;
this->var_table = _mesa_pointer_hash_table_create(NULL); this->var_table = _mesa_pointer_hash_table_create(NULL);
this->overload_table = _mesa_pointer_hash_table_create(NULL); this->overload_table = _mesa_pointer_hash_table_create(NULL);
this->sparse_variable_set = _mesa_pointer_set_create(NULL); this->sparse_variable_set = _mesa_pointer_set_create(NULL);
@ -1838,6 +1845,9 @@ nir_visitor::evaluate_rvalue(ir_rvalue* ir)
enum gl_access_qualifier access = deref_get_qualifier(this->deref); enum gl_access_qualifier access = deref_get_qualifier(this->deref);
this->result = nir_load_deref_with_access(&b, this->deref, access); this->result = nir_load_deref_with_access(&b, this->deref, access);
if (nir_deref_mode_is(this->deref, nir_var_shader_out))
this->has_output_rvalue = true;
} }
return this->result; return this->result;