summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/glslcompiler
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-02-22 16:29:25 -0700
committerBrian <brian@yutani.localnet.net>2007-02-22 16:29:25 -0700
commitbc18ac45a3b8ef746ce4a3c8abf79bd984a4614b (patch)
tree6c0881b32597329a51168b5c57224f248bf1b709 /src/mesa/drivers/glslcompiler
parentda46353056c2e20f81ef620efe81d5d076ab0c12 (diff)
updated for vbo
Diffstat (limited to 'src/mesa/drivers/glslcompiler')
-rw-r--r--src/mesa/drivers/glslcompiler/glslcompiler.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/mesa/drivers/glslcompiler/glslcompiler.c b/src/mesa/drivers/glslcompiler/glslcompiler.c
index a27f749df7..016b53d57a 100644
--- a/src/mesa/drivers/glslcompiler/glslcompiler.c
+++ b/src/mesa/drivers/glslcompiler/glslcompiler.c
@@ -53,7 +53,6 @@
#include "shader/shader_api.h"
#include "shader/prog_print.h"
#include "drivers/common/driverfuncs.h"
-#include "array_cache/acache.h"
#include "tnl/tnl.h"
#include "tnl/t_context.h"
#include "tnl/t_pipeline.h"
@@ -61,6 +60,7 @@
#include "swrast/s_context.h"
#include "swrast/s_triangle.h"
#include "swrast_setup/swrast_setup.h"
+#include "vbo/vbo.h"
static const char *Prog = "glslcompiler";
@@ -96,8 +96,8 @@ UpdateState(GLcontext *ctx, GLuint new_state)
/* easy - just propogate */
_swrast_InvalidateState( ctx, new_state );
_swsetup_InvalidateState( ctx, new_state );
- _ac_InvalidateState( ctx, new_state );
_tnl_InvalidateState( ctx, new_state );
+ _vbo_InvalidateState( ctx, new_state );
}
@@ -136,7 +136,7 @@ CreateContext(void)
_mesa_enable_sw_extensions(ctx);
if (!_swrast_CreateContext( ctx ) ||
- !_ac_CreateContext( ctx ) ||
+ !_vbo_CreateContext( ctx ) ||
!_tnl_CreateContext( ctx ) ||
!_swsetup_CreateContext( ctx )) {
_mesa_destroy_visual(vis);
@@ -277,6 +277,11 @@ ParseOptions(int argc, char *argv[])
Options.FragFile = NULL;
Options.OutputFile = NULL;
+ if (argc == 1) {
+ Usage();
+ exit(0);
+ }
+
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "--vs") == 0) {
Options.VertFile = argv[i + 1];