diff options
author | egdaniel <egdaniel@google.com> | 2016-07-29 07:36:52 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-29 07:36:52 -0700 |
commit | 0d9990f052670a8af29e1e775c414810f8fc6e86 (patch) | |
tree | 721b816372734c5f6791b208b35dc701d8fbf1ab /src/gpu/vk/GrVkPipelineState.h | |
parent | 50ce1f28ffede3fa3e38d330d4114ee52b387848 (diff) |
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
Diffstat (limited to 'src/gpu/vk/GrVkPipelineState.h')
-rw-r--r-- | src/gpu/vk/GrVkPipelineState.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/vk/GrVkPipelineState.h index 60c1db68d4..f92cdeabab 100644 --- a/src/gpu/vk/GrVkPipelineState.h +++ b/src/gpu/vk/GrVkPipelineState.h @@ -12,9 +12,9 @@ #include "GrStencilSettings.h" #include "GrVkDescriptorSetManager.h" #include "GrVkImage.h" -#include "GrVkProgramDesc.h" #include "GrVkPipelineStateDataManager.h" #include "glsl/GrGLSLProgramBuilder.h" +#include "glsl/GrGLSLProgramDesc.h" #include "vk/GrVkDefines.h" @@ -72,7 +72,7 @@ public: * For Vulkan we want to cache the entire VkPipeline for reuse of draws. The Desc here holds all * the information needed to differentiate one pipeline from another. * - * The GrVkProgramDesc contains all the information need to create the actual shaders for the + * The GrGLSLProgramDesc contains all the information need to create the actual shaders for the * pipeline. * * The fStateKey is used to store all the inputs for the rest of the state stored on the @@ -86,7 +86,7 @@ public: */ struct Desc { uint32_t fChecksum; - GrVkProgramDesc fProgramDesc; + GrGLSLProgramDesc fProgramDesc; enum { kRenderPassKeyAlloc = 12, // This is typical color attachment with no stencil or msaa |