replace _mesa_logbase2 with util_logbase2

[mesa.git] / src / mesa / main / api_loopback.c

diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 59d399b42316c088ce822282d9bef6f4f527eba7..ba4b1995765e9c400dfaee92be71a154b81088fb 100644 (file)
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -1,12 +1,11 @@
 /**
  * \file api_loopback.c
  *
- * \author Keith Whitwell <keith@tungstengraphics.com>
+ * \author Keith Whitwell <keithw@vmware.com>
  */
 
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -23,9 +22,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -34,9 +34,7 @@
 #include "api_loopback.h"
 #include "mtypes.h"
 #include "glapi/glapi.h"
-#include "glapi/glthread.h"
 #include "main/dispatch.h"
-#include "mfeatures.h"
 #include "main/context.h"
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
@@ -86,7 +84,6 @@
 
 #define ATTRIBI_4UI(index,x,y,z,w)   CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w))
 
-
 void GLAPIENTRY
 _mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue )
 {
@@ -819,12 +816,6 @@ _mesa_EvalCoord2dv( const GLdouble *u )
    EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] );
 }
 
-void GLAPIENTRY
-_mesa_EvalCoord2fv( const GLfloat *u )
-{
-   EVALCOORD2( u[0], u[1] );
-}
-
 void GLAPIENTRY
 _mesa_EvalCoord2d( GLdouble u, GLdouble v )
 {
@@ -837,12 +828,6 @@ _mesa_EvalCoord1dv( const GLdouble *u )
    EVALCOORD1( (GLfloat) *u );
 }
 
-void GLAPIENTRY
-_mesa_EvalCoord1fv( const GLfloat *u )
-{
-   EVALCOORD1( (GLfloat) *u );
-}
-
 void GLAPIENTRY
 _mesa_EvalCoord1d( GLdouble u )
 {
@@ -860,8 +845,9 @@ _mesa_Materialf( GLenum face, GLenum pname, GLfloat param )
 void GLAPIENTRY
 _mesa_Materiali(GLenum face, GLenum pname, GLint param )
 {
-   GLfloat p = (GLfloat) param;
-   MATERIALFV(face, pname, &p);
+   GLfloat p[4];
+   p[0] = (GLfloat) param;
+   MATERIALFV(face, pname, p);
 }
 
 void GLAPIENTRY
@@ -1492,9 +1478,6 @@ _mesa_VertexAttribI4usv(GLuint index, const GLushort *v)
    ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]);
 }
 
-
-
-
 /*
  * This code never registers handlers for any of the entry points
  * listed in vtxfmt.h.
@@ -1636,10 +1619,8 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s);
       SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv);
       SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv);
-      SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv);
       SET_EvalCoord2d(dest, _mesa_EvalCoord2d);
       SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv);
-      SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv);
       SET_EvalCoord1d(dest, _mesa_EvalCoord1d);
       SET_Materiali(dest, _mesa_Materiali);
       SET_Materialiv(dest, _mesa_Materialiv);