[Libreoffice-commits] core.git: external/collada2gltf

Zolnai Tamás tamas.zolnai at collabora.com
Fri Aug 15 07:52:53 PDT 2014


 external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 028c9662af563d22303b669072ac21195ea955b1
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Aug 15 16:50:35 2014 +0200

    collada2gltf: compatibility fix: OpenGL ES 2.0 is enough
    
    That's why it was worked in some case, when OpenGL ES is
    available then it is the default and not the GLSL 1.1.
    
    Change-Id: I60d545e76115396433df8dc300bc13935099c776

diff --git a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 b/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
index 5b259c5..0a09385 100644
--- a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
+++ b/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1
@@ -6,7 +6,7 @@ diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/
          
          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->_declarations = "#ifdef GL_ES_VERSION_2_0\n#version 100 es\n#else\n#version 130\n#endif\nprecision highp float;\n";
              this->_body = "void main(void) {\n";
              this->_profile = profile;
          }


More information about the Libreoffice-commits mailing list