Revert of Use unorm shorts for texture coordinates when rendering text.

src/gpu/gl/GrGLVertexArray.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLVertexArray.h"
 #include "GrGLGpu.h"
 
 struct AttribLayout {
     GrGLint     fCount;
     GrGLenum    fType;
     GrGLboolean fNormalized;  // Only used by floating point types.
 };
 
 static const AttribLayout gLayouts[kGrVertexAttribTypeCount] = {
     {1, GR_GL_FLOAT, false},         // kFloat_GrVertexAttribType
     {2, GR_GL_FLOAT, false},         // kVec2f_GrVertexAttribType
     {3, GR_GL_FLOAT, false},         // kVec3f_GrVertexAttribType
     {4, GR_GL_FLOAT, false},         // kVec4f_GrVertexAttribType
     {1, GR_GL_UNSIGNED_BYTE, true},  // kUByte_GrVertexAttribType
     {4, GR_GL_UNSIGNED_BYTE, true},  // kVec4ub_GrVertexAttribType
-    {2, GR_GL_UNSIGNED_SHORT, true},         // kVec2s_GrVertexAttribType
+    {2, GR_GL_SHORT, false},         // kVec2s_GrVertexAttribType
     {1, GR_GL_INT, false},           // kInt_GrVertexAttribType
     {1, GR_GL_UNSIGNED_INT, false},  // kUint_GrVertexAttribType
 };
 
 GR_STATIC_ASSERT(0 == kFloat_GrVertexAttribType);
 GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType);
 GR_STATIC_ASSERT(2 == kVec3f_GrVertexAttribType);
 GR_STATIC_ASSERT(3 == kVec4f_GrVertexAttribType);
 GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
 GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType);
-GR_STATIC_ASSERT(6 == kVec2us_GrVertexAttribType);
+GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType);
 GR_STATIC_ASSERT(7 == kInt_GrVertexAttribType);
 GR_STATIC_ASSERT(8 == kUint_GrVertexAttribType);
 
 void GrGLAttribArrayState::set(GrGLGpu* gpu,
                                int index,
                                GrGLuint vertexBufferID,
                                GrVertexAttribType type,
                                GrGLsizei stride,
                                GrGLvoid* offset) {
     SkASSERT(index >= 0 && index < fAttribArrayStates.count());
@@ skipping 83 matching lines @@
 void GrGLVertexArray::notifyIndexBufferDelete(GrGLuint bufferID) {
     if (fIndexBufferIDIsValid && bufferID == fIndexBufferID) {
         fIndexBufferID = 0;
     }
  }
 
 void GrGLVertexArray::invalidateCachedState() {
     fAttribArrays.invalidate();
     fIndexBufferIDIsValid = false;
 }