diff options
author | 2011-02-22 20:34:01 +0000 | |
---|---|---|
committer | 2011-02-22 20:34:01 +0000 | |
commit | ffca400ef6f96a280c3e2c09210f950af64a1f24 (patch) | |
tree | 2292badadfe451a456616652c8df3291d8a80158 /gpu/src/GrGpuGLShaders2.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/GrGpuGLShaders2.cpp')
-rw-r--r-- | gpu/src/GrGpuGLShaders2.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gpu/src/GrGpuGLShaders2.cpp b/gpu/src/GrGpuGLShaders2.cpp index 34e7c87e50..14134e7b6c 100644 --- a/gpu/src/GrGpuGLShaders2.cpp +++ b/gpu/src/GrGpuGLShaders2.cpp @@ -979,7 +979,7 @@ void GrGpuGLShaders2::GenProgram(const ProgramDesc& desc, program->fViewMatrix = GrMatrix::InvalidMatrix(); } -void GrGpuGLShaders2::getProgramDesc(PrimitiveType primType, ProgramDesc* desc) { +void GrGpuGLShaders2::getProgramDesc(GrPrimitiveType primType, ProgramDesc* desc) { // Must initialize all fields or cache will have false negatives! desc->fVertexLayout = fGeometrySrc.fVertexLayout; @@ -1220,7 +1220,7 @@ void GrGpuGLShaders2::flushRadial2(int stage) { unis)); } -void GrGpuGLShaders2::flushProgram(PrimitiveType type) { +void GrGpuGLShaders2::flushProgram(GrPrimitiveType type) { ProgramDesc desc; getProgramDesc(type, &desc); fProgram = fProgramCache->getProgram(desc); @@ -1234,7 +1234,7 @@ void GrGpuGLShaders2::flushProgram(PrimitiveType type) { } } -bool GrGpuGLShaders2::flushGraphicsState(PrimitiveType type) { +bool GrGpuGLShaders2::flushGraphicsState(GrPrimitiveType type) { if (!flushGLStateCommon(type)) { return false; |