diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-17 09:11:05 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-17 09:12:39 +0200 |
| commit | d4fccd7d2c22024800482ff2e3179f700fc83a9f (patch) | |
| tree | 1d0e5ef03a7a98fd27a3f6bdc0c90347feda345e | |
| parent | remove executable bits (diff) | |
| download | core-d4fccd7d2c22024800482ff2e3179f700fc83a9f.tar.gz core-d4fccd7d2c22024800482ff2e3179f700fc83a9f.zip | |
collada2gltf: it seems better not to add #version to glTF shader files
Here only handle precision. Using precision unconditionally
causing problems when shader source is compiled with GLSL 1.2.
The #version dircetives can be added by the glTF parser.
For example libgltf implementation:
https://gerrit.libreoffice.org/gitweb?p=libgltf.git;a=commit;
h=e4544a8b5ca8470a96bf28c6ccdb7461e78ca293
Change-Id: I934cdfa8651a8787fbcd476cea9892bf7e89dd11
| -rw-r--r-- | external/collada2gltf/patches/shader_compatibility.patch.1 | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/external/collada2gltf/patches/shader_compatibility.patch.1 b/external/collada2gltf/patches/shader_compatibility.patch.1 index 85413361c055..948d8caa5f88 100644 --- a/external/collada2gltf/patches/shader_compatibility.patch.1 +++ b/external/collada2gltf/patches/shader_compatibility.patch.1 @@ -1,12 +1,14 @@ 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 @@ +--- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-08-17 08:57:52.187210533 +0200 ++++ collada2gltf/shaders/commonProfileShaders.cpp 2014-08-17 08:59:48.427215491 +0200 +@@ -367,7 +367,9 @@ public: GLSLShader(shared_ptr <GLTFProfile> profile) { - this->_declarations = "precision highp float;\n";; -+ this->_declarations = "#ifdef GL_ES_VERSION_2_0\n#version 100\n#else\n#version 130\n#endif\nprecision highp float;\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"; this->_profile = profile; } |