mojoshader_opengl.c
changeset 1225 50b8dd7e0b1a
parent 1224 21cd84f1aa0a
child 1232 eec14d60f416
--- a/mojoshader_opengl.c	Tue Dec 31 12:22:44 2019 -0500
+++ b/mojoshader_opengl.c	Tue Dec 31 12:58:06 2019 -0500
@@ -36,7 +36,7 @@
 #include "GL/gl.h"
 #include "GL/glext.h"
 
-#if SUPPORT_PROFILE_SPIRV
+#if SUPPORT_PROFILE_GLSPIRV
 #include "spirv/spirv.h"
 #endif
 
@@ -402,7 +402,7 @@
 
 // profile-specific implementations...
 
-#if SUPPORT_PROFILE_GLSL || SUPPORT_PROFILE_SPIRV
+#if SUPPORT_PROFILE_GLSL || SUPPORT_PROFILE_GLSPIRV
 static inline GLenum glsl_shader_type(const MOJOSHADER_shaderType t)
 {
     // these enums match between core 2.0 and the ARB extensions.
@@ -436,7 +436,7 @@
     return (int) val;
 } // impl_GLSL_MaxUniforms
 
-#if SUPPORT_PROFILE_SPIRV
+#if SUPPORT_PROFILE_GLSPIRV
 static const SpirvPatchTable* spv_getPatchTable(MOJOSHADER_glShader *shader)
 {
     const MOJOSHADER_parseData *pd = shader->parseData;
@@ -657,7 +657,7 @@
         if (program->ps_vpos_flip_loc != -1) program->ps_vpos_flip_loc += ps_base_location;
     } // if
 } // impl_SPIRV_FinalInitProgram
-#endif // SUPPORT_PROFILE_SPIRV
+#endif // SUPPORT_PROFILE_GLSPIRV
 
 #if SUPPORT_PROFILE_GLSL
 static int impl_GLSL_CompileShader(const MOJOSHADER_parseData *pd, GLuint *s)
@@ -909,7 +909,7 @@
     ctx->glUniform1i(loc, sampler);
 } // impl_GLSL_PushSampler
 
-#endif // SUPPORT_PROFILE_GLSL || SUPPORT_PROFILE_SPIRV
+#endif // SUPPORT_PROFILE_GLSL || SUPPORT_PROFILE_GLSPIRV
 
 
 #if SUPPORT_PROFILE_ARB1
@@ -1553,11 +1553,11 @@
     } // else if
     #endif
 
-    #if SUPPORT_PROFILE_SPIRV
-    else if (strcmp(profile, MOJOSHADER_PROFILE_SPIRV) == 0)
+    #if SUPPORT_PROFILE_GLSPIRV
+    else if (strcmp(profile, MOJOSHADER_PROFILE_GLSPIRV) == 0)
     {
-        MUST_HAVE(MOJOSHADER_PROFILE_SPIRV, GL_ARB_ES2_compatibility);
-        MUST_HAVE(MOJOSHADER_PROFILE_SPIRV, GL_ARB_gl_spirv);
+        MUST_HAVE(MOJOSHADER_PROFILE_GLSPIRV, GL_ARB_ES2_compatibility);
+        MUST_HAVE(MOJOSHADER_PROFILE_GLSPIRV, GL_ARB_gl_spirv);
     } // else if
     #endif
 
@@ -1595,8 +1595,8 @@
 
 
 static const char *profile_priorities[] = {
-#if SUPPORT_PROFILE_SPIRV
-    MOJOSHADER_PROFILE_SPIRV,
+#if SUPPORT_PROFILE_GLSPIRV
+    MOJOSHADER_PROFILE_GLSPIRV,
 #endif
 #if SUPPORT_PROFILE_GLSL120
     MOJOSHADER_PROFILE_GLSL120,
@@ -1726,9 +1726,9 @@
     // !!! FIXME: generalize this part.
     if (profile == NULL) {}
 
-    // We don't check SUPPORT_PROFILE_SPIRV here, since valid_profile() does.
-#if SUPPORT_PROFILE_SPIRV
-    else if (strcmp(profile, MOJOSHADER_PROFILE_SPIRV) == 0)
+    // We don't check SUPPORT_PROFILE_GLSPIRV here, since valid_profile() does.
+#if SUPPORT_PROFILE_GLSPIRV
+    else if (strcmp(profile, MOJOSHADER_PROFILE_GLSPIRV) == 0)
     {
         ctx->profileMaxUniforms = impl_GLSL_MaxUniforms;
         ctx->profileCompileShader = impl_SPIRV_CompileShader;