Fix Vulkan build.

Initialization order mismatch is treated as an error with Clang/GCC: -Werror=reorder Bug b/118383648 Change-Id: I4e56aa3c61ce35d70a28dbdd1ab76d7ca8dae833 Reviewed-on: https://swiftshader-review.googlesource.com/c/22068Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com>

Fix Vulkan build.
70942e2e · Nicolas Capens · Nicolas Capens · e83048e2 · 70942e2e · 70942e2e
Commit 70942e2e authored Oct 29, 2018 by Nicolas Capens Committed by Nicolas Capens Oct 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

VkDeviceMemory.cpp src/Vulkan/VkDeviceMemory.cpp +4 -3

vulkan.vcxproj src/Vulkan/vulkan.vcxproj +2 -0

No files found.
--- a/src/Vulkan/VkDeviceMemory.cpp
+++ b/src/Vulkan/VkDeviceMemory.cpp
@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include "VkConfig.h"
 #include "VkDeviceMemory.hpp"

+#include "VkConfig.h"
+
 namespace vk
 {

 DeviceMemory::DeviceMemory(const VkMemoryAllocateInfo* pCreateInfo, void* mem) :
-	size(pCreateInfo->allocationSize), buffer(nullptr), memoryTypeIndex(pCreateInfo->memoryTypeIndex)
+	size(pCreateInfo->allocationSize), memoryTypeIndex(pCreateInfo->memoryTypeIndex)
 {
 	ASSERT(size);
 }
@@ -53,7 +54,7 @@ VkResult DeviceMemory::allocate()
 VkResult DeviceMemory::map(VkDeviceSize pOffset, VkDeviceSize pSize, void** ppData)
 {
 	*ppData = getOffsetPointer(pOffset);
-	
+
 	return VK_SUCCESS;
 }


--- a/src/Vulkan/vulkan.vcxproj
+++ b/src/Vulkan/vulkan.vcxproj
@@ -64,6 +64,7 @@
      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
+      <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -85,6 +86,7 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
+      <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>
    </ClCompile>
    <Link>
      <ModuleDefinitionFile>swiftshader_icd.def</ModuleDefinitionFile>