diff options
| author | Christoph Bumiller <[email protected]> | 2012-04-24 13:35:44 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2012-04-24 13:35:44 +0200 |
| commit | a48e5dee94460fb9b70a193069daca5f5b3e575b (patch) | |
| tree | 0743084c50e80730d4ee3779de76bfd14621034c /src/gallium/drivers/nv50 | |
| parent | 2170fed8f4c01e719b8fc9d6ff42f3214dadc267 (diff) | |
nv50,nvc0: don't initialize the draw module, we don't use it
But some day we might (e.g. for blending 16 bpp formats on nv50).
Diffstat (limited to 'src/gallium/drivers/nv50')
| -rw-r--r-- | src/gallium/drivers/nv50/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_context.h | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv50/Makefile.sources b/src/gallium/drivers/nv50/Makefile.sources index eeb0e11652a..c112e82e9c0 100644 --- a/src/gallium/drivers/nv50/Makefile.sources +++ b/src/gallium/drivers/nv50/Makefile.sources @@ -1,6 +1,5 @@ C_SOURCES := \ nv50_context.c \ - nv50_draw.c \ nv50_formats.c \ nv50_miptree.c \ nv50_resource.c \ diff --git a/src/gallium/drivers/nv50/nv50_context.c b/src/gallium/drivers/nv50/nv50_context.c index 8651be01c5c..558fe0b3684 100644 --- a/src/gallium/drivers/nv50/nv50_context.c +++ b/src/gallium/drivers/nv50/nv50_context.c @@ -20,10 +20,13 @@ * SOFTWARE. */ -#include "draw/draw_context.h" #include "pipe/p_defines.h" #include "util/u_framebuffer.h" +#ifdef NV50_WITH_DRAW_MODULE +#include "draw/draw_context.h" +#endif + #include "nv50_context.h" #include "nv50_screen.h" #include "nv50_resource.h" @@ -103,7 +106,9 @@ nv50_destroy(struct pipe_context *pipe) nv50_context_unreference_resources(nv50); +#ifdef NV50_WITH_DRAW_MODULE draw_destroy(nv50->draw); +#endif FREE(nv50); } @@ -157,9 +162,12 @@ nv50_create(struct pipe_screen *pscreen, void *priv) nv50_init_state_functions(nv50); nv50_init_resource_functions(pipe); +#ifdef NV50_WITH_DRAW_MODULE + /* no software fallbacks implemented */ nv50->draw = draw_create(pipe); assert(nv50->draw); draw_set_rasterize_stage(nv50->draw, nv50_draw_render_stage(nv50)); +#endif nouveau_context_init_vdec(&nv50->base); diff --git a/src/gallium/drivers/nv50/nv50_context.h b/src/gallium/drivers/nv50/nv50_context.h index 65304a8f1ff..1cee0e06c02 100644 --- a/src/gallium/drivers/nv50/nv50_context.h +++ b/src/gallium/drivers/nv50/nv50_context.h @@ -10,7 +10,9 @@ #include "util/u_inlines.h" #include "util/u_dynarray.h" +#ifdef NV50_WITH_DRAW_MODULE #include "draw/draw_vertex.h" +#endif #include "nv50_debug.h" #include "nv50_winsys.h" @@ -136,7 +138,9 @@ struct nv50_context { boolean vbo_push_hint; +#ifdef NV50_WITH_DRAW_MODULE struct draw_context *draw; +#endif }; static INLINE struct nv50_context * |