diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-06 05:05:45 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-06 05:05:45 +0200 |
| commit | 237426e104d1fe8e9e03296e05576bf411ea7451 (patch) | |
| tree | 104a862546cbe3e1ce0234bc97da39c590083cee | |
| parent | a6da91bd2d19632cb131a732b76559461eed8ee8 (diff) | |
Revert "fix OpenGL error in libgltf"
New tarball already contains the fix for it.
This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | external/libgltf/patches/wrong_shader_program_delete.patch.1 | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 5c46d5425544..f1e618c23b80 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -33,7 +33,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/comma_at_end_of_enumerator_list.patch \ external/libgltf/patches/extra_semicolon.patch \ external/libgltf/patches/stop_a_potential_memory_leak.patch \ - external/libgltf/patches/wrong_shader_program_delete.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/wrong_shader_program_delete.patch.1 b/external/libgltf/patches/wrong_shader_program_delete.patch.1 deleted file mode 100644 index b5dbc3b64542..000000000000 --- a/external/libgltf/patches/wrong_shader_program_delete.patch.1 +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur libgltf.org/src/Shaders.cpp libgltf/src/Shaders.cpp ---- libgltf.org/src/Shaders.cpp 2014-07-06 03:33:15.205313955 +0200 -+++ libgltf/src/Shaders.cpp 2014-07-06 03:34:33.079310767 +0200 -@@ -144,7 +144,7 @@ - - void ShaderProgram::deleteProgram(unsigned int programId) - { -- glDeleteShader(programId); -+ glDeleteProgram(programId); - } - - void ShaderProgram::useProgram(unsigned int programId) |