Add support for missing CallableNV shader stage

Author: sparmarNV

glslc/src/shader_stage.cc

@@ -50,6 +50,7 @@ shaderc_shader_kind MapStageNameToForcedKind(const string_piece& stage_name) {
       {"rchit", shaderc_glsl_closesthit_shader },
       {"rmiss", shaderc_glsl_miss_shader },
       {"rint", shaderc_glsl_intersection_shader },
+      {"rcall", shaderc_glsl_callable_shader },
       {"task", shaderc_glsl_task_shader },
       {"mesh", shaderc_glsl_mesh_shader },
 #endif
@@ -84,6 +85,7 @@ shaderc_shader_kind DeduceDefaultShaderKindFromFileName(
       {"rchit", shaderc_glsl_default_closesthit_shader },
       {"rmiss", shaderc_glsl_default_miss_shader },
       {"rint", shaderc_glsl_default_intersection_shader },
+      {"rcall", shaderc_glsl_default_callable_shader },
       {"task", shaderc_glsl_default_task_shader },
       {"mesh", shaderc_glsl_default_mesh_shader },
 #endif

glslc/src/stage_test.cc

@@ -65,6 +65,9 @@ TEST(DeduceDefaultShaderKindFromFileName, ValidStage) {
   EXPECT_EQ(shaderc_glsl_default_intersection_shader,
             glslc::DeduceDefaultShaderKindFromFileName("a.rint"));
 
+  EXPECT_EQ(shaderc_glsl_default_callable_shader,
+            glslc::DeduceDefaultShaderKindFromFileName("a.rcall"));
+
   EXPECT_EQ(shaderc_glsl_default_task_shader,
             glslc::DeduceDefaultShaderKindFromFileName("a.task"));
 

libshaderc/include/shaderc/shaderc.h

@@ -84,16 +84,19 @@ typedef enum {
   shaderc_closesthit_shader,
   shaderc_miss_shader,
   shaderc_intersection_shader,
+  shaderc_callable_shader,
   shaderc_glsl_raygen_shader = shaderc_raygen_shader,
   shaderc_glsl_anyhit_shader = shaderc_anyhit_shader,
   shaderc_glsl_closesthit_shader = shaderc_closesthit_shader,
   shaderc_glsl_miss_shader = shaderc_miss_shader,
   shaderc_glsl_intersection_shader = shaderc_intersection_shader,
+  shaderc_glsl_callable_shader = shaderc_callable_shader,
   shaderc_glsl_default_raygen_shader,
   shaderc_glsl_default_anyhit_shader,
   shaderc_glsl_default_closesthit_shader,
   shaderc_glsl_default_miss_shader,
   shaderc_glsl_default_intersection_shader,
+  shaderc_glsl_default_callable_shader,
   shaderc_task_shader,
   shaderc_mesh_shader,
   shaderc_glsl_task_shader = shaderc_task_shader,

libshaderc/src/shaderc.cc

@@ -68,6 +68,8 @@ EShLanguage GetForcedStage(shaderc_shader_kind kind) {
       return EShLangMissNV;
     case shaderc_glsl_intersection_shader:
       return EShLangIntersectNV;
+    case shaderc_glsl_callable_shader:
+      return EShLangCallableNV;
     case shaderc_glsl_task_shader:
       return EShLangTaskNV;
     case shaderc_glsl_mesh_shader:
@@ -87,6 +89,7 @@ EShLanguage GetForcedStage(shaderc_shader_kind kind) {
     case shaderc_glsl_default_closesthit_shader:
     case shaderc_glsl_default_miss_shader:
     case shaderc_glsl_default_intersection_shader:
+    case shaderc_glsl_default_callable_shader:
     case shaderc_glsl_default_task_shader:
     case shaderc_glsl_default_mesh_shader:
 #endif
@@ -153,6 +156,7 @@ class StageDeducer {
       case shaderc_glsl_closesthit_shader:
       case shaderc_glsl_miss_shader:
       case shaderc_glsl_intersection_shader:
+      case shaderc_glsl_callable_shader:
       case shaderc_glsl_task_shader:
       case shaderc_glsl_mesh_shader:
 #endif
@@ -180,6 +184,8 @@ class StageDeducer {
         return EShLangMissNV;
       case shaderc_glsl_default_intersection_shader:
         return EShLangIntersectNV;
+      case shaderc_glsl_default_callable_shader:
+        return EShLangCallableNV;
       case shaderc_glsl_default_task_shader:
         return EShLangTaskNV;
       case shaderc_glsl_default_mesh_shader:

libshaderc/src/shaderc_private.h

@@ -122,6 +122,8 @@ inline shaderc_util::Compiler::Stage shaderc_convert_specific_stage(
       return shaderc_util::Compiler::Stage::ClosestHitNV;
     case shaderc_miss_shader:
       return shaderc_util::Compiler::Stage::MissNV;
+    case shaderc_callable_shader:
+      return shaderc_util::Compiler::Stage::CallableNV;
     case shaderc_task_shader:
       return shaderc_util::Compiler::Stage::TaskNV;
     case shaderc_mesh_shader:

libshaderc/src/shaderc_private_test.cc

@@ -41,6 +41,8 @@ TEST(ConvertSpecificStage, Exhaustive) {
             shaderc_convert_specific_stage(shaderc_intersection_shader));
   EXPECT_EQ(shaderc_util::Compiler::Stage::MissNV,
             shaderc_convert_specific_stage(shaderc_miss_shader));
+  EXPECT_EQ(shaderc_util::Compiler::Stage::CallableNV,
+            shaderc_convert_specific_stage(shaderc_callable_shader));
   EXPECT_EQ(shaderc_util::Compiler::Stage::TaskNV,
             shaderc_convert_specific_stage(shaderc_task_shader));
   EXPECT_EQ(shaderc_util::Compiler::Stage::MeshNV,

libshaderc_util/include/libshaderc_util/compiler.h

@@ -175,6 +175,7 @@ class Compiler {
     AnyHitNV,
     ClosestHitNV,
     MissNV,
+    CallableNV,
     TaskNV,
     MeshNV,
 #endif
@@ -193,6 +194,7 @@ class Compiler {
           Stage::AnyHitNV,
           Stage::ClosestHitNV,
           Stage::MissNV,
+          Stage::CallableNV,
           Stage::TaskNV,
           Stage::MeshNV,
 #endif