From 82ea0b0103880d011ca679b14f0fc5542c5b2012 Mon Sep 17 00:00:00 2001
From: Mark Young <marky@lunarg.com>
Date: Thu, 19 Jan 2017 21:10:49 -0700
Subject: loader: Update the loader to 1.0.39

Add new extensions for 1.0.39.  Also, updated layers to include
minimal set of functionality for 1.0.39 extensions. Extensions include:
 - VK_KHR_get_physical_device_properties2
 - VK_KHR_shader_draw_parameters
 - VK_EXT_direct_mode_display
 - VK_EXT_display_surface_counter
 - VK_EXT_display_control

Also, redo the LoaderAndLayerIf document.

Change-Id: I10412086da7a798afe832a3892e18f606259b5af
---
 scripts/unique_objects_generator.py | 45 ++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 23 deletions(-)

(limited to 'scripts/unique_objects_generator.py')

diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py
index 46b7d8f0..6663df0b 100644
--- a/scripts/unique_objects_generator.py
+++ b/scripts/unique_objects_generator.py
@@ -408,30 +408,29 @@ class UniqueObjectsOutputGenerator(OutputGenerator):
     # Generate source for creating a non-dispatchable object
     def generate_create_ndo_code(self, indent, proto, params, cmd_info):
         create_ndo_code = ''
-        if True in [create_txt in proto.text for create_txt in ['Create', 'Allocate']]:
-            handle_type = params[-1].find('type')
-            if self.isHandleTypeNonDispatchable(handle_type.text):
-                # Check for special case where multiple handles are returned
-                ndo_array = False
-                if cmd_info[-1].len is not None:
-                    ndo_array = True;
-                handle_name = params[-1].find('name')
-                create_ndo_code += '%sif (VK_SUCCESS == result) {\n' % (indent)
+        handle_type = params[-1].find('type')
+        if self.isHandleTypeNonDispatchable(handle_type.text):
+            # Check for special case where multiple handles are returned
+            ndo_array = False
+            if cmd_info[-1].len is not None:
+                ndo_array = True;
+            handle_name = params[-1].find('name')
+            create_ndo_code += '%sif (VK_SUCCESS == result) {\n' % (indent)
+            indent = self.incIndent(indent)
+            create_ndo_code += '%sstd::lock_guard<std::mutex> lock(global_lock);\n' % (indent)
+            ndo_dest = '*%s' % handle_name.text
+            if ndo_array == True:
+                create_ndo_code += '%sfor (uint32_t index0 = 0; index0 < %s; index0++) {\n' % (indent, cmd_info[-1].len)
                 indent = self.incIndent(indent)
-                create_ndo_code += '%sstd::lock_guard<std::mutex> lock(global_lock);\n' % (indent)
-                ndo_dest = '*%s' % handle_name.text
-                if ndo_array == True:
-                    create_ndo_code += '%sfor (uint32_t index0 = 0; index0 < %s; index0++) {\n' % (indent, cmd_info[-1].len)
-                    indent = self.incIndent(indent)
-                    ndo_dest = '%s[index0]' % cmd_info[-1].name
-                create_ndo_code += '%suint64_t unique_id = global_unique_id++;\n' % (indent)
-                create_ndo_code += '%sdev_data->unique_id_mapping[unique_id] = reinterpret_cast<uint64_t &>(%s);\n' % (indent, ndo_dest)
-                create_ndo_code += '%s%s = reinterpret_cast<%s&>(unique_id);\n' % (indent, ndo_dest, handle_type.text)
-                if ndo_array == True:
-                    indent = self.decIndent(indent)
-                    create_ndo_code += '%s}\n' % indent
+                ndo_dest = '%s[index0]' % cmd_info[-1].name
+            create_ndo_code += '%suint64_t unique_id = global_unique_id++;\n' % (indent)
+            create_ndo_code += '%sdev_data->unique_id_mapping[unique_id] = reinterpret_cast<uint64_t &>(%s);\n' % (indent, ndo_dest)
+            create_ndo_code += '%s%s = reinterpret_cast<%s&>(unique_id);\n' % (indent, ndo_dest, handle_type.text)
+            if ndo_array == True:
                 indent = self.decIndent(indent)
-                create_ndo_code += '%s}\n' % (indent)
+                create_ndo_code += '%s}\n' % indent
+            indent = self.decIndent(indent)
+            create_ndo_code += '%s}\n' % (indent)
         return create_ndo_code
     #
     # Generate source for destroying a non-dispatchable object
@@ -685,7 +684,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator):
                     islocal = True
 
             isdestroy = True if True in [destroy_txt in cmdname for destroy_txt in ['Destroy', 'Free']] else False
-            iscreate = True if True in [create_txt in cmdname for create_txt in ['Create', 'Allocate']] else False
+            iscreate = True if True in [create_txt in cmdname for create_txt in ['Create', 'Allocate', 'GetRandROutputDisplayEXT', 'RegisterDeviceEvent', 'RegisterDisplayEvent']] else False
 
             membersInfo.append(self.CommandParam(type=type,
                                                  name=name,
-- 
cgit v1.2.3