projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Mention the mlen and rlen for URB reads.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_context.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_context.c
b/src/mesa/drivers/dri/mach64/mach64_context.c
index 3b4ef7ffd82a9dc3b2c44f83932652cd3985e226..72a44d96424c6cd28fbdebe8d5519ba2afe738ea 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_context.c
@@
-33,8
+33,6
@@
#include "main/context.h"
#include "main/simple_list.h"
#include "main/imports.h"
#include "main/context.h"
#include "main/simple_list.h"
#include "main/imports.h"
-#include "main/matrix.h"
-#include "main/extensions.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
#include "swrast/swrast.h"
#include "swrast_setup/swrast_setup.h"
@@
-88,7
+86,8
@@
static const struct dri_extension card_extensions[] =
/* Create the device specific context.
*/
/* Create the device specific context.
*/
-GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
+GLboolean mach64CreateContext( gl_api api,
+ const __GLcontextModes *glVisual,
__DRIcontext *driContextPriv,
void *sharedContextPrivate )
{
__DRIcontext *driContextPriv,
void *sharedContextPrivate )
{
@@
-213,7
+212,7
@@
GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
/* Allocate the vertex buffer
*/
/* Allocate the vertex buffer
*/
- mmesa->vert_buf =
ALIGN_MALLOC
(MACH64_BUFFER_SIZE, 32);
+ mmesa->vert_buf =
_mesa_align_malloc
(MACH64_BUFFER_SIZE, 32);
if ( !mmesa->vert_buf )
return GL_FALSE;
mmesa->vert_used = 0;
if ( !mmesa->vert_buf )
return GL_FALSE;
mmesa->vert_used = 0;
@@
-293,7
+292,7
@@
void mach64DestroyContext( __DRIcontext *driContextPriv )
/* Free the vertex buffer */
if ( mmesa->vert_buf )
/* Free the vertex buffer */
if ( mmesa->vert_buf )
-
ALIGN_FREE
( mmesa->vert_buf );
+
_mesa_align_free
( mmesa->vert_buf );
/* free the Mesa context */
mmesa->glCtx->DriverCtx = NULL;
/* free the Mesa context */
mmesa->glCtx->DriverCtx = NULL;