From 4b9b3ab2ce58ac1d92842333a9fd18435a2997a4 Mon Sep 17 00:00:00 2001
From: Pyry Haulos <phaulos@google.com>
Date: Wed, 15 Jul 2015 13:11:03 -0700
Subject: [PATCH] Fix build issues with upstream glslang

 * Enable C++11 mode for vkGlslToSpirV.cpp as glslang headers require
that.

 * Rename major/minor fields in vk::ApiVersion to avoid issues due to
some GNU headers defining macros with those names.

Change-Id: I4d5d5aa5a469669d260705227c12bb247ad25e32
---
 external/vulkancts/framework/vulkan/CMakeLists.txt | 17 +++++++++++------
 external/vulkancts/framework/vulkan/vkDefs.cpp     |  8 ++++----
 external/vulkancts/framework/vulkan/vkDefs.hpp     | 20 ++++++++++----------
 external/vulkancts/framework/vulkan/vkStrUtil.hpp  |  2 +-
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/external/vulkancts/framework/vulkan/CMakeLists.txt b/external/vulkancts/framework/vulkan/CMakeLists.txt
index e615e4a..158a06b 100644
--- a/external/vulkancts/framework/vulkan/CMakeLists.txt
+++ b/external/vulkancts/framework/vulkan/CMakeLists.txt
@@ -21,14 +21,10 @@ set(VKUTIL_SRCS
 	vkGlslToSpirV.hpp
 	vkBinaryRegistry.cpp
 	vkBinaryRegistry.hpp
+	vkNullDriver.cpp
+	vkNullDriver.hpp
 	)
 
-# \note Code interfacing with glslang needs to include third-party headers
-#       that cause all sorts of warnings to appear.
-set_source_files_properties(
-	FILES vkGlslToSpirV.cpp
-	PROPERTIES COMPILE_FLAGS ${DE_3RD_PARTY_CXX_FLAGS})
-
 set(VKUTIL_LIBS
 	tcutil
 	)
@@ -36,6 +32,15 @@ set(VKUTIL_LIBS
 if (DEQP_HAVE_GLSLANG)
 	include_directories(${GLSLANG_INCLUDE_PATH})
 	add_definitions(-DDEQP_HAVE_GLSLANG=1)
+
+	# \note Code interfacing with glslang needs to include third-party headers
+	#       that cause all sorts of warnings to appear.
+	if (DE_COMPILER_IS_GCC OR DE_COMPILER_IS_CLANG)
+		set_source_files_properties(
+			FILES vkGlslToSpirV.cpp
+			PROPERTIES COMPILE_FLAGS "${DE_3RD_PARTY_CXX_FLAGS} -std=c++11")
+	endif ()
+
 	set(VKUTIL_LIBS ${VKUTIL_LIBS} ${GLSLANG_LIBRARY})
 endif ()
 
diff --git a/external/vulkancts/framework/vulkan/vkDefs.cpp b/external/vulkancts/framework/vulkan/vkDefs.cpp
index e5c179c..c6d8bf1 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.cpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.cpp
@@ -113,11 +113,11 @@ ApiVersion unpackVersion (deUint32 version)
 
 deUint32 pack (const ApiVersion& version)
 {
-	DE_ASSERT((version.major & ~0x3FF) == 0);
-	DE_ASSERT((version.minor & ~0x3FF) == 0);
-	DE_ASSERT((version.patch & ~0xFFF) == 0);
+	DE_ASSERT((version.majorNum & ~0x3FF) == 0);
+	DE_ASSERT((version.minorNum & ~0x3FF) == 0);
+	DE_ASSERT((version.patchNum & ~0xFFF) == 0);
 
-	return (version.major << 22) | (version.minor << 12) | version.patch;
+	return (version.majorNum << 22) | (version.minorNum << 12) | version.patchNum;
 }
 
 VkClearValue clearValueColorF32 (float r, float g, float b, float a)
diff --git a/external/vulkancts/framework/vulkan/vkDefs.hpp b/external/vulkancts/framework/vulkan/vkDefs.hpp
index d487848..8308bdc 100644
--- a/external/vulkancts/framework/vulkan/vkDefs.hpp
+++ b/external/vulkancts/framework/vulkan/vkDefs.hpp
@@ -158,16 +158,16 @@ private:
 
 struct ApiVersion
 {
-	deUint32	major;
-	deUint32	minor;
-	deUint32	patch;
-
-	ApiVersion (deUint32	major_,
-				deUint32	minor_,
-				deUint32	patch_)
-		: major	(major_)
-		, minor	(minor_)
-		, patch	(patch_)
+	deUint32	majorNum;
+	deUint32	minorNum;
+	deUint32	patchNum;
+
+	ApiVersion (deUint32	majorNum_,
+				deUint32	minorNum_,
+				deUint32	patchNum_)
+		: majorNum	(majorNum_)
+		, minorNum	(minorNum_)
+		, patchNum	(patchNum_)
 	{
 	}
 };
diff --git a/external/vulkancts/framework/vulkan/vkStrUtil.hpp b/external/vulkancts/framework/vulkan/vkStrUtil.hpp
index a842e1f..dab10aa 100644
--- a/external/vulkancts/framework/vulkan/vkStrUtil.hpp
+++ b/external/vulkancts/framework/vulkan/vkStrUtil.hpp
@@ -53,7 +53,7 @@ inline std::ostream& operator<< (std::ostream& s, const Handle<Type>& handle)
 
 inline std::ostream& operator<< (std::ostream& s, const ApiVersion& version)
 {
-	return s << version.major << "." << version.minor << "." << version.patch;
+	return s << version.majorNum << "." << version.minorNum << "." << version.patchNum;
 }
 
 } // vk
-- 
2.7.4