| Index: src/gpu/vk/GrVkProgramBuilder.h
|
| diff --git a/src/gpu/vk/GrVkProgramBuilder.h b/src/gpu/vk/GrVkProgramBuilder.h
|
| index 65fe54667c4908e2d30490a386d172e37a6ad4f0..bb013bab27c6398f9004f4fc2de42c2dd8bf1fce 100644
|
| --- a/src/gpu/vk/GrVkProgramBuilder.h
|
| +++ b/src/gpu/vk/GrVkProgramBuilder.h
|
| @@ -11,15 +11,15 @@
|
| #include "glsl/GrGLSLProgramBuilder.h"
|
|
|
| #include "GrPipeline.h"
|
| -#include "vk/GrVkUniformHandler.h"
|
| -#include "vk/GrVkVaryingHandler.h"
|
| +#include "GrVkProgram.h"
|
| +#include "GrVkUniformHandler.h"
|
| +#include "GrVkVaryingHandler.h"
|
|
|
| #include "shaderc/shaderc.h"
|
| #include "vulkan/vulkan.h"
|
|
|
| class GrVkGpu;
|
| class GrVkRenderPass;
|
| -class GrVkProgram;
|
| class GrVkProgramDesc;
|
|
|
| class GrVkProgramBuilder : public GrGLSLProgramBuilder {
|
| @@ -35,7 +35,7 @@ public:
|
| const GrPipeline&,
|
| const GrPrimitiveProcessor&,
|
| GrPrimitiveType,
|
| - const GrVkProgramDesc&,
|
| + const GrVkProgram::PipelineDesc&,
|
| const GrVkRenderPass& renderPass);
|
|
|
| const GrCaps* caps() const override;
|
| @@ -51,7 +51,9 @@ private:
|
| const GrPrimitiveProcessor&,
|
| const GrVkProgramDesc&);
|
|
|
| - GrVkProgram* finalize(GrPrimitiveType primitiveType, const GrVkRenderPass& renderPass);
|
| + GrVkProgram* finalize(GrPrimitiveType primitiveType,
|
| + const GrVkRenderPass& renderPass,
|
| + const GrVkProgram::PipelineDesc&);
|
|
|
| static bool CreateVkShaderModule(const GrVkGpu* gpu,
|
| VkShaderStageFlagBits stage,
|
|
|