summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-31 12:17:32 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-31 12:17:32 -0600
commit8d9afa76eb090ff58ca9a8a7a86a0b23ffc56857 (patch)
tree23950a72455893d60975456f89c7156cd58ff00d /src
parent4990695f1b197b270a4e3d98dd6bcd2bb4e89b4a (diff)
Use ffvertex_prog.c code instead of t_vp_build.c code.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/ffvertex_prog.h2
-rw-r--r--src/mesa/sources1
-rw-r--r--src/mesa/state_tracker/st_draw.c4
-rw-r--r--src/mesa/tnl/t_context.c4
-rw-r--r--src/mesa/tnl/t_vp_build.c6
-rw-r--r--src/mesa/tnl/t_vp_build.h4
6 files changed, 16 insertions, 5 deletions
diff --git a/src/mesa/main/ffvertex_prog.h b/src/mesa/main/ffvertex_prog.h
index 74cafc65c1..38dc5fbb8d 100644
--- 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 727872378e..845a5ff556 100644
--- 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 065e157bc6..c3f33a447e 100644
--- 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 3b8dd18bbb..60770a91c2 100644
--- 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 2b7d8eebe0..215d6653a3 100644
--- 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 034701d8c4..adcd8f1662 100644
--- 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