[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk  |    1 +
 external/libgltf/patches/rgba_textures.patch |   12 ++++++++++++
 2 files changed, 13 insertions(+)

New commits:
commit 777c7360f77adf833878a83cbd464bda3374da11
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Tue May 27 16:48:30 2014 +0200

    Patching libgltf: the passed texture bitmaps are RGBA buffers
    
    Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index acfbab0..7a0d91a 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/free_file_buffers.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 0000000..b220894
--- /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);
+