fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

anv: fix 3DSTATE_MULTISAMPLE emission on gen8+

Browse source 
When pipeline->dynamic_state.sample_locations.samples is not set
because the state is dynamic, we're currently calling
genX(emit_multisample) with a 0 samples value which is incorrect.

Found when using renderdoc with the drawing overlay.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 4ad4cd8906 ("anv: Enabled the VK_EXT_sample_locations extension")
Cc: <mesa-stable>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10282>
(cherry picked from commit 30bc562bda)
This commit is contained in:
Lionel Landwerlin 2021-04-16 11:08:46 +03:00 • committed by Eric Engestrom
parent 61660ee4e0
commit efcedfc99e
3 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -382,7 +382,7 @@
"description": "anv: fix 3DSTATE_MULTISAMPLE emission on gen8+", "description": "anv: fix 3DSTATE_MULTISAMPLE emission on gen8+",
"nominated": true, "nominated": true,
"nomination_type": 1, "nomination_type": 1,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": "4ad4cd89069bfc98533182d2ae9151fa74fb5414" "because_sha": "4ad4cd89069bfc98533182d2ae9151fa74fb5414"
}, },

26
src/intel/vulkan/anv_pipeline.c
View file

@ -2049,9 +2049,9 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
} }
} }
const VkPipelineMultisampleStateCreateInfo *ms_info =
pCreateInfo->pMultisampleState;
if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) { if (states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS) {
const VkPipelineMultisampleStateCreateInfo *ms_info =
pCreateInfo->pMultisampleState;
const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ? const VkPipelineSampleLocationsStateCreateInfoEXT *sl_info = ms_info ?
vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL; vk_find_struct_const(ms_info, PIPELINE_SAMPLE_LOCATIONS_STATE_CREATE_INFO_EXT) : NULL;
@ -2064,16 +2064,18 @@ copy_non_dynamic_state(struct anv_graphics_pipeline *pipeline,
dynamic->sample_locations.locations[i].x = positions[i].x; dynamic->sample_locations.locations[i].x = positions[i].x;
dynamic->sample_locations.locations[i].y = positions[i].y; dynamic->sample_locations.locations[i].y = positions[i].y;
} }
}
} else { }
dynamic->sample_locations.samples = /* Ensure we always have valid values for sample_locations. */
ms_info ? ms_info->rasterizationSamples : 1; if (pipeline->base.device->vk.enabled_extensions.EXT_sample_locations &&
const struct intel_sample_position *positions = dynamic->sample_locations.samples == 0) {
intel_get_sample_positions(dynamic->sample_locations.samples); dynamic->sample_locations.samples =
for (uint32_t i = 0; i < dynamic->sample_locations.samples; i++) { ms_info ? ms_info->rasterizationSamples : 1;
dynamic->sample_locations.locations[i].x = positions[i].x; const struct intel_sample_position *positions =
dynamic->sample_locations.locations[i].y = positions[i].y; intel_get_sample_positions(dynamic->sample_locations.samples);
} for (uint32_t i = 0; i < dynamic->sample_locations.samples; i++) {
dynamic->sample_locations.locations[i].x = positions[i].x;
dynamic->sample_locations.locations[i].y = positions[i].y;
} }
} }

16
src/intel/vulkan/genX_pipeline.c
View file

@ -755,16 +755,16 @@ emit_ms_state(struct anv_graphics_pipeline *pipeline,
const VkPipelineMultisampleStateCreateInfo *info, const VkPipelineMultisampleStateCreateInfo *info,
uint32_t dynamic_states) uint32_t dynamic_states)
{ {
/* If the sample locations are dynamic, 3DSTATE_MULTISAMPLE on Gfx7/7.5 /* Only lookup locations if the extensions is active, otherwise the default
* will be emitted dynamically, so skip it here. On Gfx8+ * ones will be used either at device initialization time or through
* 3DSTATE_SAMPLE_PATTERN will be emitted dynamically, so skip it here. * 3DSTATE_MULTISAMPLE on Gfx7/7.5 by passing NULL locations.
*/ */
if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS)) { if (pipeline->base.device->vk.enabled_extensions.EXT_sample_locations) {
/* Only lookup locations if the extensions is active, otherwise the /* If the sample locations are dynamic, 3DSTATE_MULTISAMPLE on Gfx7/7.5
* default ones will be used either at device initialization time or * will be emitted dynamically, so skip it here. On Gfx8+
* through 3DSTATE_MULTISAMPLE on Gfx7/7.5 by passing NULL locations. * 3DSTATE_SAMPLE_PATTERN will be emitted dynamically, so skip it here.
*/ */
if (pipeline->base.device->vk.enabled_extensions.EXT_sample_locations) { if (!(dynamic_states & ANV_CMD_DIRTY_DYNAMIC_SAMPLE_LOCATIONS)) {
#if GFX_VER >= 8 #if GFX_VER >= 8
genX(emit_sample_pattern)(&pipeline->base.batch, genX(emit_sample_pattern)(&pipeline->base.batch,
pipeline->dynamic_state.sample_locations.samples, pipeline->dynamic_state.sample_locations.samples,