[r300] Add more struct names for r300_hw_state

[mesa.git] / src / mesa / drivers / dri / r300 / r300_shader.c

diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index 0953d32e3d68583ade2aa26fbba5a7edf467ff8c..77abf86a8eee8a4b458e0d5156e75a530a4c44db 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -1,25 +1,11 @@
-#include "glheader.h"
-#include "macros.h"
-#include "enums.h"
 
-#include "program.h"
+#include "main/glheader.h"
+
+#include "shader/program.h"
 #include "tnl/tnl.h"
 #include "r300_context.h"
 #include "r300_fragprog.h"
 
-static void
-r300BindProgram(GLcontext * ctx, GLenum target, struct gl_program *prog)
-{
-       switch (target) {
-       case GL_VERTEX_PROGRAM_ARB:
-       case GL_FRAGMENT_PROGRAM_ARB:
-               break;
-       default:
-               WARN_ONCE("Target not supported yet!\n");
-               break;
-       }
-}
-
 static struct gl_program *r300NewProgram(GLcontext * ctx, GLenum target,
                                         GLuint id)
 {
@@ -62,14 +48,12 @@ r300ProgramStringNotify(GLcontext * ctx, GLenum target, struct gl_program *prog)
        switch (target) {
        case GL_VERTEX_PROGRAM_ARB:
                vp->progs = NULL;
-               /*vp->translated = GL_FALSE;
-                  memset(&vp->translated, 0, sizeof(struct r300_vertex_program) - sizeof(struct gl_vertex_program)); */
-               /*r300_translate_vertex_shader(vp); */
                break;
        case GL_FRAGMENT_PROGRAM_ARB:
                fp->translated = GL_FALSE;
                break;
        }
+
        /* need this for tcl fallbacks */
        _tnl_program_string(ctx, target, prog);
 }
@@ -77,13 +61,12 @@ r300ProgramStringNotify(GLcontext * ctx, GLenum target, struct gl_program *prog)
 static GLboolean
 r300IsProgramNative(GLcontext * ctx, GLenum target, struct gl_program *prog)
 {
-       return 1;
+       return GL_TRUE;
 }
 
 void r300InitShaderFuncs(struct dd_function_table *functions)
 {
        functions->NewProgram = r300NewProgram;
-       functions->BindProgram = r300BindProgram;
        functions->DeleteProgram = r300DeleteProgram;
        functions->ProgramStringNotify = r300ProgramStringNotify;
        functions->IsProgramNative = r300IsProgramNative;