removed GL_ prefix from memory macros
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 7e4a312..db11a3d 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.7 1999/10/11 04:20:55 joukj Exp $ */
+/* $Id: attrib.c,v 1.8 1999/10/13 18:42:49 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -60,7 +60,7 @@
*/
static struct gl_attrib_node *new_attrib_node( GLbitfield kind )
{
- struct gl_attrib_node *an = GL_ALLOC_STRUCT(gl_attrib_node);
+ struct gl_attrib_node *an = MALLOC_STRUCT(gl_attrib_node);
if (an) {
an->kind = kind;
}
@@ -128,7 +128,7 @@
if (mask & GL_ACCUM_BUFFER_BIT) {
struct gl_accum_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_accum_attrib );
+ attr = MALLOC_STRUCT( gl_accum_attrib );
MEMCPY( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
newnode = new_attrib_node( GL_ACCUM_BUFFER_BIT );
newnode->data = attr;
@@ -138,7 +138,7 @@
if (mask & GL_COLOR_BUFFER_BIT) {
struct gl_colorbuffer_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_colorbuffer_attrib );
+ attr = MALLOC_STRUCT( gl_colorbuffer_attrib );
MEMCPY( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );
newnode = new_attrib_node( GL_COLOR_BUFFER_BIT );
newnode->data = attr;
@@ -148,7 +148,7 @@
if (mask & GL_CURRENT_BIT) {
struct gl_current_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_current_attrib );
+ attr = MALLOC_STRUCT( gl_current_attrib );
MEMCPY( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
newnode = new_attrib_node( GL_CURRENT_BIT );
newnode->data = attr;
@@ -158,7 +158,7 @@
if (mask & GL_DEPTH_BUFFER_BIT) {
struct gl_depthbuffer_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_depthbuffer_attrib );
+ attr = MALLOC_STRUCT( gl_depthbuffer_attrib );
MEMCPY( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );
newnode = new_attrib_node( GL_DEPTH_BUFFER_BIT );
newnode->data = attr;
@@ -169,7 +169,7 @@
if (mask & GL_ENABLE_BIT) {
struct gl_enable_attrib *attr;
GLuint i;
- attr = GL_ALLOC_STRUCT( gl_enable_attrib );
+ attr = MALLOC_STRUCT( gl_enable_attrib );
/* Copy enable flags from all other attributes into the enable struct. */
attr->AlphaTest = ctx->Color.AlphaEnabled;
attr->AutoNormal = ctx->Eval.AutoNormal;
@@ -230,7 +230,7 @@
if (mask & GL_EVAL_BIT) {
struct gl_eval_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_eval_attrib );
+ attr = MALLOC_STRUCT( gl_eval_attrib );
MEMCPY( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );
newnode = new_attrib_node( GL_EVAL_BIT );
newnode->data = attr;
@@ -240,7 +240,7 @@
if (mask & GL_FOG_BIT) {
struct gl_fog_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_fog_attrib );
+ attr = MALLOC_STRUCT( gl_fog_attrib );
MEMCPY( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );
newnode = new_attrib_node( GL_FOG_BIT );
newnode->data = attr;
@@ -250,7 +250,7 @@
if (mask & GL_HINT_BIT) {
struct gl_hint_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_hint_attrib );
+ attr = MALLOC_STRUCT( gl_hint_attrib );
MEMCPY( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );
newnode = new_attrib_node( GL_HINT_BIT );
newnode->data = attr;
@@ -260,7 +260,7 @@
if (mask & GL_LIGHTING_BIT) {
struct gl_light_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_light_attrib );
+ attr = MALLOC_STRUCT( gl_light_attrib );
MEMCPY( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
newnode = new_attrib_node( GL_LIGHTING_BIT );
newnode->data = attr;
@@ -270,7 +270,7 @@
if (mask & GL_LINE_BIT) {
struct gl_line_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_line_attrib );
+ attr = MALLOC_STRUCT( gl_line_attrib );
MEMCPY( attr, &ctx->Line, sizeof(struct gl_line_attrib) );
newnode = new_attrib_node( GL_LINE_BIT );
newnode->data = attr;
@@ -280,7 +280,7 @@
if (mask & GL_LIST_BIT) {
struct gl_list_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_list_attrib );
+ attr = MALLOC_STRUCT( gl_list_attrib );
MEMCPY( attr, &ctx->List, sizeof(struct gl_list_attrib) );
newnode = new_attrib_node( GL_LIST_BIT );
newnode->data = attr;
@@ -290,7 +290,7 @@
if (mask & GL_PIXEL_MODE_BIT) {
struct gl_pixel_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_pixel_attrib );
+ attr = MALLOC_STRUCT( gl_pixel_attrib );
MEMCPY( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
newnode = new_attrib_node( GL_PIXEL_MODE_BIT );
newnode->data = attr;
@@ -300,7 +300,7 @@
if (mask & GL_POINT_BIT) {
struct gl_point_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_point_attrib );
+ attr = MALLOC_STRUCT( gl_point_attrib );
MEMCPY( attr, &ctx->Point, sizeof(struct gl_point_attrib) );
newnode = new_attrib_node( GL_POINT_BIT );
newnode->data = attr;
@@ -310,7 +310,7 @@
if (mask & GL_POLYGON_BIT) {
struct gl_polygon_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_polygon_attrib );
+ attr = MALLOC_STRUCT( gl_polygon_attrib );
MEMCPY( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );
newnode = new_attrib_node( GL_POLYGON_BIT );
newnode->data = attr;
@@ -320,7 +320,7 @@
if (mask & GL_POLYGON_STIPPLE_BIT) {
GLuint *stipple;
- stipple = (GLuint *) GL_ALLOC( 32*sizeof(GLuint) );
+ stipple = (GLuint *) MALLOC( 32*sizeof(GLuint) );
MEMCPY( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );
newnode = new_attrib_node( GL_POLYGON_STIPPLE_BIT );
newnode->data = stipple;
@@ -330,7 +330,7 @@
if (mask & GL_SCISSOR_BIT) {
struct gl_scissor_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_scissor_attrib );
+ attr = MALLOC_STRUCT( gl_scissor_attrib );
MEMCPY( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );
newnode = new_attrib_node( GL_SCISSOR_BIT );
newnode->data = attr;
@@ -340,7 +340,7 @@
if (mask & GL_STENCIL_BUFFER_BIT) {
struct gl_stencil_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_stencil_attrib );
+ attr = MALLOC_STRUCT( gl_stencil_attrib );
MEMCPY( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );
newnode = new_attrib_node( GL_STENCIL_BUFFER_BIT );
newnode->data = attr;
@@ -357,7 +357,7 @@
ctx->Texture.Unit[u].CurrentD[2]->RefCount++;
ctx->Texture.Unit[u].CurrentD[3]->RefCount++;
}
- attr = GL_ALLOC_STRUCT( gl_texture_attrib );
+ attr = MALLOC_STRUCT( gl_texture_attrib );
MEMCPY( attr, &ctx->Texture, sizeof(struct gl_texture_attrib) );
/* copy state of the currently bound texture objects */
for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
@@ -373,7 +373,7 @@
if (mask & GL_TRANSFORM_BIT) {
struct gl_transform_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_transform_attrib );
+ attr = MALLOC_STRUCT( gl_transform_attrib );
MEMCPY( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );
newnode = new_attrib_node( GL_TRANSFORM_BIT );
newnode->data = attr;
@@ -383,7 +383,7 @@
if (mask & GL_VIEWPORT_BIT) {
struct gl_viewport_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_viewport_attrib );
+ attr = MALLOC_STRUCT( gl_viewport_attrib );
MEMCPY( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );
newnode = new_attrib_node( GL_VIEWPORT_BIT );
newnode->data = attr;
@@ -756,8 +756,8 @@
}
next = attr->next;
- GL_FREE( attr->data );
- GL_FREE( attr );
+ FREE( attr->data );
+ FREE( attr );
attr = next;
}
@@ -788,14 +788,14 @@
if (mask & GL_CLIENT_PIXEL_STORE_BIT) {
struct gl_pixelstore_attrib *attr;
/* packing attribs */
- attr = GL_ALLOC_STRUCT( gl_pixelstore_attrib );
+ attr = MALLOC_STRUCT( gl_pixelstore_attrib );
MEMCPY( attr, &ctx->Pack, sizeof(struct gl_pixelstore_attrib) );
newnode = new_attrib_node( GL_CLIENT_PACK_BIT );
newnode->data = attr;
newnode->next = head;
head = newnode;
/* unpacking attribs */
- attr = GL_ALLOC_STRUCT( gl_pixelstore_attrib );
+ attr = MALLOC_STRUCT( gl_pixelstore_attrib );
MEMCPY( attr, &ctx->Unpack, sizeof(struct gl_pixelstore_attrib) );
newnode = new_attrib_node( GL_CLIENT_UNPACK_BIT );
newnode->data = attr;
@@ -804,7 +804,7 @@
}
if (mask & GL_CLIENT_VERTEX_ARRAY_BIT) {
struct gl_array_attrib *attr;
- attr = GL_ALLOC_STRUCT( gl_array_attrib );
+ attr = MALLOC_STRUCT( gl_array_attrib );
MEMCPY( attr, &ctx->Array, sizeof(struct gl_array_attrib) );
newnode = new_attrib_node( GL_CLIENT_VERTEX_ARRAY_BIT );
newnode->data = attr;
@@ -853,8 +853,8 @@
}
next = attr->next;
- GL_FREE( attr->data );
- GL_FREE( attr );
+ FREE( attr->data );
+ FREE( attr );
attr = next;
}