fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use ffvertex_prog.c code instead of t_vp_build.c code.

Browse source
This commit is contained in:
Brian 2007-10-31 12:17:32 -06:00
parent 4990695f1b
commit 8d9afa76eb
6 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/main/ffvertex_prog.h
View file

@ -30,6 +30,8 @@
#define FFVERTEX_PROG_H
#include "main/mtypes.h"
struct gl_vertex_program *
_mesa_get_fixed_func_vertex_program(GLcontext *ctx);

1
src/mesa/sources
View file

@ -27,6 +27,7 @@ MAIN_SOURCES = \
main/extensions.c \
main/fbobject.c \
main/feedback.c \
main/ffvertex_prog.c \
main/fog.c \
main/framebuffer.c \
main/get.c \

4
src/mesa/state_tracker/st_draw.c
View file

@ -36,8 +36,6 @@
#include "vbo/vbo.h"
#include "vbo/vbo_context.h"
#include "tnl/t_vp_build.h"
#include "st_atom.h"
#include "st_cache.h"
#include "st_context.h"
@ -527,8 +525,6 @@ void st_init_draw( struct st_context *st )
assert(vbo);
assert(vbo->draw_prims);
vbo->draw_prims = st_draw_vbo;
_tnl_ProgramCacheInit( ctx );
}

4
src/mesa/tnl/t_context.c
View file

@ -61,7 +61,9 @@ _tnl_CreateContext( GLcontext *ctx )
/* Initialize tnl state.
*/
if (ctx->VertexProgram._MaintainTnlProgram) {
#if 0
_tnl_ProgramCacheInit( ctx );
#endif
_tnl_install_pipeline( ctx, _tnl_vp_pipeline );
} else {
_tnl_install_pipeline( ctx, _tnl_default_pipeline );
@ -90,8 +92,10 @@ _tnl_DestroyContext( GLcontext *ctx )
_tnl_destroy_pipeline( ctx );
#if 0
if (ctx->VertexProgram._MaintainTnlProgram)
_tnl_ProgramCacheDestroy( ctx );
#endif
FREE(tnl);
ctx->swtnl_context = NULL;

6
src/mesa/tnl/t_vp_build.c
View file

@ -33,6 +33,7 @@
#include "glheader.h"
#include "macros.h"
#include "enums.h"
#include "main/ffvertex_prog.h"
#include "shader/program.h"
#include "shader/prog_instruction.h"
#include "shader/prog_parameter.h"
@ -41,7 +42,7 @@
#include "t_context.h" /* NOTE: very light dependency on this */
#include "t_vp_build.h"
#if 0
struct state_key {
unsigned light_global_enabled:1;
unsigned light_local_viewer:1;
@ -1605,6 +1606,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
return prog;
}
#endif
void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
@ -1627,6 +1629,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
}
}
#if 0
void _tnl_ProgramCacheInit( GLcontext *ctx )
{
TNLcontext *tnl = TNL_CONTEXT(ctx);
@ -1655,3 +1658,4 @@ void _tnl_ProgramCacheDestroy( GLcontext *ctx )
FREE(tnl->vp_cache->items);
FREE(tnl->vp_cache);
}
#endif

4
src/mesa/tnl/t_vp_build.h
View file

@ -37,12 +37,16 @@
_NEW_FOG | \
_NEW_POINT)
#if 0
extern struct gl_vertex_program *
_mesa_get_fixed_func_vertex_program(GLcontext *ctx);
#endif
extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
#if 0
extern void _tnl_ProgramCacheInit( GLcontext *ctx );
extern void _tnl_ProgramCacheDestroy( GLcontext *ctx );
#endif
#endif