diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-26 22:12:01 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-11-27 12:50:38 +0100 |
| commit | f70e5a711b90f28db57883db023ff30b5e3ff6da (patch) | |
| tree | 20aff3be753642c44a77008b81e55e40846159a9 /external | |
| parent | ad03461b2fc7df65116823ec0bee80e60e30393b (diff) | |
collada2gltf: Force GLSL version
Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3
(cherry picked from commit 76b76049e57319a772b863519d8bbc57460eb6f4)
Diffstat (limited to 'external')
| -rw-r--r-- | external/collada2gltf/UnpackedTarball_collada2gltf.mk | 1 | ||||
| -rw-r--r-- | external/collada2gltf/patches/collada2gltf.add-glsl-version.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 16b7fed788b5..e01ca53d287b 100644 --- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk +++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk @@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,collada2gltf,\ external/collada2gltf/patches/collada2gltf.fix-memory-leak2.patch.1 \ external/collada2gltf/patches/shader_compatibility.patch.1 \ external/collada2gltf/patches/drop_tr1_support.patch.1 \ + external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 new file mode 100644 index 000000000000..5da297836064 --- /dev/null +++ b/external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 @@ -0,0 +1,13 @@ +diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp +--- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-11-26 22:05:07.445842977 +0100 ++++ collada2gltf/shaders/commonProfileShaders.cpp 2014-11-26 22:07:24.313844588 +0100 +@@ -367,7 +367,8 @@ + public: + + GLSLShader(shared_ptr <GLTFProfile> profile) { +- this->_declarations = "#ifdef GL_ES_VERSION_2_0\n"; ++ this->_declarations = "#version 130\n"; ++ this->_declarations += "#ifdef GL_ES_VERSION_2_0\n"; + this->_declarations += "precision highp float;\n"; + this->_declarations += "#endif\n"; + this->_body = "void main(void) {\n"; |