diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-07-06 03:38:00 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-07-06 03:43:07 +0200 |
| commit | 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba (patch) | |
| tree | 80cb33fc0ce7de34074b39f66a2ab535895e1184 /external/libgltf | |
| parent | 714866927951e2b3ec858349449c9dfe181b1542 (diff) | |
fix OpenGL error in libgltf
The code tried to free a program as a shader
Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414
Diffstat (limited to 'external/libgltf')
| -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, 13 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index f1e618c23b80..5c46d5425544 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -33,6 +33,7 @@ $(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 new file mode 100644 index 000000000000..b5dbc3b64542 --- /dev/null +++ b/external/libgltf/patches/wrong_shader_program_delete.patch.1 @@ -0,0 +1,12 @@ +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) |