From f78c60c92a8c212fc462262f2ce81e584d0f02f8 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Thu, 4 Dec 2014 06:01:45 -0800 Subject: Revert of move program descriptor generation to flush (patchset #7 id:120001 of https://codereview.chromium.org/777673003/) Reason for revert: breaking linux build Original issue's description: > move program descriptor generation to flush > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/829e1b80b1020b17f2078020c990e079b70c077c TBR=egdaniel@google.com,bsalomon@google.com,joshualitt@chromium.org NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/776243005 --- src/gpu/gl/GrGpuGL.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gpu/gl/GrGpuGL.h') diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h index 8a609884e1..4224ba64fd 100644 --- a/src/gpu/gl/GrGpuGL.h +++ b/src/gpu/gl/GrGpuGL.h @@ -155,7 +155,7 @@ private: virtual void clearStencil(GrRenderTarget*) SK_OVERRIDE; - virtual bool flushGraphicsState(const GrOptDrawState&) SK_OVERRIDE; + virtual bool flushGraphicsState(const GrOptDrawState&, DrawType) SK_OVERRIDE; // GrDrawTarget overrides virtual void didAddGpuTraceMarker() SK_OVERRIDE; @@ -188,7 +188,7 @@ private: ~ProgramCache(); void abandon(); - GrGLProgram* getProgram(const GrOptDrawState&); + GrGLProgram* getProgram(const GrOptDrawState&, DrawType); private: enum { @@ -248,7 +248,7 @@ private: void flushRenderTarget(GrGLRenderTarget*, const SkIRect* bounds); void flushStencil(const GrStencilSettings&, DrawType); - void flushAAState(const GrOptDrawState&); + void flushAAState(const GrOptDrawState&, DrawType); bool configToGLFormats(GrPixelConfig config, bool getSizedInternal, -- cgit v1.2.3