src/gpu/gl/GrGpuGL.h - Issue 776243005: Revert of move program descriptor generation to flush

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/gl/GrGpuGL.h

Issue 776243005: Revert of move program descriptor generation to flush (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/gpu/gl/GrGpuGL.h

diff --git a/src/gpu/gl/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h

index 8a609884e155014c53e2358da12d1d48e9e70647..4224ba64fdd3f7279c73ece0cbfdc388e5c2bb76 100644

--- a/src/gpu/gl/GrGpuGL.h

+++ b/src/gpu/gl/GrGpuGL.h

@@ -155,7 +155,7 @@

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

~ProgramCache();

void abandon();

- GrGLProgram* getProgram(const GrOptDrawState&);

+ GrGLProgram* getProgram(const GrOptDrawState&, DrawType);

private:

enum {

@@ -248,7 +248,7 @@

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,

« no previous file with comments | « src/gpu/gl/GrGLProgramDesc.cpp ('k') | src/gpu/gl/GrGpuGL.cpp » ('j') | no next file with comments »