Merge ProgramDesc's for GL and Vulkan
authoregdaniel <egdaniel@google.com>
Fri, 29 Jul 2016 14:36:52 +0000 (07:36 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 29 Jul 2016 14:36:52 +0000 (07:36 -0700)
commit0d9990f052670a8af29e1e775c414810f8fc6e86
tree721b816372734c5f6791b208b35dc701d8fbf1ab
parent50ce1f28ffede3fa3e38d330d4114ee52b387848
Merge ProgramDesc's for GL and Vulkan

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184413002

Review-Url: https://codereview.chromium.org/2184413002
15 files changed:
gyp/gpu.gypi
src/gpu/gl/GrGLGpuProgramCache.cpp
src/gpu/gl/GrGLProgram.h
src/gpu/gl/GrGLProgramDesc.h [deleted file]
src/gpu/gl/builders/GrGLProgramBuilder.cpp
src/gpu/gl/builders/GrGLProgramBuilder.h
src/gpu/glsl/GrGLSLProgramDesc.cpp [moved from src/gpu/gl/GrGLProgramDesc.cpp with 93% similarity]
src/gpu/glsl/GrGLSLProgramDesc.h [new file with mode: 0644]
src/gpu/vk/GrVkPipeline.cpp
src/gpu/vk/GrVkPipelineState.h
src/gpu/vk/GrVkPipelineStateBuilder.cpp
src/gpu/vk/GrVkPipelineStateBuilder.h
src/gpu/vk/GrVkPipelineStateCache.cpp
src/gpu/vk/GrVkProgramDesc.cpp [deleted file]
src/gpu/vk/GrVkProgramDesc.h [deleted file]