Patches for r8468 build errors. Unreviewed.

git-svn-id: http://skia.googlecode.com/svn/trunk@8469 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index b2bb765cd01d09a8717b12276643633bb8fc9917..18558507012fb3c4a5dc642530bc4721d1aa6e0e 100644 (file)
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -133,7 +133,7 @@ static const int kGrVertexAttribBindingCnt = kLast_GrVertexAttribBinding + 1;
 static const int kGrFixedFunctionVertexAttribBindingCnt =
     kLastFixedFunction_GrVertexAttribBinding + 1;
 
-static inline const int GrFixedFunctionVertexAttribVectorCount(GrVertexAttribBinding binding) {
+static inline int GrFixedFunctionVertexAttribVectorCount(GrVertexAttribBinding binding) {
     GrAssert(binding >= 0 && binding < kGrFixedFunctionVertexAttribBindingCnt);
     static const int kVecCounts[] = { 2, 2, 4, 4 };
 

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 2f96c15671eb878ecbf7b4a6a34b8a64aa02ca68..3ed9fea26cd30f02ea70c2deba9b77aeb3a18178 100644 (file)
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -1031,8 +1031,6 @@ private:
         // not need to be compared in op==.
         int fFixedFunctionVertexAttribIndices[kGrFixedFunctionVertexAttribBindingCnt];
 
-        GR_STATIC_ASSERT(kGrVertexAttribBindingCnt <= 8*sizeof(uint32_t));
-
         bool operator== (const CommonState& other) const {
             bool result = fColor == other.fColor &&
                           fViewMatrix.cheapEqualTo(other.fViewMatrix) &&