diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/swr/.gitignore | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/Makefile.am | 126 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/SConscript | 38 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/gen_archrast.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/gen_backends.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/gen_knobs.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py (renamed from src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_ir_macros.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py (renamed from src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_types.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/knob_defs.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/knob_defs.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/__init__.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/__init__.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/_ast_util.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/_ast_util.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/ast.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/ast.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/cache.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/cache.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/cmd.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/cmd.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/codegen.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/codegen.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/compat.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/compat.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/exceptions.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/exceptions.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/filters.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/filters.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/lexer.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/lexer.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/lookup.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/lookup.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/parsetree.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/parsetree.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/pygen.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/pygen.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/pyparser.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/pyparser.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/runtime.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/runtime.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/template.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/template.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/mako/util.py (renamed from src/gallium/drivers/swr/rasterizer/scripts/mako/util.py) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_cpp.template (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_cpp.template) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_h.template (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_h.template) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandler_h.template (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandler_h.template) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandlerfile_h.template (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandlerfile_h.template) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/backend_template.cpp (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/backend_template.cpp) | 0 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/codegen/templates/knobs.template (renamed from src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template) | 0 |
32 files changed, 84 insertions, 84 deletions
diff --git a/src/gallium/drivers/swr/.gitignore b/src/gallium/drivers/swr/.gitignore index b6c5faa110a..ec3b400461b 100644 --- a/src/gallium/drivers/swr/.gitignore +++ b/src/gallium/drivers/swr/.gitignore @@ -8,6 +8,6 @@ rasterizer/jitter/builder_gen.h rasterizer/jitter/builder_x86.cpp rasterizer/jitter/builder_x86.h rasterizer/jitter/state_llvm.h -rasterizer/scripts/gen_knobs.cpp -rasterizer/scripts/gen_knobs.h +rasterizer/codegen/gen_knobs.cpp +rasterizer/codegen/gen_knobs.h rasterizer/core/BackendPixelRate0.cpp diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am index c67eadc05df..e5cf6f24305 100644 --- a/src/gallium/drivers/swr/Makefile.am +++ b/src/gallium/drivers/swr/Makefile.am @@ -33,12 +33,12 @@ COMMON_CXXFLAGS = \ $(GALLIUM_DRIVER_CFLAGS) \ $(LLVM_CXXFLAGS) \ $(SWR_CXX11_CXXFLAGS) \ - -I$(builddir)/rasterizer/scripts \ + -I$(builddir)/rasterizer/codegen \ -I$(builddir)/rasterizer/jitter \ -I$(builddir)/rasterizer/archrast \ -I$(srcdir)/rasterizer \ -I$(srcdir)/rasterizer/core \ - -I$(srcdir)/rasterizer/scripts \ + -I$(srcdir)/rasterizer/codegen \ -I$(srcdir)/rasterizer/jitter \ -I$(srcdir)/rasterizer/archrast @@ -53,8 +53,8 @@ COMMON_SOURCES = \ BUILT_SOURCES = \ swr_context_llvm.h \ - rasterizer/scripts/gen_knobs.cpp \ - rasterizer/scripts/gen_knobs.h \ + rasterizer/codegen/gen_knobs.cpp \ + rasterizer/codegen/gen_knobs.h \ rasterizer/jitter/state_llvm.h \ rasterizer/jitter/builder_x86.h \ rasterizer/jitter/builder_x86.cpp \ @@ -66,93 +66,93 @@ BUILT_SOURCES = \ MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D) PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) -swr_context_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py swr_context.h +swr_context_llvm.h: rasterizer/codegen/gen_llvm_types.py swr_context.h $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_types.py \ --input $(srcdir)/swr_context.h \ --output swr_context_llvm.h -rasterizer/scripts/gen_knobs.cpp: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template +rasterizer/codegen/gen_knobs.cpp: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/knobs.template $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_knobs.py \ - --input $(srcdir)/rasterizer/scripts/templates/knobs.template \ - --output rasterizer/scripts/gen_knobs.cpp \ + $(srcdir)/rasterizer/codegen/gen_knobs.py \ + --input $(srcdir)/rasterizer/codegen/templates/knobs.template \ + --output rasterizer/codegen/gen_knobs.cpp \ --gen_cpp -rasterizer/scripts/gen_knobs.h: rasterizer/scripts/gen_knobs.py rasterizer/scripts/knob_defs.py rasterizer/scripts/templates/knobs.template +rasterizer/codegen/gen_knobs.h: rasterizer/codegen/gen_knobs.py rasterizer/codegen/knob_defs.py rasterizer/codegen/templates/knobs.template $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_knobs.py \ - --input $(srcdir)/rasterizer/scripts/templates/knobs.template \ - --output rasterizer/scripts/gen_knobs.h \ + $(srcdir)/rasterizer/codegen/gen_knobs.py \ + --input $(srcdir)/rasterizer/codegen/templates/knobs.template \ + --output rasterizer/codegen/gen_knobs.h \ --gen_h -rasterizer/jitter/state_llvm.h: rasterizer/jitter/scripts/gen_llvm_types.py rasterizer/core/state.h +rasterizer/jitter/state_llvm.h: rasterizer/codegen/gen_llvm_types.py rasterizer/core/state.h $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_types.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_types.py \ --input $(srcdir)/rasterizer/core/state.h \ --output rasterizer/jitter/state_llvm.h -rasterizer/jitter/builder_gen.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py +rasterizer/jitter/builder_gen.h: rasterizer/codegen/gen_llvm_ir_macros.py $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \ --output rasterizer/jitter/builder_gen.h \ --gen_h -rasterizer/jitter/builder_gen.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py +rasterizer/jitter/builder_gen.cpp: rasterizer/codegen/gen_llvm_ir_macros.py $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ --input $(LLVM_INCLUDEDIR)/llvm/IR/IRBuilder.h \ --output rasterizer/jitter/builder_gen.cpp \ --gen_cpp -rasterizer/jitter/builder_x86.h: rasterizer/jitter/scripts/gen_llvm_ir_macros.py +rasterizer/jitter/builder_x86.h: rasterizer/codegen/gen_llvm_ir_macros.py $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ --output rasterizer/jitter/builder_x86.h \ --gen_x86_h -rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.py +rasterizer/jitter/builder_x86.cpp: rasterizer/codegen/gen_llvm_ir_macros.py $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ + $(srcdir)/rasterizer/codegen/gen_llvm_ir_macros.py \ --output rasterizer/jitter/builder_x86.cpp \ --gen_x86_cpp -rasterizer/archrast/gen_ar_event.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_h.template rasterizer/archrast/events.proto +rasterizer/archrast/gen_ar_event.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_h.template rasterizer/archrast/events.proto $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_archrast.py \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ --proto $(srcdir)/rasterizer/archrast/events.proto \ --output rasterizer/archrast/gen_ar_event.h \ --gen_event_h -rasterizer/archrast/gen_ar_event.cpp: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_event_cpp.template rasterizer/archrast/events.proto +rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_event_cpp.template rasterizer/archrast/events.proto $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_archrast.py \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ --proto $(srcdir)/rasterizer/archrast/events.proto \ --output rasterizer/archrast/gen_ar_event.cpp \ --gen_event_cpp -rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto +rasterizer/archrast/gen_ar_eventhandler.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandler_h.template rasterizer/archrast/events.proto $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_archrast.py \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ --proto $(srcdir)/rasterizer/archrast/events.proto \ --output rasterizer/archrast/gen_ar_eventhandler.h \ --gen_eventhandler_h -rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.py rasterizer/scripts/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto +rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/ar_eventhandlerfile_h.template rasterizer/archrast/events.proto $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_archrast.py \ + $(srcdir)/rasterizer/codegen/gen_archrast.py \ --proto $(srcdir)/rasterizer/archrast/events.proto \ --output rasterizer/archrast/gen_ar_eventhandlerfile.h \ --gen_eventhandlerfile_h @@ -163,10 +163,10 @@ rasterizer/archrast/gen_ar_eventhandlerfile.h: rasterizer/scripts/gen_archrast.p # 2 centroid # 2 forcedSampleCount # 2 canEarlyZ -rasterizer/core/BackendPixelRate0.cpp: rasterizer/scripts/gen_backends.py rasterizer/scripts/templates/backend_template.cpp +rasterizer/core/BackendPixelRate0.cpp: rasterizer/codegen/gen_backends.py rasterizer/codegen/templates/backend_template.cpp $(MKDIR_GEN) $(PYTHON_GEN) \ - $(srcdir)/rasterizer/scripts/gen_backends.py \ + $(srcdir)/rasterizer/codegen/gen_backends.py \ --outdir rasterizer/core \ --dim 5 2 3 2 2 2 \ --split 0 \ @@ -263,32 +263,32 @@ include $(top_srcdir)/install-gallium-links.mk EXTRA_DIST = \ SConscript \ rasterizer/archrast/events.proto \ - rasterizer/jitter/scripts/gen_llvm_ir_macros.py \ - rasterizer/jitter/scripts/gen_llvm_types.py \ - rasterizer/scripts/gen_archrast.py \ - rasterizer/scripts/gen_backends.py \ - rasterizer/scripts/gen_knobs.py \ - rasterizer/scripts/knob_defs.py \ - rasterizer/scripts/mako/ast.py \ - rasterizer/scripts/mako/_ast_util.py \ - rasterizer/scripts/mako/cache.py \ - rasterizer/scripts/mako/cmd.py \ - rasterizer/scripts/mako/codegen.py \ - rasterizer/scripts/mako/compat.py \ - rasterizer/scripts/mako/exceptions.py \ - rasterizer/scripts/mako/filters.py \ - rasterizer/scripts/mako/__init__.py \ - rasterizer/scripts/mako/lexer.py \ - rasterizer/scripts/mako/lookup.py \ - rasterizer/scripts/mako/parsetree.py \ - rasterizer/scripts/mako/pygen.py \ - rasterizer/scripts/mako/pyparser.py \ - rasterizer/scripts/mako/runtime.py \ - rasterizer/scripts/mako/template.py \ - rasterizer/scripts/mako/util.py \ - rasterizer/scripts/templates/knobs.template \ - rasterizer/scripts/templates/ar_event_h.template \ - rasterizer/scripts/templates/ar_event_cpp.template \ - rasterizer/scripts/templates/ar_eventhandler_h.template \ - rasterizer/scripts/templates/ar_eventhandlerfile_h.template \ - rasterizer/scripts/templates/backend_template.cpp + rasterizer/codegen/gen_llvm_ir_macros.py \ + rasterizer/codegen/gen_llvm_types.py \ + rasterizer/codegen/gen_archrast.py \ + rasterizer/codegen/gen_backends.py \ + rasterizer/codegen/gen_knobs.py \ + rasterizer/codegen/knob_defs.py \ + rasterizer/codegen/mako/ast.py \ + rasterizer/codegen/mako/_ast_util.py \ + rasterizer/codegen/mako/cache.py \ + rasterizer/codegen/mako/cmd.py \ + rasterizer/codegen/mako/codegen.py \ + rasterizer/codegen/mako/compat.py \ + rasterizer/codegen/mako/exceptions.py \ + rasterizer/codegen/mako/filters.py \ + rasterizer/codegen/mako/__init__.py \ + rasterizer/codegen/mako/lexer.py \ + rasterizer/codegen/mako/lookup.py \ + rasterizer/codegen/mako/parsetree.py \ + rasterizer/codegen/mako/pygen.py \ + rasterizer/codegen/mako/pyparser.py \ + rasterizer/codegen/mako/runtime.py \ + rasterizer/codegen/mako/template.py \ + rasterizer/codegen/mako/util.py \ + rasterizer/codegen/templates/knobs.template \ + rasterizer/codegen/templates/ar_event_h.template \ + rasterizer/codegen/templates/ar_event_cpp.template \ + rasterizer/codegen/templates/ar_eventhandler_h.template \ + rasterizer/codegen/templates/ar_eventhandlerfile_h.template \ + rasterizer/codegen/templates/backend_template.cpp diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript index dafeb9229d7..eb20b00982f 100644 --- a/src/gallium/drivers/swr/SConscript +++ b/src/gallium/drivers/swr/SConscript @@ -49,85 +49,85 @@ if not env['msvc'] : swrroot = '#src/gallium/drivers/swr/' env.CodeGenerate( - target = 'rasterizer/scripts/gen_knobs.cpp', - script = swrroot + 'rasterizer/scripts/gen_knobs.py', - source = 'rasterizer/scripts/templates/knobs.template', + target = 'rasterizer/codegen/gen_knobs.cpp', + script = swrroot + 'rasterizer/codegen/gen_knobs.py', + source = 'rasterizer/codegen/templates/knobs.template', command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_cpp' ) env.CodeGenerate( - target = 'rasterizer/scripts/gen_knobs.h', - script = swrroot + 'rasterizer/scripts/gen_knobs.py', - source = 'rasterizer/scripts/templates/knobs.template', + target = 'rasterizer/codegen/gen_knobs.h', + script = swrroot + 'rasterizer/codegen/gen_knobs.py', + source = 'rasterizer/codegen/templates/knobs.template', command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_h' ) env.CodeGenerate( target = 'rasterizer/jitter/state_llvm.h', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_types.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_types.py', source = 'rasterizer/core/state.h', command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET' ) env.CodeGenerate( target = 'rasterizer/jitter/builder_gen.h', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py', source = os.path.join(llvm_includedir, 'llvm/IR/IRBuilder.h'), command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_h' ) env.CodeGenerate( target = 'rasterizer/jitter/builder_gen.cpp', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py', source = os.path.join(llvm_includedir, 'llvm/IR/IRBuilder.h'), command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET --gen_cpp' ) env.CodeGenerate( target = 'rasterizer/jitter/builder_x86.h', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py', source = '', command = python_cmd + ' $SCRIPT --output $TARGET --gen_x86_h' ) env.CodeGenerate( target = 'rasterizer/jitter/builder_x86.cpp', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_ir_macros.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_ir_macros.py', source = '', command = python_cmd + ' $SCRIPT --output $TARGET --gen_x86_cpp' ) env.CodeGenerate( target = 'swr_context_llvm.h', - script = swrroot + 'rasterizer/jitter/scripts/gen_llvm_types.py', + script = swrroot + 'rasterizer/codegen/gen_llvm_types.py', source = 'swr_context.h', command = python_cmd + ' $SCRIPT --input $SOURCE --output $TARGET' ) env.CodeGenerate( target = 'rasterizer/archrast/gen_ar_event.h', - script = swrroot + 'rasterizer/scripts/gen_archrast.py', + script = swrroot + 'rasterizer/codegen/gen_archrast.py', source = 'rasterizer/archrast/events.proto', command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_event_h' ) env.CodeGenerate( target = 'rasterizer/archrast/gen_ar_event.cpp', - script = swrroot + 'rasterizer/scripts/gen_archrast.py', + script = swrroot + 'rasterizer/codegen/gen_archrast.py', source = 'rasterizer/archrast/events.proto', command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_event_cpp' ) env.CodeGenerate( target = 'rasterizer/archrast/gen_ar_eventhandler.h', - script = swrroot + 'rasterizer/scripts/gen_archrast.py', + script = swrroot + 'rasterizer/codegen/gen_archrast.py', source = 'rasterizer/archrast/events.proto', command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_eventhandler_h' ) env.CodeGenerate( target = 'rasterizer/archrast/gen_ar_eventhandlerfile.h', - script = swrroot + 'rasterizer/scripts/gen_archrast.py', + script = swrroot + 'rasterizer/codegen/gen_archrast.py', source = 'rasterizer/archrast/events.proto', command = python_cmd + ' $SCRIPT --proto $SOURCE --output $TARGET --gen_eventhandlerfile_h' ) @@ -140,13 +140,13 @@ env.CodeGenerate( # 2 canEarlyZ env.CodeGenerate( target = 'rasterizer/core/BackendPixelRate0.cpp', - script = swrroot + 'rasterizer/scripts/gen_backends.py', + script = swrroot + 'rasterizer/codegen/gen_backends.py', command = python_cmd + ' $SCRIPT --output rasterizer/core --dim 5 2 3 2 2 2 --split 0 --cpp' ) # Auto-generated .cpp files (that need to generate object files) built_sources = [ - 'rasterizer/scripts/gen_knobs.cpp', + 'rasterizer/codegen/gen_knobs.cpp', 'rasterizer/jitter/builder_gen.cpp', 'rasterizer/jitter/builder_x86.cpp', 'rasterizer/archrast/gen_ar_event.cpp', @@ -168,7 +168,7 @@ env.Prepend(LIBS = [ mesautil, mesa, gallium ]) env.Prepend(CPPPATH = [ '.', 'rasterizer', - 'rasterizer/scripts', + 'rasterizer/codegen', 'rasterizer/core', 'rasterizer/jitter', 'rasterizer/archrast', diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_archrast.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py index 901d6d8d05b..901d6d8d05b 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/gen_archrast.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_backends.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py index cbbc3780a68..cbbc3780a68 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/gen_backends.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/gen_knobs.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py index 225082e7882..225082e7882 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/gen_knobs.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py diff --git a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_ir_macros.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py index 70d35762bc5..70d35762bc5 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_ir_macros.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py diff --git a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_types.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py index e88158c14d8..e88158c14d8 100644 --- a/src/gallium/drivers/swr/rasterizer/jitter/scripts/gen_llvm_types.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/knob_defs.py b/src/gallium/drivers/swr/rasterizer/codegen/knob_defs.py index 3c6940d8428..3c6940d8428 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/knob_defs.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/knob_defs.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/__init__.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/__init__.py index d9638481889..d9638481889 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/__init__.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/__init__.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/_ast_util.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/_ast_util.py index efbc4fc245d..efbc4fc245d 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/_ast_util.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/_ast_util.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/ast.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/ast.py index 65fd84dfe15..65fd84dfe15 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/ast.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/ast.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/cache.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/cache.py index c405c5171d7..c405c5171d7 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/cache.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/cache.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/cmd.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/cmd.py index 1a9ca56637c..1a9ca56637c 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/cmd.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/cmd.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/codegen.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/codegen.py index 4b0bda86731..4b0bda86731 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/codegen.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/codegen.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/compat.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/compat.py index fe277bbf05a..fe277bbf05a 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/compat.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/compat.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/exceptions.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/exceptions.py index c531f2118d0..c531f2118d0 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/exceptions.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/exceptions.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/filters.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/filters.py index d79ce2388f6..d79ce2388f6 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/filters.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/filters.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/lexer.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/lexer.py index 1dda398215d..1dda398215d 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/lexer.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/lexer.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/lookup.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/lookup.py index 2af5411907a..2af5411907a 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/lookup.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/lookup.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/parsetree.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/parsetree.py index 49ec4e0696c..49ec4e0696c 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/parsetree.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/parsetree.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/pygen.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/pygen.py index 5ba5125a4c7..5ba5125a4c7 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/pygen.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/pygen.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/pyparser.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/pyparser.py index bfa46a9fafd..bfa46a9fafd 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/pyparser.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/pyparser.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/runtime.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/runtime.py index 6b6a35a9215..6b6a35a9215 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/runtime.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/runtime.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/template.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/template.py index fb6106289fa..fb6106289fa 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/template.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/template.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/mako/util.py b/src/gallium/drivers/swr/rasterizer/codegen/mako/util.py index cba2ab7920c..cba2ab7920c 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/mako/util.py +++ b/src/gallium/drivers/swr/rasterizer/codegen/mako/util.py diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_cpp.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_cpp.template index 4b3dcd57dbc..4b3dcd57dbc 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_cpp.template +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_cpp.template diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_h.template index 68926ea8053..68926ea8053 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_event_h.template +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_event_h.template diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandler_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandler_h.template index cfed2aded0c..cfed2aded0c 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandler_h.template +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandler_h.template diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandlerfile_h.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandlerfile_h.template index 48ff0b0a958..48ff0b0a958 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/ar_eventhandlerfile_h.template +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/ar_eventhandlerfile_h.template diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/backend_template.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/backend_template.cpp index f015f5f179c..f015f5f179c 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/backend_template.cpp +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/backend_template.cpp diff --git a/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template b/src/gallium/drivers/swr/rasterizer/codegen/templates/knobs.template index 1ae45e52e74..1ae45e52e74 100644 --- a/src/gallium/drivers/swr/rasterizer/scripts/templates/knobs.template +++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/knobs.template |