fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

swr/rast: Fix autotools and scons codegen

Browse source 
Use new input flags for gen_archrast.py

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
This commit is contained in:
Alok Hota 2019-02-19 14:29:35 -06:00
parent 16e10b8c30
commit 773b3ceaca
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/gallium/drivers/swr/Makefile.am
View file

@ -159,40 +159,32 @@ rasterizer/archrast/gen_ar_event.hpp: rasterizer/codegen/gen_archrast.py rasteri
$(MKDIR_GEN) $(MKDIR_GEN)
$(PYTHON_GEN) \ $(PYTHON_GEN) \
$(srcdir)/rasterizer/codegen/gen_archrast.py \ $(srcdir)/rasterizer/codegen/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \ --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ --output-dir rasterizer/codegen
--output rasterizer/archrast/gen_ar_event.hpp \
--gen_event_hpp
$(AM_V_GEN)touch $@ $(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 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) $(MKDIR_GEN)
$(PYTHON_GEN) \ $(PYTHON_GEN) \
$(srcdir)/rasterizer/codegen/gen_archrast.py \ $(srcdir)/rasterizer/codegen/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \ --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ --output-dir rasterizer/codegen
--output rasterizer/archrast/gen_ar_event.cpp \
--gen_event_cpp
$(AM_V_GEN)touch $@ $(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 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) $(MKDIR_GEN)
$(PYTHON_GEN) \ $(PYTHON_GEN) \
$(srcdir)/rasterizer/codegen/gen_archrast.py \ $(srcdir)/rasterizer/codegen/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \ --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ --output-dir rasterizer/codegen
--output rasterizer/archrast/gen_ar_eventhandler.hpp \
--gen_eventhandler_hpp
$(AM_V_GEN)touch $@ $(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 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) $(MKDIR_GEN)
$(PYTHON_GEN) \ $(PYTHON_GEN) \
$(srcdir)/rasterizer/codegen/gen_archrast.py \ $(srcdir)/rasterizer/codegen/gen_archrast.py \
--proto $(srcdir)/rasterizer/archrast/events.proto \ --proto $(srcdir)/rasterizer/archrast/events.proto $(srcdir)/rasterizer/archrast/events_private.proto \
--proto_private $(srcdir)/rasterizer/archrast/events_private.proto \ --output-dir rasterizer/codegen
--output rasterizer/archrast/gen_ar_eventhandlerfile.hpp \
--gen_eventhandlerfile_hpp
$(AM_V_GEN)touch $@ $(AM_V_GEN)touch $@
rasterizer/core/backends/gen_BackendPixelRate0.cpp \ rasterizer/core/backends/gen_BackendPixelRate0.cpp \

8
src/gallium/drivers/swr/SConscript
View file

@ -106,7 +106,7 @@ env.CodeGenerate(
target = 'rasterizer/archrast/gen_ar_event.hpp', target = 'rasterizer/archrast/gen_ar_event.hpp',
script = swrroot + 'rasterizer/codegen/gen_archrast.py', script = swrroot + 'rasterizer/codegen/gen_archrast.py',
source = 'rasterizer/archrast/events.proto', 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', Depends('rasterizer/archrast/gen_ar_event.hpp',
swrroot + 'rasterizer/archrast/events_private.proto') swrroot + 'rasterizer/archrast/events_private.proto')
@ -117,7 +117,7 @@ env.CodeGenerate(
target = 'rasterizer/archrast/gen_ar_event.cpp', target = 'rasterizer/archrast/gen_ar_event.cpp',
script = swrroot + 'rasterizer/codegen/gen_archrast.py', script = swrroot + 'rasterizer/codegen/gen_archrast.py',
source = 'rasterizer/archrast/events.proto', 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', Depends('rasterizer/archrast/gen_ar_event.cpp',
swrroot + 'rasterizer/archrast/events_private.proto') swrroot + 'rasterizer/archrast/events_private.proto')
@ -128,7 +128,7 @@ env.CodeGenerate(
target = 'rasterizer/archrast/gen_ar_eventhandler.hpp', target = 'rasterizer/archrast/gen_ar_eventhandler.hpp',
script = swrroot + 'rasterizer/codegen/gen_archrast.py', script = swrroot + 'rasterizer/codegen/gen_archrast.py',
source = 'rasterizer/archrast/events.proto', 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', Depends('rasterizer/archrast/gen_ar_eventhandler.hpp',
swrroot + 'rasterizer/archrast/events_private.proto') swrroot + 'rasterizer/archrast/events_private.proto')
@ -139,7 +139,7 @@ env.CodeGenerate(
target = 'rasterizer/archrast/gen_ar_eventhandlerfile.hpp', target = 'rasterizer/archrast/gen_ar_eventhandlerfile.hpp',
script = swrroot + 'rasterizer/codegen/gen_archrast.py', script = swrroot + 'rasterizer/codegen/gen_archrast.py',
source = 'rasterizer/archrast/events.proto', 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', Depends('rasterizer/archrast/gen_ar_eventhandlerfile.hpp',
swrroot + 'rasterizer/archrast/events_private.proto') swrroot + 'rasterizer/archrast/events_private.proto')