Properly support BGRA textures on desktop GL

On GLES2, you must have internalFormat == format. That's what WebKit passes to
WebGraphicsContext3DInProcessImpl. On Desktop GL, internalFormat must be one of
RGBA* for BGRA textures. This patch does the proper translation.

BUG=None
TEST=WebKit compositor


Review URL: http://codereview.chromium.org/8202019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104674 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 0 deletions

diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
index ffcd46d..ae8c4c5 100644
--- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
+++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc
@@ -1331,6 +1331,17 @@ void WebGraphicsContext3DInProcessImpl::texImage2D(
     WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border,
     WGC3Denum format, WGC3Denum type, const void* pixels) {
   makeContextCurrent();
+  if (gfx::GetGLImplementation() != gfx::kGLImplementationEGLGLES2) {
+    if (format == GL_BGRA_EXT && internalFormat == GL_BGRA_EXT) {
+      internalFormat = GL_RGBA;
+    } else if (type == GL_FLOAT) {
+      if (format == GL_RGBA) {
+        internalFormat = GL_RGBA32F_ARB;
+      } else if (format == GL_RGB) {
+        internalFormat = GL_RGB32F_ARB;
+      }
+    }
+  }
   glTexImage2D(target, level, internalFormat,
                width, height, border, format, type, pixels);
 }