mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-14 07:36:15 +00:00
Dawn: Break dependency on ANGLE
Fixed: dawn:1715 Change-Id: I6d7965a9a73c42a2aca59b03379aa68aea1695c8 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/124460 Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
committed by
Dawn LUCI CQ
parent
d7d8b80c81
commit
d493c0f314
@@ -240,10 +240,6 @@ class OpenGLLoaderGenerator(Generator):
|
||||
required=True,
|
||||
type=str,
|
||||
help='The Khronos gl.xml to use.')
|
||||
parser.add_argument('--gl-angle-ext-xml',
|
||||
required=True,
|
||||
type=str,
|
||||
help='The ANGLE gl_angle_ext.xml to use.')
|
||||
parser.add_argument(
|
||||
'--supported-extensions',
|
||||
required=True,
|
||||
@@ -254,24 +250,14 @@ class OpenGLLoaderGenerator(Generator):
|
||||
|
||||
def get_file_renders(self, args):
|
||||
supported_extensions = []
|
||||
supported_angle_extensions = []
|
||||
with open(args.supported_extensions) as f:
|
||||
supported_extensions_json = json.loads(f.read())
|
||||
supported_extensions = supported_extensions_json[
|
||||
'supported_extensions']
|
||||
supported_angle_extensions = supported_extensions_json[
|
||||
'supported_angle_extensions']
|
||||
|
||||
params = compute_params(
|
||||
etree.parse(args.gl_xml).getroot(), supported_extensions)
|
||||
|
||||
angle_params = compute_params(
|
||||
etree.parse(args.gl_angle_ext_xml).getroot(),
|
||||
supported_angle_extensions)
|
||||
|
||||
for key, value in params.items():
|
||||
params[key] += angle_params[key]
|
||||
|
||||
return [
|
||||
FileRender(
|
||||
'opengl/OpenGLFunctionsBase.cpp',
|
||||
@@ -288,7 +274,6 @@ class OpenGLLoaderGenerator(Generator):
|
||||
def get_dependencies(self, args):
|
||||
return [
|
||||
os.path.abspath(args.gl_xml),
|
||||
os.path.abspath(args.gl_angle_ext_xml),
|
||||
os.path.abspath(args.supported_extensions)
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user