OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: fix using FS sample shading if the linker optimized inputs away

Browse Source 
During NIR linking, constant varyings might be moved to the next
stage and the sample qualifier removed.

shader_info::uses_sample_shading remembers if the sample qualifier
was used before optimizations.

No fossils-db changes on Sienna Cichlid.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7892>
This commit is contained in:
Samuel Pitoiset
2020-12-03 10:10:22 +01:00
committed by Marge Bot
parent 9a993da0ff
commit 562dd79bfa
5 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/compiler/aco_instruction_selection.cpp
View File

@@ -6907,7 +6907,7 @@ void visit_store_scratch(isel_context *ctx, nir_intrinsic_instr *instr) {
void visit_load_sample_mask_in(isel_context *ctx, nir_intrinsic_instr *instr) {
uint8_t log2_ps_iter_samples;
if (ctx->program->info->ps.force_persample) {
if (ctx->program->info->ps.uses_sample_shading) {
log2_ps_iter_samples =
util_logbase2(ctx->options->key.fs.num_samples);
} else {

2
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -739,7 +739,7 @@ static LLVMValueRef load_sample_mask_in(struct ac_shader_abi *abi)
struct radv_shader_context *ctx = radv_shader_context_from_abi(abi);
uint8_t log2_ps_iter_samples;
if (ctx->args->shader_info->ps.force_persample) {
if (ctx->args->shader_info->ps.uses_sample_shading) {
log2_ps_iter_samples =
util_logbase2(ctx->args->options->key.fs.num_samples);
} else {

2
src/amd/vulkan/radv_pipeline.c
View File

@@ -1127,7 +1127,7 @@ radv_pipeline_init_multisample_state(struct radv_pipeline *pipeline,
*
* Otherwise, sample shading is considered disabled."
*/
if (pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.force_persample) {
if (pipeline->shaders[MESA_SHADER_FRAGMENT]->info.ps.uses_sample_shading) {
ps_iter_samples = ms->num_samples;
} else {
ps_iter_samples = radv_pipeline_get_ps_iter_samples(pCreateInfo);

2
src/amd/vulkan/radv_shader.h
View File

@@ -303,7 +303,7 @@ struct radv_shader_info {
uint8_t num_linked_outputs;
} tes;
struct {
bool force_persample;
bool uses_sample_shading;
bool needs_sample_positions;
bool writes_memory;
bool writes_z;

13
src/amd/vulkan/radv_shader_info.c
View File

@@ -162,12 +162,6 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
case nir_intrinsic_load_num_subgroups:
info->cs.uses_local_invocation_idx = true;
break;
case nir_intrinsic_load_sample_id:
info->ps.force_persample = true;
break;
case nir_intrinsic_load_sample_pos:
info->ps.force_persample = true;
break;
case nir_intrinsic_load_view_index:
info->needs_multiview_view_index = true;
if (nir->info.stage == MESA_SHADER_FRAGMENT)
@@ -337,7 +331,6 @@ gather_info_input_decl_ps(const nir_shader *nir, const nir_variable *var,
struct radv_shader_info *info)
{
unsigned attrib_count = glsl_count_attribute_slots(var->type, false);
const struct glsl_type *type = glsl_without_array(var->type);
int idx = var->data.location;
switch (idx) {
@@ -361,11 +354,6 @@ gather_info_input_decl_ps(const nir_shader *nir, const nir_variable *var,
break;
}
if (glsl_get_base_type(type) == GLSL_TYPE_FLOAT) {
if (var->data.sample)
info->ps.force_persample = true;
}
if (var->data.compact) {
unsigned component_count = var->data.location_frac +
glsl_get_length(var->type);
@@ -657,6 +645,7 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
info->ps.early_fragment_test = nir->info.fs.early_fragment_tests;
info->ps.post_depth_coverage = nir->info.fs.post_depth_coverage;
info->ps.depth_layout = nir->info.fs.depth_layout;
info->ps.uses_sample_shading = nir->info.fs.uses_sample_shading;
break;
case MESA_SHADER_GEOMETRY:
info->gs.vertices_in = nir->info.gs.vertices_in;