mesa: Branch 'glsl-compiler-1' - 2 commits

[Brian Paul]

 docs/shading.html                            |    9 ++++++++-
 src/mesa/drivers/glslcompiler/glslcompiler.c |   11 ++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

New commits:
diff-tree ff0cc92757b59c9343e4fda4d20c32fbfc7586c1 (from bc18ac45a3b8ef746ce4a3c8abf79bd984a4614b)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Feb 22 16:29:48 2007 -0700

    glslcompiler build instructions

diff --git a/docs/shading.html b/docs/shading.html
index 847b231..412c893 100644
--- a/docs/shading.html
+++ b/docs/shading.html
@@ -145,8 +145,15 @@ This tool is useful for:
 </ul>
 
 <p>
-(compiler build instructions TBD)
+To build the glslcompiler program (this will be improved someday):
 </p>
+<pre>
+    cd src/mesa
+    make libmesa.a
+    cd drivers/glslcompiler
+    make
+</pre>
+
 
 <p>
 Here's an example of using the compiler to compile a vertex shader and
diff-tree bc18ac45a3b8ef746ce4a3c8abf79bd984a4614b (from da46353056c2e20f81ef620efe81d5d076ab0c12)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Feb 22 16:29:25 2007 -0700

    updated for vbo

diff --git a/src/mesa/drivers/glslcompiler/glslcompiler.c b/src/mesa/drivers/glslcompiler/glslcompiler.c
index a27f749..016b53d 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_s
    /* 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];