projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into radeon-rewrite
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_query.c
diff --git
a/src/gallium/drivers/softpipe/sp_query.c
b/src/gallium/drivers/softpipe/sp_query.c
index 2106ee1d235e7a982bdc071b1e7ba4dfe5dc3d53..379cf4ad064d201f35d12bea4e8b7bf53a001a98 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_query.c
+++ b/
src/gallium/drivers/softpipe/sp_query.c
@@
-31,14
+31,14
@@
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
#include "draw/draw_context.h"
#include "pipe/p_defines.h"
-#include "pipe/p_inlines.h"
#include "util/u_memory.h"
#include "sp_context.h"
#include "sp_query.h"
#include "util/u_memory.h"
#include "sp_context.h"
#include "sp_query.h"
+#include "sp_state.h"
struct softpipe_query {
struct softpipe_query {
- uint64 start;
- uint64 end;
+ uint64
_t
start;
+ uint64
_t
end;
};
};
@@
-70,6
+70,8
@@
softpipe_begin_query(struct pipe_context *pipe, struct pipe_query *q)
struct softpipe_query *sq = softpipe_query(q);
sq->start = softpipe->occlusion_count;
struct softpipe_query *sq = softpipe_query(q);
sq->start = softpipe->occlusion_count;
+ softpipe->active_query_count++;
+ softpipe->dirty |= SP_NEW_QUERY;
}
}
@@
-79,7
+81,9
@@
softpipe_end_query(struct pipe_context *pipe, struct pipe_query *q)
struct softpipe_context *softpipe = softpipe_context( pipe );
struct softpipe_query *sq = softpipe_query(q);
struct softpipe_context *softpipe = softpipe_context( pipe );
struct softpipe_query *sq = softpipe_query(q);
+ softpipe->active_query_count--;
sq->end = softpipe->occlusion_count;
sq->end = softpipe->occlusion_count;
+ softpipe->dirty |= SP_NEW_QUERY;
}
}
@@
-87,7
+91,7
@@
static boolean
softpipe_get_query_result(struct pipe_context *pipe,
struct pipe_query *q,
boolean wait,
softpipe_get_query_result(struct pipe_context *pipe,
struct pipe_query *q,
boolean wait,
- uint64 *result )
+ uint64
_t
*result )
{
struct softpipe_query *sq = softpipe_query(q);
*result = sq->end - sq->start;
{
struct softpipe_query *sq = softpipe_query(q);
*result = sq->end - sq->start;