glBindProgramARB dispatches to glBindProgramNV (remove _mesa_BindProgramARB).

Removed VertexAttrib*ARB() stubs.

1 files changed, 0 insertions, 276 deletions

diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 384504e15e..5cc451e8bb 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -60,187 +60,6 @@ _mesa_parse_arb_fragment_program(GLcontext *ctx, GLenum target,
 
 
 void
-_mesa_VertexAttrib1sARB(GLuint index, GLshort x)
-{
-}
-
-void
-_mesa_VertexAttrib1fARB(GLuint index, GLfloat x)
-{
-}
-
-void
-_mesa_VertexAttrib1dARB(GLuint index, GLdouble x)
-{
-}
-
-void
-_mesa_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y)
-{
-}
-
-void
-_mesa_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y)
-{
-}
-
-void
-_mesa_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y)
-{
-}
-
-void
-_mesa_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z)
-{
-}
-
-void
-_mesa_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z)
-{
-}
-
-void
-_mesa_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z)
-{
-}
-
-void
-_mesa_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
-{
-}
-
-void
-_mesa_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
-{
-}
-
-void
-_mesa_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
-{
-}
-
-void
-_mesa_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
-{
-}
-
-void
-_mesa_VertexAttrib1svARB(GLuint index, const GLshort *v)
-{
-}
-
-void
-_mesa_VertexAttrib1fvARB(GLuint index, const GLfloat *v)
-{
-}
-
-void
-_mesa_VertexAttrib1dvARB(GLuint index, const GLdouble *v)
-{
-}
-
-void
-_mesa_VertexAttrib2svARB(GLuint index, const GLshort *v)
-{
-}
-
-void
-_mesa_VertexAttrib2fvARB(GLuint index, const GLfloat *v)
-{
-}
-
-void
-_mesa_VertexAttrib2dvARB(GLuint index, const GLdouble *v)
-{
-}
-
-void
-_mesa_VertexAttrib3svARB(GLuint index, const GLshort *v)
-{
-}
-
-void
-_mesa_VertexAttrib3fvARB(GLuint index, const GLfloat *v)
-{
-}
-
-void
-_mesa_VertexAttrib3dvARB(GLuint index, const GLdouble *v)
-{
-}
-
-void
-_mesa_VertexAttrib4bvARB(GLuint index, const GLbyte *v)
-{
-}
-
-void
-_mesa_VertexAttrib4svARB(GLuint index, const GLshort *v)
-{
-}
-
-void
-_mesa_VertexAttrib4ivARB(GLuint index, const GLint *v)
-{
-}
-
-void
-_mesa_VertexAttrib4ubvARB(GLuint index, const GLubyte *v)
-{
-}
-
-void
-_mesa_VertexAttrib4usvARB(GLuint index, const GLushort *v)
-{
-}
-
-void
-_mesa_VertexAttrib4uivARB(GLuint index, const GLuint *v)
-{
-}
-
-void
-_mesa_VertexAttrib4fvARB(GLuint index, const GLfloat *v)
-{
-}
-
-void
-_mesa_VertexAttrib4dvARB(GLuint index, const GLdouble *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NbvARB(GLuint index, const GLbyte *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NsvARB(GLuint index, const GLshort *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NivARB(GLuint index, const GLint *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NubvARB(GLuint index, const GLubyte *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NusvARB(GLuint index, const GLushort *v)
-{
-}
-
-void
-_mesa_VertexAttrib4NuivARB(GLuint index, const GLuint *v)
-{
-}
-
-
-void
 _mesa_EnableVertexAttribArrayARB(GLuint index)
 {
    GET_CURRENT_CONTEXT(ctx);
@@ -403,101 +222,6 @@ _mesa_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 
 
 void
-_mesa_BindProgramARB(GLenum target, GLuint program)
-{
-   struct program *prog;
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (target == GL_VERTEX_PROGRAM_ARB
-       && ctx->Extensions.ARB_vertex_program) {
-      if (ctx->VertexProgram.Current &&
-          ctx->VertexProgram.Current->Base.Id == program)
-         return;
-      /* decrement refcount on previously bound vertex program */
-      if (ctx->VertexProgram.Current) {
-         ctx->VertexProgram.Current->Base.RefCount--;
-         /* and delete if refcount goes below one */
-         if (ctx->VertexProgram.Current->Base.RefCount <= 0) {
-            _mesa_delete_program(ctx, &(ctx->VertexProgram.Current->Base));
-            _mesa_HashRemove(ctx->Shared->Programs, program);
-         }
-      }
-   }
-   else if (target == GL_FRAGMENT_PROGRAM_ARB
-            && ctx->Extensions.ARB_fragment_program) {
-      if (ctx->FragmentProgram.Current &&
-          ctx->FragmentProgram.Current->Base.Id == program)
-         return;
-      /* decrement refcount on previously bound fragment program */
-      if (ctx->FragmentProgram.Current) {
-         ctx->FragmentProgram.Current->Base.RefCount--;
-         /* and delete if refcount goes below one */
-         if (ctx->FragmentProgram.Current->Base.RefCount <= 0) {
-            _mesa_delete_program(ctx, &(ctx->FragmentProgram.Current->Base));
-            _mesa_HashRemove(ctx->Shared->Programs, program);
-         }
-      }
-   }
-   else {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBindProgramARB(target)");
-      return;
-   }
-
-   /* NOTE: binding to a non-existant program is not an error.
-    * That's supposed to be caught in glBegin.
-    * NOTE: program number 0 is legal here.
-    */
-   if (program == 0) {
-      /* default program */
-      if (target == GL_VERTEX_PROGRAM_ARB)
-         prog = ctx->Shared->DefaultVertexProgram;
-      else
-         prog = ctx->Shared->DefaultFragmentProgram;
-   }
-   else {
-      prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, program);
-      if (prog) {
-         if (prog->Target == 0) {
-            /* prog was allocated with glGenProgramsARB */
-            prog->Target = target;
-         }
-         else if (prog->Target != target) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glBindProgramARB(target mismatch)");
-            return;
-         }
-      }
-      else {
-         /* allocate a new program now */
-         prog = _mesa_alloc_program(ctx, target, program);
-         if (!prog) {
-            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindProgramARB");
-            return;
-         }
-         prog->Id = program;
-         prog->Target = target;
-         prog->Resident = GL_TRUE;
-         prog->RefCount = 1;
-         _mesa_HashInsert(ctx->Shared->Programs, program, prog);
-      }
-   }
-
-   /* bind now */
-   if (target == GL_VERTEX_PROGRAM_ARB) {
-      ctx->VertexProgram.Current = (struct vertex_program *) prog;
-   }
-   else {
-      ASSERT(target == GL_FRAGMENT_PROGRAM_ARB);
-      ctx->FragmentProgram.Current = (struct fragment_program *) prog;
-   }
-
-   if (prog)
-      prog->RefCount++;
-}
-
-
-void
 _mesa_ProgramEnvParameter4dARB(GLenum target, GLuint index,
                                GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {