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