From 2e6f0d7aab55bd4db01e4e9971b78973e7a07bb5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 26 Aug 2016 19:28:36 +0100 Subject: [PATCH] Quitened unused parameter warnings --- src/osg/glu/libtess/render.cpp | 28 +++++++++++++-------------- src/osg/glu/libtess/tess.cpp | 35 +++++++++++++--------------------- 2 files changed, 27 insertions(+), 36 deletions(-) diff --git a/src/osg/glu/libtess/render.cpp b/src/osg/glu/libtess/render.cpp index cf29be7ed..046e5c816 100644 --- a/src/osg/glu/libtess/render.cpp +++ b/src/osg/glu/libtess/render.cpp @@ -235,12 +235,12 @@ static struct FaceCount MaximumStrip( GLUhalfEdge *eOrig ) } -static void RenderTriangle( GLUtesselator *tess, GLUhalfEdge *e, long size ) +static void RenderTriangle( GLUtesselator *tess, GLUhalfEdge *e, long /*size*/ ) { /* Just add the triangle to a triangle list, so we can render all * the separate triangles at once. */ - assert( size == 1 ); + // assert( size == 1 ); AddToTrail( e->Lface, tess->lonelyTriList ); } @@ -286,15 +286,15 @@ static void RenderFan( GLUtesselator *tess, GLUhalfEdge *e, long size ) * edge "e". The fan *should* contain exactly "size" triangles * (otherwise we've goofed up somewhere). */ - CALL_BEGIN_OR_BEGIN_DATA( GL_TRIANGLE_FAN ); - CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); - CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); + CALL_BEGIN_OR_BEGIN_DATA( GL_TRIANGLE_FAN ); + CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); while( ! Marked( e->Lface )) { e->Lface->marked = TRUE; --size; e = e->Onext; - CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); } assert( size == 0 ); @@ -309,20 +309,20 @@ static void RenderStrip( GLUtesselator *tess, GLUhalfEdge *e, long size ) * (otherwise we've goofed up somewhere). */ CALL_BEGIN_OR_BEGIN_DATA( GL_TRIANGLE_STRIP ); - CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); - CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); while( ! Marked( e->Lface )) { e->Lface->marked = TRUE; --size; e = e->Dprev; - CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); if( Marked( e->Lface )) break; e->Lface->marked = TRUE; --size; e = e->Onext; - CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Dst->data ); } assert( size == 0 ); @@ -346,7 +346,7 @@ void __gl_renderBoundary( GLUtesselator *tess, GLUmesh *mesh ) CALL_BEGIN_OR_BEGIN_DATA( GL_LINE_LOOP ); e = f->anEdge; do { - CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); + CALL_VERTEX_OR_VERTEX_DATA( e->Org->data ); e = e->Lnext; } while( e != f->anEdge ); CALL_END_OR_END_DATA(); @@ -487,14 +487,14 @@ GLboolean __gl_renderCache( GLUtesselator *tess ) : (tess->cacheCount > 3) ? GL_TRIANGLE_FAN : GL_TRIANGLES ); - CALL_VERTEX_OR_VERTEX_DATA( v0->data ); + CALL_VERTEX_OR_VERTEX_DATA( v0->data ); if( sign > 0 ) { for( vc = v0+1; vc < vn; ++vc ) { - CALL_VERTEX_OR_VERTEX_DATA( vc->data ); + CALL_VERTEX_OR_VERTEX_DATA( vc->data ); } } else { for( vc = vn-1; vc > v0; --vc ) { - CALL_VERTEX_OR_VERTEX_DATA( vc->data ); + CALL_VERTEX_OR_VERTEX_DATA( vc->data ); } } CALL_END_OR_END_DATA(); diff --git a/src/osg/glu/libtess/tess.cpp b/src/osg/glu/libtess/tess.cpp index 1c7d91a08..e6d11e791 100644 --- a/src/osg/glu/libtess/tess.cpp +++ b/src/osg/glu/libtess/tess.cpp @@ -55,30 +55,21 @@ #endif -/*ARGSUSED*/ static void GLAPIENTRY noBegin( GLenum type ) {} -/*ARGSUSED*/ static void GLAPIENTRY noEdgeFlag( GLboolean boundaryEdge ) {} -/*ARGSUSED*/ static void GLAPIENTRY noVertex( void *data ) {} +/*ARGSUSED*/ static void GLAPIENTRY noBegin( GLenum /*type*/ ) {} +/*ARGSUSED*/ static void GLAPIENTRY noEdgeFlag( GLboolean /*boundaryEdge*/ ) {} +/*ARGSUSED*/ static void GLAPIENTRY noVertex( void * /*data*/ ) {} /*ARGSUSED*/ static void GLAPIENTRY noEnd( void ) {} -/*ARGSUSED*/ static void GLAPIENTRY noError( GLenum errnum ) {} -/*ARGSUSED*/ static void GLAPIENTRY noCombine( GLdouble coords[3], void *data[4], - GLfloat weight[4], void **dataOut ) {} -/*ARGSUSED*/ static void GLAPIENTRY noMesh( GLUmesh *mesh ) {} +/*ARGSUSED*/ static void GLAPIENTRY noError( GLenum /*errnum*/ ) {} +/*ARGSUSED*/ static void GLAPIENTRY noCombine( GLdouble /*coords*/[3], void */*data*/[4], GLfloat /*weight*/[4], void ** /*dataOut*/ ) {} +/*ARGSUSED*/ static void GLAPIENTRY noMesh( GLUmesh * /*mesh*/ ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noBeginData( GLenum type, - void *polygonData ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noEdgeFlagData( GLboolean boundaryEdge, - void *polygonData ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noVertexData( void *data, - void *polygonData ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noEndData( void *polygonData ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noErrorData( GLenum errnum, - void *polygonData ) {} -/*ARGSUSED*/ void GLAPIENTRY __gl_noCombineData( GLdouble coords[3], - void *data[4], - GLfloat weight[4], - void **outData, - void *polygonData ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noBeginData( GLenum /*type*/, void * /*polygonData*/ ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noEdgeFlagData( GLboolean /*boundaryEdge*/, void * /*polygonData*/ ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noVertexData( void * /*data*/, void * /*polygonData*/ ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noEndData( void * /*polygonData*/ ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noErrorData( GLenum /*errnum*/, void * /*polygonData*/ ) {} +/*ARGSUSED*/ void GLAPIENTRY __gl_noCombineData( GLdouble /*coords*/[3], void */*data*/[4], GLfloat /*weight*/[4], void ** /*outData*/, void * /*polygonData*/ ) {} /* Half-edges are allocated in pairs (see mesh.c) */ typedef struct { GLUhalfEdge e, eSym; } EdgePair; @@ -502,7 +493,7 @@ osg::gluTessEndPolygon( GLUtesselator *tess ) { GLUmesh *mesh; - if (setjmp(tess->env) != 0) { + if (setjmp(tess->env) != 0) { /* come back here if out of memory */ CALL_ERROR_OR_ERROR_DATA( GLU_OUT_OF_MEMORY ); return;