summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2013-04-26 07:31:49 -0600
committerBrian Paul <[email protected]>2013-04-26 16:22:24 -0600
commitff74cf62b1244bd3bc53e83b685582f73fe6ffdd (patch)
tree3ebffd01d3a6aa2350f360f1efcc5bd23d483d18
parent38a751cbe85b7e31925931dc4994e7def5e5af96 (diff)
llvmpipe: replace LP_MAX_THREADS with screen->num_threads in query code
Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/drivers/llvmpipe/lp_query.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_query.c b/src/gallium/drivers/llvmpipe/lp_query.c
index 96e1e3ff1f3..fcb5c6ac340 100644
--- a/src/gallium/drivers/llvmpipe/lp_query.c
+++ b/src/gallium/drivers/llvmpipe/lp_query.c
@@ -38,6 +38,7 @@
#include "lp_flush.h"
#include "lp_fence.h"
#include "lp_query.h"
+#include "lp_screen.h"
#include "lp_state.h"
@@ -92,6 +93,7 @@ llvmpipe_get_query_result(struct pipe_context *pipe,
boolean wait,
union pipe_query_result *vresult)
{
+ struct llvmpipe_screen *screen = llvmpipe_screen(pipe->screen);
struct llvmpipe_query *pq = llvmpipe_query(q);
uint64_t *result = (uint64_t *)vresult;
int i;
@@ -118,12 +120,12 @@ llvmpipe_get_query_result(struct pipe_context *pipe,
switch (pq->type) {
case PIPE_QUERY_OCCLUSION_COUNTER:
- for (i = 0; i < LP_MAX_THREADS; i++) {
+ for (i = 0; i < screen->num_threads; i++) {
*result += pq->count[i];
}
break;
case PIPE_QUERY_TIMESTAMP:
- for (i = 0; i < LP_MAX_THREADS; i++) {
+ for (i = 0; i < screen->num_threads; i++) {
if (pq->count[i] > *result) {
*result = pq->count[i];
}