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

zink: clone shader before lowering clip_halfz

Browse source 
If we don't clone the shader before lowering clip_halfz, we risk ending
up performing the same lowering multiple times, each time we compile a
new variant.

This fixes rendering in Neverball.

Fixes: 15f478fe84 ("zink: only run nir_lower_clip_halfz for last vertex processing stage")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4147
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8652>
(cherry picked from commit 92ec7b577c)
This commit is contained in:
Erik Faye-Lund 2021-01-22 16:14:32 +01:00 • committed by Dylan Baker
parent 88a5bbb341
commit 219407fd01
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -94,7 +94,7 @@
"description": "zink: clone shader before lowering clip_halfz",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "15f478fe840c29ba118fbb4fa49118f85fb208c6"
},

35
src/gallium/drivers/zink/zink_compiler.c
View file

@ -313,6 +313,17 @@ update_so_info(struct zink_shader *sh,
}
}
static bool
last_vertex_stage(struct zink_shader *zs)
{
assert(zs->nir->info.stage != MESA_SHADER_FRAGMENT);
if (zs->has_geometry_shader)
return zs->nir->info.stage == MESA_SHADER_GEOMETRY;
if (zs->has_tess_shader)
return zs->nir->info.stage == MESA_SHADER_TESS_EVAL;
return true;
}
VkShaderModule
zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct zink_shader_key *key,
unsigned char *shader_slot_map, unsigned char *shader_slots_reserved)
@ -321,26 +332,18 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
void *streamout = NULL;
nir_shader *nir = zs->nir;
/* TODO: use a separate mem ctx here for ralloc */
if (zs->has_geometry_shader) {
if (zs->nir->info.stage == MESA_SHADER_GEOMETRY) {
streamout = &zs->streamout;
NIR_PASS_V(nir, nir_lower_clip_halfz);
}
} else if (zs->has_tess_shader) {
if (zs->nir->info.stage == MESA_SHADER_TESS_EVAL) {
streamout = &zs->streamout;
if (zs->nir->info.stage != MESA_SHADER_FRAGMENT) {
if (last_vertex_stage(zs)) {
if (zs->streamout.so_info_slots)
streamout = &zs->streamout;
nir = nir_shader_clone(NULL, zs->nir);
NIR_PASS_V(nir, nir_lower_clip_halfz);
}
} else {
streamout = &zs->streamout;
NIR_PASS_V(nir, nir_lower_clip_halfz);
}
if (!zs->streamout.so_info_slots)
streamout = NULL;
if (zs->nir->info.stage == MESA_SHADER_FRAGMENT) {
nir = nir_shader_clone(NULL, nir);
if (!zink_fs_key(key)->samples &&
nir->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK)) {
nir = nir_shader_clone(NULL, zs->nir);
/* VK will always use gl_SampleMask[] values even if sample count is 0,
* so we need to skip this write here to mimic GL's behavior of ignoring it
*/
@ -376,7 +379,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, struct z
if (vkCreateShaderModule(screen->dev, &smci, NULL, &mod) != VK_SUCCESS)
mod = VK_NULL_HANDLE;
if (zs->nir->info.stage == MESA_SHADER_FRAGMENT)
if (nir != zs->nir)
ralloc_free(nir);
/* TODO: determine if there's any reason to cache spirv output? */