From 12d8181b383e9ba355bbbb855e3813a88b10f30a Mon Sep 17 00:00:00 2001
From: scygan <slawomir.cygan@intel.com>
Date: Tue, 17 Nov 2015 19:32:10 +0100
Subject: [PATCH] vktShaderRenderCase: remove buffer views from test

BufferViews should be used only with TEXEL_BUFFER descriptors, while this test tries to use them for UNIFORM_BUFFERS
---
 .../modules/vulkan/shaderrender/vktShaderRender.cpp       | 15 +--------------
 .../modules/vulkan/shaderrender/vktShaderRender.hpp       |  2 --
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
index 9cf22db..3c6aa83 100644
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
@@ -541,25 +541,13 @@ void ShaderRenderCaseInstance::setupUniformData (deUint32 bindingLocation, deUin
 	deMemcpy(alloc->getHostPtr(), dataPtr, size);
 	flushMappedMemoryRange(vk, vkDevice, alloc->getMemory(), alloc->getOffset(), size);
 
-	const VkBufferViewCreateInfo	viewInfo 	=
-	{
-		VK_STRUCTURE_TYPE_BUFFER_VIEW_CREATE_INFO, 	// VkStructureType	sType;
-		DE_NULL,									// void* 			pNext;
-		*buffer,									// VkBuffer			buffer;
-		VK_FORMAT_R32_SFLOAT,						// VkFormat	format;
-		0u,											// VkDeviceSize	offset;
-		size,										// VkDeviceSize	range;
-	};
-
-	Move<VkBufferView>				bufferView			= createBufferView(vk, vkDevice, &viewInfo);
-
 	// \todo [2015-10-09 elecro] remove the '_hack_padding' variable if the driver support small uniforms,
 	// that is for example one float big uniforms.
 	const deUint32 _hack_padding = size < 4 * sizeof(float) ? (deUint32)(3u * sizeof(float)) : 0u;
 
 	const VkDescriptorInfo 			descriptor			=
 	{
-		bufferView.get(),							// VkBufferView				bufferView;
+		DE_NULL,									// VkBufferView				bufferView;
 		0,											// VkSampler				sampler;
 		0,											// VkImageView				imageView;
 		VK_IMAGE_LAYOUT_UNDEFINED,					// VkImageLayout			imageLayout;
@@ -575,7 +563,6 @@ void ShaderRenderCaseInstance::setupUniformData (deUint32 bindingLocation, deUin
 	uniformInfo->descriptor = descriptor;
 	uniformInfo->location = bindingLocation;
 	uniformInfo->buffer = VkBufferSp(new vk::Unique<VkBuffer>(buffer));
-	uniformInfo->bufferView = VkBufferViewSp(new vk::Unique<VkBufferView>(bufferView));
 	uniformInfo->alloc = AllocationSp(alloc.release());
 
 	m_uniformInfos.push_back(UniformInfoSp(new de::UniquePtr<UniformInfo>(uniformInfo)));
diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
index bb4aebd..eb797f6 100644
--- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
+++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.hpp
@@ -473,7 +473,6 @@ private:
 	vk::DescriptorSetUpdateBuilder 						m_descriptorSetUpdateBuilder;
 
 	typedef de::SharedPtr<vk::Unique<vk::VkBuffer> > 		VkBufferSp;
-	typedef de::SharedPtr<vk::Unique<vk::VkBufferView> > 	VkBufferViewSp;
 
 	typedef de::SharedPtr<vk::Unique<vk::VkImage> > 		VkImageSp;
 	typedef de::SharedPtr<vk::Unique<vk::VkImageView> >		VkImageViewSp;
@@ -498,7 +497,6 @@ private:
 		virtual						~BufferUniform	(void) {}
 
 		VkBufferSp					buffer;
-		VkBufferViewSp				bufferView;
 		AllocationSp				alloc;
 	};
 
-- 
2.7.4