From cc71fccb754740b8f4fad52995e1c4ebcb224391 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Tue, 16 Jun 2020 11:31:13 +0200 Subject: [PATCH] nvc0: enable spirv caps with nir This enables the SPIR-V GL extensions moving us a step closer to GL 4.6. Signed-off-by: Karol Herbst Tested-by: Ben Skeggs Part-of: --- docs/relnotes/new_features.txt | 2 ++ src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt index e6f1499abff..a0f3789877b 100644 --- a/docs/relnotes/new_features.txt +++ b/docs/relnotes/new_features.txt @@ -10,3 +10,5 @@ VK_EXT_shader_demote_to_helper_invocation on RADV/LLVM. VK_EXT_subgroup_size_control on RADV/ACO. VK_GOOGLE_user_type on ANV and RADV. VK_KHR_shader_subgroup_extended_types on RADV/ACO. +GL_ARB_gl_spirv on nvc0/nir. +GL_ARB_spirv_extensions on nvc0/nir. diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c index c3233632790..9e8a3e5c3e3 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c @@ -324,6 +324,8 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return class_3d >= GP100_3D_CLASS; /* caps has to be turned on with nir */ + case PIPE_CAP_GL_SPIRV: + case PIPE_CAP_GL_SPIRV_VARIABLE_POINTERS: case PIPE_CAP_INT64_DIVMOD: return screen->prefer_nir ? 1 : 0; @@ -391,7 +393,6 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_OPENCL_INTEGER_FUNCTIONS: /* could be done */ case PIPE_CAP_INTEGER_MULTIPLY_32X16: /* could be done */ case PIPE_CAP_FRONTEND_NOOP: - case PIPE_CAP_GL_SPIRV: case PIPE_CAP_SHADER_SAMPLES_IDENTICAL: case PIPE_CAP_VIEWPORT_TRANSFORM_LOWERED: case PIPE_CAP_PSIZ_CLAMPED: -- 2.30.2