i965: Don't allocate a 1-level texture when GL_GENERATE_MIPMAP is set.

[mesa.git] / src / mesa / vbo / vbo_noop.c

diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index cff26bf14b3b8f773379a74e5f3a940d114b8e94..f86984589f1a8fba3aee96f34141f1a19efaa3a4 100644 (file)
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -30,7 +30,6 @@
 
 
 #include "main/glheader.h"
-#include "main/api_arrayelt.h"
 #include "main/context.h"
 #include "main/dispatch.h"
 #include "main/dlist.h"
@@ -332,28 +331,23 @@ _mesa_noop_EvalPoint2(GLint a, GLint b)
 }
 
 static void GLAPIENTRY
-_mesa_noop_Begin(GLenum mode)
+_mesa_noop_ArrayElement(GLint elem)
 {
 }
 
-static void GLAPIENTRY
-_mesa_noop_End(void)
-{
-}
 
 static void GLAPIENTRY
-_mesa_noop_PrimitiveRestartNV(void)
+_mesa_noop_Begin(GLenum mode)
 {
 }
 
-
 static void GLAPIENTRY
-_mesa_noop_EvalMesh1(GLenum mode, GLint i1, GLint i2)
+_mesa_noop_End(void)
 {
 }
 
 static void GLAPIENTRY
-_mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
+_mesa_noop_PrimitiveRestartNV(void)
 {
 }
 
@@ -366,7 +360,7 @@ _mesa_noop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 void
 _mesa_noop_vtxfmt_init(GLvertexformat * vfmt)
 {
-   vfmt->ArrayElement = _ae_ArrayElement;
+   vfmt->ArrayElement = _mesa_noop_ArrayElement;
 
    vfmt->Begin = _mesa_noop_Begin;
 
@@ -388,8 +382,6 @@ _mesa_noop_vtxfmt_init(GLvertexformat * vfmt)
    vfmt->EvalCoord2fv = _mesa_noop_EvalCoord2fv;
    vfmt->EvalPoint1 = _mesa_noop_EvalPoint1;
    vfmt->EvalPoint2 = _mesa_noop_EvalPoint2;
-   vfmt->EvalMesh1 = _mesa_noop_EvalMesh1;
-   vfmt->EvalMesh2 = _mesa_noop_EvalMesh2;
 
    vfmt->FogCoordfEXT = _mesa_noop_FogCoordfEXT;
    vfmt->FogCoordfvEXT = _mesa_noop_FogCoordfvEXT;