-#!/usr/bin/env python
# Copyright (C) 2012 Intel Corporation
#
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
+from __future__ import print_function
+
import contextlib
import getopt
import gl_XML
def out(str):
if str:
- print ' '*current_indent + str
+ print(' '*current_indent + str)
else:
- print ''
+ print('')
@contextlib.contextmanager
'Copyright (C) 2012 Intel Corporation', 'INTEL CORPORATION')
def printRealHeader(self):
- print header
- print '#include <X11/Xlib-xcb.h>'
- print
- print 'static _X_INLINE int safe_mul(int a, int b)'
- print '{'
- print ' if (a < 0 || b < 0) return -1;'
- print ' if (a == 0 || b == 0) return 0;'
- print ' if (a > INT_MAX / b) return -1;'
- print ' return a * b;'
- print '}'
- print
+ print(header)
+ print('static inline int safe_mul(int a, int b)')
+ print('{')
+ print(' if (a < 0 || b < 0) return -1;')
+ print(' if (a == 0 || b == 0) return 0;')
+ print(' if (a > INT_MAX / b) return -1;')
+ print(' return a * b;')
+ print('}')
+ print()
def printRealFooter(self):
pass
out('return {0};'.format(call))
def print_sync_dispatch(self, func):
- out('_mesa_glthread_finish(ctx);')
+ out('debug_print_sync_fallback("{0}");'.format(func.name))
self.print_sync_call(func)
def print_sync_body(self, func):
if func.variable_params:
out('char *variable_data = (char *) (cmd + 1);')
for p in func.variable_params:
- out(('memcpy(variable_data, {0}, {1});').format(
+ if p.img_null_flag:
+ out('cmd->{0}_null = !{0};'.format(p.name))
+ out('if (!cmd->{0}_null) {{'.format(p.name))
+ with indent():
+ out(('memcpy(variable_data, {0}, {1});').format(
+ p.name, p.size_string(False)))
+ out('variable_data += {0};'.format(
+ p.size_string(False)))
+ out('}')
+ else:
+ out(('memcpy(variable_data, {0}, {1});').format(
p.name, p.size_string(False)))
- out('variable_data += {0};'.format(
+ out('variable_data += {0};'.format(
p.size_string(False)))
+
if not func.fixed_params and not func.variable_params:
out('(void) cmd;\n')
out('_mesa_post_marshal_hook(ctx);')
p.get_base_type_string(), p.name, p.count))
else:
out('{0} {1};'.format(p.type_string(), p.name))
+
+ for p in func.variable_params:
+ if p.img_null_flag:
+ out('bool {0}_null; /* If set, no data follows '
+ 'for "{0}" */'.format(p.name))
+
for p in func.variable_params:
if p.count_scale != 1:
out(('/* Next {0} bytes are '
with indent():
for p in func.fixed_params:
if p.count:
- out('const {0} * {1} = cmd->{1};'.format(
- p.get_base_type_string(), p.name))
+ p_decl = '{0} * {1} = cmd->{1};'.format(
+ p.get_base_type_string(), p.name)
else:
- out('const {0} {1} = cmd->{1};'.format(
- p.type_string(), p.name))
+ p_decl = '{0} {1} = cmd->{1};'.format(
+ p.type_string(), p.name)
+
+ if not p_decl.startswith('const '):
+ # Declare all local function variables as const, even if
+ # the original parameter is not const.
+ p_decl = 'const ' + p_decl
+
+ out(p_decl)
+
if func.variable_params:
for p in func.variable_params:
- out('const {0} * {1};'.format(
+ out('{0} * {1};'.format(
p.get_base_type_string(), p.name))
out('const char *variable_data = (const char *) (cmd + 1);')
for p in func.variable_params:
- out('{0} = (const {1} *) variable_data;'.format(
+ out('{0} = ({1} *) variable_data;'.format(
p.name, p.get_base_type_string()))
- out('variable_data += {0};'.format(p.size_string(False)))
+
+ if p.img_null_flag:
+ out('if (cmd->{0}_null)'.format(p.name))
+ with indent():
+ out('{0} = NULL;'.format(p.name))
+ out('else')
+ with indent():
+ out('variable_data += {0};'.format(p.size_string(False)))
+ else:
+ out('variable_data += {0};'.format(p.size_string(False)))
+
self.print_sync_call(func)
out('}')
+ def validate_count_or_fallback(self, func):
+ # Check that any counts for variable-length arguments might be < 0, in
+ # which case the command alloc or the memcpy would blow up before we
+ # get to the validation in Mesa core.
+ for p in func.parameters:
+ if p.is_variable_length():
+ out('if (unlikely({0} < 0)) {{'.format(p.size_string()))
+ with indent():
+ out('goto fallback_to_sync;')
+ out('}')
+ return True
+ return False
+
+
def print_async_marshal(self, func):
+ need_fallback_sync = False
out('static void GLAPIENTRY')
out('_mesa_marshal_{0}({1})'.format(
func.name, func.get_parameter_string()))
struct = 'struct marshal_cmd_{0}'.format(func.name)
size_terms = ['sizeof({0})'.format(struct)]
for p in func.variable_params:
- size_terms.append(p.size_string())
+ size = p.size_string()
+ if p.img_null_flag:
+ size = '({0} ? {1} : 0)'.format(p.name, size)
+ size_terms.append(size)
out('size_t cmd_size = {0};'.format(' + '.join(size_terms)))
out('{0} *cmd;'.format(struct))
out('debug_print_marshal("{0}");'.format(func.name))
- out('if (cmd_size <= MARSHAL_MAX_CMD_SIZE) {')
+ need_fallback_sync = self.validate_count_or_fallback(func)
+
+ if func.marshal_fail:
+ out('if ({0}) {{'.format(func.marshal_fail))
+ with indent():
+ out('_mesa_glthread_finish(ctx);')
+ out('_mesa_glthread_restore_dispatch(ctx, __func__);')
+ self.print_sync_dispatch(func)
+ out('return;')
+ out('}')
+
+ if len(func.variable_params) > 0:
with indent():
- self.print_async_dispatch(func)
- out('} else {')
+ out('if (cmd_size <= MARSHAL_MAX_CMD_SIZE) {')
+ with indent():
+ self.print_async_dispatch(func)
+ out('return;')
+ out('}')
+ out('')
+ if need_fallback_sync:
+ out('fallback_to_sync:')
with indent():
+ out('_mesa_glthread_finish(ctx);')
self.print_sync_dispatch(func)
- out('}')
-
+ else:
+ with indent():
+ self.print_async_dispatch(func)
+ assert not need_fallback_sync
out('}')
def print_async_body(self, func):
def show_usage():
- print 'Usage: %s [-f input_file_name]' % sys.argv[0]
+ print('Usage: %s [-f input_file_name]' % sys.argv[0])
sys.exit(1)
try:
(args, trail) = getopt.getopt(sys.argv[1:], 'm:f:')
- except Exception,e:
+ except Exception:
show_usage()
for (arg,val) in args:
projects / mesa.git / blobdiff