diff options
| author | Jouk <joukj@tarantella.(none)> | 2007-06-08 13:38:24 +0200 |
|---|---|---|
| committer | Jouk <joukj@tarantella.(none)> | 2007-06-08 13:38:24 +0200 |
| commit | 55f8b7053065ce88296608071feed6f9540f6c0d (patch) | |
| tree | 86ac301ed5805c895985040caf56f857de017233 /src/glx | |
| parent | 518f9168862b2096278ae14a65c8c854c208e004 (diff) | |
| parent | 7b559a91028d297b34df9ec939bd4d00fad6027c (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/mini/miniglx.c | 1 | ||||
| -rw-r--r-- | src/glx/x11/glx_pbuffer.c | 14 | ||||
| -rw-r--r-- | src/glx/x11/indirect_vertex_array.c | 2 |
3 files changed, 3 insertions, 14 deletions
diff --git a/src/glx/mini/miniglx.c b/src/glx/mini/miniglx.c index 71a0658eae3..874b88bc497 100644 --- a/src/glx/mini/miniglx.c +++ b/src/glx/mini/miniglx.c @@ -2434,6 +2434,7 @@ void (*glXGetProcAddress(const GLubyte *procname))( void ) return _glapi_get_proc_address((const char *) procname); } +void (*glXGetProcAddressARB(const GLubyte *procName))( void ) __attribute__ ((alias ("glXGetProcAddress"))); /** * \brief Query the Mini GLX version. diff --git a/src/glx/x11/glx_pbuffer.c b/src/glx/x11/glx_pbuffer.c index 472045e93d8..1df2d0f342a 100644 --- a/src/glx/x11/glx_pbuffer.c +++ b/src/glx/x11/glx_pbuffer.c @@ -40,18 +40,6 @@ #include "glcontextmodes.h" #include "glheader.h" -static void ChangeDrawableAttribute( Display * dpy, GLXDrawable drawable, - const CARD32 * attribs, size_t num_attribs ); - -static void DestroyPbuffer( Display * dpy, GLXDrawable drawable ); - -static GLXDrawable CreatePbuffer( Display *dpy, - const __GLcontextModes * fbconfig, unsigned int width, unsigned int height, - const int *attrib_list, GLboolean size_in_attribs ); - -static int GetDrawableAttribute( Display *dpy, GLXDrawable drawable, - int attribute, unsigned int *value ); - /** * Change a drawable's attribute. @@ -150,7 +138,7 @@ DestroyPbuffer( Display * dpy, GLXDrawable drawable ) if ( (priv->majorVersion > 1) || (priv->minorVersion >= 3) ) { xGLXDestroyPbufferReq * req; - GetReqExtra( GLXDestroyPbuffer, 4, req ); + GetReq( GLXDestroyPbuffer, req ); req->reqType = opcode; req->glxCode = X_GLXDestroyPbuffer; req->pbuffer = (GLXPbuffer) drawable; diff --git a/src/glx/x11/indirect_vertex_array.c b/src/glx/x11/indirect_vertex_array.c index 1855547dced..90ec277c41b 100644 --- a/src/glx/x11/indirect_vertex_array.c +++ b/src/glx/x11/indirect_vertex_array.c @@ -1667,7 +1667,7 @@ __glXGetArrayType( const __GLXattribute * const state, key, index ); if ( a != NULL ) { - *dest = (GLintptr) a->enabled; + *dest = (GLintptr) a->data_type; } return (a != NULL); |