diff options
| -rw-r--r-- | external/collada2gltf/UnpackedTarball_collada2gltf.mk | 1 | ||||
| -rw-r--r-- | external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk index 15a1a545cdcb..00ef562b74f5 100644 --- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk +++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk @@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ external/collada2gltf/patches/collada2gltf.new-delete-mismatch.patch.1 \ external/collada2gltf/patches/collada2gltf.fix-memory-leak.patch.1 \ external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \ + external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 b/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 new file mode 100644 index 000000000000..a4813c163c66 --- /dev/null +++ b/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 @@ -0,0 +1,13 @@ +diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp +--- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-08-15 15:21:51.839323947 +0200 ++++ collada2gltf/shaders/commonProfileShaders.cpp 2014-08-15 15:23:36.931327850 +0200 +@@ -367,7 +367,7 @@ + public: + + GLSLShader(shared_ptr <GLTFProfile> profile) { +- this->_declarations = "precision highp float;\n";; ++ this->_declarations = "#ifdef GL_ES_VERSION_3_0\n#version 300 es\n#else\n#version 130\n#endif\nprecision highp float;\n"; + this->_body = "void main(void) {\n"; + this->_profile = profile; + } +Only in collada2gltf/shaders: commonProfileShaders.cpp~ |