Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into multitouch

Conflicts:
	configure.ac
	dix/inpututils.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2011-12-22 09:29:59 +10:00
commit e395efc25f
88 changed files with 20045 additions and 9175 deletions

View File

@ -97,7 +97,7 @@ static const Mask SecurityClientMask = DixGetAttrAccess;
* Writes the message to the log file if security logging is on. * Writes the message to the log file if security logging is on.
*/ */
static void static void _X_ATTRIBUTE_PRINTF(1,2)
SecurityAudit(const char *format, ...) SecurityAudit(const char *format, ...)
{ {
va_list args; va_list args;
@ -171,7 +171,8 @@ SecurityDeleteAuthorization(
{ {
SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value; SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
unsigned short name_len, data_len; unsigned short name_len, data_len;
char *name, *data; const char *name;
char *data;
int status; int status;
int i; int i;
OtherClientsPtr pEventClient; OtherClientsPtr pEventClient;

View File

@ -147,12 +147,12 @@ ProcXResQueryClientResources (ClientPtr client)
if(num_types) { if(num_types) {
xXResType scratch; xXResType scratch;
char *name; const char *name;
for(i = 0; i < lastResourceType; i++) { for(i = 0; i < lastResourceType; i++) {
if(!counts[i]) continue; if(!counts[i]) continue;
name = (char *)LookupResourceName(i + 1); name = LookupResourceName(i + 1);
if (strcmp(name, XREGISTRY_UNKNOWN)) if (strcmp(name, XREGISTRY_UNKNOWN))
scratch.resource_type = MakeAtom(name, strlen(name), TRUE); scratch.resource_type = MakeAtom(name, strlen(name), TRUE);
else { else {

View File

@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure. dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT([xorg-server], 1.11.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_INIT([xorg-server], 1.11.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
RELEASE_DATE="2011-11-20" RELEASE_DATE="2011-12-17"
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -212,7 +212,7 @@ AC_CHECK_FUNC([dlopen], [],
AC_SUBST(DLOPEN_LIBS) AC_SUBST(DLOPEN_LIBS)
dnl Checks for library functions. dnl Checks for library functions.
AC_CHECK_FUNCS([backtrace ffs \ AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
getdtablesize getifaddrs getpeereid getpeerucred getzoneid \ getdtablesize getifaddrs getpeereid getpeerucred getzoneid \
mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext]) mmap shmctl64 strncasecmp vasprintf vsnprintf walkcontext])
AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup]) AC_REPLACE_FUNCS([strcasecmp strcasestr strlcat strlcpy strndup])
@ -2020,12 +2020,10 @@ if test "$KDRIVE" = yes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm" XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
fi fi
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
if test "x$XEPHYR" = xauto; then if test "x$XEPHYR" = xauto; then
XEPHYR=$xephyr PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
fi elif test "x$XEPHYR" = xyes ; then
if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS)
AC_MSG_ERROR([Xephyr dependencies missing])
fi fi
# Xephyr needs nanosleep() which is in librt on Solaris # Xephyr needs nanosleep() which is in librt on Solaris

View File

@ -152,7 +152,7 @@ CheckForEmptyMask(CursorBitsPtr bits)
if (bits->argb) if (bits->argb)
{ {
CARD32 *argb = bits->argb; CARD32 *argb = bits->argb;
int n = bits->width * bits->height; n = bits->width * bits->height;
while (n--) while (n--)
if (*argb++ & 0xff000000) return; if (*argb++ & 0xff000000) return;
} }

View File

@ -3600,7 +3600,7 @@ ProcInitialConnection(ClientPtr client)
} }
static int static int
SendConnSetup(ClientPtr client, char *reason) SendConnSetup(ClientPtr client, const char *reason)
{ {
xWindowRoot *root; xWindowRoot *root;
int i; int i;
@ -3699,7 +3699,8 @@ SendConnSetup(ClientPtr client, char *reason)
int int
ProcEstablishConnection(ClientPtr client) ProcEstablishConnection(ClientPtr client)
{ {
char *reason, *auth_proto, *auth_string; const char *reason;
char *auth_proto, *auth_string;
xConnClientPrefix *prefix; xConnClientPrefix *prefix;
REQUEST(xReq); REQUEST(xReq);

View File

@ -167,8 +167,8 @@ ISOLatin1ToLower (unsigned char source)
int int
CompareISOLatin1Lowered(unsigned char *s1, int s1len, CompareISOLatin1Lowered(const unsigned char *s1, int s1len,
unsigned char *s2, int s2len) const unsigned char *s2, int s2len)
{ {
unsigned char c1, c2; unsigned char c1, c2;

View File

@ -41,7 +41,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static FILE *fh; static FILE *fh;
static char ***requests, **events, **errors, **resources; static char ***requests, **events, **errors;
static const char **resources;
static unsigned nmajor, *nminor, nevent, nerror, nresource; static unsigned nmajor, *nminor, nevent, nerror, nresource;
/* /*
@ -197,7 +198,7 @@ RegisterExtensionNames(ExtensionEntry *extEntry)
*/ */
void void
RegisterResourceName(RESTYPE resource, char *name) RegisterResourceName(RESTYPE resource, const char *name)
{ {
resource &= TypeMask; resource &= TypeMask;

View File

@ -242,7 +242,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
} }
RESTYPE RESTYPE
CreateNewResourceType(DeleteType deleteFunc, char *name) CreateNewResourceType(DeleteType deleteFunc, const char *name)
{ {
RESTYPE next = lastResourceType + 1; RESTYPE next = lastResourceType + 1;
struct ResourceType *types; struct ResourceType *types;

View File

@ -63,6 +63,8 @@ libglxdri_la_LIBADD = $(DLOPEN_LIBS)
libglx_la_SOURCES = \ libglx_la_SOURCES = \
$(indirect_sources) \ $(indirect_sources) \
$(glapi_sources) \ $(glapi_sources) \
clientinfo.c \
createcontext.c \
extension_string.c \ extension_string.c \
extension_string.h \ extension_string.h \
indirect_util.c \ indirect_util.c \

48
glx/clientinfo.c Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright © 2011 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "glxserver.h"
#include "indirect_dispatch.h"
int __glXDisp_SetClientInfoARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}
int __glXDispSwap_SetClientInfoARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}
int __glXDisp_SetClientInfo2ARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}
int __glXDispSwap_SetClientInfo2ARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}

38
glx/createcontext.c Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright © 2011 Intel Corporation
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "glxserver.h"
#include "indirect_dispatch.h"
int __glXDisp_CreateContextAttribsARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}
int __glXDispSwap_CreateContextAttribsARB(__GLXclientState *cl, GLbyte *pc)
{
return BadRequest;
}

File diff suppressed because it is too large Load Diff

View File

@ -44,9 +44,11 @@
#endif #endif
#include "glapi.h" #include "glapi.h"
#include "glapioffsets.h" #include "dispatch.h"
#include "glapitable.h" #include "glapitable.h"
#define FIRST_DYNAMIC_OFFSET (sizeof(struct _glapi_table) / sizeof(void *))
#if defined(PTHREADS) || defined(GLX_USE_TLS) #if defined(PTHREADS) || defined(GLX_USE_TLS)
static void init_glapi_relocs(void); static void init_glapi_relocs(void);
#endif #endif
@ -380,7 +382,7 @@ PUBLIC int
_glapi_add_dispatch( const char * const * function_names, _glapi_add_dispatch( const char * const * function_names,
const char * parameter_signature ) const char * parameter_signature )
{ {
static int next_dynamic_offset = _gloffset_FIRST_DYNAMIC; static int next_dynamic_offset = FIRST_DYNAMIC_OFFSET;
const char * const real_sig = (parameter_signature != NULL) const char * const real_sig = (parameter_signature != NULL)
? parameter_signature : ""; ? parameter_signature : "";
struct _glapi_function * entry[8]; struct _glapi_function * entry[8];

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -470,346 +470,549 @@ struct _glapi_table
void (GLAPIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 427 */ void (GLAPIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 427 */
void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 428 */ void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 428 */
void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 429 */ void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 429 */
void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 430 */ void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 430 */
void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 431 */ void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 431 */
void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 432 */ void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 432 */
void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 433 */ void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 433 */
void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 434 */ void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 434 */
void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 435 */ const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 435 */
void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 436 */ void (GLAPIENTRYP TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer); /* 436 */
void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 437 */ void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 437 */
void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 438 */ void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 438 */
void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 439 */ void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 439 */
void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 440 */ void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 440 */
void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 441 */ void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 441 */
void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 442 */ void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 442 */
void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 443 */ void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 443 */
void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 444 */ void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 444 */
void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 445 */ void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 445 */
void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 446 */ void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 446 */
void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 447 */ void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 447 */
void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 448 */ void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 448 */
void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 449 */ void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 449 */
void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 450 */ void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 450 */
void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 451 */ void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 451 */
void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 452 */ void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 452 */
void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 453 */ void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 453 */
void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 454 */ void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 454 */
void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 455 */ void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 455 */
void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 456 */ void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 456 */
void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 457 */ void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 457 */
void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 458 */ void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 458 */
void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 459 */ void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 459 */
void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 460 */ void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 460 */
void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 461 */ void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 461 */
void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 462 */ void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 462 */
void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 463 */ void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 463 */
void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 464 */ void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 464 */
void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 465 */ void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 465 */
void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 466 */ void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 466 */
void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 467 */ void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 467 */
void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 468 */ void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 468 */
void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 469 */ void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 469 */
void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 470 */ void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 470 */
void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 471 */ void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 471 */
void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 472 */ void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 472 */
void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 473 */ void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 473 */
void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 474 */ void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 474 */
void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 475 */ void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 475 */
void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 476 */ void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 476 */
void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 477 */ void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 477 */
void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 478 */ void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 478 */
void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 479 */ void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 479 */
void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 480 */ void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 480 */
void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 481 */ void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 481 */
void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 482 */ void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 482 */
void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 483 */ void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 483 */
void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 484 */ void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 484 */
void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 485 */ void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 485 */
void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 486 */ void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 486 */
void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 487 */ void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 487 */
void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 488 */ void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 488 */
void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 489 */ void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 489 */
void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 490 */ void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 490 */
void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 491 */ void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 491 */
void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 492 */ void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 492 */
void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 493 */ void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 493 */
void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 494 */ void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 494 */
void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 495 */ void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 495 */
void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 496 */ void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 496 */
void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 497 */ void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 497 */
void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 498 */ void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 498 */
void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 499 */ void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 499 */
void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 500 */ void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 500 */
void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 501 */ void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 501 */
void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 502 */ void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 502 */
void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 503 */ void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 503 */
void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 504 */ void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 504 */
void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 505 */ void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 505 */
void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 506 */ void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 506 */
GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 507 */ void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 507 */
GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 508 */ void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 508 */
GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 509 */ void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 509 */
void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 510 */ void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 510 */
void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 511 */ void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 511 */
void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 512 */ void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 512 */
void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 513 */ void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 513 */
void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 514 */ void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 514 */
void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 515 */ void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 515 */
void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 516 */ void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 516 */
GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 517 */ void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 517 */
void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 518 */ GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 518 */
void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 519 */ GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 519 */
GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 520 */ GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 520 */
GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 521 */ void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 521 */
void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 522 */ void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 522 */
void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 523 */ void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 523 */
void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 524 */ void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 524 */
void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 525 */ void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 525 */
GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 526 */ void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 526 */
void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 527 */ void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 527 */
void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 528 */ GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 528 */
void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 529 */ void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 529 */
void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 530 */ void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 530 */
GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 531 */ GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 531 */
void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 532 */ GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 532 */
void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 533 */ void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 533 */
void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 534 */ void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 534 */
void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 535 */ void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 535 */
void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 536 */ void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 536 */
void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 537 */ GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 537 */
void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 538 */ void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 538 */
void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 539 */ void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 539 */
void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 540 */ void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 540 */
void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 541 */ void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 541 */
void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 542 */ GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 542 */
void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 543 */ void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 543 */
void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 544 */ void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 544 */
void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 545 */ void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 545 */
void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 546 */ void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 546 */
void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 547 */ void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 547 */
void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 548 */ void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 548 */
void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 549 */ void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 549 */
void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 550 */ void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 550 */
void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 551 */ void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 551 */
void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 552 */ void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 552 */
void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 553 */ void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 553 */
void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 554 */ void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 554 */
void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 555 */ void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 555 */
void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 556 */ void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 556 */
void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 557 */ void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 557 */
void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 558 */ void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 558 */
GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 559 */ void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 559 */
void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 560 */ void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 560 */
void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 561 */ void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 561 */
void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 562 */ void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 562 */
void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 563 */ void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 564 */ void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 565 */ void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */
void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 566 */ void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 566 */
void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 567 */ void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 567 */
void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 568 */ void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 568 */
void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 569 */ void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 569 */
void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 570 */ GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 570 */
void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 571 */ void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 571 */
void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 572 */ void (GLAPIENTRYP ClampColorARB)(GLenum target, GLenum clamp); /* 572 */
void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 573 */ void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 573 */
void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 574 */ void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 574 */
void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 575 */ void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 575 */
void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 576 */ void (GLAPIENTRYP FramebufferTextureARB)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 576 */
void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 577 */ void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 577 */
void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 578 */ void (GLAPIENTRYP ProgramParameteriARB)(GLuint program, GLenum pname, GLint value); /* 578 */
void (GLAPIENTRYP UnlockArraysEXT)(void); /* 579 */ void (GLAPIENTRYP VertexAttribDivisorARB)(GLuint index, GLuint divisor); /* 579 */
void (GLAPIENTRYP CullParameterdvEXT)(GLenum pname, GLdouble * params); /* 580 */ void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 580 */
void (GLAPIENTRYP CullParameterfvEXT)(GLenum pname, GLfloat * params); /* 581 */ GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 581 */
void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 582 */ void (GLAPIENTRYP TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer); /* 582 */
void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 583 */ void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 583 */
void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 584 */ void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 584 */
void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 585 */ void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 585 */
void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 586 */ GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 586 */
void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 587 */ void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 587 */
void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 588 */ GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 588 */
void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 589 */ void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 589 */
void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 590 */ void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 590 */
void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 591 */ GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 591 */
void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 592 */ void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 592 */
void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 593 */ void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 593 */
void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 594 */ void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 594 */
void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 595 */ void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 595 */
void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 596 */ void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex); /* 596 */
void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 597 */ void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 597 */
void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 598 */ void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 598 */
void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount); /* 599 */ void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 599 */
void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 600 */ void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 600 */
void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 601 */ void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 601 */
void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 602 */ void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 602 */
void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 603 */ void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 603 */
void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 604 */ void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 604 */
void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 605 */ void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 605 */
void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 606 */ void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 606 */
void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 607 */ void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 607 */
void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 608 */ GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 608 */
void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 609 */ void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 609 */
void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 610 */ void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 610 */
void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 611 */ void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 611 */
void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 612 */ void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 612 */
void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 613 */ void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 613 */
void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 614 */ void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 614 */
void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 615 */ void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 615 */
void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 616 */ void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 616 */
void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 617 */ void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 617 */
void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 618 */ void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 618 */
void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 619 */ void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 619 */
void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 620 */ void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 620 */
void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 621 */ void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 621 */
void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 622 */ void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 622 */
void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 623 */ void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 623 */
void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 624 */ void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 624 */
void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 625 */ void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 625 */
void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 626 */ void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 626 */
void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 627 */ void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 627 */
void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 628 */ void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 628 */
void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 629 */ void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 629 */
void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 630 */ void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 630 */
void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 631 */ void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 631 */
void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 632 */ void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 632 */
void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 633 */ void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 633 */
void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 634 */ void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 634 */
void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 635 */ void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 635 */
void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 636 */ void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 636 */
void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 637 */ void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 637 */
void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 638 */ void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 638 */
void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 639 */ void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 639 */
void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 640 */ void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 640 */
void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 641 */ void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 641 */
void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 642 */ void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 642 */
void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 643 */ void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 643 */
void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 644 */ void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 644 */
void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 645 */ void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 645 */
void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 646 */ void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 646 */
void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 647 */ void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 647 */
void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 648 */ void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 648 */
void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 649 */ void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 649 */
void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 650 */ void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 650 */
void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 651 */ void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 651 */
void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 652 */ void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 652 */
void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 653 */ void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 653 */
GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 654 */ void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 654 */
void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 655 */ void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 655 */
GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 656 */ void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 656 */
GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 657 */ GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 657 */
void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 658 */ void (GLAPIENTRYP PauseTransformFeedback)(void); /* 658 */
void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 659 */ void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 659 */
void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 660 */ void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 660 */
void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 661 */ void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 661 */
void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 662 */ void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 662 */
void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 663 */ void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 663 */
void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 664 */ void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 664 */
void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 665 */ GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 665 */
void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 666 */ void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 666 */
void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 667 */ void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 667 */
void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 668 */ void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 668 */
void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 669 */ void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 669 */
void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 670 */ void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 670 */
GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 671 */ void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 671 */
void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 672 */ void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 672 */
void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLuint num, const GLdouble * params); /* 673 */ void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 673 */
void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLuint num, const GLfloat * params); /* 674 */ void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 674 */
void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 675 */ void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 675 */
void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 676 */ void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 676 */
void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 677 */ void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 677 */
void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 678 */ void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 678 */
void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 679 */ void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 679 */
void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 680 */ void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 680 */
void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 681 */ void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 681 */
void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 682 */ void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 682 */
void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 683 */ void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 683 */
void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 684 */ void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 684 */
void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 685 */ void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 685 */
void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 686 */ void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 686 */
void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 687 */ void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 687 */
void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 688 */ void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 688 */
void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 689 */ void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 689 */
void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 690 */ void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 690 */
void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 691 */ void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 691 */
void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 692 */ void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 692 */
void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 693 */ void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 693 */
void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 694 */ void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 694 */
void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 695 */ void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 695 */
void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 696 */ void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 696 */
void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 697 */ void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 697 */
void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 698 */ void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 698 */
void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 699 */ void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 699 */
void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 700 */ void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 700 */
void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 701 */ void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 701 */
void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 702 */ void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 702 */
void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 703 */ void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 703 */
void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 704 */ void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 704 */
void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 705 */ void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 705 */
void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 706 */ void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 706 */
void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 707 */ void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 707 */
void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 708 */ void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 708 */
void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 709 */ void (GLAPIENTRYP UnlockArraysEXT)(void); /* 709 */
void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 710 */ void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 710 */
void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 711 */ void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 711 */
void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 712 */ void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 712 */
void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 713 */ void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 713 */
void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 714 */ void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 714 */
void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 715 */ void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 715 */
void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 716 */ void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 716 */
void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 717 */ void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 717 */
void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 718 */ void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 718 */
void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 719 */ void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 719 */
void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 720 */ void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 720 */
void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 721 */ void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 721 */
void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 722 */ void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 722 */
void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 723 */ void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 723 */
void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 724 */ void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 724 */
void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 725 */ void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 725 */
void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 726 */ void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 726 */
GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 727 */ void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 727 */
void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 728 */ void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 728 */
void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 729 */ void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 729 */
void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 730 */ void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 730 */
void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 731 */ void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 731 */
void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 732 */ void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 732 */
void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 733 */ void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 733 */
void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 734 */ void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 734 */
void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 735 */ void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 735 */
void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 736 */ void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 736 */
GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 737 */ void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 737 */
void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 738 */ void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 738 */
void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 739 */ void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 739 */
void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 740 */ void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 740 */
void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 741 */ void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 741 */
void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 742 */ void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 742 */
void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 743 */ void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 743 */
void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 744 */ void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 744 */
void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 745 */ void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 745 */
void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 746 */ void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 746 */
void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 747 */ void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 747 */
GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 748 */ void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 748 */
void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 749 */ void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 749 */
void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 750 */ void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 750 */
void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 751 */ void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 751 */
void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 752 */ void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 752 */
void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 753 */ void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 753 */
void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 754 */ void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 754 */
void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 755 */ void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 755 */
void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 756 */ void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 756 */
void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 757 */ void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 757 */
void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 758 */ void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 758 */
void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 759 */ void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 759 */
GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 760 */ void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 760 */
GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 761 */ void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 761 */
void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 762 */ void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 762 */
void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 763 */ void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 763 */
void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 764 */ void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 764 */
void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 765 */ void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 765 */
void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 766 */ void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 766 */
void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 767 */ void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 767 */
void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 768 */ void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 768 */
void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 769 */ void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 769 */
void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 770 */
void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 771 */
void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 772 */
void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 773 */
void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 774 */
void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 775 */
void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 776 */
void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 777 */
void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 778 */
void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 779 */
void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 780 */
void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 781 */
GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 782 */
void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 783 */
GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 784 */
GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 785 */
void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 786 */
void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 787 */
void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 788 */
void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 789 */
void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 790 */
void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 791 */
void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 792 */
void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 793 */
void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 794 */
void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 795 */
void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 796 */
void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 797 */
void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 798 */
GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 799 */
void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 800 */
void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 801 */
void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 802 */
void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 803 */
void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 804 */
void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 805 */
void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 806 */
void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 807 */
void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 808 */
void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 809 */
void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 810 */
void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 811 */
void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 812 */
void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 813 */
void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 814 */
void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 815 */
void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 816 */
void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 817 */
void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 818 */
void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 819 */
void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 820 */
void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 821 */
void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 822 */
void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 823 */
void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 824 */
void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 825 */
void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 826 */
void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 827 */
void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 828 */
void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 829 */
void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 830 */
void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 831 */
void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 832 */
void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 833 */
void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 834 */
void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 835 */
void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 836 */
void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 837 */
void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 838 */
void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 839 */
void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 840 */
void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 841 */
void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 842 */
void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 843 */
void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 844 */
void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 845 */
void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 846 */
void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 847 */
void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 848 */
void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 849 */
void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 850 */
void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 851 */
void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 852 */
void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 853 */
void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 854 */
void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 855 */
void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 856 */
void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 857 */
void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 858 */
GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 859 */
void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 860 */
void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 861 */
void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 862 */
void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 863 */
void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 864 */
void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 865 */
void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 866 */
void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 867 */
void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 868 */
GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 869 */
void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 870 */
void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 871 */
void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 872 */
void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 873 */
void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 874 */
void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 875 */
void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 876 */
void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 877 */
void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 878 */
void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 879 */
void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 880 */
void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 881 */
GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 882 */
void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 883 */
void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 884 */
void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 885 */
void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 886 */
void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 887 */
void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 888 */
void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 889 */
void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 890 */
void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 891 */
void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 892 */
void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 893 */
GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 894 */
GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 895 */
void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 896 */
void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 897 */
void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 898 */
void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 899 */
void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 900 */
GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 901 */
void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 902 */
void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 903 */
void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 904 */
void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 905 */
void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 906 */
void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 907 */
void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 908 */
void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 909 */
void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 911 */
void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 913 */
void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 914 */
void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 915 */
void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 916 */
void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 917 */
void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 918 */
void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 919 */
void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 920 */
void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 921 */
void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 922 */
void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 923 */
void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 924 */
void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 925 */
void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 926 */
void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 927 */
void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 928 */
void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 929 */
void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 930 */
void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 931 */
void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 932 */
void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 933 */
void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 934 */
void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 935 */
void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 936 */
void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 937 */
void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 938 */
void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 939 */
GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 940 */
void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 941 */
void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 942 */
void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 943 */
void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 944 */
void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 945 */
void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 946 */
void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 947 */
void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 948 */
void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 949 */
void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 950 */
void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 951 */
void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 952 */
void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 953 */
void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 954 */
void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 955 */
void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 956 */
void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 957 */
void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 958 */
void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 959 */
GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 960 */
GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 961 */
void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 962 */
GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 963 */
void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 964 */
void (GLAPIENTRYP TextureBarrierNV)(void); /* 965 */
void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 966 */
void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 967 */
void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 968 */
void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 969 */
void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 970 */
void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 971 */
void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 972 */
}; };
#endif /* !defined( _GLAPI_TABLE_H_ ) */ #endif /* !defined( _GLAPI_TABLE_H_ ) */

File diff suppressed because it is too large Load Diff

View File

@ -423,7 +423,7 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
} }
static void static void
__glXDRIinvalidateBuffers(DrawablePtr pDraw, void *priv) __glXDRIinvalidateBuffers(DrawablePtr pDraw, void *priv, XID id)
{ {
#if __DRI2_FLUSH_VERSION >= 3 #if __DRI2_FLUSH_VERSION >= 3
__GLXDRIdrawable *private = priv; __GLXDRIdrawable *private = priv;

View File

@ -44,8 +44,6 @@ extern void __glXClearErrorOccured(void);
extern GLboolean __glXErrorOccured(void); extern GLboolean __glXErrorOccured(void);
extern void __glXResetLargeCommandStatus(__GLXclientState*); extern void __glXResetLargeCommandStatus(__GLXclientState*);
extern void GlxExtensionInit(void);
extern const char GLServerVersion[]; extern const char GLServerVersion[];
extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap); extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap);

View File

@ -98,6 +98,8 @@ void __glXDisp_CallLists(GLbyte * pc)
const GLenum type = *(GLenum *)(pc + 4); const GLenum type = *(GLenum *)(pc + 4);
const GLvoid * lists = (const GLvoid *)(pc + 8); const GLvoid * lists = (const GLvoid *)(pc + 8);
lists = (const GLvoid *) (pc + 8);
CALL_CallLists( GET_DISPATCH(), ( CALL_CallLists( GET_DISPATCH(), (
n, n,
type, type,
@ -158,7 +160,7 @@ void __glXDisp_Begin(GLbyte * pc)
void __glXDisp_Bitmap(GLbyte * pc) void __glXDisp_Bitmap(GLbyte * pc)
{ {
const GLubyte * const bitmap = (const GLubyte *) (pc + 44); const GLubyte * const bitmap = (const GLubyte *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );
@ -1035,7 +1037,7 @@ void __glXDisp_PolygonMode(GLbyte * pc)
void __glXDisp_PolygonStipple(GLbyte * pc) void __glXDisp_PolygonStipple(GLbyte * pc)
{ {
const GLubyte * const mask = (const GLubyte *) (pc + 20); const GLubyte * const mask = (const GLubyte *) ((pc + 20));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );
@ -1114,7 +1116,7 @@ void __glXDisp_TexParameteriv(GLbyte * pc)
void __glXDisp_TexImage1D(GLbyte * pc) void __glXDisp_TexImage1D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 52); const GLvoid * const pixels = (const GLvoid *) ((pc + 52));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -1138,7 +1140,7 @@ void __glXDisp_TexImage1D(GLbyte * pc)
void __glXDisp_TexImage2D(GLbyte * pc) void __glXDisp_TexImage2D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 52); const GLvoid * const pixels = (const GLvoid *) ((pc + 52));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -1744,7 +1746,7 @@ void __glXDisp_CopyPixels(GLbyte * pc)
void __glXDisp_DrawPixels(GLbyte * pc) void __glXDisp_DrawPixels(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 36); const GLvoid * const pixels = (const GLvoid *) ((pc + 36));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -2970,7 +2972,7 @@ void __glXDisp_PrioritizeTextures(GLbyte * pc)
void __glXDisp_TexSubImage1D(GLbyte * pc) void __glXDisp_TexSubImage1D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 56); const GLvoid * const pixels = (const GLvoid *) ((pc + 56));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -2993,7 +2995,7 @@ void __glXDisp_TexSubImage1D(GLbyte * pc)
void __glXDisp_TexSubImage2D(GLbyte * pc) void __glXDisp_TexSubImage2D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 56); const GLvoid * const pixels = (const GLvoid *) ((pc + 56));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3035,7 +3037,7 @@ void __glXDisp_BlendEquation(GLbyte * pc)
void __glXDisp_ColorTable(GLbyte * pc) void __glXDisp_ColorTable(GLbyte * pc)
{ {
const GLvoid * const table = (const GLvoid *) (pc + 40); const GLvoid * const table = (const GLvoid *) ((pc + 40));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3212,7 +3214,7 @@ int __glXDisp_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
void __glXDisp_ColorSubTable(GLbyte * pc) void __glXDisp_ColorSubTable(GLbyte * pc)
{ {
const GLvoid * const data = (const GLvoid *) (pc + 40); const GLvoid * const data = (const GLvoid *) ((pc + 40));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3245,7 +3247,7 @@ void __glXDisp_CopyColorSubTable(GLbyte * pc)
void __glXDisp_ConvolutionFilter1D(GLbyte * pc) void __glXDisp_ConvolutionFilter1D(GLbyte * pc)
{ {
const GLvoid * const image = (const GLvoid *) (pc + 44); const GLvoid * const image = (const GLvoid *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3267,7 +3269,7 @@ void __glXDisp_ConvolutionFilter1D(GLbyte * pc)
void __glXDisp_ConvolutionFilter2D(GLbyte * pc) void __glXDisp_ConvolutionFilter2D(GLbyte * pc)
{ {
const GLvoid * const image = (const GLvoid *) (pc + 44); const GLvoid * const image = (const GLvoid *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3769,7 +3771,7 @@ void __glXDisp_TexImage3D(GLbyte * pc)
void __glXDisp_TexSubImage3D(GLbyte * pc) void __glXDisp_TexSubImage3D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 88); const GLvoid * const pixels = (const GLvoid *) ((pc + 88));
__GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -4729,6 +4731,25 @@ void __glXDisp_DrawBuffersARB(GLbyte * pc)
) ); ) );
} }
void __glXDisp_ClampColorARB(GLbyte * pc)
{
CALL_ClampColorARB( GET_DISPATCH(), (
*(GLenum *)(pc + 0),
*(GLenum *)(pc + 4)
) );
}
void __glXDisp_RenderbufferStorageMultisample(GLbyte * pc)
{
CALL_RenderbufferStorageMultisample( GET_DISPATCH(), (
*(GLenum *)(pc + 0),
*(GLsizei *)(pc + 4),
*(GLenum *)(pc + 8),
*(GLsizei *)(pc + 12),
*(GLsizei *)(pc + 16)
) );
}
void __glXDisp_SampleMaskSGIS(GLbyte * pc) void __glXDisp_SampleMaskSGIS(GLbyte * pc)
{ {
CALL_SampleMaskSGIS( GET_DISPATCH(), ( CALL_SampleMaskSGIS( GET_DISPATCH(), (
@ -5166,7 +5187,7 @@ void __glXDisp_LoadProgramNV(GLbyte * pc)
void __glXDisp_ProgramParameters4dvNV(GLbyte * pc) void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
{ {
const GLuint num = *(GLuint *)(pc + 8); const GLsizei num = *(GLsizei *)(pc + 8);
#ifdef __GLX_ALIGN64 #ifdef __GLX_ALIGN64
const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
@ -5186,7 +5207,7 @@ void __glXDisp_ProgramParameters4dvNV(GLbyte * pc)
void __glXDisp_ProgramParameters4fvNV(GLbyte * pc) void __glXDisp_ProgramParameters4fvNV(GLbyte * pc)
{ {
const GLuint num = *(GLuint *)(pc + 8); const GLsizei num = *(GLsizei *)(pc + 8);
CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
*(GLenum *)(pc + 0), *(GLenum *)(pc + 0),
@ -5882,3 +5903,30 @@ void __glXDisp_RenderbufferStorageEXT(GLbyte * pc)
) ); ) );
} }
void __glXDisp_BlitFramebufferEXT(GLbyte * pc)
{
CALL_BlitFramebufferEXT( GET_DISPATCH(), (
*(GLint *)(pc + 0),
*(GLint *)(pc + 4),
*(GLint *)(pc + 8),
*(GLint *)(pc + 12),
*(GLint *)(pc + 16),
*(GLint *)(pc + 20),
*(GLint *)(pc + 24),
*(GLint *)(pc + 28),
*(GLbitfield *)(pc + 32),
*(GLenum *)(pc + 36)
) );
}
void __glXDisp_FramebufferTextureLayerEXT(GLbyte * pc)
{
CALL_FramebufferTextureLayerEXT( GET_DISPATCH(), (
*(GLenum *)(pc + 0),
*(GLenum *)(pc + 4),
*(GLuint *)(pc + 8),
*(GLint *)(pc + 12),
*(GLint *)(pc + 16)
) );
}

File diff suppressed because it is too large Load Diff

View File

@ -76,6 +76,14 @@ bswap_ENUM( const void * src )
return x.ret; return x.ret;
} }
static GLsync
bswap_CARD64( const void * src )
{
union { uint64_t dst; GLsync ret; } x;
x.dst = bswap_64( *(uint64_t *) src );
return x.ret;
}
static GLdouble static GLdouble
bswap_FLOAT64( const void * src ) bswap_FLOAT64( const void * src )
{ {
@ -255,7 +263,7 @@ void __glXDispSwap_Begin(GLbyte * pc)
void __glXDispSwap_Bitmap(GLbyte * pc) void __glXDispSwap_Bitmap(GLbyte * pc)
{ {
const GLubyte * const bitmap = (const GLubyte *) (pc + 44); const GLubyte * const bitmap = (const GLubyte *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );
@ -1132,7 +1140,7 @@ void __glXDispSwap_PolygonMode(GLbyte * pc)
void __glXDispSwap_PolygonStipple(GLbyte * pc) void __glXDispSwap_PolygonStipple(GLbyte * pc)
{ {
const GLubyte * const mask = (const GLubyte *) (pc + 20); const GLubyte * const mask = (const GLubyte *) ((pc + 20));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );
@ -1211,7 +1219,7 @@ void __glXDispSwap_TexParameteriv(GLbyte * pc)
void __glXDispSwap_TexImage1D(GLbyte * pc) void __glXDispSwap_TexImage1D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 52); const GLvoid * const pixels = (const GLvoid *) ((pc + 52));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -1235,7 +1243,7 @@ void __glXDispSwap_TexImage1D(GLbyte * pc)
void __glXDispSwap_TexImage2D(GLbyte * pc) void __glXDispSwap_TexImage2D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 52); const GLvoid * const pixels = (const GLvoid *) ((pc + 52));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -1841,7 +1849,7 @@ void __glXDispSwap_CopyPixels(GLbyte * pc)
void __glXDispSwap_DrawPixels(GLbyte * pc) void __glXDispSwap_DrawPixels(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 36); const GLvoid * const pixels = (const GLvoid *) ((pc + 36));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3092,7 +3100,7 @@ void __glXDispSwap_PrioritizeTextures(GLbyte * pc)
void __glXDispSwap_TexSubImage1D(GLbyte * pc) void __glXDispSwap_TexSubImage1D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 56); const GLvoid * const pixels = (const GLvoid *) ((pc + 56));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3115,7 +3123,7 @@ void __glXDispSwap_TexSubImage1D(GLbyte * pc)
void __glXDispSwap_TexSubImage2D(GLbyte * pc) void __glXDispSwap_TexSubImage2D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 56); const GLvoid * const pixels = (const GLvoid *) ((pc + 56));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3157,7 +3165,7 @@ void __glXDispSwap_BlendEquation(GLbyte * pc)
void __glXDispSwap_ColorTable(GLbyte * pc) void __glXDispSwap_ColorTable(GLbyte * pc)
{ {
const GLvoid * const table = (const GLvoid *) (pc + 40); const GLvoid * const table = (const GLvoid *) ((pc + 40));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3338,7 +3346,7 @@ int __glXDispSwap_GetColorTableParameterivSGI(__GLXclientState *cl, GLbyte *pc)
void __glXDispSwap_ColorSubTable(GLbyte * pc) void __glXDispSwap_ColorSubTable(GLbyte * pc)
{ {
const GLvoid * const data = (const GLvoid *) (pc + 40); const GLvoid * const data = (const GLvoid *) ((pc + 40));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3371,7 +3379,7 @@ void __glXDispSwap_CopyColorSubTable(GLbyte * pc)
void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc) void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
{ {
const GLvoid * const image = (const GLvoid *) (pc + 44); const GLvoid * const image = (const GLvoid *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3393,7 +3401,7 @@ void __glXDispSwap_ConvolutionFilter1D(GLbyte * pc)
void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc) void __glXDispSwap_ConvolutionFilter2D(GLbyte * pc)
{ {
const GLvoid * const image = (const GLvoid *) (pc + 44); const GLvoid * const image = (const GLvoid *) ((pc + 44));
__GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc); __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -3907,7 +3915,7 @@ void __glXDispSwap_TexImage3D(GLbyte * pc)
void __glXDispSwap_TexSubImage3D(GLbyte * pc) void __glXDispSwap_TexSubImage3D(GLbyte * pc)
{ {
const GLvoid * const pixels = (const GLvoid *) (pc + 88); const GLvoid * const pixels = (const GLvoid *) ((pc + 88));
__GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc); __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) ); CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
@ -4879,6 +4887,25 @@ void __glXDispSwap_DrawBuffersARB(GLbyte * pc)
) ); ) );
} }
void __glXDispSwap_ClampColorARB(GLbyte * pc)
{
CALL_ClampColorARB( GET_DISPATCH(), (
(GLenum )bswap_ENUM ( pc + 0 ),
(GLenum )bswap_ENUM ( pc + 4 )
) );
}
void __glXDispSwap_RenderbufferStorageMultisample(GLbyte * pc)
{
CALL_RenderbufferStorageMultisample( GET_DISPATCH(), (
(GLenum )bswap_ENUM ( pc + 0 ),
(GLsizei )bswap_CARD32 ( pc + 4 ),
(GLenum )bswap_ENUM ( pc + 8 ),
(GLsizei )bswap_CARD32 ( pc + 12 ),
(GLsizei )bswap_CARD32 ( pc + 16 )
) );
}
void __glXDispSwap_SampleMaskSGIS(GLbyte * pc) void __glXDispSwap_SampleMaskSGIS(GLbyte * pc)
{ {
CALL_SampleMaskSGIS( GET_DISPATCH(), ( CALL_SampleMaskSGIS( GET_DISPATCH(), (
@ -5324,7 +5351,7 @@ void __glXDispSwap_LoadProgramNV(GLbyte * pc)
void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
{ {
const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 );
#ifdef __GLX_ALIGN64 #ifdef __GLX_ALIGN64
const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4; const GLuint cmdlen = 16 + __GLX_PAD((num * 32)) - 4;
@ -5344,7 +5371,7 @@ void __glXDispSwap_ProgramParameters4dvNV(GLbyte * pc)
void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc) void __glXDispSwap_ProgramParameters4fvNV(GLbyte * pc)
{ {
const GLuint num = (GLuint )bswap_CARD32 ( pc + 8 ); const GLsizei num = (GLsizei )bswap_CARD32 ( pc + 8 );
CALL_ProgramParameters4fvNV( GET_DISPATCH(), ( CALL_ProgramParameters4fvNV( GET_DISPATCH(), (
(GLenum )bswap_ENUM ( pc + 0 ), (GLenum )bswap_ENUM ( pc + 0 ),
@ -6046,3 +6073,30 @@ void __glXDispSwap_RenderbufferStorageEXT(GLbyte * pc)
) ); ) );
} }
void __glXDispSwap_BlitFramebufferEXT(GLbyte * pc)
{
CALL_BlitFramebufferEXT( GET_DISPATCH(), (
(GLint )bswap_CARD32 ( pc + 0 ),
(GLint )bswap_CARD32 ( pc + 4 ),
(GLint )bswap_CARD32 ( pc + 8 ),
(GLint )bswap_CARD32 ( pc + 12 ),
(GLint )bswap_CARD32 ( pc + 16 ),
(GLint )bswap_CARD32 ( pc + 20 ),
(GLint )bswap_CARD32 ( pc + 24 ),
(GLint )bswap_CARD32 ( pc + 28 ),
(GLbitfield)bswap_CARD32 ( pc + 32 ),
(GLenum )bswap_ENUM ( pc + 36 )
) );
}
void __glXDispSwap_FramebufferTextureLayerEXT(GLbyte * pc)
{
CALL_FramebufferTextureLayerEXT( GET_DISPATCH(), (
(GLenum )bswap_ENUM ( pc + 0 ),
(GLenum )bswap_ENUM ( pc + 4 ),
(GLuint )bswap_CARD32 ( pc + 8 ),
(GLint )bswap_CARD32 ( pc + 12 ),
(GLint )bswap_CARD32 ( pc + 16 )
) );
}

View File

@ -44,7 +44,6 @@
#include "glapi.h" #include "glapi.h"
#include "glthread.h" #include "glthread.h"
#include "dispatch.h" #include "dispatch.h"
#include "glapioffsets.h"
static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc, static int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc,
unsigned get_programiv_offset, unsigned get_program_string_offset, unsigned get_programiv_offset, unsigned get_program_string_offset,

View File

@ -35,16 +35,16 @@
#define __GLX_PAD(x) (((x) + 3) & ~3) #define __GLX_PAD(x) (((x) + 3) & ~3)
#if defined(__CYGWIN__) || defined(__MINGW32__) #if defined(__CYGWIN__) || defined(__MINGW32__)
# undef HAVE_ALIAS #undef HAVE_ALIAS
#endif #endif
#ifdef HAVE_ALIAS #ifdef HAVE_ALIAS
# define ALIAS2(from,to) \ #define ALIAS2(from,to) \
int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
__attribute__ ((alias( # to ))); __attribute__ ((alias( # to )));
# define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize ) #define ALIAS(from,to) ALIAS2( from, __glX ## to ## ReqSize )
#else #else
# define ALIAS(from,to) \ #define ALIAS(from,to) \
int __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \ GLint __glX ## from ## ReqSize( const GLbyte * pc, Bool swap ) \
{ return __glX ## to ## ReqSize( pc, swap ); } { return __glX ## to ## ReqSize( pc, swap ); }
#endif #endif
@ -703,7 +703,7 @@ __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap)
int int
__glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap) __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap)
{ {
GLuint num = *(GLuint *) (pc + 8); GLsizei num = *(GLsizei *) (pc + 8);
if (swap) { if (swap) {
num = bswap_32(num); num = bswap_32(num);
@ -715,7 +715,7 @@ __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap)
int int
__glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap) __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap)
{ {
GLuint num = *(GLuint *) (pc + 8); GLsizei num = *(GLsizei *) (pc + 8);
if (swap) { if (swap) {
num = bswap_32(num); num = bswap_32(num);

View File

@ -26,96 +26,91 @@
*/ */
#if !defined( _INDIRECT_REQSIZE_H_ ) #if !defined( _INDIRECT_REQSIZE_H_ )
# define _INDIRECT_REQSIZE_H_ #define _INDIRECT_REQSIZE_H_
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) #include <X11/Xfuncproto.h>
# define HIDDEN __attribute__((visibility("hidden")))
# else
# define HIDDEN
# endif
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) #if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define PURE __attribute__((pure)) #define PURE __attribute__((pure))
# else #else
# define PURE #define PURE
# endif #endif
extern PURE HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCallListsReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXBitmapReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXFogfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXFogivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXLightfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXLightivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXLightModelfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXLightModelivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMaterialfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMaterialivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPolygonStippleReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexParameterfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexParameterivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexImage1DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexImage2DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexEnvfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexEnvivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexGendvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexGenfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexGenivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMap1dReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMap1fReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMap2dReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXMap2fReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPixelMapfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPixelMapuivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPixelMapusvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXDrawPixelsReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXDrawArraysReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPrioritizeTexturesReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexSubImage1DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexSubImage2DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXColorTableReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXColorTableParameterfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXColorTableParameterivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXColorSubTableReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXConvolutionFilter1DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXConvolutionFilter2DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXConvolutionParameterfvReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXConvolutionParameterivReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXSeparableFilter2DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexImage3DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXTexSubImage3DReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexImage1DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexImage2DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexImage3DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexSubImage1DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexSubImage2DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXCompressedTexSubImage3DARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramStringARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXDrawBuffersARBReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPointParameterfvEXTReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXLoadProgramNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramParameters4dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramParameters4fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXRequestResidentProgramsNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs1dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs1fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs1svNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs2dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs2fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs2svNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs3dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs3fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs3svNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs4dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs4fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs4svNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXVertexAttribs4ubvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXPointParameterivNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXPointParameterivNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramNamedParameter4dvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXProgramNamedParameter4fvNVReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXDeleteFramebuffersEXTReqSize(const GLbyte *pc, Bool swap);
extern PURE HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte *pc, Bool swap); extern PURE _X_HIDDEN int __glXDeleteRenderbuffersEXTReqSize(const GLbyte *pc, Bool swap);
# undef HIDDEN #undef PURE
# undef PURE
#endif /* !defined( _INDIRECT_REQSIZE_H_ ) */ #endif /* !defined( _INDIRECT_REQSIZE_H_ ) */

View File

@ -26,7 +26,7 @@
*/ */
#if !defined( _INDIRECT_SIZE_H_ ) #if !defined( _INDIRECT_SIZE_H_ )
# define _INDIRECT_SIZE_H_ #define _INDIRECT_SIZE_H_
/** /**
* \file * \file
@ -36,53 +36,50 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) #include <X11/Xfuncproto.h>
# define PURE __attribute__((pure))
# else
# define PURE
# endif
# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) #if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define FASTCALL __attribute__((fastcall)) #define PURE __attribute__((pure))
# else #else
# define FASTCALL #define PURE
# endif #endif
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) #if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# define INTERNAL __attribute__((visibility("internal"))) #define FASTCALL __attribute__((fastcall))
# else #else
# define INTERNAL #define FASTCALL
# endif #endif
extern INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glCallLists_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glFogfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glFogiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glLightfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glLightiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glLightModelfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glLightModeliv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMaterialfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMaterialiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexEnvfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexEnviv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexGendv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexGenfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glTexGeniv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMap1d_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMap1f_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMap2d_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glMap2f_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glColorTableParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glConvolutionParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glConvolutionParameteriv_size(GLenum); __glConvolutionParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum); __glConvolutionParameteriv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterfvEXT_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glPointParameterivNV_size(GLenum);
# undef PURE #undef PURE
# undef FASTCALL #undef FASTCALL
# undef INTERNAL
#endif /* !defined( _INDIRECT_SIZE_H_ ) */ #endif /* !defined( _INDIRECT_SIZE_H_ ) */

View File

@ -26,47 +26,42 @@
*/ */
#include <X11/Xfuncproto.h>
#include <GL/gl.h> #include <GL/gl.h>
#include "indirect_size_get.h" #include "indirect_size_get.h"
#include "glxserver.h" #include "glxserver.h"
#include "indirect_util.h" #include "indirect_util.h"
#include "indirect_size.h" #include "indirect_size.h"
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) #if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define PURE __attribute__((pure)) #define PURE __attribute__((pure))
# else #else
# define PURE #define PURE
# endif #endif
# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) #if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# define FASTCALL __attribute__((fastcall)) #define FASTCALL __attribute__((fastcall))
# else #else
# define FASTCALL #define FASTCALL
# endif #endif
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
# define INTERNAL __attribute__((visibility("internal")))
# else
# define INTERNAL
# endif
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__APPLE__) #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(GLX_USE_APPLEGL)
# undef HAVE_ALIAS #undef HAVE_ALIAS
#endif #endif
#ifdef HAVE_ALIAS #ifdef HAVE_ALIAS
# define ALIAS2(from,to) \ #define ALIAS2(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \ _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
__attribute__ ((alias( # to ))); __attribute__ ((alias( # to )));
# define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size ) #define ALIAS(from,to) ALIAS2( from, __gl ## to ## _size )
#else #else
# define ALIAS(from,to) \ #define ALIAS(from,to) \
INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \ _X_INTERNAL PURE FASTCALL GLint __gl ## from ## _size( GLenum e ) \
{ return __gl ## to ## _size( e ); } { return __gl ## to ## _size( e ); }
#endif #endif
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glCallLists_size(GLenum e) __glCallLists_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -76,6 +71,7 @@ __glCallLists_size(GLenum e)
case GL_SHORT: case GL_SHORT:
case GL_UNSIGNED_SHORT: case GL_UNSIGNED_SHORT:
case GL_2_BYTES: case GL_2_BYTES:
case GL_HALF_FLOAT:
return 2; return 2;
case GL_3_BYTES: case GL_3_BYTES:
return 3; return 3;
@ -89,7 +85,7 @@ __glCallLists_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glFogfv_size(GLenum e) __glFogfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -108,7 +104,7 @@ __glFogfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glLightfv_size(GLenum e) __glLightfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -130,7 +126,7 @@ __glLightfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glLightModelfv_size(GLenum e) __glLightModelfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -146,7 +142,7 @@ __glLightModelfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glMaterialfv_size(GLenum e) __glMaterialfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -165,7 +161,7 @@ __glMaterialfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glTexParameterfv_size(GLenum e) __glTexParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -195,6 +191,10 @@ __glTexParameterfv_size(GLenum e)
case GL_TEXTURE_MAX_ANISOTROPY_EXT: case GL_TEXTURE_MAX_ANISOTROPY_EXT:
case GL_TEXTURE_LOD_BIAS: case GL_TEXTURE_LOD_BIAS:
/* case GL_TEXTURE_LOD_BIAS_EXT:*/ /* case GL_TEXTURE_LOD_BIAS_EXT:*/
case GL_TEXTURE_STORAGE_HINT_APPLE:
case GL_STORAGE_PRIVATE_APPLE:
case GL_STORAGE_CACHED_APPLE:
case GL_STORAGE_SHARED_APPLE:
case GL_DEPTH_TEXTURE_MODE: case GL_DEPTH_TEXTURE_MODE:
/* case GL_DEPTH_TEXTURE_MODE_ARB:*/ /* case GL_DEPTH_TEXTURE_MODE_ARB:*/
case GL_TEXTURE_COMPARE_MODE: case GL_TEXTURE_COMPARE_MODE:
@ -217,7 +217,7 @@ __glTexParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glTexEnvfv_size(GLenum e) __glTexEnvfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -243,6 +243,7 @@ __glTexEnvfv_size(GLenum e)
case GL_OPERAND1_ALPHA: case GL_OPERAND1_ALPHA:
case GL_OPERAND2_ALPHA: case GL_OPERAND2_ALPHA:
case GL_OPERAND3_ALPHA_NV: case GL_OPERAND3_ALPHA_NV:
case GL_BUMP_TARGET_ATI:
case GL_COORD_REPLACE_ARB: case GL_COORD_REPLACE_ARB:
/* case GL_COORD_REPLACE_NV:*/ /* case GL_COORD_REPLACE_NV:*/
return 1; return 1;
@ -253,7 +254,7 @@ __glTexEnvfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glTexGendv_size(GLenum e) __glTexGendv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -267,7 +268,7 @@ __glTexGendv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glMap1d_size(GLenum e) __glMap1d_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -289,7 +290,7 @@ __glMap1d_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glMap2d_size(GLenum e) __glMap2d_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -311,7 +312,7 @@ __glMap2d_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetBooleanv_size(GLenum e) __glGetBooleanv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -601,6 +602,7 @@ __glGetBooleanv_size(GLenum e)
case GL_OCCLUSION_TEST_HP: case GL_OCCLUSION_TEST_HP:
case GL_OCCLUSION_TEST_RESULT_HP: case GL_OCCLUSION_TEST_RESULT_HP:
case GL_LIGHT_MODEL_COLOR_CONTROL: case GL_LIGHT_MODEL_COLOR_CONTROL:
case GL_RESET_NOTIFICATION_STRATEGY_ARB:
case GL_CURRENT_FOG_COORD: case GL_CURRENT_FOG_COORD:
case GL_FOG_COORDINATE_ARRAY_TYPE: case GL_FOG_COORDINATE_ARRAY_TYPE:
case GL_FOG_COORDINATE_ARRAY_STRIDE: case GL_FOG_COORDINATE_ARRAY_STRIDE:
@ -616,7 +618,8 @@ __glGetBooleanv_size(GLenum e)
/* case GL_CLIENT_ACTIVE_TEXTURE_ARB:*/ /* case GL_CLIENT_ACTIVE_TEXTURE_ARB:*/
case GL_MAX_TEXTURE_UNITS: case GL_MAX_TEXTURE_UNITS:
/* case GL_MAX_TEXTURE_UNITS_ARB:*/ /* case GL_MAX_TEXTURE_UNITS_ARB:*/
case GL_MAX_RENDERBUFFER_SIZE_EXT: case GL_MAX_RENDERBUFFER_SIZE:
/* case GL_MAX_RENDERBUFFER_SIZE_EXT:*/
case GL_TEXTURE_COMPRESSION_HINT: case GL_TEXTURE_COMPRESSION_HINT:
/* case GL_TEXTURE_COMPRESSION_HINT_ARB:*/ /* case GL_TEXTURE_COMPRESSION_HINT_ARB:*/
case GL_TEXTURE_RECTANGLE_ARB: case GL_TEXTURE_RECTANGLE_ARB:
@ -644,7 +647,8 @@ __glGetBooleanv_size(GLenum e)
case GL_VERTEX_PROGRAM_POINT_SIZE_ARB: case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
case GL_VERTEX_PROGRAM_TWO_SIDE_ARB: case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
case GL_PROGRAM_ERROR_POSITION_ARB: case GL_PROGRAM_ERROR_POSITION_ARB:
case GL_DEPTH_CLAMP_NV: case GL_DEPTH_CLAMP:
/* case GL_DEPTH_CLAMP_NV:*/
case GL_NUM_COMPRESSED_TEXTURE_FORMATS: case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
/* case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:*/ /* case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:*/
case GL_MAX_VERTEX_UNITS_ARB: case GL_MAX_VERTEX_UNITS_ARB:
@ -663,11 +667,11 @@ __glGetBooleanv_size(GLenum e)
case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI: case GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI:
case GL_FRAGMENT_PROGRAM_ARB: case GL_FRAGMENT_PROGRAM_ARB:
case GL_MAX_DRAW_BUFFERS_ARB: case GL_MAX_DRAW_BUFFERS_ARB:
/* case GL_MAX_DRAW_BUFFERS_ATI:*/ /* case GL_MAX_DRAW_BUFFERS_NV:*/
case GL_DRAW_BUFFER0_ARB: case GL_DRAW_BUFFER0_ARB:
/* case GL_DRAW_BUFFER0_ATI:*/ /* case GL_DRAW_BUFFER0_ATI:*/
case GL_DRAW_BUFFER1_ARB: case GL_DRAW_BUFFER1_ARB:
/* case GL_DRAW_BUFFER1_ATI:*/ /* case GL_DRAW_BUFFER1_NV:*/
case GL_DRAW_BUFFER2_ARB: case GL_DRAW_BUFFER2_ARB:
/* case GL_DRAW_BUFFER2_ATI:*/ /* case GL_DRAW_BUFFER2_ATI:*/
case GL_DRAW_BUFFER3_ARB: case GL_DRAW_BUFFER3_ARB:
@ -685,15 +689,15 @@ __glGetBooleanv_size(GLenum e)
case GL_DRAW_BUFFER9_ARB: case GL_DRAW_BUFFER9_ARB:
/* case GL_DRAW_BUFFER9_ATI:*/ /* case GL_DRAW_BUFFER9_ATI:*/
case GL_DRAW_BUFFER10_ARB: case GL_DRAW_BUFFER10_ARB:
/* case GL_DRAW_BUFFER10_ATI:*/ /* case GL_DRAW_BUFFER10_NV:*/
case GL_DRAW_BUFFER11_ARB: case GL_DRAW_BUFFER11_ARB:
/* case GL_DRAW_BUFFER11_ATI:*/ /* case GL_DRAW_BUFFER11_NV:*/
case GL_DRAW_BUFFER12_ARB: case GL_DRAW_BUFFER12_ARB:
/* case GL_DRAW_BUFFER12_ATI:*/ /* case GL_DRAW_BUFFER12_ATI:*/
case GL_DRAW_BUFFER13_ARB: case GL_DRAW_BUFFER13_ARB:
/* case GL_DRAW_BUFFER13_ATI:*/ /* case GL_DRAW_BUFFER13_ATI:*/
case GL_DRAW_BUFFER14_ARB: case GL_DRAW_BUFFER14_ARB:
/* case GL_DRAW_BUFFER14_ATI:*/ /* case GL_DRAW_BUFFER14_NV:*/
case GL_DRAW_BUFFER15_ARB: case GL_DRAW_BUFFER15_ARB:
/* case GL_DRAW_BUFFER15_ATI:*/ /* case GL_DRAW_BUFFER15_ATI:*/
case GL_BLEND_EQUATION_ALPHA_EXT: case GL_BLEND_EQUATION_ALPHA_EXT:
@ -725,15 +729,24 @@ __glGetBooleanv_size(GLenum e)
case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB: case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB: case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB: case GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB:
case GL_TEXTURE_CUBE_MAP_SEAMLESS:
case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT: case GL_MAX_ARRAY_TEXTURE_LAYERS_EXT:
case GL_STENCIL_TEST_TWO_SIDE_EXT: case GL_STENCIL_TEST_TWO_SIDE_EXT:
case GL_ACTIVE_STENCIL_FACE_EXT: case GL_ACTIVE_STENCIL_FACE_EXT:
case GL_SAMPLER_BINDING:
case GL_TEXTURE_BINDING_1D_ARRAY_EXT: case GL_TEXTURE_BINDING_1D_ARRAY_EXT:
case GL_TEXTURE_BINDING_2D_ARRAY_EXT: case GL_TEXTURE_BINDING_2D_ARRAY_EXT:
case GL_DRAW_FRAMEBUFFER_BINDING_EXT: case GL_FRAMEBUFFER_BINDING:
case GL_RENDERBUFFER_BINDING_EXT: /* case GL_DRAW_FRAMEBUFFER_BINDING_EXT:*/
case GL_READ_FRAMEBUFFER_BINDING_EXT: case GL_RENDERBUFFER_BINDING:
case GL_MAX_COLOR_ATTACHMENTS_EXT: /* case GL_RENDERBUFFER_BINDING_EXT:*/
case GL_READ_FRAMEBUFFER_BINDING:
/* case GL_READ_FRAMEBUFFER_BINDING_EXT:*/
case GL_MAX_COLOR_ATTACHMENTS:
/* case GL_MAX_COLOR_ATTACHMENTS_EXT:*/
case GL_MAX_SAMPLES:
/* case GL_MAX_SAMPLES_EXT:*/
case GL_MAX_SERVER_WAIT_TIMEOUT:
case GL_RASTER_POSITION_UNCLIPPED_IBM: case GL_RASTER_POSITION_UNCLIPPED_IBM:
return 1; return 1;
case GL_SMOOTH_POINT_SIZE_RANGE: case GL_SMOOTH_POINT_SIZE_RANGE:
@ -808,13 +821,14 @@ __glGetBooleanv_size(GLenum e)
return 16; return 16;
case GL_FOG_COORDINATE_SOURCE: case GL_FOG_COORDINATE_SOURCE:
case GL_COMPRESSED_TEXTURE_FORMATS: case GL_COMPRESSED_TEXTURE_FORMATS:
case GL_RGBA_INTEGER_MODE_EXT:
return __glGetBooleanv_variable_size(e); return __glGetBooleanv_variable_size(e);
default: default:
return 0; return 0;
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetTexParameterfv_size(GLenum e) __glGetTexParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -845,6 +859,8 @@ __glGetTexParameterfv_size(GLenum e)
case GL_TEXTURE_MAX_ANISOTROPY_EXT: case GL_TEXTURE_MAX_ANISOTROPY_EXT:
case GL_TEXTURE_LOD_BIAS: case GL_TEXTURE_LOD_BIAS:
/* case GL_TEXTURE_LOD_BIAS_EXT:*/ /* case GL_TEXTURE_LOD_BIAS_EXT:*/
case GL_TEXTURE_RANGE_LENGTH_APPLE:
case GL_TEXTURE_STORAGE_HINT_APPLE:
case GL_DEPTH_TEXTURE_MODE: case GL_DEPTH_TEXTURE_MODE:
/* case GL_DEPTH_TEXTURE_MODE_ARB:*/ /* case GL_DEPTH_TEXTURE_MODE_ARB:*/
case GL_TEXTURE_COMPARE_MODE: case GL_TEXTURE_COMPARE_MODE:
@ -867,7 +883,7 @@ __glGetTexParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetTexLevelParameterfv_size(GLenum e) __glGetTexLevelParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -895,13 +911,15 @@ __glGetTexLevelParameterfv_size(GLenum e)
/* case GL_TEXTURE_COMPRESSED_ARB:*/ /* case GL_TEXTURE_COMPRESSED_ARB:*/
case GL_TEXTURE_DEPTH_SIZE: case GL_TEXTURE_DEPTH_SIZE:
/* case GL_TEXTURE_DEPTH_SIZE_ARB:*/ /* case GL_TEXTURE_DEPTH_SIZE_ARB:*/
case GL_TEXTURE_STENCIL_SIZE:
/* case GL_TEXTURE_STENCIL_SIZE_EXT:*/
return 1; return 1;
default: default:
return 0; return 0;
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glColorTableParameterfv_size(GLenum e) __glColorTableParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -913,7 +931,7 @@ __glColorTableParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetColorTableParameterfv_size(GLenum e) __glGetColorTableParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -942,7 +960,7 @@ __glGetColorTableParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glConvolutionParameterfv_size(GLenum e) __glConvolutionParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -961,7 +979,7 @@ __glConvolutionParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetConvolutionParameterfv_size(GLenum e) __glGetConvolutionParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -990,7 +1008,7 @@ __glGetConvolutionParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetHistogramParameterfv_size(GLenum e) __glGetHistogramParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1008,7 +1026,7 @@ __glGetHistogramParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetMinmaxParameterfv_size(GLenum e) __glGetMinmaxParameterfv_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1020,7 +1038,7 @@ __glGetMinmaxParameterfv_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetProgramivARB_size(GLenum e) __glGetProgramivARB_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1073,7 +1091,7 @@ __glGetProgramivARB_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetVertexAttribdvARB_size(GLenum e) __glGetVertexAttribdvARB_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1090,7 +1108,7 @@ __glGetVertexAttribdvARB_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetQueryObjectivARB_size(GLenum e) __glGetQueryObjectivARB_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1102,7 +1120,7 @@ __glGetQueryObjectivARB_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetQueryivARB_size(GLenum e) __glGetQueryivARB_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1114,7 +1132,7 @@ __glGetQueryivARB_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glPointParameterfvEXT_size(GLenum e) __glPointParameterfvEXT_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1139,7 +1157,7 @@ __glPointParameterfvEXT_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetProgramivNV_size(GLenum e) __glGetProgramivNV_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1152,7 +1170,7 @@ __glGetProgramivNV_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetVertexAttribdvNV_size(GLenum e) __glGetVertexAttribdvNV_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1166,7 +1184,7 @@ __glGetVertexAttribdvNV_size(GLenum e)
} }
} }
INTERNAL PURE FASTCALL GLint _X_INTERNAL PURE FASTCALL GLint
__glGetFramebufferAttachmentParameterivEXT_size(GLenum e) __glGetFramebufferAttachmentParameterivEXT_size(GLenum e)
{ {
switch (e) { switch (e) {
@ -1217,6 +1235,5 @@ ALIAS(Fogiv, Fogfv)
ALIAS(GetVertexAttribfvNV, GetVertexAttribdvNV) ALIAS(GetVertexAttribfvNV, GetVertexAttribdvNV)
ALIAS(GetVertexAttribivNV, GetVertexAttribdvNV) ALIAS(GetVertexAttribivNV, GetVertexAttribdvNV)
ALIAS(PointParameterivNV, PointParameterfvEXT) ALIAS(PointParameterivNV, PointParameterfvEXT)
# undef PURE #undef PURE
# undef FASTCALL #undef FASTCALL
# undef INTERNAL

View File

@ -26,7 +26,7 @@
*/ */
#if !defined( _INDIRECT_SIZE_GET_H_ ) #if !defined( _INDIRECT_SIZE_GET_H_ )
# define _INDIRECT_SIZE_GET_H_ #define _INDIRECT_SIZE_GET_H_
/** /**
* \file * \file
@ -36,67 +36,68 @@
* \author Ian Romanick <idr@us.ibm.com> * \author Ian Romanick <idr@us.ibm.com>
*/ */
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) #include <X11/Xfuncproto.h>
# define PURE __attribute__((pure))
# else
# define PURE
# endif
# if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__) #if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
# define FASTCALL __attribute__((fastcall)) #define PURE __attribute__((pure))
# else #else
# define FASTCALL #define PURE
# endif #endif
# if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__) #if defined(__i386__) && defined(__GNUC__) && !defined(__CYGWIN__) && !defined(__MINGW32__)
# define INTERNAL __attribute__((visibility("internal"))) #define FASTCALL __attribute__((fastcall))
# else #else
# define INTERNAL #define FASTCALL
# endif #endif
extern INTERNAL PURE FASTCALL GLint __glGetBooleanv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetBooleanv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetDoublev_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetDoublev_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetFloatv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetFloatv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetIntegerv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetIntegerv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetLightfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetLightfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetLightiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetLightiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetMaterialfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMaterialfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetMaterialiv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMaterialiv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexEnvfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexEnvfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexEnviv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexEnviv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexGendv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexGendv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexGenfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexGenfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexGeniv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexGeniv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetTexParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glGetTexLevelParameteriv_size(GLenum); __glGetTexLevelParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glGetColorTableParameteriv_size(GLenum); __glGetTexLevelParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint extern _X_INTERNAL PURE FASTCALL GLint
__glGetColorTableParameterfv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint
__glGetColorTableParameteriv_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint
__glGetConvolutionParameterfv_size(GLenum); __glGetConvolutionParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint extern _X_INTERNAL PURE FASTCALL GLint
__glGetConvolutionParameteriv_size(GLenum); __glGetConvolutionParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glGetHistogramParameteriv_size(GLenum); __glGetHistogramParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint
extern INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum); __glGetHistogramParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameterfv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetMinmaxParameteriv_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectivARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryObjectuivARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetQueryivARB_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetProgramivNV_size(GLenum);
extern INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum); extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribdvNV_size(GLenum);
extern INTERNAL PURE FASTCALL GLint extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribfvNV_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint __glGetVertexAttribivNV_size(GLenum);
extern _X_INTERNAL PURE FASTCALL GLint
__glGetFramebufferAttachmentParameterivEXT_size(GLenum); __glGetFramebufferAttachmentParameterivEXT_size(GLenum);
# undef PURE #undef PURE
# undef FASTCALL #undef FASTCALL
# undef INTERNAL
#endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */ #endif /* !defined( _INDIRECT_SIZE_GET_H_ ) */

View File

@ -107,9 +107,9 @@ static const void *Single_function_table[112][2] = {
/* [ 30] = 30 */ {__glXDisp_ChangeDrawableAttributes, __glXDispSwap_ChangeDrawableAttributes}, /* [ 30] = 30 */ {__glXDisp_ChangeDrawableAttributes, __glXDispSwap_ChangeDrawableAttributes},
/* [ 31] = 31 */ {__glXDisp_CreateWindow, __glXDispSwap_CreateWindow}, /* [ 31] = 31 */ {__glXDisp_CreateWindow, __glXDispSwap_CreateWindow},
/* [ 32] = 32 */ {__glXDisp_DestroyWindow, __glXDispSwap_DestroyWindow}, /* [ 32] = 32 */ {__glXDisp_DestroyWindow, __glXDispSwap_DestroyWindow},
/* [ 33] = 33 */ {NULL, NULL}, /* [ 33] = 33 */ {__glXDisp_SetClientInfoARB, __glXDispSwap_SetClientInfoARB},
/* [ 34] = 34 */ {NULL, NULL}, /* [ 34] = 34 */ {__glXDisp_CreateContextAttribsARB, __glXDispSwap_CreateContextAttribsARB},
/* [ 35] = 35 */ {NULL, NULL}, /* [ 35] = 35 */ {__glXDisp_SetClientInfo2ARB, __glXDispSwap_SetClientInfo2ARB},
/* [ 36] = 36 */ {NULL, NULL}, /* [ 36] = 36 */ {NULL, NULL},
/* [ 37] = 37 */ {NULL, NULL}, /* [ 37] = 37 */ {NULL, NULL},
/* [ 38] = 38 */ {NULL, NULL}, /* [ 38] = 38 */ {NULL, NULL},
@ -198,7 +198,7 @@ const struct __glXDispatchInfo Single_dispatch_info = {
/*****************************************************************/ /*****************************************************************/
/* tree depth = 8 */ /* tree depth = 8 */
static const int_fast16_t Render_dispatch_tree[95] = { static const int_fast16_t Render_dispatch_tree[92] = {
/* [0] -> opcode range [0, 8192], node depth 1 */ /* [0] -> opcode range [0, 8192], node depth 1 */
2, 2,
5, 5,
@ -308,37 +308,32 @@ static const int_fast16_t Render_dispatch_tree[95] = {
86, 86,
EMPTY_LEAF, EMPTY_LEAF,
89, 89,
92, LEAF(360),
EMPTY_LEAF, EMPTY_LEAF,
/* [80] -> opcode range [4128, 4144], node depth 6 */ /* [80] -> opcode range [4128, 4144], node depth 6 */
1, 1,
LEAF(360), LEAF(376),
EMPTY_LEAF, EMPTY_LEAF,
/* [83] -> opcode range [4256, 4272], node depth 6 */ /* [83] -> opcode range [4256, 4272], node depth 6 */
1, 1,
EMPTY_LEAF, EMPTY_LEAF,
LEAF(368), LEAF(384),
/* [86] -> opcode range [4272, 4288], node depth 6 */ /* [86] -> opcode range [4272, 4288], node depth 6 */
1, 1,
LEAF(376), LEAF(392),
EMPTY_LEAF, EMPTY_LEAF,
/* [89] -> opcode range [4304, 4320], node depth 6 */ /* [89] -> opcode range [4304, 4320], node depth 6 */
1, 1,
EMPTY_LEAF, EMPTY_LEAF,
LEAF(384), LEAF(400),
/* [92] -> opcode range [4320, 4336], node depth 6 */
1,
LEAF(392),
EMPTY_LEAF,
}; };
static const void *Render_function_table[400][2] = { static const void *Render_function_table[408][2] = {
/* [ 0] = 0 */ {NULL, NULL}, /* [ 0] = 0 */ {NULL, NULL},
/* [ 1] = 1 */ {__glXDisp_CallList, __glXDispSwap_CallList}, /* [ 1] = 1 */ {__glXDisp_CallList, __glXDispSwap_CallList},
/* [ 2] = 2 */ {__glXDisp_CallLists, __glXDispSwap_CallLists}, /* [ 2] = 2 */ {__glXDisp_CallLists, __glXDispSwap_CallLists},
@ -573,10 +568,10 @@ static const void *Render_function_table[400][2] = {
/* [ 231] = 231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB}, /* [ 231] = 231 */ {__glXDisp_BeginQueryARB, __glXDispSwap_BeginQueryARB},
/* [ 232] = 232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB}, /* [ 232] = 232 */ {__glXDisp_EndQueryARB, __glXDispSwap_EndQueryARB},
/* [ 233] = 233 */ {__glXDisp_DrawBuffersARB, __glXDispSwap_DrawBuffersARB}, /* [ 233] = 233 */ {__glXDisp_DrawBuffersARB, __glXDispSwap_DrawBuffersARB},
/* [ 234] = 234 */ {NULL, NULL}, /* [ 234] = 234 */ {__glXDisp_ClampColorARB, __glXDispSwap_ClampColorARB},
/* [ 235] = 235 */ {NULL, NULL}, /* [ 235] = 235 */ {NULL, NULL},
/* [ 236] = 236 */ {NULL, NULL}, /* [ 236] = 236 */ {NULL, NULL},
/* [ 237] = 237 */ {NULL, NULL}, /* [ 237] = 237 */ {__glXDisp_FramebufferTextureLayerEXT, __glXDispSwap_FramebufferTextureLayerEXT},
/* [ 238] = 238 */ {NULL, NULL}, /* [ 238] = 238 */ {NULL, NULL},
/* [ 239] = 239 */ {NULL, NULL}, /* [ 239] = 239 */ {NULL, NULL},
/* [ 240] = 2048 */ {__glXDisp_SampleMaskSGIS, __glXDispSwap_SampleMaskSGIS}, /* [ 240] = 2048 */ {__glXDisp_SampleMaskSGIS, __glXDispSwap_SampleMaskSGIS},
@ -699,49 +694,57 @@ static const void *Render_function_table[400][2] = {
/* [ 357] = 4237 */ {__glXDisp_VertexAttrib4NivARB, __glXDispSwap_VertexAttrib4NivARB}, /* [ 357] = 4237 */ {__glXDisp_VertexAttrib4NivARB, __glXDispSwap_VertexAttrib4NivARB},
/* [ 358] = 4238 */ {__glXDisp_VertexAttrib4NusvARB, __glXDispSwap_VertexAttrib4NusvARB}, /* [ 358] = 4238 */ {__glXDisp_VertexAttrib4NusvARB, __glXDispSwap_VertexAttrib4NusvARB},
/* [ 359] = 4239 */ {__glXDisp_VertexAttrib4NuivARB, __glXDispSwap_VertexAttrib4NuivARB}, /* [ 359] = 4239 */ {__glXDisp_VertexAttrib4NuivARB, __glXDispSwap_VertexAttrib4NuivARB},
/* [ 360] = 4128 */ {__glXDisp_SecondaryColor3ivEXT, __glXDispSwap_SecondaryColor3ivEXT}, /* [ 360] = 4320 */ {__glXDisp_DeleteFramebuffersEXT, __glXDispSwap_DeleteFramebuffersEXT},
/* [ 361] = 4129 */ {__glXDisp_SecondaryColor3fvEXT, __glXDispSwap_SecondaryColor3fvEXT}, /* [ 361] = 4321 */ {__glXDisp_FramebufferTexture1DEXT, __glXDispSwap_FramebufferTexture1DEXT},
/* [ 362] = 4130 */ {__glXDisp_SecondaryColor3dvEXT, __glXDispSwap_SecondaryColor3dvEXT}, /* [ 362] = 4322 */ {__glXDisp_FramebufferTexture2DEXT, __glXDispSwap_FramebufferTexture2DEXT},
/* [ 363] = 4131 */ {__glXDisp_SecondaryColor3ubvEXT, __glXDispSwap_SecondaryColor3ubvEXT}, /* [ 363] = 4323 */ {__glXDisp_FramebufferTexture3DEXT, __glXDispSwap_FramebufferTexture3DEXT},
/* [ 364] = 4132 */ {__glXDisp_SecondaryColor3usvEXT, __glXDispSwap_SecondaryColor3usvEXT}, /* [ 364] = 4324 */ {__glXDisp_FramebufferRenderbufferEXT, __glXDispSwap_FramebufferRenderbufferEXT},
/* [ 365] = 4133 */ {__glXDisp_SecondaryColor3uivEXT, __glXDispSwap_SecondaryColor3uivEXT}, /* [ 365] = 4325 */ {__glXDisp_GenerateMipmapEXT, __glXDispSwap_GenerateMipmapEXT},
/* [ 366] = 4134 */ {__glXDisp_BlendFuncSeparateEXT, __glXDispSwap_BlendFuncSeparateEXT}, /* [ 366] = 4326 */ {NULL, NULL},
/* [ 367] = 4135 */ {NULL, NULL}, /* [ 367] = 4327 */ {NULL, NULL},
/* [ 368] = 4264 */ {NULL, NULL}, /* [ 368] = 4328 */ {NULL, NULL},
/* [ 369] = 4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV}, /* [ 369] = 4329 */ {NULL, NULL},
/* [ 370] = 4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV}, /* [ 370] = 4330 */ {__glXDisp_BlitFramebufferEXT, __glXDispSwap_BlitFramebufferEXT},
/* [ 371] = 4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV}, /* [ 371] = 4331 */ {__glXDisp_RenderbufferStorageMultisample, __glXDispSwap_RenderbufferStorageMultisample},
/* [ 372] = 4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV}, /* [ 372] = 4332 */ {NULL, NULL},
/* [ 373] = 4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV}, /* [ 373] = 4333 */ {NULL, NULL},
/* [ 374] = 4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV}, /* [ 374] = 4334 */ {NULL, NULL},
/* [ 375] = 4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV}, /* [ 375] = 4335 */ {NULL, NULL},
/* [ 376] = 4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV}, /* [ 376] = 4128 */ {__glXDisp_SecondaryColor3ivEXT, __glXDispSwap_SecondaryColor3ivEXT},
/* [ 377] = 4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV}, /* [ 377] = 4129 */ {__glXDisp_SecondaryColor3fvEXT, __glXDispSwap_SecondaryColor3fvEXT},
/* [ 378] = 4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV}, /* [ 378] = 4130 */ {__glXDisp_SecondaryColor3dvEXT, __glXDispSwap_SecondaryColor3dvEXT},
/* [ 379] = 4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV}, /* [ 379] = 4131 */ {__glXDisp_SecondaryColor3ubvEXT, __glXDispSwap_SecondaryColor3ubvEXT},
/* [ 380] = 4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV}, /* [ 380] = 4132 */ {__glXDisp_SecondaryColor3usvEXT, __glXDispSwap_SecondaryColor3usvEXT},
/* [ 381] = 4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV}, /* [ 381] = 4133 */ {__glXDisp_SecondaryColor3uivEXT, __glXDispSwap_SecondaryColor3uivEXT},
/* [ 382] = 4278 */ {NULL, NULL}, /* [ 382] = 4134 */ {__glXDisp_BlendFuncSeparateEXT, __glXDispSwap_BlendFuncSeparateEXT},
/* [ 383] = 4279 */ {NULL, NULL}, /* [ 383] = 4135 */ {NULL, NULL},
/* [ 384] = 4312 */ {NULL, NULL}, /* [ 384] = 4264 */ {NULL, NULL},
/* [ 385] = 4313 */ {NULL, NULL}, /* [ 385] = 4265 */ {__glXDisp_VertexAttrib1svNV, __glXDispSwap_VertexAttrib1svNV},
/* [ 386] = 4314 */ {NULL, NULL}, /* [ 386] = 4266 */ {__glXDisp_VertexAttrib2svNV, __glXDispSwap_VertexAttrib2svNV},
/* [ 387] = 4315 */ {NULL, NULL}, /* [ 387] = 4267 */ {__glXDisp_VertexAttrib3svNV, __glXDispSwap_VertexAttrib3svNV},
/* [ 388] = 4316 */ {__glXDisp_BindRenderbufferEXT, __glXDispSwap_BindRenderbufferEXT}, /* [ 388] = 4268 */ {__glXDisp_VertexAttrib4svNV, __glXDispSwap_VertexAttrib4svNV},
/* [ 389] = 4317 */ {__glXDisp_DeleteRenderbuffersEXT, __glXDispSwap_DeleteRenderbuffersEXT}, /* [ 389] = 4269 */ {__glXDisp_VertexAttrib1fvNV, __glXDispSwap_VertexAttrib1fvNV},
/* [ 390] = 4318 */ {__glXDisp_RenderbufferStorageEXT, __glXDispSwap_RenderbufferStorageEXT}, /* [ 390] = 4270 */ {__glXDisp_VertexAttrib2fvNV, __glXDispSwap_VertexAttrib2fvNV},
/* [ 391] = 4319 */ {__glXDisp_BindFramebufferEXT, __glXDispSwap_BindFramebufferEXT}, /* [ 391] = 4271 */ {__glXDisp_VertexAttrib3fvNV, __glXDispSwap_VertexAttrib3fvNV},
/* [ 392] = 4320 */ {__glXDisp_DeleteFramebuffersEXT, __glXDispSwap_DeleteFramebuffersEXT}, /* [ 392] = 4272 */ {__glXDisp_VertexAttrib4fvNV, __glXDispSwap_VertexAttrib4fvNV},
/* [ 393] = 4321 */ {__glXDisp_FramebufferTexture1DEXT, __glXDispSwap_FramebufferTexture1DEXT}, /* [ 393] = 4273 */ {__glXDisp_VertexAttrib1dvNV, __glXDispSwap_VertexAttrib1dvNV},
/* [ 394] = 4322 */ {__glXDisp_FramebufferTexture2DEXT, __glXDispSwap_FramebufferTexture2DEXT}, /* [ 394] = 4274 */ {__glXDisp_VertexAttrib2dvNV, __glXDispSwap_VertexAttrib2dvNV},
/* [ 395] = 4323 */ {__glXDisp_FramebufferTexture3DEXT, __glXDispSwap_FramebufferTexture3DEXT}, /* [ 395] = 4275 */ {__glXDisp_VertexAttrib3dvNV, __glXDispSwap_VertexAttrib3dvNV},
/* [ 396] = 4324 */ {__glXDisp_FramebufferRenderbufferEXT, __glXDispSwap_FramebufferRenderbufferEXT}, /* [ 396] = 4276 */ {__glXDisp_VertexAttrib4dvNV, __glXDispSwap_VertexAttrib4dvNV},
/* [ 397] = 4325 */ {__glXDisp_GenerateMipmapEXT, __glXDispSwap_GenerateMipmapEXT}, /* [ 397] = 4277 */ {__glXDisp_VertexAttrib4ubvNV, __glXDispSwap_VertexAttrib4ubvNV},
/* [ 398] = 4326 */ {NULL, NULL}, /* [ 398] = 4278 */ {NULL, NULL},
/* [ 399] = 4327 */ {NULL, NULL}, /* [ 399] = 4279 */ {NULL, NULL},
/* [ 400] = 4312 */ {NULL, NULL},
/* [ 401] = 4313 */ {NULL, NULL},
/* [ 402] = 4314 */ {NULL, NULL},
/* [ 403] = 4315 */ {NULL, NULL},
/* [ 404] = 4316 */ {__glXDisp_BindRenderbufferEXT, __glXDispSwap_BindRenderbufferEXT},
/* [ 405] = 4317 */ {__glXDisp_DeleteRenderbuffersEXT, __glXDispSwap_DeleteRenderbuffersEXT},
/* [ 406] = 4318 */ {__glXDisp_RenderbufferStorageEXT, __glXDispSwap_RenderbufferStorageEXT},
/* [ 407] = 4319 */ {__glXDisp_BindFramebufferEXT, __glXDispSwap_BindFramebufferEXT},
}; };
static const int_fast16_t Render_size_table[400][2] = { static const int_fast16_t Render_size_table[408][2] = {
/* [ 0] = 0 */ { 0, ~0}, /* [ 0] = 0 */ { 0, ~0},
/* [ 1] = 1 */ { 8, ~0}, /* [ 1] = 1 */ { 8, ~0},
/* [ 2] = 2 */ { 12, 0}, /* [ 2] = 2 */ { 12, 0},
@ -976,10 +979,10 @@ static const int_fast16_t Render_size_table[400][2] = {
/* [231] = 231 */ { 12, ~0}, /* [231] = 231 */ { 12, ~0},
/* [232] = 232 */ { 8, ~0}, /* [232] = 232 */ { 8, ~0},
/* [233] = 233 */ { 8, 36}, /* [233] = 233 */ { 8, 36},
/* [234] = 234 */ { 0, ~0}, /* [234] = 234 */ { 12, ~0},
/* [235] = 235 */ { 0, ~0}, /* [235] = 235 */ { 0, ~0},
/* [236] = 236 */ { 0, ~0}, /* [236] = 236 */ { 0, ~0},
/* [237] = 237 */ { 0, ~0}, /* [237] = 237 */ { 24, ~0},
/* [238] = 238 */ { 0, ~0}, /* [238] = 238 */ { 0, ~0},
/* [239] = 239 */ { 0, ~0}, /* [239] = 239 */ { 0, ~0},
/* [240] = 2048 */ { 12, ~0}, /* [240] = 2048 */ { 12, ~0},
@ -1102,46 +1105,54 @@ static const int_fast16_t Render_size_table[400][2] = {
/* [357] = 4237 */ { 24, ~0}, /* [357] = 4237 */ { 24, ~0},
/* [358] = 4238 */ { 16, ~0}, /* [358] = 4238 */ { 16, ~0},
/* [359] = 4239 */ { 24, ~0}, /* [359] = 4239 */ { 24, ~0},
/* [360] = 4128 */ { 16, ~0}, /* [360] = 4320 */ { 8, 72},
/* [361] = 4129 */ { 16, ~0}, /* [361] = 4321 */ { 24, ~0},
/* [362] = 4130 */ { 28, ~0}, /* [362] = 4322 */ { 24, ~0},
/* [363] = 4131 */ { 8, ~0}, /* [363] = 4323 */ { 28, ~0},
/* [364] = 4132 */ { 12, ~0}, /* [364] = 4324 */ { 20, ~0},
/* [365] = 4133 */ { 16, ~0}, /* [365] = 4325 */ { 8, ~0},
/* [366] = 4134 */ { 20, ~0}, /* [366] = 4326 */ { 0, ~0},
/* [367] = 4135 */ { 0, ~0}, /* [367] = 4327 */ { 0, ~0},
/* [368] = 4264 */ { 0, ~0}, /* [368] = 4328 */ { 0, ~0},
/* [369] = 4265 */ { 12, ~0}, /* [369] = 4329 */ { 0, ~0},
/* [370] = 4266 */ { 12, ~0}, /* [370] = 4330 */ { 44, ~0},
/* [371] = 4267 */ { 16, ~0}, /* [371] = 4331 */ { 24, ~0},
/* [372] = 4268 */ { 16, ~0}, /* [372] = 4332 */ { 0, ~0},
/* [373] = 4269 */ { 12, ~0}, /* [373] = 4333 */ { 0, ~0},
/* [374] = 4270 */ { 16, ~0}, /* [374] = 4334 */ { 0, ~0},
/* [375] = 4271 */ { 20, ~0}, /* [375] = 4335 */ { 0, ~0},
/* [376] = 4272 */ { 24, ~0}, /* [376] = 4128 */ { 16, ~0},
/* [377] = 4273 */ { 16, ~0}, /* [377] = 4129 */ { 16, ~0},
/* [378] = 4274 */ { 24, ~0}, /* [378] = 4130 */ { 28, ~0},
/* [379] = 4275 */ { 32, ~0}, /* [379] = 4131 */ { 8, ~0},
/* [380] = 4276 */ { 40, ~0}, /* [380] = 4132 */ { 12, ~0},
/* [381] = 4277 */ { 12, ~0}, /* [381] = 4133 */ { 16, ~0},
/* [382] = 4278 */ { 0, ~0}, /* [382] = 4134 */ { 20, ~0},
/* [383] = 4279 */ { 0, ~0}, /* [383] = 4135 */ { 0, ~0},
/* [384] = 4312 */ { 0, ~0}, /* [384] = 4264 */ { 0, ~0},
/* [385] = 4313 */ { 0, ~0}, /* [385] = 4265 */ { 12, ~0},
/* [386] = 4314 */ { 0, ~0}, /* [386] = 4266 */ { 12, ~0},
/* [387] = 4315 */ { 0, ~0}, /* [387] = 4267 */ { 16, ~0},
/* [388] = 4316 */ { 12, ~0}, /* [388] = 4268 */ { 16, ~0},
/* [389] = 4317 */ { 8, 72}, /* [389] = 4269 */ { 12, ~0},
/* [390] = 4318 */ { 20, ~0}, /* [390] = 4270 */ { 16, ~0},
/* [391] = 4319 */ { 12, ~0}, /* [391] = 4271 */ { 20, ~0},
/* [392] = 4320 */ { 8, 73}, /* [392] = 4272 */ { 24, ~0},
/* [393] = 4321 */ { 24, ~0}, /* [393] = 4273 */ { 16, ~0},
/* [394] = 4322 */ { 24, ~0}, /* [394] = 4274 */ { 24, ~0},
/* [395] = 4323 */ { 28, ~0}, /* [395] = 4275 */ { 32, ~0},
/* [396] = 4324 */ { 20, ~0}, /* [396] = 4276 */ { 40, ~0},
/* [397] = 4325 */ { 8, ~0}, /* [397] = 4277 */ { 12, ~0},
/* [398] = 4326 */ { 0, ~0}, /* [398] = 4278 */ { 0, ~0},
/* [399] = 4327 */ { 0, ~0}, /* [399] = 4279 */ { 0, ~0},
/* [400] = 4312 */ { 0, ~0},
/* [401] = 4313 */ { 0, ~0},
/* [402] = 4314 */ { 0, ~0},
/* [403] = 4315 */ { 0, ~0},
/* [404] = 4316 */ { 12, ~0},
/* [405] = 4317 */ { 8, 73},
/* [406] = 4318 */ { 20, ~0},
/* [407] = 4319 */ { 12, ~0},
}; };
static const gl_proto_size_func Render_size_func_table[74] = { static const gl_proto_size_func Render_size_func_table[74] = {
@ -1217,8 +1228,8 @@ static const gl_proto_size_func Render_size_func_table[74] = {
__glXProgramNamedParameter4fvNVReqSize, __glXProgramNamedParameter4fvNVReqSize,
__glXProgramNamedParameter4dvNVReqSize, __glXProgramNamedParameter4dvNVReqSize,
__glXPointParameterivNVReqSize, __glXPointParameterivNVReqSize,
__glXDeleteRenderbuffersEXTReqSize,
__glXDeleteFramebuffersEXTReqSize, __glXDeleteFramebuffersEXTReqSize,
__glXDeleteRenderbuffersEXTReqSize,
}; };
const struct __glXDispatchInfo Render_dispatch_info = { const struct __glXDispatchInfo Render_dispatch_info = {
@ -1509,7 +1520,7 @@ static const void *VendorPriv_function_table[104][2] = {
/* [ 27] = 1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV}, /* [ 27] = 1299 */ {__glXDisp_GetProgramStringNV, __glXDispSwap_GetProgramStringNV},
/* [ 28] = 1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV}, /* [ 28] = 1300 */ {__glXDisp_GetTrackMatrixivNV, __glXDispSwap_GetTrackMatrixivNV},
/* [ 29] = 1301 */ {__glXDisp_GetVertexAttribdvARB, __glXDispSwap_GetVertexAttribdvARB}, /* [ 29] = 1301 */ {__glXDisp_GetVertexAttribdvARB, __glXDispSwap_GetVertexAttribdvARB},
/* [ 30] = 1302 */ {__glXDisp_GetVertexAttribfvNV, __glXDispSwap_GetVertexAttribfvNV}, /* [ 30] = 1302 */ {__glXDisp_GetVertexAttribfvARB, __glXDispSwap_GetVertexAttribfvARB},
/* [ 31] = 1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV}, /* [ 31] = 1303 */ {__glXDisp_GetVertexAttribivNV, __glXDispSwap_GetVertexAttribivNV},
/* [ 32] = 1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV}, /* [ 32] = 1304 */ {__glXDisp_IsProgramNV, __glXDispSwap_IsProgramNV},
/* [ 33] = 1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB}, /* [ 33] = 1305 */ {__glXDisp_GetProgramLocalParameterfvARB, __glXDispSwap_GetProgramLocalParameterfvARB},

View File

@ -37,7 +37,6 @@
#include "glapi.h" #include "glapi.h"
#include "glthread.h" #include "glthread.h"
#include "dispatch.h" #include "dispatch.h"
#include "glapioffsets.h"
#include "glxbyteorder.h" #include "glxbyteorder.h"
static int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap); static int DoSwapInterval(__GLXclientState *cl, GLbyte *pc, int do_swap);

View File

@ -10,60 +10,60 @@ bin_PROGRAMS = \
noinst_PROGRAMS = xinput xtest evi res xled xbell $(EV_PROG) noinst_PROGRAMS = xinput xtest evi res xled xbell $(EV_PROG)
dmxinfo_SOURCES = dmxinfo.c dmxinfo_SOURCES = dmxinfo.c
dmxinfo_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxinfo_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxinfo_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxinfo_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxwininfo_SOURCES = dmxwininfo.c dmxwininfo_SOURCES = dmxwininfo.c
dmxwininfo_LDADD = @DMXXMUEXAMPLES_DEP_LIBS@ dmxwininfo_LDADD = $(DMXXMUEXAMPLES_DEP_LIBS)
dmxwininfo_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@ dmxwininfo_CFLAGS = $(DMXXMUEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxreconfig_SOURCES = dmxreconfig.c dmxreconfig_SOURCES = dmxreconfig.c
dmxreconfig_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxreconfig_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxreconfig_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxreconfig_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxresize_SOURCES = dmxresize.c dmxresize_SOURCES = dmxresize.c
dmxresize_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxresize_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxresize_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxresize_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxaddscreen_SOURCES = dmxaddscreen.c dmxaddscreen_SOURCES = dmxaddscreen.c
dmxaddscreen_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxaddscreen_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxaddscreen_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxaddscreen_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxrmscreen_SOURCES = dmxrmscreen.c dmxrmscreen_SOURCES = dmxrmscreen.c
dmxrmscreen_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxrmscreen_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxrmscreen_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxrmscreen_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxaddinput_SOURCES = dmxaddinput.c dmxaddinput_SOURCES = dmxaddinput.c
dmxaddinput_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxaddinput_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxaddinput_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxaddinput_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
dmxrminput_SOURCES = dmxrminput.c dmxrminput_SOURCES = dmxrminput.c
dmxrminput_LDADD = @DMXEXAMPLES_DEP_LIBS@ dmxrminput_LDADD = $(DMXEXAMPLES_DEP_LIBS)
dmxrminput_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@ dmxrminput_CFLAGS = $(DMXEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
xinput_SOURCES = xinput.c xinput_SOURCES = xinput.c
xinput_LDADD = @DMXXIEXAMPLES_DEP_LIBS@ xinput_LDADD = $(DMXXIEXAMPLES_DEP_LIBS)
xinput_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@ xinput_CFLAGS = $(DMXXIEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
xtest_SOURCES = xtest.c xtest_SOURCES = xtest.c
xtest_LDADD = @XTSTEXAMPLES_DEP_LIBS@ xtest_LDADD = $(XTSTEXAMPLES_DEP_LIBS)
xtest_CFLAGS = @XTSTEXAMPLES_DEP_CFLAGS@ xtest_CFLAGS = $(XTSTEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
evi_SOURCES = evi.c evi_SOURCES = evi.c
evi_LDADD = @X11EXAMPLES_DEP_LIBS@ evi_LDADD = $(X11EXAMPLES_DEP_LIBS)
evi_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@ evi_CFLAGS = $(X11EXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
res_SOURCES = res.c res_SOURCES = res.c
res_LDADD = @XRESEXAMPLES_DEP_LIBS@ res_LDADD = $(XRESEXAMPLES_DEP_LIBS)
res_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@ res_CFLAGS = $(XRESEXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
xled_SOURCES = xled.c xled_SOURCES = xled.c
xled_LDADD = @X11EXAMPLES_DEP_LIBS@ xled_LDADD = $(X11EXAMPLES_DEP_LIBS)
xled_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@ xled_CFLAGS = $(X11EXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
xbell_SOURCES = xbell.c xbell_SOURCES = xbell.c
xbell_LDADD = @X11EXAMPLES_DEP_LIBS@ xbell_LDADD = $(X11EXAMPLES_DEP_LIBS)
xbell_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@ xbell_CFLAGS = $(X11EXAMPLES_DEP_CFLAGS) $(CWARNFLAGS)
ev_SOURCES = ev.c ev_SOURCES = ev.c
ev_LDADD = ev_LDADD =

View File

@ -1,10 +1,12 @@
noinst_LIBRARIES = libglxproxy.a noinst_LIBRARIES = libglxproxy.a
libglxproxy_a_SOURCES = compsize.c \ libglxproxy_a_SOURCES = compsize.c \
compsize.h \
g_disptab.c \ g_disptab.c \
g_disptab.h \ g_disptab.h \
global.c \ global.c \
glxcmds.c \ glxcmds.c \
glxcmds.h \
glxcmdsswap.c \ glxcmdsswap.c \
glxcontext.h \ glxcontext.h \
glxdrawable.h \ glxdrawable.h \

View File

@ -692,7 +692,7 @@ LinuxKeyboardEnable (KdKeyboardInfo *ki)
return !Success; return !Success;
fd = LinuxConsoleFd; fd = LinuxConsoleFd;
ki->driverPrivate = (void *) fd; ki->driverPrivate = (void *) (intptr_t) fd;
ioctl (fd, KDGKBMODE, &LinuxKbdTrans); ioctl (fd, KDGKBMODE, &LinuxKbdTrans);
tcgetattr (fd, &LinuxTermios); tcgetattr (fd, &LinuxTermios);
@ -724,7 +724,7 @@ LinuxKeyboardDisable (KdKeyboardInfo *ki)
if (!ki) if (!ki)
return; return;
fd = (int) ki->driverPrivate; fd = (int) (intptr_t) ki->driverPrivate;
KdUnregisterFd(ki, fd, FALSE); KdUnregisterFd(ki, fd, FALSE);
ioctl(fd, KDSKBMODE, LinuxKbdTrans); ioctl(fd, KDSKBMODE, LinuxKbdTrans);
@ -753,7 +753,7 @@ LinuxKeyboardLeds (KdKeyboardInfo *ki, int leds)
if (!ki) if (!ki)
return; return;
ioctl ((int)ki->driverPrivate, KDSETLED, leds & 7); ioctl ((int)(intptr_t)ki->driverPrivate, KDSETLED, leds & 7);
} }
KdKeyboardDriver LinuxKeyboardDriver = { KdKeyboardDriver LinuxKeyboardDriver = {

View File

@ -152,7 +152,7 @@ MsEnable (KdPointerInfo *pi)
} }
if (KdRegisterFd (port, MsRead, pi)) if (KdRegisterFd (port, MsRead, pi))
return TRUE; return TRUE;
pi->driverPrivate = (void *)port; pi->driverPrivate = (void *)(intptr_t)port;
return Success; return Success;
@ -164,7 +164,7 @@ MsEnable (KdPointerInfo *pi)
static void static void
MsDisable (KdPointerInfo *pi) MsDisable (KdPointerInfo *pi)
{ {
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
} }
static void static void

View File

@ -159,7 +159,7 @@ Ps2Enable (KdPointerInfo *pi)
return BadAlloc; return BadAlloc;
} }
pi->driverPrivate = (void *)fd; pi->driverPrivate = (void *)(intptr_t)fd;
return Success; return Success;
} }
@ -168,7 +168,7 @@ Ps2Enable (KdPointerInfo *pi)
static void static void
Ps2Disable (KdPointerInfo *pi) Ps2Disable (KdPointerInfo *pi)
{ {
KdUnregisterFd (pi, (int)pi->driverPrivate, TRUE); KdUnregisterFd (pi, (int)(intptr_t)pi->driverPrivate, TRUE);
} }
static void static void

View File

@ -113,19 +113,14 @@ KdDisableScreen (ScreenPtr pScreen)
} }
static void static void
KdDoSwitchCmd (char *reason) KdDoSwitchCmd (const char *reason)
{ {
if (kdSwitchCmd) if (kdSwitchCmd)
{ {
char *command = malloc(strlen (kdSwitchCmd) + char *command;
1 +
strlen (reason) + if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
1);
if (!command)
return; return;
strcpy (command, kdSwitchCmd);
strcat (command, " ");
strcat (command, reason);
system (command); system (command);
free(command); free(command);
} }
@ -258,7 +253,7 @@ Bool kdDumbDriver;
Bool kdSoftCursor; Bool kdSoftCursor;
char * char *
KdParseFindNext (char *cur, char *delim, char *save, char *last) KdParseFindNext (char *cur, const char *delim, char *save, char *last)
{ {
while (*cur && !strchr (delim, *cur)) while (*cur && !strchr (delim, *cur))
{ {

View File

@ -424,7 +424,7 @@ KdKeyboardInfo *
KdParseKeyboard (char *arg); KdParseKeyboard (char *arg);
char * char *
KdParseFindNext (char *cur, char *delim, char *save, char *last); KdParseFindNext (char *cur, const char *delim, char *save, char *last);
void void
KdParseRgba (char *rgba); KdParseRgba (char *rgba);
@ -503,12 +503,6 @@ KdInitInput(void);
void void
KdCloseInput(void); KdCloseInput(void);
void
KdAddPointerDriver(KdPointerDriver *);
void
KdAddKeyboardDriver(KdKeyboardDriver *);
Bool Bool
KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure); KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);

View File

@ -232,7 +232,7 @@ extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen); extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable); extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb, extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
const char *format, va_list args); const char *format, va_list args) _X_ATTRIBUTE_PRINTF(4,0);
extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb, extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5); const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...) extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)

View File

@ -72,8 +72,8 @@
* These paths define the way the config file search is done. The escape * These paths define the way the config file search is done. The escape
* sequences are documented in parser/scan.c. * sequences are documented in parser/scan.c.
*/ */
#ifndef ROOT_CONFIGPATH #ifndef ALL_CONFIGPATH
#define ROOT_CONFIGPATH "%A," "%R," \ #define ALL_CONFIGPATH "%A," "%R," \
"/etc/X11/%R," "%P/etc/X11/%R," \ "/etc/X11/%R," "%P/etc/X11/%R," \
"%E," "%F," \ "%E," "%F," \
"/etc/X11/%F," "%P/etc/X11/%F," \ "/etc/X11/%F," "%P/etc/X11/%F," \
@ -83,8 +83,8 @@
"%P/lib/X11/%X.%H," \ "%P/lib/X11/%X.%H," \
"%P/lib/X11/%X" "%P/lib/X11/%X"
#endif #endif
#ifndef USER_CONFIGPATH #ifndef RESTRICTED_CONFIGPATH
#define USER_CONFIGPATH "/etc/X11/%S," "%P/etc/X11/%S," \ #define RESTRICTED_CONFIGPATH "/etc/X11/%S," "%P/etc/X11/%S," \
"/etc/X11/%G," "%P/etc/X11/%G," \ "/etc/X11/%G," "%P/etc/X11/%G," \
"/etc/X11/%X," "/etc/%X," \ "/etc/X11/%X," "/etc/%X," \
"%P/etc/X11/%X.%H," \ "%P/etc/X11/%X.%H," \
@ -92,14 +92,14 @@
"%P/lib/X11/%X.%H," \ "%P/lib/X11/%X.%H," \
"%P/lib/X11/%X" "%P/lib/X11/%X"
#endif #endif
#ifndef ROOT_CONFIGDIRPATH #ifndef ALL_CONFIGDIRPATH
#define ROOT_CONFIGDIRPATH "%A," "%R," \ #define ALL_CONFIGDIRPATH "%A," "%R," \
"/etc/X11/%R," "%C/X11/%R," \ "/etc/X11/%R," "%C/X11/%R," \
"/etc/X11/%X," "%C/X11/%X" "/etc/X11/%X," "%C/X11/%X"
#endif #endif
#ifndef USER_CONFIGDIRPATH #ifndef RESTRICTED_CONFIGDIRPATH
#define USER_CONFIGDIRPATH "/etc/X11/%R," "%C/X11/%R," \ #define RESTRICTED_CONFIGDIRPATH "/etc/X11/%R," "%C/X11/%R," \
"/etc/X11/%X," "%C/X11/%X" "/etc/X11/%X," "%C/X11/%X"
#endif #endif
#ifndef SYS_CONFIGDIRPATH #ifndef SYS_CONFIGDIRPATH
#define SYS_CONFIGDIRPATH "/usr/share/X11/%X," "%D/X11/%X" #define SYS_CONFIGDIRPATH "/usr/share/X11/%X," "%D/X11/%X"
@ -552,7 +552,7 @@ xf86DriverlistFromCompile(void)
* Print a READABLE ErrorMessage!!! All information that is * Print a READABLE ErrorMessage!!! All information that is
* available is printed. * available is printed.
*/ */
static void static void _X_ATTRIBUTE_PRINTF(1,2)
xf86ConfigError(const char *msg, ...) xf86ConfigError(const char *msg, ...)
{ {
va_list ap; va_list ap;
@ -2300,21 +2300,22 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
ConfigStatus ConfigStatus
xf86HandleConfigFile(Bool autoconfig) xf86HandleConfigFile(Bool autoconfig)
{ {
char *filename, *dirname, *sysdirname;
const char *filesearch, *dirsearch;
MessageType filefrom = X_DEFAULT;
MessageType dirfrom = X_DEFAULT;
char *scanptr; char *scanptr;
Bool singlecard = 0; Bool singlecard = 0;
Bool implicit_layout = FALSE; Bool implicit_layout = FALSE;
if (!autoconfig) { if (!autoconfig) {
if (getuid() == 0) { char *filename, *dirname, *sysdirname;
filesearch = ROOT_CONFIGPATH; const char *filesearch, *dirsearch;
dirsearch = ROOT_CONFIGDIRPATH; MessageType filefrom = X_DEFAULT;
MessageType dirfrom = X_DEFAULT;
if (!xf86PrivsElevated()) {
filesearch = ALL_CONFIGPATH;
dirsearch = ALL_CONFIGDIRPATH;
} else { } else {
filesearch = USER_CONFIGPATH; filesearch = RESTRICTED_CONFIGPATH;
dirsearch = USER_CONFIGDIRPATH; dirsearch = RESTRICTED_CONFIGDIRPATH;
} }
if (xf86ConfigFile) if (xf86ConfigFile)
@ -2350,11 +2351,11 @@ xf86HandleConfigFile(Bool autoconfig)
sysdirname); sysdirname);
if (!filename && !dirname && !sysdirname) if (!filename && !dirname && !sysdirname)
return CONFIG_NOFILE; return CONFIG_NOFILE;
}
free(filename); free(filename);
free(dirname); free(dirname);
free(sysdirname); free(sysdirname);
}
if ((xf86configptr = xf86readConfigFile ()) == NULL) { if ((xf86configptr = xf86readConfigFile ()) == NULL) {
xf86Msg(X_ERROR, "Problem parsing the config file\n"); xf86Msg(X_ERROR, "Problem parsing the config file\n");

View File

@ -778,7 +778,8 @@ void DoShowOptions (void) {
free(vlist); free(vlist);
for (i = 0; i < xf86NumDrivers; i++) { for (i = 0; i < xf86NumDrivers; i++) {
if (xf86DriverList[i]->AvailableOptions) { if (xf86DriverList[i]->AvailableOptions) {
OptionInfoPtr pOption = (OptionInfoPtr)(*xf86DriverList[i]->AvailableOptions)(0,0); const OptionInfoRec *pOption =
(*xf86DriverList[i]->AvailableOptions)(0,0);
if (! pOption) { if (! pOption) {
ErrorF ("(EE) Couldn't read option table for %s driver\n", ErrorF ("(EE) Couldn't read option table for %s driver\n",
xf86DriverList[i]->driverName xf86DriverList[i]->driverName
@ -790,7 +791,7 @@ void DoShowOptions (void) {
initData = LoaderSymbol (pSymbol); initData = LoaderSymbol (pSymbol);
if (initData) { if (initData) {
XF86ModuleVersionInfo *vers = initData->vers; XF86ModuleVersionInfo *vers = initData->vers;
OptionInfoPtr p; const OptionInfoRec *p;
ErrorF ("Driver[%d]:%s[%s] {\n", ErrorF ("Driver[%d]:%s[%s] {\n",
i,xf86DriverList[i]->driverName,vers->vendor i,xf86DriverList[i]->driverName,vers->vendor
); );

View File

@ -1734,7 +1734,6 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
int format, unsigned long len, pointer value ) int format, unsigned long len, pointer value )
{ {
RootWinPropPtr pNewProp = NULL, pRegProp; RootWinPropPtr pNewProp = NULL, pRegProp;
int i;
Bool existing = FALSE; Bool existing = FALSE;
DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n", DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
@ -1775,15 +1774,11 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
DebugF("new property filled\n"); DebugF("new property filled\n");
if (NULL==xf86RegisteredPropertiesTable) { if (xf86RegisteredPropertiesTable == NULL) {
DebugF("creating xf86RegisteredPropertiesTable[] size %d\n", DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
xf86NumScreens); xf86NumScreens);
if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) { xf86RegisteredPropertiesTable =
return BadAlloc; xnfcalloc(sizeof(RootWinProp), xf86NumScreens);
}
for (i=0; i<xf86NumScreens; i++) {
xf86RegisteredPropertiesTable[i] = NULL;
}
} }
DebugF("xf86RegisteredPropertiesTable %p\n", DebugF("xf86RegisteredPropertiesTable %p\n",

View File

@ -238,6 +238,65 @@ xf86PrintMarkers(void)
LogPrintMarkers(); LogPrintMarkers();
} }
Bool xf86PrivsElevated(void)
{
static Bool privsTested = FALSE;
static Bool privsElevated = TRUE;
if (!privsTested) {
#if defined(WIN32)
privsElevated = FALSE;
#else
if ((getuid() != geteuid()) || (getgid() != getegid())) {
privsElevated = TRUE;
} else {
#if defined(HAVE_ISSETUGID)
privsElevated = issetugid();
#elif defined(HAVE_GETRESUID)
uid_t ruid, euid, suid;
gid_t rgid, egid, sgid;
if ((getresuid(&ruid, &euid, &suid) == 0) &&
(getresgid(&rgid, &egid, &sgid) == 0)) {
privsElevated = (euid != suid) || (egid != sgid);
}
else {
printf("Failed getresuid or getresgid");
/* Something went wrong, make defensive assumption */
privsElevated = TRUE;
}
#else
if (getuid()==0) {
/* running as root: uid==euid==0 */
privsElevated = FALSE;
}
else {
/*
* If there are saved ID's the process might still be privileged
* even though the above test succeeded. If issetugid() and
* getresgid() aren't available, test this by trying to set
* euid to 0.
*/
unsigned int oldeuid;
oldeuid = geteuid();
if (seteuid(0) != 0) {
privsElevated = FALSE;
} else {
if (seteuid(oldeuid) != 0) {
FatalError("Failed to drop privileges. Exiting\n");
}
privsElevated = TRUE;
}
}
#endif
}
#endif
privsTested = TRUE;
}
return privsElevated;
}
static Bool static Bool
xf86CreateRootWindow(WindowPtr pWin) xf86CreateRootWindow(WindowPtr pWin)
{ {
@ -872,7 +931,7 @@ OsVendorInit(void)
#ifdef O_NONBLOCK #ifdef O_NONBLOCK
if (!beenHere) { if (!beenHere) {
if (geteuid() == 0 && getuid() != geteuid()) if (xf86PrivsElevated())
{ {
int status; int status;
@ -1043,10 +1102,11 @@ ddxProcessArgument(int argc, char **argv, int i)
FatalError("Required argument to %s not specified\n", argv[i]); \ FatalError("Required argument to %s not specified\n", argv[i]); \
} }
/* First the options that are only allowed for root */ /* First the options that are not allowed with elevated privileges */
if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) { if (!strcmp(argv[i], "-modulepath") || !strcmp(argv[i], "-logfile")) {
if ( (geteuid() == 0) && (getuid() != 0) ) { if (xf86PrivsElevated()) {
FatalError("The '%s' option can only be used by root.\n", argv[i]); FatalError("The '%s' option cannot be used with "
"elevated privileges.\n", argv[i]);
} }
else if (!strcmp(argv[i], "-modulepath")) else if (!strcmp(argv[i], "-modulepath"))
{ {
@ -1074,9 +1134,9 @@ ddxProcessArgument(int argc, char **argv, int i)
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config")) if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
{ {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) { if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
FatalError("\nInvalid argument for %s\n" FatalError("\nInvalid argument for %s\n"
"\tFor non-root users, the file specified with %s must be\n" "\tWith elevated privileges, the file specified with %s must be\n"
"\ta relative path and must not contain any \"..\" elements.\n" "\ta relative path and must not contain any \"..\" elements.\n"
"\tUsing default "__XCONFIGFILE__" search path.\n\n", "\tUsing default "__XCONFIGFILE__" search path.\n\n",
argv[i], argv[i]); argv[i], argv[i]);
@ -1087,9 +1147,9 @@ ddxProcessArgument(int argc, char **argv, int i)
if (!strcmp(argv[i], "-configdir")) if (!strcmp(argv[i], "-configdir"))
{ {
CHECK_FOR_REQUIRED_ARGUMENT(); CHECK_FOR_REQUIRED_ARGUMENT();
if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) { if (xf86PrivsElevated() && !xf86PathIsSafe(argv[i + 1])) {
FatalError("\nInvalid argument for %s\n" FatalError("\nInvalid argument for %s\n"
"\tFor non-root users, the file specified with %s must be\n" "\tWith elevated privileges, the file specified with %s must be\n"
"\ta relative path and must not contain any \"..\" elements.\n" "\ta relative path and must not contain any \"..\" elements.\n"
"\tUsing default "__XCONFIGDIR__" search path.\n\n", "\tUsing default "__XCONFIGDIR__" search path.\n\n",
argv[i], argv[i]); argv[i], argv[i]);
@ -1375,7 +1435,7 @@ ddxUseMsg(void)
ErrorF("\n"); ErrorF("\n");
ErrorF("\n"); ErrorF("\n");
ErrorF("Device Dependent Usage\n"); ErrorF("Device Dependent Usage\n");
if (getuid() == 0 || geteuid() != 0) if (!xf86PrivsElevated())
{ {
ErrorF("-modulepath paths specify the module search path\n"); ErrorF("-modulepath paths specify the module search path\n");
ErrorF("-logfile file specify a log file name\n"); ErrorF("-logfile file specify a log file name\n");

View File

@ -125,10 +125,8 @@ extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
extern _X_EXPORT const int xf86NumDefaultModes; extern _X_EXPORT const int xf86NumDefaultModes;
/* xf86Configure.c */ /* xf86Configure.c */
extern _X_EXPORT void DoConfigure(void); extern _X_EXPORT void DoConfigure(void) _X_NORETURN;
extern _X_EXPORT void DoShowOptions(void) _X_NORETURN;
/* xf86ShowOpts.c */
extern _X_EXPORT void DoShowOptions(void);
/* xf86Events.c */ /* xf86Events.c */
@ -147,6 +145,7 @@ extern _X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist);
extern _X_EXPORT int xf86SetVerbosity(int verb); extern _X_EXPORT int xf86SetVerbosity(int verb);
extern _X_EXPORT int xf86SetLogVerbosity(int verb); extern _X_EXPORT int xf86SetLogVerbosity(int verb);
extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only ); extern _X_EXPORT Bool xf86CallDriverProbe( struct _DriverRec * drv, Bool detect_only );
extern _X_EXPORT Bool xf86PrivsElevated(void);
#endif /* _NO_XF86_PROTOTYPES */ #endif /* _NO_XF86_PROTOTYPES */

View File

@ -176,7 +176,7 @@ extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
MessageType type, MessageType type,
int verb, int verb,
const char *format, const char *format,
va_list args); va_list args) _X_ATTRIBUTE_PRINTF(4,0);
/* xf86Option.c */ /* xf86Option.c */
extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts); extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);

View File

@ -181,6 +181,7 @@ DRI2AllocateDrawable(DrawablePtr pDraw)
pPriv->last_swap_ust = 0; pPriv->last_swap_ust = 0;
list_init(&pPriv->reference_list); list_init(&pPriv->reference_list);
pPriv->serialNumber = DRI2DrawableSerial(pDraw); pPriv->serialNumber = DRI2DrawableSerial(pDraw);
pPriv->needInvalidate = FALSE;
if (pDraw->type == DRAWABLE_WINDOW) { if (pDraw->type == DRAWABLE_WINDOW) {
pWin = (WindowPtr) pDraw; pWin = (WindowPtr) pDraw;
@ -376,6 +377,7 @@ allocate_or_reuse_buffer(DrawablePtr pDraw, DRI2ScreenPtr ds,
int old_buf = find_attachment(pPriv, attachment); int old_buf = find_attachment(pPriv, attachment);
if ((old_buf < 0) if ((old_buf < 0)
|| attachment == DRI2BufferFrontLeft
|| !dimensions_match || !dimensions_match
|| (pPriv->buffers[old_buf]->format != format)) { || (pPriv->buffers[old_buf]->format != format)) {
*buffer = (*ds->CreateBuffer)(pDraw, attachment, format); *buffer = (*ds->CreateBuffer)(pDraw, attachment, format);
@ -585,7 +587,7 @@ DRI2InvalidateDrawable(DrawablePtr pDraw)
pPriv->needInvalidate = FALSE; pPriv->needInvalidate = FALSE;
list_for_each_entry(ref, &pPriv->reference_list, link) list_for_each_entry(ref, &pPriv->reference_list, link)
ref->invalidate(pDraw, ref->priv); ref->invalidate(pDraw, ref->priv, ref->id);
} }
/* /*
@ -828,6 +830,19 @@ DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
return FALSE; return FALSE;
} }
/*
* A TraverseTree callback to invalidate all windows using the same
* pixmap
*/
static int
DRI2InvalidateWalk(WindowPtr pWin, pointer data)
{
if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
return WT_DONTWALKCHILDREN;
DRI2InvalidateDrawable(&pWin->drawable);
return WT_WALKCHILDREN;
}
int int
DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc, DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
CARD64 divisor, CARD64 remainder, CARD64 *swap_target, CARD64 divisor, CARD64 remainder, CARD64 *swap_target,
@ -928,7 +943,24 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
*/ */
*swap_target = pPriv->swap_count + pPriv->swapsPending; *swap_target = pPriv->swap_count + pPriv->swapsPending;
DRI2InvalidateDrawable(pDraw); if (pDraw->type == DRAWABLE_WINDOW) {
WindowPtr pWin = (WindowPtr) pDraw;
PixmapPtr pPixmap = pScreen->GetWindowPixmap(pWin);
/*
* Find the top-most window using this pixmap
*/
while (pWin->parent && pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
pWin = pWin->parent;
/*
* Walk the sub-tree to invalidate all of the
* windows using the same pixmap
*/
TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
DRI2InvalidateDrawable(&pPixmap->drawable);
} else
DRI2InvalidateDrawable(pDraw);
return Success; return Success;
} }

View File

@ -166,7 +166,8 @@ typedef int (*DRI2ScheduleWaitMSCProcPtr)(ClientPtr client,
CARD64 remainder); CARD64 remainder);
typedef void (*DRI2InvalidateProcPtr)(DrawablePtr pDraw, typedef void (*DRI2InvalidateProcPtr)(DrawablePtr pDraw,
void *data); void *data,
XID id);
/** /**
* DRI2 calls this hook when ever swap_limit is going to be changed. Default * DRI2 calls this hook when ever swap_limit is going to be changed. Default

View File

@ -156,13 +156,13 @@ ProcDRI2Authenticate(ClientPtr client)
} }
static void static void
DRI2InvalidateBuffersEvent(DrawablePtr pDraw, void *priv) DRI2InvalidateBuffersEvent(DrawablePtr pDraw, void *priv, XID id)
{ {
xDRI2InvalidateBuffers event; xDRI2InvalidateBuffers event;
ClientPtr client = priv; ClientPtr client = priv;
event.type = DRI2EventBase + DRI2_InvalidateBuffers; event.type = DRI2EventBase + DRI2_InvalidateBuffers;
event.drawable = pDraw->id; event.drawable = id;
WriteEventsToClient(client, 1, (xEvent *)&event); WriteEventsToClient(client, 1, (xEvent *)&event);
} }

View File

@ -98,10 +98,6 @@ xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
extern _X_EXPORT DisplayModePtr extern _X_EXPORT DisplayModePtr
xf86PruneDuplicateModes(DisplayModePtr modes); xf86PruneDuplicateModes(DisplayModePtr modes);
extern _X_EXPORT void
xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
int flags);
extern _X_EXPORT void extern _X_EXPORT void
xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList); xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList);

View File

@ -119,8 +119,8 @@ else\
}\ }\
} }
#define Error(a,b) do { \ #define Error(...) do { \
xf86parseError (a, b); CLEANUP (ptr); return NULL; \ xf86parseError (__VA_ARGS__); CLEANUP (ptr); return NULL; \
} while (0) } while (0)
/* /*

View File

@ -64,7 +64,7 @@ xf86parseDRISection (void)
else if (token == NUMBER) else if (token == NUMBER)
ptr->dri_group = val.num; ptr->dri_group = val.num;
else else
Error (GROUP_MSG, NULL); Error (GROUP_MSG);
break; break;
case MODE: case MODE:
if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER) if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
@ -74,7 +74,7 @@ xf86parseDRISection (void)
ptr->dri_mode = val.num; ptr->dri_mode = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case COMMENT: case COMMENT:
ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str); ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);

View File

@ -245,7 +245,7 @@ xf86parseDeviceSection (void)
ptr->dev_screen = val.num; ptr->dev_screen = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -254,7 +254,7 @@ xf86parseDeviceSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Device section parsed\n"); printf ("Device section parsed\n");

View File

@ -62,7 +62,7 @@ xf86parseExtensionsSection (void)
ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst); ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case COMMENT: case COMMENT:
ptr->extensions_comment = ptr->extensions_comment =

View File

@ -162,7 +162,7 @@ xf86parseFilesSection (void)
ptr->file_xkbdir = val.str; ptr->file_xkbdir = val.str;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case OBSOLETE_TOKEN: case OBSOLETE_TOKEN:
xf86parseError (OBSOLETE_MSG, xf86tokenString ()); xf86parseError (OBSOLETE_MSG, xf86tokenString ());

View File

@ -160,7 +160,7 @@ xf86parseFlagsSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -440,7 +440,7 @@ xf86parseOption(XF86OptionPtr head)
int token; int token;
if ((token = xf86getSubToken(&comment)) != STRING) { if ((token = xf86getSubToken(&comment)) != STRING) {
xf86parseError(BAD_OPTION_MSG, NULL); xf86parseError(BAD_OPTION_MSG);
free(comment); free(comment);
return head; return head;
} }

View File

@ -114,7 +114,7 @@ xf86parseInputSection (void)
ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst); ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -123,7 +123,7 @@ xf86parseInputSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("InputDevice section parsed\n"); printf ("InputDevice section parsed\n");

View File

@ -241,7 +241,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsTouchscreen"); Error(BOOL_MSG, "MatchIsTouchscreen");
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error(UNEXPECTED_EOF_MSG, NULL); Error(UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error(INVALID_KEYWORD_MSG, xf86tokenString ()); Error(INVALID_KEYWORD_MSG, xf86tokenString ());
@ -250,7 +250,7 @@ xf86parseInputClassSection(void)
} }
if (!has_ident) if (!has_ident)
Error(NO_IDENT_MSG, NULL); Error(NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf("InputClass section parsed\n"); printf("InputClass section parsed\n");

View File

@ -124,7 +124,7 @@ xf86parseLayoutSection (void)
iptr->list.next = NULL; iptr->list.next = NULL;
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free (iptr); free (iptr);
Error (INACTIVE_MSG, NULL); Error (INACTIVE_MSG);
} }
iptr->inactive_device_str = val.str; iptr->inactive_device_str = val.str;
ptr->lay_inactive_lst = (XF86ConfInactivePtr) ptr->lay_inactive_lst = (XF86ConfInactivePtr)
@ -150,7 +150,7 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_screen_str = val.str; aptr->adj_screen_str = val.str;
@ -178,7 +178,7 @@ xf86parseLayoutSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
free(aptr); free(aptr);
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
xf86unGetToken (token); xf86unGetToken (token);
@ -199,13 +199,13 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_y = val.num; aptr->adj_y = val.num;
} else { } else {
if (absKeyword) { if (absKeyword) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} else } else
xf86unGetToken (token); xf86unGetToken (token);
} }
@ -218,7 +218,7 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != STRING) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_refscreen = val.str; aptr->adj_refscreen = val.str;
if (aptr->adj_where == CONF_ADJ_RELATIVE) if (aptr->adj_where == CONF_ADJ_RELATIVE)
@ -226,13 +226,13 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_x = val.num; aptr->adj_x = val.num;
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_y = val.num; aptr->adj_y = val.num;
} }
@ -244,21 +244,21 @@ xf86parseLayoutSection (void)
/* bottom */ /* bottom */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_bottom_str = val.str; aptr->adj_bottom_str = val.str;
/* left */ /* left */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_left_str = val.str; aptr->adj_left_str = val.str;
/* right */ /* right */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_right_str = val.str; aptr->adj_right_str = val.str;
@ -276,7 +276,7 @@ xf86parseLayoutSection (void)
iptr->iref_option_lst = NULL; iptr->iref_option_lst = NULL;
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(iptr); free(iptr);
Error (INPUTDEV_MSG, NULL); Error (INPUTDEV_MSG);
} }
iptr->iref_inputdev_str = val.str; iptr->iref_inputdev_str = val.str;
while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING) while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING)
@ -293,7 +293,7 @@ xf86parseLayoutSection (void)
ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst); ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -302,7 +302,7 @@ xf86parseLayoutSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Layout section parsed\n"); printf ("Layout section parsed\n");

View File

@ -107,7 +107,7 @@ xf86parseModuleSubSection (XF86LoadPtr head, char *name)
ptr->load_opt = xf86parseOption(ptr->load_opt); ptr->load_opt = xf86parseOption(ptr->load_opt);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
xf86parseError (UNEXPECTED_EOF_MSG, NULL); xf86parseError (UNEXPECTED_EOF_MSG);
free(ptr); free(ptr);
return NULL; return NULL;
default: default:
@ -163,7 +163,7 @@ xf86parseModuleSection (void)
xf86parseModuleSubSection (ptr->mod_load_lst, val.str); xf86parseModuleSubSection (ptr->mod_load_lst, val.str);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());

View File

@ -145,52 +145,52 @@ xf86parseModeLine (void)
/* Identifier */ /* Identifier */
if (xf86getSubToken (&(ptr->ml_comment)) != STRING) if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
Error ("ModeLine identifier expected", NULL); Error ("ModeLine identifier expected");
ptr->ml_identifier = val.str; ptr->ml_identifier = val.str;
/* DotClock */ /* DotClock */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine dotclock expected", NULL); Error ("ModeLine dotclock expected");
ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5); ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
/* HDisplay */ /* HDisplay */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine Hdisplay expected", NULL); Error ("ModeLine Hdisplay expected");
ptr->ml_hdisplay = val.num; ptr->ml_hdisplay = val.num;
/* HSyncStart */ /* HSyncStart */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HSyncStart expected", NULL); Error ("ModeLine HSyncStart expected");
ptr->ml_hsyncstart = val.num; ptr->ml_hsyncstart = val.num;
/* HSyncEnd */ /* HSyncEnd */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HSyncEnd expected", NULL); Error ("ModeLine HSyncEnd expected");
ptr->ml_hsyncend = val.num; ptr->ml_hsyncend = val.num;
/* HTotal */ /* HTotal */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HTotal expected", NULL); Error ("ModeLine HTotal expected");
ptr->ml_htotal = val.num; ptr->ml_htotal = val.num;
/* VDisplay */ /* VDisplay */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine Vdisplay expected", NULL); Error ("ModeLine Vdisplay expected");
ptr->ml_vdisplay = val.num; ptr->ml_vdisplay = val.num;
/* VSyncStart */ /* VSyncStart */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VSyncStart expected", NULL); Error ("ModeLine VSyncStart expected");
ptr->ml_vsyncstart = val.num; ptr->ml_vsyncstart = val.num;
/* VSyncEnd */ /* VSyncEnd */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VSyncEnd expected", NULL); Error ("ModeLine VSyncEnd expected");
ptr->ml_vsyncend = val.num; ptr->ml_vsyncend = val.num;
/* VTotal */ /* VTotal */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VTotal expected", NULL); Error ("ModeLine VTotal expected");
ptr->ml_vtotal = val.num; ptr->ml_vtotal = val.num;
token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab); token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
@ -247,7 +247,7 @@ xf86parseModeLine (void)
ptr->ml_flags |= XF86CONF_VSCAN; ptr->ml_flags |= XF86CONF_VSCAN;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -271,7 +271,7 @@ xf86parseVerboseMode (void)
parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec) parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
if (xf86getSubToken (&(ptr->ml_comment)) != STRING) if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
Error ("Mode name expected", NULL); Error ("Mode name expected");
ptr->ml_identifier = val.str; ptr->ml_identifier = val.str;
while ((token = xf86getToken (ModeTab)) != ENDMODE) while ((token = xf86getToken (ModeTab)) != ENDMODE)
{ {
@ -290,44 +290,44 @@ xf86parseVerboseMode (void)
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hdisplay = val.num; ptr->ml_hdisplay = val.num;
else else
Error ("Horizontal display expected", NULL); Error ("Horizontal display expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hsyncstart = val.num; ptr->ml_hsyncstart = val.num;
else else
Error ("Horizontal sync start expected", NULL); Error ("Horizontal sync start expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hsyncend = val.num; ptr->ml_hsyncend = val.num;
else else
Error ("Horizontal sync end expected", NULL); Error ("Horizontal sync end expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_htotal = val.num; ptr->ml_htotal = val.num;
else else
Error ("Horizontal total expected", NULL); Error ("Horizontal total expected");
had_htimings = 1; had_htimings = 1;
break; break;
case VTIMINGS: case VTIMINGS:
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vdisplay = val.num; ptr->ml_vdisplay = val.num;
else else
Error ("Vertical display expected", NULL); Error ("Vertical display expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vsyncstart = val.num; ptr->ml_vsyncstart = val.num;
else else
Error ("Vertical sync start expected", NULL); Error ("Vertical sync start expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vsyncend = val.num; ptr->ml_vsyncend = val.num;
else else
Error ("Vertical sync end expected", NULL); Error ("Vertical sync end expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vtotal = val.num; ptr->ml_vtotal = val.num;
else else
Error ("Vertical total expected", NULL); Error ("Vertical total expected");
had_vtimings = 1; had_vtimings = 1;
break; break;
case FLAGS: case FLAGS:
@ -367,10 +367,10 @@ xf86parseVerboseMode (void)
ptr->ml_flags |= XF86CONF_DBLSCAN; ptr->ml_flags |= XF86CONF_DBLSCAN;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error ("Unknown flag string", NULL); Error ("Unknown flag string");
break; break;
} }
token = xf86getSubToken (&(ptr->ml_comment)); token = xf86getSubToken (&(ptr->ml_comment));
@ -379,29 +379,29 @@ xf86parseVerboseMode (void)
break; break;
case HSKEW: case HSKEW:
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("Horizontal skew expected", NULL); Error ("Horizontal skew expected");
ptr->ml_flags |= XF86CONF_HSKEW; ptr->ml_flags |= XF86CONF_HSKEW;
ptr->ml_hskew = val.num; ptr->ml_hskew = val.num;
break; break;
case VSCAN: case VSCAN:
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("Vertical scan count expected", NULL); Error ("Vertical scan count expected");
ptr->ml_flags |= XF86CONF_VSCAN; ptr->ml_flags |= XF86CONF_VSCAN;
ptr->ml_vscan = val.num; ptr->ml_vscan = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error ("Unexepcted token in verbose \"Mode\" entry\n", NULL); Error ("Unexepcted token in verbose \"Mode\" entry\n");
} }
} }
if (!had_dotclock) if (!had_dotclock)
Error ("the dotclock is missing", NULL); Error ("the dotclock is missing");
if (!had_htimings) if (!had_htimings)
Error ("the horizontal timings are missing", NULL); Error ("the horizontal timings are missing");
if (!had_vtimings) if (!had_vtimings)
Error ("the vertical timings are missing", NULL); Error ("the vertical timings are missing");
#ifdef DEBUG #ifdef DEBUG
printf ("Verbose Mode parsed\n"); printf ("Verbose Mode parsed\n");
@ -455,19 +455,19 @@ xf86parseMonitorSection (void)
break; break;
case DISPLAYSIZE: case DISPLAYSIZE:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (DISPLAYSIZE_MSG, NULL); Error (DISPLAYSIZE_MSG);
ptr->mon_width = val.realnum; ptr->mon_width = val.realnum;
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (DISPLAYSIZE_MSG, NULL); Error (DISPLAYSIZE_MSG);
ptr->mon_height = val.realnum; ptr->mon_height = val.realnum;
break; break;
case HORIZSYNC: case HORIZSYNC:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (HORIZSYNC_MSG, NULL); Error (HORIZSYNC_MSG);
do { do {
if (ptr->mon_n_hsync >= CONF_MAX_HSYNC) if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
Error ("Sorry. Too many horizontal sync intervals.", NULL); Error ("Sorry. Too many horizontal sync intervals.");
ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum; ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
switch (token = xf86getSubToken (&(ptr->mon_comment))) switch (token = xf86getSubToken (&(ptr->mon_comment)))
{ {
@ -478,7 +478,7 @@ xf86parseMonitorSection (void)
case DASH: case DASH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER || if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
(float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo) (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo)
Error (HORIZSYNC_MSG, NULL); Error (HORIZSYNC_MSG);
ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum; ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;
if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA) if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
break; break;
@ -501,7 +501,7 @@ HorizDone:
case VERTREFRESH: case VERTREFRESH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (VERTREFRESH_MSG, NULL); Error (VERTREFRESH_MSG);
do { do {
ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum; ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;
switch (token = xf86getSubToken (&(ptr->mon_comment))) switch (token = xf86getSubToken (&(ptr->mon_comment)))
@ -513,7 +513,7 @@ HorizDone:
case DASH: case DASH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER || if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
(float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo) (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)
Error (VERTREFRESH_MSG, NULL); Error (VERTREFRESH_MSG);
ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum; ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;
if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA) if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
break; break;
@ -529,7 +529,7 @@ HorizDone:
goto VertDone; goto VertDone;
} }
if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH) if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
Error ("Sorry. Too many vertical refresh intervals.", NULL); Error ("Sorry. Too many vertical refresh intervals.");
ptr->mon_n_vrefresh++; ptr->mon_n_vrefresh++;
} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER); } while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
VertDone: VertDone:
@ -539,7 +539,7 @@ VertDone:
case GAMMA: case GAMMA:
if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER ) if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER )
{ {
Error (INVALID_GAMMA_MSG, NULL); Error (INVALID_GAMMA_MSG);
} }
else else
{ {
@ -554,7 +554,7 @@ VertDone:
} }
else else
{ {
Error (INVALID_GAMMA_MSG, NULL); Error (INVALID_GAMMA_MSG);
} }
} }
else else
@ -583,7 +583,7 @@ VertDone:
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ()); xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -594,7 +594,7 @@ VertDone:
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Monitor section parsed\n"); printf ("Monitor section parsed\n");
@ -644,7 +644,7 @@ xf86parseModesSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Modes section parsed\n"); printf ("Modes section parsed\n");

View File

@ -184,10 +184,10 @@ xf86parsePointerSection (void)
switch (xf86getToken(ZMapTab)) { switch (xf86getToken(ZMapTab)) {
case NUMBER: case NUMBER:
if (val.num < 0) if (val.num < 0)
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
val1 = val.num; val1 = val.num;
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) { if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
} }
if (asprintf(&s, "%lu %u", val1, val.num) == -1) if (asprintf(&s, "%lu %u", val1, val.num) == -1)
s = NULL; s = NULL;
@ -199,7 +199,7 @@ xf86parsePointerSection (void)
s = strdup("y"); s = strdup("y");
break; break;
default: default:
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
break; break;
} }
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst, ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
@ -209,7 +209,7 @@ xf86parsePointerSection (void)
case ALWAYSCORE: case ALWAYSCORE:
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());

View File

@ -101,18 +101,18 @@ xf86parseDisplaySubSection (void)
break; break;
case VIEWPORT: case VIEWPORT:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIEWPORT_MSG, NULL); Error (VIEWPORT_MSG);
ptr->disp_frameX0 = val.num; ptr->disp_frameX0 = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIEWPORT_MSG, NULL); Error (VIEWPORT_MSG);
ptr->disp_frameY0 = val.num; ptr->disp_frameY0 = val.num;
break; break;
case VIRTUAL: case VIRTUAL:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->disp_virtualX = val.num; ptr->disp_virtualX = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->disp_virtualY = val.num; ptr->disp_virtualY = val.num;
break; break;
case DEPTH: case DEPTH:
@ -132,35 +132,35 @@ xf86parseDisplaySubSection (void)
break; break;
case WEIGHT: case WEIGHT:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.red = val.num; ptr->disp_weight.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.green = val.num; ptr->disp_weight.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.blue = val.num; ptr->disp_weight.blue = val.num;
break; break;
case BLACK_TOK: case BLACK_TOK:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.red = val.num; ptr->disp_black.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.green = val.num; ptr->disp_black.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.blue = val.num; ptr->disp_black.blue = val.num;
break; break;
case WHITE_TOK: case WHITE_TOK:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.red = val.num; ptr->disp_white.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.green = val.num; ptr->disp_white.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.blue = val.num; ptr->disp_white.blue = val.num;
break; break;
case MODES: case MODES:
@ -183,7 +183,7 @@ xf86parseDisplaySubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -302,10 +302,10 @@ xf86parseScreenSection (void)
break; break;
case VIRTUAL: case VIRTUAL:
if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER) if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->scrn_virtualX = val.num; ptr->scrn_virtualX = val.num;
if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER) if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->scrn_virtualY = val.num; ptr->scrn_virtualY = val.num;
break; break;
case OPTION: case OPTION:
@ -321,7 +321,7 @@ xf86parseScreenSection (void)
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -330,7 +330,7 @@ xf86parseScreenSection (void)
} }
if (!has_ident && !has_driver) if (!has_ident && !has_driver)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Screen section parsed\n"); printf ("Screen section parsed\n");

View File

@ -102,7 +102,7 @@ xf86parseVendorSubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -164,7 +164,7 @@ xf86parseVendorSection (void)
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -174,7 +174,7 @@ xf86parseVendorSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Vendor section parsed\n"); printf ("Vendor section parsed\n");

View File

@ -117,7 +117,7 @@ xf86parseVideoPortSubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -205,7 +205,7 @@ xf86parseVideoAdaptorSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -214,7 +214,7 @@ xf86parseVideoAdaptorSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("VideoAdaptor section parsed\n"); printf ("VideoAdaptor section parsed\n");

View File

@ -95,8 +95,8 @@ int xf86getSubToken(char **comment);
int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec *tab); int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec *tab);
void xf86unGetToken(int token); void xf86unGetToken(int token);
char *xf86tokenString(void); char *xf86tokenString(void);
void xf86parseError(const char *format, ...); void xf86parseError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
void xf86validationError(const char *format, ...); void xf86validationError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
void xf86setSection(const char *section); void xf86setSection(const char *section);
int xf86getStringToken(xf86ConfigSymTabRec *tab); int xf86getStringToken(xf86ConfigSymTabRec *tab);
/* write.c */ /* write.c */

View File

@ -163,13 +163,13 @@ void x86emu_inc_decoded_inst_len (int x)
M.x86.enc_pos += x; M.x86.enc_pos += x;
} }
void x86emu_decode_printf (char *x) void x86emu_decode_printf (const char *x)
{ {
sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x); sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x);
M.x86.enc_str_pos += strlen(x); M.x86.enc_str_pos += strlen(x);
} }
void x86emu_decode_printf2 (char *x, int y) void x86emu_decode_printf2 (const char *x, int y)
{ {
char temp[100]; char temp[100];
snprintf(temp,sizeof(temp),x,y); snprintf(temp,sizeof(temp),x,y);

View File

@ -52,7 +52,7 @@ void x86emuOp_esc_coprocess_d8(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_d9_tab[] = { static const char *x86emu_fpu_op_d9_tab[] = {
"FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ", "FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ",
"FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t", "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
@ -63,7 +63,7 @@ static char *x86emu_fpu_op_d9_tab[] = {
"FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t", "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
}; };
static char *x86emu_fpu_op_d9_tab1[] = { static const char *x86emu_fpu_op_d9_tab1[] = {
"FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t",
"FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t", "FLD\t",
@ -299,7 +299,7 @@ void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_da_tab[] = { static const char *x86emu_fpu_op_da_tab[] = {
"FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ", "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
"FICOMP\tDWORD PTR ", "FICOMP\tDWORD PTR ",
"FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ", "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
@ -392,7 +392,7 @@ void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_db_tab[] = { static const char *x86emu_fpu_op_db_tab[] = {
"FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ", "FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ",
"ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ", "ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ",
@ -513,7 +513,7 @@ void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
} }
#ifdef DEBUG #ifdef DEBUG
char *x86emu_fpu_op_dc_tab[] = { static const char *x86emu_fpu_op_dc_tab[] = {
"FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ", "FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ",
"FCOMP\tQWORD PTR ", "FCOMP\tQWORD PTR ",
"FSUB\tQWORD PTR ", "FSUBR\tQWORD PTR ", "FDIV\tQWORD PTR ", "FSUB\tQWORD PTR ", "FSUBR\tQWORD PTR ", "FDIV\tQWORD PTR ",
@ -631,7 +631,7 @@ void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_dd_tab[] = { static const char *x86emu_fpu_op_dd_tab[] = {
"FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ", "FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ",
"FRSTOR\t", "ESC_DD\t2D,", "FSAVE\t", "FSTSW\t", "FRSTOR\t", "ESC_DD\t2D,", "FSAVE\t", "FSTSW\t",
@ -734,7 +734,7 @@ void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_de_tab[] = static const char *x86emu_fpu_op_de_tab[] =
{ {
"FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ", "FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ",
"FICOMP\tWORD PTR ", "FICOMP\tWORD PTR ",
@ -856,7 +856,7 @@ void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
#ifdef DEBUG #ifdef DEBUG
static char *x86emu_fpu_op_df_tab[] = { static const char *x86emu_fpu_op_df_tab[] = {
/* mod == 00 */ /* mod == 00 */
"FILD\tWORD PTR ", "ESC_DF\t39\n", "FIST\tWORD PTR ", "FISTP\tWORD PTR ", "FILD\tWORD PTR ", "ESC_DF\t39\n", "FIST\tWORD PTR ", "FISTP\tWORD PTR ",
"FBLD\tTBYTE PTR ", "FILD\tQWORD PTR ", "FBSTP\tTBYTE PTR ", "FBLD\tTBYTE PTR ", "FILD\tQWORD PTR ", "FBSTP\tTBYTE PTR ",

View File

@ -110,7 +110,7 @@ Handles opcode 0x0f,0x80-0x8F
static void x86emuOp2_long_jump(u8 op2) static void x86emuOp2_long_jump(u8 op2)
{ {
s32 target; s32 target;
char *name = NULL; const char *name = NULL;
int cond = 0; int cond = 0;
/* conditional jump to word offset. */ /* conditional jump to word offset. */
@ -204,7 +204,7 @@ static void x86emuOp2_set_byte(u8 op2)
int mod, rl, rh; int mod, rl, rh;
uint destoffset; uint destoffset;
u8 *destreg; u8 *destreg;
char *name = NULL; const char *name = NULL;
int cond = 0; int cond = 0;
START_OF_INSTR(); START_OF_INSTR();

View File

@ -189,8 +189,8 @@ extern "C" { /* Use "C" linkage when in C++ mode */
#endif #endif
extern void x86emu_inc_decoded_inst_len (int x); extern void x86emu_inc_decoded_inst_len (int x);
extern void x86emu_decode_printf (char *x); extern void x86emu_decode_printf (const char *x);
extern void x86emu_decode_printf2 (char *x, int y); extern void x86emu_decode_printf2 (const char *x, int y);
extern void x86emu_just_disassemble (void); extern void x86emu_just_disassemble (void);
extern void x86emu_single_step (void); extern void x86emu_single_step (void);
extern void x86emu_end_instr (void); extern void x86emu_end_instr (void);

View File

@ -12,6 +12,13 @@ x11app_PROGRAMS = X11.bin
dist_X11_bin_SOURCES = \ dist_X11_bin_SOURCES = \
bundle-main.c bundle-main.c
# strndup(3) was added in Mac OS X 10.7, but we do this unconditionally to deal
# with the case where we build on Lion but target Snow Leopard as the minimum
# OS version.
#if NEED_STRNDUP
dist_X11_bin_SOURCES += $(top_srcdir)/os/strndup.c
#endif
nodist_X11_bin_SOURCES = \ nodist_X11_bin_SOURCES = \
mach_startupServer.c \ mach_startupServer.c \
mach_startupUser.c mach_startupUser.c

View File

@ -175,9 +175,9 @@ extern _X_HIDDEN Bool CreateConnectionBlock(void);
/* dixutils.c */ /* dixutils.c */
extern _X_EXPORT int CompareISOLatin1Lowered( extern _X_EXPORT int CompareISOLatin1Lowered(
unsigned char * /*a*/, const unsigned char * /*a*/,
int alen, int alen,
unsigned char * /*b*/, const unsigned char * /*b*/,
int blen); int blen);
extern _X_EXPORT int dixLookupWindow( extern _X_EXPORT int dixLookupWindow(

View File

@ -127,7 +127,7 @@ extern _X_EXPORT void CloseWellKnownConnections(void);
extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/); extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
extern _X_EXPORT char *ClientAuthorized( extern _X_EXPORT const char *ClientAuthorized(
ClientPtr /*client*/, ClientPtr /*client*/,
unsigned int /*proto_n*/, unsigned int /*proto_n*/,
char* /*auth_proto*/, char* /*auth_proto*/,
@ -405,7 +405,7 @@ extern _X_EXPORT void InitAuthorization(char * /*filename*/);
extern _X_EXPORT int AuthorizationFromID ( extern _X_EXPORT int AuthorizationFromID (
XID id, XID id,
unsigned short *name_lenp, unsigned short *name_lenp,
char **namep, const char **namep,
unsigned short *data_lenp, unsigned short *data_lenp,
char **datap); char **datap);
@ -415,7 +415,7 @@ extern _X_EXPORT XID CheckAuthorization(
unsigned int /*datalength*/, unsigned int /*datalength*/,
const char * /*data*/, const char * /*data*/,
ClientPtr /*client*/, ClientPtr /*client*/,
char ** /*reason*/ const char ** /*reason*/
); );
extern _X_EXPORT void ResetAuthorization(void); extern _X_EXPORT void ResetAuthorization(void);

View File

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* Registration functions. The name string is not copied, so it must * Registration functions. The name string is not copied, so it must
* not be a stack variable. * not be a stack variable.
*/ */
extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name); extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext); extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
/* /*

View File

@ -157,7 +157,7 @@ typedef Bool (*FindComplexResType)(
pointer /*cdata*/); pointer /*cdata*/);
extern _X_EXPORT RESTYPE CreateNewResourceType( extern _X_EXPORT RESTYPE CreateNewResourceType(
DeleteType /*deleteFunc*/, char * /*name*/); DeleteType /*deleteFunc*/, const char * /*name*/);
extern _X_EXPORT void SetResourceTypeErrorValue( extern _X_EXPORT void SetResourceTypeErrorValue(
RESTYPE /*type*/, int /*errorValue*/); RESTYPE /*type*/, int /*errorValue*/);

View File

@ -130,4 +130,10 @@
/* Use libpciaccess */ /* Use libpciaccess */
#undef XSERVER_LIBPCIACCESS #undef XSERVER_LIBPCIACCESS
/* Have setugid */
#undef HAVE_ISSETUGID
/* Have getresuid */
#undef HAVE_GETRESUID
#endif /* _XORG_CONFIG_H_ */ #endif /* _XORG_CONFIG_H_ */

View File

@ -176,12 +176,10 @@ SOFTWARE.
Bool defeatAccessControl = FALSE; Bool defeatAccessControl = FALSE;
#define acmp(a1, a2, len) memcmp((char *)(a1), (char *)(a2), len)
#define acopy(a1, a2, len) memmove((char *)(a2), (char *)(a1), len)
#define addrEqual(fam, address, length, host) \ #define addrEqual(fam, address, length, host) \
((fam) == (host)->family &&\ ((fam) == (host)->family &&\
(length) == (host)->len &&\ (length) == (host)->len &&\
!acmp (address, (host)->addr, length)) !memcmp (address, (host)->addr, length))
static int ConvertAddr(struct sockaddr * /*saddr*/, static int ConvertAddr(struct sockaddr * /*saddr*/,
int * /*len*/, int * /*len*/,
@ -371,13 +369,13 @@ DefineSelf (int fd)
switch (hp->h_addrtype) { switch (hp->h_addrtype) {
case AF_INET: case AF_INET:
inetaddr = (struct sockaddr_in *) (&(saddr.sa)); inetaddr = (struct sockaddr_in *) (&(saddr.sa));
acopy ( hp->h_addr, &(inetaddr->sin_addr), hp->h_length); memcpy ( &(inetaddr->sin_addr), hp->h_addr, hp->h_length);
len = sizeof(saddr.sa); len = sizeof(saddr.sa);
break; break;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
case AF_INET6: case AF_INET6:
inet6addr = (struct sockaddr_in6 *) (&(saddr.sa)); inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
acopy ( hp->h_addr, &(inet6addr->sin6_addr), hp->h_length); memcpy ( &(inet6addr->sin6_addr), hp->h_addr, hp->h_length);
len = sizeof(saddr.in6); len = sizeof(saddr.in6);
break; break;
#endif #endif
@ -398,7 +396,7 @@ DefineSelf (int fd)
{ {
host->family = family; host->family = family;
host->len = len; host->len = len;
acopy ( addr, host->addr, len); memcpy ( host->addr, addr, len);
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -448,7 +446,7 @@ DefineLocalHost:
{ {
host->family = FamilyLocalHost; host->family = FamilyLocalHost;
host->len = 0; host->len = 0;
acopy("", host->addr, 0); /* Nothing to store in host->addr */
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -585,7 +583,7 @@ DefineSelf (int fd)
{ {
host->family = family; host->family = family;
host->len = len; host->len = len;
acopy(addr, host->addr, len); memcpy(host->addr, addr, len);
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -717,7 +715,7 @@ DefineSelf (int fd)
if (host != NULL) { if (host != NULL) {
host->family = family; host->family = family;
host->len = len; host->len = len;
acopy(addr, host->addr, len); memcpy(host->addr, addr, len);
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -792,7 +790,7 @@ DefineSelf (int fd)
{ {
host->family = FamilyLocalHost; host->family = FamilyLocalHost;
host->len = 0; host->len = 0;
acopy("", host->addr, 0); /* Nothing to store in host->addr */
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -821,7 +819,7 @@ AugmentSelf(pointer from, int len)
return; return;
host->family = family; host->family = family;
host->len = len; host->len = len;
acopy(addr, host->addr, len); memcpy(host->addr, addr, len);
host->next = selfhosts; host->next = selfhosts;
selfhosts = host; selfhosts = host;
} }
@ -1306,7 +1304,7 @@ NewHost (int family,
return FALSE; return FALSE;
host->family = family; host->family = family;
host->len = len; host->len = len;
acopy(addr, host->addr, len); memcpy(host->addr, addr, len);
host->next = validhosts; host->next = validhosts;
validhosts = host; validhosts = host;
return TRUE; return TRUE;
@ -1400,7 +1398,7 @@ GetHosts (
((xHostEntry *)ptr)->family = host->family; ((xHostEntry *)ptr)->family = host->family;
((xHostEntry *)ptr)->length = len; ((xHostEntry *)ptr)->length = len;
ptr += sizeof(xHostEntry); ptr += sizeof(xHostEntry);
acopy (host->addr, ptr, len); memcpy (ptr, host->addr, len);
ptr += pad_to_int32(len); ptr += pad_to_int32(len);
} }
} else { } else {
@ -1763,7 +1761,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
hostaddrlen = a->ai_addrlen; hostaddrlen = a->ai_addrlen;
f = ConvertAddr(a->ai_addr,&hostaddrlen,&hostaddr); f = ConvertAddr(a->ai_addr,&hostaddrlen,&hostaddr);
if ((f == family) && (len == hostaddrlen) && if ((f == family) && (len == hostaddrlen) &&
(acmp (addr, hostaddr, len) == 0) ) { (memcmp (addr, hostaddr, len) == 0) ) {
res = TRUE; res = TRUE;
break; break;
} }
@ -1798,12 +1796,12 @@ siHostnameAddrMatch(int family, pointer addr, int len,
struct sockaddr_in sin; struct sockaddr_in sin;
sin.sin_family = hp->h_addrtype; sin.sin_family = hp->h_addrtype;
acopy ( *addrlist, &(sin.sin_addr), hp->h_length); memcpy ( &(sin.sin_addr), *addrlist, hp->h_length);
hostaddrlen = sizeof(sin); hostaddrlen = sizeof(sin);
f = ConvertAddr ((struct sockaddr *)&sin, f = ConvertAddr ((struct sockaddr *)&sin,
&hostaddrlen, &hostaddr); &hostaddrlen, &hostaddr);
if ((f == family) && (len == hostaddrlen) && if ((f == family) && (len == hostaddrlen) &&
(acmp (addr, hostaddr, len) == 0) ) { (memcmp (addr, hostaddr, len) == 0) ) {
res = TRUE; res = TRUE;
break; break;
} }

View File

@ -48,7 +48,7 @@ from The Open Group.
struct protocol { struct protocol {
unsigned short name_length; unsigned short name_length;
char *name; const char *name;
AuthAddCFunc Add; /* new authorization data */ AuthAddCFunc Add; /* new authorization data */
AuthCheckFunc Check; /* verify client authorization data */ AuthCheckFunc Check; /* verify client authorization data */
AuthRstCFunc Reset; /* delete all authorization data entries */ AuthRstCFunc Reset; /* delete all authorization data entries */
@ -163,7 +163,7 @@ CheckAuthorization (
unsigned int data_length, unsigned int data_length,
const char *data, const char *data,
ClientPtr client, ClientPtr client,
char **reason) /* failure message. NULL for default msg */ const char **reason) /* failure message. NULL for default msg */
{ {
int i; int i;
struct stat buf; struct stat buf;
@ -236,7 +236,7 @@ int
AuthorizationFromID ( AuthorizationFromID (
XID id, XID id,
unsigned short *name_lenp, unsigned short *name_lenp,
char **namep, const char **namep,
unsigned short *data_lenp, unsigned short *data_lenp,
char **datap) char **datap)
{ {

View File

@ -629,7 +629,7 @@ AuthorizationIDOfClient(ClientPtr client)
* *
*****************************************************************/ *****************************************************************/
char * const char *
ClientAuthorized(ClientPtr client, ClientAuthorized(ClientPtr client,
unsigned int proto_n, char *auth_proto, unsigned int proto_n, char *auth_proto,
unsigned int string_n, char *auth_string) unsigned int string_n, char *auth_string)
@ -639,7 +639,7 @@ ClientAuthorized(ClientPtr client,
int family; int family;
int fromlen; int fromlen;
XID auth_id; XID auth_id;
char *reason = NULL; const char *reason = NULL;
XtransConnInfo trans_conn; XtransConnInfo trans_conn;
priv = (OsCommPtr)client->osPrivate; priv = (OsCommPtr)client->osPrivate;

View File

@ -823,7 +823,7 @@ WriteToClient (ClientPtr who, int count, const void *__buf)
CARD32 replylen; CARD32 replylen;
unsigned long bytesleft; unsigned long bytesleft;
replylen = ((xGenericReply *)buf)->length; replylen = ((const xGenericReply *)buf)->length;
if (who->swapped) if (who->swapped)
swapl(&replylen); swapl(&replylen);
bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes; bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes;

View File

@ -76,7 +76,7 @@ MitCheckCookie (
unsigned short data_length, unsigned short data_length,
const char *data, const char *data,
ClientPtr client, ClientPtr client,
char **reason) const char **reason)
{ {
struct auth *auth; struct auth *auth;

View File

@ -137,7 +137,7 @@ typedef void (*AuthInitFunc) (AuthInitArgs);
#define AuthAddCArgs unsigned short data_length, const char *data, XID id #define AuthAddCArgs unsigned short data_length, const char *data, XID id
typedef int (*AuthAddCFunc) (AuthAddCArgs); typedef int (*AuthAddCFunc) (AuthAddCArgs);
#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, char **reason #define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, const char **reason
typedef XID (*AuthCheckFunc) (AuthCheckArgs); typedef XID (*AuthCheckFunc) (AuthCheckArgs);
#define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap #define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap

View File

@ -151,7 +151,7 @@ void
OsInit(void) OsInit(void)
{ {
static Bool been_here = FALSE; static Bool been_here = FALSE;
static char* devnull = "/dev/null"; static const char* devnull = "/dev/null";
char fname[PATH_MAX]; char fname[PATH_MAX];
if (!been_here) { if (!been_here) {

View File

@ -128,7 +128,7 @@ static char rpc_error[MAXNETNAMELEN+50];
_X_HIDDEN XID _X_HIDDEN XID
SecureRPCCheck (unsigned short data_length, const char *data, SecureRPCCheck (unsigned short data_length, const char *data,
ClientPtr client, char **reason) ClientPtr client, const char **reason)
{ {
char *fullname; char *fullname;

View File

@ -248,7 +248,7 @@ LockServer(void)
{ {
char tmp[PATH_MAX], pid_str[12]; char tmp[PATH_MAX], pid_str[12];
int lfd, i, haslock, l_pid, t; int lfd, i, haslock, l_pid, t;
char *tmppath = NULL; const char *tmppath = LOCK_DIR;
int len; int len;
char port[20]; char port[20];
@ -256,8 +256,6 @@ LockServer(void)
/* /*
* Path names * Path names
*/ */
tmppath = LOCK_DIR;
snprintf(port, sizeof(port), "%d", atoi(display)); snprintf(port, sizeof(port), "%d", atoi(display));
len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) : len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) :
strlen(LOCK_TMP_PREFIX); strlen(LOCK_TMP_PREFIX);

View File

@ -248,7 +248,7 @@ XdmClientAuthTimeout (long now)
static XdmClientAuthPtr static XdmClientAuthPtr
XdmAuthorizationValidate (unsigned char *plain, int length, XdmAuthorizationValidate (unsigned char *plain, int length,
XdmAuthKeyPtr rho, ClientPtr xclient, char **reason) XdmAuthKeyPtr rho, ClientPtr xclient, const char **reason)
{ {
XdmClientAuthPtr client, existing; XdmClientAuthPtr client, existing;
long now; long now;
@ -376,7 +376,7 @@ XdmAddCookie (unsigned short data_length, const char *data, XID id)
XID XID
XdmCheckCookie (unsigned short cookie_length, const char *cookie, XdmCheckCookie (unsigned short cookie_length, const char *cookie,
ClientPtr xclient, char **reason) ClientPtr xclient, const char **reason)
{ {
XdmAuthorizationPtr auth; XdmAuthorizationPtr auth;
XdmClientAuthPtr client; XdmClientAuthPtr client;

View File

@ -60,7 +60,7 @@
#define X_INCLUDE_NETDB_H #define X_INCLUDE_NETDB_H
#include <X11/Xos_r.h> #include <X11/Xos_r.h>
static char *defaultDisplayClass = COMPILEDDISPLAYCLASS; static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
static int xdmcpSocket, sessionSocket; static int xdmcpSocket, sessionSocket;
static xdmcp_states state; static xdmcp_states state;
@ -479,7 +479,7 @@ XdmcpRegisterConnection (
if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) { if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) {
fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr; fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr;
} else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) && } else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) &&
IN6_IS_ADDR_V4MAPPED((struct in6_addr *) address)) { IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) address)) {
fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr; fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr;
regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12]; regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12];
regAddrlen = sizeof(struct in_addr); regAddrlen = sizeof(struct in_addr);
@ -1593,7 +1593,7 @@ get_fromaddr_by_name(
static int static int
get_mcast_options(int argc, char **argv, int i) get_mcast_options(int argc, char **argv, int i)
{ {
char *address = XDM_DEFAULT_MCAST_ADDR6; const char *address = XDM_DEFAULT_MCAST_ADDR6;
int hopcount = 1; int hopcount = 1;
struct addrinfo hints; struct addrinfo hints;
char portstr[6]; char portstr[6];

View File

@ -56,7 +56,8 @@ PictureGetFilterId (const char *filter, int len, Bool makeit)
if (len < 0) if (len < 0)
len = strlen (filter); len = strlen (filter);
for (i = 0; i < nfilterNames; i++) for (i = 0; i < nfilterNames; i++)
if (!CompareISOLatin1Lowered ((unsigned char *) filterNames[i], -1, (unsigned char *) filter, len)) if (!CompareISOLatin1Lowered ((const unsigned char *) filterNames[i], -1,
(const unsigned char *) filter, len))
return i; return i;
if (!makeit) if (!makeit)
return -1; return -1;

View File

@ -951,13 +951,13 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi,
unsigned keycode, unsigned keycode,
XkbAction * pAction) XkbAction * pAction)
{ {
DeviceIntPtr dev;
int button;
if (xkbi->device == inputInfo.keyboard) if (xkbi->device == inputInfo.keyboard)
return 0; return 0;
if (filter->keycode==0) { /* initial press */ if (filter->keycode==0) { /* initial press */
DeviceIntPtr dev;
int button;
_XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient, _XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient,
DixUnknownAccess, &button); DixUnknownAccess, &button);
if (!dev || !dev->public.on) if (!dev || !dev->public.on)
@ -996,7 +996,8 @@ int button;
} }
} }
else if (filter->keycode==keycode) { else if (filter->keycode==keycode) {
int button; DeviceIntPtr dev;
int button;
filter->active= 0; filter->active= 0;
_XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device, _XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device,

View File

@ -680,11 +680,9 @@ XkbSrvLedInfoPtr sli;
/* optimization to check for most common case */ /* optimization to check for most common case */
if (((class==XkbDfltXIClass)&&(id==XkbDfltXIId))&&(dev->kbdfeed)) { if (((class==XkbDfltXIClass)&&(id==XkbDfltXIId))&&(dev->kbdfeed)) {
XkbSrvLedInfoPtr sli;
sli= dev->kbdfeed->xkb_sli;
if (dev->kbdfeed->xkb_sli==NULL) { if (dev->kbdfeed->xkb_sli==NULL) {
sli= XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts); dev->kbdfeed->xkb_sli=
dev->kbdfeed->xkb_sli= sli; XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts);
} }
return dev->kbdfeed->xkb_sli; return dev->kbdfeed->xkb_sli;
} }