nouveau: rename pass0_arb to pass0.

I was expecting to have 2 frontends for the shader code (asm, glsl).
With Brian's work on GLSL this is unnecessary :)

diff --git a/src/mesa/drivers/dri/nouveau/Makefile b/src/mesa/drivers/dri/nouveau/Makefile
index 7ffba27..9718f3b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/Makefile
+++ b/src/mesa/drivers/dri/nouveau/Makefile
@@ -20,7 +20,7 @@ DRIVER_SOURCES = \
        nouveau_span.c           \
        nouveau_state.c          \
        nouveau_shader.c         \
-       nouveau_shader_0_arb.c   \
+       nouveau_shader_0.c       \
        nouveau_shader_1.c       \
        nouveau_shader_2.c       \
        nouveau_tex.c            \

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader.c b/src/mesa/drivers/dri/nouveau/nouveau_shader.c
index dc366b3..e4db115 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_shader.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_shader.c
@@ -111,7 +111,7 @@ nvsUpdateShader(GLcontext *ctx, nouveauShader *nvs)
    /* Translate to HW format now if necessary */
    if (!nvs->translated) {
       /* Mesa ASM shader -> nouveauShader */
-      if (!nouveau_shader_pass0_arb(ctx, nvs))
+      if (!nouveau_shader_pass0(ctx, nvs))
         return GL_FALSE;
       /* Basic dead code elimination + register usage info */
       if (!nouveau_shader_pass1(nvs))
@@ -187,7 +187,7 @@ nvsBuildTextShader(GLcontext *ctx, GLenum target, const char *text)
                                       &nvs->mesa.fp);
    }
 
-   nouveau_shader_pass0_arb(ctx, nvs);
+   nouveau_shader_pass0(ctx, nvs);
    nouveau_shader_pass1(nvs);
    nouveau_shader_pass2(nvs);
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader.h b/src/mesa/drivers/dri/nouveau/nouveau_shader.h
index 4b94625..1a971e5 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_shader.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_shader.h
@@ -366,8 +366,7 @@ extern void NV40FPInitShaderFuncs(nvsFunc *);
 
 extern void nouveauShaderInitFuncs(GLcontext *ctx);
 
-extern GLboolean nouveau_shader_pass0_arb(GLcontext *ctx, nouveauShader *nvs);
-extern GLboolean nouveau_shader_pass0_slang(GLcontext *ctx, nouveauShader *nvs);
+extern GLboolean nouveau_shader_pass0(GLcontext *ctx, nouveauShader *nvs);
 extern GLboolean nouveau_shader_pass1(nvsPtr nvs);
 extern GLboolean nouveau_shader_pass2(nvsPtr nvs);
 

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_shader_0_arb.c b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
similarity index 99%
rename from src/mesa/drivers/dri/nouveau/nouveau_shader_0_arb.c
rename to src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
index afb889d..34475ca 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_shader_0_arb.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
@@ -666,7 +666,7 @@ pass0_translate_instructions(nouveauShader *nvs)
 }
 
 GLboolean
-nouveau_shader_pass0_arb(GLcontext *ctx, nouveauShader *nvs)
+nouveau_shader_pass0(GLcontext *ctx, nouveauShader *nvs)
 {
    nouveauContextPtr            nmesa  = NOUVEAU_CONTEXT(ctx);
    struct gl_program           *prog   = (struct gl_program*)nvs;