diff options
author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-15 17:04:29 +0200 |
---|---|---|
committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-15 17:05:41 +0200 |
commit | 1ea4f163c5a2f531dcfda7899b322636a735c618 (patch) | |
tree | f271a788d2792bb01f53e14545b9d1a00b34343d /external | |
parent | 38cbb4c7176d85973c4945a10a262bb487388246 (diff) |
collada2gltf: add a better name to this patch
Change-Id: Ie8fb4ff71a683e986b9fec861608590cadee8612
Diffstat (limited to 'external')
-rw-r--r-- | external/collada2gltf/UnpackedTarball_collada2gltf.mk | 2 | ||||
-rw-r--r-- | external/collada2gltf/patches/shader_compatibility.patch.1 (renamed from external/collada2gltf/patches/fix_linux_shader_compiling.patch.1) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/external/collada2gltf/UnpackedTarball_collada2gltf.mk b/external/collada2gltf/UnpackedTarball_collada2gltf.mk index 00ef562b74f5..439e86bb0f04 100644 --- a/external/collada2gltf/UnpackedTarball_collada2gltf.mk +++ b/external/collada2gltf/UnpackedTarball_collada2gltf.mk @@ -18,7 +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 \ + external/collada2gltf/patches/shader_compatibility.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 b/external/collada2gltf/patches/shader_compatibility.patch.1 index 0a09385646b7..85413361c055 100644 --- a/external/collada2gltf/patches/fix_linux_shader_compiling.patch.1 +++ b/external/collada2gltf/patches/shader_compatibility.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_2_0\n#version 100 es\n#else\n#version 130\n#endif\nprecision 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->_body = "void main(void) {\n"; this->_profile = profile; } |