diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 18:17:25 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-21 18:17:25 +0000 |
| commit | 25fb21f5df904c6f111bbf8f07e6a6c339416d09 (patch) | |
| tree | 5af3f261512d7fa4aa4555ded17b348cecc971a1 /gpu/src/GrGpuGLFixed.cpp | |
| parent | 62b65b0913566381db468277de07e5dd2a9237ca (diff) | |
Refactor GrDrawTarget vertex/index api
Review URL: http://codereview.appspot.com/4631056/
git-svn-id: http://skia.googlecode.com/svn/trunk@1662 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGpuGLFixed.cpp')
| -rw-r--r-- | gpu/src/GrGpuGLFixed.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/src/GrGpuGLFixed.cpp b/gpu/src/GrGpuGLFixed.cpp index 65229dc0a1..baa220b0b5 100644 --- a/gpu/src/GrGpuGLFixed.cpp +++ b/gpu/src/GrGpuGLFixed.cpp @@ -166,7 +166,7 @@ bool GrGpuGLFixed::flushGraphicsState(GrPrimitiveType type) { } } - uint32_t vertColor = (fGeometrySrc.fVertexLayout & kColor_VertexLayoutBit); + uint32_t vertColor = (this->getGeomSrc().fVertexLayout & kColor_VertexLayoutBit); uint32_t prevVertColor = (fHWGeometryState.fVertexLayout & kColor_VertexLayoutBit); @@ -250,7 +250,7 @@ void GrGpuGLFixed::setupGeometry(int* startVertex, int newColorOffset; int newTexCoordOffsets[kNumStages]; - GrGLsizei newStride = VertexSizeAndOffsetsByStage(fGeometrySrc.fVertexLayout, + GrGLsizei newStride = VertexSizeAndOffsetsByStage(this->getGeomSrc().fVertexLayout, newTexCoordOffsets, &newColorOffset); int oldColorOffset; @@ -266,7 +266,7 @@ void GrGpuGLFixed::setupGeometry(int* startVertex, setBuffers(indexed, &extraVertexOffset, &extraIndexOffset); GrGLenum scalarType; - if (fGeometrySrc.fVertexLayout & kTextFormat_VertexLayoutBit) { + if (this->getGeomSrc().fVertexLayout & kTextFormat_VertexLayoutBit) { scalarType = GrGLTextType; } else { scalarType = GrGLType; @@ -289,7 +289,7 @@ void GrGpuGLFixed::setupGeometry(int* startVertex, ((GrGLTextType != GrGLType) && (kTextFormat_VertexLayoutBit & (fHWGeometryState.fVertexLayout ^ - fGeometrySrc.fVertexLayout))); + this->getGeomSrc().fVertexLayout))); if (posAndTexChange) { GR_GL(VertexPointer(2, scalarType, newStride, (GrGLvoid*)vertexOffset)); @@ -328,6 +328,6 @@ void GrGpuGLFixed::setupGeometry(int* startVertex, GR_GL(DisableClientState(GR_GL_COLOR_ARRAY)); } - fHWGeometryState.fVertexLayout = fGeometrySrc.fVertexLayout; + fHWGeometryState.fVertexLayout = this->getGeomSrc().fVertexLayout; fHWGeometryState.fArrayPtrsDirty = false; } |