spirv: Prefer symbols from Khronos extension for compute shader derivatives

The extension was promoted, start using the KHR instead of
vendor-specific symbols.

Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30956>
This commit is contained in:
Caio Oliveira
2024-08-30 08:46:56 -07:00
committed by Marge Bot
parent 155c614c52
commit 1cece2691f
+4 -4
View File
@@ -57,8 +57,8 @@ static const struct spirv_capabilities implemented_capabilities = {
.AtomicFloat64MinMaxEXT = true,
.AtomicStorage = true,
.ClipDistance = true,
.ComputeDerivativeGroupLinearNV = true,
.ComputeDerivativeGroupQuadsNV = true,
.ComputeDerivativeGroupLinearKHR = true,
.ComputeDerivativeGroupQuadsKHR = true,
.CooperativeMatrixKHR = true,
.CullDistance = true,
.DemoteToHelperInvocation = true,
@@ -5272,12 +5272,12 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point,
vtn_assert(b->shader->info.stage == MESA_SHADER_FRAGMENT);
break;
case SpvExecutionModeDerivativeGroupQuadsNV:
case SpvExecutionModeDerivativeGroupQuadsKHR:
vtn_assert(b->shader->info.stage == MESA_SHADER_COMPUTE);
b->shader->info.derivative_group = DERIVATIVE_GROUP_QUADS;
break;
case SpvExecutionModeDerivativeGroupLinearNV:
case SpvExecutionModeDerivativeGroupLinearKHR:
vtn_assert(b->shader->info.stage == MESA_SHADER_COMPUTE);
b->shader->info.derivative_group = DERIVATIVE_GROUP_LINEAR;
break;