AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix vulkan build on linux and android

Browse Source 
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
This commit is contained in:
egdaniel 2016-04-28 09:30:39 -07:00 committed by Commit bot
parent 28d5bdd97e
commit dd97b8585a
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/vk/GrVkGpu.h
View File

@ -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;

2
src/gpu/vk/GrVkPipelineState.cpp
View File

@ -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,

2
src/gpu/vk/GrVkPipelineStateCache.cpp
View File

@ -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

2
src/gpu/vk/GrVkTexture.cpp
View File

@ -10,7 +10,7 @@
#include "GrVkImageView.h"
#include "GrTexturePriv.h"
#include "GrVkUtil.h"
#include "SkMipmap.h"
#include "SkMipMap.h"
#include "vk/GrVkTypes.h"

2
src/gpu/vk/GrVkTextureRenderTarget.cpp
View File

@ -12,7 +12,7 @@
#include "GrVkImageView.h"
#include "GrVkUtil.h"
#include "SkMipmap.h"
#include "SkMipMap.h"
#include "vk/GrVkTypes.h"

2
tools/vulkan/android/VulkanTestContext_android.cpp
View File

@ -32,7 +32,7 @@ VkSurfaceKHR VulkanTestContext::createVkSurface(VkInstance instance, void* platf
surfaceCreateInfo.flags = 0;
surfaceCreateInfo.window = androidPlatformData->fNativeWindow;
VkResult res = createAndroidSurfaceKHR(fBackendContext->fInstance, &surfaceCreateInfo,
VkResult res = createAndroidSurfaceKHR(instance, &surfaceCreateInfo,
nullptr, &surface);
return (VK_SUCCESS == res) ? surface : VK_NULL_HANDLE;
}