commit 0a1b54df7ac118722bb627c61cb322cb4e248ace
author Eric Anholt <eric@anholt.net> Mon Jun 21 11:29:15 2010 -0700
committer Eric Anholt <eric@anholt.net> Thu Jun 24 17:23:21 2010 -0700
tree c01794fe2833bbfa38a24e975d000ee00804271a
parent 3d6012303c3ce24c75d209267e6914f706d025c5

glsl2: Replace the GLSL compiler with the glsl2 project.

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index c414e89..a584f60 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -44,8 +44,6 @@
 #include "shader/prog_uniform.h"
 #include "shader/shader_api.h"
 #include "shader/uniforms.h"
-#include "shader/slang/slang_compile.h"
-#include "shader/slang/slang_link.h"
 
 
 /**
@@ -1100,7 +1098,7 @@
    /* this call will set the sh->CompileStatus field to indicate if
     * compilation was successful.
     */
-   (void) _slang_compile(ctx, sh);
+   _mesa_glsl_compile_shader(ctx, sh);
 }
 
 
@@ -1126,7 +1124,7 @@
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM);
 
-   _slang_link(ctx, program, shProg);
+   _mesa_glsl_link_shader(ctx, shProg);
 
    /* debug code */
    if (0) {