From 492e99e1c3fb974a66ee9ff0d4d406bb2f05c636 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Tue, 10 Dec 2013 22:18:00 -0800 Subject: [PATCH] Android fixed RGBA16F texture format. --- src/glcontext_egl.cpp | 1 + src/renderer_gl.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/glcontext_egl.cpp b/src/glcontext_egl.cpp index 60fe4f49..cd865803 100644 --- a/src/glcontext_egl.cpp +++ b/src/glcontext_egl.cpp @@ -18,6 +18,7 @@ namespace bgfx void GlContext::create(uint32_t _width, uint32_t _height) { + BX_UNUSED(_width, _height); EGLNativeDisplayType ndt = EGL_DEFAULT_DISPLAY; EGLNativeWindowType nwt = (EGLNativeWindowType)NULL; # if BX_PLATFORM_WINDOWS diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 095ab78d..4de3131c 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1272,6 +1272,10 @@ namespace bgfx static void texImage(GLenum _target, GLint _level, GLint _internalFormat, GLsizei _width, GLsizei _height, GLsizei _depth, GLint _border, GLenum _format, GLenum _type, const GLvoid* _data) { +#if !BGFX_CONFIG_RENDERER_OPENGL + _internalFormat = _format; // GLES wants internal format to match format... +#endif // !BGFX_CONFIG_RENDERER_OPENGL + #if BGFX_CONFIG_RENDERER_OPENGL|BGFX_CONFIG_RENDERER_OPENGLES3 if (_target == GL_TEXTURE_3D) {