gitlab-ci: Move up meson-main job definition

[mesa.git] / src / mesa / tnl_dd / t_dd_triemit.h

diff --git a/src/mesa/tnl_dd/t_dd_triemit.h b/src/mesa/tnl_dd/t_dd_triemit.h
index 2f5bcee7ec4e07b3e913d39520b0eddc817972e4..093501f16766dc6721feb363b0fd12b9cbb1598b 100644 (file)
--- a/src/mesa/tnl_dd/t_dd_triemit.h
+++ b/src/mesa/tnl_dd/t_dd_triemit.h
@@ -39,7 +39,7 @@ static __inline void TAG(quad)( CTX_ARG,
    GLuint j;
 
    if (DO_DEBUG_VERTS) {
-      fprintf(stderr, "%s\n", __FUNCTION__);
+      fprintf(stderr, "%s\n", __func__);
       PRINT_VERTEX(v0);
       PRINT_VERTEX(v1);
       PRINT_VERTEX(v2);
@@ -63,7 +63,7 @@ static __inline void TAG(quad)( CTX_ARG,
    GLuint j;
 
    if (DO_DEBUG_VERTS) {
-      fprintf(stderr, "%s\n", __FUNCTION__);
+      fprintf(stderr, "%s\n", __func__);
       PRINT_VERTEX(v0);
       PRINT_VERTEX(v1);
       PRINT_VERTEX(v2);
@@ -90,7 +90,7 @@ static __inline void TAG(triangle)( CTX_ARG,
    GLuint j;
 
    if (DO_DEBUG_VERTS) {
-      fprintf(stderr, "%s\n", __FUNCTION__);
+      fprintf(stderr, "%s\n", __func__);
       PRINT_VERTEX(v0);
       PRINT_VERTEX(v1);
       PRINT_VERTEX(v2);
@@ -129,17 +129,17 @@ static __inline void TAG(point)( CTX_ARG,
 #endif
 
 
-static void TAG(fast_clipped_poly)( GLcontext *ctx, const GLuint *elts,
+static void TAG(fast_clipped_poly)( struct gl_context *ctx, const GLuint *elts,
                                    GLuint n )
 {
    LOCAL_VARS
    GLuint vertsize = GET_VERTEX_DWORDS();
    GLuint *vb = (GLuint *)ALLOC_VERTS( (n-2) * 3, vertsize );
    const GLuint *start = (const GLuint *)VERT(elts[0]);
-   int i,j;
+   GLuint i,j;
 
    if (DO_DEBUG_VERTS) {
-      fprintf(stderr, "%s\n", __FUNCTION__);
+      fprintf(stderr, "%s\n", __func__);
       PRINT_VERTEX(VERT(elts[0]));
       PRINT_VERTEX(VERT(elts[1]));
    }