gyp/gpu.gypi - Issue 2184413002: Merge ProgramDesc's for GL and Vulkan

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: gyp/gpu.gypi

Issue 2184413002: Merge ProgramDesc's for GL and Vulkan (Closed) Base URL: https://skia.googlesource.com/skia.git@minorPerf

Patch Set: typo Created 4 years, 5 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: gyp/gpu.gypi

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi

index 7d586620b6ebbb72990a1c9139eb91230c1fe67a..9b4a98af1dd23ba53c63ddf0a1d9370eabb3c56f 100644

--- a/gyp/gpu.gypi

+++ b/gyp/gpu.gypi

@@ -358,8 +358,6 @@

'<(skia_src_path)/gpu/gl/GrGLPathRendering.h',

'<(skia_src_path)/gpu/gl/GrGLProgram.cpp',

'<(skia_src_path)/gpu/gl/GrGLProgram.h',

- '<(skia_src_path)/gpu/gl/GrGLProgramDesc.cpp',

- '<(skia_src_path)/gpu/gl/GrGLProgramDesc.h',

'<(skia_src_path)/gpu/gl/GrGLProgramDataManager.cpp',

'<(skia_src_path)/gpu/gl/GrGLProgramDataManager.h',

'<(skia_src_path)/gpu/gl/GrGLRenderTarget.cpp',

@@ -413,6 +411,8 @@

'<(skia_src_path)/gpu/glsl/GrGLSLProgramBuilder.h',

'<(skia_src_path)/gpu/glsl/GrGLSLProgramDataManager.cpp',

'<(skia_src_path)/gpu/glsl/GrGLSLProgramDataManager.h',

+ '<(skia_src_path)/gpu/glsl/GrGLSLProgramDesc.cpp',

+ '<(skia_src_path)/gpu/glsl/GrGLSLProgramDesc.h',

'<(skia_src_path)/gpu/glsl/GrGLSLSampler.h',

'<(skia_src_path)/gpu/glsl/GrGLSLShaderBuilder.cpp',

'<(skia_src_path)/gpu/glsl/GrGLSLShaderBuilder.h',

@@ -486,8 +486,6 @@

'<(skia_src_path)/gpu/vk/GrVkPipelineStateCache.cpp',

'<(skia_src_path)/gpu/vk/GrVkPipelineStateDataManager.cpp',

'<(skia_src_path)/gpu/vk/GrVkPipelineStateDataManager.h',

- '<(skia_src_path)/gpu/vk/GrVkProgramDesc.cpp',

- '<(skia_src_path)/gpu/vk/GrVkProgramDesc.h',

'<(skia_src_path)/gpu/vk/GrVkRenderPass.cpp',

'<(skia_src_path)/gpu/vk/GrVkRenderPass.h',

'<(skia_src_path)/gpu/vk/GrVkRenderTarget.cpp',

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