aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-02-19 11:49:22 +0000
committerEmil Velikov <[email protected]>2017-02-24 17:36:25 +0000
commite3ad2d40dba4bd56ac5f7b8836728a795d6f89b4 (patch)
tree4a32ee196672f3852f9248318fd851b1b2e9c573
parentd1bb7895b98692e2c1932cd73e24816a4ac560b1 (diff)
radv/entrypoints: Only generate entrypoints for supported features
This changes the way radv_entrypoints_gen.py works from generating a table containing every single entrypoint in the XML to just the ones that we actually need. There's no reason for us to burn entrypoint table space on a bunch of NV extensions we never plan to implement. RADV implements VK_AMD_draw_indirect_count, so add that to the list. Port of 114c281e707919a1420d3a20219ce4392d8b360d "and/entrypoints: Only generate entrypoints for supported features" Signed-off-by: Emil Velikov <[email protected]> Acked-by: Dave Airlie <[email protected]>
-rw-r--r--src/amd/vulkan/radv_entrypoints_gen.py45
1 files changed, 42 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_entrypoints_gen.py b/src/amd/vulkan/radv_entrypoints_gen.py
index 5c3bd6f7bff..420de2c7871 100644
--- a/src/amd/vulkan/radv_entrypoints_gen.py
+++ b/src/amd/vulkan/radv_entrypoints_gen.py
@@ -25,6 +25,21 @@
import sys
import xml.etree.ElementTree as ET
+max_api_version = 1.0
+
+supported_extensions = [
+ 'VK_AMD_draw_indirect_count',
+ 'VK_KHR_get_physical_device_properties2',
+ 'VK_KHR_maintenance1',
+ 'VK_KHR_sampler_mirror_clamp_to_edge',
+ 'VK_KHR_shader_draw_parameters',
+ 'VK_KHR_surface',
+ 'VK_KHR_swapchain',
+ 'VK_KHR_wayland_surface',
+ 'VK_KHR_xcb_surface',
+ 'VK_KHR_xlib_surface',
+]
+
# We generate a static hash table for entry point lookup
# (vkGetProcAddress). We use a linear congruential generator for our hash
# function and a power-of-two size table. The prime numbers are determined
@@ -66,10 +81,32 @@ elif (sys.argv[1] == "code"):
# Extract the entry points from the registry
def get_entrypoints(doc, entrypoints_to_defines):
entrypoints = []
- commands = doc.findall('./commands/command')
- for i, command in enumerate(commands):
+
+ enabled_commands = set()
+ for feature in doc.findall('./feature'):
+ assert feature.attrib['api'] == 'vulkan'
+ if float(feature.attrib['number']) > max_api_version:
+ continue
+
+ for command in feature.findall('./require/command'):
+ enabled_commands.add(command.attrib['name'])
+
+ for extension in doc.findall('.extensions/extension'):
+ if extension.attrib['name'] not in supported_extensions:
+ continue
+
+ assert extension.attrib['supported'] == 'vulkan'
+ for command in extension.findall('./require/command'):
+ enabled_commands.add(command.attrib['name'])
+
+ index = 0
+ for command in doc.findall('./commands/command'):
type = command.find('./proto/type').text
fullname = command.find('./proto/name').text
+
+ if fullname not in enabled_commands:
+ continue
+
shortname = fullname[2:]
params = map(lambda p: "".join(p.itertext()), command.findall('./param'))
params = ', '.join(params)
@@ -77,7 +114,9 @@ def get_entrypoints(doc, entrypoints_to_defines):
guard = entrypoints_to_defines[fullname]
else:
guard = None
- entrypoints.append((type, shortname, params, i, hash(fullname), guard))
+ entrypoints.append((type, shortname, params, index, hash(fullname), guard))
+ index += 1
+
return entrypoints
# Maps entry points to extension defines