Merge vk-gl-cts/vulkan-cts-1.3.0 into vk-gl-cts/vulkan-cts-1.3.1

Change-Id: Ic7b88eb0135468ea8b013fff65e216a0bc945a6b

3 files changed, 27 insertions, 4 deletions

diff --git a/external/amber/CMakeLists.txt b/external/amber/CMakeLists.txt
index b78caccf2..4e0975067 100644
--- a/external/amber/CMakeLists.txt
+++ b/external/amber/CMakeLists.txt
@@ -10,4 +10,12 @@ set(AMBER_ENABLE_RTTI TRUE CACHE BOOL "Enable runtime type information" FORCE)
 set(AMBER_CTS_INL_DIR ${PROJECT_BINARY_DIR}/external/vulkancts/framework/vulkan)
 set(Vulkan-Headers_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../vulkancts/framework/vulkan/)
 
+if (DE_COMPILER_IS_GCC OR DE_COMPILER_IS_CLANG)
+       add_compile_options(-w)
+elseif (DE_COMPILER_IS_MSC)
+       add_compile_options(/W0)
+endif ()
+
+
+
 add_subdirectory(src)
diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerBorderSwizzleTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerBorderSwizzleTests.cpp
index 6091bca5a..a21efcbf4 100644
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerBorderSwizzleTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineSamplerBorderSwizzleTests.cpp
@@ -452,6 +452,15 @@ bool comparePixelToColorClearValue (const TestParams&					params,
 	const auto	channelClass	= getTextureChannelClass(textureFormat.type);
 	// We must compare all available channels in the color buffer to check RGBA conversion.
 	const auto	channelMask		= getTextureFormatChannelMask(bufferFormat);
+	// If the component mapping contains a SWIZZLE_ONE, overwrite this with a SWIZZLE_ZERO to ensure
+	// a strict tolerance when applying a swizzle of SWIZZLE_ONE to the threshold.
+	const VkComponentMapping thresholdComponentMapping =
+	{
+		(params.componentMapping.r == VK_COMPONENT_SWIZZLE_ONE ? VK_COMPONENT_SWIZZLE_ZERO : params.componentMapping.r),
+		(params.componentMapping.g == VK_COMPONENT_SWIZZLE_ONE ? VK_COMPONENT_SWIZZLE_ZERO : params.componentMapping.g),
+		(params.componentMapping.b == VK_COMPONENT_SWIZZLE_ONE ? VK_COMPONENT_SWIZZLE_ZERO : params.componentMapping.b),
+		(params.componentMapping.a == VK_COMPONENT_SWIZZLE_ONE ? VK_COMPONENT_SWIZZLE_ZERO : params.componentMapping.a),
+	};
 
 	switch (channelClass)
 	{
@@ -484,7 +493,7 @@ bool comparePixelToColorClearValue (const TestParams&					params,
 			}
 
 			// Apply swizzle and gather to thresholds.
-			threshold = applySwizzle(threshold, params.componentMapping);
+			threshold = applySwizzle(threshold, thresholdComponentMapping);
 
 			if (params.componentGather)
 				threshold = applyGather(threshold, *params.componentGather);
@@ -530,7 +539,7 @@ bool comparePixelToColorClearValue (const TestParams&					params,
 			}
 
 			// Apply swizzle and gather to thresholds.
-			threshold = applySwizzle(threshold, params.componentMapping);
+			threshold = applySwizzle(threshold, thresholdComponentMapping);
 
 			if (params.componentGather)
 				threshold = applyGather(threshold, *params.componentGather);
@@ -576,7 +585,7 @@ bool comparePixelToColorClearValue (const TestParams&					params,
 			}
 
 			// Apply swizzle and gather to thresholds.
-			threshold = applySwizzle(threshold, params.componentMapping);
+			threshold = applySwizzle(threshold, thresholdComponentMapping);
 
 			if (params.componentGather)
 				threshold = applyGather(threshold, *params.componentGather);
@@ -625,7 +634,7 @@ bool comparePixelToColorClearValue (const TestParams&					params,
 			}
 
 			// Apply swizzle and gather to thresholds.
-			threshold = applySwizzle(threshold, params.componentMapping);
+			threshold = applySwizzle(threshold, thresholdComponentMapping);
 
 			if (params.componentGather)
 				threshold = applyGather(threshold, *params.componentGather);
diff --git a/framework/delibs/cmake/CFlags.cmake b/framework/delibs/cmake/CFlags.cmake
index cde5aa55f..48bb0295d 100644
--- a/framework/delibs/cmake/CFlags.cmake
+++ b/framework/delibs/cmake/CFlags.cmake
@@ -45,6 +45,12 @@ if (DE_COMPILER_IS_GCC OR DE_COMPILER_IS_CLANG)
 	set(CMAKE_C_FLAGS			"${TARGET_FLAGS} ${WARNING_FLAGS} ${CMAKE_C_FLAGS} -std=c99 -pedantic ")
 	set(CMAKE_CXX_FLAGS			"${TARGET_FLAGS} ${WARNING_FLAGS} ${CMAKE_CXX_FLAGS} -std=c++11 -Wno-delete-non-virtual-dtor")
 
+	# Set _FILE_OFFSET_BITS=64 on 32-bit build on Linux to enable output log files to exceed 2GB
+	if ((DE_CPU_X86) AND (DE_OS_UNIX))
+		set(CMAKE_C_FLAGS		"${CMAKE_C_FLAGS} -D_FILE_OFFSET_BITS=64")
+		set(CMAKE_CXX_FLAGS		"${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")
+	endif ()
+
 	# Force compiler to generate code where integers have well defined overflow
 	# Turn on -Wstrict-overflow=5 and check all warnings before removing
 	set(CMAKE_C_FLAGS			"${CMAKE_C_FLAGS} -fwrapv")