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

anv: Stop looking at the pipeline in multiview lowering

Browse Source 
Passing all the data we need in directly avoids issues where we might
forget what is and isn't set on the pipeline object at the time the
shader call happens.  This will be especially important once we start
splitting things up for pipeline libraries.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17602>
This commit is contained in:
Jason Ekstrand
2022-07-18 11:06:41 -05:00
committed by Marge Bot
parent 4bdbc4c93f
commit 30251aaca2
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/intel/vulkan/anv_nir_lower_multiview.c
View File

@@ -176,11 +176,10 @@ replace_load_view_index_with_layer_id(struct nir_builder *b,
}
bool
anv_nir_lower_multiview(nir_shader *shader,
struct anv_graphics_pipeline *pipeline)
anv_nir_lower_multiview(nir_shader *shader, uint32_t view_mask,
bool use_primitive_replication)
{
assert(shader->info.stage != MESA_SHADER_COMPUTE);
uint32_t view_mask = pipeline->view_mask;
/* If multiview isn't enabled, just lower the ViewIndex builtin to zero. */
if (view_mask == 0) {
@@ -201,8 +200,8 @@ anv_nir_lower_multiview(nir_shader *shader,
* view, then it is possible to use the feature instead of instancing to
* implement multiview.
*/
if (pipeline->use_primitive_replication) {
bool progress = nir_lower_multiview(shader, pipeline->view_mask);
if (use_primitive_replication) {
bool progress = nir_lower_multiview(shader, view_mask);
if (progress) {
nir_builder b;
@@ -289,10 +288,12 @@ anv_nir_lower_multiview(nir_shader *shader,
}
bool
anv_check_for_primitive_replication(nir_shader **shaders,
struct anv_graphics_pipeline *pipeline)
anv_check_for_primitive_replication(struct anv_device *device,
VkShaderStageFlags stages,
nir_shader **shaders,
uint32_t view_mask)
{
assert(pipeline->base.device->info->ver >= 12);
assert(device->info->ver >= 12);
static int primitive_replication_max_views = -1;
if (primitive_replication_max_views < 0) {
@@ -312,11 +313,9 @@ anv_check_for_primitive_replication(nir_shader **shaders,
* later than Vertex. In that case only the last stage can refer to
* gl_ViewIndex.
*/
if (pipeline->active_stages & ~(VK_SHADER_STAGE_VERTEX_BIT |
VK_SHADER_STAGE_FRAGMENT_BIT))
if (stages & ~(VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT))
return false;
uint32_t view_mask = pipeline->view_mask;
int view_count = util_bitcount(view_mask);
if (view_count == 1 || view_count > primitive_replication_max_views)
return false;