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

radv: fix selecting shader variants with ESO

Browse Source 
The shader BO for variants (like as LS) wasn't added to the BO list.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27479>
This commit is contained in:
Samuel Pitoiset
2024-02-06 10:19:54 +01:00
committed by Marge Bot
parent a47de04ff3
commit b199aa1bda
1 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/amd/vulkan/radv_cmd_buffer.c
View File

@@ -9326,6 +9326,7 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer)
for (unsigned s = 0; s <= MESA_SHADER_MESH; s++) {
const struct radv_shader_object *shader_obj = cmd_buffer->state.shader_objs[s];
struct radv_shader *shader = NULL;
if (s == MESA_SHADER_COMPUTE)
continue;
@@ -9335,30 +9336,21 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer)
continue;
}
struct radv_shader *shader = shader_obj->shader ? shader_obj->shader : NULL;
switch (s) {
case MESA_SHADER_VERTEX:
/* Select shader variants. */
if (s == MESA_SHADER_VERTEX && (cmd_buffer->state.shader_objs[MESA_SHADER_TESS_CTRL] ||
cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY])) {
if (cmd_buffer->state.shader_objs[MESA_SHADER_TESS_CTRL]) {
radv_bind_shader(cmd_buffer, shader_obj->vs.as_ls.shader, s);
} else if (cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]) {
radv_bind_shader(cmd_buffer, shader_obj->vs.as_es.shader, s);
shader = shader_obj->vs.as_ls.shader;
} else {
radv_bind_shader(cmd_buffer, shader, s);
shader = shader_obj->vs.as_es.shader;
}
break;
case MESA_SHADER_TESS_EVAL:
if (cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]) {
radv_bind_shader(cmd_buffer, shader_obj->tes.as_es.shader, s);
} else {
radv_bind_shader(cmd_buffer, shader, s);
}
break;
default:
radv_bind_shader(cmd_buffer, shader, s);
break;
} else if (s == MESA_SHADER_TESS_EVAL && cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]) {
shader = shader_obj->tes.as_es.shader;
} else {
shader = shader_obj->shader;
}
radv_bind_shader(cmd_buffer, shader, s);
if (!shader)
continue;