From e9cfcc2d64981354e86833e6e7d4063267ce786c Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Fri, 30 Oct 2015 13:21:03 +0100 Subject: [PATCH] ShaderRenderCase: add anonymous namespace and fix error reporting in the TextureBinding --- .../modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp index d7a8767..64b6c0f 100644 --- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp +++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp @@ -64,6 +64,9 @@ namespace shaderrendercase using namespace vk; +namespace +{ + static const int s_gridSize = 2; static const int s_maxRenderWidth = 128; static const int s_maxRenderHeight = 128; @@ -115,6 +118,8 @@ static VkImageMemoryBarrier createImageMemoryBarrier (const VkImage& image, return imageMemoryBarrier; } +} // anonymous + // QuadGrid. class QuadGrid @@ -270,7 +275,7 @@ TextureBinding::TextureBinding (const tcu::Archive& archive, { case TYPE_2D: m_binding.tex2D = loadTexture2D(archive, filename).release(); break; default: - TCU_FAIL("Unsupported texture type"); + DE_FATAL("Unsupported texture type"); } } -- 2.7.4