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

fix release build vulkan

Browse Source 
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1819853004

Review URL: https://codereview.chromium.org/1819853004
This commit is contained in:
egdaniel 2016-03-21 14:24:14 -07:00 committed by Commit bot
parent 50e82e6176
commit 2cab66be9c
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,7 +357,7 @@ GrVkGpu::~GrVkGpu() {
// wait for all commands to finish
fResourceProvider.checkCommandBuffers();
VkResult res = VK_CALL(QueueWaitIdle(fQueue));
SkDEBUGCODE(VkResult res =) VK_CALL(QueueWaitIdle(fQueue));
// VK_ERROR_DEVICE_LOST is acceptable when tearing down (see 4.2.4 in spec)
SkASSERT(VK_SUCCESS == res || VK_ERROR_DEVICE_LOST == res);

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

@ -62,9 +62,7 @@ GrVkProgram::GrVkProgram(GrVkGpu* gpu,
fVertexUniformBuffer.reset(GrVkUniformBuffer::Create(gpu, vertexUniformSize, true));
fFragmentUniformBuffer.reset(GrVkUniformBuffer::Create(gpu, fragmentUniformSize, true));
#ifdef SK_DEBUG
fNumSamplers = numSamplers;
#endif
}
GrVkProgram::~GrVkProgram() {

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

@ -182,9 +182,7 @@ private:
DescriptorPoolManager fSamplerPoolManager;
DescriptorPoolManager fUniformPoolManager;
#ifdef SK_DEBUG
int fNumSamplers;
#endif
friend class GrVkProgramBuilder;
};