summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/nv40/nv40_context.c
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2007-12-09 03:22:14 +1100
committerBen Skeggs <skeggsb@gmail.com>2007-12-09 12:12:50 +1100
commitb8965bee404cb36ccd97ac089fbd3ffc63268080 (patch)
treec303b5737dd51f9cecc79a76389b63dc79f9f8a8 /src/mesa/pipe/nv40/nv40_context.c
parent274a3d9cb6a196c1b191769f581915cf5f8dccfe (diff)
nouveau: adapt to gallium interface changes
Diffstat (limited to 'src/mesa/pipe/nv40/nv40_context.c')
-rw-r--r--src/mesa/pipe/nv40/nv40_context.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/mesa/pipe/nv40/nv40_context.c b/src/mesa/pipe/nv40/nv40_context.c
index 8706ed1c07..7b77c70e81 100644
--- a/src/mesa/pipe/nv40/nv40_context.c
+++ b/src/mesa/pipe/nv40/nv40_context.c
@@ -10,9 +10,9 @@ static boolean
nv40_is_format_supported(struct pipe_context *pipe, uint format)
{
switch (format) {
- case PIPE_FORMAT_U_A8_R8_G8_B8:
- case PIPE_FORMAT_U_R5_G6_B5:
- case PIPE_FORMAT_Z24_S8:
+ case PIPE_FORMAT_A8R8G8B8_UNORM:
+ case PIPE_FORMAT_R5G6B5_UNORM:
+ case PIPE_FORMAT_Z24S8_UNORM:
return TRUE;
default:
break;
@@ -267,17 +267,12 @@ nv40_create(struct pipe_winsys *pipe_winsys, struct nouveau_winsys *nvws,
nv40->pipe.draw_elements = nv40_draw_elements;
nv40->pipe.clear = nv40_clear;
- nv40->pipe.begin_query = nv40_query_begin;
- nv40->pipe.end_query = nv40_query_end;
- nv40->pipe.wait_query = nv40_query_wait;
-
- nv40->pipe.mipmap_tree_layout = nv40_miptree_layout;
-
nv40->pipe.flush = nv40_flush;
- nv40_init_region_functions(nv40);
+ nv40_init_query_functions(nv40);
nv40_init_surface_functions(nv40);
nv40_init_state_functions(nv40);
+ nv40_init_miptree_functions(nv40);
nv40->draw = draw_create();
assert(nv40->draw);