summaryrefslogtreecommitdiffstats
path: root/src/intel
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2018-01-20 10:14:10 -0800
committerJason Ekstrand <[email protected]>2018-01-23 00:15:40 -0800
commiteac29f3a6dc7f2659cdb34301a57b2618db1ed12 (patch)
tree9b17181c0f52dc0ff17edcc2f55ff9440a86a2c9 /src/intel
parent1f79d986afa5a92d7c7d85882714c7feeddc5d14 (diff)
anv/entrypoints: Use an named tuple for params
This allows us to store a bit more detailed data per-param Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r--src/intel/vulkan/anv_entrypoints_gen.py34
1 files changed, 23 insertions, 11 deletions
diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index 32359b6b713..5bae1949a80 100644
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -27,7 +27,7 @@ import functools
import os
import xml.etree.cElementTree as et
-from collections import OrderedDict
+from collections import OrderedDict, namedtuple
from mako.template import Template
from anv_extensions import *
@@ -77,7 +77,7 @@ extern const struct anv_dispatch_table ${layer}_dispatch_table;
#ifdef ${e.guard}
% endif
% for layer in LAYERS:
- ${e.return_type} ${e.prefixed_name(layer)}(${e.params});
+ ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()});
% endfor
% if e.guard is not None:
#endif // ${e.guard}
@@ -145,7 +145,7 @@ static const struct anv_entrypoint entrypoints[] = {
% if e.guard is not None:
#ifdef ${e.guard}
% endif
- ${e.return_type} ${e.prefixed_name(layer)}(${e.params}) __attribute__ ((weak));
+ ${e.return_type} ${e.prefixed_name(layer)}(${e.decl_params()}) __attribute__ ((weak));
% if e.guard is not None:
#endif // ${e.guard}
% endif
@@ -301,11 +301,13 @@ def cal_hash(name):
return functools.reduce(
lambda h, c: (h * PRIME_FACTOR + ord(c)) & U32_MASK, name, 0)
+EntrypointParam = namedtuple('EntrypointParam', 'type name decl')
+
class Entrypoint(object):
def __init__(self, name, return_type, params, guard = None):
self.name = name
self.return_type = return_type
- self.params = ', '.join(params)
+ self.params = params
self.guard = guard
self.enabled = False
self.num = None
@@ -317,6 +319,9 @@ class Entrypoint(object):
assert self.name.startswith('vk')
return prefix + '_' + self.name[2:]
+ def decl_params(self):
+ return ', '.join(p.decl for p in self.params)
+
def get_c_hash(self):
return cal_hash(self.name)
@@ -327,7 +332,11 @@ def get_entrypoints(doc, entrypoints_to_defines, start_index):
for command in doc.findall('./commands/command'):
ret_type = command.find('./proto/type').text
fullname = command.find('./proto/name').text
- params = (''.join(p.itertext()) for p in command.findall('./param'))
+ params = [EntrypointParam(
+ type = p.find('./type').text,
+ name = p.find('./name').text,
+ decl = ''.join(p.itertext())
+ ) for p in command.findall('./param')]
guard = entrypoints_to_defines.get(fullname)
# They really need to be unique
assert fullname not in entrypoints
@@ -437,12 +446,15 @@ def main():
# Manually add CreateDmaBufImageINTEL for which we don't have an extension
# defined.
- entrypoints.append(Entrypoint('vkCreateDmaBufImageINTEL', 'VkResult',
- ['VkDevice device',
- 'const VkDmaBufImageCreateInfo* pCreateInfo',
- 'const VkAllocationCallbacks* pAllocator',
- 'VkDeviceMemory* pMem',
- 'VkImage* pImage']))
+ entrypoints.append(Entrypoint('vkCreateDmaBufImageINTEL', 'VkResult', [
+ EntrypointParam('VkDevice', 'device', 'VkDevice device'),
+ EntrypointParam('VkDmaBufImageCreateInfo', 'pCreateInfo',
+ 'const VkDmaBufImageCreateInfo* pCreateInfo'),
+ EntrypointParam('VkAllocationCallbacks', 'pAllocator',
+ 'const VkAllocationCallbacks* pAllocator'),
+ EntrypointParam('VkDeviceMemory', 'pMem', 'VkDeviceMemory* pMem'),
+ EntrypointParam('VkImage', 'pImage', 'VkImage* pImage')
+ ]))
for num, e in enumerate(entrypoints):
e.num = num