commit 6f25bb7c1c77be0bcfbca387329550a4d069f706
author Jamie Madill <jmadill@chromium.org> Mon Apr 04 11:54:43 2016 -0400
committer Dustin Graves <dustin@lunarg.com> Tue Apr 05 12:00:40 2016 -0600
tree 37afe06e4853245c44550aeadeb56d52ad0cd8fc
parent 1d5109d5e0dcc530b27e632e73e1be5e12a28dcd

layers: Change include order of loader platform.

This fixes a bug where on Windows, windows.h would include
winsock.h before winsock2.h, causing numerous warnings.

Change-Id: I8eba1497385dcee6ebb201c74fe48268e6663b9c

layers/unique_objects.h

diff --git a/layers/unique_objects.h b/layers/unique_objects.h
index b8effcf..3fbf54e 100644
--- a/layers/unique_objects.h
+++ b/layers/unique_objects.h
@@ -25,14 +25,14 @@
  * Author: Tobin Ehlis <tobine@google.com>
  */
 
+#include "vk_loader_platform.h"
+#include "vulkan/vulkan.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <inttypes.h>
 
-#include "vulkan/vulkan.h"
-#include "vk_loader_platform.h"
-
 #include <vector>
 #include <unordered_map>
 

vk-layer-generate.py

diff --git a/vk-layer-generate.py b/vk-layer-generate.py
index 3e25a80..c78116c 100755
--- a/vk-layer-generate.py
+++ b/vk-layer-generate.py
@@ -723,14 +723,14 @@
     def generate_header(self):
         header_txt = []
         header_txt.append('%s' % self.lineinfo.get())
+        header_txt.append('#include "vk_loader_platform.h"')
+        header_txt.append('#include "vulkan/vulkan.h"')
+        header_txt.append('')
         header_txt.append('#include <stdio.h>')
         header_txt.append('#include <stdlib.h>')
         header_txt.append('#include <string.h>')
         header_txt.append('#include <inttypes.h>')
         header_txt.append('')
-        header_txt.append('#include "vulkan/vulkan.h"')
-        header_txt.append('#include "vk_loader_platform.h"')
-        header_txt.append('')
         header_txt.append('#include <unordered_map>')
         header_txt.append('using namespace std;')
         header_txt.append('#include "vulkan/vk_layer.h"')