diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-05-27 16:48:30 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-11 19:27:30 +0200 |
| commit | 093c80e1a67d2d387729ddaa9e72bea162e52993 (patch) | |
| tree | e244ee43eadaf5e686f330bd209370c7434ebadf /external | |
| parent | 7e50c6ab24f0cadffe43073c3410cd121d578fec (diff) | |
Patching libgltf: the passed texture bitmaps are RGBA buffers
(cherry picked from commit 9c830b09a033a4716bbc54bfe59f46e22cafe677)
Conflicts:
external/libgltf/UnpackedTarball_libgltf.mk
Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84
Diffstat (limited to 'external')
| -rw-r--r-- | external/libgltf/UnpackedTarball_libgltf.mk | 1 | ||||
| -rw-r--r-- | external/libgltf/patches/rgba_textures.patch | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk index 33889fb49089..ce5ad79141a7 100644 --- a/external/libgltf/UnpackedTarball_libgltf.mk +++ b/external/libgltf/UnpackedTarball_libgltf.mk @@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\ external/libgltf/patches/include_path_glew.patch \ external/libgltf/patches/include_path_freetype.patch \ external/libgltf/patches/openmp-disable.patch \ + external/libgltf/patches/rgba_textures.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libgltf/patches/rgba_textures.patch b/external/libgltf/patches/rgba_textures.patch new file mode 100644 index 000000000000..b22089475038 --- /dev/null +++ b/external/libgltf/patches/rgba_textures.patch @@ -0,0 +1,12 @@ +diff -ur libgltf.org/src/Texture.cpp libgltf/src/Texture.cpp +--- libgltf.org/src/Texture.cpp 2014-05-27 16:40:18.625920865 +0200 ++++ libgltf/src/Texture.cpp 2014-05-27 16:41:45.601917179 +0200 +@@ -60,7 +60,7 @@ + bool Texture::loadTexture2DFromBuffer(unsigned char* buffer, int width,
+ int height)
+ {
+- GLenum format = GL_BGRA;
++ GLenum format = GL_RGBA;
+
+ createFromData(buffer, width, height, format, false);
+
|