projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv30
/
nv30_query.c
diff --git
a/src/gallium/drivers/nv30/nv30_query.c
b/src/gallium/drivers/nv30/nv30_query.c
index d40d75f264021d1344fbd41d1eb2f32a08de299b..1d1c8a484e1933da0d78cab6297e01bbce5377a4 100644
(file)
--- a/
src/gallium/drivers/nv30/nv30_query.c
+++ b/
src/gallium/drivers/nv30/nv30_query.c
@@
-29,11
+29,10
@@
nv30_query_create(struct pipe_context *pipe, unsigned query_type)
static void
nv30_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
{
static void
nv30_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
{
- struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_query *q = nv30_query(pq);
if (q->object)
struct nv30_query *q = nv30_query(pq);
if (q->object)
- n
v30->nvws->res
_free(&q->object);
+ n
ouveau_resource
_free(&q->object);
FREE(q);
}
FREE(q);
}
@@
-50,13
+49,13
@@
nv30_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
* the existing query to notify completion, but it could be better.
*/
if (q->object) {
* the existing query to notify completion, but it could be better.
*/
if (q->object) {
- uint64 tmp;
+ uint64
_t
tmp;
pipe->get_query_result(pipe, pq, 1, &tmp);
}
pipe->get_query_result(pipe, pq, 1, &tmp);
}
- if (n
v30->nvws->res
_alloc(nv30->screen->query_heap, 1, NULL, &q->object))
+ if (n
ouveau_resource
_alloc(nv30->screen->query_heap, 1, NULL, &q->object))
assert(0);
assert(0);
- n
v30->nvws->
notifier_reset(nv30->screen->query, q->object->start);
+ n
ouveau_
notifier_reset(nv30->screen->query, q->object->start);
BEGIN_RING(rankine, NV34TCL_QUERY_RESET, 1);
OUT_RING (1);
BEGIN_RING(rankine, NV34TCL_QUERY_RESET, 1);
OUT_RING (1);
@@
-80,31
+79,31
@@
nv30_query_end(struct pipe_context *pipe, struct pipe_query *pq)
static boolean
nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
static boolean
nv30_query_result(struct pipe_context *pipe, struct pipe_query *pq,
- boolean wait, uint64 *result)
+ boolean wait, uint64
_t
*result)
{
struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_query *q = nv30_query(pq);
{
struct nv30_context *nv30 = nv30_context(pipe);
struct nv30_query *q = nv30_query(pq);
- struct nouveau_winsys *nvws = nv30->nvws;
assert(q->object && q->type == PIPE_QUERY_OCCLUSION_COUNTER);
if (!q->ready) {
unsigned status;
assert(q->object && q->type == PIPE_QUERY_OCCLUSION_COUNTER);
if (!q->ready) {
unsigned status;
- status = n
vws->
notifier_status(nv30->screen->query,
- q->object->start);
+ status = n
ouveau_
notifier_status(nv30->screen->query,
+
q->object->start);
if (status != NV_NOTIFY_STATE_STATUS_COMPLETED) {
if (wait == FALSE)
return FALSE;
if (status != NV_NOTIFY_STATE_STATUS_COMPLETED) {
if (wait == FALSE)
return FALSE;
- nvws->notifier_wait(nv30->screen->query, q->object->start,
- NV_NOTIFY_STATE_STATUS_COMPLETED,
- 0);
+
+ nouveau_notifier_wait_status(nv30->screen->query,
+ q->object->start,
+ NV_NOTIFY_STATE_STATUS_COMPLETED, 0);
}
}
- q->result = n
vws->notifier_ret
val(nv30->screen->query,
- q->object->start);
+ q->result = n
ouveau_notifier_return_
val(nv30->screen->query,
+
q->object->start);
q->ready = TRUE;
q->ready = TRUE;
- n
vws->res
_free(&q->object);
+ n
ouveau_resource
_free(&q->object);
}
*result = q->result;
}
*result = q->result;