aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/vk/GrVkResourceProvider.h
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-06-23 15:17:27 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-25 17:55:45 +0000
commitff168d9258e0101826a8072b4ee077c3d2aa7258 (patch)
treec8338ce3ffb83b18575785a3bd98b2607e59bb1a /src/gpu/vk/GrVkResourceProvider.h
parent721e63727f38b9c7664a173ab475d7c7a58cd8a8 (diff)
Put GrPrimitiveProcessor/GrGeometryProcessor before GrPipeline in param lists.
We were inconsistent about which order these were in. Having the processor first will make the parameter order more logical for an upcoming change. Also, the primitive processor comes logically before the pipeline. Change-Id: I3968c5e4e6dff01f9c4ad311eb1795b3c7580ff5 Reviewed-on: https://skia-review.googlesource.com/137228 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkResourceProvider.h')
-rw-r--r--src/gpu/vk/GrVkResourceProvider.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkResourceProvider.h b/src/gpu/vk/GrVkResourceProvider.h
index 00263c87f6..8b87983dec 100644
--- a/src/gpu/vk/GrVkResourceProvider.h
+++ b/src/gpu/vk/GrVkResourceProvider.h
@@ -43,9 +43,9 @@ public:
// Set up any initial vk objects
void init();
- GrVkPipeline* createPipeline(const GrPipeline& pipeline,
+ GrVkPipeline* createPipeline(const GrPrimitiveProcessor& primProc,
+ const GrPipeline& pipeline,
const GrStencilSettings& stencil,
- const GrPrimitiveProcessor& primProc,
VkPipelineShaderStageCreateInfo* shaderStageInfo,
int shaderStageCount,
GrPrimitiveType primitiveType,
@@ -171,8 +171,8 @@ private:
void abandon();
void release();
- GrVkPipelineState* refPipelineState(const GrPipeline&,
- const GrPrimitiveProcessor&,
+ GrVkPipelineState* refPipelineState(const GrPrimitiveProcessor&,
+ const GrPipeline&,
GrPrimitiveType,
const GrVkRenderPass& renderPass);