[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - external/collada2gltf

[Matúš Kukan]

 external/collada2gltf/UnpackedTarball_collada2gltf.mk               |    1 
 external/collada2gltf/patches/collada2gltf.add-glsl-version.patch.1 |   13 ++++++++++
 2 files changed, 14 insertions(+)

New commits:
commit f70e5a711b90f28db57883db023ff30b5e3ff6da
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Wed Nov 26 22:12:01 2014 +0100

    collada2gltf: Force GLSL version
    
    Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3
    (cherry picked from commit 76b76049e57319a772b863519d8bbc57460eb6f4)

diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk
index 16b7fed..e01ca53 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 0000000..5da2978
--- /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";