avmedia/source/opengl/oglplayer.cxx | 3 ++-
external/libgltf/UnpackedTarball_libgltf.mk | 1 +
external/libgltf/patches/rgba_textures.patch | 12 ++++++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 7c0dc577a4bae2cd398894a68e2edfe966c9ae26
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date: Tue May 27 20:12:59 2014 +0200
glTF rendering: fix texture problems
It seems we need mirroring.
Change-Id: Id9ad7041eb09ec773e4174cb68d34a65a2c473fe
diff --git a/avmedia/source/opengl/oglplayer.cxx
b/avmedia/source/opengl/oglplayer.cxx
index 86da386..79c78f1 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -88,7 +88,8 @@ bool OGLPlayer::create( const OUString& rURL )
GraphicFilter aFilter;
Graphic aGraphic;
aFilter.ImportGraphic(aGraphic, INetURLObject(sFilesURL));
- const BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+ BitmapEx aBitmapEx = aGraphic.GetBitmapEx();
+ aBitmapEx.Mirror(BMP_MIRROR_VERT);
rFile.buffer =
(char*)OpenGLHelper::ConvertBitmapExToRGBABuffer(aBitmapEx);
rFile.imagewidth = aBitmapEx.GetSizePixel().Width();
rFile.imageheight = aBitmapEx.GetSizePixel().Height();
commit 9c830b09a033a4716bbc54bfe59f46e22cafe677
Author: Zolnai Tamás <tamas.zol...@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 99609ba..65262ea 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/include_path_freetype.patch \
external/libgltf/patches/openmp-disable.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);
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
