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 2bca293b3c299f5a8c723e39fb270288bd112955..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,12
+86,13
@@
static const struct dri_extension card_extensions[] =
/* Create the device specific context.
*/
/* Create the device specific context.
*/
-GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
- __DRIcontextPrivate *driContextPriv,
+GLboolean mach64CreateContext( gl_api api,
+ const __GLcontextModes *glVisual,
+ __DRIcontext *driContextPriv,
void *sharedContextPrivate )
{
GLcontext *ctx, *shareCtx;
void *sharedContextPrivate )
{
GLcontext *ctx, *shareCtx;
- __DRIscreen
Private
*driScreen = driContextPriv->driScreenPriv;
+ __DRIscreen *driScreen = driContextPriv->driScreenPriv;
struct dd_function_table functions;
mach64ContextPtr mmesa;
mach64ScreenPtr mach64Screen;
struct dd_function_table functions;
mach64ContextPtr mmesa;
mach64ScreenPtr mach64Screen;
@@
-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;
@@
-260,7
+259,7
@@
GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
/* Destroy the device specific context.
*/
/* Destroy the device specific context.
*/
-void mach64DestroyContext( __DRIcontext
Private
*driContextPriv )
+void mach64DestroyContext( __DRIcontext *driContextPriv )
{
mach64ContextPtr mmesa = (mach64ContextPtr) driContextPriv->driverPrivate;
{
mach64ContextPtr mmesa = (mach64ContextPtr) driContextPriv->driverPrivate;
@@
-293,7
+292,7
@@
void mach64DestroyContext( __DRIcontextPrivate *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;
@@
-307,9
+306,9
@@
void mach64DestroyContext( __DRIcontextPrivate *driContextPriv )
* buffer `b'.
*/
GLboolean
* buffer `b'.
*/
GLboolean
-mach64MakeCurrent( __DRIcontext
Private
*driContextPriv,
- __DRIdrawable
Private
*driDrawPriv,
- __DRIdrawable
Private
*driReadPriv )
+mach64MakeCurrent( __DRIcontext *driContextPriv,
+ __DRIdrawable *driDrawPriv,
+ __DRIdrawable *driReadPriv )
{
if ( driContextPriv ) {
GET_CURRENT_CONTEXT(ctx);
{
if ( driContextPriv ) {
GET_CURRENT_CONTEXT(ctx);
@@
-352,7
+351,7
@@
mach64MakeCurrent( __DRIcontextPrivate *driContextPriv,
/* Force the context `c' to be unbound from its buffer.
*/
GLboolean
/* Force the context `c' to be unbound from its buffer.
*/
GLboolean
-mach64UnbindContext( __DRIcontext
Private
*driContextPriv )
+mach64UnbindContext( __DRIcontext *driContextPriv )
{
return GL_TRUE;
}
{
return GL_TRUE;
}