summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/nv40/nv40_query.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-02-29 23:08:01 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-02-29 23:08:01 +1100
commit17f6db9d0197657cd753249ef60355c6fd983032 (patch)
tree62a00ab44eab8eb0ec43268a3d4143242cb008aa /src/gallium/drivers/nv40/nv40_query.c
parentbaaae562f02563c5966b857c61b3eae7341950e3 (diff)
nv40: move "channel context" stuff into nv40_screen
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_query.c')
-rw-r--r--src/gallium/drivers/nv40/nv40_query.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
index 8bca2788b9..0317845624 100644
--- a/src/gallium/drivers/nv40/nv40_query.c
+++ b/src/gallium/drivers/nv40/nv40_query.c
@@ -45,9 +45,9 @@ nv40_query_begin(struct pipe_context *pipe, struct pipe_query *pq)
assert(q->type == PIPE_QUERY_OCCLUSION_COUNTER);
- if (nv40->nvws->res_alloc(nv40->hw->query_heap, 1, NULL, &q->object))
+ if (nv40->nvws->res_alloc(nv40->screen->query_heap, 1, NULL, &q->object))
assert(0);
- nv40->nvws->notifier_reset(nv40->hw->query, q->object->start);
+ nv40->nvws->notifier_reset(nv40->screen->query, q->object->start);
BEGIN_RING(curie, NV40TCL_QUERY_RESET, 1);
OUT_RING (1);
@@ -82,17 +82,17 @@ nv40_query_result(struct pipe_context *pipe, struct pipe_query *pq,
if (!q->ready) {
unsigned status;
- status = nvws->notifier_status(nv40->hw->query,
+ status = nvws->notifier_status(nv40->screen->query,
q->object->start);
if (status != NV_NOTIFY_STATE_STATUS_COMPLETED) {
if (wait == FALSE)
return FALSE;
- nvws->notifier_wait(nv40->hw->query, q->object->start,
+ nvws->notifier_wait(nv40->screen->query, q->object->start,
NV_NOTIFY_STATE_STATUS_COMPLETED,
0);
}
- q->result = nvws->notifier_retval(nv40->hw->query,
+ q->result = nvws->notifier_retval(nv40->screen->query,
q->object->start);
q->ready = TRUE;
nvws->res_free(&q->object);