File tree 2 files changed +11
-0
lines changed
2 files changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -10,6 +10,7 @@ target_compile_features(Plugin_GLSLangProgramManager PRIVATE cxx_std_17)
10
10
if (ANDROID)
11
11
target_include_directories (Plugin_GLSLangProgramManager SYSTEM PRIVATE
12
12
${ANDROID_NDK} /sources /third_party/shaderc/third_party/glslang
13
+ ${ANDROID_NDK} /sources /third_party/shaderc/obj/local/${ANDROID_ABI} /include /
13
14
${ANDROID_NDK} /sources /third_party/shaderc/third_party/)
14
15
target_link_libraries (Plugin_GLSLangProgramManager PUBLIC OgreMain
15
16
${ANDROID_NDK} /sources /third_party/shaderc/libs/c++_static/${ANDROID_ABI} /libshaderc.a)
Original file line number Diff line number Diff line change 10
10
11
11
#include < glslang/Public/ShaderLang.h>
12
12
#include < glslang/SPIRV/GlslangToSpv.h>
13
+ #ifndef GLSLANG_MINOR_VERSION
14
+ #include < glslang/build_info.h>
15
+ #else
16
+ #define GLSLANG_VERSION_MAJOR 10
17
+ #endif
13
18
#include " gl_types.h"
14
19
15
20
namespace
@@ -457,7 +462,12 @@ void GLSLangProgram::prepareImpl()
457
462
}
458
463
}
459
464
465
+ #if GLSLANG_VERSION_MAJOR < 14
466
+ auto utype = program.getUniformTType (i);
467
+ #else
460
468
auto utype = (const TType*)program.getUniformTType (i);
469
+ #endif
470
+
461
471
GpuConstantDefinition def;
462
472
def.logicalIndex = isUBO ? uoffset : utype->getQualifier ().layoutLocation ;
463
473
def.arraySize = program.getUniformArraySize (i);
You can’t perform that action at this time.
0 commit comments