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

dxil: Sync dxil_spirv_shader_stage with gl_shader_stage

Browse Source 
Add STATIC_ASSERT to guard `dxil_spirv_shader_stage` and `gl_shader_stage`
to be same for each enum value.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16671>
This commit is contained in:
Yonggang Luo
2022-04-30 17:29:19 +08:00
committed by Marge Bot
parent ed7e78b084
commit 0d0283f698
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/microsoft/spirv_to_dxil/spirv_to_dxil.c
+9
View File
@@ -32,6 +32,15 @@
#include "git_sha1.h"
#include "vulkan/vulkan.h"
static_assert(DXIL_SPIRV_SHADER_NONE == (int)MESA_SHADER_NONE, "must match");
static_assert(DXIL_SPIRV_SHADER_VERTEX == (int)MESA_SHADER_VERTEX, "must match");
static_assert(DXIL_SPIRV_SHADER_TESS_CTRL == (int)MESA_SHADER_TESS_CTRL, "must match");
static_assert(DXIL_SPIRV_SHADER_TESS_EVAL == (int)MESA_SHADER_TESS_EVAL, "must match");
static_assert(DXIL_SPIRV_SHADER_GEOMETRY == (int)MESA_SHADER_GEOMETRY, "must match");
static_assert(DXIL_SPIRV_SHADER_FRAGMENT == (int)MESA_SHADER_FRAGMENT, "must match");
static_assert(DXIL_SPIRV_SHADER_COMPUTE == (int)MESA_SHADER_COMPUTE, "must match");
static_assert(DXIL_SPIRV_SHADER_KERNEL == (int)MESA_SHADER_KERNEL, "must match");
/* Logic extracted from vk_spirv_to_nir() so we have the same preparation
* steps for both the vulkan driver and the lib used by the WebGPU
* implementation.
src/microsoft/spirv_to_dxil/spirv_to_dxil.h
+1 -1
View File
@@ -44,7 +44,7 @@ typedef enum {
DXIL_SPIRV_SHADER_GEOMETRY = 3,
DXIL_SPIRV_SHADER_FRAGMENT = 4,
DXIL_SPIRV_SHADER_COMPUTE = 5,
DXIL_SPIRV_SHADER_KERNEL = 6,
DXIL_SPIRV_SHADER_KERNEL = 14,
} dxil_spirv_shader_stage;
// Copy of nir_spirv_const_value