From a95e6b0848772879eb30672444d0835c13304618 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Thu, 12 Apr 2018 09:18:22 -0600 Subject: scripts: Remove generators from lvl_genvk.py Also remove unneeded include from common_codegen.py. Change-Id: I1b6833acb5654217d85bbc4284713aa12fa1a104 --- scripts/common_codegen.py | 1 - scripts/lvl_genvk.py | 328 +--------------------------------------------- 2 files changed, 1 insertion(+), 328 deletions(-) (limited to 'scripts') diff --git a/scripts/common_codegen.py b/scripts/common_codegen.py index 8662a6f2..aea552c5 100644 --- a/scripts/common_codegen.py +++ b/scripts/common_codegen.py @@ -22,7 +22,6 @@ import os,re,sys,string import xml.etree.ElementTree as etree from generator import * from collections import namedtuple -from vuid_mapping import * # Copyright text prefixing all headers (list of strings). prefixStrings = [ diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py index 887608d7..129e548c 100644 --- a/scripts/lvl_genvk.py +++ b/scripts/lvl_genvk.py @@ -18,14 +18,7 @@ import argparse, cProfile, pdb, string, sys, time from reg import * from generator import write from cgenerator import CGeneratorOptions, COutputGenerator -# LoaderAndValidationLayer Generator Modifications -from threading_generator import ThreadGeneratorOptions, ThreadOutputGenerator -from parameter_validation_generator import ParameterValidationGeneratorOptions, ParameterValidationOutputGenerator -from unique_objects_generator import UniqueObjectsGeneratorOptions, UniqueObjectsOutputGenerator -from object_tracker_generator import ObjectTrackerGeneratorOptions, ObjectTrackerOutputGenerator -from dispatch_table_helper_generator import DispatchTableHelperOutputGenerator, DispatchTableHelperOutputGeneratorOptions -from helper_file_generator import HelperFileOutputGenerator, HelperFileOutputGeneratorOptions -from loader_extension_generator import LoaderExtensionOutputGenerator, LoaderExtensionGeneratorOptions +# Generator Modifications from mock_icd_generator import MockICDGeneratorOptions, MockICDOutputGenerator # Simple timer functions @@ -122,325 +115,6 @@ def makeGenOpts(args): # Defaults for generating re-inclusion protection wrappers (or not) protectFeature = protect - # LoaderAndValidationLayer Generators - # Options for threading layer - genOpts['thread_check.h'] = [ - ThreadOutputGenerator, - ThreadGeneratorOptions( - filename = 'thread_check.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - protectFeature = False, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for parameter validation layer - genOpts['parameter_validation.cpp'] = [ - ParameterValidationOutputGenerator, - ParameterValidationGeneratorOptions( - filename = 'parameter_validation.cpp', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for unique objects layer - genOpts['unique_objects_wrappers.h'] = [ - UniqueObjectsOutputGenerator, - UniqueObjectsGeneratorOptions( - filename = 'unique_objects_wrappers.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - protectFeature = False, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for object_tracker layer - genOpts['object_tracker.cpp'] = [ - ObjectTrackerOutputGenerator, - ObjectTrackerGeneratorOptions( - filename = 'object_tracker.cpp', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - protectFeature = False, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for dispatch table helper generator - genOpts['vk_dispatch_table_helper.h'] = [ - DispatchTableHelperOutputGenerator, - DispatchTableHelperOutputGeneratorOptions( - filename = 'vk_dispatch_table_helper.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for Layer dispatch table generator - genOpts['vk_layer_dispatch_table.h'] = [ - LoaderExtensionOutputGenerator, - LoaderExtensionGeneratorOptions( - filename = 'vk_layer_dispatch_table.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for loader extension source generator - genOpts['vk_loader_extensions.h'] = [ - LoaderExtensionOutputGenerator, - LoaderExtensionGeneratorOptions( - filename = 'vk_loader_extensions.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Options for loader extension source generator - genOpts['vk_loader_extensions.c'] = [ - LoaderExtensionOutputGenerator, - LoaderExtensionGeneratorOptions( - filename = 'vk_loader_extensions.c', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False) - ] - - # Helper file generator options for vk_enum_string_helper.h - genOpts['vk_enum_string_helper.h'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_enum_string_helper.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'enum_string_header') - ] - - # Helper file generator options for vk_safe_struct.h - genOpts['vk_safe_struct.h'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_safe_struct.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'safe_struct_header') - ] - - # Helper file generator options for vk_safe_struct.cpp - genOpts['vk_safe_struct.cpp'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_safe_struct.cpp', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'safe_struct_source') - ] - - # Helper file generator options for vk_object_types.h - genOpts['vk_object_types.h'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_object_types.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'object_types_header') - ] - - # Helper file generator options for extension_helper.h - genOpts['vk_extension_helper.h'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_extension_helper.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'extension_helper_header') - ] - - # Helper file generator options for typemap_helper.h - genOpts['vk_typemap_helper.h'] = [ - HelperFileOutputGenerator, - HelperFileOutputGeneratorOptions( - filename = 'vk_typemap_helper.h', - directory = directory, - apiname = 'vulkan', - profile = None, - versions = featuresPat, - emitversions = featuresPat, - defaultExtensions = 'vulkan', - addExtensions = addExtensionsPat, - removeExtensions = removeExtensionsPat, - emitExtensions = emitExtensionsPat, - prefixText = prefixStrings + vkPrefixStrings, - protectFeature = False, - apicall = 'VKAPI_ATTR ', - apientry = 'VKAPI_CALL ', - apientryp = 'VKAPI_PTR *', - alignFuncParam = 48, - expandEnumerants = False, - helper_file_type = 'typemap_helper_header') - ] - # Options for mock ICD header genOpts['mock_icd.h'] = [ MockICDOutputGenerator, -- cgit v1.2.3