AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patches for r8468 build errors. Unreviewed.

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8469 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
jvanverth@google.com 2013-04-01 20:14:02 +00:00
parent 054ae99d93
commit 86b5e29f80
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/gpu/GrTypesPriv.h
View File

@ -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 };

2
src/gpu/GrDrawState.h
View File

@ -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) &&