KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

anv: Make some bits of anv_extensions module-private 

This way we can use "from anv_extensions import *" in the entrypoint
generator without worrying too much about pollution

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand 2017-08-01 10:59:40 -07:00
parent aab0649487
commit a25267654b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/anv_entrypoints_gen.py
View File

@ -30,7 +30,7 @@ import xml.etree.cElementTree as et
from mako.template import Template from mako.template import Template
import anv_extensions from anv_extensions import *
MAX_API_VERSION = 1.0 MAX_API_VERSION = 1.0
@ -268,7 +268,7 @@ def get_entrypoints(doc, entrypoints_to_defines):
for command in feature.findall('./require/command'): for command in feature.findall('./require/command'):
enabled_commands.add(command.attrib['name']) enabled_commands.add(command.attrib['name'])
supported = set(ext.name for ext in anv_extensions.EXTENSIONS) supported = set(ext.name for ext in EXTENSIONS)
for extension in doc.findall('.extensions/extension'): for extension in doc.findall('.extensions/extension'):
if extension.attrib['name'] not in supported: if extension.attrib['name'] not in supported:
continue continue

8
src/intel/vulkan/anv_extensions.py
View File

@ -64,7 +64,7 @@ EXTENSIONS = [
Extension('VK_KHX_multiview', 1, True), Extension('VK_KHX_multiview', 1, True),
] ]
def init_exts_from_xml(xml): def _init_exts_from_xml(xml):
""" Walk the Vulkan XML and fill out extra extension information. """ """ Walk the Vulkan XML and fill out extra extension information. """
xml = et.parse(xml) xml = et.parse(xml)
@ -84,7 +84,7 @@ def init_exts_from_xml(xml):
for ext in EXTENSIONS: for ext in EXTENSIONS:
assert ext.type == 'instance' or ext.type == 'device' assert ext.type == 'instance' or ext.type == 'device'
TEMPLATE = Template(COPYRIGHT + """ _TEMPLATE = Template(COPYRIGHT + """
#include "anv_private.h" #include "anv_private.h"
#include "vk_util.h" #include "vk_util.h"
@ -172,7 +172,7 @@ if __name__ == '__main__':
parser.add_argument('--xml', help='Vulkan API XML file.', required=True) parser.add_argument('--xml', help='Vulkan API XML file.', required=True)
args = parser.parse_args() args = parser.parse_args()
init_exts_from_xml(args.xml) _init_exts_from_xml(args.xml)
template_env = { template_env = {
'instance_extensions': [e for e in EXTENSIONS if e.type == 'instance'], 'instance_extensions': [e for e in EXTENSIONS if e.type == 'instance'],
@ -180,4 +180,4 @@ if __name__ == '__main__':
} }
with open(args.out, 'w') as f: with open(args.out, 'w') as f:
f.write(TEMPLATE.render(**template_env)) f.write(_TEMPLATE.render(**template_env))