diff options
| author |  egdaniel <egdaniel@google.com> | 2016-04-28 09:30:39 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-28 09:30:39 -0700 |
| commit | dd97b8585ac667f795fb56314bdba974720e774e (patch) | |
| tree | 52a0c7ee979e21eeedbb0a3cad2aaa26f85dd7b6 /src/gpu/vk | |
| parent | 28d5bdd97ebbbdfff49d2e719b24a6343b0f0b48 (diff) | |
Fix vulkan build on linux and android
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1921963003
Review-Url: https://codereview.chromium.org/1921963003
Diffstat (limited to 'src/gpu/vk')
| -rw-r--r-- | src/gpu/vk/GrVkGpu.h | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipelineStateCache.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkTexture.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkTextureRenderTarget.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/vk/GrVkGpu.h index 9c8a48c810..13cbd0cbf0 100644 --- a/src/gpu/vk/GrVkGpu.h +++ b/src/gpu/vk/GrVkGpu.h @@ -73,7 +73,7 @@ public: void onGetMultisampleSpecs(GrRenderTarget* rt, const GrStencilSettings&, int* effectiveSampleCnt, - SkAutoTDeleteArray<SkPoint>*); + SkAutoTDeleteArray<SkPoint>*) override; bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) const override; diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 2821483ca6..e416069458 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -22,7 +22,7 @@ #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLGeometryProcessor.h" #include "glsl/GrGLSLXferProcessor.h" -#include "SkMipmap.h" +#include "SkMipMap.h" GrVkPipelineState::GrVkPipelineState(GrVkGpu* gpu, const GrVkPipelineState::Desc& desc, diff --git a/src/gpu/vk/GrVkPipelineStateCache.cpp b/src/gpu/vk/GrVkPipelineStateCache.cpp index a250dcac99..fc3464c390 100644 --- a/src/gpu/vk/GrVkPipelineStateCache.cpp +++ b/src/gpu/vk/GrVkPipelineStateCache.cpp @@ -104,7 +104,7 @@ sk_sp<GrVkPipelineState> GrVkResourceProvider::PipelineStateCache::refPipelineSt pipeline, *fGpu->vkCaps().glslCaps())) { GrCapsDebugf(fGpu->caps(), "Failed to build vk program descriptor!\n"); - return false; + return nullptr; } // Get vulkan specific descriptor key diff --git a/src/gpu/vk/GrVkTexture.cpp b/src/gpu/vk/GrVkTexture.cpp index 736d8e3b5a..9c68df705a 100644 --- a/src/gpu/vk/GrVkTexture.cpp +++ b/src/gpu/vk/GrVkTexture.cpp @@ -10,7 +10,7 @@ #include "GrVkImageView.h" #include "GrTexturePriv.h" #include "GrVkUtil.h" -#include "SkMipmap.h" +#include "SkMipMap.h" #include "vk/GrVkTypes.h" diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/vk/GrVkTextureRenderTarget.cpp index 6742a9195c..e44e85a647 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.cpp +++ b/src/gpu/vk/GrVkTextureRenderTarget.cpp @@ -12,7 +12,7 @@ #include "GrVkImageView.h" #include "GrVkUtil.h" -#include "SkMipmap.h" +#include "SkMipMap.h" #include "vk/GrVkTypes.h" |