mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3015 from spnda/remove_nv_c_interface

Browse Source 
Fix: Remove NV suffix from glslang C interface
This commit is contained in:
Greg Fischer 2022-09-06 12:20:53 -06:00 committed by GitHub
commit 5487373dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SPIRV/CInterface/spirv_c_interface.cpp
View File

@ -59,17 +59,17 @@ static EShLanguage c_shader_stage(glslang_stage_t stage)
return EShLangFragment; return EShLangFragment;
case GLSLANG_STAGE_COMPUTE: case GLSLANG_STAGE_COMPUTE:
return EShLangCompute; return EShLangCompute;
case GLSLANG_STAGE_RAYGEN_NV: case GLSLANG_STAGE_RAYGEN:
return EShLangRayGen; return EShLangRayGen;
case GLSLANG_STAGE_INTERSECT_NV: case GLSLANG_STAGE_INTERSECT:
return EShLangIntersect; return EShLangIntersect;
case GLSLANG_STAGE_ANYHIT_NV: case GLSLANG_STAGE_ANYHIT:
return EShLangAnyHit; return EShLangAnyHit;
case GLSLANG_STAGE_CLOSESTHIT_NV: case GLSLANG_STAGE_CLOSESTHIT:
return EShLangClosestHit; return EShLangClosestHit;
case GLSLANG_STAGE_MISS_NV: case GLSLANG_STAGE_MISS:
return EShLangMiss; return EShLangMiss;
case GLSLANG_STAGE_CALLABLE_NV: case GLSLANG_STAGE_CALLABLE:
return EShLangCallable; return EShLangCallable;
case GLSLANG_STAGE_TASK: case GLSLANG_STAGE_TASK:
return EShLangTask; return EShLangTask;

36
glslang/Include/glslang_c_shader_types.h
View File

@ -43,12 +43,18 @@ typedef enum {
GLSLANG_STAGE_GEOMETRY, GLSLANG_STAGE_GEOMETRY,
GLSLANG_STAGE_FRAGMENT, GLSLANG_STAGE_FRAGMENT,
GLSLANG_STAGE_COMPUTE, GLSLANG_STAGE_COMPUTE,
GLSLANG_STAGE_RAYGEN_NV, GLSLANG_STAGE_RAYGEN,
GLSLANG_STAGE_INTERSECT_NV, GLSLANG_STAGE_RAYGEN_NV = GLSLANG_STAGE_RAYGEN,
GLSLANG_STAGE_ANYHIT_NV, GLSLANG_STAGE_INTERSECT,
GLSLANG_STAGE_CLOSESTHIT_NV, GLSLANG_STAGE_INTERSECT_NV = GLSLANG_STAGE_INTERSECT,
GLSLANG_STAGE_MISS_NV, GLSLANG_STAGE_ANYHIT,
GLSLANG_STAGE_CALLABLE_NV, GLSLANG_STAGE_ANYHIT_NV = GLSLANG_STAGE_ANYHIT,
GLSLANG_STAGE_CLOSESTHIT,
GLSLANG_STAGE_CLOSESTHIT_NV = GLSLANG_STAGE_CLOSESTHIT,
GLSLANG_STAGE_MISS,
GLSLANG_STAGE_MISS_NV = GLSLANG_STAGE_MISS,
GLSLANG_STAGE_CALLABLE,
GLSLANG_STAGE_CALLABLE_NV = GLSLANG_STAGE_CALLABLE,
GLSLANG_STAGE_TASK, GLSLANG_STAGE_TASK,
GLSLANG_STAGE_TASK_NV = GLSLANG_STAGE_TASK, GLSLANG_STAGE_TASK_NV = GLSLANG_STAGE_TASK,
GLSLANG_STAGE_MESH, GLSLANG_STAGE_MESH,
@ -64,12 +70,18 @@ typedef enum {
GLSLANG_STAGE_GEOMETRY_MASK = (1 << GLSLANG_STAGE_GEOMETRY), GLSLANG_STAGE_GEOMETRY_MASK = (1 << GLSLANG_STAGE_GEOMETRY),
GLSLANG_STAGE_FRAGMENT_MASK = (1 << GLSLANG_STAGE_FRAGMENT), GLSLANG_STAGE_FRAGMENT_MASK = (1 << GLSLANG_STAGE_FRAGMENT),
GLSLANG_STAGE_COMPUTE_MASK = (1 << GLSLANG_STAGE_COMPUTE), GLSLANG_STAGE_COMPUTE_MASK = (1 << GLSLANG_STAGE_COMPUTE),
GLSLANG_STAGE_RAYGEN_NV_MASK = (1 << GLSLANG_STAGE_RAYGEN_NV), GLSLANG_STAGE_RAYGEN_MASK = (1 << GLSLANG_STAGE_RAYGEN),
GLSLANG_STAGE_INTERSECT_NV_MASK = (1 << GLSLANG_STAGE_INTERSECT_NV), GLSLANG_STAGE_RAYGEN_NV_MASK = GLSLANG_STAGE_RAYGEN_MASK,
GLSLANG_STAGE_ANYHIT_NV_MASK = (1 << GLSLANG_STAGE_ANYHIT_NV), GLSLANG_STAGE_INTERSECT_MASK = (1 << GLSLANG_STAGE_INTERSECT),
GLSLANG_STAGE_CLOSESTHIT_NV_MASK = (1 << GLSLANG_STAGE_CLOSESTHIT_NV), GLSLANG_STAGE_INTERSECT_NV_MASK = GLSLANG_STAGE_INTERSECT_MASK,
GLSLANG_STAGE_MISS_NV_MASK = (1 << GLSLANG_STAGE_MISS_NV), GLSLANG_STAGE_ANYHIT_MASK = (1 << GLSLANG_STAGE_ANYHIT),
GLSLANG_STAGE_CALLABLE_NV_MASK = (1 << GLSLANG_STAGE_CALLABLE_NV), GLSLANG_STAGE_ANYHIT_NV_MASK = GLSLANG_STAGE_ANYHIT_MASK,
GLSLANG_STAGE_CLOSESTHIT_MASK = (1 << GLSLANG_STAGE_CLOSESTHIT),
GLSLANG_STAGE_CLOSESTHIT_NV_MASK = GLSLANG_STAGE_CLOSESTHIT_MASK,
GLSLANG_STAGE_MISS_MASK = (1 << GLSLANG_STAGE_MISS),
GLSLANG_STAGE_MISS_NV_MASK = GLSLANG_STAGE_MISS_MASK,
GLSLANG_STAGE_CALLABLE_MASK = (1 << GLSLANG_STAGE_CALLABLE),
GLSLANG_STAGE_CALLABLE_NV_MASK = GLSLANG_STAGE_CALLABLE_MASK,
GLSLANG_STAGE_TASK_MASK = (1 << GLSLANG_STAGE_TASK), GLSLANG_STAGE_TASK_MASK = (1 << GLSLANG_STAGE_TASK),
GLSLANG_STAGE_TASK_NV_MASK = GLSLANG_STAGE_TASK_MASK, GLSLANG_STAGE_TASK_NV_MASK = GLSLANG_STAGE_TASK_MASK,
GLSLANG_STAGE_MESH_MASK = (1 << GLSLANG_STAGE_MESH), GLSLANG_STAGE_MESH_MASK = (1 << GLSLANG_STAGE_MESH),