From 3323c4d3413341c9d144cadfa43e6506d15dda00 Mon Sep 17 00:00:00 2001
From: "bsalomon@google.com"
 <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Tue, 20 Aug 2013 13:48:33 +0000
Subject: [PATCH] Revert "Changed rules about sized internal formats on GLES3."

This reverts commit r10806.

git-svn-id: http://skia.googlecode.com/svn/trunk@10811 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 src/gpu/gl/GrGLUtil.cpp |  3 ---
 src/gpu/gl/GrGLUtil.h   |  1 -
 src/gpu/gl/GrGpuGL.cpp  | 13 ++++---------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp
index 99efeaf6a6..8440c574ea 100644
--- a/src/gpu/gl/GrGLUtil.cpp
+++ b/src/gpu/gl/GrGLUtil.cpp
@@ -206,9 +206,6 @@ GrGLVendor GrGLGetVendorFromString(const char* vendorString) {
         if (0 == strcmp(vendorString, "Intel")) {
             return kIntel_GrGLVendor;
         }
-        if (0 == strcmp(vendorString, "Qualcomm")) {
-            return kQualcomm_GrGLVendor;
-        }
     }
     return kOther_GrGLVendor;
 }
diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/gl/GrGLUtil.h
index 9a82b0b97a..b8a96e5140 100644
--- a/src/gpu/gl/GrGLUtil.h
+++ b/src/gpu/gl/GrGLUtil.h
@@ -23,7 +23,6 @@ enum GrGLVendor {
     kARM_GrGLVendor,
     kImagination_GrGLVendor,
     kIntel_GrGLVendor,
-    kQualcomm_GrGLVendor,
 
     kOther_GrGLVendor
 };
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index c10df6c7e8..c95edb740b 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -610,14 +610,9 @@ bool GrGpuGL::uploadTexData(const GrGLTexture::Desc& desc,
     GrGLenum internalFormat;
     GrGLenum externalFormat;
     GrGLenum externalType;
-    // glTexStorage requires sized internal formats on both desktop and ES. ES2
-    // requires an unsized format for glTexImage. ES3 has relaxed this restriction.
-    // Qualcomm Adreno drivers seem to have issues with the relaxed ES3 rules.
-    bool useSizedInternalFormat = useTexStorage ||
-                                  kDesktop_GrGLBinding == this->glBinding() ||
-                                  (this->glVersion() >= GR_GL_VER(3,0) &&
-                                   kQualcomm_GrGLVendor != this->glContext().info().vendor());
-    if (!this->configToGLFormats(dataConfig, useSizedInternalFormat, &internalFormat,
+    // glTexStorage requires sized internal formats on both desktop and ES. ES
+    // glTexImage requires an unsized format.
+    if (!this->configToGLFormats(dataConfig, useTexStorage, &internalFormat,
                                  &externalFormat, &externalType)) {
         return false;
     }
@@ -814,7 +809,7 @@ bool GrGpuGL::createRenderTargetObjects(int width, int height,
         if (!desc->fRTFBOID ||
             !desc->fMSColorRenderbufferID ||
             !this->configToGLFormats(desc->fConfig,
-                                     // ES2 and ES3 require sized internal formats for rb storage.
+                                     // GLES requires sized internal formats
                                      kES_GrGLBinding == this->glBinding(),
                                      &msColorFormat,
                                      NULL,