AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: always enable fixed shader-caps

Browse Source 
This is required for a bunch of stuff that can occur in any Vulkan
shader stage, not just these few. So let's always emit this cap.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10371>
This commit is contained in:
Erik Faye-Lund
2021-04-21 12:09:45 +02:00
parent 922f71b819
commit 567699f048
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+5 -10
View File
@@ -3576,15 +3576,11 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, bool spir
if (!ctx.glsl_types)
goto fail;
switch (s->info.stage) {
case MESA_SHADER_VERTEX:
case MESA_SHADER_FRAGMENT:
case MESA_SHADER_COMPUTE:
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShader);
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageBuffer);
spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampledBuffer);
break;
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityShader);
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityImageBuffer);
spirv_builder_emit_cap(&ctx.builder, SpvCapabilitySampledBuffer);
switch (s->info.stage) {
case MESA_SHADER_TESS_CTRL:
case MESA_SHADER_TESS_EVAL:
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityTessellation);
@@ -3601,8 +3597,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, bool spir
spirv_builder_emit_cap(&ctx.builder, SpvCapabilityGeometryPointSize);
break;
default:
unreachable("invalid stage");
default: ;
}
ctx.info = &s->info;