CInterface: replaced SH_ prefix with GLSLANG_

glslang/CInterface/glslang_c_interface.cpp

@@ -155,33 +155,33 @@ void glslang_finalize_process() { glslang::FinalizeProcess(); }
 static EShLanguage c_shader_stage(glslang_stage_t stage)
 {
     switch (stage) {
-    case SH_STAGE_VERTEX:
+    case GLSLANG_STAGE_VERTEX:
         return EShLangVertex;
-    case SH_STAGE_TESSCONTROL:
+    case GLSLANG_STAGE_TESSCONTROL:
         return EShLangTessControl;
-    case SH_STAGE_TESSEVALUATION:
+    case GLSLANG_STAGE_TESSEVALUATION:
         return EShLangTessEvaluation;
-    case SH_STAGE_GEOMETRY:
+    case GLSLANG_STAGE_GEOMETRY:
         return EShLangGeometry;
-    case SH_STAGE_FRAGMENT:
+    case GLSLANG_STAGE_FRAGMENT:
         return EShLangFragment;
-    case SH_STAGE_COMPUTE:
+    case GLSLANG_STAGE_COMPUTE:
         return EShLangCompute;
-    case SH_STAGE_RAYGEN_NV:
+    case GLSLANG_STAGE_RAYGEN_NV:
         return EShLangRayGenNV;
-    case SH_STAGE_INTERSECT_NV:
+    case GLSLANG_STAGE_INTERSECT_NV:
         return EShLangIntersectNV;
-    case SH_STAGE_ANYHIT_NV:
+    case GLSLANG_STAGE_ANYHIT_NV:
         return EShLangAnyHitNV;
-    case SH_STAGE_CLOSESTHIT_NV:
+    case GLSLANG_STAGE_CLOSESTHIT_NV:
         return EShLangClosestHitNV;
-    case SH_STAGE_MISS_NV:
+    case GLSLANG_STAGE_MISS_NV:
         return EShLangMissNV;
-    case SH_STAGE_CALLABLE_NV:
+    case GLSLANG_STAGE_CALLABLE_NV:
         return EShLangCallableNV;
-    case SH_STAGE_TASK_NV:
+    case GLSLANG_STAGE_TASK_NV:
         return EShLangTaskNV;
-    case SH_STAGE_MESH_NV:
+    case GLSLANG_STAGE_MESH_NV:
         return EShLangMeshNV;
     default:
         break;
@@ -197,21 +197,21 @@ static int c_shader_messages(glslang_messages_t messages)
 
     int res = 0;
 
-    CONVERT_MSG(SH_MSG_RELAXED_ERRORS_BIT, EShMsgRelaxedErrors);
-    CONVERT_MSG(SH_MSG_SUPPRESS_WARNINGS_BIT, EShMsgSuppressWarnings);
-    CONVERT_MSG(SH_MSG_AST_BIT, EShMsgAST);
-    CONVERT_MSG(SH_MSG_SPV_RULES_BIT, EShMsgSpvRules);
-    CONVERT_MSG(SH_MSG_VULKAN_RULES_BIT, EShMsgVulkanRules);
-    CONVERT_MSG(SH_MSG_ONLY_PREPROCESSOR_BIT, EShMsgOnlyPreprocessor);
-    CONVERT_MSG(SH_MSG_READ_HLSL_BIT, EShMsgReadHlsl);
-    CONVERT_MSG(SH_MSG_CASCADING_ERRORS_BIT, EShMsgCascadingErrors);
-    CONVERT_MSG(SH_MSG_KEEP_UNCALLED_BIT, EShMsgKeepUncalled);
-    CONVERT_MSG(SH_MSG_HLSL_OFFSETS_BIT, EShMsgHlslOffsets);
-    CONVERT_MSG(SH_MSG_DEBUG_INFO_BIT, EShMsgDebugInfo);
-    CONVERT_MSG(SH_MSG_HLSL_ENABLE_16BIT_TYPES_BIT, EShMsgHlslEnable16BitTypes);
-    CONVERT_MSG(SH_MSG_HLSL_LEGALIZATION_BIT, EShMsgHlslLegalization);
-    CONVERT_MSG(SH_MSG_HLSL_DX9_COMPATIBLE_BIT, EShMsgHlslDX9Compatible);
-    CONVERT_MSG(SH_MSG_BUILTIN_SYMBOL_TABLE_BIT, EShMsgBuiltinSymbolTable);
+    CONVERT_MSG(GLSLANG_MSG_RELAXED_ERRORS_BIT, EShMsgRelaxedErrors);
+    CONVERT_MSG(GLSLANG_MSG_SUPPRESS_WARNINGS_BIT, EShMsgSuppressWarnings);
+    CONVERT_MSG(GLSLANG_MSG_AST_BIT, EShMsgAST);
+    CONVERT_MSG(GLSLANG_MSG_SPV_RULES_BIT, EShMsgSpvRules);
+    CONVERT_MSG(GLSLANG_MSG_VULKAN_RULES_BIT, EShMsgVulkanRules);
+    CONVERT_MSG(GLSLANG_MSG_ONLY_PREPROCESSOR_BIT, EShMsgOnlyPreprocessor);
+    CONVERT_MSG(GLSLANG_MSG_READ_HLSL_BIT, EShMsgReadHlsl);
+    CONVERT_MSG(GLSLANG_MSG_CASCADING_ERRORS_BIT, EShMsgCascadingErrors);
+    CONVERT_MSG(GLSLANG_MSG_KEEP_UNCALLED_BIT, EShMsgKeepUncalled);
+    CONVERT_MSG(GLSLANG_MSG_HLSL_OFFSETS_BIT, EShMsgHlslOffsets);
+    CONVERT_MSG(GLSLANG_MSG_DEBUG_INFO_BIT, EShMsgDebugInfo);
+    CONVERT_MSG(GLSLANG_MSG_HLSL_ENABLE_16BIT_TYPES_BIT, EShMsgHlslEnable16BitTypes);
+    CONVERT_MSG(GLSLANG_MSG_HLSL_LEGALIZATION_BIT, EShMsgHlslLegalization);
+    CONVERT_MSG(GLSLANG_MSG_HLSL_DX9_COMPATIBLE_BIT, EShMsgHlslDX9Compatible);
+    CONVERT_MSG(GLSLANG_MSG_BUILTIN_SYMBOL_TABLE_BIT, EShMsgBuiltinSymbolTable);
     return res;
 #undef CONVERT_MSG
 }
@@ -220,17 +220,17 @@ static glslang::EShTargetLanguageVersion
 c_shader_target_language_version(glslang_target_language_version_t target_language_version)
 {
     switch (target_language_version) {
-    case SH_TARGET_SPV_1_0:
+    case GLSLANG_TARGET_SPV_1_0:
         return glslang::EShTargetSpv_1_0;
-    case SH_TARGET_SPV_1_1:
+    case GLSLANG_TARGET_SPV_1_1:
         return glslang::EShTargetSpv_1_1;
-    case SH_TARGET_SPV_1_2:
+    case GLSLANG_TARGET_SPV_1_2:
         return glslang::EShTargetSpv_1_2;
-    case SH_TARGET_SPV_1_3:
+    case GLSLANG_TARGET_SPV_1_3:
         return glslang::EShTargetSpv_1_3;
-    case SH_TARGET_SPV_1_4:
+    case GLSLANG_TARGET_SPV_1_4:
         return glslang::EShTargetSpv_1_4;
-    case SH_TARGET_SPV_1_5:
+    case GLSLANG_TARGET_SPV_1_5:
         return glslang::EShTargetSpv_1_5;
     default:
         break;
@@ -241,9 +241,9 @@ c_shader_target_language_version(glslang_target_language_version_t target_langua
 static glslang::EShClient c_shader_client(glslang_client_t client)
 {
     switch (client) {
-    case SH_CLIENT_VULKAN:
+    case GLSLANG_CLIENT_VULKAN:
         return glslang::EShClientVulkan;
-    case SH_CLIENT_OPENGL:
+    case GLSLANG_CLIENT_OPENGL:
         return glslang::EShClientOpenGL;
     default:
         break;
@@ -255,9 +255,9 @@ static glslang::EShClient c_shader_client(glslang_client_t client)
 static glslang::EShTargetClientVersion c_shader_client_version(glslang_target_client_version_t client_version)
 {
     switch (client_version) {
-    case SH_TARGET_VULKAN_1_1:
+    case GLSLANG_TARGET_VULKAN_1_1:
         return glslang::EShTargetVulkan_1_1;
-    case SH_TARGET_OPENGL_450:
+    case GLSLANG_TARGET_OPENGL_450:
         return glslang::EShTargetOpenGL_450;
     default:
         break;
@@ -268,7 +268,7 @@ static glslang::EShTargetClientVersion c_shader_client_version(glslang_target_cl
 
 static glslang::EShTargetLanguage c_shader_target_language(glslang_target_language_t target_language)
 {
-    if (target_language == SH_TARGET_NONE)
+    if (target_language == GLSLANG_TARGET_NONE)
         return glslang::EShTargetNone;
 
     return glslang::EShTargetSpv;
@@ -277,9 +277,9 @@ static glslang::EShTargetLanguage c_shader_target_language(glslang_target_langua
 static glslang::EShSource c_shader_source(glslang_source_t source)
 {
     switch (source) {
-    case SH_SOURCE_GLSL:
+    case GLSLANG_SOURCE_GLSL:
         return glslang::EShSourceGlsl;
-    case SH_SOURCE_HLSL:
+    case GLSLANG_SOURCE_HLSL:
         return glslang::EShSourceHlsl;
     default:
         break;
@@ -291,15 +291,15 @@ static glslang::EShSource c_shader_source(glslang_source_t source)
 static EProfile c_shader_profile(glslang_profile_t profile)
 {
     switch (profile) {
-    case SH_BAD_PROFILE:
+    case GLSLANG_BAD_PROFILE:
         return EBadProfile;
-    case SH_NO_PROFILE:
+    case GLSLANG_NO_PROFILE:
         return ENoProfile;
-    case SH_CORE_PROFILE:
+    case GLSLANG_CORE_PROFILE:
         return ECoreProfile;
-    case SH_COMPATIBILITY_PROFILE:
+    case GLSLANG_COMPATIBILITY_PROFILE:
         return ECompatibilityProfile;
-    case SH_ES_PROFILE:
+    case GLSLANG_ES_PROFILE:
         return EEsProfile;
     }
 

glslang/Include/glslang_c_shader_types.h

@@ -35,133 +35,133 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 /* EShLanguage counterpart */
 typedef enum {
-    SH_STAGE_VERTEX,
-    SH_STAGE_TESSCONTROL,
-    SH_STAGE_TESSEVALUATION,
-    SH_STAGE_GEOMETRY,
-    SH_STAGE_FRAGMENT,
-    SH_STAGE_COMPUTE,
-    SH_STAGE_RAYGEN_NV,
-    SH_STAGE_INTERSECT_NV,
-    SH_STAGE_ANYHIT_NV,
-    SH_STAGE_CLOSESTHIT_NV,
-    SH_STAGE_MISS_NV,
-    SH_STAGE_CALLABLE_NV,
-    SH_STAGE_TASK_NV,
-    SH_STAGE_MESH_NV,
-    SH_STAGE_COUNT,
+    GLSLANG_STAGE_VERTEX,
+    GLSLANG_STAGE_TESSCONTROL,
+    GLSLANG_STAGE_TESSEVALUATION,
+    GLSLANG_STAGE_GEOMETRY,
+    GLSLANG_STAGE_FRAGMENT,
+    GLSLANG_STAGE_COMPUTE,
+    GLSLANG_STAGE_RAYGEN_NV,
+    GLSLANG_STAGE_INTERSECT_NV,
+    GLSLANG_STAGE_ANYHIT_NV,
+    GLSLANG_STAGE_CLOSESTHIT_NV,
+    GLSLANG_STAGE_MISS_NV,
+    GLSLANG_STAGE_CALLABLE_NV,
+    GLSLANG_STAGE_TASK_NV,
+    GLSLANG_STAGE_MESH_NV,
+    GLSLANG_STAGE_COUNT,
 } glslang_stage_t; // would be better as stage, but this is ancient now
 
 /* EShLanguageMask counterpart */
 typedef enum {
-    SH_STAGE_VERTEX_MASK = (1 << SH_STAGE_VERTEX),
-    SH_STAGE_TESSCONTROL_MASK = (1 << SH_STAGE_TESSCONTROL),
-    SH_STAGE_TESSEVALUATION_MASK = (1 << SH_STAGE_TESSEVALUATION),
-    SH_STAGE_GEOMETRY_MASK = (1 << SH_STAGE_GEOMETRY),
-    SH_STAGE_FRAGMENT_MASK = (1 << SH_STAGE_FRAGMENT),
-    SH_STAGE_COMPUTE_MASK = (1 << SH_STAGE_COMPUTE),
-    SH_STAGE_RAYGEN_NV_MASK = (1 << SH_STAGE_RAYGEN_NV),
-    SH_STAGE_INTERSECT_NV_MASK = (1 << SH_STAGE_INTERSECT_NV),
-    SH_STAGE_ANYHIT_NV_MASK = (1 << SH_STAGE_ANYHIT_NV),
-    SH_STAGE_CLOSESTHIT_NV_MASK = (1 << SH_STAGE_CLOSESTHIT_NV),
-    SH_STAGE_MISS_NV_MASK = (1 << SH_STAGE_MISS_NV),
-    SH_STAGE_CALLABLE_NV_MASK = (1 << SH_STAGE_CALLABLE_NV),
-    SH_STAGE_TASK_NV_MASK = (1 << SH_STAGE_TASK_NV),
-    SH_STAGE_MESH_NV_MASK = (1 << SH_STAGE_MESH_NV),
+    GLSLANG_STAGE_VERTEX_MASK = (1 << GLSLANG_STAGE_VERTEX),
+    GLSLANG_STAGE_TESSCONTROL_MASK = (1 << GLSLANG_STAGE_TESSCONTROL),
+    GLSLANG_STAGE_TESSEVALUATION_MASK = (1 << GLSLANG_STAGE_TESSEVALUATION),
+    GLSLANG_STAGE_GEOMETRY_MASK = (1 << GLSLANG_STAGE_GEOMETRY),
+    GLSLANG_STAGE_FRAGMENT_MASK = (1 << GLSLANG_STAGE_FRAGMENT),
+    GLSLANG_STAGE_COMPUTE_MASK = (1 << GLSLANG_STAGE_COMPUTE),
+    GLSLANG_STAGE_RAYGEN_NV_MASK = (1 << GLSLANG_STAGE_RAYGEN_NV),
+    GLSLANG_STAGE_INTERSECT_NV_MASK = (1 << GLSLANG_STAGE_INTERSECT_NV),
+    GLSLANG_STAGE_ANYHIT_NV_MASK = (1 << GLSLANG_STAGE_ANYHIT_NV),
+    GLSLANG_STAGE_CLOSESTHIT_NV_MASK = (1 << GLSLANG_STAGE_CLOSESTHIT_NV),
+    GLSLANG_STAGE_MISS_NV_MASK = (1 << GLSLANG_STAGE_MISS_NV),
+    GLSLANG_STAGE_CALLABLE_NV_MASK = (1 << GLSLANG_STAGE_CALLABLE_NV),
+    GLSLANG_STAGE_TASK_NV_MASK = (1 << GLSLANG_STAGE_TASK_NV),
+    GLSLANG_STAGE_MESH_NV_MASK = (1 << GLSLANG_STAGE_MESH_NV),
 } glslang_stage_mask_t;
 
 /* EShSource counterpart */
 typedef enum {
-    SH_SOURCE_NONE,
-    SH_SOURCE_GLSL,
-    SH_SOURCE_HLSL,
+    GLSLANG_SOURCE_NONE,
+    GLSLANG_SOURCE_GLSL,
+    GLSLANG_SOURCE_HLSL,
 } glslang_source_t;
 
 /* EShClient counterpart */
 typedef enum {
-    SH_CLIENT_NONE,
-    SH_CLIENT_VULKAN,
-    SH_CLIENT_OPENGL,
+    GLSLANG_CLIENT_NONE,
+    GLSLANG_CLIENT_VULKAN,
+    GLSLANG_CLIENT_OPENGL,
 } glslang_client_t;
 
 /* EShTargetLanguage counterpart */
 typedef enum {
-    SH_TARGET_NONE,
-    SH_TARGET_SPV,
+    GLSLANG_TARGET_NONE,
+    GLSLANG_TARGET_SPV,
 } glslang_target_language_t;
 
 /* SH_TARGET_ClientVersion counterpart */
 typedef enum {
-    SH_TARGET_VULKAN_1_0 = (1 << 22),
-    SH_TARGET_VULKAN_1_1 = (1 << 22) | (1 << 12),
-    SH_TARGET_OPENGL_450 = 450,
+    GLSLANG_TARGET_VULKAN_1_0 = (1 << 22),
+    GLSLANG_TARGET_VULKAN_1_1 = (1 << 22) | (1 << 12),
+    GLSLANG_TARGET_OPENGL_450 = 450,
 } glslang_target_client_version_t;
 
 /* SH_TARGET_LanguageVersion counterpart */
 typedef enum {
-    SH_TARGET_SPV_1_0 = (1 << 16),
-    SH_TARGET_SPV_1_1 = (1 << 16) | (1 << 8),
-    SH_TARGET_SPV_1_2 = (1 << 16) | (2 << 8),
-    SH_TARGET_SPV_1_3 = (1 << 16) | (3 << 8),
-    SH_TARGET_SPV_1_4 = (1 << 16) | (4 << 8),
-    SH_TARGET_SPV_1_5 = (1 << 16) | (5 << 8),
+    GLSLANG_TARGET_SPV_1_0 = (1 << 16),
+    GLSLANG_TARGET_SPV_1_1 = (1 << 16) | (1 << 8),
+    GLSLANG_TARGET_SPV_1_2 = (1 << 16) | (2 << 8),
+    GLSLANG_TARGET_SPV_1_3 = (1 << 16) | (3 << 8),
+    GLSLANG_TARGET_SPV_1_4 = (1 << 16) | (4 << 8),
+    GLSLANG_TARGET_SPV_1_5 = (1 << 16) | (5 << 8),
 } glslang_target_language_version_t;
 
 /* EShExecutable counterpart */
-typedef enum { SH_EX_VERTEX_FRAGMENT, SH_EX_FRAGMENT } glslang_executable_t;
+typedef enum { GLSLANG_EX_VERTEX_FRAGMENT, GLSLANG_EX_FRAGMENT } glslang_executable_t;
 
 /* EShOptimizationLevel counterpart  */
 typedef enum {
-    SH_OPT_NO_GENERATION,
-    SH_OPT_NONE,
-    SH_OPT_SIMPLE,
-    SH_OPT_FULL,
+    GLSLANG_OPT_NO_GENERATION,
+    GLSLANG_OPT_NONE,
+    GLSLANG_OPT_SIMPLE,
+    GLSLANG_OPT_FULL,
 } glslang_optimization_level_t;
 
 /* EShTextureSamplerTransformMode counterpart */
 typedef enum {
-    SH_TEX_SAMP_TRANS_KEEP,
-    SH_TEX_SAMP_TRANS_UPGRADE_TEXTURE_REMOVE_SAMPLER,
+    GLSLANG_TEX_SAMP_TRANS_KEEP,
+    GLSLANG_TEX_SAMP_TRANS_UPGRADE_TEXTURE_REMOVE_SAMPLER,
 } glslang_texture_sampler_transform_mode_t;
 
 /* EShMessages counterpart */
 typedef enum {
-    SH_MSG_DEFAULT_BIT = 0,
-    SH_MSG_RELAXED_ERRORS_BIT = (1 << 0),
-    SH_MSG_SUPPRESS_WARNINGS_BIT = (1 << 1),
-    SH_MSG_AST_BIT = (1 << 2),
-    SH_MSG_SPV_RULES_BIT = (1 << 3),
-    SH_MSG_VULKAN_RULES_BIT = (1 << 4),
-    SH_MSG_ONLY_PREPROCESSOR_BIT = (1 << 5),
-    SH_MSG_READ_HLSL_BIT = (1 << 6),
-    SH_MSG_CASCADING_ERRORS_BIT = (1 << 7),
-    SH_MSG_KEEP_UNCALLED_BIT = (1 << 8),
-    SH_MSG_HLSL_OFFSETS_BIT = (1 << 9),
-    SH_MSG_DEBUG_INFO_BIT = (1 << 10),
-    SH_MSG_HLSL_ENABLE_16BIT_TYPES_BIT = (1 << 11),
-    SH_MSG_HLSL_LEGALIZATION_BIT = (1 << 12),
-    SH_MSG_HLSL_DX9_COMPATIBLE_BIT = (1 << 13),
-    SH_MSG_BUILTIN_SYMBOL_TABLE_BIT = (1 << 14),
+    GLSLANG_MSG_DEFAULT_BIT = 0,
+    GLSLANG_MSG_RELAXED_ERRORS_BIT = (1 << 0),
+    GLSLANG_MSG_SUPPRESS_WARNINGS_BIT = (1 << 1),
+    GLSLANG_MSG_AST_BIT = (1 << 2),
+    GLSLANG_MSG_SPV_RULES_BIT = (1 << 3),
+    GLSLANG_MSG_VULKAN_RULES_BIT = (1 << 4),
+    GLSLANG_MSG_ONLY_PREPROCESSOR_BIT = (1 << 5),
+    GLSLANG_MSG_READ_HLSL_BIT = (1 << 6),
+    GLSLANG_MSG_CASCADING_ERRORS_BIT = (1 << 7),
+    GLSLANG_MSG_KEEP_UNCALLED_BIT = (1 << 8),
+    GLSLANG_MSG_HLSL_OFFSETS_BIT = (1 << 9),
+    GLSLANG_MSG_DEBUG_INFO_BIT = (1 << 10),
+    GLSLANG_MSG_HLSL_ENABLE_16BIT_TYPES_BIT = (1 << 11),
+    GLSLANG_MSG_HLSL_LEGALIZATION_BIT = (1 << 12),
+    GLSLANG_MSG_HLSL_DX9_COMPATIBLE_BIT = (1 << 13),
+    GLSLANG_MSG_BUILTIN_SYMBOL_TABLE_BIT = (1 << 14),
 } glslang_messages_t;
 
 /* EShReflectionOptions counterpart */
 typedef enum {
-    SH_REFLECTION_DEFAULT_BIT = 0,
-    SH_REFLECTION_STRICT_ARRAY_SUFFIX_BIT = (1 << 0),
-    SH_REFLECTION_BASIC_ARRAY_SUFFIX_BIT = (1 << 1),
-    SH_REFLECTION_INTERMEDIATE_IOO_BIT = (1 << 2),
-    SH_REFLECTION_SEPARATE_BUFFERS_BIT = (1 << 3),
-    SH_REFLECTION_ALL_BLOCK_VARIABLES_BIT = (1 << 4),
-    SH_REFLECTION_UNWRAP_IO_BLOCKS_BIT = (1 << 5),
+    GLSLANG_REFLECTION_DEFAULT_BIT = 0,
+    GLSLANG_REFLECTION_STRICT_ARRAY_SUFFIX_BIT = (1 << 0),
+    GLSLANG_REFLECTION_BASIC_ARRAY_SUFFIX_BIT = (1 << 1),
+    GLSLANG_REFLECTION_INTERMEDIATE_IOO_BIT = (1 << 2),
+    GLSLANG_REFLECTION_SEPARATE_BUFFERS_BIT = (1 << 3),
+    GLSLANG_REFLECTION_ALL_BLOCK_VARIABLES_BIT = (1 << 4),
+    GLSLANG_REFLECTION_UNWRAP_IO_BLOCKS_BIT = (1 << 5),
 } glslang_reflection_options_t;
 
 /* EProfile counterpart (from Versions.h) */
 typedef enum {
-    SH_BAD_PROFILE = 0,
-    SH_NO_PROFILE = (1 << 0),
-    SH_CORE_PROFILE = (1 << 1),
-    SH_COMPATIBILITY_PROFILE = (1 << 2),
-    SH_ES_PROFILE = (1 << 3)
+    GLSLANG_BAD_PROFILE = 0,
+    GLSLANG_NO_PROFILE = (1 << 0),
+    GLSLANG_CORE_PROFILE = (1 << 1),
+    GLSLANG_COMPATIBILITY_PROFILE = (1 << 2),
+    GLSLANG_ES_PROFILE = (1 << 3)
 } glslang_profile_t;
 
 #endif