Remove TNL-to-VP tracking from i965

The i965 driver previously had it's own set of code to convert
fixed-function TNL state to a vertex program.  Core Mesa has code to
do this, so there is no reason to duplicate that effort in the driver.
In fact, this duplication leads to bugs when other aspects of the Mesa
infrastructure change.
This commit is contained in:
Ian Romanick 2008-09-25 17:19:47 -07:00
parent 2e5d717007
commit b5d59222cc
7 changed files with 2 additions and 1665 deletions

View file

@ -152,8 +152,6 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
brw_draw_init( brw );
brw_ProgramCacheInit( ctx );
return GL_TRUE;
}

View file

@ -130,7 +130,6 @@ struct brw_context;
#define BRW_NEW_CONTEXT 0x80
#define BRW_NEW_WM_INPUT_DIMENSIONS 0x100
#define BRW_NEW_INPUT_VARYING 0x200
#define BRW_NEW_TNL_PROGRAM 0x400
#define BRW_NEW_PSP 0x800
#define BRW_NEW_METAOPS 0x1000
#define BRW_NEW_FENCE 0x2000
@ -488,10 +487,6 @@ struct brw_context
GLboolean active;
} metaops;
/* Track fixed function t&l in a vertex program:
*/
struct gl_vertex_program *tnl_program;
struct brw_tnl_cache tnl_program_cache;
/* Active vertex program:
*/

View file

@ -74,7 +74,6 @@ const struct brw_tracked_state brw_wm_unit;
const struct brw_tracked_state brw_psp_urb_cbs;
const struct brw_tracked_state brw_active_vertprog;
const struct brw_tracked_state brw_tnl_vertprog;
const struct brw_tracked_state brw_pipe_control;
const struct brw_tracked_state brw_clear_surface_cache;

View file

@ -45,7 +45,6 @@ const struct brw_tracked_state *atoms[] =
{
&brw_check_fallback,
&brw_tnl_vertprog,
&brw_active_vertprog,
&brw_wm_input_sizes,
&brw_vs_prog,

View file

@ -80,8 +80,4 @@ struct brw_vs_compile {
void brw_vs_emit( struct brw_vs_compile *c );
void brw_ProgramCacheDestroy( GLcontext *ctx );
void brw_ProgramCacheInit( GLcontext *ctx );
#endif

File diff suppressed because it is too large Load diff

View file

@ -70,7 +70,6 @@ static void brw_destroy_context( struct intel_context *intel )
brw_destroy_state(brw);
brw_draw_destroy( brw );
brw_ProgramCacheDestroy( ctx );
brw_FrameBufferTexDestroy( brw );
for (i = 0; i < brw->state.nr_draw_regions; i++)