fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 01:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: just include si_pipe.h in r600_query.c

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-11-25 21:36:36 +01:00
parent c63e225bff
commit d96c7e7822
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/radeon/Makefile.am
View file

@ -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)

2
src/gallium/drivers/radeon/meson.build
View file

@ -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,
],
)

9
src/gallium/drivers/radeon/r600_query.c
View file

@ -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,