diff options
author | Brian <[email protected]> | 2007-08-20 16:43:58 -0600 |
---|---|---|
committer | Brian <[email protected]> | 2007-08-20 16:43:58 -0600 |
commit | 9d9e838974d1b9ab35235387bdfda5d99cb19d38 (patch) | |
tree | 24a68359e49eb5dab75470c837c84c73eab90c97 | |
parent | 8175eaa3b49f3b62f7ab251c4e0fbd14dd9f7e2b (diff) |
remove dead code related to vf module
-rw-r--r-- | src/mesa/pipe/draw/draw_context.c | 30 | ||||
-rw-r--r-- | src/mesa/pipe/draw/draw_private.h | 7 |
2 files changed, 2 insertions, 35 deletions
diff --git a/src/mesa/pipe/draw/draw_context.c b/src/mesa/pipe/draw/draw_context.c index 0a3df37b7fa..760756ce89a 100644 --- a/src/mesa/pipe/draw/draw_context.c +++ b/src/mesa/pipe/draw/draw_context.c @@ -31,14 +31,12 @@ */ -#ifdef MESA -#include "main/macros.h" -#else #include "pipe/p_util.h" -#endif #include "draw_context.h" #include "draw_private.h" + + struct draw_context *draw_create( void ) { struct draw_context *draw = CALLOC_STRUCT( draw_context ); @@ -59,12 +57,6 @@ struct draw_context *draw_create( void ) ASSIGN_4V( draw->plane[5], 0, 0, -1, 1 ); /* mesa's a bit wonky */ draw->nr_planes = 6; -#ifdef MESA -#if 0 - draw->vf = vf_create( GL_TRUE ); -#endif -#endif - /* Statically allocate maximum sized vertices for the cache - could be cleverer... */ { @@ -81,14 +73,6 @@ struct draw_context *draw_create( void ) void draw_destroy( struct draw_context *draw ) { -#if 0/*def MESA*/ - if (draw->header.storage) { - ALIGN_FREE( draw->header.storage ); - } - - vf_destroy( draw->vf ); -#endif - free( draw->vcache.vertex[0] ); /* Frees all the vertices. */ free( draw ); } @@ -194,16 +178,6 @@ void draw_set_viewport_state( struct draw_context *draw, const struct pipe_viewport_state *viewport ) { draw->viewport = *viewport; /* struct copy */ - -#ifdef MESA -#if 0 - vf_set_vp_scale_translate( draw->vf, viewport->scale, viewport->translate ); -#endif -#endif - - /* Using tnl/ and vf/ modules is temporary while getting started. - * Full pipe will have vertex shader, vertex fetch of its own. - */ } diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h index a9825e646b1..5983bc1174b 100644 --- a/src/mesa/pipe/draw/draw_private.h +++ b/src/mesa/pipe/draw/draw_private.h @@ -220,13 +220,6 @@ struct draw_context struct prim_header queue[PRIM_QUEUE_LENGTH]; unsigned queue_nr; } pq; - - -#if 0 - ubyte *verts; - boolean in_vb; - struct vertex_fetch *vf; -#endif }; |