diff options
| author | Marek Olšák <[email protected]> | 2020-03-09 20:33:06 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-03-20 23:01:13 -0400 |
| commit | 11d3aa5e7bc7dc60f18e43adf35d43082feb759e (patch) | |
| tree | 768fc3e2f20fbb73049b25141efcaac92d12ff66 /src/mapi/glapi/gen | |
| parent | c02a1347e5c68d7f1c68ca6b90d2736e35b1fde5 (diff) | |
glthread: remove the marshal_fail XML attribute
Reviewed-by: Timothy Arceri <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>
Diffstat (limited to 'src/mapi/glapi/gen')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.dtd | 5 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_marshal.py | 8 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/marshal_XML.py | 1 |
3 files changed, 0 insertions, 14 deletions
diff --git a/src/mapi/glapi/gen/gl_API.dtd b/src/mapi/glapi/gen/gl_API.dtd index 96d70982c83..aceb69c07f6 100644 --- a/src/mapi/glapi/gen/gl_API.dtd +++ b/src/mapi/glapi/gen/gl_API.dtd @@ -40,7 +40,6 @@ exec NMTOKEN #IMPLIED desktop (true | false) "true" marshal NMTOKEN #IMPLIED - marshal_fail CDATA #IMPLIED> marshal_sync CDATA #IMPLIED> marshal_count CDATA #IMPLIED> marshal_call_after CDATA #IMPLIED> @@ -133,10 +132,6 @@ param: generated but a custom implementation will be present in marshal.c. If "draw", it will follow the "async" rules except that "indices" are ignored (since they may come from a VBO). - marshal_fail - an expression that, if it evaluates true, causes glthread - to switch back to the Mesa implementation and call it directly. Used - to disable glthread for GL compatibility interactions that we don't - want to track state for. marshal_sync - an expression that, if it evaluates true, causes glthread to sync and execute the call directly. marshal_count - same as count, but variable_param is ignored. Used by diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py index da71a1de787..bfa3f5bc34b 100644 --- a/src/mapi/glapi/gen/gl_marshal.py +++ b/src/mapi/glapi/gen/gl_marshal.py @@ -261,14 +261,6 @@ class PrintCode(gl_XML.gl_print_base): self.validate_count_or_fallback(func) - if func.marshal_fail: - out('if ({0}) {{'.format(func.marshal_fail)) - with indent(): - out('_mesa_glthread_disable(ctx, "{0}");'.format(func.name)) - self.print_sync_dispatch(func) - out('return;') - out('}') - if func.marshal_sync: out('if ({0}) {{'.format(func.marshal_sync)) with indent(): diff --git a/src/mapi/glapi/gen/marshal_XML.py b/src/mapi/glapi/gen/marshal_XML.py index f0be4f8780a..42c82c15e68 100644 --- a/src/mapi/glapi/gen/marshal_XML.py +++ b/src/mapi/glapi/gen/marshal_XML.py @@ -57,7 +57,6 @@ class marshal_function(gl_XML.gl_function): # Store the "marshal" attribute, if present. self.marshal = element.get('marshal') - self.marshal_fail = element.get('marshal_fail') self.marshal_sync = element.get('marshal_sync') self.marshal_call_after = element.get('marshal_call_after') |