diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-22 20:34:01 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-02-22 20:34:01 +0000 |
| commit | ffca400ef6f96a280c3e2c09210f950af64a1f24 (patch) | |
| tree | 2292badadfe451a456616652c8df3291d8a80158 /gpu/src/GrGpuGL.cpp | |
| parent | bdee9fc778d4387d805d717f2cd7fc7074991fdb (diff) | |
Make a separate path renderer object. Move enum types to GrTypes.h
Review URL http://codereview.appspot.com/4167067/
git-svn-id: http://skia.googlecode.com/svn/trunk@829 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gpu/src/GrGpuGL.cpp')
| -rw-r--r-- | gpu/src/GrGpuGL.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp index 8cfc4a07ba..edcadb4be6 100644 --- a/gpu/src/GrGpuGL.cpp +++ b/gpu/src/GrGpuGL.cpp @@ -443,8 +443,8 @@ void GrGpuGL::resetContextHelper() { fHWDrawState.fFlagBits = 0; // illegal values - fHWDrawState.fSrcBlend = (BlendCoeff)-1; - fHWDrawState.fDstBlend = (BlendCoeff)-1; + fHWDrawState.fSrcBlend = (GrBlendCoeff)-1; + fHWDrawState.fDstBlend = (GrBlendCoeff)-1; fHWDrawState.fColor = GrColor_ILLEGAL; fHWDrawState.fViewMatrix = GrMatrix::InvalidMatrix(); @@ -1183,7 +1183,7 @@ GLenum gPrimitiveType2GLMode[] = { GL_LINE_STRIP }; -void GrGpuGL::drawIndexedHelper(PrimitiveType type, +void GrGpuGL::drawIndexedHelper(GrPrimitiveType type, uint32_t startVertex, uint32_t startIndex, uint32_t vertexCount, @@ -1203,7 +1203,7 @@ void GrGpuGL::drawIndexedHelper(PrimitiveType type, GL_UNSIGNED_SHORT, indices)); } -void GrGpuGL::drawNonIndexedHelper(PrimitiveType type, +void GrGpuGL::drawNonIndexedHelper(GrPrimitiveType type, uint32_t startVertex, uint32_t vertexCount) { GrAssert((size_t)type < GR_ARRAY_COUNT(gPrimitiveType2GLMode)); @@ -1458,7 +1458,7 @@ void GrGpuGL::flushStencil() { } } -bool GrGpuGL::flushGLStateCommon(PrimitiveType type) { +bool GrGpuGL::flushGLStateCommon(GrPrimitiveType type) { // GrGpu::setupClipAndFlushState should have already checked this // and bailed if not true. |