src/gpu/gl/GrGLProgram.h - Issue 2318523006: Merge GrGLSLProgramDesc into GrProgramDesc

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

Issue 2318523006: Merge GrGLSLProgramDesc into GrProgramDesc (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: update comments Created 4 years, 3 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:

Index: src/gpu/gl/GrGLProgram.h

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

index 462ea142940f3f27de25ee4ce969f662d8b4a49b..ea98d87915951c4c9b83e9a7918d3b2c293aa48b 100644

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

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

@@ -10,10 +10,10 @@

#define GrGLProgram_DEFINED

#include "GrGLContext.h"

+#include "GrProgramDesc.h"

#include "GrGLTexture.h"

#include "GrGLProgramDataManager.h"

#include "glsl/GrGLSLProgramDataManager.h"

-#include "glsl/GrGLSLProgramDesc.h"

#include "glsl/GrGLSLUniformHandler.h"

#include "SkString.h"

« no previous file with comments | « src/gpu/gl/GrGLGpuProgramCache.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.h » ('j') | no next file with comments »