summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver McFadden <[email protected]>2007-05-11 21:22:37 +0000
committerOliver McFadden <[email protected]>2007-05-11 21:41:16 +0000
commitef29d6af6c24487a66155586feb9ab3eb0c3a229 (patch)
tree4e96fa8f93ddcc696a0512bc2e73f4c40969b1fb
parent6a69bb586445da4c6bdfa00fa775a9286ead3c31 (diff)
r300: Removed the r300BindProgram function; mesa default does better checking.
-rw-r--r--src/mesa/drivers/dri/r300/r300_shader.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index f54a4f9f474..ac4ed441cb2 100644
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -7,19 +7,6 @@
#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,9 +49,7 @@ 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)); */
- /*r300TranslateVertexShader(vp); */
+ vp->translated = GL_FALSE;
break;
case GL_FRAGMENT_PROGRAM_ARB:
fp->translated = GL_FALSE;
@@ -83,7 +68,6 @@ r300IsProgramNative(GLcontext * ctx, GLenum target, struct gl_program *prog)
void r300InitShaderFuncs(struct dd_function_table *functions)
{
functions->NewProgram = r300NewProgram;
- functions->BindProgram = r300BindProgram;
functions->DeleteProgram = r300DeleteProgram;
functions->ProgramStringNotify = r300ProgramStringNotify;
functions->IsProgramNative = r300IsProgramNative;