Fix up some loose ends from the last big check-in.
This commit is contained in:
@@ -1195,7 +1195,6 @@ _mesa_initialize_context( GLcontext *ctx,
|
|||||||
|
|
||||||
if (!init_attrib_groups( ctx )) {
|
if (!init_attrib_groups( ctx )) {
|
||||||
free_shared_state(ctx, ctx->Shared);
|
free_shared_state(ctx, ctx->Shared);
|
||||||
fprintf(stderr, "%s: failed to init attrib groups\n", __FUNCTION__);
|
|
||||||
return GL_FALSE;
|
return GL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1313,7 +1312,6 @@ _mesa_initialize_context( GLcontext *ctx,
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fprintf(stderr, "%s: succeded\n", __FUNCTION__);
|
|
||||||
return GL_TRUE;
|
return GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1398,7 +1396,8 @@ _mesa_free_context_data( GLcontext *ctx )
|
|||||||
free_shared_state( ctx, ctx->Shared );
|
free_shared_state( ctx, ctx->Shared );
|
||||||
}
|
}
|
||||||
|
|
||||||
_mesa_extensions_dtr(ctx);
|
if (ctx->Extensions.String)
|
||||||
|
FREE((void *) ctx->Extensions.String);
|
||||||
|
|
||||||
FREE(ctx->Exec);
|
FREE(ctx->Exec);
|
||||||
FREE(ctx->Save);
|
FREE(ctx->Save);
|
||||||
|
@@ -26,8 +26,9 @@
|
|||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
#include "imports.h"
|
#include "imports.h"
|
||||||
#include "context.h"
|
#include "context.h"
|
||||||
#include "enums.h"
|
|
||||||
#include "depth.h"
|
#include "depth.h"
|
||||||
|
#include "enums.h"
|
||||||
|
#include "hash.h"
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
#include "mtypes.h"
|
#include "mtypes.h"
|
||||||
|
|
||||||
|
@@ -427,10 +427,3 @@ _mesa_make_extension_string( GLcontext *ctx )
|
|||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
_mesa_extensions_dtr( GLcontext *ctx )
|
|
||||||
{
|
|
||||||
if (ctx->Extensions.String)
|
|
||||||
FREE((void *) ctx->Extensions.String);
|
|
||||||
}
|
|
||||||
|
@@ -42,6 +42,7 @@
|
|||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "mtypes.h"
|
#include "mtypes.h"
|
||||||
#include "math/m_matrix.h"
|
#include "math/m_matrix.h"
|
||||||
|
#include "math/m_xform.h"
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -2987,5 +2987,5 @@ void _mesa_free_texture_data( GLcontext *ctx )
|
|||||||
(ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyRect );
|
(ctx->Driver.DeleteTexture)(ctx, ctx->Texture.ProxyRect );
|
||||||
|
|
||||||
for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
|
for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
|
||||||
_mesa_free_colortable_data( &ctx->Texture.Unit[i].ColorTable );
|
_mesa_free_one_colortable( &ctx->Texture.Unit[i].ColorTable );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user