| Index: src/gpu/gl/GrGLVertexArray.h
|
| diff --git a/src/gpu/gl/GrGLVertexArray.h b/src/gpu/gl/GrGLVertexArray.h
|
| index ebdb681e34e408095f214354114d97aba260e04f..0a5dea6a1ebf22830b3d4e7bcf0fab090ad08947 100644
|
| --- a/src/gpu/gl/GrGLVertexArray.h
|
| +++ b/src/gpu/gl/GrGLVertexArray.h
|
| @@ -24,7 +24,6 @@ struct GrGLAttribLayout {
|
| };
|
|
|
| static inline const GrGLAttribLayout& GrGLAttribTypeToLayout(GrVertexAttribType type) {
|
| - SkASSERT(type >= 0 && type < kGrVertexAttribTypeCount);
|
| static const GrGLAttribLayout kLayouts[kGrVertexAttribTypeCount] = {
|
| {1, GR_GL_FLOAT, false}, // kFloat_GrVertexAttribType
|
| {2, GR_GL_FLOAT, false}, // kVec2f_GrVertexAttribType
|
| @@ -33,6 +32,7 @@ static inline const GrGLAttribLayout& GrGLAttribTypeToLayout(GrVertexAttribType
|
| {1, GR_GL_UNSIGNED_BYTE, true}, // kUByte_GrVertexAttribType
|
| {4, GR_GL_UNSIGNED_BYTE, true}, // kVec4ub_GrVertexAttribType
|
| {2, GR_GL_SHORT, false}, // kVec2s_GrVertexAttribType
|
| + {4, GR_GL_INT, false}, // kInt_GrVertexAttribType
|
| };
|
| GR_STATIC_ASSERT(0 == kFloat_GrVertexAttribType);
|
| GR_STATIC_ASSERT(1 == kVec2f_GrVertexAttribType);
|
| @@ -41,6 +41,7 @@ static inline const GrGLAttribLayout& GrGLAttribTypeToLayout(GrVertexAttribType
|
| GR_STATIC_ASSERT(4 == kUByte_GrVertexAttribType);
|
| GR_STATIC_ASSERT(5 == kVec4ub_GrVertexAttribType);
|
| GR_STATIC_ASSERT(6 == kVec2s_GrVertexAttribType);
|
| + GR_STATIC_ASSERT(7 == kInt_GrVertexAttribType);
|
| GR_STATIC_ASSERT(SK_ARRAY_COUNT(kLayouts) == kGrVertexAttribTypeCount);
|
| return kLayouts[type];
|
| }
|
|
|