swr/rast: Fix autotools and scons codegen

Use new input flags for gen_archrast.py

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>

diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 3390ef6b096b9a24823758803b3fb05fd8e31b44..81bfaca54faf2c66bf112c0deef30e054af6713c 100644 (file)
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -159,40 +159,32 @@ rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasteri
        $(MKDIR_GEN)
        $(PYTHON_GEN) \
                $(srcdir)/rasterizer/codegen/gen_archrast.py \
-               --proto $(srcdir)/rasterizer/archrast/events.proto \
-               --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-               --output rasterizer/archrast/gen_ar_event.hpp \
-               --gen_event_hpp
+               --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
+               --output-dir rasterizer/codegen
        $(AM_V_GEN)touch $@
 
 rasterizer/archrast/gen_ar_event.cpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_event.cpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) \
                $(srcdir)/rasterizer/codegen/gen_archrast.py \
-               --proto $(srcdir)/rasterizer/archrast/events.proto \
-               --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-               --output rasterizer/archrast/gen_ar_event.cpp \
-               --gen_event_cpp
+               --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
+               --output-dir rasterizer/codegen
        $(AM_V_GEN)touch $@
 
 rasterizer/archrast/gen_ar_eventhandler.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandler.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) \
                $(srcdir)/rasterizer/codegen/gen_archrast.py \
-               --proto $(srcdir)/rasterizer/archrast/events.proto \
-               --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-               --output rasterizer/archrast/gen_ar_eventhandler.hpp \
-               --gen_eventhandler_hpp
+               --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
+               --output-dir rasterizer/codegen
        $(AM_V_GEN)touch $@
 
 rasterizer/archrast/gen_ar_eventhandlerfile.hpp: rasterizer/codegen/gen_archrast.py rasterizer/codegen/templates/gen_ar_eventhandlerfile.hpp rasterizer/archrast/events.proto rasterizer/archrast/events_private.proto rasterizer/codegen/gen_common.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) \
                $(srcdir)/rasterizer/codegen/gen_archrast.py \
-               --proto $(srcdir)/rasterizer/archrast/events.proto \
-               --proto_private $(srcdir)/rasterizer/archrast/events_private.proto \
-               --output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
-               --gen_eventhandlerfile_hpp
+               --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
+               --output-dir rasterizer/codegen
        $(AM_V_GEN)touch $@
 
 rasterizer/core/backends/gen_BackendPixelRate0.cpp \

diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript
index a89d02c5db0828b8acf6013907cc90489ea69f15..6d2d31a52606d5b3abee097ca8342bf48edd135a 100644 (file)
--- a/src/gallium/drivers/swr/SConscript
+++ b/src/gallium/drivers/swr/SConscript
@@ -106,7 +106,7 @@ env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_event.hpp',
     script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
-    command = python_cmd + ' $SCRIPT --proto $SOURCE --proto_private ' + srcroot + '/rasterizer/archrast/events_private.proto --output $TARGET --gen_event_hpp'
+    command = python_cmd + ' $SCRIPT --proto $SOURCE ' + srcroot + '/rasterizer/archrast/events_private.proto --output-dir ' + bldroot + '/rasterizer/archrast'
 )
 Depends('rasterizer/archrast/gen_ar_event.hpp',
         swrroot + 'rasterizer/archrast/events_private.proto')
@@ -117,7 +117,7 @@ env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_event.cpp',
     script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
-    command = python_cmd + ' $SCRIPT --proto $SOURCE --proto_private ' + srcroot + '/rasterizer/archrast/events_private.proto --output $TARGET --gen_event_cpp'
+    command = python_cmd + ' $SCRIPT --proto $SOURCE ' + srcroot + '/rasterizer/archrast/events_private.proto --output-dir ' + bldroot + '/rasterizer/archrast'
 )
 Depends('rasterizer/archrast/gen_ar_event.cpp',
         swrroot + 'rasterizer/archrast/events_private.proto')
@@ -128,7 +128,7 @@ env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_eventhandler.hpp',
     script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
-    command = python_cmd + ' $SCRIPT --proto $SOURCE --proto_private ' + srcroot + '/rasterizer/archrast/events_private.proto --output $TARGET --gen_eventhandler_hpp'
+    command = python_cmd + ' $SCRIPT --proto $SOURCE ' + srcroot + '/rasterizer/archrast/events_private.proto --output-dir ' + bldroot + '/rasterizer/archrast'
 )
 Depends('rasterizer/archrast/gen_ar_eventhandler.hpp',
         swrroot + 'rasterizer/archrast/events_private.proto')
@@ -139,7 +139,7 @@ env.CodeGenerate(
     target = 'rasterizer/archrast/gen_ar_eventhandlerfile.hpp',
     script = swrroot + 'rasterizer/codegen/gen_archrast.py',
     source = 'rasterizer/archrast/events.proto',
-    command = python_cmd + ' $SCRIPT --proto $SOURCE --proto_private ' + srcroot + '/rasterizer/archrast/events_private.proto --output $TARGET --gen_eventhandlerfile_hpp'
+    command = python_cmd + ' $SCRIPT --proto $SOURCE ' + srcroot + '/rasterizer/archrast/events_private.proto --output-dir ' + bldroot + '/rasterizer/archrast'
 )
 Depends('rasterizer/archrast/gen_ar_eventhandlerfile.hpp',
         swrroot + 'rasterizer/archrast/events_private.proto')