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

Merge pull request #2079 from dneto0/warnings

Browse Source 
Avoid enum-compare warning, missing cases in switch
This commit is contained in:
John Kessenich 2020-02-06 09:12:50 -07:00 committed by GitHub
commit 95c414ffee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glslang/CInterface/glslang_c_interface.cpp
View File

@ -42,18 +42,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "glslang/Include/ResourceLimits.h" #include "glslang/Include/ResourceLimits.h"
#include "glslang/MachineIndependent/Versions.h" #include "glslang/MachineIndependent/Versions.h"
static_assert(GLSLANG_STAGE_COUNT == EShLangCount, ""); static_assert(int(GLSLANG_STAGE_COUNT) == EShLangCount, "");
static_assert(GLSLANG_STAGE_MASK_COUNT == EShLanguageMaskCount, ""); static_assert(int(GLSLANG_STAGE_MASK_COUNT) == EShLanguageMaskCount, "");
static_assert(GLSLANG_SOURCE_COUNT == glslang::EShSourceCount, ""); static_assert(int(GLSLANG_SOURCE_COUNT) == glslang::EShSourceCount, "");
static_assert(GLSLANG_CLIENT_COUNT == glslang::EShClientCount, ""); static_assert(int(GLSLANG_CLIENT_COUNT) == glslang::EShClientCount, "");
static_assert(GLSLANG_TARGET_COUNT == glslang::EShTargetCount, ""); static_assert(int(GLSLANG_TARGET_COUNT) == glslang::EShTargetCount, "");
static_assert(GLSLANG_TARGET_CLIENT_VERSION_COUNT == glslang::EShTargetClientVersionCount, ""); static_assert(int(GLSLANG_TARGET_CLIENT_VERSION_COUNT) == glslang::EShTargetClientVersionCount, "");
static_assert(GLSLANG_TARGET_LANGUAGE_VERSION_COUNT == glslang::EShTargetLanguageVersionCount, ""); static_assert(int(GLSLANG_TARGET_LANGUAGE_VERSION_COUNT) == glslang::EShTargetLanguageVersionCount, "");
static_assert(GLSLANG_OPT_LEVEL_COUNT == EshOptLevelCount, ""); static_assert(int(GLSLANG_OPT_LEVEL_COUNT) == EshOptLevelCount, "");
static_assert(GLSLANG_TEX_SAMP_TRANS_COUNT == EShTexSampTransCount, ""); static_assert(int(GLSLANG_TEX_SAMP_TRANS_COUNT) == EShTexSampTransCount, "");
static_assert(GLSLANG_MSG_COUNT == EShMsgCount, ""); static_assert(int(GLSLANG_MSG_COUNT) == EShMsgCount, "");
static_assert(GLSLANG_REFLECTION_COUNT == EShReflectionCount, ""); static_assert(int(GLSLANG_REFLECTION_COUNT) == EShReflectionCount, "");
static_assert(GLSLANG_PROFILE_COUNT == EProfileCount, ""); static_assert(int(GLSLANG_PROFILE_COUNT) == EProfileCount, "");
typedef struct glslang_shader_s { typedef struct glslang_shader_s {
glslang::TShader* shader; glslang::TShader* shader;
@ -314,6 +314,8 @@ static EProfile c_shader_profile(glslang_profile_t profile)
return ECompatibilityProfile; return ECompatibilityProfile;
case GLSLANG_ES_PROFILE: case GLSLANG_ES_PROFILE:
return EEsProfile; return EEsProfile;
case GLSLANG_PROFILE_COUNT: // Should not use this
break;
} }
return EProfile(); return EProfile();