Revert "Changed rules about sized internal formats on GLES3."

This reverts commit r10806.

git-svn-id: http://skia.googlecode.com/svn/trunk/src@10811 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gpu/gl/GrGLUtil.cpp b/gpu/gl/GrGLUtil.cpp
index 99efeaf..8440c57 100644
--- a/gpu/gl/GrGLUtil.cpp
+++ b/gpu/gl/GrGLUtil.cpp
@@ -206,9 +206,6 @@
         if (0 == strcmp(vendorString, "Intel")) {
             return kIntel_GrGLVendor;
         }
-        if (0 == strcmp(vendorString, "Qualcomm")) {
-            return kQualcomm_GrGLVendor;
-        }
     }
     return kOther_GrGLVendor;
 }
diff --git a/gpu/gl/GrGLUtil.h b/gpu/gl/GrGLUtil.h
index 9a82b0b..b8a96e5 100644
--- a/gpu/gl/GrGLUtil.h
+++ b/gpu/gl/GrGLUtil.h
@@ -23,7 +23,6 @@
     kARM_GrGLVendor,
     kImagination_GrGLVendor,
     kIntel_GrGLVendor,
-    kQualcomm_GrGLVendor,
 
     kOther_GrGLVendor
 };
diff --git a/gpu/gl/GrGpuGL.cpp b/gpu/gl/GrGpuGL.cpp
index c10df6c..c95edb7 100644
--- a/gpu/gl/GrGpuGL.cpp
+++ b/gpu/gl/GrGpuGL.cpp
@@ -610,14 +610,9 @@
     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 @@
         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,