mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

collada2gltf: fix compatibility issues of *.kmz/*.dae files under linux

Browse Source 
It seems under linux we need to specify the version number
explicitly, because otherwise shader compiler will use GLSL 1.1
and will fail. Base line is GLSL 1.3 or OpenGL ES 3.0.

Change-Id: Ie143275ade8d6989fda055ab96943b25ef220e9d
This commit is contained in:
Zolnai Tamás
2014-08-15 15:42:19 +02:00
parent 971e230a99
commit 2a8da8a548
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/collada2gltf/UnpackedTarball_collada2gltf.mk vendored
View File

@@ -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:

13
external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 vendored Normal file
View File

@@ -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~