From 94efbf51f5a88d9e8aa961d3fbe38c5e335d6108 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Tue, 29 Nov 2016 13:43:05 -0500 Subject: Merge GrGLSLCaps into GrShaderCaps GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=5121 Change-Id: If8d13638f80f42161cbc766a2666c5789e5772c8 Reviewed-on: https://skia-review.googlesource.com/5121 Reviewed-by: Ethan Nicholas Commit-Queue: Brian Salomon --- src/gpu/vk/GrVkPipelineState.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/vk/GrVkPipelineState.cpp') diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 75b8baaa4f..e5bf7fa9a8 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -501,7 +501,7 @@ bool GrVkPipelineState::Desc::Build(Desc* desc, const GrPipeline& pipeline, const GrStencilSettings& stencil, GrPrimitiveType primitiveType, - const GrGLSLCaps& caps) { + const GrShaderCaps& caps) { if (!INHERITED::Build(desc, primProc, primitiveType == kPoints_GrPrimitiveType, pipeline, caps)) { return false; -- cgit v1.2.3