From 94987beb2c9e87d9c55db5cb7c089dc77f78df94 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@freedesktop.org>
Date: Sun, 24 Oct 2004 02:05:40 +0000
Subject: Bug #1682: Mesa core code that gets linked into DRI drivers should
 never call through the GL API directly, but should instead use the GL_CALL
 macro.

---
 src/mesa/tnl/t_save_loopback.c | 4 ++--
 src/mesa/tnl/t_vtx_eval.c      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/tnl')

diff --git a/src/mesa/tnl/t_save_loopback.c b/src/mesa/tnl/t_save_loopback.c
index 18ecc3514f..2e752c809a 100644
--- a/src/mesa/tnl/t_save_loopback.c
+++ b/src/mesa/tnl/t_save_loopback.c
@@ -196,7 +196,7 @@ static void loopback_prim( GLcontext *ctx,
    GLuint k;
 
    if (prim->mode & PRIM_BEGIN) {
-      glBegin( prim->mode & PRIM_MODE_MASK );
+      GL_CALL(Begin)( prim->mode & PRIM_MODE_MASK );
    }
    else {
       assert(i == 0);
@@ -221,7 +221,7 @@ static void loopback_prim( GLcontext *ctx,
    }
 
    if (prim->mode & PRIM_END) {
-      glEnd();
+      GL_CALL(End)();
    }
    else {
       assert (i == list->prim_count-1);
diff --git a/src/mesa/tnl/t_vtx_eval.c b/src/mesa/tnl/t_vtx_eval.c
index ea9da13fe4..5a24c70d21 100644
--- a/src/mesa/tnl/t_vtx_eval.c
+++ b/src/mesa/tnl/t_vtx_eval.c
@@ -165,9 +165,9 @@ void _tnl_do_EvalCoord1f(GLcontext* ctx, GLfloat u)
 				map->Order);
 
       if (tnl->vtx.eval.map1[0].sz == 4) 
-	 glVertex4fv( vertex );
+	 GL_CALL(Vertex4fv)( vertex );
       else
-	 glVertex3fv( vertex ); 
+	 GL_CALL(Vertex3fv)( vertex ); 
    }
 }
 
@@ -244,9 +244,9 @@ void _tnl_do_EvalCoord2f( GLcontext* ctx, GLfloat u, GLfloat v )
       }
 
       if (tnl->vtx.attrsz[0] == 4) 
-	 glVertex4fv( vertex );
+	 GL_CALL(Vertex4fv)( vertex );
       else
-	 glVertex3fv( vertex ); 
+	 GL_CALL(Vertex3fv)( vertex ); 
    }
 }
 
-- 
cgit v1.2.3