diff options
| author | Marek Olšák <[email protected]> | 2017-11-25 21:36:36 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-11-29 18:21:30 +0100 |
| commit | d96c7e7822d42a4db269dedbbec4f3f7852c91a1 (patch) | |
| tree | 0a13f04a7b245378041d935c223d34f9aebe645a /src | |
| parent | c63e225bff7417f792dc99f069dbdafc619e32d9 (diff) | |
radeonsi: just include si_pipe.h in r600_query.c
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/radeon/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_query.c | 9 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am index 7f64b7615fe..d5570926885 100644 --- a/src/gallium/drivers/radeon/Makefile.am +++ b/src/gallium/drivers/radeon/Makefile.am @@ -5,6 +5,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ $(GALLIUM_DRIVER_CFLAGS) \ $(RADEON_CFLAGS) \ + -I$(top_srcdir)/src/amd/common \ -Wstrict-overflow=0 # ^^ disable warnings about overflows (os_time_timeout) diff --git a/src/gallium/drivers/radeon/meson.build b/src/gallium/drivers/radeon/meson.build index 8563060480b..6857df3cd30 100644 --- a/src/gallium/drivers/radeon/meson.build +++ b/src/gallium/drivers/radeon/meson.build @@ -51,6 +51,6 @@ libradeon = static_library( c_args : ['-Wstrict-overflow=0', c_vis_args], dependencies : [dep_llvm, dep_clock], include_directories : [ - inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, + inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers, inc_amd_common, ], ) diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c index 0a03061ab91..324bc91592e 100644 --- a/src/gallium/drivers/radeon/r600_query.c +++ b/src/gallium/drivers/radeon/r600_query.c @@ -22,6 +22,7 @@ * USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "radeonsi/si_pipe.h" #include "r600_query.h" #include "r600_cs.h" #include "util/u_memory.h" @@ -30,10 +31,6 @@ #include "tgsi/tgsi_text.h" #include "amd/common/sid.h" -/* TODO: remove this: */ -void si_update_prims_generated_query_state(struct r600_common_context *rctx, - unsigned type, int diff); - #define R600_MAX_STREAMS 4 struct r600_hw_query_params { @@ -808,7 +805,7 @@ static void r600_query_hw_emit_start(struct r600_common_context *ctx, return; // previous buffer allocation failure r600_update_occlusion_query_state(ctx, query->b.type, 1); - si_update_prims_generated_query_state(ctx, query->b.type, 1); + si_update_prims_generated_query_state((void*)ctx, query->b.type, 1); ctx->need_gfx_cs_space(&ctx->b, query->num_cs_dw_begin + query->num_cs_dw_end, true); @@ -922,7 +919,7 @@ static void r600_query_hw_emit_stop(struct r600_common_context *ctx, ctx->num_cs_dw_queries_suspend -= query->num_cs_dw_end; r600_update_occlusion_query_state(ctx, query->b.type, -1); - si_update_prims_generated_query_state(ctx, query->b.type, -1); + si_update_prims_generated_query_state((void*)ctx, query->b.type, -1); } static void emit_set_predicate(struct r600_common_context *ctx, |