src/gpu/gl/GrGLShaderBuilder.h - Issue 164973002: Defer deletion of our shaders until after linking the gl program to work around an Android emulator…

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/GrGLShaderBuilder.h

Issue 164973002: Defer deletion of our shaders until after linking the gl program to work around an Android emulator… (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 10 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/gl/GrGLShaderBuilder.h

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

index 103efa5aabcbde7e8d6a87ee9be5820a0ea76ce5..fb75d3a7db86521b9d36013a98f018dd7e379bac 100644

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

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

@@ -248,7 +248,7 @@ protected:

int effectCnt,

GrGLSLExpr4* inOutFSColor);

- virtual bool compileAndAttachShaders(GrGLuint programId) const;

+ virtual bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;

virtual void bindProgramLocations(GrGLuint programId) const;

void appendDecls(const VarArray&, SkString*) const;

@@ -422,7 +422,7 @@ public:

}

protected:

- virtual bool compileAndAttachShaders(GrGLuint programId) const SK_OVERRIDE;

+ virtual bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const SK_OVERRIDE;

virtual void bindProgramLocations(GrGLuint programId) const SK_OVERRIDE;

private:

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