From a9d0f1da9e4fa1ce614cc553e8bf401a81d8c0cc Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Mon, 9 Jul 2012 21:49:50 -0400
Subject: [PATCH] Backout a516a86f854d (bug 767064) due to Android M1 orange.

---
 content/canvas/src/WebGLContext.cpp | 29 ++++---------------
 gfx/gl/GLContext.cpp                | 45 ++++++++++-------------------
 gfx/thebes/gfxPlatform.cpp          |  2 +-
 3 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp
index a95052fd6275..dad31815025e 100644
--- a/content/canvas/src/WebGLContext.cpp
+++ b/content/canvas/src/WebGLContext.cpp
@@ -407,33 +407,16 @@ WebGLContext::SetDimensions(PRInt32 width, PRInt32 height)
     }
 
     if (!mOptions.alpha) {
+        // Select 565; we won't/shouldn't hit this on the desktop,
+        // but let mobile know we're ok with it.
+        format.red = 5;
+        format.green = 6;
+        format.blue = 5;
+
         format.alpha = 0;
         format.minAlpha = 0;
     }
 
-    // Don't do this on Windows, since we might get a 565 config from ANGLE
-    // and end up causing problems with a surface depth mismatch
-#ifndef XP_WIN
-    if (gfxPlatform::GetPlatform()->GetScreenDepth() == 16) {
-        // Select 4444 or 565 on 16-bit displays; we won't/shouldn't
-        // hit this on the desktop, but let mobile know we're ok with
-        // it.  Note that we don't just set this to 4440 if no alpha,
-        // because that might cause us to choose 4444 anyway and we
-        // don't want that.
-        if (mOptions.alpha) {
-            format.red = 4;
-            format.green = 4;
-            format.blue = 4;
-            format.alpha = 4;
-        } else {
-            format.red = 5;
-            format.green = 6;
-            format.blue = 5;
-            format.alpha = 0;
-        }
-    }
-#endif
-
     bool forceMSAA =
         Preferences::GetBool("webgl.msaa-force", false);
 
diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 2efcd804ecc6..4325eac2756e 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -1278,48 +1278,35 @@ GLContext::ChooseGLFormats(ContextFormat& aCF)
 {
     GLFormats formats;
 
-    // If we're on ES2 hardware and we have an explicit request for 16 bits of color or less
-    // OR we don't support full 8-bit color, return a 4444 or 565 format.
-    if (mIsGLES2 && (aCF.colorBits() <= 16 || !IsExtensionSupported(OES_rgb8_rgba8))) {
-        if (aCF.alpha) {
+    if (aCF.alpha) {
+        if (mIsGLES2 && IsExtensionSupported(EXT_texture_format_BGRA8888)) {
+            formats.texColor = LOCAL_GL_BGRA;
+        } else {
             formats.texColor = LOCAL_GL_RGBA;
-            formats.texColorType = LOCAL_GL_UNSIGNED_SHORT_4_4_4_4;
-            formats.rbColor = LOCAL_GL_RGBA4;
+        }
 
+        if (mIsGLES2 && !IsExtensionSupported(OES_rgb8_rgba8)) {
+            formats.rbColor = LOCAL_GL_RGBA4;
             aCF.red = aCF.green = aCF.blue = aCF.alpha = 4;
         } else {
-            formats.texColor = LOCAL_GL_RGB;
-            formats.texColorType = LOCAL_GL_UNSIGNED_SHORT_5_6_5;
+            formats.rbColor = LOCAL_GL_RGBA8;
+            aCF.red = aCF.green = aCF.blue = aCF.alpha = 8;
+        }
+    } else {
+        formats.texColor = LOCAL_GL_RGB;
+        if (mIsGLES2 && !IsExtensionSupported(OES_rgb8_rgba8)) {
             formats.rbColor = LOCAL_GL_RGB565;
-
             aCF.red = 5;
             aCF.green = 6;
             aCF.blue = 5;
-            aCF.alpha = 0;
-        }   
-    } else {
-        formats.texColorType = LOCAL_GL_UNSIGNED_BYTE;
-
-        if (aCF.alpha) {
-            // prefer BGRA8888 on ES2 hardware; if the extension is supported, it
-            // should be faster.
-            if (mIsGLES2 && IsExtensionSupported(EXT_texture_format_BGRA8888)) {
-                formats.texColor = LOCAL_GL_BGRA;
-            } else {
-                formats.texColor = LOCAL_GL_RGBA;
-            }
-
-            formats.rbColor = LOCAL_GL_RGBA8;
-
-            aCF.red = aCF.green = aCF.blue = aCF.alpha = 8;
         } else {
-            formats.texColor = LOCAL_GL_RGB;
             formats.rbColor = LOCAL_GL_RGB8;
-
             aCF.red = aCF.green = aCF.blue = 8;
-            aCF.alpha = 0;
         }
+        aCF.alpha = 0;
     }
+    formats.texColorType = LOCAL_GL_UNSIGNED_BYTE;
+
 
     GLsizei samples = aCF.samples;
 
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
index 95550771979b..fe9e5703d6a5 100644
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1458,7 +1458,7 @@ gfxPlatform::GetLog(eGfxLog aWhichLog)
 int
 gfxPlatform::GetScreenDepth() const
 {
-    NS_WARNING("GetScreenDepth not implemented on this platform -- returning 0!");
+    MOZ_ASSERT(false, "Not implemented on this platform");
     return 0;
 }