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_7_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv10
/
nv10_screen.c
diff --git
a/src/gallium/drivers/nv10/nv10_screen.c
b/src/gallium/drivers/nv10/nv10_screen.c
index c64f78bc00a00d8a8f60cf635e47454be4444822..69a6dab866a6f3c2c6e0f74f0672f2fa6cd92b7e 100644
(file)
--- a/
src/gallium/drivers/nv10/nv10_screen.c
+++ b/
src/gallium/drivers/nv10/nv10_screen.c
@@
-15,8
+15,6
@@
nv10_screen_get_param(struct pipe_screen *screen, int param)
return 0;
case PIPE_CAP_GLSL:
return 0;
return 0;
case PIPE_CAP_GLSL:
return 0;
- case PIPE_CAP_S3TC:
- return 0;
case PIPE_CAP_ANISOTROPIC_FILTER:
return 1;
case PIPE_CAP_POINT_SPRITE:
case PIPE_CAP_ANISOTROPIC_FILTER:
return 1;
case PIPE_CAP_POINT_SPRITE:
@@
-37,6
+35,8
@@
nv10_screen_get_param(struct pipe_screen *screen, int param)
return 0;
case PIPE_CAP_TGSI_CONT_SUPPORTED:
return 0;
return 0;
case PIPE_CAP_TGSI_CONT_SUPPORTED:
return 0;
+ case PIPE_CAP_BLEND_EQUATION_SEPARATE:
+ return 0;
case NOUVEAU_CAP_HW_VTXBUF:
case NOUVEAU_CAP_HW_IDXBUF:
return 0;
case NOUVEAU_CAP_HW_VTXBUF:
case NOUVEAU_CAP_HW_IDXBUF:
return 0;
@@
-115,6
+115,9
@@
nv10_screen_destroy(struct pipe_screen *pscreen)
nouveau_notifier_free(&screen->sync);
nouveau_grobj_free(&screen->celsius);
nouveau_notifier_free(&screen->sync);
nouveau_grobj_free(&screen->celsius);
+ nv04_surface_2d_takedown(&screen->eng2d);
+
+ nouveau_screen_fini(&screen->base);
FREE(pscreen);
}
FREE(pscreen);
}
@@
-177,7
+180,6
@@
nv10_screen_create(struct pipe_winsys *ws, struct nouveau_device *dev)
NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
return FALSE;
}
NOUVEAU_ERR("Error creating 3D object: %d\n", ret);
return FALSE;
}
- BIND_RING(chan, screen->celsius, 7);
/* 2D engine setup */
screen->eng2d = nv04_surface_2d_init(&screen->base);
/* 2D engine setup */
screen->eng2d = nv04_surface_2d_init(&screen->base);