KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated memory allocation to allow new macros to be used.

This commit is contained in:
Gareth Hughes 1999-10-12 18:49:28 +00:00
parent 21a257d25b
commit 2e4fce138c
1 changed files with 16 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/glu/mesa/tess.c
View File

@ -1,4 +1,4 @@
/* $Id: tess.c,v 1.13 1999/10/11 17:53:09 gareth Exp $ */ /* $Id: tess.c,v 1.14 1999/10/12 18:49:28 gareth Exp $ */
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
@ -26,6 +26,9 @@
/* /*
* $Log: tess.c,v $ * $Log: tess.c,v $
* Revision 1.14 1999/10/12 18:49:28 gareth
* Updated memory allocation to allow new macros to be used.
*
* Revision 1.13 1999/10/11 17:53:09 gareth * Revision 1.13 1999/10/11 17:53:09 gareth
* Renamed GLUtesselator user data pointer to avoid confusion. * Renamed GLUtesselator user data pointer to avoid confusion.
* *
@ -109,9 +112,8 @@ GLUtesselator* GLAPIENTRY gluNewTess( void )
DEBUGP( 15, ( "-> gluNewTess()\n" ) ); DEBUGP( 15, ( "-> gluNewTess()\n" ) );
if ( ( tobj = (GLUtesselator *) tobj = malloc( sizeof(GLUtesselator) );
malloc( sizeof(GLUtesselator) ) ) == NULL ) if ( tobj == NULL ) {
{
return NULL; return NULL;
} }
@ -211,10 +213,8 @@ void GLAPIENTRY gluTessBeginContour( GLUtesselator *tobj )
return; return;
} }
if ( ( tobj->current_contour = tobj->current_contour = malloc( sizeof(tess_contour_t) );
(tess_contour_t *) malloc( sizeof(tess_contour_t) ) ) == NULL ) if ( tobj->current_contour == NULL ) {
{
DEBUGP( 0, ( "*** memory error ***\n" ) );
tess_error_callback( tobj, GLU_OUT_OF_MEMORY ); tess_error_callback( tobj, GLU_OUT_OF_MEMORY );
return; return;
} }
@ -270,10 +270,8 @@ void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
if ( last_vertex == NULL ) if ( last_vertex == NULL )
{ {
if ( ( last_vertex = (tess_vertex_t *) last_vertex = malloc( sizeof(tess_vertex_t) );
malloc( sizeof(tess_vertex_t) ) ) == NULL ) if ( last_vertex == NULL ) {
{
DEBUGP( 0, ( "*** memory error ***\n" ) );
tess_error_callback( tobj, GLU_OUT_OF_MEMORY ); tess_error_callback( tobj, GLU_OUT_OF_MEMORY );
return; return;
} }
@ -301,10 +299,8 @@ void GLAPIENTRY gluTessVertex( GLUtesselator *tobj, GLdouble coords[3],
{ {
tess_vertex_t *vertex; tess_vertex_t *vertex;
if ( ( vertex = (tess_vertex_t *) vertex = malloc( sizeof(tess_vertex_t) );
malloc( sizeof(tess_vertex_t) ) ) == NULL ) if ( vertex == NULL ) {
{
DEBUGP( 0, ( "*** memory error ***\n" ) );
tess_error_callback( tobj, GLU_OUT_OF_MEMORY ); tess_error_callback( tobj, GLU_OUT_OF_MEMORY );
return; return;
} }
@ -398,12 +394,6 @@ void GLAPIENTRY gluTessEndPolygon( GLUtesselator *tobj )
tobj->last_contour->next = tobj->contours; tobj->last_contour->next = tobj->contours;
tobj->contours->previous = tobj->last_contour; tobj->contours->previous = tobj->last_contour;
/* tess_find_contour_hierarchies(tobj); */
TESS_CHECK_ERRORS( tobj );
/* tess_handle_holes(tobj); */
TESS_CHECK_ERRORS( tobj ); TESS_CHECK_ERRORS( tobj );
/* /*
@ -417,17 +407,9 @@ void GLAPIENTRY gluTessEndPolygon( GLUtesselator *tobj )
( tobj->callbacks.vertexData != NULL ) ) && ( tobj->callbacks.vertexData != NULL ) ) &&
( ( tobj->callbacks.end != NULL ) || ( ( tobj->callbacks.end != NULL ) ||
( tobj->callbacks.endData != NULL ) ) ) ( tobj->callbacks.endData != NULL ) ) )
{
if ( ( tobj->callbacks.edgeFlag == NULL ) &&
( tobj->callbacks.edgeFlagData == NULL ) )
{ {
fist_tessellation( tobj ); fist_tessellation( tobj );
} }
else
{
fist_tessellation( tobj );
}
}
cleanup: cleanup:
delete_all_contours( tobj ); delete_all_contours( tobj );
@ -673,13 +655,10 @@ static void tess_cleanup( GLUtesselator *tobj )
{ {
DEBUGP( 15, ( " -> tess_cleanup( tobj:%p )\n", tobj ) ); DEBUGP( 15, ( " -> tess_cleanup( tobj:%p )\n", tobj ) );
if ( tobj->current_contour != NULL ) if ( tobj->current_contour != NULL ) {
{
delete_current_contour( tobj ); delete_current_contour( tobj );
} }
if ( tobj->contours != NULL ) {
if ( tobj->contours != NULL )
{
delete_all_contours( tobj ); delete_all_contours( tobj );
} }
@ -970,8 +949,7 @@ static void delete_all_contours( GLUtesselator *tobj )
tess_vertex_t *vertex, *next_vertex; tess_vertex_t *vertex, *next_vertex;
GLuint i; GLuint i;
if ( current != NULL ) if ( current != NULL ) {
{
delete_current_contour( tobj ); delete_current_contour( tobj );
} }