diff options
| author | Chris Forbes <chrisforbes@google.com> | 2017-05-02 16:26:23 -0700 |
|---|---|---|
| committer | Chris Forbes <chrisf@ijw.co.nz> | 2017-05-03 11:38:06 -0700 |
| commit | 04c739104d66020cebaf981a9bfa5d8ce622df45 (patch) | |
| tree | d2fd02ee48d66baaf1e84eb1fa8cb4b0adcef59b /scripts/unique_objects_generator.py | |
| parent | df6205fbe1cc7beae323dac2dea783d25f302327 (diff) | |
| download | usermoji-04c739104d66020cebaf981a9bfa5d8ce622df45.tar.xz | |
layers: UO: split device and instance data
Diffstat (limited to 'scripts/unique_objects_generator.py')
| -rw-r--r-- | scripts/unique_objects_generator.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py index 8e9cc45b..a08276fa 100644 --- a/scripts/unique_objects_generator.py +++ b/scripts/unique_objects_generator.py @@ -873,7 +873,10 @@ class UniqueObjectsOutputGenerator(OutputGenerator): dispatchable_type = cmdinfo.elem.find('param/type').text dispatchable_name = cmdinfo.elem.find('param/name').text # Generate local instance/pdev/device data lookup - self.appendSection('command', ' layer_data *dev_data = GetLayerDataPtr(get_dispatch_key('+dispatchable_name+'), layer_data_map);') + if dispatchable_type in ["VkPhysicalDevice", "VkInstance"]: + self.appendSection('command', ' instance_layer_data *dev_data = GetLayerDataPtr(get_dispatch_key('+dispatchable_name+'), instance_layer_data_map);') + else: + self.appendSection('command', ' layer_data *dev_data = GetLayerDataPtr(get_dispatch_key('+dispatchable_name+'), layer_data_map);') # Handle return values, if any resulttype = cmdinfo.elem.find('proto/type') if (resulttype != None and resulttype.text == 'void'): @@ -901,10 +904,7 @@ class UniqueObjectsOutputGenerator(OutputGenerator): else: paramstext = paramstext.replace(param.name, '(%s %s)local_%s' % ('const', param.type, param.name)) # Use correct dispatch table - if dispatchable_type in ["VkPhysicalDevice", "VkInstance"]: - API = cmdinfo.elem.attrib.get('name').replace('vk','dev_data->instance_dispatch_table->',1) - else: - API = cmdinfo.elem.attrib.get('name').replace('vk','dev_data->device_dispatch_table->',1) + API = cmdinfo.elem.attrib.get('name').replace('vk','dev_data->dispatch_table->',1) # Put all this together for the final down-chain call self.appendSection('command', ' ' + assignresult + API + '(' + paramstext + ');') # And add the post-API-call codegen |