diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-11-18 15:11:49 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-11-18 15:11:49 +0000 |
| commit | d6113fc20d68f5720740b89c594227d0312bab3e (patch) | |
| tree | 17172dc34f5fccd80a4cda438c5d1ec97f698434 /src/mesa/drivers/x11/glxapi.c | |
| parent | a8f002f4f494aca72eaddeb47c754ac5a0b46681 (diff) | |
bring in a few AGP-related bits from 4.0.4
Diffstat (limited to 'src/mesa/drivers/x11/glxapi.c')
| -rw-r--r-- | src/mesa/drivers/x11/glxapi.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c index 7b36d41964..81170a7ef3 100644 --- a/src/mesa/drivers/x11/glxapi.c +++ b/src/mesa/drivers/x11/glxapi.c @@ -1,10 +1,10 @@ -/* $Id: glxapi.c,v 1.30 2002/08/22 21:10:01 brianp Exp $ */ +/* $Id: glxapi.c,v 1.31 2002/11/18 15:11:52 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 4.0.2 + * Version: 5.1 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -988,7 +988,8 @@ Bool glXSet3DfxModeMESA(int mode) -/*** AGP memory allocation ***/ + +/*** GLX_NV_vertex_array_range ***/ void * glXAllocateMemoryNV( GLsizei size, @@ -1017,6 +1018,19 @@ glXFreeMemoryNV( GLvoid *pointer ) } +/*** GLX_MESA_agp_offset */ + +GLuint +glXGetAGPOffsetMESA( const GLvoid *pointer ) +{ + struct _glxapi_table *t; + Display *dpy = glXGetCurrentDisplay(); + GET_DISPATCH(dpy, t); + if (!t) + return ~0; + return (t->GetAGPOffsetMESA)(pointer); +} + /**********************************************************************/ /* GLX API management functions */ @@ -1227,10 +1241,13 @@ static struct name_address_pair GLX_functions[] = { /*** GLX_ARB_get_proc_address ***/ { "glXGetProcAddressARB", (GLvoid *) glXGetProcAddressARB }, - /*** GLX AGP memory allocation ***/ + /*** GLX_NV_vertex_array_range ***/ { "glXAllocateMemoryNV", (GLvoid *) glXAllocateMemoryNV }, { "glXFreeMemoryNV", (GLvoid *) glXFreeMemoryNV }, + /*** GLX_MESA_agp_offset ***/ + { "glXGetAGPOffsetMESA", (GLvoid *) glXGetAGPOffsetMESA }, + { NULL, NULL } /* end of list */ }; |