encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-13 23:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add .clang-format files and format more files

Browse Source 
The .clang-format files tell clang-format to ignore certain directories
(replacing code in lint_clang_format.sh which will be removed).

$ git ls-tree -r master --name-only | grep '\.\(c\|h\|cpp\|gn\|gni\|mm\|m\|py\)$' | xargs ./append-space-to-files
$ git checkout -- generator/templates third_party/khronos/{KHR,vulkan}
$ git cl format --full --python

Followed by manual reformatting of a few things in Python for
readability.

Bug: none
Change-Id: I4c9e472cc9a5cd80c07286e808f4e597cfef5428
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/24785
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Kai Ninomiya
2020-07-15 19:51:17 +00:00
committed by Commit Bot service account
parent 5a1d39ad0b
commit 01aeca22a9
12 changed files with 508 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
generator/opengl_loader_generator.py
View File

@@ -19,9 +19,10 @@ import xml.etree.ElementTree as etree
from generator_lib import Generator, run_generator, FileRender
class ProcName:
def __init__(self, gl_name, proc_name=None):
assert(gl_name.startswith('gl'))
assert gl_name.startswith('gl')
if proc_name == None:
proc_name = gl_name[2:]
@@ -40,7 +41,10 @@ class ProcName:
def __repr__(self):
return 'Proc("{}", "{}")'.format(self.gl_name, self.proc_name)
ProcParam = namedtuple('ProcParam', ['name', 'type'])
class Proc:
def __init__(self, element):
# Type declaration for return values and arguments all have the same
@@ -72,7 +76,9 @@ class Proc:
self.params = []
for param in element.findall('./param'):
self.params.append(ProcParam(param.find('name').text, parse_type_declaration(param)))
self.params.append(
ProcParam(
param.find('name').text, parse_type_declaration(param)))
self.gl_name = proto.find('name').text
self.alias = None
@@ -83,7 +89,7 @@ class Proc:
return self.gl_name
def ProcName(self):
assert(self.gl_name.startswith('gl'))
assert self.gl_name.startswith('gl')
return self.gl_name[2:]
def PFNGLPROCNAME(self):
@@ -92,11 +98,14 @@ class Proc:
def __repr__(self):
return 'Proc("{}")'.format(self.gl_name)
EnumDefine = namedtuple('EnumDefine', ['name', 'value'])
Version = namedtuple('Version', ['major', 'minor'])
VersionBlock = namedtuple('VersionBlock', ['version', 'procs', 'enums'])
HeaderBlock = namedtuple('HeaderBlock', ['description', 'procs', 'enums'])
ExtensionBlock = namedtuple('ExtensionBlock', ['extension', 'procs', 'enums', 'supported_specs'])
ExtensionBlock = namedtuple('ExtensionBlock',
['extension', 'procs', 'enums', 'supported_specs'])
def parse_version(version):
return Version(*map(int, version.split('.')))
@@ -107,7 +116,7 @@ def compute_params(root, supported_extensions):
all_procs = {}
for command in root.findall('''commands[@namespace='GL']/command'''):
proc = Proc(command)
assert(proc.gl_name not in all_procs)
assert proc.gl_name not in all_procs
all_procs[proc.gl_name] = proc
all_enums = {}
@@ -117,7 +126,7 @@ def compute_params(root, supported_extensions):
if enum_name == 'GL_ACTIVE_PROGRAM_EXT':
continue
assert(enum_name not in all_enums)
assert enum_name not in all_enums
all_enums[enum_name] = EnumDefine(enum_name, enum.attrib['value'])
# Get the list of all Desktop OpenGL function removed by the Core Profile.
@@ -126,13 +135,13 @@ def compute_params(root, supported_extensions):
core_removed_procs.add(proc.attrib['name'])
# Get list of enums and procs per OpenGL ES/Desktop OpenGL version
def parse_version_blocks(api, removed_procs = set()):
def parse_version_blocks(api, removed_procs=set()):
blocks = []
for section in root.findall('''feature[@api='{}']'''.format(api)):
section_procs = []
for command in section.findall('./require/command'):
proc_name = command.attrib['name']
assert(all_procs[proc_name].alias == None)
assert all_procs[proc_name].alias == None
if proc_name not in removed_procs:
section_procs.append(all_procs[proc_name])
@@ -140,7 +149,9 @@ def compute_params(root, supported_extensions):
for enum in section.findall('./require/enum'):
section_enums.append(all_enums[enum.attrib['name']])
blocks.append(VersionBlock(parse_version(section.attrib['number']), section_procs, section_enums))
blocks.append(
VersionBlock(parse_version(section.attrib['number']),
section_procs, section_enums))
return blocks
@@ -148,12 +159,13 @@ def compute_params(root, supported_extensions):
desktop_gl_blocks = parse_version_blocks('gl', core_removed_procs)
def parse_extension_block(extension):
section = root.find('''extensions/extension[@name='{}']'''.format(extension))
section = root.find(
'''extensions/extension[@name='{}']'''.format(extension))
supported_specs = section.attrib['supported'].split('|')
section_procs = []
for command in section.findall('./require/command'):
proc_name = command.attrib['name']
assert(all_procs[proc_name].alias == None)
assert all_procs[proc_name].alias == None
if proc_name not in removed_procs:
section_procs.append(all_procs[proc_name])
@@ -161,10 +173,11 @@ def compute_params(root, supported_extensions):
for enum in section.findall('./require/enum'):
section_enums.append(all_enums[enum.attrib['name']])
return ExtensionBlock(extension, section_procs, section_enums, supported_specs)
return ExtensionBlock(extension, section_procs, section_enums,
supported_specs)
extension_desktop_gl_blocks = [];
extension_gles_blocks = [];
extension_desktop_gl_blocks = []
extension_gles_blocks = []
for extension in supported_extensions:
extension_block = parse_extension_block(extension)
if 'gl' in extension_block.supported_specs:
@@ -176,6 +189,7 @@ def compute_params(root, supported_extensions):
already_added_header_procs = set()
already_added_header_enums = set()
header_blocks = []
def add_header_block(description, block):
block_procs = []
for proc in block.procs:
@@ -190,13 +204,18 @@ def compute_params(root, supported_extensions):
block_enums.append(enum)
if len(block_procs) > 0 or len(block_enums) > 0:
header_blocks.append(HeaderBlock(description, block_procs, block_enums))
header_blocks.append(
HeaderBlock(description, block_procs, block_enums))
for block in gles_blocks:
add_header_block('OpenGL ES {}.{}'.format(block.version.major, block.version.minor), block)
add_header_block(
'OpenGL ES {}.{}'.format(block.version.major, block.version.minor),
block)
for block in desktop_gl_blocks:
add_header_block('Desktop OpenGL {}.{}'.format(block.version.major, block.version.minor), block)
add_header_block(
'Desktop OpenGL {}.{}'.format(block.version.major,
block.version.minor), block)
for block in extension_desktop_gl_blocks:
add_header_block(block.extension, block)
@@ -212,30 +231,50 @@ def compute_params(root, supported_extensions):
'header_blocks': header_blocks,
}
class OpenGLLoaderGenerator(Generator):
def get_description(self):
return 'Generates code to load OpenGL function pointers'
def add_commandline_arguments(self, parser):
parser.add_argument('--gl-xml', required=True, type=str, help='The Khronos gl.xml to use.')
parser.add_argument('--supported-extensions', required=True, type=str, help ='The JSON file that defines the OpenGL and GLES extensions to use.')
parser.add_argument('--gl-xml',
required=True,
type=str,
help='The Khronos gl.xml to use.')
parser.add_argument(
'--supported-extensions',
required=True,
type=str,
help=
'The JSON file that defines the OpenGL and GLES extensions to use.'
)
def get_file_renders(self, args):
supported_extensions = []
with open(args.supported_extensions) as f:
supported_extensions_json = json.loads(f.read())
supported_extensions = supported_extensions_json['supported_extensions']
supported_extensions = supported_extensions_json[
'supported_extensions']
params = compute_params(etree.parse(args.gl_xml).getroot(), supported_extensions)
params = compute_params(
etree.parse(args.gl_xml).getroot(), supported_extensions)
return [
FileRender('opengl/OpenGLFunctionsBase.cpp', 'src/dawn_native/opengl/OpenGLFunctionsBase_autogen.cpp', [params]),
FileRender('opengl/OpenGLFunctionsBase.h', 'src/dawn_native/opengl/OpenGLFunctionsBase_autogen.h', [params]),
FileRender('opengl/opengl_platform.h', 'src/dawn_native/opengl/opengl_platform_autogen.h', [params]),
FileRender(
'opengl/OpenGLFunctionsBase.cpp',
'src/dawn_native/opengl/OpenGLFunctionsBase_autogen.cpp',
[params]),
FileRender('opengl/OpenGLFunctionsBase.h',
'src/dawn_native/opengl/OpenGLFunctionsBase_autogen.h',
[params]),
FileRender('opengl/opengl_platform.h',
'src/dawn_native/opengl/opengl_platform_autogen.h',
[params]),
]
def get_dependencies(self, args):
return [os.path.abspath(args.gl_xml)]
if __name__ == '__main__':
sys.exit(run_generator(OpenGLLoaderGenerator()))