Fix to allow simply using the glslang_shader_parse from C API without…

… preprocess
KhronosGroup · Nov 28, 2024 · acd8900 · acd8900
1 parent 0099ed6
commit acd8900
Showing 1 changed file with 24 additions and 9 deletions.
diff --git a/glslang/CInterface/glslang_c_interface.cpp b/glslang/CInterface/glslang_c_interface.cpp
@@ -431,15 +431,30 @@ GLSLANG_EXPORT int glslang_shader_preprocess(glslang_shader_t* shader, const gls
 
 GLSLANG_EXPORT int glslang_shader_parse(glslang_shader_t* shader, const glslang_input_t* input)
 {
-    const char* preprocessedCStr = shader->preprocessedGLSL.c_str();
-    shader->shader->setStrings(&preprocessedCStr, 1);
-
-    return shader->shader->parse(
-        reinterpret_cast<const TBuiltInResource*>(input->resource),
-        input->default_version,
-        input->forward_compatible != 0,
-        (EShMessages)c_shader_messages(input->messages)
-    );
+    if (shader->preprocessedGLSL.length() > 0) {
+        const char* preprocessedCStr = shader->preprocessedGLSL.c_str();
+        shader->shader->setStrings(&preprocessedCStr, 1);
+
+        return shader->shader->parse(
+            reinterpret_cast<const TBuiltInResource*>(input->resource),
+            input->default_version,
+            input->forward_compatible != 0,
+            (EShMessages)c_shader_messages(input->messages)
+        );
+    } else {
+        DirStackFileIncluder dirStackFileIncluder;
+        CallbackIncluder callbackIncluder(input->callbacks, input->callbacks_ctx);
+        glslang::TShader::Includer& Includer = (input->callbacks.include_local||input->callbacks.include_system)
+            ? static_cast<glslang::TShader::Includer&>(callbackIncluder)
+            : static_cast<glslang::TShader::Includer&>(dirStackFileIncluder);
+        return shader->shader->parse(
+            reinterpret_cast<const TBuiltInResource*>(input->resource),
+            input->default_version,
+            input->forward_compatible != 0,
+            (EShMessages)c_shader_messages(input->messages),
+            Includer
+        );
+    }
 }
 
 GLSLANG_EXPORT const char* glslang_shader_get_info_log(glslang_shader_t* shader) { return shader->shader->getInfoLog(); }