diff options
| author |  egdaniel <egdaniel@google.com> | 2016-03-21 14:24:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-21 14:24:14 -0700 |
| commit | 2cab66be9c47660da6a2cc94b469c14d5bed958e (patch) | |
| tree | baa2dde2cb7d71aab8ecd5528f4a6c4094232773 | |
| parent | 50e82e61766d22da5238905916a8abc3e6664060 (diff) | |
fix release build vulkan
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
| -rw-r--r-- | src/gpu/vk/GrVkGpu.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkProgram.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkProgram.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp index 0666f10f7e..926e423b6e 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/vk/GrVkGpu.cpp @@ -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); diff --git a/src/gpu/vk/GrVkProgram.cpp b/src/gpu/vk/GrVkProgram.cpp index d9d4336057..9580a3ad06 100644 --- a/src/gpu/vk/GrVkProgram.cpp +++ b/src/gpu/vk/GrVkProgram.cpp @@ -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() { diff --git a/src/gpu/vk/GrVkProgram.h b/src/gpu/vk/GrVkProgram.h index 1a024f2f2a..23a9713a6a 100644 --- a/src/gpu/vk/GrVkProgram.h +++ b/src/gpu/vk/GrVkProgram.h @@ -182,9 +182,7 @@ private: DescriptorPoolManager fSamplerPoolManager; DescriptorPoolManager fUniformPoolManager; -#ifdef SK_DEBUG int fNumSamplers; -#endif friend class GrVkProgramBuilder; }; |