summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2019-01-11 00:21:06 -0800
committerKenneth Graunke <[email protected]>2019-02-21 10:26:11 -0800
commita23c06cabcfaaca4386eff7b73c9fb62894f6519 (patch)
treeb20cb330ebbeb8f6f927eca20e34abb9593be7bd /src/gallium/drivers
parent5aef30b886460d50b0ffec4f6d210e04c9ecf421 (diff)
iris: Use new PIPE_STAT_QUERY enums rather than hardcoded numbers.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/iris/iris_query.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index 0318b76a0f2..9d854f4bdcd 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -701,7 +701,9 @@ calculate_result_on_gpu(struct iris_context *ice, struct iris_query *q)
iris_batch_emit(batch, math, sizeof(math));
/* WaDividePSInvocationCountBy4:HSW,BDW */
- if (q->type == PIPE_QUERY_PIPELINE_STATISTICS && q->index == 7 && devinfo->gen == 8)
+ if (devinfo->gen == 8 &&
+ q->type == PIPE_QUERY_PIPELINE_STATISTICS &&
+ q->index == PIPE_STAT_QUERY_PS_INVOCATIONS)
shr_gpr0_by_2_bits(ice);
if (q->type == PIPE_QUERY_OCCLUSION_PREDICATE ||
@@ -724,7 +726,8 @@ iris_create_query(struct pipe_context *ctx,
q->type = query_type;
q->index = index;
- if (q->type == PIPE_QUERY_PIPELINE_STATISTICS && q->index == 10)
+ if (q->type == PIPE_QUERY_PIPELINE_STATISTICS &&
+ q->index == PIPE_STAT_QUERY_CS_INVOCATIONS)
q->batch_idx = IRIS_BATCH_COMPUTE;
else
q->batch_idx = IRIS_BATCH_RENDER;