From 990c8a9df9f7b7081b0406fcffcae6f37c1d39e7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 4 Oct 2006 21:55:55 +0000 Subject: [PATCH] Keep indentation consistent with indent. Remove code in the Python scripts that keeps the indentation of the generated code consistent for all cases. Instead, pass the generated code through the indent command. Unix tools for the win! --- src/mesa/glapi/Makefile | 12 ++-- src/mesa/glapi/glX_proto_send.py | 117 +++++++++++++++---------------- src/mesa/glapi/glX_proto_size.py | 10 +-- 3 files changed, 67 insertions(+), 72 deletions(-) diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile index b7b1330ad14..d92fc8dfd6f 100644 --- a/src/mesa/glapi/Makefile +++ b/src/mesa/glapi/Makefile @@ -37,6 +37,8 @@ API_XML = gl_API.xml \ COMMON = gl_XML.py license.py $(API_XML) typeexpr.py COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py +INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce + all: $(OUTPUTS) server: $(SERVER_OUTPUTS) @@ -73,7 +75,7 @@ dispatch.h: $(COMMON) gl_table.py $(PYTHON2) $(PYTHON_FLAGS) extension_helper.py > ../drivers/dri/common/extension_helper.h ../../glx/x11/indirect.c: $(COMMON_GLX) glX_proto_send.py - $(PYTHON2) $(PYTHON_FLAGS) glX_proto_send.py -m proto > ../../glx/x11/indirect.c + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_send.py -m proto | indent $(INDENT_FLAGS) > ../../glx/x11/indirect.c ../../glx/x11/indirect.h: $(COMMON_GLX) glX_proto_send.py $(PYTHON2) $(PYTHON_FLAGS) glX_proto_send.py -m init_h > ../../glx/x11/indirect.h @@ -82,10 +84,10 @@ dispatch.h: $(COMMON) gl_table.py $(PYTHON2) $(PYTHON_FLAGS) glX_proto_send.py -m init_c > ../../glx/x11/indirect_init.c ../../glx/x11/indirect_size.h: $(COMMON_GLX) glX_proto_size.py - $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-set -h _INDIRECT_SIZE_H_ > ../../glx/x11/indirect_size.h + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-set -h _INDIRECT_SIZE_H_ | indent $(INDENT_FLAGS) > ../../glx/x11/indirect_size.h ../../glx/x11/indirect_size.c: $(COMMON_GLX) glX_proto_size.py - $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c --only-set > ../../glx/x11/indirect_size.c + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c --only-set | indent $(INDENT_FLAGS) > ../../glx/x11/indirect_size.c $(GLX_DIR)/indirect_dispatch.c: $(COMMON_GLX) glX_proto_recv.py $(PYTHON2) $(PYTHON_FLAGS) glX_proto_recv.py -m dispatch_c > $@ @@ -97,10 +99,10 @@ $(GLX_DIR)/indirect_dispatch.h: $(COMMON_GLX) glX_proto_recv.py glX_API.xml $(PYTHON2) $(PYTHON_FLAGS) glX_proto_recv.py -m dispatch_h -f gl_and_glX_API.xml -s > $@ $(GLX_DIR)/indirect_size_get.h: $(COMMON_GLX) glX_proto_size.py - $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' > $@ + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' | indent $(INDENT_FLAGS) > $@ $(GLX_DIR)/indirect_size_get.c: $(COMMON_GLX) glX_proto_size.py - $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c > $@ + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c | indent $(INDENT_FLAGS) > $@ $(GLX_DIR)/indirect_table.c: $(COMMON_GLX) glX_server_table.py glX_API.xml $(PYTHON2) $(PYTHON_FLAGS) glX_server_table.py -f gl_and_glX_API.xml > $@ diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py index f8153e4c2e2..30ffd2b1d7d 100644 --- a/src/mesa/glapi/glX_proto_send.py +++ b/src/mesa/glapi/glX_proto_send.py @@ -397,25 +397,25 @@ generic_%u_byte( GLint rop, const void * ptr ) return - def common_emit_one_arg(self, p, pc, indent, adjust, extra_offset): + def common_emit_one_arg(self, p, pc, adjust, extra_offset): if p.is_array(): src_ptr = p.name else: src_ptr = "&" + p.name if not extra_offset: - print '%s (void) memcpy((void *)(%s + %u), (void *)(%s), %s);' \ - % (indent, pc, p.offset + adjust, src_ptr, p.size_string() ) + print '(void) memcpy((void *)(%s + %u), (void *)(%s), %s);' \ + % (pc, p.offset + adjust, src_ptr, p.size_string() ) else: - print '%s (void) memcpy((void *)(%s + %u + %s), (void *)(%s), %s);' \ - % (indent, pc, p.offset + adjust, extra_offset, src_ptr, p.size_string() ) + print '(void) memcpy((void *)(%s + %u + %s), (void *)(%s), %s);' \ + % (pc, p.offset + adjust, extra_offset, src_ptr, p.size_string() ) - def common_emit_args(self, f, pc, indent, adjust, skip_vla): + def common_emit_args(self, f, pc, adjust, skip_vla): extra_offset = None for p in f.parameterIterateGlxSend( not skip_vla ): if p.name != f.img_reset: - self.common_emit_one_arg(p, pc, indent, adjust, extra_offset) + self.common_emit_one_arg(p, pc, adjust, extra_offset) if p.is_variable_length(): temp = p.size_string() @@ -427,7 +427,7 @@ generic_%u_byte( GLint rop, const void * ptr ) return - def pixel_emit_args(self, f, pc, indent, large): + def pixel_emit_args(self, f, pc, large): """Emit the arguments for a pixel function. This differs from common_emit_args in that pixel functions may require padding be inserted (i.e., for the missing width field for @@ -441,10 +441,10 @@ generic_%u_byte( GLint rop, const void * ptr ) for param in f.parameterIterateGlxSend(): if not param.is_image(): - self.common_emit_one_arg(param, pc, indent, adjust, None) + self.common_emit_one_arg(param, pc, adjust, None) if f.pad_after(param): - print '%s (void) memcpy((void *)(%s + %u), zero, 4);' % (indent, pc, (param.offset + param.size()) + adjust) + print '(void) memcpy((void *)(%s + %u), zero, 4);' % (pc, (param.offset + param.size()) + adjust) else: [dim, width, height, depth, extent] = param.get_dimensions() @@ -455,9 +455,9 @@ generic_%u_byte( GLint rop, const void * ptr ) if param.img_null_flag: if large: - print '%s (void) memcpy((void *)(%s + %u), zero, 4);' % (indent, pc, (param.offset - 4) + adjust) + print '(void) memcpy((void *)(%s + %u), zero, 4);' % (pc, (param.offset - 4) + adjust) else: - print '%s (void) memcpy((void *)(%s + %u), (void *)((%s == NULL) ? one : zero), 4);' % (indent, pc, (param.offset - 4) + adjust, param.name) + print '(void) memcpy((void *)(%s + %u), (void *)((%s == NULL) ? one : zero), 4);' % (pc, (param.offset - 4) + adjust, param.name) pixHeaderPtr = "%s + %u" % (pc, adjust) @@ -469,27 +469,26 @@ generic_%u_byte( GLint rop, const void * ptr ) else: condition = 'compsize > 0' - print '%s if (%s) {' % (indent, condition) - print '%s (*gc->fillImage)(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (indent, dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) - print '%s }' % (indent) - print '%s else {' % (indent) - print '%s (void) memcpy( %s, default_pixel_store_%uD, default_pixel_store_%uD_size );' % (indent, pixHeaderPtr, dim, dim) - print '%s }' % (indent) + print 'if (%s) {' % (condition) + print ' (*gc->fillImage)(gc, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) + print '} else {' + print ' (void) memcpy( %s, default_pixel_store_%uD, default_pixel_store_%uD_size );' % (pixHeaderPtr, dim, dim) + print '}' else: - print '%s __glXSendLargeImage(gc, compsize, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (indent, dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) + print '__glXSendLargeImage(gc, compsize, %s, %s, %s, %s, %s, %s, %s, %s, %s);' % (dim_str, width, height, depth, param.img_format, param.img_type, param.name, pcPtr, pixHeaderPtr) return - def large_emit_begin(self, indent, f, op_name = None): + def large_emit_begin(self, f, op_name = None): if not op_name: op_name = f.opcode_real_name() - print '%s const GLint op = %s;' % (indent, op_name) - print '%s const GLuint cmdlenLarge = cmdlen + 4;' % (indent) - print '%s GLubyte * const pc = __glXFlushRenderBuffer(gc, gc->pc);' % (indent) - print '%s (void) memcpy((void *)(pc + 0), (void *)(&cmdlenLarge), 4);' % (indent) - print '%s (void) memcpy((void *)(pc + 4), (void *)(&op), 4);' % (indent) + print 'const GLint op = %s;' % (op_name) + print 'const GLuint cmdlenLarge = cmdlen + 4;' + print 'GLubyte * const pc = __glXFlushRenderBuffer(gc, gc->pc);' + print '(void) memcpy((void *)(pc + 0), (void *)(&cmdlenLarge), 4);' + print '(void) memcpy((void *)(pc + 4), (void *)(&op), 4);' return @@ -619,7 +618,7 @@ generic_%u_byte( GLint rop, const void * ptr ) else: print ' %s __glXSetupSingleRequest(gc, %s, cmdlen);' % (pc_decl, f.opcode_name()) - self.common_emit_args(f, "pc", " ", 0, 0) + self.common_emit_args(f, "pc", 0, 0) images = f.get_images() @@ -722,39 +721,36 @@ generic_%u_byte( GLint rop, const void * ptr ) if self.common_func_print_just_start(f): - indent = " " trailer = " }" else: - indent = "" trailer = None if f.can_be_large: - print '%s if (cmdlen <= gc->maxSmallRenderCommandSize) {' % (indent) - print '%s if ( (gc->pc + cmdlen) > gc->bufEnd ) {' % (indent) - print '%s (void) __glXFlushRenderBuffer(gc, gc->pc);' % (indent) - print '%s }' % (indent) - indent += " " + print 'if (cmdlen <= gc->maxSmallRenderCommandSize) {' + print ' if ( (gc->pc + cmdlen) > gc->bufEnd ) {' + print ' (void) __glXFlushRenderBuffer(gc, gc->pc);' + print ' }' if f.glx_rop == ~0: opcode = "opcode" else: opcode = f.opcode_real_name() - print '%s emit_header(gc->pc, %s, cmdlen);' % (indent, opcode) + print 'emit_header(gc->pc, %s, cmdlen);' % (opcode) - self.pixel_emit_args( f, "gc->pc", indent, 0 ) - print '%s gc->pc += cmdlen;' % (indent) - print '%s if (gc->pc > gc->limit) { (void) __glXFlushRenderBuffer(gc, gc->pc); }' % (indent) + self.pixel_emit_args( f, "gc->pc", 0 ) + print 'gc->pc += cmdlen;' + print 'if (gc->pc > gc->limit) { (void) __glXFlushRenderBuffer(gc, gc->pc); }' if f.can_be_large: - print '%s}' % (indent) - print '%selse {' % (indent) + print '}' + print 'else {' - self.large_emit_begin(indent, f, opcode) - self.pixel_emit_args( f, "pc", indent, 1 ) + self.large_emit_begin(f, opcode) + self.pixel_emit_args(f, "pc", 1) - print '%s}' % (indent) + print '}' if trailer: print trailer return @@ -777,42 +773,39 @@ generic_%u_byte( GLint rop, const void * ptr ) return if self.common_func_print_just_start(f): - indent = " " trailer = " }" else: - indent = "" trailer = None if self.debug: - print '%s printf( "Enter %%s...\\n", "gl%s" );' % (indent, f.name) + print 'printf( "Enter %%s...\\n", "gl%s" );' % (f.name) if f.can_be_large: - print '%s if (cmdlen <= gc->maxSmallRenderCommandSize) {' % (indent) - print '%s if ( (gc->pc + cmdlen) > gc->bufEnd ) {' % (indent) - print '%s (void) __glXFlushRenderBuffer(gc, gc->pc);' % (indent) - print '%s }' % (indent) - indent += " " + print 'if (cmdlen <= gc->maxSmallRenderCommandSize) {' + print ' if ( (gc->pc + cmdlen) > gc->bufEnd ) {' + print ' (void) __glXFlushRenderBuffer(gc, gc->pc);' + print ' }' - print '%s emit_header(gc->pc, %s, cmdlen);' % (indent, f.opcode_real_name()) + print 'emit_header(gc->pc, %s, cmdlen);' % (f.opcode_real_name()) - self.common_emit_args(f, "gc->pc", indent, 4, 0) - print '%s gc->pc += cmdlen;' % (indent) - print '%s if (__builtin_expect(gc->pc > gc->limit, 0)) { (void) __glXFlushRenderBuffer(gc, gc->pc); }' % (indent) + self.common_emit_args(f, "gc->pc", 4, 0) + print 'gc->pc += cmdlen;' + print 'if (__builtin_expect(gc->pc > gc->limit, 0)) { (void) __glXFlushRenderBuffer(gc, gc->pc); }' if f.can_be_large: - print '%s}' % (indent) - print '%selse {' % (indent) + print '}' + print 'else {' - self.large_emit_begin(indent, f) - self.common_emit_args(f, "pc", indent, 8, 1) + self.large_emit_begin(f) + self.common_emit_args(f, "pc", 8, 1) p = f.variable_length_parameter() - print '%s __glXSendLargeCommand(gc, pc, %u, %s, %s);' % (indent, p.offset + 8, p.name, p.size_string()) - print '%s}' % (indent) + print ' __glXSendLargeCommand(gc, pc, %u, %s, %s);' % (p.offset + 8, p.name, p.size_string()) + print '}' if self.debug: - print '%s __indirect_glFinish();' % (indent) - print '%s printf( "Exit %%s.\\n", "gl%s" );' % (indent, f.name) + print '__indirect_glFinish();' + print 'printf( "Exit %%s.\\n", "gl%s" );' % (f.name) if trailer: print trailer return diff --git a/src/mesa/glapi/glX_proto_size.py b/src/mesa/glapi/glX_proto_size.py index 54232781d29..18bfa1b71bc 100644 --- a/src/mesa/glapi/glX_proto_size.py +++ b/src/mesa/glapi/glX_proto_size.py @@ -277,7 +277,7 @@ class glx_server_enum_function(glx_enum_function): for o in keys: p = f.parameters_by_name[ foo[o] ] - printer.common_emit_one_arg(p, "pc", " ", 0) + printer.common_emit_one_arg(p, "pc", 0) fixup.append( p.name ) @@ -544,11 +544,11 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): return - def common_emit_one_arg(self, p, pc, indent, adjust): + def common_emit_one_arg(self, p, pc, adjust): offset = p.offset dst = p.string() src = '(%s *)' % (p.type_string()) - print '%s%-18s = *%11s(%s + %u);' % (indent, dst, src, pc, offset + adjust); + print '%-18s = *%11s(%s + %u);' % (dst, src, pc, offset + adjust); return @@ -582,7 +582,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): img = f.images[0] for p in f.parameterIterateGlxSend(): if p.name in [w, h, d, img.img_format, img.img_type, img.img_target]: - self.common_emit_one_arg( p, "pc", " ", 0 ) + self.common_emit_one_arg(p, "pc", 0) fixup.append( p.name ) print '' @@ -640,7 +640,7 @@ class PrintGlxReqSize_c(PrintGlxReqSize_common): self.common_func_print_just_header(f) for p in params: - self.common_emit_one_arg(p, "pc", " ", 0 ) + self.common_emit_one_arg(p, "pc", 0) print '' -- 2.30.2