diff options
| -rw-r--r-- | include/gpu/GrTypesPriv.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrDrawState.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h index b2bb765cd0..1855850701 100644 --- 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 2f96c15671..3ed9fea26c 100644 --- 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) && |