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

diff --git a/src/mesa/main/ffvertex_prog.h b/src/mesa/main/ffvertex_prog.h
index 74cafc65c196eca2a081961e90e3a4990f9c9d64..38dc5fbb8d385ffcc9f52e68979e33a831e80a38 100644 (file)
--- a/src/mesa/main/ffvertex_prog.h
+++ b/src/mesa/main/ffvertex_prog.h
@@ -30,6 +30,8 @@
 #define FFVERTEX_PROG_H
 
 
+#include "main/mtypes.h"
+
 struct gl_vertex_program *
 _mesa_get_fixed_func_vertex_program(GLcontext *ctx);
 

diff --git a/src/mesa/sources b/src/mesa/sources
index 727872378edcb5e76715f8d8b4badf43c23154ef..845a5ff5566fc832ab54eeb11b46529ad39ed220 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -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 \

diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 065e157bc68b0b901bd285e26aa866a1b67935fa..c3f33a447e94b7588742c838022f0b727394726c 100644 (file)
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -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 );
 }
 
 

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 3b8dd18bbb2bb53a9e6cbb7d039fd510a1cacb71..60770a91c2cc2e601782907fd0f66cb28fcfed50 100644 (file)
--- a/src/mesa/tnl/t_context.c
+++ b/src/mesa/tnl/t_context.c
@@ -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;

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 2b7d8eebe0352dc8ffd931a367ad10bf09b8e564..215d6653a3ccb1bf207a52b3ebadd575570795a5 100644 (file)
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -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

diff --git a/src/mesa/tnl/t_vp_build.h b/src/mesa/tnl/t_vp_build.h
index 034701d8c46a2f68e2b7a03387690bb9a7b0d110..adcd8f1662a7d5bf5c01599c41c8c24c12de3c93 100644 (file)
--- a/src/mesa/tnl/t_vp_build.h
+++ b/src/mesa/tnl/t_vp_build.h
@@ -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