Merge GrGLSLProgramDesc into GrProgramDesc
authoregdaniel <egdaniel@google.com>
Wed, 7 Sep 2016 14:24:12 +0000 (07:24 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 7 Sep 2016 14:24:12 +0000 (07:24 -0700)
commit5d8f69f2d492a15189e4b976ccca3fa092876419
treecd3992a510ba5260e7c03bbe298d96af68a49c0b
parent653212c37efaa6d3175882559634772528bb8ad2
Merge GrGLSLProgramDesc into GrProgramDesc

BUG=skia:

Review-Url: https://codereview.chromium.org/2318523006
12 files changed:
gyp/gpu.gypi
src/gpu/GrProgramDesc.cpp [moved from src/gpu/glsl/GrGLSLProgramDesc.cpp with 91% similarity]
src/gpu/GrProgramDesc.h
src/gpu/gl/GrGLGpuProgramCache.cpp
src/gpu/gl/GrGLProgram.h
src/gpu/gl/builders/GrGLProgramBuilder.cpp
src/gpu/gl/builders/GrGLProgramBuilder.h
src/gpu/glsl/GrGLSLProgramDesc.h [deleted file]
src/gpu/vk/GrVkPipelineState.h
src/gpu/vk/GrVkPipelineStateBuilder.cpp
src/gpu/vk/GrVkPipelineStateBuilder.h
src/gpu/vk/GrVkPipelineStateCache.cpp