From: Peter Gal <pgal.u-szeged@partner.samsung.com>
Date: Thu, 8 Oct 2015 13:21:51 +0000 (+0200)
Subject: ShaderRenderCase: updated naming of a few image information mapping methods
X-Git-Tag: upstream/0.1.0~812^2~521^2~6^2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3416e4e1f40e7bc515d6fb0631c4dc7ba0deac55;p=platform%2Fupstream%2FVK-GL-CTS.git

ShaderRenderCase: updated naming of a few image information mapping methods
---

diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
index 76e3014..733e53c 100644
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp
@@ -706,16 +706,16 @@ void ShaderRenderCaseInstance::useSampler2D (deUint32 bindingLocation, deUint32
 	{
 		VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO,
 		DE_NULL,
-		mapTexFilter(refSampler.magFilter),
-		mapTexFilter(refSampler.minFilter),
-		mapTexMipmapMode(refSampler.minFilter),
-		mapWrapMode(refSampler.wrapS),
-		mapWrapMode(refSampler.wrapT),
-		mapWrapMode(refSampler.wrapR),
+		getVkTexFilter(refSampler.magFilter),
+		getVkTexFilter(refSampler.minFilter),
+		getVkTexMipmapMode(refSampler.minFilter),
+		getVkWrapMode(refSampler.wrapS),
+		getVkWrapMode(refSampler.wrapT),
+		getVkWrapMode(refSampler.wrapR),
 		refSampler.lodThreshold,
 		1,
 		(refSampler.compare != tcu::Sampler::COMPAREMODE_NONE),
-		mapCompareMode(refSampler.compare),
+		getVkCompareMode(refSampler.compare),
 		0.0f,
 		0.0f,
 		VK_BORDER_COLOR_INT_OPAQUE_WHITE
diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.cpp
index 5acfe7d..6406809 100644
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.cpp
@@ -1,4 +1,7 @@
 /*------------------------------------------------------------------------
+ * Vulkan Conformance Tests
+ * ------------------------
+ *
  * Copyright (c) 2015 The Khronos Group Inc.
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
@@ -253,7 +256,7 @@ void Texture2D::loadCompressed (int numLevels, const tcu::CompressedTexture* lev
 }
 
 
-vk::VkTexFilter mapTexFilter (const tcu::Sampler::FilterMode& filterMode)
+vk::VkTexFilter getVkTexFilter (const tcu::Sampler::FilterMode& filterMode)
 {
 	// \todo [2015-09-07 elecro] dobule check the mappings
 	switch(filterMode)
@@ -270,7 +273,7 @@ vk::VkTexFilter mapTexFilter (const tcu::Sampler::FilterMode& filterMode)
 	return vk::VK_TEX_FILTER_NEAREST;
 }
 
-vk::VkTexMipmapMode mapTexMipmapMode (const tcu::Sampler::FilterMode& filterMode)
+vk::VkTexMipmapMode getVkTexMipmapMode (const tcu::Sampler::FilterMode& filterMode)
 {
 	// \todo [2015-09-07 elecro] dobule check the mappings
 	switch(filterMode)
@@ -287,7 +290,7 @@ vk::VkTexMipmapMode mapTexMipmapMode (const tcu::Sampler::FilterMode& filterMode
 	return vk::VK_TEX_MIPMAP_MODE_BASE;
 }
 
-vk::VkTexAddress mapWrapMode (const tcu::Sampler::WrapMode& wrapMode)
+vk::VkTexAddress getVkWrapMode (const tcu::Sampler::WrapMode& wrapMode)
 {
 	// \todo [2015-09-07 elecro] dobule check the mappings
 	switch(wrapMode)
@@ -305,7 +308,7 @@ vk::VkTexAddress mapWrapMode (const tcu::Sampler::WrapMode& wrapMode)
 	return vk::VK_TEX_ADDRESS_WRAP;
 }
 
-vk::VkCompareOp mapCompareMode (const tcu::Sampler::CompareMode& mode)
+vk::VkCompareOp getVkCompareMode (const tcu::Sampler::CompareMode& mode)
 {
 	// \todo [2015-09-07 elecro] dobule check the mappings
 	switch(mode)
diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.hpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.hpp
index d9ea14f..20520f6 100644
--- a/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktTexture.hpp
@@ -1,6 +1,9 @@
 #ifndef _VKTTEXTURE_HPP
 #define _VKTTEXTURE_HPP
 /*------------------------------------------------------------------------
+ * Vulkan Conformance Tests
+ * ------------------------
+ *
  * Copyright (c) 2015 The Khronos Group Inc.
  * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
@@ -96,11 +99,10 @@ private:
 	de::MovePtr<vk::Allocation>		m_allocation;
 };
 
-
-vk::VkTexFilter mapTexFilter (const tcu::Sampler::FilterMode& filterMode);
-vk::VkTexMipmapMode mapTexMipmapMode (const tcu::Sampler::FilterMode& filterMode);
-vk::VkTexAddress mapWrapMode (const tcu::Sampler::WrapMode& wrapMode);
-vk::VkCompareOp mapCompareMode (const tcu::Sampler::CompareMode& mode);
+vk::VkTexFilter getVkTexFilter (const tcu::Sampler::FilterMode& filterMode);
+vk::VkTexMipmapMode getVkTexMipmapMode (const tcu::Sampler::FilterMode& filterMode);
+vk::VkTexAddress getVkWrapMode (const tcu::Sampler::WrapMode& wrapMode);
+vk::VkCompareOp getVkCompareMode (const tcu::Sampler::CompareMode& mode);
 
 } // vkt