diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-25 23:48:18 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-03-25 23:48:18 +0000 |
| commit | 14e9700621d02a8d1d56b929d8f09b90705f2abc (patch) | |
| tree | 98122cceb8391b037625342c305731360557c25b | |
| parent | 7fb177c367cc8f522dd1dced1e80908ee51befd4 (diff) | |
merge from trunk
126 files changed, 19664 insertions, 12431 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index c554be0743c..9838e0b5ec0 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -211,6 +211,10 @@ _mesa_init_driver_functions(struct dd_function_table *driver) driver->FramebufferRenderbuffer = _mesa_framebuffer_renderbuffer; #endif +#if FEATURE_EXT_framebuffer_blit + driver->BlitFramebuffer = _swrast_BlitFramebuffer; +#endif + /* query objects */ driver->NewQueryObject = _mesa_new_query_object; driver->BeginQuery = NULL; diff --git a/src/mesa/glapi/Makefile b/src/mesa/glapi/Makefile index fb5a2288517..129e51fb1f0 100644 --- a/src/mesa/glapi/Makefile +++ b/src/mesa/glapi/Makefile @@ -18,11 +18,21 @@ OUTPUTS = glprocs.h glapitemp.h glapioffsets.h glapitable.h dispatch.h \ ../../glx/x11/indirect_size.h \ ../../glx/x11/indirect_size.c + +#XORG_BASE = /home/idr/devel/graphics/Xorg/xserver/xorg +GLX_DIR = $(XORG_BASE)/GL/glx + +SERVER_OUTPUTS = $(GLX_DIR)/indirect_dispatch.c \ + $(GLX_DIR)/indirect_dispatch_swap.c \ + $(GLX_DIR)/indirect_dispatch.h + COMMON = gl_XML.py license.py gl_API.xml typeexpr.py COMMON_GLX = $(COMMON) glX_XML.py glX_proto_common.py all: $(OUTPUTS) +server: $(SERVER_OUTPUTS) + glprocs.h: $(COMMON) gl_procs.py $(PYTHON2) $(PYTHON_FLAGS) gl_procs.py > glprocs.h @@ -65,6 +75,21 @@ dispatch.h: $(COMMON) gl_table.py ../../glx/x11/indirect_size.c: $(COMMON_GLX) glX_proto_size.py $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c --only-set > ../../glx/x11/indirect_size.c +$(GLX_DIR)/indirect_dispatch.c: $(COMMON_GLX) glX_proto_recv.py + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_recv.py -m dispatch_c > $@ + +$(GLX_DIR)/indirect_dispatch_swap.c: $(COMMON_GLX) glX_proto_recv.py + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_recv.py -m dispatch_c -s > $@ + +$(GLX_DIR)/indirect_dispatch.h: $(COMMON_GLX) glX_proto_recv.py + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_recv.py -m dispatch_h -s > $@ + +$(GLX_DIR)/indirect_size_get.h: $(COMMON_GLX) glX_proto_size.py + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_h --only-get -h '_INDIRECT_SIZE_GET_H_' > $@ + +$(GLX_DIR)/indirect_size_get.c: $(COMMON_GLX) glX_proto_size.py + $(PYTHON2) $(PYTHON_FLAGS) glX_proto_size.py -m size_c > $@ + clean: rm -f *~ *.pyo rm -f $(OUTPUTS) diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h index b2b06a837e6..d1d21beb458 100644 --- a/src/mesa/glapi/dispatch.h +++ b/src/mesa/glapi/dispatch.h @@ -2512,10 +2512,13 @@ #define CALL_GetQueryObjectui64vEXT(disp, parameters) (*((disp)->GetQueryObjectui64vEXT)) parameters #define GET_GetQueryObjectui64vEXT(disp) ((disp)->GetQueryObjectui64vEXT) #define SET_GetQueryObjectui64vEXT(disp, fn) ((disp)->GetQueryObjectui64vEXT = fn) +#define CALL_BlitFramebufferEXT(disp, parameters) (*((disp)->BlitFramebufferEXT)) parameters +#define GET_BlitFramebufferEXT(disp) ((disp)->BlitFramebufferEXT) +#define SET_BlitFramebufferEXT(disp, fn) ((disp)->BlitFramebufferEXT = fn) #else -#define driDispatchRemapTable_size 410 +#define driDispatchRemapTable_size 411 extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define LoadTransposeMatrixfARB_remap_index 0 @@ -2928,6 +2931,7 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define StencilMaskSeparate_remap_index 407 #define GetQueryObjecti64vEXT_remap_index 408 #define GetQueryObjectui64vEXT_remap_index 409 +#define BlitFramebufferEXT_remap_index 410 #define CALL_LoadTransposeMatrixfARB(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(const GLfloat *)), driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index], parameters) #define GET_LoadTransposeMatrixfARB(disp) GET_by_offset(disp, driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index]) @@ -4159,6 +4163,9 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ]; #define CALL_GetQueryObjectui64vEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint64EXT *)), driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index], parameters) #define GET_GetQueryObjectui64vEXT(disp) GET_by_offset(disp, driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index]) #define SET_GetQueryObjectui64vEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index], fn) +#define CALL_BlitFramebufferEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)), driDispatchRemapTable[BlitFramebufferEXT_remap_index], parameters) +#define GET_BlitFramebufferEXT(disp) GET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index]) +#define SET_BlitFramebufferEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[BlitFramebufferEXT_remap_index], fn) #endif /* !defined(IN_DRI_DRIVER) */ diff --git a/src/mesa/glapi/glX_proto_common.py b/src/mesa/glapi/glX_proto_common.py index 74489635710..6f094e22b31 100644 --- a/src/mesa/glapi/glX_proto_common.py +++ b/src/mesa/glapi/glX_proto_common.py @@ -48,7 +48,7 @@ class glx_proto_type(gl_XML.gl_type): class glx_print_proto(gl_XML.gl_print_base): - def size_call(self, func): + def size_call(self, func, outputs_also = 0): """Create C code to calculate 'compsize'. Creates code to calculate 'compsize'. If the function does @@ -58,7 +58,7 @@ class glx_print_proto(gl_XML.gl_print_base): compsize = None for param in func.parameterIterator(): - if not param.is_output: + if outputs_also or not param.is_output: if param.is_image(): [dim, w, h, d, junk] = param.get_dimensions() diff --git a/src/mesa/glapi/glX_proto_recv.py b/src/mesa/glapi/glX_proto_recv.py new file mode 100644 index 00000000000..a0c4ea0541a --- /dev/null +++ b/src/mesa/glapi/glX_proto_recv.py @@ -0,0 +1,561 @@ +#!/usr/bin/env python + +# (C) Copyright IBM Corporation 2005 +# All Rights Reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# on the rights to use, copy, modify, merge, publish, distribute, sub +# license, 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 NON-INFRINGEMENT. IN NO EVENT SHALL +# IBM AND/OR ITS SUPPLIERS 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. +# +# Authors: +# Ian Romanick <idr@us.ibm.com> + +import gl_XML, glX_XML, glX_proto_common, license +import sys, getopt, string + + +class PrintGlxDispatch_h(gl_XML.gl_print_base): + def __init__(self): + gl_XML.gl_print_base.__init__(self) + + self.name = "glX_proto_recv.py (from Mesa)" + self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM") + + self.header_tag = "_INDIRECT_DISPATCH_H_" + return + + + def printRealHeader(self): + self.printVisibility( "HIDDEN", "hidden" ) + print 'struct __GLXclientStateRec;' + print '' + return + + + def printBody(self, api): + for func in api.functionIterateAll(): + if not func.ignore and not func.vectorequiv: + if func.glx_rop != 0: + print 'extern HIDDEN void __glXDisp_%s(GLbyte * pc);' % (func.name) + print 'extern HIDDEN void __glXDispSwap_%s(GLbyte * pc);' % (func.name) + elif func.glx_sop != 0 or func.glx_vendorpriv != 0: + print 'extern HIDDEN int __glXDisp_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) + print 'extern HIDDEN int __glXDispSwap_%s(struct __GLXclientStateRec *, GLbyte *);' % (func.name) + + return + + +class PrintGlxDispatchFunctions(glX_proto_common.glx_print_proto): + def __init__(self, do_swap): + gl_XML.gl_print_base.__init__(self) + self.name = "glX_proto_recv.py (from Mesa)" + self.license = license.bsd_license_template % ( "(C) Copyright IBM Corporation 2005", "IBM") + + self.real_types = [ '', '', 'uint16_t', '', 'uint32_t', '', '', '', 'uint64_t' ] + self.do_swap = do_swap + return + + + def printRealHeader(self): + print '#include <X11/Xmd.h>' + print '#include <GL/gl.h>' + print '#include <GL/glxproto.h>' + + + # FIXME: Since this block will require changes as other + # FIXME: platforms are added, it should probably be in a + # FIXME: header file that is not generated by a script. + + if self.do_swap: + print '#ifdef __linux__' + print '#include <byteswap.h>' + print '#elif defined(__OpenBSD__)' + print '#include <sys/endian.h>' + print '#define bswap_16 __swap16' + print '#define bswap_32 __swap32' + print '#define bswap_64 __swap64' + print '#else' + print '#include <sys/endian.h>' + print '#define bswap_16 bswap16' + print '#define bswap_32 bswap32' + print '#define bswap_64 bswap64' + print '#endif' + + print '#include <inttypes.h>' + print '#include "indirect_size.h"' + print '#include "indirect_size_get.h"' + print '#include "indirect_dispatch.h"' + print '#include "glxserver.h"' + print '#include "indirect_util.h"' + print '#include "singlesize.h"' + print '#include "glapitable.h"' + print '#include "glapi.h"' + print '#include "glthread.h"' + print '#include "dispatch.h"' + print '' + print '#define __GLX_PAD(x) (((x) + 3) & ~3)' + print '' + print 'typedef struct {' + print ' __GLX_PIXEL_3D_HDR;' + print '} __GLXpixel3DHeader;' + print '' + print 'extern GLboolean __glXErrorOccured( void );' + print 'extern void __glXClearErrorOccured( void );' + print '' + print 'static const unsigned dummy_answer[2] = {0, 0};' + print '' + return + + + def printBody(self, api): + if self.do_swap: + self.emit_swap_wrappers(api) + + + for func in api.functionIterateByOffset(): + if not func.ignore and not func.server_handcode and not func.vectorequiv and (func.glx_rop or func.glx_sop or func.glx_vendorpriv): + self.printFunction(func) + + return + + + def printFunction(self, f): + if (f.glx_sop or f.glx_vendorpriv) and (len(f.get_images()) != 0): + return + + if not self.do_swap: + base = '__glXDisp' + else: + base = '__glXDispSwap' + + if f.glx_rop: + print 'void %s_%s(GLbyte * pc)' % (base, f.name) + else: + print 'int %s_%s(__GLXclientState *cl, GLbyte *pc)' % (base, f.name) + + print '{' + + if f.glx_rop or f.vectorequiv: + self.printRenderFunction(f) + elif f.glx_sop or f.glx_vendorpriv: + if len(f.get_images()) == 0: + self.printSingleFunction(f) + else: + print "/* Missing GLX protocol for %s. */" % (f.name) + + print '}' + print '' + return + + + def swap_name(self, bytes): + return 'bswap_%u_array' % (8 * bytes) + + + def emit_swap_wrappers(self, api): + self.type_map = {} + already_done = [ ] + + for t in api.typeIterate(): + te = t.get_type_expression() + t_size = te.get_element_size() + + if t_size > 1 and t.glx_name: + + t_name = "GL" + t.name + self.type_map[ t_name ] = t.glx_name + + if t.glx_name not in already_done: + real_name = self.real_types[t_size] + + print 'static %s' % (t_name) + print 'bswap_%s( const void * src )' % (t.glx_name) + print '{' + print ' union { %s dst; %s ret; } x;' % (real_name, t_name) + print ' x.dst = bswap_%u( *(%s *) src );' % (t_size * 8, real_name) + print ' return x.ret;' + print '}' + print '' + already_done.append( t.glx_name ) + + for bits in [16, 32, 64]: + print 'static void *' + print 'bswap_%u_array( uint%u_t * src, unsigned count )' % (bits, bits) + print '{' + print ' unsigned i;' + print '' + print ' for ( i = 0 ; i < count ; i++ ) {' + print ' uint%u_t temp = bswap_%u( src[i] );' % (bits, bits) + print ' src[i] = temp;' + print ' }' + print '' + print ' return src;' + print '}' + print '' + + + def fetch_param(self, param): + t = param.type_string() + o = param.offset + element_size = param.size() / param.get_element_count() + + if self.do_swap and (element_size != 1): + if param.is_array(): + real_name = self.real_types[ element_size ] + + swap_func = self.swap_name( element_size ) + return ' (%-8s)%s( (%s *) (pc + %2s), %s )' % (t, swap_func, real_name, o, param.count) + else: + t_name = param.get_base_type_string() + return ' (%-8s)bswap_%-7s( pc + %2s )' % (t, self.type_map[ t_name ], o) + else: + if param.is_array(): + return ' (%-8s)(pc + %2u)' % (t, o) + else: + return '*(%-8s *)(pc + %2u)' % (t, o) + + return None + + + def emit_function_call(self, f, retval_assign, indent): + list = [] + + for param in f.parameterIterator(): + + if param.is_counter or param.is_image() or param.is_output or len(param.count_parameter_list): + location = param.name + else: + location = self.fetch_param(param) + + list.append( '%s %s' % (indent, location) ) + + + if len( list ): + print '%s %sCALL_%s( GET_DISPATCH(), (' % (indent, retval_assign, f.name) + print string.join( list, ",\n" ) + print '%s ) );' % (indent) + else: + print '%s %sCALL_%s( GET_DISPATCH(), () );' % (indent, retval_assign, f.name) + return + + + def common_func_print_just_start(self, f, indent): + align64 = 0 + need_blank = 0 + + + f.calculate_offsets() + for param in f.parameterIterateGlxSend(): + # If any parameter has a 64-bit base type, then we + # have to do alignment magic for the while thing. + + if param.is_64_bit(): + align64 = 1 + + + # FIXME img_null_flag is over-loaded. In addition to + # FIXME being used for images, it is used to signify + # FIXME NULL data pointers for vertex buffer object + # FIXME related functions. Re-name it to null_data + # FIXME or something similar. + + if param.img_null_flag: + print '%s const CARD32 ptr_is_null = *(CARD32 *)(pc + %s);' % (indent, param.offset - 4) + cond = '(ptr_is_null != 0) ? NULL : ' + else: + cond = "" + + + type_string = param.type_string() + + if param.is_image(): + offset = f.offset_of( param.name ) + + print '%s %s const %s = (%s) %s(pc + %s);' % (indent, type_string, param.name, type_string, cond, offset) + + if param.depth: + print '%s __GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);' % (indent) + else: + print '%s __GLXpixelHeader * const hdr = (__GLXpixelHeader *)(pc);' % (indent) + + need_blank = 1 + elif param.is_counter or param.name in f.count_parameter_list: + location = self.fetch_param(param) + print '%s const %s %s = %s;' % (indent, type_string, param.name, location) + need_blank = 1 + elif len(param.count_parameter_list): + if param.size() == 1 and not self.do_swap: + location = self.fetch_param(param) + print '%s %s %s = %s%s;' % (indent, type_string, param.name, cond, location) + else: + print '%s %s %s;' % (indent, type_string, param.name) + need_blank = 1 + + + + if need_blank: + print '' + + if align64: + print '#ifdef __GLX_ALIGN64' + + if f.has_variable_size_request(): + self.emit_packet_size_calculation(f, 4) + s = "cmdlen" + else: + s = str((f.command_fixed_length() + 3) & ~3) + + print ' if ((unsigned long)(pc) & 7) {' + print ' (void) memmove(pc-4, pc, %s);' % (s) + print ' pc -= 4;' + print ' }' + print '#endif' + print '' + + + need_blank = 0 + if self.do_swap: + for param in f.parameterIterateGlxSend(): + if param.count_parameter_list: + o = param.offset + count = param.get_element_count() + type_size = param.size() / count + + if param.counter: + count_name = param.counter + else: + count_name = str(count) + + # This is basically an ugly special- + # case for glCallLists. + + if type_size == 1: + x = [] + x.append( [1, ['BYTE', 'UNSIGNED_BYTE', '2_BYTES', '3_BYTES', '4_BYTES']] ) + x.append( [2, ['SHORT', 'UNSIGNED_SHORT']] ) + x.append( [4, ['INT', 'UNSIGNED_INT', 'FLOAT']] ) + + print ' switch(%s) {' % (param.count_parameter_list[0]) + for sub in x: + for t_name in sub[1]: + print ' case GL_%s:' % (t_name) + + if sub[0] == 1: + print ' %s = (%s) (pc + %s); break;' % (param.name, param.type_string(), o) + else: + swap_func = self.swap_name(sub[0]) + print ' %s = (%s) %s( (%s *) (pc + %s), %s ); break;' % (param.name, param.type_string(), swap_func, self.real_types[sub[0]], o, count_name) + print ' }' + else: + swap_func = self.swap_name(type_size) + compsize = self.size_call(f, 1) + print ' %s = (%s) %s( (%s *) (pc + %s), %s );' % (param.name, param.type_string(), swap_func, self.real_types[type_size], o, compsize) + + need_blank = 1 + + else: + for param in f.parameterIterateGlxSend(): + if param.count_parameter_list: + print '%s %s = (%s) (pc + %s);' % (indent, param.name, param.type_string(), param.offset) + need_blank = 1 + + + if need_blank: + print '' + + + return + + + def printSingleFunction(self, f): + if f.glx_sop: + print ' xGLXSingleReq * const req = (xGLXSingleReq *) pc;' + else: + print ' xGLXVendorPrivateReq * const req = (xGLXVendorPrivateReq *) pc;' + + print ' int error;' + + if self.do_swap: + print ' __GLXcontext * const cx = __glXForceCurrent(cl, bswap_CARD32( &req->contextTag ), &error);' + else: + print ' __GLXcontext * const cx = __glXForceCurrent(cl, req->contextTag, &error);' + + print '' + if f.glx_sop: + print ' pc += __GLX_SINGLE_HDR_SIZE;' + else: + print ' pc += __GLX_VENDPRIV_HDR_SIZE;' + + print ' if ( cx != NULL ) {' + self.common_func_print_just_start(f, " ") + + + if f.return_type != 'void': + print ' %s retval;' % (f.return_type) + retval_string = "retval" + retval_assign = "retval = " + else: + retval_string = "0" + retval_assign = "" + + + type_size = 0 + answer_string = "dummy_answer" + answer_count = "0" + is_array_string = "GL_FALSE" + + for param in f.parameterIterateOutputs(): + answer_type = param.get_base_type_string() + if answer_type == "GLvoid": + answer_type = "GLubyte" + + + c = param.get_element_count() + type_size = (param.size() / c) + if type_size == 1: + size_scale = "" + else: + size_scale = " * %u" % (type_size) + + + if param.count_parameter_list: + print ' const GLuint compsize = %s;' % (self.size_call(f, 1)) + print ' %s answerBuffer[200];' % (answer_type) + print ' %s %s = __glXGetAnswerBuffer(cl, compsize%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, size_scale, type_size ) + answer_string = param.name + answer_count = "compsize" + + print '' + print ' if (%s == NULL) return BadAlloc;' % (param.name) + print ' __glXClearErrorOccured();' + print '' + elif param.counter: + print ' %s answerBuffer[200];' % (answer_type) + print ' %s %s = __glXGetAnswerBuffer(cl, %s%s, answerBuffer, sizeof(answerBuffer), %u);' % (param.type_string(), param.name, param.counter, size_scale, type_size) + answer_string = param.name + answer_count = param.counter + elif c >= 1: + print ' %s %s[%u];' % (answer_type, param.name, c) + answer_string = param.name + answer_count = "%u" % (c) + + if f.reply_always_array: + is_array_string = "GL_TRUE" + + + self.emit_function_call(f, retval_assign, " ") + + + if f.needs_reply(): + if self.do_swap: + for param in f.parameterIterateOutputs(): + c = param.get_element_count() + type_size = (param.size() / c) + + if type_size > 1: + swap_name = self.swap_name( type_size ) + print ' (void) %s( (uint%u_t *) %s, %s );' % (swap_name, 8 * type_size, param.name, answer_count) + + + reply_func = '__glXSendReplySwap' + else: + reply_func = '__glXSendReply' + + print ' %s(cl->client, %s, %s, %u, %s, %s);' % (reply_func, answer_string, answer_count, type_size, is_array_string, retval_string) + #elif f.note_unflushed: + # print ' cx->hasUnflushedCommands = GL_TRUE;' + + print ' error = Success;' + print ' }' + print '' + print ' return error;' + return + + + def printRenderFunction(self, f): + # There are 4 distinct phases in a rendering dispatch function. + # In the first phase we compute the sizes and offsets of each + # element in the command. In the second phase we (optionally) + # re-align 64-bit data elements. In the third phase we + # (optionally) byte-swap array data. Finally, in the fourth + # phase we actually dispatch the function. + + self.common_func_print_just_start(f, "") + + images = f.get_images() + if len(images): + if self.do_swap: + pre = "bswap_CARD32( & " + post = " )" + else: + pre = "" + post = "" + + img = images[0] + + # swapBytes and lsbFirst are single byte fields, so + # the must NEVER be byte-swapped. + + if not (img.img_type == "GL_BITMAP" and img.img_format == "GL_COLOR_INDEX"): + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );' + + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst) );' + + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, (GLint) %shdr->rowLength%s) );' % (pre, post) + if img.depth: + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_IMAGE_HEIGHT, (GLint) %shdr->imageHeight%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, (GLint) %shdr->skipRows%s) );' % (pre, post) + if img.depth: + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_IMAGES, (GLint) %shdr->skipImages%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, (GLint) %shdr->skipPixels%s) );' % (pre, post) + print ' CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, (GLint) %shdr->alignment%s) );' % (pre, post) + print '' + + + self.emit_function_call(f, "", "") + return + + +if __name__ == '__main__': + file_name = "gl_API.xml" + + try: + (args, trail) = getopt.getopt(sys.argv[1:], "f:m:s") + except Exception,e: + show_usage() + + mode = "dispatch_c" + do_swap = 0 + for (arg,val) in args: + if arg == "-f": + file_name = val + elif arg == "-m": + mode = val + elif arg == "-s": + do_swap = 1 + + if mode == "dispatch_c": + printer = PrintGlxDispatchFunctions(do_swap) + elif mode == "dispatch_h": + printer = PrintGlxDispatch_h() + else: + show_usage() + + api = gl_XML.parse_GL_API( file_name, glX_proto_common.glx_proto_item_factory() ) + + printer.Print( api ) diff --git a/src/mesa/glapi/glX_proto_send.py b/src/mesa/glapi/glX_proto_send.py index 53a97959182..3fa665dbcec 100644 --- a/src/mesa/glapi/glX_proto_send.py +++ b/src/mesa/glapi/glX_proto_send.py @@ -879,7 +879,7 @@ __GLapi * __glXNewIndirectAPI( void ) if first: print '' if show_num: - print ' /* % 3u. %s */' % (cat_num, cat_name) + print ' /* %3u. %s */' % (cat_num, cat_name) else: print ' /* %s */' % (cat_name) print '' diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index e473f1d5a42..9fb99e381a4 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -10447,8 +10447,8 @@ <function name="GenProgramsNV" offset="582"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="GLuint *" output="true" count="n"/> - <glx vendorpriv="1295"/> - </function> + <glx vendorpriv="1295" always_array="true"/> + </function> <!-- This isn't 100% correct. Currently, the only valid value of pname is GL_PROGRAM_PARAMETER_NV, and the count for that pname is always @@ -11498,4 +11498,23 @@ </function> </category> +<category name="GL_EXT_framebuffer_blit" number="316"> + <enum name="GL_READ_FRAMEBUFFER_EXT" value="0x8CA8"/> + <enum name="GL_DRAW_FRAMEBUFFER_EXT" value="0x8CA9"/> + <enum name="GL_DRAW_FRAMEBUFFER_BINDING_EXT" value="0x8CA6"/> + <enum name="GL_READ_FRAMEBUFFER_BINDING_EXT" value="0x8CAA"/> + <function name="BlitFramebufferEXT" offset="818"> + <param name="srcX0" type="GLint"/> + <param name="srcY0" type="GLint"/> + <param name="srcX1" type="GLint"/> + <param name="srcY1" type="GLint"/> + <param name="dstX0" type="GLint"/> + <param name="dstY0" type="GLint"/> + <param name="dstX1" type="GLint"/> + <param name="dstY1" type="GLint"/> + <param name="mask" type="GLbitfield"/> + <param name="filter" type="GLenum"/> + </function> +</category> + </OpenGLAPI> diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py index 33d621dcd6f..e8c0576fd9b 100644 --- a/src/mesa/glapi/gl_enums.py +++ b/src/mesa/glapi/gl_enums.py @@ -161,7 +161,7 @@ int _mesa_lookup_enum_by_name( const char *symbol ) print 'static const enum_elt all_enums[%u] =' % (len(name_table)) print '{' for [name, enum] in name_table: - print ' { % 5u, 0x%08X }, /* %s */' % (string_offsets[name], enum, name) + print ' { %5u, 0x%08X }, /* %s */' % (string_offsets[name], enum, name) print '};' print '' @@ -174,7 +174,7 @@ int _mesa_lookup_enum_by_name( const char *symbol ) else: i = name_table.index( [name, enum] ) - print ' % 4u, /* %s */' % (i, name) + print ' %4u, /* %s */' % (i, name) print '};' diff --git a/src/mesa/glapi/gl_procs.py b/src/mesa/glapi/gl_procs.py index 1ad683de5c7..76131b83a0b 100644 --- a/src/mesa/glapi/gl_procs.py +++ b/src/mesa/glapi/gl_procs.py @@ -113,7 +113,7 @@ class PrintGlProcs(gl_XML.gl_print_base): print 'static const glprocs_table_t static_functions[] = {' for (offset, disp_name, real_name) in table: - print ' NAME_FUNC_OFFSET( % 5u, gl%s, _gloffset_%s ),' % (offset, disp_name, real_name) + print ' NAME_FUNC_OFFSET( %5u, gl%s, _gloffset_%s ),' % (offset, disp_name, real_name) print ' NAME_FUNC_OFFSET( -1, NULL, 0 )' print '};' diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h index 40ccd3af02d..dfa927f7b24 100644 --- a/src/mesa/glapi/glapioffsets.h +++ b/src/mesa/glapi/glapioffsets.h @@ -850,7 +850,8 @@ #define _gloffset_StencilMaskSeparate 815 #define _gloffset_GetQueryObjecti64vEXT 816 #define _gloffset_GetQueryObjectui64vEXT 817 -#define _gloffset_FIRST_DYNAMIC 818 +#define _gloffset_BlitFramebufferEXT 818 +#define _gloffset_FIRST_DYNAMIC 819 #else @@ -1264,6 +1265,7 @@ #define _gloffset_StencilMaskSeparate driDispatchRemapTable[StencilMaskSeparate_remap_index] #define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index] #define _gloffset_GetQueryObjectui64vEXT driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index] +#define _gloffset_BlitFramebufferEXT driDispatchRemapTable[BlitFramebufferEXT_remap_index] #endif /* !defined(IN_DRI_DRIVER) */ diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 1524e2aa8a8..c672e7e40d7 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -855,6 +855,7 @@ struct _glapi_table void (GLAPIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask); /* 815 */ void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 816 */ void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 817 */ + void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 818 */ }; #endif /* !defined( _GLAPI_TABLE_H_ ) */ diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index d473774703b..a4494099e37 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -5050,6 +5050,11 @@ KEYWORD1 void KEYWORD2 NAME(GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLu DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params)); } +KEYWORD1 void KEYWORD2 NAME(BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) +{ + DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)); +} + #endif /* defined( NAME ) */ @@ -5882,6 +5887,7 @@ static _glapi_proc DISPATCH_TABLE_NAME[] = { TABLE_ENTRY(StencilMaskSeparate), TABLE_ENTRY(GetQueryObjecti64vEXT), TABLE_ENTRY(GetQueryObjectui64vEXT), + TABLE_ENTRY(BlitFramebufferEXT), /* A whole bunch of no-op functions. These might be called * when someone tries to call a dynamically-registered * extension function without a current rendering context. diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h index b8d175abf40..b41c4185613 100644 --- a/src/mesa/glapi/glprocs.h +++ b/src/mesa/glapi/glprocs.h @@ -864,6 +864,7 @@ static const char gl_string_table[] = "glStencilMaskSeparate\0" "glGetQueryObjecti64vEXT\0" "glGetQueryObjectui64vEXT\0" + "glBlitFramebufferEXT\0" "glArrayElementEXT\0" "glBindTextureEXT\0" "glDrawArraysEXT\0" @@ -1863,184 +1864,185 @@ static const glprocs_table_t static_functions[] = { NAME_FUNC_OFFSET( 14649, glStencilMaskSeparate, _gloffset_StencilMaskSeparate ), NAME_FUNC_OFFSET( 14671, glGetQueryObjecti64vEXT, _gloffset_GetQueryObjecti64vEXT ), NAME_FUNC_OFFSET( 14695, glGetQueryObjectui64vEXT, _gloffset_GetQueryObjectui64vEXT ), - NAME_FUNC_OFFSET( 14720, glArrayElementEXT, _gloffset_ArrayElement ), - NAME_FUNC_OFFSET( 14738, glBindTextureEXT, _gloffset_BindTexture ), - NAME_FUNC_OFFSET( 14755, glDrawArraysEXT, _gloffset_DrawArrays ), - NAME_FUNC_OFFSET( 14771, glCopyTexImage1DEXT, _gloffset_CopyTexImage1D ), - NAME_FUNC_OFFSET( 14791, glCopyTexImage2DEXT, _gloffset_CopyTexImage2D ), - NAME_FUNC_OFFSET( 14811, glCopyTexSubImage1DEXT, _gloffset_CopyTexSubImage1D ), - NAME_FUNC_OFFSET( 14834, glCopyTexSubImage2DEXT, _gloffset_CopyTexSubImage2D ), - NAME_FUNC_OFFSET( 14857, glDeleteTexturesEXT, _gloffset_DeleteTextures ), - NAME_FUNC_OFFSET( 14877, glGetPointervEXT, _gloffset_GetPointerv ), - NAME_FUNC_OFFSET( 14894, glPrioritizeTexturesEXT, _gloffset_PrioritizeTextures ), - NAME_FUNC_OFFSET( 14918, glTexSubImage1DEXT, _gloffset_TexSubImage1D ), - NAME_FUNC_OFFSET( 14937, glTexSubImage2DEXT, _gloffset_TexSubImage2D ), - NAME_FUNC_OFFSET( 14956, glBlendColorEXT, _gloffset_BlendColor ), - NAME_FUNC_OFFSET( 14972, glBlendEquationEXT, _gloffset_BlendEquation ), - NAME_FUNC_OFFSET( 14991, glDrawRangeElementsEXT, _gloffset_DrawRangeElements ), - NAME_FUNC_OFFSET( 15014, glColorTableSGI, _gloffset_ColorTable ), - NAME_FUNC_OFFSET( 15030, glColorTableEXT, _gloffset_ColorTable ), - NAME_FUNC_OFFSET( 15046, glColorTableParameterfvSGI, _gloffset_ColorTableParameterfv ), - NAME_FUNC_OFFSET( 15073, glColorTableParameterivSGI, _gloffset_ColorTableParameteriv ), - NAME_FUNC_OFFSET( 15100, glCopyColorTableSGI, _gloffset_CopyColorTable ), - NAME_FUNC_OFFSET( 15120, glColorSubTableEXT, _gloffset_ColorSubTable ), - NAME_FUNC_OFFSET( 15139, glCopyColorSubTableEXT, _gloffset_CopyColorSubTable ), - NAME_FUNC_OFFSET( 15162, glConvolutionFilter1DEXT, _gloffset_ConvolutionFilter1D ), - NAME_FUNC_OFFSET( 15187, glConvolutionFilter2DEXT, _gloffset_ConvolutionFilter2D ), - NAME_FUNC_OFFSET( 15212, glConvolutionParameterfEXT, _gloffset_ConvolutionParameterf ), - NAME_FUNC_OFFSET( 15239, glConvolutionParameterfvEXT, _gloffset_ConvolutionParameterfv ), - NAME_FUNC_OFFSET( 15267, glConvolutionParameteriEXT, _gloffset_ConvolutionParameteri ), - NAME_FUNC_OFFSET( 15294, glConvolutionParameterivEXT, _gloffset_ConvolutionParameteriv ), - NAME_FUNC_OFFSET( 15322, glCopyConvolutionFilter1DEXT, _gloffset_CopyConvolutionFilter1D ), - NAME_FUNC_OFFSET( 15351, glCopyConvolutionFilter2DEXT, _gloffset_CopyConvolutionFilter2D ), - NAME_FUNC_OFFSET( 15380, glSeparableFilter2DEXT, _gloffset_SeparableFilter2D ), - NAME_FUNC_OFFSET( 15403, glHistogramEXT, _gloffset_Histogram ), - NAME_FUNC_OFFSET( 15418, glMinmaxEXT, _gloffset_Minmax ), - NAME_FUNC_OFFSET( 15430, glResetHistogramEXT, _gloffset_ResetHistogram ), - NAME_FUNC_OFFSET( 15450, glResetMinmaxEXT, _gloffset_ResetMinmax ), - NAME_FUNC_OFFSET( 15467, glTexImage3DEXT, _gloffset_TexImage3D ), - NAME_FUNC_OFFSET( 15483, glTexSubImage3DEXT, _gloffset_TexSubImage3D ), - NAME_FUNC_OFFSET( 15502, glCopyTexSubImage3DEXT, _gloffset_CopyTexSubImage3D ), - NAME_FUNC_OFFSET( 15525, glActiveTexture, _gloffset_ActiveTextureARB ), - NAME_FUNC_OFFSET( 15541, glClientActiveTexture, _gloffset_ClientActiveTextureARB ), - NAME_FUNC_OFFSET( 15563, glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB ), - NAME_FUNC_OFFSET( 15581, glMultiTexCoord1dv, _gloffset_MultiTexCoord1dvARB ), - NAME_FUNC_OFFSET( 15600, glMultiTexCoord1f, _gloffset_MultiTexCoord1fARB ), - NAME_FUNC_OFFSET( 15618, glMultiTexCoord1fv, _gloffset_MultiTexCoord1fvARB ), - NAME_FUNC_OFFSET( 15637, glMultiTexCoord1i, _gloffset_MultiTexCoord1iARB ), - NAME_FUNC_OFFSET( 15655, glMultiTexCoord1iv, _gloffset_MultiTexCoord1ivARB ), - NAME_FUNC_OFFSET( 15674, glMultiTexCoord1s, _gloffset_MultiTexCoord1sARB ), - NAME_FUNC_OFFSET( 15692, glMultiTexCoord1sv, _gloffset_MultiTexCoord1svARB ), - NAME_FUNC_OFFSET( 15711, glMultiTexCoord2d, _gloffset_MultiTexCoord2dARB ), - NAME_FUNC_OFFSET( 15729, glMultiTexCoord2dv, _gloffset_MultiTexCoord2dvARB ), - NAME_FUNC_OFFSET( 15748, glMultiTexCoord2f, _gloffset_MultiTexCoord2fARB ), - NAME_FUNC_OFFSET( 15766, glMultiTexCoord2fv, _gloffset_MultiTexCoord2fvARB ), - NAME_FUNC_OFFSET( 15785, glMultiTexCoord2i, _gloffset_MultiTexCoord2iARB ), - NAME_FUNC_OFFSET( 15803, glMultiTexCoord2iv, _gloffset_MultiTexCoord2ivARB ), - NAME_FUNC_OFFSET( 15822, glMultiTexCoord2s, _gloffset_MultiTexCoord2sARB ), - NAME_FUNC_OFFSET( 15840, glMultiTexCoord2sv, _gloffset_MultiTexCoord2svARB ), - NAME_FUNC_OFFSET( 15859, glMultiTexCoord3d, _gloffset_MultiTexCoord3dARB ), - NAME_FUNC_OFFSET( 15877, glMultiTexCoord3dv, _gloffset_MultiTexCoord3dvARB ), - NAME_FUNC_OFFSET( 15896, glMultiTexCoord3f, _gloffset_MultiTexCoord3fARB ), - NAME_FUNC_OFFSET( 15914, glMultiTexCoord3fv, _gloffset_MultiTexCoord3fvARB ), - NAME_FUNC_OFFSET( 15933, glMultiTexCoord3i, _gloffset_MultiTexCoord3iARB ), - NAME_FUNC_OFFSET( 15951, glMultiTexCoord3iv, _gloffset_MultiTexCoord3ivARB ), - NAME_FUNC_OFFSET( 15970, glMultiTexCoord3s, _gloffset_MultiTexCoord3sARB ), - NAME_FUNC_OFFSET( 15988, glMultiTexCoord3sv, _gloffset_MultiTexCoord3svARB ), - NAME_FUNC_OFFSET( 16007, glMultiTexCoord4d, _gloffset_MultiTexCoord4dARB ), - NAME_FUNC_OFFSET( 16025, glMultiTexCoord4dv, _gloffset_MultiTexCoord4dvARB ), - NAME_FUNC_OFFSET( 16044, glMultiTexCoord4f, _gloffset_MultiTexCoord4fARB ), - NAME_FUNC_OFFSET( 16062, glMultiTexCoord4fv, _gloffset_MultiTexCoord4fvARB ), - NAME_FUNC_OFFSET( 16081, glMultiTexCoord4i, _gloffset_MultiTexCoord4iARB ), - NAME_FUNC_OFFSET( 16099, glMultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB ), - NAME_FUNC_OFFSET( 16118, glMultiTexCoord4s, _gloffset_MultiTexCoord4sARB ), - NAME_FUNC_OFFSET( 16136, glMultiTexCoord4sv, _gloffset_MultiTexCoord4svARB ), - NAME_FUNC_OFFSET( 16155, glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB ), - NAME_FUNC_OFFSET( 16178, glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB ), - NAME_FUNC_OFFSET( 16201, glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB ), - NAME_FUNC_OFFSET( 16224, glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB ), - NAME_FUNC_OFFSET( 16247, glSampleCoverage, _gloffset_SampleCoverageARB ), - NAME_FUNC_OFFSET( 16264, glDrawBuffersATI, _gloffset_DrawBuffersARB ), - NAME_FUNC_OFFSET( 16281, glSampleMaskEXT, _gloffset_SampleMaskSGIS ), - NAME_FUNC_OFFSET( 16297, glSamplePatternEXT, _gloffset_SamplePatternSGIS ), - NAME_FUNC_OFFSET( 16316, glPointParameterf, _gloffset_PointParameterfEXT ), - NAME_FUNC_OFFSET( 16334, glPointParameterfARB, _gloffset_PointParameterfEXT ), - NAME_FUNC_OFFSET( 16355, glPointParameterfSGIS, _gloffset_PointParameterfEXT ), - NAME_FUNC_OFFSET( 16377, glPointParameterfv, _gloffset_PointParameterfvEXT ), - NAME_FUNC_OFFSET( 16396, glPointParameterfvARB, _gloffset_PointParameterfvEXT ), - NAME_FUNC_OFFSET( 16418, glPointParameterfvSGIS, _gloffset_PointParameterfvEXT ), - NAME_FUNC_OFFSET( 16441, glWindowPos2d, _gloffset_WindowPos2dMESA ), - NAME_FUNC_OFFSET( 16455, glWindowPos2dARB, _gloffset_WindowPos2dMESA ), - NAME_FUNC_OFFSET( 16472, glWindowPos2dv, _gloffset_WindowPos2dvMESA ), - NAME_FUNC_OFFSET( 16487, glWindowPos2dvARB, _gloffset_WindowPos2dvMESA ), - NAME_FUNC_OFFSET( 16505, glWindowPos2f, _gloffset_WindowPos2fMESA ), - NAME_FUNC_OFFSET( 16519, glWindowPos2fARB, _gloffset_WindowPos2fMESA ), - NAME_FUNC_OFFSET( 16536, glWindowPos2fv, _gloffset_WindowPos2fvMESA ), - NAME_FUNC_OFFSET( 16551, glWindowPos2fvARB, _gloffset_WindowPos2fvMESA ), - NAME_FUNC_OFFSET( 16569, glWindowPos2i, _gloffset_WindowPos2iMESA ), - NAME_FUNC_OFFSET( 16583, glWindowPos2iARB, _gloffset_WindowPos2iMESA ), - NAME_FUNC_OFFSET( 16600, glWindowPos2iv, _gloffset_WindowPos2ivMESA ), - NAME_FUNC_OFFSET( 16615, glWindowPos2ivARB, _gloffset_WindowPos2ivMESA ), - NAME_FUNC_OFFSET( 16633, glWindowPos2s, _gloffset_WindowPos2sMESA ), - NAME_FUNC_OFFSET( 16647, glWindowPos2sARB, _gloffset_WindowPos2sMESA ), - NAME_FUNC_OFFSET( 16664, glWindowPos2sv, _gloffset_WindowPos2svMESA ), - NAME_FUNC_OFFSET( 16679, glWindowPos2svARB, _gloffset_WindowPos2svMESA ), - NAME_FUNC_OFFSET( 16697, glWindowPos3d, _gloffset_WindowPos3dMESA ), - NAME_FUNC_OFFSET( 16711, glWindowPos3dARB, _gloffset_WindowPos3dMESA ), - NAME_FUNC_OFFSET( 16728, glWindowPos3dv, _gloffset_WindowPos3dvMESA ), - NAME_FUNC_OFFSET( 16743, glWindowPos3dvARB, _gloffset_WindowPos3dvMESA ), - NAME_FUNC_OFFSET( 16761, glWindowPos3f, _gloffset_WindowPos3fMESA ), - NAME_FUNC_OFFSET( 16775, glWindowPos3fARB, _gloffset_WindowPos3fMESA ), - NAME_FUNC_OFFSET( 16792, glWindowPos3fv, _gloffset_WindowPos3fvMESA ), - NAME_FUNC_OFFSET( 16807, glWindowPos3fvARB, _gloffset_WindowPos3fvMESA ), - NAME_FUNC_OFFSET( 16825, glWindowPos3i, _gloffset_WindowPos3iMESA ), - NAME_FUNC_OFFSET( 16839, glWindowPos3iARB, _gloffset_WindowPos3iMESA ), - NAME_FUNC_OFFSET( 16856, glWindowPos3iv, _gloffset_WindowPos3ivMESA ), - NAME_FUNC_OFFSET( 16871, glWindowPos3ivARB, _gloffset_WindowPos3ivMESA ), - NAME_FUNC_OFFSET( 16889, glWindowPos3s, _gloffset_WindowPos3sMESA ), - NAME_FUNC_OFFSET( 16903, glWindowPos3sARB, _gloffset_WindowPos3sMESA ), - NAME_FUNC_OFFSET( 16920, glWindowPos3sv, _gloffset_WindowPos3svMESA ), - NAME_FUNC_OFFSET( 16935, glWindowPos3svARB, _gloffset_WindowPos3svMESA ), - NAME_FUNC_OFFSET( 16953, glBlendFuncSeparate, _gloffset_BlendFuncSeparateEXT ), - NAME_FUNC_OFFSET( 16973, glBlendFuncSeparateINGR, _gloffset_BlendFuncSeparateEXT ), - NAME_FUNC_OFFSET( 16997, glFogCoordf, _gloffset_FogCoordfEXT ), - NAME_FUNC_OFFSET( 17009, glFogCoordfv, _gloffset_FogCoordfvEXT ), - NAME_FUNC_OFFSET( 17022, glFogCoordd, _gloffset_FogCoorddEXT ), - NAME_FUNC_OFFSET( 17034, glFogCoorddv, _gloffset_FogCoorddvEXT ), - NAME_FUNC_OFFSET( 17047, glFogCoordPointer, _gloffset_FogCoordPointerEXT ), - NAME_FUNC_OFFSET( 17065, glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB ), - NAME_FUNC_OFFSET( 17088, glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB ), - NAME_FUNC_OFFSET( 17111, glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB ), - NAME_FUNC_OFFSET( 17134, glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3DARB ), - NAME_FUNC_OFFSET( 17160, glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2DARB ), - NAME_FUNC_OFFSET( 17186, glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1DARB ), - NAME_FUNC_OFFSET( 17212, glGetCompressedTexImage, _gloffset_GetCompressedTexImageARB ), - NAME_FUNC_OFFSET( 17236, glSecondaryColor3b, _gloffset_SecondaryColor3bEXT ), - NAME_FUNC_OFFSET( 17255, glSecondaryColor3bv, _gloffset_SecondaryColor3bvEXT ), - NAME_FUNC_OFFSET( 17275, glSecondaryColor3d, _gloffset_SecondaryColor3dEXT ), - NAME_FUNC_OFFSET( 17294, glSecondaryColor3dv, _gloffset_SecondaryColor3dvEXT ), - NAME_FUNC_OFFSET( 17314, glSecondaryColor3f, _gloffset_SecondaryColor3fEXT ), - NAME_FUNC_OFFSET( 17333, glSecondaryColor3fv, _gloffset_SecondaryColor3fvEXT ), - NAME_FUNC_OFFSET( 17353, glSecondaryColor3i, _gloffset_SecondaryColor3iEXT ), - NAME_FUNC_OFFSET( 17372, glSecondaryColor3iv, _gloffset_SecondaryColor3ivEXT ), - NAME_FUNC_OFFSET( 17392, glSecondaryColor3s, _gloffset_SecondaryColor3sEXT ), - NAME_FUNC_OFFSET( 17411, glSecondaryColor3sv, _gloffset_SecondaryColor3svEXT ), - NAME_FUNC_OFFSET( 17431, glSecondaryColor3ub, _gloffset_SecondaryColor3ubEXT ), - NAME_FUNC_OFFSET( 17451, glSecondaryColor3ubv, _gloffset_SecondaryColor3ubvEXT ), - NAME_FUNC_OFFSET( 17472, glSecondaryColor3ui, _gloffset_SecondaryColor3uiEXT ), - NAME_FUNC_OFFSET( 17492, glSecondaryColor3uiv, _gloffset_SecondaryColor3uivEXT ), - NAME_FUNC_OFFSET( 17513, glSecondaryColor3us, _gloffset_SecondaryColor3usEXT ), - NAME_FUNC_OFFSET( 17533, glSecondaryColor3usv, _gloffset_SecondaryColor3usvEXT ), - NAME_FUNC_OFFSET( 17554, glSecondaryColorPointer, _gloffset_SecondaryColorPointerEXT ), - NAME_FUNC_OFFSET( 17578, glBindProgramARB, _gloffset_BindProgramNV ), - NAME_FUNC_OFFSET( 17595, glDeleteProgramsARB, _gloffset_DeleteProgramsNV ), - NAME_FUNC_OFFSET( 17615, glGenProgramsARB, _gloffset_GenProgramsNV ), - NAME_FUNC_OFFSET( 17632, glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervNV ), - NAME_FUNC_OFFSET( 17661, glIsProgramARB, _gloffset_IsProgramNV ), - NAME_FUNC_OFFSET( 17676, glPointParameteri, _gloffset_PointParameteriNV ), - NAME_FUNC_OFFSET( 17694, glPointParameteriv, _gloffset_PointParameterivNV ), - NAME_FUNC_OFFSET( 17713, glMultiDrawArrays, _gloffset_MultiDrawArraysEXT ), - NAME_FUNC_OFFSET( 17731, glMultiDrawElements, _gloffset_MultiDrawElementsEXT ), - NAME_FUNC_OFFSET( 17751, glBindBuffer, _gloffset_BindBufferARB ), - NAME_FUNC_OFFSET( 17764, glBufferData, _gloffset_BufferDataARB ), - NAME_FUNC_OFFSET( 17777, glBufferSubData, _gloffset_BufferSubDataARB ), - NAME_FUNC_OFFSET( 17793, glDeleteBuffers, _gloffset_DeleteBuffersARB ), - NAME_FUNC_OFFSET( 17809, glGenBuffers, _gloffset_GenBuffersARB ), - NAME_FUNC_OFFSET( 17822, glGetBufferParameteriv, _gloffset_GetBufferParameterivARB ), - NAME_FUNC_OFFSET( 17845, glGetBufferPointerv, _gloffset_GetBufferPointervARB ), - NAME_FUNC_OFFSET( 17865, glGetBufferSubData, _gloffset_GetBufferSubDataARB ), - NAME_FUNC_OFFSET( 17884, glIsBuffer, _gloffset_IsBufferARB ), - NAME_FUNC_OFFSET( 17895, glMapBuffer, _gloffset_MapBufferARB ), - NAME_FUNC_OFFSET( 17907, glUnmapBuffer, _gloffset_UnmapBufferARB ), - NAME_FUNC_OFFSET( 17921, glGenQueries, _gloffset_GenQueriesARB ), - NAME_FUNC_OFFSET( 17934, glDeleteQueries, _gloffset_DeleteQueriesARB ), - NAME_FUNC_OFFSET( 17950, glIsQuery, _gloffset_IsQueryARB ), - NAME_FUNC_OFFSET( 17960, glBeginQuery, _gloffset_BeginQueryARB ), - NAME_FUNC_OFFSET( 17973, glEndQuery, _gloffset_EndQueryARB ), - NAME_FUNC_OFFSET( 17984, glGetQueryiv, _gloffset_GetQueryivARB ), - NAME_FUNC_OFFSET( 17997, glGetQueryObjectiv, _gloffset_GetQueryObjectivARB ), - NAME_FUNC_OFFSET( 18016, glGetQueryObjectuiv, _gloffset_GetQueryObjectuivARB ), - NAME_FUNC_OFFSET( 18036, glBlendEquationSeparateATI, _gloffset_BlendEquationSeparateEXT ), + NAME_FUNC_OFFSET( 14720, glBlitFramebufferEXT, _gloffset_BlitFramebufferEXT ), + NAME_FUNC_OFFSET( 14741, glArrayElementEXT, _gloffset_ArrayElement ), + NAME_FUNC_OFFSET( 14759, glBindTextureEXT, _gloffset_BindTexture ), + NAME_FUNC_OFFSET( 14776, glDrawArraysEXT, _gloffset_DrawArrays ), + NAME_FUNC_OFFSET( 14792, glCopyTexImage1DEXT, _gloffset_CopyTexImage1D ), + NAME_FUNC_OFFSET( 14812, glCopyTexImage2DEXT, _gloffset_CopyTexImage2D ), + NAME_FUNC_OFFSET( 14832, glCopyTexSubImage1DEXT, _gloffset_CopyTexSubImage1D ), + NAME_FUNC_OFFSET( 14855, glCopyTexSubImage2DEXT, _gloffset_CopyTexSubImage2D ), + NAME_FUNC_OFFSET( 14878, glDeleteTexturesEXT, _gloffset_DeleteTextures ), + NAME_FUNC_OFFSET( 14898, glGetPointervEXT, _gloffset_GetPointerv ), + NAME_FUNC_OFFSET( 14915, glPrioritizeTexturesEXT, _gloffset_PrioritizeTextures ), + NAME_FUNC_OFFSET( 14939, glTexSubImage1DEXT, _gloffset_TexSubImage1D ), + NAME_FUNC_OFFSET( 14958, glTexSubImage2DEXT, _gloffset_TexSubImage2D ), + NAME_FUNC_OFFSET( 14977, glBlendColorEXT, _gloffset_BlendColor ), + NAME_FUNC_OFFSET( 14993, glBlendEquationEXT, _gloffset_BlendEquation ), + NAME_FUNC_OFFSET( 15012, glDrawRangeElementsEXT, _gloffset_DrawRangeElements ), + NAME_FUNC_OFFSET( 15035, glColorTableSGI, _gloffset_ColorTable ), + NAME_FUNC_OFFSET( 15051, glColorTableEXT, _gloffset_ColorTable ), + NAME_FUNC_OFFSET( 15067, glColorTableParameterfvSGI, _gloffset_ColorTableParameterfv ), + NAME_FUNC_OFFSET( 15094, glColorTableParameterivSGI, _gloffset_ColorTableParameteriv ), + NAME_FUNC_OFFSET( 15121, glCopyColorTableSGI, _gloffset_CopyColorTable ), + NAME_FUNC_OFFSET( 15141, glColorSubTableEXT, _gloffset_ColorSubTable ), + NAME_FUNC_OFFSET( 15160, glCopyColorSubTableEXT, _gloffset_CopyColorSubTable ), + NAME_FUNC_OFFSET( 15183, glConvolutionFilter1DEXT, _gloffset_ConvolutionFilter1D ), + NAME_FUNC_OFFSET( 15208, glConvolutionFilter2DEXT, _gloffset_ConvolutionFilter2D ), + NAME_FUNC_OFFSET( 15233, glConvolutionParameterfEXT, _gloffset_ConvolutionParameterf ), + NAME_FUNC_OFFSET( 15260, glConvolutionParameterfvEXT, _gloffset_ConvolutionParameterfv ), + NAME_FUNC_OFFSET( 15288, glConvolutionParameteriEXT, _gloffset_ConvolutionParameteri ), + NAME_FUNC_OFFSET( 15315, glConvolutionParameterivEXT, _gloffset_ConvolutionParameteriv ), + NAME_FUNC_OFFSET( 15343, glCopyConvolutionFilter1DEXT, _gloffset_CopyConvolutionFilter1D ), + NAME_FUNC_OFFSET( 15372, glCopyConvolutionFilter2DEXT, _gloffset_CopyConvolutionFilter2D ), + NAME_FUNC_OFFSET( 15401, glSeparableFilter2DEXT, _gloffset_SeparableFilter2D ), + NAME_FUNC_OFFSET( 15424, glHistogramEXT, _gloffset_Histogram ), + NAME_FUNC_OFFSET( 15439, glMinmaxEXT, _gloffset_Minmax ), + NAME_FUNC_OFFSET( 15451, glResetHistogramEXT, _gloffset_ResetHistogram ), + NAME_FUNC_OFFSET( 15471, glResetMinmaxEXT, _gloffset_ResetMinmax ), + NAME_FUNC_OFFSET( 15488, glTexImage3DEXT, _gloffset_TexImage3D ), + NAME_FUNC_OFFSET( 15504, glTexSubImage3DEXT, _gloffset_TexSubImage3D ), + NAME_FUNC_OFFSET( 15523, glCopyTexSubImage3DEXT, _gloffset_CopyTexSubImage3D ), + NAME_FUNC_OFFSET( 15546, glActiveTexture, _gloffset_ActiveTextureARB ), + NAME_FUNC_OFFSET( 15562, glClientActiveTexture, _gloffset_ClientActiveTextureARB ), + NAME_FUNC_OFFSET( 15584, glMultiTexCoord1d, _gloffset_MultiTexCoord1dARB ), + NAME_FUNC_OFFSET( 15602, glMultiTexCoord1dv, _gloffset_MultiTexCoord1dvARB ), + NAME_FUNC_OFFSET( 15621, glMultiTexCoord1f, _gloffset_MultiTexCoord1fARB ), + NAME_FUNC_OFFSET( 15639, glMultiTexCoord1fv, _gloffset_MultiTexCoord1fvARB ), + NAME_FUNC_OFFSET( 15658, glMultiTexCoord1i, _gloffset_MultiTexCoord1iARB ), + NAME_FUNC_OFFSET( 15676, glMultiTexCoord1iv, _gloffset_MultiTexCoord1ivARB ), + NAME_FUNC_OFFSET( 15695, glMultiTexCoord1s, _gloffset_MultiTexCoord1sARB ), + NAME_FUNC_OFFSET( 15713, glMultiTexCoord1sv, _gloffset_MultiTexCoord1svARB ), + NAME_FUNC_OFFSET( 15732, glMultiTexCoord2d, _gloffset_MultiTexCoord2dARB ), + NAME_FUNC_OFFSET( 15750, glMultiTexCoord2dv, _gloffset_MultiTexCoord2dvARB ), + NAME_FUNC_OFFSET( 15769, glMultiTexCoord2f, _gloffset_MultiTexCoord2fARB ), + NAME_FUNC_OFFSET( 15787, glMultiTexCoord2fv, _gloffset_MultiTexCoord2fvARB ), + NAME_FUNC_OFFSET( 15806, glMultiTexCoord2i, _gloffset_MultiTexCoord2iARB ), + NAME_FUNC_OFFSET( 15824, glMultiTexCoord2iv, _gloffset_MultiTexCoord2ivARB ), + NAME_FUNC_OFFSET( 15843, glMultiTexCoord2s, _gloffset_MultiTexCoord2sARB ), + NAME_FUNC_OFFSET( 15861, glMultiTexCoord2sv, _gloffset_MultiTexCoord2svARB ), + NAME_FUNC_OFFSET( 15880, glMultiTexCoord3d, _gloffset_MultiTexCoord3dARB ), + NAME_FUNC_OFFSET( 15898, glMultiTexCoord3dv, _gloffset_MultiTexCoord3dvARB ), + NAME_FUNC_OFFSET( 15917, glMultiTexCoord3f, _gloffset_MultiTexCoord3fARB ), + NAME_FUNC_OFFSET( 15935, glMultiTexCoord3fv, _gloffset_MultiTexCoord3fvARB ), + NAME_FUNC_OFFSET( 15954, glMultiTexCoord3i, _gloffset_MultiTexCoord3iARB ), + NAME_FUNC_OFFSET( 15972, glMultiTexCoord3iv, _gloffset_MultiTexCoord3ivARB ), + NAME_FUNC_OFFSET( 15991, glMultiTexCoord3s, _gloffset_MultiTexCoord3sARB ), + NAME_FUNC_OFFSET( 16009, glMultiTexCoord3sv, _gloffset_MultiTexCoord3svARB ), + NAME_FUNC_OFFSET( 16028, glMultiTexCoord4d, _gloffset_MultiTexCoord4dARB ), + NAME_FUNC_OFFSET( 16046, glMultiTexCoord4dv, _gloffset_MultiTexCoord4dvARB ), + NAME_FUNC_OFFSET( 16065, glMultiTexCoord4f, _gloffset_MultiTexCoord4fARB ), + NAME_FUNC_OFFSET( 16083, glMultiTexCoord4fv, _gloffset_MultiTexCoord4fvARB ), + NAME_FUNC_OFFSET( 16102, glMultiTexCoord4i, _gloffset_MultiTexCoord4iARB ), + NAME_FUNC_OFFSET( 16120, glMultiTexCoord4iv, _gloffset_MultiTexCoord4ivARB ), + NAME_FUNC_OFFSET( 16139, glMultiTexCoord4s, _gloffset_MultiTexCoord4sARB ), + NAME_FUNC_OFFSET( 16157, glMultiTexCoord4sv, _gloffset_MultiTexCoord4svARB ), + NAME_FUNC_OFFSET( 16176, glLoadTransposeMatrixf, _gloffset_LoadTransposeMatrixfARB ), + NAME_FUNC_OFFSET( 16199, glLoadTransposeMatrixd, _gloffset_LoadTransposeMatrixdARB ), + NAME_FUNC_OFFSET( 16222, glMultTransposeMatrixf, _gloffset_MultTransposeMatrixfARB ), + NAME_FUNC_OFFSET( 16245, glMultTransposeMatrixd, _gloffset_MultTransposeMatrixdARB ), + NAME_FUNC_OFFSET( 16268, glSampleCoverage, _gloffset_SampleCoverageARB ), + NAME_FUNC_OFFSET( 16285, glDrawBuffersATI, _gloffset_DrawBuffersARB ), + NAME_FUNC_OFFSET( 16302, glSampleMaskEXT, _gloffset_SampleMaskSGIS ), + NAME_FUNC_OFFSET( 16318, glSamplePatternEXT, _gloffset_SamplePatternSGIS ), + NAME_FUNC_OFFSET( 16337, glPointParameterf, _gloffset_PointParameterfEXT ), + NAME_FUNC_OFFSET( 16355, glPointParameterfARB, _gloffset_PointParameterfEXT ), + NAME_FUNC_OFFSET( 16376, glPointParameterfSGIS, _gloffset_PointParameterfEXT ), + NAME_FUNC_OFFSET( 16398, glPointParameterfv, _gloffset_PointParameterfvEXT ), + NAME_FUNC_OFFSET( 16417, glPointParameterfvARB, _gloffset_PointParameterfvEXT ), + NAME_FUNC_OFFSET( 16439, glPointParameterfvSGIS, _gloffset_PointParameterfvEXT ), + NAME_FUNC_OFFSET( 16462, glWindowPos2d, _gloffset_WindowPos2dMESA ), + NAME_FUNC_OFFSET( 16476, glWindowPos2dARB, _gloffset_WindowPos2dMESA ), + NAME_FUNC_OFFSET( 16493, glWindowPos2dv, _gloffset_WindowPos2dvMESA ), + NAME_FUNC_OFFSET( 16508, glWindowPos2dvARB, _gloffset_WindowPos2dvMESA ), + NAME_FUNC_OFFSET( 16526, glWindowPos2f, _gloffset_WindowPos2fMESA ), + NAME_FUNC_OFFSET( 16540, glWindowPos2fARB, _gloffset_WindowPos2fMESA ), + NAME_FUNC_OFFSET( 16557, glWindowPos2fv, _gloffset_WindowPos2fvMESA ), + NAME_FUNC_OFFSET( 16572, glWindowPos2fvARB, _gloffset_WindowPos2fvMESA ), + NAME_FUNC_OFFSET( 16590, glWindowPos2i, _gloffset_WindowPos2iMESA ), + NAME_FUNC_OFFSET( 16604, glWindowPos2iARB, _gloffset_WindowPos2iMESA ), + NAME_FUNC_OFFSET( 16621, glWindowPos2iv, _gloffset_WindowPos2ivMESA ), + NAME_FUNC_OFFSET( 16636, glWindowPos2ivARB, _gloffset_WindowPos2ivMESA ), + NAME_FUNC_OFFSET( 16654, glWindowPos2s, _gloffset_WindowPos2sMESA ), + NAME_FUNC_OFFSET( 16668, glWindowPos2sARB, _gloffset_WindowPos2sMESA ), + NAME_FUNC_OFFSET( 16685, glWindowPos2sv, _gloffset_WindowPos2svMESA ), + NAME_FUNC_OFFSET( 16700, glWindowPos2svARB, _gloffset_WindowPos2svMESA ), + NAME_FUNC_OFFSET( 16718, glWindowPos3d, _gloffset_WindowPos3dMESA ), + NAME_FUNC_OFFSET( 16732, glWindowPos3dARB, _gloffset_WindowPos3dMESA ), + NAME_FUNC_OFFSET( 16749, glWindowPos3dv, _gloffset_WindowPos3dvMESA ), + NAME_FUNC_OFFSET( 16764, glWindowPos3dvARB, _gloffset_WindowPos3dvMESA ), + NAME_FUNC_OFFSET( 16782, glWindowPos3f, _gloffset_WindowPos3fMESA ), + NAME_FUNC_OFFSET( 16796, glWindowPos3fARB, _gloffset_WindowPos3fMESA ), + NAME_FUNC_OFFSET( 16813, glWindowPos3fv, _gloffset_WindowPos3fvMESA ), + NAME_FUNC_OFFSET( 16828, glWindowPos3fvARB, _gloffset_WindowPos3fvMESA ), + NAME_FUNC_OFFSET( 16846, glWindowPos3i, _gloffset_WindowPos3iMESA ), + NAME_FUNC_OFFSET( 16860, glWindowPos3iARB, _gloffset_WindowPos3iMESA ), + NAME_FUNC_OFFSET( 16877, glWindowPos3iv, _gloffset_WindowPos3ivMESA ), + NAME_FUNC_OFFSET( 16892, glWindowPos3ivARB, _gloffset_WindowPos3ivMESA ), + NAME_FUNC_OFFSET( 16910, glWindowPos3s, _gloffset_WindowPos3sMESA ), + NAME_FUNC_OFFSET( 16924, glWindowPos3sARB, _gloffset_WindowPos3sMESA ), + NAME_FUNC_OFFSET( 16941, glWindowPos3sv, _gloffset_WindowPos3svMESA ), + NAME_FUNC_OFFSET( 16956, glWindowPos3svARB, _gloffset_WindowPos3svMESA ), + NAME_FUNC_OFFSET( 16974, glBlendFuncSeparate, _gloffset_BlendFuncSeparateEXT ), + NAME_FUNC_OFFSET( 16994, glBlendFuncSeparateINGR, _gloffset_BlendFuncSeparateEXT ), + NAME_FUNC_OFFSET( 17018, glFogCoordf, _gloffset_FogCoordfEXT ), + NAME_FUNC_OFFSET( 17030, glFogCoordfv, _gloffset_FogCoordfvEXT ), + NAME_FUNC_OFFSET( 17043, glFogCoordd, _gloffset_FogCoorddEXT ), + NAME_FUNC_OFFSET( 17055, glFogCoorddv, _gloffset_FogCoorddvEXT ), + NAME_FUNC_OFFSET( 17068, glFogCoordPointer, _gloffset_FogCoordPointerEXT ), + NAME_FUNC_OFFSET( 17086, glCompressedTexImage3D, _gloffset_CompressedTexImage3DARB ), + NAME_FUNC_OFFSET( 17109, glCompressedTexImage2D, _gloffset_CompressedTexImage2DARB ), + NAME_FUNC_OFFSET( 17132, glCompressedTexImage1D, _gloffset_CompressedTexImage1DARB ), + NAME_FUNC_OFFSET( 17155, glCompressedTexSubImage3D, _gloffset_CompressedTexSubImage3DARB ), + NAME_FUNC_OFFSET( 17181, glCompressedTexSubImage2D, _gloffset_CompressedTexSubImage2DARB ), + NAME_FUNC_OFFSET( 17207, glCompressedTexSubImage1D, _gloffset_CompressedTexSubImage1DARB ), + NAME_FUNC_OFFSET( 17233, glGetCompressedTexImage, _gloffset_GetCompressedTexImageARB ), + NAME_FUNC_OFFSET( 17257, glSecondaryColor3b, _gloffset_SecondaryColor3bEXT ), + NAME_FUNC_OFFSET( 17276, glSecondaryColor3bv, _gloffset_SecondaryColor3bvEXT ), + NAME_FUNC_OFFSET( 17296, glSecondaryColor3d, _gloffset_SecondaryColor3dEXT ), + NAME_FUNC_OFFSET( 17315, glSecondaryColor3dv, _gloffset_SecondaryColor3dvEXT ), + NAME_FUNC_OFFSET( 17335, glSecondaryColor3f, _gloffset_SecondaryColor3fEXT ), + NAME_FUNC_OFFSET( 17354, glSecondaryColor3fv, _gloffset_SecondaryColor3fvEXT ), + NAME_FUNC_OFFSET( 17374, glSecondaryColor3i, _gloffset_SecondaryColor3iEXT ), + NAME_FUNC_OFFSET( 17393, glSecondaryColor3iv, _gloffset_SecondaryColor3ivEXT ), + NAME_FUNC_OFFSET( 17413, glSecondaryColor3s, _gloffset_SecondaryColor3sEXT ), + NAME_FUNC_OFFSET( 17432, glSecondaryColor3sv, _gloffset_SecondaryColor3svEXT ), + NAME_FUNC_OFFSET( 17452, glSecondaryColor3ub, _gloffset_SecondaryColor3ubEXT ), + NAME_FUNC_OFFSET( 17472, glSecondaryColor3ubv, _gloffset_SecondaryColor3ubvEXT ), + NAME_FUNC_OFFSET( 17493, glSecondaryColor3ui, _gloffset_SecondaryColor3uiEXT ), + NAME_FUNC_OFFSET( 17513, glSecondaryColor3uiv, _gloffset_SecondaryColor3uivEXT ), + NAME_FUNC_OFFSET( 17534, glSecondaryColor3us, _gloffset_SecondaryColor3usEXT ), + NAME_FUNC_OFFSET( 17554, glSecondaryColor3usv, _gloffset_SecondaryColor3usvEXT ), + NAME_FUNC_OFFSET( 17575, glSecondaryColorPointer, _gloffset_SecondaryColorPointerEXT ), + NAME_FUNC_OFFSET( 17599, glBindProgramARB, _gloffset_BindProgramNV ), + NAME_FUNC_OFFSET( 17616, glDeleteProgramsARB, _gloffset_DeleteProgramsNV ), + NAME_FUNC_OFFSET( 17636, glGenProgramsARB, _gloffset_GenProgramsNV ), + NAME_FUNC_OFFSET( 17653, glGetVertexAttribPointervARB, _gloffset_GetVertexAttribPointervNV ), + NAME_FUNC_OFFSET( 17682, glIsProgramARB, _gloffset_IsProgramNV ), + NAME_FUNC_OFFSET( 17697, glPointParameteri, _gloffset_PointParameteriNV ), + NAME_FUNC_OFFSET( 17715, glPointParameteriv, _gloffset_PointParameterivNV ), + NAME_FUNC_OFFSET( 17734, glMultiDrawArrays, _gloffset_MultiDrawArraysEXT ), + NAME_FUNC_OFFSET( 17752, glMultiDrawElements, _gloffset_MultiDrawElementsEXT ), + NAME_FUNC_OFFSET( 17772, glBindBuffer, _gloffset_BindBufferARB ), + NAME_FUNC_OFFSET( 17785, glBufferData, _gloffset_BufferDataARB ), + NAME_FUNC_OFFSET( 17798, glBufferSubData, _gloffset_BufferSubDataARB ), + NAME_FUNC_OFFSET( 17814, glDeleteBuffers, _gloffset_DeleteBuffersARB ), + NAME_FUNC_OFFSET( 17830, glGenBuffers, _gloffset_GenBuffersARB ), + NAME_FUNC_OFFSET( 17843, glGetBufferParameteriv, _gloffset_GetBufferParameterivARB ), + NAME_FUNC_OFFSET( 17866, glGetBufferPointerv, _gloffset_GetBufferPointervARB ), + NAME_FUNC_OFFSET( 17886, glGetBufferSubData, _gloffset_GetBufferSubDataARB ), + NAME_FUNC_OFFSET( 17905, glIsBuffer, _gloffset_IsBufferARB ), + NAME_FUNC_OFFSET( 17916, glMapBuffer, _gloffset_MapBufferARB ), + NAME_FUNC_OFFSET( 17928, glUnmapBuffer, _gloffset_UnmapBufferARB ), + NAME_FUNC_OFFSET( 17942, glGenQueries, _gloffset_GenQueriesARB ), + NAME_FUNC_OFFSET( 17955, glDeleteQueries, _gloffset_DeleteQueriesARB ), + NAME_FUNC_OFFSET( 17971, glIsQuery, _gloffset_IsQueryARB ), + NAME_FUNC_OFFSET( 17981, glBeginQuery, _gloffset_BeginQueryARB ), + NAME_FUNC_OFFSET( 17994, glEndQuery, _gloffset_EndQueryARB ), + NAME_FUNC_OFFSET( 18005, glGetQueryiv, _gloffset_GetQueryivARB ), + NAME_FUNC_OFFSET( 18018, glGetQueryObjectiv, _gloffset_GetQueryObjectivARB ), + NAME_FUNC_OFFSET( 18037, glGetQueryObjectuiv, _gloffset_GetQueryObjectuivARB ), + NAME_FUNC_OFFSET( 18057, glBlendEquationSeparateATI, _gloffset_BlendEquationSeparateEXT ), NAME_FUNC_OFFSET( -1, NULL, 0 ) }; diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py index 24e64ef998b..0c59a46c190 100644 --- a/src/mesa/glapi/mesadef.py +++ b/src/mesa/glapi/mesadef.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: mesadef.py,v 1.3 2005/09/05 14:09:25 kschultz Exp $ +# $Id: mesadef.py,v 1.3.2.1 2006/03/25 23:48:21 brianp Exp $ # Mesa 3-D graphics library # Version: 4.1 @@ -89,6 +89,7 @@ def PrintTail(): print '\twglDescribePixelFormat' print '\twglGetCurrentContext' print '\twglGetCurrentDC' + print '\twglGetExtensionsStringARB' print '\twglGetLayerPaletteEntries' print '\twglGetPixelFormat' print '\twglGetProcAddress' diff --git a/src/mesa/glapi/typeexpr.py b/src/mesa/glapi/typeexpr.py index eface2a521f..8ba7de48627 100644 --- a/src/mesa/glapi/typeexpr.py +++ b/src/mesa/glapi/typeexpr.py @@ -29,20 +29,21 @@ import string, copy class type_node: def __init__(self): - self.pointer = 0 - self.const = 0 - self.signed = 1 - self.integer = 1 + self.pointer = 0 # bool + self.const = 0 # bool + self.signed = 1 # bool + self.integer = 1 # bool # If elements is set to non-zero, then field is an array. self.elements = 0 self.name = None - self.size = 0 + self.size = 0 # type's size in bytes return def string(self): + """Return string representation of this type_node.""" s = "" if self.pointer: @@ -85,16 +86,17 @@ class type_table: def create_initial_types(): tt = type_table() - basic_types = [ ["char", 1, 1], \ - ["short", 2, 1], \ - ["int", 4, 1], \ - ["long", 4, 1], \ - ["float", 4, 0], \ - ["double", 8, 0], \ - ["enum", 4, 1] ] - - - for [type_name, type_size, integer] in basic_types: + basic_types = [ + ("char", 1, 1), + ("short", 2, 1), + ("int", 4, 1), + ("long", 4, 1), + ("float", 4, 0), + ("double", 8, 0), + ("enum", 4, 1) + ] + + for (type_name, type_size, integer) in basic_types: te = type_expression(None) tn = type_node() tn.name = type_name @@ -113,22 +115,24 @@ class type_expression: def __init__(self, type_string, extra_types = None): self.expr = [] - if not type_string: return + if not type_string: + return self.original_string = type_string if not type_expression.built_in_types: raise RuntimeError("create_initial_types must be called before creating type_expression objects.") - - elements = string.split( string.replace( type_string, "*", " * " ) ) + # Replace '*' with ' * ' in type_string. Then, split the string + # into tokens, separated by spaces. + tokens = string.split( string.replace( type_string, "*", " * " ) ) const = 0 t = None signed = 0 unsigned = 0 - for i in elements: + for i in tokens: if i == "const": if t and t.pointer: t.const = 1 diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c index 2f7375bd3a0..a6e422640cf 100644 --- a/src/mesa/main/accum.c +++ b/src/mesa/main/accum.c @@ -76,7 +76,9 @@ _mesa_Accum( GLenum op, GLfloat value ) } if (ctx->DrawBuffer != ctx->ReadBuffer) { - /* See GLX_SGI_make_current_read or WGL_ARB_make_current_read */ + /* See GLX_SGI_make_current_read or WGL_ARB_make_current_read, + * or GL_EXT_framebuffer_blit. + */ _mesa_error(ctx, GL_INVALID_OPERATION, "glAccum(different read/draw buffers)"); return; diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 84df98dc89b..d4c69d25ea8 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -29,10 +29,8 @@ #include "glheader.h" #include "api_arrayelt.h" #include "context.h" -#include "glapi.h" #include "imports.h" #include "macros.h" -#include "mtypes.h" #include "glapioffsets.h" #include "dispatch.h" @@ -145,41 +143,9 @@ static const int NormalFuncs[8] = { _gloffset_Normal3dv, }; -#if defined(IN_DRI_DRIVER) +/* Note: _gloffset_* for these may not be a compile-time constant. */ static int SecondaryColorFuncs[8]; -static int FogCoordFuncs[8] = { - -1, - -1, - -1, - -1, - -1, - -1, - 0, - 0, -}; -#else -static const int SecondaryColorFuncs[8] = { - _gloffset_SecondaryColor3bvEXT, - _gloffset_SecondaryColor3ubvEXT, - _gloffset_SecondaryColor3svEXT, - _gloffset_SecondaryColor3usvEXT, - _gloffset_SecondaryColor3ivEXT, - _gloffset_SecondaryColor3uivEXT, - _gloffset_SecondaryColor3fvEXT, - _gloffset_SecondaryColor3dvEXT, -}; - -static const int FogCoordFuncs[8] = { - -1, - -1, - -1, - -1, - -1, - -1, - _gloffset_FogCoordfvEXT, - _gloffset_FogCoorddvEXT -}; -#endif +static int FogCoordFuncs[8]; /**********************************************************************/ @@ -622,7 +588,7 @@ GLboolean _ae_create_context( GLcontext *ctx ) if (ctx->aelt_context) return GL_TRUE; -#if defined(IN_DRI_DRIVER) + /* These _gloffset_* values may not be compile-time constants */ SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT; SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT; SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT; @@ -632,9 +598,14 @@ GLboolean _ae_create_context( GLcontext *ctx ) SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT; SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT; + FogCoordFuncs[0] = -1; + FogCoordFuncs[1] = -1; + FogCoordFuncs[2] = -1; + FogCoordFuncs[3] = -1; + FogCoordFuncs[4] = -1; + FogCoordFuncs[5] = -1; FogCoordFuncs[6] = _gloffset_FogCoordfvEXT; FogCoordFuncs[7] = _gloffset_FogCoorddvEXT; -#endif ctx->aelt_context = MALLOC( sizeof(AEcontext) ); if (!ctx->aelt_context) @@ -699,7 +670,7 @@ static void _ae_update_state( GLcontext *ctx ) aa++; } for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { - if (ctx->Array.TexCoord[i].Enabled) { + if (ctx->Array.TexCoord[i].Enabled && ctx->Array.TexCoord[i].Ptr) { /* NOTE: we use generic glVertexAttrib functions here. * If we ever de-alias conventional/generic vertex attribs this * will have to change. @@ -714,7 +685,8 @@ static void _ae_update_state( GLcontext *ctx ) /* generic vertex attribute arrays */ for (i = 1; i < VERT_ATTRIB_MAX; i++) { /* skip zero! */ - if (ctx->Array.VertexAttrib[i].Enabled) { + if (ctx->Array.VertexAttrib[i].Enabled && + ctx->Array.VertexAttrib[i].Ptr) { struct gl_client_array *attribArray = &ctx->Array.VertexAttrib[i]; at->array = attribArray; /* Note: we can't grab the _glapi_Dispatch->VertexAttrib1fvNV diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 41119f7937d..2eef7294691 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -533,16 +533,16 @@ pop_enable_group(GLcontext *ctx, const struct gl_enable_attrib *enable) TEST_AND_UPDATE(ctx->Multisample.SampleCoverageInvert, enable->SampleCoverageInvert, GL_SAMPLE_COVERAGE_INVERT_ARB); - /* GL_NV_vertex_program */ + /* GL_ARB_vertex_program, GL_NV_vertex_program */ TEST_AND_UPDATE(ctx->VertexProgram.Enabled, enable->VertexProgram, - GL_VERTEX_PROGRAM_NV); + GL_VERTEX_PROGRAM_ARB); TEST_AND_UPDATE(ctx->VertexProgram.PointSizeEnabled, enable->VertexProgramPointSize, - GL_VERTEX_PROGRAM_POINT_SIZE_NV); + GL_VERTEX_PROGRAM_POINT_SIZE_ARB); TEST_AND_UPDATE(ctx->VertexProgram.TwoSideEnabled, enable->VertexProgramTwoSide, - GL_VERTEX_PROGRAM_TWO_SIDE_NV); + GL_VERTEX_PROGRAM_TWO_SIDE_ARB); #undef TEST_AND_UPDATE diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 4101c9f1ed2..bbefc32804b 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -8,7 +8,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -605,7 +605,7 @@ _glthread_DECLARE_STATIC_MUTEX(OneTimeLock); * and sets the glapi callbacks if the \c MESA_DEBUG environment variable is * defined. * - * \sa _mesa_init_lists(), _math_init(). + * \sa _math_init(). */ static void one_time_init( GLcontext *ctx ) @@ -624,8 +624,6 @@ one_time_init( GLcontext *ctx ) assert( sizeof(GLint) == 4 ); assert( sizeof(GLuint) == 4 ); - _mesa_init_lists(); - #if _HAVE_FULL_GL _math_init(); @@ -845,8 +843,8 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) } _mesa_DeleteHashTable(ss->TexObjects); -#if FEATURE_NV_vertex_program - /* Free vertex programs */ +#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_NV_fragment_program) + /* Free vertex/fragment programs */ while (1) { GLuint prog = _mesa_HashFirstEntry(ss->Programs); if (prog) { @@ -868,15 +866,33 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) #if FEATURE_ARB_fragment_program _mesa_delete_program(ctx, ss->DefaultFragmentProgram); #endif + #if FEATURE_ATI_fragment_shader - _mesa_free(ss->DefaultFragmentShader); + /* Free ATI fragment shaders */ + while (1) { + GLuint prog = _mesa_HashFirstEntry(ss->ATIShaders); + if (prog) { + struct ati_fragment_shader *s = (struct ati_fragment_shader *) + _mesa_HashLookup(ss->ATIShaders, prog); + ASSERT(s); + _mesa_delete_ati_fragment_shader(ctx, s); + _mesa_HashRemove(ss->ATIShaders, prog); + } + else { + break; + } + } + _mesa_DeleteHashTable(ss->ATIShaders); + _mesa_delete_ati_fragment_shader(ctx, ss->DefaultFragmentShader); #endif #if FEATURE_ARB_vertex_buffer_object _mesa_DeleteHashTable(ss->BufferObjects); #endif +#if FEATURE_ARB_shader_objects _mesa_DeleteHashTable (ss->GL2Objects); +#endif #if FEATURE_EXT_framebuffer_object _mesa_DeleteHashTable(ss->FrameBuffers); @@ -1404,7 +1420,7 @@ _mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask ) if (mask & GL_LIGHTING_BIT) { GLuint i; /* begin with memcpy */ - MEMCPY( &dst->Light, &src->Light, sizeof(struct gl_light) ); + dst->Light = src->Light; /* fixup linked lists to prevent pointer insanity */ make_empty_list( &(dst->Light.EnabledList) ); for (i = 0; i < MAX_LIGHTS; i++) { @@ -1479,6 +1495,11 @@ _mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask ) /** * Check if the given context can render into the given framebuffer * by checking visual attributes. + * + * XXX this may go away someday because we're moving toward more freedom + * in binding contexts to drawables with different visual attributes. + * The GL_EXT_f_b_o extension is prompting some of that. + * * \return GL_TRUE if compatible, GL_FALSE otherwise. */ static GLboolean @@ -1492,8 +1513,11 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer) if (ctxvis->rgbMode != bufvis->rgbMode) return GL_FALSE; +#if 0 + /* disabling this fixes the fgl_glxgears pbuffer demo */ if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode) return GL_FALSE; +#endif if (ctxvis->stereoMode && !bufvis->stereoMode) return GL_FALSE; if (ctxvis->haveAccumBuffer && !bufvis->haveAccumBuffer) @@ -1558,23 +1582,22 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, /* Check that the context's and framebuffer's visuals are compatible. */ - if (newCtx && drawBuffer && newCtx->DrawBuffer != drawBuffer) { - if (!check_compatible(newCtx, drawBuffer)) + if (newCtx && drawBuffer && newCtx->WinSysDrawBuffer != drawBuffer) { + if (!check_compatible(newCtx, drawBuffer)) { + _mesa_warning(newCtx, + "MakeCurrent: incompatible visuals for context and drawbuffer"); return; + } } - if (newCtx && readBuffer && newCtx->ReadBuffer != readBuffer) { - if (!check_compatible(newCtx, readBuffer)) + if (newCtx && readBuffer && newCtx->WinSysReadBuffer != readBuffer) { + if (!check_compatible(newCtx, readBuffer)) { + _mesa_warning(newCtx, + "MakeCurrent: incompatible visuals for context and readbuffer"); return; + } } -#if !defined(IN_DRI_DRIVER) - /* We call this function periodically (just here for now) in - * order to detect when multithreading has begun. In a DRI driver, this - * step is done by the driver loader (e.g., libGL). - */ - _glapi_check_multithread(); -#endif /* !defined(IN_DRI_DRIVER) */ - + /* We used to call _glapi_check_multithread() here. Now do it in drivers */ _glapi_set_context((void *) newCtx); ASSERT(_mesa_get_current_context() == newCtx); @@ -1591,9 +1614,15 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, ASSERT(readBuffer->Name == 0); newCtx->WinSysDrawBuffer = drawBuffer; newCtx->WinSysReadBuffer = readBuffer; - /* don't replace user-buffer bindings with window system buffer */ + + /* + * Only set the context's Draw/ReadBuffer fields if they're NULL + * or not bound to a user-created FBO. + */ if (!newCtx->DrawBuffer || newCtx->DrawBuffer->Name == 0) { newCtx->DrawBuffer = drawBuffer; + } + if (!newCtx->ReadBuffer || newCtx->ReadBuffer->Name == 0) { newCtx->ReadBuffer = readBuffer; } diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 8a0ac0fa4ab..dba2008ef73 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -2,7 +2,7 @@ * Mesa 3-D graphics library * Version: 6.5 * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -169,191 +169,194 @@ do { \ * The fact that these identifiers are assigned consecutive * integer values starting at 0 is very important, see InstSize array usage) */ -typedef enum { - OPCODE_INVALID = -1, /* Force signed enum */ - OPCODE_ACCUM, - OPCODE_ALPHA_FUNC, - OPCODE_BIND_TEXTURE, - OPCODE_BITMAP, - OPCODE_BLEND_COLOR, - OPCODE_BLEND_EQUATION, - OPCODE_BLEND_EQUATION_SEPARATE, - OPCODE_BLEND_FUNC_SEPARATE, - OPCODE_CALL_LIST, - OPCODE_CALL_LIST_OFFSET, - OPCODE_CLEAR, - OPCODE_CLEAR_ACCUM, - OPCODE_CLEAR_COLOR, - OPCODE_CLEAR_DEPTH, - OPCODE_CLEAR_INDEX, - OPCODE_CLEAR_STENCIL, - OPCODE_CLIP_PLANE, - OPCODE_COLOR_MASK, - OPCODE_COLOR_MATERIAL, - OPCODE_COLOR_TABLE, - OPCODE_COLOR_TABLE_PARAMETER_FV, - OPCODE_COLOR_TABLE_PARAMETER_IV, - OPCODE_COLOR_SUB_TABLE, - OPCODE_CONVOLUTION_FILTER_1D, - OPCODE_CONVOLUTION_FILTER_2D, - OPCODE_CONVOLUTION_PARAMETER_I, - OPCODE_CONVOLUTION_PARAMETER_IV, - OPCODE_CONVOLUTION_PARAMETER_F, - OPCODE_CONVOLUTION_PARAMETER_FV, - OPCODE_COPY_COLOR_SUB_TABLE, - OPCODE_COPY_COLOR_TABLE, - OPCODE_COPY_PIXELS, - OPCODE_COPY_TEX_IMAGE1D, - OPCODE_COPY_TEX_IMAGE2D, - OPCODE_COPY_TEX_SUB_IMAGE1D, - OPCODE_COPY_TEX_SUB_IMAGE2D, - OPCODE_COPY_TEX_SUB_IMAGE3D, - OPCODE_CULL_FACE, - OPCODE_DEPTH_FUNC, - OPCODE_DEPTH_MASK, - OPCODE_DEPTH_RANGE, - OPCODE_DISABLE, - OPCODE_DRAW_BUFFER, - OPCODE_DRAW_PIXELS, - OPCODE_ENABLE, - OPCODE_EVALMESH1, - OPCODE_EVALMESH2, - OPCODE_FOG, - OPCODE_FRONT_FACE, - OPCODE_FRUSTUM, - OPCODE_HINT, - OPCODE_HISTOGRAM, - OPCODE_INDEX_MASK, - OPCODE_INIT_NAMES, - OPCODE_LIGHT, - OPCODE_LIGHT_MODEL, - OPCODE_LINE_STIPPLE, - OPCODE_LINE_WIDTH, - OPCODE_LIST_BASE, - OPCODE_LOAD_IDENTITY, - OPCODE_LOAD_MATRIX, - OPCODE_LOAD_NAME, - OPCODE_LOGIC_OP, - OPCODE_MAP1, - OPCODE_MAP2, - OPCODE_MAPGRID1, - OPCODE_MAPGRID2, - OPCODE_MATRIX_MODE, - OPCODE_MIN_MAX, - OPCODE_MULT_MATRIX, - OPCODE_ORTHO, - OPCODE_PASSTHROUGH, - OPCODE_PIXEL_MAP, - OPCODE_PIXEL_TRANSFER, - OPCODE_PIXEL_ZOOM, - OPCODE_POINT_SIZE, - OPCODE_POINT_PARAMETERS, - OPCODE_POLYGON_MODE, - OPCODE_POLYGON_STIPPLE, - OPCODE_POLYGON_OFFSET, - OPCODE_POP_ATTRIB, - OPCODE_POP_MATRIX, - OPCODE_POP_NAME, - OPCODE_PRIORITIZE_TEXTURE, - OPCODE_PUSH_ATTRIB, - OPCODE_PUSH_MATRIX, - OPCODE_PUSH_NAME, - OPCODE_RASTER_POS, - OPCODE_READ_BUFFER, - OPCODE_RESET_HISTOGRAM, - OPCODE_RESET_MIN_MAX, - OPCODE_ROTATE, - OPCODE_SCALE, - OPCODE_SCISSOR, - OPCODE_SELECT_TEXTURE_SGIS, - OPCODE_SELECT_TEXTURE_COORD_SET, - OPCODE_SHADE_MODEL, - OPCODE_STENCIL_FUNC, - OPCODE_STENCIL_MASK, - OPCODE_STENCIL_OP, - OPCODE_TEXENV, - OPCODE_TEXGEN, - OPCODE_TEXPARAMETER, - OPCODE_TEX_IMAGE1D, - OPCODE_TEX_IMAGE2D, - OPCODE_TEX_IMAGE3D, - OPCODE_TEX_SUB_IMAGE1D, - OPCODE_TEX_SUB_IMAGE2D, - OPCODE_TEX_SUB_IMAGE3D, - OPCODE_TRANSLATE, - OPCODE_VIEWPORT, - OPCODE_WINDOW_POS, - /* GL_ARB_multitexture */ - OPCODE_ACTIVE_TEXTURE, - /* GL_ARB_texture_compression */ - OPCODE_COMPRESSED_TEX_IMAGE_1D, - OPCODE_COMPRESSED_TEX_IMAGE_2D, - OPCODE_COMPRESSED_TEX_IMAGE_3D, - OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, - OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, - OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, - /* GL_ARB_multisample */ - OPCODE_SAMPLE_COVERAGE, - /* GL_ARB_window_pos */ - OPCODE_WINDOW_POS_ARB, - /* GL_NV_vertex_program */ - OPCODE_BIND_PROGRAM_NV, - OPCODE_EXECUTE_PROGRAM_NV, - OPCODE_REQUEST_RESIDENT_PROGRAMS_NV, - OPCODE_LOAD_PROGRAM_NV, - OPCODE_PROGRAM_PARAMETER4F_NV, - OPCODE_TRACK_MATRIX_NV, - /* GL_NV_fragment_program */ - OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, - OPCODE_PROGRAM_NAMED_PARAMETER_NV, - /* GL_EXT_stencil_two_side */ - OPCODE_ACTIVE_STENCIL_FACE_EXT, - /* GL_EXT_depth_bounds_test */ - OPCODE_DEPTH_BOUNDS_EXT, - /* GL_ARB_vertex/fragment_program */ - OPCODE_PROGRAM_STRING_ARB, - OPCODE_PROGRAM_ENV_PARAMETER_ARB, - /* GL_ARB_occlusion_query */ - OPCODE_BEGIN_QUERY_ARB, - OPCODE_END_QUERY_ARB, - /* GL_ARB_draw_buffers */ - OPCODE_DRAW_BUFFERS_ARB, - /* GL_ATI_fragment_shader */ - OPCODE_BIND_FRAGMENT_SHADER_ATI, - OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, - /* OpenGL 2.0 */ - OPCODE_STENCIL_FUNC_SEPARATE, - OPCODE_STENCIL_OP_SEPARATE, - OPCODE_STENCIL_MASK_SEPARATE, - - /* Vertex attributes -- fallback for when optimized display - * list build isn't active. - */ - OPCODE_ATTR_1F_NV, - OPCODE_ATTR_2F_NV, - OPCODE_ATTR_3F_NV, - OPCODE_ATTR_4F_NV, - OPCODE_ATTR_1F_ARB, - OPCODE_ATTR_2F_ARB, - OPCODE_ATTR_3F_ARB, - OPCODE_ATTR_4F_ARB, - OPCODE_MATERIAL, - OPCODE_INDEX, - OPCODE_EDGEFLAG, - OPCODE_BEGIN, - OPCODE_END, - OPCODE_RECTF, - OPCODE_EVAL_C1, - OPCODE_EVAL_C2, - OPCODE_EVAL_P1, - OPCODE_EVAL_P2, - - - /* The following three are meta instructions */ - OPCODE_ERROR, /* raise compiled-in error */ - OPCODE_CONTINUE, - OPCODE_END_OF_LIST, - OPCODE_EXT_0 +typedef enum +{ + OPCODE_INVALID = -1, /* Force signed enum */ + OPCODE_ACCUM, + OPCODE_ALPHA_FUNC, + OPCODE_BIND_TEXTURE, + OPCODE_BITMAP, + OPCODE_BLEND_COLOR, + OPCODE_BLEND_EQUATION, + OPCODE_BLEND_EQUATION_SEPARATE, + OPCODE_BLEND_FUNC_SEPARATE, + OPCODE_CALL_LIST, + OPCODE_CALL_LIST_OFFSET, + OPCODE_CLEAR, + OPCODE_CLEAR_ACCUM, + OPCODE_CLEAR_COLOR, + OPCODE_CLEAR_DEPTH, + OPCODE_CLEAR_INDEX, + OPCODE_CLEAR_STENCIL, + OPCODE_CLIP_PLANE, + OPCODE_COLOR_MASK, + OPCODE_COLOR_MATERIAL, + OPCODE_COLOR_TABLE, + OPCODE_COLOR_TABLE_PARAMETER_FV, + OPCODE_COLOR_TABLE_PARAMETER_IV, + OPCODE_COLOR_SUB_TABLE, + OPCODE_CONVOLUTION_FILTER_1D, + OPCODE_CONVOLUTION_FILTER_2D, + OPCODE_CONVOLUTION_PARAMETER_I, + OPCODE_CONVOLUTION_PARAMETER_IV, + OPCODE_CONVOLUTION_PARAMETER_F, + OPCODE_CONVOLUTION_PARAMETER_FV, + OPCODE_COPY_COLOR_SUB_TABLE, + OPCODE_COPY_COLOR_TABLE, + OPCODE_COPY_PIXELS, + OPCODE_COPY_TEX_IMAGE1D, + OPCODE_COPY_TEX_IMAGE2D, + OPCODE_COPY_TEX_SUB_IMAGE1D, + OPCODE_COPY_TEX_SUB_IMAGE2D, + OPCODE_COPY_TEX_SUB_IMAGE3D, + OPCODE_CULL_FACE, + OPCODE_DEPTH_FUNC, + OPCODE_DEPTH_MASK, + OPCODE_DEPTH_RANGE, + OPCODE_DISABLE, + OPCODE_DRAW_BUFFER, + OPCODE_DRAW_PIXELS, + OPCODE_ENABLE, + OPCODE_EVALMESH1, + OPCODE_EVALMESH2, + OPCODE_FOG, + OPCODE_FRONT_FACE, + OPCODE_FRUSTUM, + OPCODE_HINT, + OPCODE_HISTOGRAM, + OPCODE_INDEX_MASK, + OPCODE_INIT_NAMES, + OPCODE_LIGHT, + OPCODE_LIGHT_MODEL, + OPCODE_LINE_STIPPLE, + OPCODE_LINE_WIDTH, + OPCODE_LIST_BASE, + OPCODE_LOAD_IDENTITY, + OPCODE_LOAD_MATRIX, + OPCODE_LOAD_NAME, + OPCODE_LOGIC_OP, + OPCODE_MAP1, + OPCODE_MAP2, + OPCODE_MAPGRID1, + OPCODE_MAPGRID2, + OPCODE_MATRIX_MODE, + OPCODE_MIN_MAX, + OPCODE_MULT_MATRIX, + OPCODE_ORTHO, + OPCODE_PASSTHROUGH, + OPCODE_PIXEL_MAP, + OPCODE_PIXEL_TRANSFER, + OPCODE_PIXEL_ZOOM, + OPCODE_POINT_SIZE, + OPCODE_POINT_PARAMETERS, + OPCODE_POLYGON_MODE, + OPCODE_POLYGON_STIPPLE, + OPCODE_POLYGON_OFFSET, + OPCODE_POP_ATTRIB, + OPCODE_POP_MATRIX, + OPCODE_POP_NAME, + OPCODE_PRIORITIZE_TEXTURE, + OPCODE_PUSH_ATTRIB, + OPCODE_PUSH_MATRIX, + OPCODE_PUSH_NAME, + OPCODE_RASTER_POS, + OPCODE_READ_BUFFER, + OPCODE_RESET_HISTOGRAM, + OPCODE_RESET_MIN_MAX, + OPCODE_ROTATE, + OPCODE_SCALE, + OPCODE_SCISSOR, + OPCODE_SELECT_TEXTURE_SGIS, + OPCODE_SELECT_TEXTURE_COORD_SET, + OPCODE_SHADE_MODEL, + OPCODE_STENCIL_FUNC, + OPCODE_STENCIL_MASK, + OPCODE_STENCIL_OP, + OPCODE_TEXENV, + OPCODE_TEXGEN, + OPCODE_TEXPARAMETER, + OPCODE_TEX_IMAGE1D, + OPCODE_TEX_IMAGE2D, + OPCODE_TEX_IMAGE3D, + OPCODE_TEX_SUB_IMAGE1D, + OPCODE_TEX_SUB_IMAGE2D, + OPCODE_TEX_SUB_IMAGE3D, + OPCODE_TRANSLATE, + OPCODE_VIEWPORT, + OPCODE_WINDOW_POS, + /* GL_ARB_multitexture */ + OPCODE_ACTIVE_TEXTURE, + /* GL_ARB_texture_compression */ + OPCODE_COMPRESSED_TEX_IMAGE_1D, + OPCODE_COMPRESSED_TEX_IMAGE_2D, + OPCODE_COMPRESSED_TEX_IMAGE_3D, + OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, + OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, + OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, + /* GL_ARB_multisample */ + OPCODE_SAMPLE_COVERAGE, + /* GL_ARB_window_pos */ + OPCODE_WINDOW_POS_ARB, + /* GL_NV_vertex_program */ + OPCODE_BIND_PROGRAM_NV, + OPCODE_EXECUTE_PROGRAM_NV, + OPCODE_REQUEST_RESIDENT_PROGRAMS_NV, + OPCODE_LOAD_PROGRAM_NV, + OPCODE_PROGRAM_PARAMETER4F_NV, + OPCODE_TRACK_MATRIX_NV, + /* GL_NV_fragment_program */ + OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, + OPCODE_PROGRAM_NAMED_PARAMETER_NV, + /* GL_EXT_stencil_two_side */ + OPCODE_ACTIVE_STENCIL_FACE_EXT, + /* GL_EXT_depth_bounds_test */ + OPCODE_DEPTH_BOUNDS_EXT, + /* GL_ARB_vertex/fragment_program */ + OPCODE_PROGRAM_STRING_ARB, + OPCODE_PROGRAM_ENV_PARAMETER_ARB, + /* GL_ARB_occlusion_query */ + OPCODE_BEGIN_QUERY_ARB, + OPCODE_END_QUERY_ARB, + /* GL_ARB_draw_buffers */ + OPCODE_DRAW_BUFFERS_ARB, + /* GL_ATI_fragment_shader */ + OPCODE_BIND_FRAGMENT_SHADER_ATI, + OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, + /* OpenGL 2.0 */ + OPCODE_STENCIL_FUNC_SEPARATE, + OPCODE_STENCIL_OP_SEPARATE, + OPCODE_STENCIL_MASK_SEPARATE, + + /* GL_EXT_framebuffer_blit */ + OPCODE_BLIT_FRAMEBUFFER, + + /* Vertex attributes -- fallback for when optimized display + * list build isn't active. + */ + OPCODE_ATTR_1F_NV, + OPCODE_ATTR_2F_NV, + OPCODE_ATTR_3F_NV, + OPCODE_ATTR_4F_NV, + OPCODE_ATTR_1F_ARB, + OPCODE_ATTR_2F_ARB, + OPCODE_ATTR_3F_ARB, + OPCODE_ATTR_4F_ARB, + OPCODE_MATERIAL, + OPCODE_INDEX, + OPCODE_EDGEFLAG, + OPCODE_BEGIN, + OPCODE_END, + OPCODE_RECTF, + OPCODE_EVAL_C1, + OPCODE_EVAL_C2, + OPCODE_EVAL_P1, + OPCODE_EVAL_P2, + + /* The following three are meta instructions */ + OPCODE_ERROR, /* raise compiled-in error */ + OPCODE_CONTINUE, + OPCODE_END_OF_LIST, + OPCODE_EXT_0 } OpCode; @@ -369,19 +372,20 @@ typedef enum { * contiguous nodes in memory. * Each node is the union of a variety of data types. */ -union node { - OpCode opcode; - GLboolean b; - GLbitfield bf; - GLubyte ub; - GLshort s; - GLushort us; - GLint i; - GLuint ui; - GLenum e; - GLfloat f; - GLvoid *data; - void *next; /* If prev node's opcode==OPCODE_CONTINUE */ +union node +{ + OpCode opcode; + GLboolean b; + GLbitfield bf; + GLubyte ub; + GLshort s; + GLushort us; + GLint i; + GLuint ui; + GLenum e; + GLfloat f; + GLvoid *data; + void *next; /* If prev node's opcode==OPCODE_CONTINUE */ }; @@ -398,47 +402,52 @@ union node { * Number of nodes of storage needed for each instruction. * Sizes for dynamically allocated opcodes are stored in the context struct. */ -static GLuint InstSize[ OPCODE_END_OF_LIST+1 ]; +static GLuint InstSize[OPCODE_END_OF_LIST + 1]; -void mesa_print_display_list( GLuint list ); +void mesa_print_display_list(GLuint list); /**********************************************************************/ /***** Private *****/ /**********************************************************************/ -/* + +/** * Make an empty display list. This is used by glGenLists() to - * reserver display list IDs. + * reserve display list IDs. */ -static struct mesa_display_list *make_list( GLuint list, GLuint count ) +static struct mesa_display_list * +make_list(GLuint list, GLuint count) { - struct mesa_display_list *dlist = CALLOC_STRUCT( mesa_display_list ); + struct mesa_display_list *dlist = CALLOC_STRUCT(mesa_display_list); dlist->id = list; - dlist->node = (Node *) MALLOC( sizeof(Node) * count ); + dlist->node = (Node *) _mesa_malloc(sizeof(Node) * count); dlist->node[0].opcode = OPCODE_END_OF_LIST; return dlist; } -/* +/** * Destroy all nodes in a display list. * \param list - display list number */ -void _mesa_destroy_list( GLcontext *ctx, GLuint list ) +void +_mesa_destroy_list(GLcontext *ctx, GLuint list) { struct mesa_display_list *dlist; Node *n, *block; GLboolean done; - if (list==0) + if (list == 0) return; - dlist = (struct mesa_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, list); + dlist = + (struct mesa_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, + list); if (!dlist) return; - + n = block = dlist->node; done = block ? GL_FALSE : GL_TRUE; @@ -448,136 +457,136 @@ void _mesa_destroy_list( GLcontext *ctx, GLuint list ) GLint i = (GLint) n[0].opcode - (GLint) OPCODE_EXT_0; if (i >= 0 && i < (GLint) ctx->ListExt.NumOpcodes) { - ctx->ListExt.Opcode[i].Destroy(ctx, &n[1]); - n += ctx->ListExt.Opcode[i].Size; + ctx->ListExt.Opcode[i].Destroy(ctx, &n[1]); + n += ctx->ListExt.Opcode[i].Size; } else { - switch (n[0].opcode) { - /* for some commands, we need to free malloc'd memory */ - case OPCODE_MAP1: - FREE(n[6].data); - n += InstSize[n[0].opcode]; - break; - case OPCODE_MAP2: - FREE(n[10].data); - n += InstSize[n[0].opcode]; - break; - case OPCODE_DRAW_PIXELS: - FREE( n[5].data ); - n += InstSize[n[0].opcode]; - break; - case OPCODE_BITMAP: - FREE( n[7].data ); - n += InstSize[n[0].opcode]; - break; + switch (n[0].opcode) { + /* for some commands, we need to free malloc'd memory */ + case OPCODE_MAP1: + _mesa_free(n[6].data); + n += InstSize[n[0].opcode]; + break; + case OPCODE_MAP2: + _mesa_free(n[10].data); + n += InstSize[n[0].opcode]; + break; + case OPCODE_DRAW_PIXELS: + _mesa_free(n[5].data); + n += InstSize[n[0].opcode]; + break; + case OPCODE_BITMAP: + _mesa_free(n[7].data); + n += InstSize[n[0].opcode]; + break; case OPCODE_COLOR_TABLE: - FREE( n[6].data ); + _mesa_free(n[6].data); n += InstSize[n[0].opcode]; break; case OPCODE_COLOR_SUB_TABLE: - FREE( n[6].data ); + _mesa_free(n[6].data); n += InstSize[n[0].opcode]; break; case OPCODE_CONVOLUTION_FILTER_1D: - FREE( n[6].data ); + _mesa_free(n[6].data); n += InstSize[n[0].opcode]; break; case OPCODE_CONVOLUTION_FILTER_2D: - FREE( n[7].data ); + _mesa_free(n[7].data); n += InstSize[n[0].opcode]; break; case OPCODE_POLYGON_STIPPLE: - FREE( n[1].data ); - n += InstSize[n[0].opcode]; + _mesa_free(n[1].data); + n += InstSize[n[0].opcode]; break; - case OPCODE_TEX_IMAGE1D: - FREE(n[8].data); + case OPCODE_TEX_IMAGE1D: + _mesa_free(n[8].data); n += InstSize[n[0].opcode]; - break; - case OPCODE_TEX_IMAGE2D: - FREE( n[9]. data ); + break; + case OPCODE_TEX_IMAGE2D: + _mesa_free(n[9].data); n += InstSize[n[0].opcode]; - break; - case OPCODE_TEX_IMAGE3D: - FREE( n[10]. data ); + break; + case OPCODE_TEX_IMAGE3D: + _mesa_free(n[10].data); n += InstSize[n[0].opcode]; - break; + break; case OPCODE_TEX_SUB_IMAGE1D: - FREE(n[7].data); + _mesa_free(n[7].data); n += InstSize[n[0].opcode]; break; case OPCODE_TEX_SUB_IMAGE2D: - FREE(n[9].data); + _mesa_free(n[9].data); n += InstSize[n[0].opcode]; break; case OPCODE_TEX_SUB_IMAGE3D: - FREE(n[11].data); + _mesa_free(n[11].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_IMAGE_1D: - FREE(n[7].data); + _mesa_free(n[7].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_IMAGE_2D: - FREE(n[8].data); + _mesa_free(n[8].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_IMAGE_3D: - FREE(n[9].data); + _mesa_free(n[9].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: - FREE(n[7].data); + _mesa_free(n[7].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: - FREE(n[9].data); + _mesa_free(n[9].data); n += InstSize[n[0].opcode]; break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: - FREE(n[11].data); + _mesa_free(n[11].data); n += InstSize[n[0].opcode]; break; #if FEATURE_NV_vertex_program case OPCODE_LOAD_PROGRAM_NV: - FREE(n[4].data); /* program string */ + _mesa_free(n[4].data); /* program string */ n += InstSize[n[0].opcode]; break; case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV: - FREE(n[2].data); /* array of program ids */ + _mesa_free(n[2].data); /* array of program ids */ n += InstSize[n[0].opcode]; break; #endif #if FEATURE_NV_fragment_program case OPCODE_PROGRAM_NAMED_PARAMETER_NV: - FREE(n[3].data); /* parameter name */ + _mesa_free(n[3].data); /* parameter name */ n += InstSize[n[0].opcode]; break; #endif #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program case OPCODE_PROGRAM_STRING_ARB: - FREE(n[4].data); /* program string */ + _mesa_free(n[4].data); /* program string */ n += InstSize[n[0].opcode]; break; #endif - case OPCODE_CONTINUE: - n = (Node *) n[1].next; - FREE( block ); - block = n; - break; - case OPCODE_END_OF_LIST: - FREE( block ); - done = GL_TRUE; - break; - default: - /* Most frequent case */ - n += InstSize[n[0].opcode]; - break; - } + case OPCODE_CONTINUE: + n = (Node *) n[1].next; + _mesa_free(block); + block = n; + break; + case OPCODE_END_OF_LIST: + _mesa_free(block); + done = GL_TRUE; + break; + default: + /* Most frequent case */ + n += InstSize[n[0].opcode]; + break; + } } } - FREE( dlist ); + _mesa_free(dlist); _mesa_HashRemove(ctx->Shared->DisplayList, list); } @@ -586,7 +595,8 @@ void _mesa_destroy_list( GLcontext *ctx, GLuint list ) /* * Translate the nth element of list from type to GLuint. */ -static GLuint translate_id( GLsizei n, GLenum type, const GLvoid *list ) +static GLuint +translate_id(GLsizei n, GLenum type, const GLvoid * list) { GLbyte *bptr; GLubyte *ubptr; @@ -597,43 +607,41 @@ static GLuint translate_id( GLsizei n, GLenum type, const GLvoid *list ) GLfloat *fptr; switch (type) { - case GL_BYTE: - bptr = (GLbyte *) list; - return (GLuint) *(bptr+n); - case GL_UNSIGNED_BYTE: - ubptr = (GLubyte *) list; - return (GLuint) *(ubptr+n); - case GL_SHORT: - sptr = (GLshort *) list; - return (GLuint) *(sptr+n); - case GL_UNSIGNED_SHORT: - usptr = (GLushort *) list; - return (GLuint) *(usptr+n); - case GL_INT: - iptr = (GLint *) list; - return (GLuint) *(iptr+n); - case GL_UNSIGNED_INT: - uiptr = (GLuint *) list; - return (GLuint) *(uiptr+n); - case GL_FLOAT: - fptr = (GLfloat *) list; - return (GLuint) *(fptr+n); - case GL_2_BYTES: - ubptr = ((GLubyte *) list) + 2*n; - return (GLuint) *ubptr * 256 + (GLuint) *(ubptr+1); - case GL_3_BYTES: - ubptr = ((GLubyte *) list) + 3*n; - return (GLuint) *ubptr * 65536 - + (GLuint) *(ubptr+1) * 256 - + (GLuint) *(ubptr+2); - case GL_4_BYTES: - ubptr = ((GLubyte *) list) + 4*n; - return (GLuint) *ubptr * 16777216 - + (GLuint) *(ubptr+1) * 65536 - + (GLuint) *(ubptr+2) * 256 - + (GLuint) *(ubptr+3); - default: - return 0; + case GL_BYTE: + bptr = (GLbyte *) list; + return (GLuint) *(bptr + n); + case GL_UNSIGNED_BYTE: + ubptr = (GLubyte *) list; + return (GLuint) *(ubptr + n); + case GL_SHORT: + sptr = (GLshort *) list; + return (GLuint) *(sptr + n); + case GL_UNSIGNED_SHORT: + usptr = (GLushort *) list; + return (GLuint) *(usptr + n); + case GL_INT: + iptr = (GLint *) list; + return (GLuint) *(iptr + n); + case GL_UNSIGNED_INT: + uiptr = (GLuint *) list; + return (GLuint) *(uiptr + n); + case GL_FLOAT: + fptr = (GLfloat *) list; + return (GLuint) *(fptr + n); + case GL_2_BYTES: + ubptr = ((GLubyte *) list) + 2 * n; + return (GLuint) *ubptr * 256 + (GLuint) * (ubptr + 1); + case GL_3_BYTES: + ubptr = ((GLubyte *) list) + 3 * n; + return (GLuint) * ubptr * 65536 + + (GLuint) *(ubptr + 1) * 256 + (GLuint) * (ubptr + 2); + case GL_4_BYTES: + ubptr = ((GLubyte *) list) + 4 * n; + return (GLuint) *ubptr * 16777216 + + (GLuint) *(ubptr + 1) * 65536 + + (GLuint) *(ubptr + 2) * 256 + (GLuint) * (ubptr + 3); + default: + return 0; } } @@ -645,247 +653,63 @@ static GLuint translate_id( GLsizei n, GLenum type, const GLvoid *list ) /**********************************************************************/ /** - * Do one-time initialiazations for display lists. - */ -void -_mesa_init_lists( void ) -{ - static int init_flag = 0; - - if (init_flag==0) { - InstSize[OPCODE_ACCUM] = 3; - InstSize[OPCODE_ALPHA_FUNC] = 3; - InstSize[OPCODE_BIND_TEXTURE] = 3; - InstSize[OPCODE_BITMAP] = 8; - InstSize[OPCODE_BLEND_COLOR] = 5; - InstSize[OPCODE_BLEND_EQUATION] = 2; - InstSize[OPCODE_BLEND_EQUATION_SEPARATE] = 3; - InstSize[OPCODE_BLEND_FUNC_SEPARATE] = 5; - InstSize[OPCODE_CALL_LIST] = 2; - InstSize[OPCODE_CALL_LIST_OFFSET] = 3; - InstSize[OPCODE_CLEAR] = 2; - InstSize[OPCODE_CLEAR_ACCUM] = 5; - InstSize[OPCODE_CLEAR_COLOR] = 5; - InstSize[OPCODE_CLEAR_DEPTH] = 2; - InstSize[OPCODE_CLEAR_INDEX] = 2; - InstSize[OPCODE_CLEAR_STENCIL] = 2; - InstSize[OPCODE_CLIP_PLANE] = 6; - InstSize[OPCODE_COLOR_MASK] = 5; - InstSize[OPCODE_COLOR_MATERIAL] = 3; - InstSize[OPCODE_COLOR_TABLE] = 7; - InstSize[OPCODE_COLOR_TABLE_PARAMETER_FV] = 7; - InstSize[OPCODE_COLOR_TABLE_PARAMETER_IV] = 7; - InstSize[OPCODE_COLOR_SUB_TABLE] = 7; - InstSize[OPCODE_CONVOLUTION_FILTER_1D] = 7; - InstSize[OPCODE_CONVOLUTION_FILTER_2D] = 8; - InstSize[OPCODE_CONVOLUTION_PARAMETER_I] = 4; - InstSize[OPCODE_CONVOLUTION_PARAMETER_IV] = 7; - InstSize[OPCODE_CONVOLUTION_PARAMETER_F] = 4; - InstSize[OPCODE_CONVOLUTION_PARAMETER_FV] = 7; - InstSize[OPCODE_COPY_PIXELS] = 6; - InstSize[OPCODE_COPY_COLOR_SUB_TABLE] = 6; - InstSize[OPCODE_COPY_COLOR_TABLE] = 6; - InstSize[OPCODE_COPY_TEX_IMAGE1D] = 8; - InstSize[OPCODE_COPY_TEX_IMAGE2D] = 9; - InstSize[OPCODE_COPY_TEX_SUB_IMAGE1D] = 7; - InstSize[OPCODE_COPY_TEX_SUB_IMAGE2D] = 9; - InstSize[OPCODE_COPY_TEX_SUB_IMAGE3D] = 10; - InstSize[OPCODE_CULL_FACE] = 2; - InstSize[OPCODE_DEPTH_FUNC] = 2; - InstSize[OPCODE_DEPTH_MASK] = 2; - InstSize[OPCODE_DEPTH_RANGE] = 3; - InstSize[OPCODE_DISABLE] = 2; - InstSize[OPCODE_DRAW_BUFFER] = 2; - InstSize[OPCODE_DRAW_PIXELS] = 6; - InstSize[OPCODE_ENABLE] = 2; - InstSize[OPCODE_EVALMESH1] = 4; - InstSize[OPCODE_EVALMESH2] = 6; - InstSize[OPCODE_FOG] = 6; - InstSize[OPCODE_FRONT_FACE] = 2; - InstSize[OPCODE_FRUSTUM] = 7; - InstSize[OPCODE_HINT] = 3; - InstSize[OPCODE_HISTOGRAM] = 5; - InstSize[OPCODE_INDEX_MASK] = 2; - InstSize[OPCODE_INIT_NAMES] = 1; - InstSize[OPCODE_LIGHT] = 7; - InstSize[OPCODE_LIGHT_MODEL] = 6; - InstSize[OPCODE_LINE_STIPPLE] = 3; - InstSize[OPCODE_LINE_WIDTH] = 2; - InstSize[OPCODE_LIST_BASE] = 2; - InstSize[OPCODE_LOAD_IDENTITY] = 1; - InstSize[OPCODE_LOAD_MATRIX] = 17; - InstSize[OPCODE_LOAD_NAME] = 2; - InstSize[OPCODE_LOGIC_OP] = 2; - InstSize[OPCODE_MAP1] = 7; - InstSize[OPCODE_MAP2] = 11; - InstSize[OPCODE_MAPGRID1] = 4; - InstSize[OPCODE_MAPGRID2] = 7; - InstSize[OPCODE_MATRIX_MODE] = 2; - InstSize[OPCODE_MIN_MAX] = 4; - InstSize[OPCODE_MULT_MATRIX] = 17; - InstSize[OPCODE_ORTHO] = 7; - InstSize[OPCODE_PASSTHROUGH] = 2; - InstSize[OPCODE_PIXEL_MAP] = 4; - InstSize[OPCODE_PIXEL_TRANSFER] = 3; - InstSize[OPCODE_PIXEL_ZOOM] = 3; - InstSize[OPCODE_POINT_SIZE] = 2; - InstSize[OPCODE_POINT_PARAMETERS] = 5; - InstSize[OPCODE_POLYGON_MODE] = 3; - InstSize[OPCODE_POLYGON_STIPPLE] = 2; - InstSize[OPCODE_POLYGON_OFFSET] = 3; - InstSize[OPCODE_POP_ATTRIB] = 1; - InstSize[OPCODE_POP_MATRIX] = 1; - InstSize[OPCODE_POP_NAME] = 1; - InstSize[OPCODE_PRIORITIZE_TEXTURE] = 3; - InstSize[OPCODE_PUSH_ATTRIB] = 2; - InstSize[OPCODE_PUSH_MATRIX] = 1; - InstSize[OPCODE_PUSH_NAME] = 2; - InstSize[OPCODE_RASTER_POS] = 5; - InstSize[OPCODE_READ_BUFFER] = 2; - InstSize[OPCODE_RESET_HISTOGRAM] = 2; - InstSize[OPCODE_RESET_MIN_MAX] = 2; - InstSize[OPCODE_ROTATE] = 5; - InstSize[OPCODE_SCALE] = 4; - InstSize[OPCODE_SCISSOR] = 5; - InstSize[OPCODE_STENCIL_FUNC] = 4; - InstSize[OPCODE_STENCIL_MASK] = 2; - InstSize[OPCODE_STENCIL_OP] = 4; - InstSize[OPCODE_SHADE_MODEL] = 2; - InstSize[OPCODE_TEXENV] = 7; - InstSize[OPCODE_TEXGEN] = 7; - InstSize[OPCODE_TEXPARAMETER] = 7; - InstSize[OPCODE_TEX_IMAGE1D] = 9; - InstSize[OPCODE_TEX_IMAGE2D] = 10; - InstSize[OPCODE_TEX_IMAGE3D] = 11; - InstSize[OPCODE_TEX_SUB_IMAGE1D] = 8; - InstSize[OPCODE_TEX_SUB_IMAGE2D] = 10; - InstSize[OPCODE_TEX_SUB_IMAGE3D] = 12; - InstSize[OPCODE_TRANSLATE] = 4; - InstSize[OPCODE_VIEWPORT] = 5; - InstSize[OPCODE_WINDOW_POS] = 5; - InstSize[OPCODE_CONTINUE] = 2; - InstSize[OPCODE_ERROR] = 3; - InstSize[OPCODE_END_OF_LIST] = 1; - /* GL_ARB_texture_compression */ - InstSize[OPCODE_COMPRESSED_TEX_IMAGE_1D] = 8; - InstSize[OPCODE_COMPRESSED_TEX_IMAGE_2D] = 9; - InstSize[OPCODE_COMPRESSED_TEX_IMAGE_3D] = 10; - InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D] = 8; - InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D] = 10; - InstSize[OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D] = 12; - /* GL_ARB_multisample */ - InstSize[OPCODE_SAMPLE_COVERAGE] = 3; - /* GL_ARB_multitexture */ - InstSize[OPCODE_ACTIVE_TEXTURE] = 2; - /* GL_ARB_window_pos */ - InstSize[OPCODE_WINDOW_POS_ARB] = 4; - /* GL_NV_vertex_program */ - InstSize[OPCODE_BIND_PROGRAM_NV] = 3; - InstSize[OPCODE_EXECUTE_PROGRAM_NV] = 7; - InstSize[OPCODE_REQUEST_RESIDENT_PROGRAMS_NV] = 2; - InstSize[OPCODE_LOAD_PROGRAM_NV] = 5; - InstSize[OPCODE_PROGRAM_PARAMETER4F_NV] = 7; - InstSize[OPCODE_TRACK_MATRIX_NV] = 5; - /* GL_NV_fragment_program */ - InstSize[OPCODE_PROGRAM_LOCAL_PARAMETER_ARB] = 7; - InstSize[OPCODE_PROGRAM_NAMED_PARAMETER_NV] = 8; - /* GL_EXT_stencil_two_side */ - InstSize[OPCODE_ACTIVE_STENCIL_FACE_EXT] = 2; - /* GL_EXT_depth_bounds_test */ - InstSize[OPCODE_DEPTH_BOUNDS_EXT] = 3; -#if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program - InstSize[OPCODE_PROGRAM_STRING_ARB] = 5; - InstSize[OPCODE_PROGRAM_ENV_PARAMETER_ARB] = 7; -#endif -#if FEATURE_ARB_occlusion_query - InstSize[OPCODE_BEGIN_QUERY_ARB] = 3; - InstSize[OPCODE_END_QUERY_ARB] = 2; -#endif - InstSize[OPCODE_DRAW_BUFFERS_ARB] = 2 + MAX_DRAW_BUFFERS; -#if FEATURE_ATI_fragment_shader - InstSize[OPCODE_BIND_FRAGMENT_SHADER_ATI] = 2; - InstSize[OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI] = 6; -#endif - /* OpenGL 2.0 */ - InstSize[OPCODE_STENCIL_FUNC_SEPARATE] = 5; - InstSize[OPCODE_STENCIL_MASK_SEPARATE] = 3; - InstSize[OPCODE_STENCIL_OP_SEPARATE] = 5; - - InstSize[OPCODE_ATTR_1F_NV] = 3; - InstSize[OPCODE_ATTR_2F_NV] = 4; - InstSize[OPCODE_ATTR_3F_NV] = 5; - InstSize[OPCODE_ATTR_4F_NV] = 6; - InstSize[OPCODE_ATTR_1F_ARB] = 3; - InstSize[OPCODE_ATTR_2F_ARB] = 4; - InstSize[OPCODE_ATTR_3F_ARB] = 5; - InstSize[OPCODE_ATTR_4F_ARB] = 6; - InstSize[OPCODE_MATERIAL] = 7; - InstSize[OPCODE_INDEX] = 2; - InstSize[OPCODE_EDGEFLAG] = 2; - InstSize[OPCODE_BEGIN] = 2; - InstSize[OPCODE_END] = 1; - InstSize[OPCODE_RECTF] = 5; - InstSize[OPCODE_EVAL_C1] = 2; - InstSize[OPCODE_EVAL_C2] = 3; - InstSize[OPCODE_EVAL_P1] = 2; - InstSize[OPCODE_EVAL_P2] = 3; - } - init_flag = 1; -} - - - -/** * Wrapper for _mesa_unpack_image() that handles pixel buffer objects. * \todo This won't suffice when the PBO is really in VRAM/GPU memory. */ static GLvoid * -unpack_image( GLuint dimensions, GLsizei width, GLsizei height, GLsizei depth, - GLenum format, GLenum type, const GLvoid *pixels, - const struct gl_pixelstore_attrib *unpack ) +unpack_image(GLuint dimensions, GLsizei width, GLsizei height, GLsizei depth, + GLenum format, GLenum type, const GLvoid * pixels, + const struct gl_pixelstore_attrib *unpack) { if (unpack->BufferObj->Name == 0) { /* no PBO */ - return _mesa_unpack_image(dimensions, width, height, depth, format, type, - pixels, unpack); + return _mesa_unpack_image(dimensions, width, height, depth, format, + type, pixels, unpack); } - else if (_mesa_validate_pbo_access(dimensions, unpack, width, height, depth, - format, type, pixels)) { + else + if (_mesa_validate_pbo_access + (dimensions, unpack, width, height, depth, format, type, pixels)) { const GLubyte *src = ADD_POINTERS(unpack->BufferObj->Data, pixels); - return _mesa_unpack_image(dimensions, width, height, depth, format, type, - src, unpack); + return _mesa_unpack_image(dimensions, width, height, depth, format, + type, src, unpack); } /* bad access! */ return NULL; } -/* +/** * Allocate space for a display list instruction. - * \param opcode - type of instruction - * argcount - size in bytes of data required. + * \param opcode the instruction opcode (OPCODE_* value) + * \param size instruction size in bytes, not counting opcode. * \return pointer to the usable data area (not including the internal * opcode). */ void * -_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz ) +_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint bytes) { - Node *n, *newblock; - GLuint count = 1 + (sz + sizeof(Node) - 1) / sizeof(Node); + const GLuint numNodes = 1 + (bytes + sizeof(Node) - 1) / sizeof(Node); + Node *n; -#ifdef DEBUG - if (opcode < (int) OPCODE_EXT_0) { - assert( count == InstSize[opcode] ); + if (opcode < (GLuint) OPCODE_EXT_0) { + if (InstSize[opcode] == 0) { + /* save instruction size now */ + InstSize[opcode] = numNodes; + } + else { + /* make sure instruction size agrees */ + ASSERT(numNodes == InstSize[opcode]); + } } -#endif - if (ctx->ListState.CurrentPos + count + 2 > BLOCK_SIZE) { + if (ctx->ListState.CurrentPos + numNodes + 2 > BLOCK_SIZE) { /* This block is full. Allocate a new block and chain to it */ + Node *newblock; n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos; n[0].opcode = OPCODE_CONTINUE; - newblock = (Node *) MALLOC( sizeof(Node) * BLOCK_SIZE ); + newblock = (Node *) _mesa_malloc(sizeof(Node) * BLOCK_SIZE); if (!newblock) { - _mesa_error( ctx, GL_OUT_OF_MEMORY, "Building display list" ); + _mesa_error(ctx, GL_OUT_OF_MEMORY, "Building display list"); return NULL; } n[1].next = (Node *) newblock; @@ -894,11 +718,11 @@ _mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz ) } n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos; - ctx->ListState.CurrentPos += count; + ctx->ListState.CurrentPos += numNodes; n[0].opcode = (OpCode) opcode; - return (void *)&n[1]; + return (void *) (n + 1); /* return ptr to node following opcode */ } @@ -913,15 +737,16 @@ _mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz ) * \return the new opcode number or -1 if error */ GLint -_mesa_alloc_opcode( GLcontext *ctx, - GLuint size, - void (*execute)( GLcontext *, void * ), - void (*destroy)( GLcontext *, void * ), - void (*print)( GLcontext *, void * ) ) +_mesa_alloc_opcode(GLcontext *ctx, + GLuint size, + void (*execute) (GLcontext *, void *), + void (*destroy) (GLcontext *, void *), + void (*print) (GLcontext *, void *)) { if (ctx->ListExt.NumOpcodes < MAX_DLIST_EXT_OPCODES) { const GLuint i = ctx->ListExt.NumOpcodes++; - ctx->ListExt.Opcode[i].Size = 1 + (size + sizeof(Node) - 1)/sizeof(Node); + ctx->ListExt.Opcode[i].Size = + 1 + (size + sizeof(Node) - 1) / sizeof(Node); ctx->ListExt.Opcode[i].Execute = execute; ctx->ListExt.Opcode[i].Destroy = destroy; ctx->ListExt.Opcode[i].Print = print; @@ -932,77 +757,82 @@ _mesa_alloc_opcode( GLcontext *ctx, -/* Mimic the old behaviour of alloc_instruction: - * - sz is in units of sizeof(Node) +/** + * Allocate display list instruction. Returns Node ptr to where the opcode + * is stored. + * - nParams is the number of function parameters * - return value a pointer to sizeof(Node) before the actual * usable data area. */ -#define ALLOC_INSTRUCTION(ctx, opcode, sz) \ - ((Node *)_mesa_alloc_instruction(ctx, opcode, sz*sizeof(Node)) - 1) +#define ALLOC_INSTRUCTION(CTX, OPCODE, NPARAMS) \ + ((Node *)_mesa_alloc_instruction(CTX, OPCODE, (NPARAMS)*sizeof(Node)) - 1) /* * Display List compilation functions */ -static void GLAPIENTRY save_Accum( GLenum op, GLfloat value ) +static void GLAPIENTRY +save_Accum(GLenum op, GLfloat value) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ACCUM, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ACCUM, 2); if (n) { n[1].e = op; n[2].f = value; } if (ctx->ExecuteFlag) { - CALL_Accum(ctx->Exec, ( op, value )); + CALL_Accum(ctx->Exec, (op, value)); } } -static void GLAPIENTRY save_AlphaFunc( GLenum func, GLclampf ref ) +static void GLAPIENTRY +save_AlphaFunc(GLenum func, GLclampf ref) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ALPHA_FUNC, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ALPHA_FUNC, 2); if (n) { n[1].e = func; n[2].f = (GLfloat) ref; } if (ctx->ExecuteFlag) { - CALL_AlphaFunc(ctx->Exec, ( func, ref )); + CALL_AlphaFunc(ctx->Exec, (func, ref)); } } -static void GLAPIENTRY save_BindTexture( GLenum target, GLuint texture ) +static void GLAPIENTRY +save_BindTexture(GLenum target, GLuint texture) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BIND_TEXTURE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BIND_TEXTURE, 2); if (n) { n[1].e = target; n[2].ui = texture; } if (ctx->ExecuteFlag) { - CALL_BindTexture(ctx->Exec, ( target, texture )); + CALL_BindTexture(ctx->Exec, (target, texture)); } } -static void GLAPIENTRY save_Bitmap( GLsizei width, GLsizei height, - GLfloat xorig, GLfloat yorig, - GLfloat xmove, GLfloat ymove, - const GLubyte *pixels ) +static void GLAPIENTRY +save_Bitmap(GLsizei width, GLsizei height, + GLfloat xorig, GLfloat yorig, + GLfloat xmove, GLfloat ymove, const GLubyte * pixels) { GET_CURRENT_CONTEXT(ctx); - GLvoid *image = _mesa_unpack_bitmap( width, height, pixels, &ctx->Unpack ); + GLvoid *image = _mesa_unpack_bitmap(width, height, pixels, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BITMAP, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BITMAP, 7); if (n) { n[1].i = (GLint) width; n[2].i = (GLint) height; @@ -1013,54 +843,56 @@ static void GLAPIENTRY save_Bitmap( GLsizei width, GLsizei height, n[7].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_Bitmap(ctx->Exec, ( width, height, - xorig, yorig, xmove, ymove, pixels )); + CALL_Bitmap(ctx->Exec, (width, height, + xorig, yorig, xmove, ymove, pixels)); } } -static void GLAPIENTRY save_BlendEquation( GLenum mode ) +static void GLAPIENTRY +save_BlendEquation(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_EQUATION, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BLEND_EQUATION, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_BlendEquation(ctx->Exec, ( mode )); + CALL_BlendEquation(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_BlendEquationSeparateEXT( GLenum modeRGB, - GLenum modeA ) +static void GLAPIENTRY +save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_EQUATION_SEPARATE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BLEND_EQUATION_SEPARATE, 2); if (n) { n[1].e = modeRGB; n[2].e = modeA; } if (ctx->ExecuteFlag) { - CALL_BlendEquationSeparateEXT(ctx->Exec, ( modeRGB, modeA )); + CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA)); } } -static void GLAPIENTRY save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA) +static void GLAPIENTRY +save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_FUNC_SEPARATE, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BLEND_FUNC_SEPARATE, 4); if (n) { n[1].e = sfactorRGB; n[2].e = dfactorRGB; @@ -1068,19 +900,19 @@ static void GLAPIENTRY save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfact n[4].e = dfactorA; } if (ctx->ExecuteFlag) { - CALL_BlendFuncSeparateEXT(ctx->Exec, - (sfactorRGB, dfactorRGB, sfactorA, dfactorA)); + CALL_BlendFuncSeparateEXT(ctx->Exec, + (sfactorRGB, dfactorRGB, sfactorA, dfactorA)); } } -static void GLAPIENTRY save_BlendColor( GLfloat red, GLfloat green, - GLfloat blue, GLfloat alpha ) +static void GLAPIENTRY +save_BlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BLEND_COLOR, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BLEND_COLOR, 4); if (n) { n[1].f = red; n[2].f = green; @@ -1088,33 +920,35 @@ static void GLAPIENTRY save_BlendColor( GLfloat red, GLfloat green, n[4].f = alpha; } if (ctx->ExecuteFlag) { - CALL_BlendColor(ctx->Exec, ( red, green, blue, alpha )); + CALL_BlendColor(ctx->Exec, (red, green, blue, alpha)); } } -void GLAPIENTRY _mesa_save_CallList( GLuint list ) +void GLAPIENTRY +_mesa_save_CallList(GLuint list) { GET_CURRENT_CONTEXT(ctx); Node *n; SAVE_FLUSH_VERTICES(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CALL_LIST, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CALL_LIST, 1); if (n) { n[1].ui = list; } - + /* After this, we don't know what begin/end state we're in: */ ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN; if (ctx->ExecuteFlag) { - CALL_CallList(ctx->Exec, ( list )); + CALL_CallList(ctx->Exec, (list)); } } -void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists ) +void GLAPIENTRY +_mesa_save_CallLists(GLsizei n, GLenum type, const GLvoid * lists) { GET_CURRENT_CONTEXT(ctx); GLint i; @@ -1123,25 +957,25 @@ void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *list SAVE_FLUSH_VERTICES(ctx); switch (type) { - case GL_BYTE: - case GL_UNSIGNED_BYTE: - case GL_SHORT: - case GL_UNSIGNED_SHORT: - case GL_INT: - case GL_UNSIGNED_INT: - case GL_FLOAT: - case GL_2_BYTES: - case GL_3_BYTES: - case GL_4_BYTES: - typeErrorFlag = GL_FALSE; - break; - default: - typeErrorFlag = GL_TRUE; + case GL_BYTE: + case GL_UNSIGNED_BYTE: + case GL_SHORT: + case GL_UNSIGNED_SHORT: + case GL_INT: + case GL_UNSIGNED_INT: + case GL_FLOAT: + case GL_2_BYTES: + case GL_3_BYTES: + case GL_4_BYTES: + typeErrorFlag = GL_FALSE; + break; + default: + typeErrorFlag = GL_TRUE; } - for (i=0;i<n;i++) { - GLuint list = translate_id( i, type, lists ); - Node *n = ALLOC_INSTRUCTION( ctx, OPCODE_CALL_LIST_OFFSET, 2 ); + for (i = 0; i < n; i++) { + GLuint list = translate_id(i, type, lists); + Node *n = ALLOC_INSTRUCTION(ctx, OPCODE_CALL_LIST_OFFSET, 2); if (n) { n[1].ui = list; n[2].b = typeErrorFlag; @@ -1153,33 +987,34 @@ void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *list ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN; if (ctx->ExecuteFlag) { - CALL_CallLists(ctx->Exec, ( n, type, lists )); + CALL_CallLists(ctx->Exec, (n, type, lists)); } } -static void GLAPIENTRY save_Clear( GLbitfield mask ) +static void GLAPIENTRY +save_Clear(GLbitfield mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR, 1); if (n) { n[1].bf = mask; } if (ctx->ExecuteFlag) { - CALL_Clear(ctx->Exec, ( mask )); + CALL_Clear(ctx->Exec, (mask)); } } -static void GLAPIENTRY save_ClearAccum( GLfloat red, GLfloat green, - GLfloat blue, GLfloat alpha ) +static void GLAPIENTRY +save_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_ACCUM, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR_ACCUM, 4); if (n) { n[1].f = red; n[2].f = green; @@ -1187,18 +1022,18 @@ static void GLAPIENTRY save_ClearAccum( GLfloat red, GLfloat green, n[4].f = alpha; } if (ctx->ExecuteFlag) { - CALL_ClearAccum(ctx->Exec, ( red, green, blue, alpha )); + CALL_ClearAccum(ctx->Exec, (red, green, blue, alpha)); } } -static void GLAPIENTRY save_ClearColor( GLclampf red, GLclampf green, - GLclampf blue, GLclampf alpha ) +static void GLAPIENTRY +save_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_COLOR, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR_COLOR, 4); if (n) { n[1].f = red; n[2].f = green; @@ -1206,62 +1041,66 @@ static void GLAPIENTRY save_ClearColor( GLclampf red, GLclampf green, n[4].f = alpha; } if (ctx->ExecuteFlag) { - CALL_ClearColor(ctx->Exec, ( red, green, blue, alpha )); + CALL_ClearColor(ctx->Exec, (red, green, blue, alpha)); } } -static void GLAPIENTRY save_ClearDepth( GLclampd depth ) +static void GLAPIENTRY +save_ClearDepth(GLclampd depth) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_DEPTH, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR_DEPTH, 1); if (n) { n[1].f = (GLfloat) depth; } if (ctx->ExecuteFlag) { - CALL_ClearDepth(ctx->Exec, ( depth )); + CALL_ClearDepth(ctx->Exec, (depth)); } } -static void GLAPIENTRY save_ClearIndex( GLfloat c ) +static void GLAPIENTRY +save_ClearIndex(GLfloat c) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_INDEX, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR_INDEX, 1); if (n) { n[1].f = c; } if (ctx->ExecuteFlag) { - CALL_ClearIndex(ctx->Exec, ( c )); + CALL_ClearIndex(ctx->Exec, (c)); } } -static void GLAPIENTRY save_ClearStencil( GLint s ) +static void GLAPIENTRY +save_ClearStencil(GLint s) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLEAR_STENCIL, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLEAR_STENCIL, 1); if (n) { n[1].i = s; } if (ctx->ExecuteFlag) { - CALL_ClearStencil(ctx->Exec, ( s )); + CALL_ClearStencil(ctx->Exec, (s)); } } -static void GLAPIENTRY save_ClipPlane( GLenum plane, const GLdouble *equ ) +static void GLAPIENTRY +save_ClipPlane(GLenum plane, const GLdouble * equ) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CLIP_PLANE, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CLIP_PLANE, 5); if (n) { n[1].e = plane; n[2].f = (GLfloat) equ[0]; @@ -1270,19 +1109,20 @@ static void GLAPIENTRY save_ClipPlane( GLenum plane, const GLdouble *equ ) n[5].f = (GLfloat) equ[3]; } if (ctx->ExecuteFlag) { - CALL_ClipPlane(ctx->Exec, ( plane, equ )); + CALL_ClipPlane(ctx->Exec, (plane, equ)); } } -static void GLAPIENTRY save_ColorMask( GLboolean red, GLboolean green, - GLboolean blue, GLboolean alpha ) +static void GLAPIENTRY +save_ColorMask(GLboolean red, GLboolean green, + GLboolean blue, GLboolean alpha) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_MASK, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_MASK, 4); if (n) { n[1].b = red; n[2].b = green; @@ -1290,44 +1130,46 @@ static void GLAPIENTRY save_ColorMask( GLboolean red, GLboolean green, n[4].b = alpha; } if (ctx->ExecuteFlag) { - CALL_ColorMask(ctx->Exec, ( red, green, blue, alpha )); + CALL_ColorMask(ctx->Exec, (red, green, blue, alpha)); } } -static void GLAPIENTRY save_ColorMaterial( GLenum face, GLenum mode ) +static void GLAPIENTRY +save_ColorMaterial(GLenum face, GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_MATERIAL, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_MATERIAL, 2); if (n) { n[1].e = face; n[2].e = mode; } if (ctx->ExecuteFlag) { - CALL_ColorMaterial(ctx->Exec, ( face, mode )); + CALL_ColorMaterial(ctx->Exec, (face, mode)); } } -static void GLAPIENTRY save_ColorTable( GLenum target, GLenum internalFormat, - GLsizei width, GLenum format, GLenum type, - const GLvoid *table ) +static void GLAPIENTRY +save_ColorTable(GLenum target, GLenum internalFormat, + GLsizei width, GLenum format, GLenum type, + const GLvoid * table) { GET_CURRENT_CONTEXT(ctx); if (_mesa_is_proxy_texture(target)) { /* execute immediately */ - CALL_ColorTable(ctx->Exec, ( target, internalFormat, width, - format, type, table )); + CALL_ColorTable(ctx->Exec, (target, internalFormat, width, + format, type, table)); } else { GLvoid *image = unpack_image(1, width, 1, 1, format, type, table, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_TABLE, 6); if (n) { n[1].e = target; n[2].e = internalFormat; @@ -1337,11 +1179,11 @@ static void GLAPIENTRY save_ColorTable( GLenum target, GLenum internalFormat, n[6].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_ColorTable(ctx->Exec, ( target, internalFormat, width, - format, type, table )); + CALL_ColorTable(ctx->Exec, (target, internalFormat, width, + format, type, table)); } } } @@ -1349,14 +1191,15 @@ static void GLAPIENTRY save_ColorTable( GLenum target, GLenum internalFormat, static void GLAPIENTRY -save_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) +save_ColorTableParameterfv(GLenum target, GLenum pname, + const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_TABLE_PARAMETER_FV, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -1372,7 +1215,7 @@ save_ColorTableParameterfv(GLenum target, GLenum pname, const GLfloat *params) } if (ctx->ExecuteFlag) { - CALL_ColorTableParameterfv(ctx->Exec, ( target, pname, params )); + CALL_ColorTableParameterfv(ctx->Exec, (target, pname, params)); } } @@ -1385,7 +1228,7 @@ save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_TABLE_PARAMETER_IV, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -1401,22 +1244,22 @@ save_ColorTableParameteriv(GLenum target, GLenum pname, const GLint *params) } if (ctx->ExecuteFlag) { - CALL_ColorTableParameteriv(ctx->Exec, ( target, pname, params )); + CALL_ColorTableParameteriv(ctx->Exec, (target, pname, params)); } } -static void GLAPIENTRY save_ColorSubTable( GLenum target, GLsizei start, GLsizei count, - GLenum format, GLenum type, - const GLvoid *table) +static void GLAPIENTRY +save_ColorSubTable(GLenum target, GLsizei start, GLsizei count, + GLenum format, GLenum type, const GLvoid * table) { GET_CURRENT_CONTEXT(ctx); GLvoid *image = unpack_image(1, count, 1, 1, format, type, table, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COLOR_SUB_TABLE, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COLOR_SUB_TABLE, 6); if (n) { n[1].e = target; n[2].i = start; @@ -1426,10 +1269,11 @@ static void GLAPIENTRY save_ColorSubTable( GLenum target, GLsizei start, GLsizei n[6].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_ColorSubTable(ctx->Exec, (target, start, count, format, type, table)); + CALL_ColorSubTable(ctx->Exec, + (target, start, count, format, type, table)); } } @@ -1442,7 +1286,7 @@ save_CopyColorSubTable(GLenum target, GLsizei start, Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_COLOR_SUB_TABLE, 5); if (n) { n[1].e = target; n[2].i = start; @@ -1464,7 +1308,7 @@ save_CopyColorTable(GLenum target, GLenum internalformat, Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_COLOR_TABLE, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_COLOR_TABLE, 5); if (n) { n[1].e = target; n[2].e = internalformat; @@ -1480,14 +1324,14 @@ save_CopyColorTable(GLenum target, GLenum internalformat, static void GLAPIENTRY save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, - GLenum format, GLenum type, const GLvoid *filter) + GLenum format, GLenum type, const GLvoid * filter) { GET_CURRENT_CONTEXT(ctx); GLvoid *image = unpack_image(1, width, 1, 1, format, type, filter, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_FILTER_1D, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_FILTER_1D, 6); if (n) { n[1].e = target; n[2].e = internalFormat; @@ -1497,11 +1341,11 @@ save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, n[6].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_ConvolutionFilter1D(ctx->Exec, ( target, internalFormat, width, - format, type, filter )); + CALL_ConvolutionFilter1D(ctx->Exec, (target, internalFormat, width, + format, type, filter)); } } @@ -1509,14 +1353,14 @@ save_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, static void GLAPIENTRY save_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, - GLenum type, const GLvoid *filter) + GLenum type, const GLvoid * filter) { GET_CURRENT_CONTEXT(ctx); GLvoid *image = unpack_image(2, width, height, 1, format, type, filter, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_FILTER_2D, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_FILTER_2D, 7); if (n) { n[1].e = target; n[2].e = internalFormat; @@ -1527,11 +1371,12 @@ save_ConvolutionFilter2D(GLenum target, GLenum internalFormat, n[7].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_ConvolutionFilter2D(ctx->Exec, ( target, internalFormat, width, height, - format, type, filter )); + CALL_ConvolutionFilter2D(ctx->Exec, + (target, internalFormat, width, height, format, + type, filter)); } } @@ -1542,14 +1387,14 @@ save_ConvolutionParameteri(GLenum target, GLenum pname, GLint param) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_PARAMETER_I, 3); if (n) { n[1].e = target; n[2].e = pname; n[3].i = param; } if (ctx->ExecuteFlag) { - CALL_ConvolutionParameteri(ctx->Exec, ( target, pname, param )); + CALL_ConvolutionParameteri(ctx->Exec, (target, pname, param)); } } @@ -1560,7 +1405,7 @@ save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_PARAMETER_IV, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -1577,7 +1422,7 @@ save_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) } } if (ctx->ExecuteFlag) { - CALL_ConvolutionParameteriv(ctx->Exec, ( target, pname, params )); + CALL_ConvolutionParameteriv(ctx->Exec, (target, pname, params)); } } @@ -1588,25 +1433,26 @@ save_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat param) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_PARAMETER_F, 3); if (n) { n[1].e = target; n[2].e = pname; n[3].f = param; } if (ctx->ExecuteFlag) { - CALL_ConvolutionParameterf(ctx->Exec, ( target, pname, param )); + CALL_ConvolutionParameterf(ctx->Exec, (target, pname, param)); } } static void GLAPIENTRY -save_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) +save_ConvolutionParameterfv(GLenum target, GLenum pname, + const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CONVOLUTION_PARAMETER_FV, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -1623,19 +1469,18 @@ save_ConvolutionParameterfv(GLenum target, GLenum pname, const GLfloat *params) } } if (ctx->ExecuteFlag) { - CALL_ConvolutionParameterfv(ctx->Exec, ( target, pname, params )); + CALL_ConvolutionParameterfv(ctx->Exec, (target, pname, params)); } } static void GLAPIENTRY -save_CopyPixels( GLint x, GLint y, - GLsizei width, GLsizei height, GLenum type ) +save_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_PIXELS, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_PIXELS, 5); if (n) { n[1].i = x; n[2].i = y; @@ -1644,20 +1489,20 @@ save_CopyPixels( GLint x, GLint y, n[5].e = type; } if (ctx->ExecuteFlag) { - CALL_CopyPixels(ctx->Exec, ( x, y, width, height, type )); + CALL_CopyPixels(ctx->Exec, (x, y, width, height, type)); } } static void GLAPIENTRY -save_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat, - GLint x, GLint y, GLsizei width, GLint border ) +save_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat, + GLint x, GLint y, GLsizei width, GLint border) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_IMAGE1D, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_TEX_IMAGE1D, 7); if (n) { n[1].e = target; n[2].i = level; @@ -1668,22 +1513,22 @@ save_CopyTexImage1D( GLenum target, GLint level, GLenum internalformat, n[7].i = border; } if (ctx->ExecuteFlag) { - CALL_CopyTexImage1D(ctx->Exec, ( target, level, internalformat, - x, y, width, border )); + CALL_CopyTexImage1D(ctx->Exec, (target, level, internalformat, + x, y, width, border)); } } static void GLAPIENTRY -save_CopyTexImage2D( GLenum target, GLint level, - GLenum internalformat, - GLint x, GLint y, GLsizei width, - GLsizei height, GLint border ) +save_CopyTexImage2D(GLenum target, GLint level, + GLenum internalformat, + GLint x, GLint y, GLsizei width, + GLsizei height, GLint border) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_IMAGE2D, 8 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_TEX_IMAGE2D, 8); if (n) { n[1].e = target; n[2].i = level; @@ -1695,22 +1540,21 @@ save_CopyTexImage2D( GLenum target, GLint level, n[8].i = border; } if (ctx->ExecuteFlag) { - CALL_CopyTexImage2D(ctx->Exec, ( target, level, internalformat, - x, y, width, height, border )); + CALL_CopyTexImage2D(ctx->Exec, (target, level, internalformat, + x, y, width, height, border)); } } static void GLAPIENTRY -save_CopyTexSubImage1D( GLenum target, GLint level, - GLint xoffset, GLint x, GLint y, - GLsizei width ) +save_CopyTexSubImage1D(GLenum target, GLint level, + GLint xoffset, GLint x, GLint y, GLsizei width) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE1D, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_TEX_SUB_IMAGE1D, 6); if (n) { n[1].e = target; n[2].i = level; @@ -1720,21 +1564,21 @@ save_CopyTexSubImage1D( GLenum target, GLint level, n[6].i = width; } if (ctx->ExecuteFlag) { - CALL_CopyTexSubImage1D(ctx->Exec, ( target, level, xoffset, x, y, width )); + CALL_CopyTexSubImage1D(ctx->Exec, + (target, level, xoffset, x, y, width)); } } static void GLAPIENTRY -save_CopyTexSubImage2D( GLenum target, GLint level, - GLint xoffset, GLint yoffset, - GLint x, GLint y, - GLsizei width, GLint height ) +save_CopyTexSubImage2D(GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLint x, GLint y, GLsizei width, GLint height) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE2D, 8 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_TEX_SUB_IMAGE2D, 8); if (n) { n[1].e = target; n[2].i = level; @@ -1746,22 +1590,21 @@ save_CopyTexSubImage2D( GLenum target, GLint level, n[8].i = height; } if (ctx->ExecuteFlag) { - CALL_CopyTexSubImage2D(ctx->Exec, ( target, level, xoffset, yoffset, - x, y, width, height )); + CALL_CopyTexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset, + x, y, width, height)); } } static void GLAPIENTRY -save_CopyTexSubImage3D( GLenum target, GLint level, - GLint xoffset, GLint yoffset, GLint zoffset, - GLint x, GLint y, - GLsizei width, GLint height ) +save_CopyTexSubImage3D(GLenum target, GLint level, + GLint xoffset, GLint yoffset, GLint zoffset, + GLint x, GLint y, GLsizei width, GLint height) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COPY_TEX_SUB_IMAGE3D, 9 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COPY_TEX_SUB_IMAGE3D, 9); if (n) { n[1].e = target; n[2].i = level; @@ -1774,114 +1617,120 @@ save_CopyTexSubImage3D( GLenum target, GLint level, n[9].i = height; } if (ctx->ExecuteFlag) { - CALL_CopyTexSubImage3D(ctx->Exec, ( target, level, - xoffset, yoffset, zoffset, - x, y, width, height )); + CALL_CopyTexSubImage3D(ctx->Exec, (target, level, + xoffset, yoffset, zoffset, + x, y, width, height)); } } -static void GLAPIENTRY save_CullFace( GLenum mode ) +static void GLAPIENTRY +save_CullFace(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_CULL_FACE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_CULL_FACE, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_CullFace(ctx->Exec, ( mode )); + CALL_CullFace(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_DepthFunc( GLenum func ) +static void GLAPIENTRY +save_DepthFunc(GLenum func) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_FUNC, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DEPTH_FUNC, 1); if (n) { n[1].e = func; } if (ctx->ExecuteFlag) { - CALL_DepthFunc(ctx->Exec, ( func )); + CALL_DepthFunc(ctx->Exec, (func)); } } -static void GLAPIENTRY save_DepthMask( GLboolean mask ) +static void GLAPIENTRY +save_DepthMask(GLboolean mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_MASK, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DEPTH_MASK, 1); if (n) { n[1].b = mask; } if (ctx->ExecuteFlag) { - CALL_DepthMask(ctx->Exec, ( mask )); + CALL_DepthMask(ctx->Exec, (mask)); } } -static void GLAPIENTRY save_DepthRange( GLclampd nearval, GLclampd farval ) +static void GLAPIENTRY +save_DepthRange(GLclampd nearval, GLclampd farval) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_RANGE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DEPTH_RANGE, 2); if (n) { n[1].f = (GLfloat) nearval; n[2].f = (GLfloat) farval; } if (ctx->ExecuteFlag) { - CALL_DepthRange(ctx->Exec, ( nearval, farval )); + CALL_DepthRange(ctx->Exec, (nearval, farval)); } } -static void GLAPIENTRY save_Disable( GLenum cap ) +static void GLAPIENTRY +save_Disable(GLenum cap) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DISABLE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DISABLE, 1); if (n) { n[1].e = cap; } if (ctx->ExecuteFlag) { - CALL_Disable(ctx->Exec, ( cap )); + CALL_Disable(ctx->Exec, (cap)); } } -static void GLAPIENTRY save_DrawBuffer( GLenum mode ) +static void GLAPIENTRY +save_DrawBuffer(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DRAW_BUFFER, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DRAW_BUFFER, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_DrawBuffer(ctx->Exec, ( mode )); + CALL_DrawBuffer(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_DrawPixels( GLsizei width, GLsizei height, - GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_DrawPixels(GLsizei width, GLsizei height, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); GLvoid *image = unpack_image(2, width, height, 1, format, type, pixels, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DRAW_PIXELS, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DRAW_PIXELS, 5); if (n) { n[1].i = width; n[2].i = height; @@ -1890,54 +1739,57 @@ static void GLAPIENTRY save_DrawPixels( GLsizei width, GLsizei height, n[5].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_DrawPixels(ctx->Exec, ( width, height, format, type, pixels )); + CALL_DrawPixels(ctx->Exec, (width, height, format, type, pixels)); } } -static void GLAPIENTRY save_Enable( GLenum cap ) +static void GLAPIENTRY +save_Enable(GLenum cap) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ENABLE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ENABLE, 1); if (n) { n[1].e = cap; } if (ctx->ExecuteFlag) { - CALL_Enable(ctx->Exec, ( cap )); + CALL_Enable(ctx->Exec, (cap)); } } -void GLAPIENTRY _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 ) +static void GLAPIENTRY +_mesa_save_EvalMesh1(GLenum mode, GLint i1, GLint i2) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVALMESH1, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVALMESH1, 3); if (n) { n[1].e = mode; n[2].i = i1; n[3].i = i2; } if (ctx->ExecuteFlag) { - CALL_EvalMesh1(ctx->Exec, ( mode, i1, i2 )); + CALL_EvalMesh1(ctx->Exec, (mode, i1, i2)); } } -void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2 ) +static void GLAPIENTRY +_mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVALMESH2, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVALMESH2, 5); if (n) { n[1].e = mode; n[2].i = i1; @@ -1946,19 +1798,20 @@ void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, n[5].i = j2; } if (ctx->ExecuteFlag) { - CALL_EvalMesh2(ctx->Exec, ( mode, i1, i2, j1, j2 )); + CALL_EvalMesh2(ctx->Exec, (mode, i1, i2, j1, j2)); } } -static void GLAPIENTRY save_Fogfv( GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_Fogfv(GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_FOG, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_FOG, 5); if (n) { n[1].e = pname; n[2].f = params[0]; @@ -1967,71 +1820,75 @@ static void GLAPIENTRY save_Fogfv( GLenum pname, const GLfloat *params ) n[5].f = params[3]; } if (ctx->ExecuteFlag) { - CALL_Fogfv(ctx->Exec, ( pname, params )); + CALL_Fogfv(ctx->Exec, (pname, params)); } } -static void GLAPIENTRY save_Fogf( GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_Fogf(GLenum pname, GLfloat param) { save_Fogfv(pname, ¶m); } -static void GLAPIENTRY save_Fogiv(GLenum pname, const GLint *params ) +static void GLAPIENTRY +save_Fogiv(GLenum pname, const GLint *params) { GLfloat p[4]; switch (pname) { - case GL_FOG_MODE: - case GL_FOG_DENSITY: - case GL_FOG_START: - case GL_FOG_END: - case GL_FOG_INDEX: - p[0] = (GLfloat) *params; - break; - case GL_FOG_COLOR: - p[0] = INT_TO_FLOAT( params[0] ); - p[1] = INT_TO_FLOAT( params[1] ); - p[2] = INT_TO_FLOAT( params[2] ); - p[3] = INT_TO_FLOAT( params[3] ); - break; - default: - /* Error will be caught later in gl_Fogfv */ - ; + case GL_FOG_MODE: + case GL_FOG_DENSITY: + case GL_FOG_START: + case GL_FOG_END: + case GL_FOG_INDEX: + p[0] = (GLfloat) *params; + break; + case GL_FOG_COLOR: + p[0] = INT_TO_FLOAT(params[0]); + p[1] = INT_TO_FLOAT(params[1]); + p[2] = INT_TO_FLOAT(params[2]); + p[3] = INT_TO_FLOAT(params[3]); + break; + default: + /* Error will be caught later in gl_Fogfv */ + ; } save_Fogfv(pname, p); } -static void GLAPIENTRY save_Fogi(GLenum pname, GLint param ) +static void GLAPIENTRY +save_Fogi(GLenum pname, GLint param) { save_Fogiv(pname, ¶m); } -static void GLAPIENTRY save_FrontFace( GLenum mode ) +static void GLAPIENTRY +save_FrontFace(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_FRONT_FACE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_FRONT_FACE, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_FrontFace(ctx->Exec, ( mode )); + CALL_FrontFace(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_Frustum( GLdouble left, GLdouble right, - GLdouble bottom, GLdouble top, - GLdouble nearval, GLdouble farval ) +static void GLAPIENTRY +save_Frustum(GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_FRUSTUM, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_FRUSTUM, 6); if (n) { n[1].f = (GLfloat) left; n[2].f = (GLfloat) right; @@ -2041,35 +1898,37 @@ static void GLAPIENTRY save_Frustum( GLdouble left, GLdouble right, n[6].f = (GLfloat) farval; } if (ctx->ExecuteFlag) { - CALL_Frustum(ctx->Exec, ( left, right, bottom, top, nearval, farval )); + CALL_Frustum(ctx->Exec, (left, right, bottom, top, nearval, farval)); } } -static void GLAPIENTRY save_Hint( GLenum target, GLenum mode ) +static void GLAPIENTRY +save_Hint(GLenum target, GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_HINT, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_HINT, 2); if (n) { n[1].e = target; n[2].e = mode; } if (ctx->ExecuteFlag) { - CALL_Hint(ctx->Exec, ( target, mode )); + CALL_Hint(ctx->Exec, (target, mode)); } } static void GLAPIENTRY -save_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean sink) +save_Histogram(GLenum target, GLsizei width, GLenum internalFormat, + GLboolean sink) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_HISTOGRAM, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_HISTOGRAM, 4); if (n) { n[1].e = target; n[2].i = width; @@ -2077,147 +1936,154 @@ save_Histogram(GLenum target, GLsizei width, GLenum internalFormat, GLboolean si n[4].b = sink; } if (ctx->ExecuteFlag) { - CALL_Histogram(ctx->Exec, ( target, width, internalFormat, sink )); + CALL_Histogram(ctx->Exec, (target, width, internalFormat, sink)); } } -static void GLAPIENTRY save_IndexMask( GLuint mask ) +static void GLAPIENTRY +save_IndexMask(GLuint mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_INDEX_MASK, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_INDEX_MASK, 1); if (n) { n[1].ui = mask; } if (ctx->ExecuteFlag) { - CALL_IndexMask(ctx->Exec, ( mask )); + CALL_IndexMask(ctx->Exec, (mask)); } } -static void GLAPIENTRY save_InitNames( void ) +static void GLAPIENTRY +save_InitNames(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_INIT_NAMES, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_INIT_NAMES, 0); if (ctx->ExecuteFlag) { CALL_InitNames(ctx->Exec, ()); } } -static void GLAPIENTRY save_Lightfv( GLenum light, GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_Lightfv(GLenum light, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LIGHT, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LIGHT, 6); if (OPCODE_LIGHT) { GLint i, nParams; n[1].e = light; n[2].e = pname; switch (pname) { - case GL_AMBIENT: - nParams = 4; - break; - case GL_DIFFUSE: - nParams = 4; - break; - case GL_SPECULAR: - nParams = 4; - break; - case GL_POSITION: - nParams = 4; - break; - case GL_SPOT_DIRECTION: - nParams = 3; - break; - case GL_SPOT_EXPONENT: - nParams = 1; - break; - case GL_SPOT_CUTOFF: - nParams = 1; - break; - case GL_CONSTANT_ATTENUATION: - nParams = 1; - break; - case GL_LINEAR_ATTENUATION: - nParams = 1; - break; - case GL_QUADRATIC_ATTENUATION: - nParams = 1; - break; - default: - nParams = 0; + case GL_AMBIENT: + nParams = 4; + break; + case GL_DIFFUSE: + nParams = 4; + break; + case GL_SPECULAR: + nParams = 4; + break; + case GL_POSITION: + nParams = 4; + break; + case GL_SPOT_DIRECTION: + nParams = 3; + break; + case GL_SPOT_EXPONENT: + nParams = 1; + break; + case GL_SPOT_CUTOFF: + nParams = 1; + break; + case GL_CONSTANT_ATTENUATION: + nParams = 1; + break; + case GL_LINEAR_ATTENUATION: + nParams = 1; + break; + case GL_QUADRATIC_ATTENUATION: + nParams = 1; + break; + default: + nParams = 0; } for (i = 0; i < nParams; i++) { - n[3+i].f = params[i]; + n[3 + i].f = params[i]; } } if (ctx->ExecuteFlag) { - CALL_Lightfv(ctx->Exec, ( light, pname, params )); + CALL_Lightfv(ctx->Exec, (light, pname, params)); } } -static void GLAPIENTRY save_Lightf( GLenum light, GLenum pname, GLfloat params ) +static void GLAPIENTRY +save_Lightf(GLenum light, GLenum pname, GLfloat params) { save_Lightfv(light, pname, ¶ms); } -static void GLAPIENTRY save_Lightiv( GLenum light, GLenum pname, const GLint *params ) +static void GLAPIENTRY +save_Lightiv(GLenum light, GLenum pname, const GLint *params) { GLfloat fparam[4]; switch (pname) { - case GL_AMBIENT: - case GL_DIFFUSE: - case GL_SPECULAR: - fparam[0] = INT_TO_FLOAT( params[0] ); - fparam[1] = INT_TO_FLOAT( params[1] ); - fparam[2] = INT_TO_FLOAT( params[2] ); - fparam[3] = INT_TO_FLOAT( params[3] ); - break; - case GL_POSITION: - fparam[0] = (GLfloat) params[0]; - fparam[1] = (GLfloat) params[1]; - fparam[2] = (GLfloat) params[2]; - fparam[3] = (GLfloat) params[3]; - break; - case GL_SPOT_DIRECTION: - fparam[0] = (GLfloat) params[0]; - fparam[1] = (GLfloat) params[1]; - fparam[2] = (GLfloat) params[2]; - break; - case GL_SPOT_EXPONENT: - case GL_SPOT_CUTOFF: - case GL_CONSTANT_ATTENUATION: - case GL_LINEAR_ATTENUATION: - case GL_QUADRATIC_ATTENUATION: - fparam[0] = (GLfloat) params[0]; - break; - default: - /* error will be caught later in gl_Lightfv */ - ; + case GL_AMBIENT: + case GL_DIFFUSE: + case GL_SPECULAR: + fparam[0] = INT_TO_FLOAT(params[0]); + fparam[1] = INT_TO_FLOAT(params[1]); + fparam[2] = INT_TO_FLOAT(params[2]); + fparam[3] = INT_TO_FLOAT(params[3]); + break; + case GL_POSITION: + fparam[0] = (GLfloat) params[0]; + fparam[1] = (GLfloat) params[1]; + fparam[2] = (GLfloat) params[2]; + fparam[3] = (GLfloat) params[3]; + break; + case GL_SPOT_DIRECTION: + fparam[0] = (GLfloat) params[0]; + fparam[1] = (GLfloat) params[1]; + fparam[2] = (GLfloat) params[2]; + break; + case GL_SPOT_EXPONENT: + case GL_SPOT_CUTOFF: + case GL_CONSTANT_ATTENUATION: + case GL_LINEAR_ATTENUATION: + case GL_QUADRATIC_ATTENUATION: + fparam[0] = (GLfloat) params[0]; + break; + default: + /* error will be caught later in gl_Lightfv */ + ; } - save_Lightfv( light, pname, fparam ); + save_Lightfv(light, pname, fparam); } -static void GLAPIENTRY save_Lighti( GLenum light, GLenum pname, GLint param ) +static void GLAPIENTRY +save_Lighti(GLenum light, GLenum pname, GLint param) { - save_Lightiv( light, pname, ¶m ); + save_Lightiv(light, pname, ¶m); } -static void GLAPIENTRY save_LightModelfv( GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_LightModelfv(GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LIGHT_MODEL, 5 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LIGHT_MODEL, 5); if (n) { n[1].e = pname; n[2].f = params[0]; @@ -2226,122 +2092,131 @@ static void GLAPIENTRY save_LightModelfv( GLenum pname, const GLfloat *params ) n[5].f = params[3]; } if (ctx->ExecuteFlag) { - CALL_LightModelfv(ctx->Exec, ( pname, params )); + CALL_LightModelfv(ctx->Exec, (pname, params)); } } -static void GLAPIENTRY save_LightModelf( GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_LightModelf(GLenum pname, GLfloat param) { save_LightModelfv(pname, ¶m); } -static void GLAPIENTRY save_LightModeliv( GLenum pname, const GLint *params ) +static void GLAPIENTRY +save_LightModeliv(GLenum pname, const GLint *params) { GLfloat fparam[4]; switch (pname) { - case GL_LIGHT_MODEL_AMBIENT: - fparam[0] = INT_TO_FLOAT( params[0] ); - fparam[1] = INT_TO_FLOAT( params[1] ); - fparam[2] = INT_TO_FLOAT( params[2] ); - fparam[3] = INT_TO_FLOAT( params[3] ); - break; - case GL_LIGHT_MODEL_LOCAL_VIEWER: - case GL_LIGHT_MODEL_TWO_SIDE: - case GL_LIGHT_MODEL_COLOR_CONTROL: - fparam[0] = (GLfloat) params[0]; - break; - default: - /* Error will be caught later in gl_LightModelfv */ - ; + case GL_LIGHT_MODEL_AMBIENT: + fparam[0] = INT_TO_FLOAT(params[0]); + fparam[1] = INT_TO_FLOAT(params[1]); + fparam[2] = INT_TO_FLOAT(params[2]); + fparam[3] = INT_TO_FLOAT(params[3]); + break; + case GL_LIGHT_MODEL_LOCAL_VIEWER: + case GL_LIGHT_MODEL_TWO_SIDE: + case GL_LIGHT_MODEL_COLOR_CONTROL: + fparam[0] = (GLfloat) params[0]; + break; + default: + /* Error will be caught later in gl_LightModelfv */ + ; } save_LightModelfv(pname, fparam); } -static void GLAPIENTRY save_LightModeli( GLenum pname, GLint param ) +static void GLAPIENTRY +save_LightModeli(GLenum pname, GLint param) { save_LightModeliv(pname, ¶m); } -static void GLAPIENTRY save_LineStipple( GLint factor, GLushort pattern ) +static void GLAPIENTRY +save_LineStipple(GLint factor, GLushort pattern) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LINE_STIPPLE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LINE_STIPPLE, 2); if (n) { n[1].i = factor; n[2].us = pattern; } if (ctx->ExecuteFlag) { - CALL_LineStipple(ctx->Exec, ( factor, pattern )); + CALL_LineStipple(ctx->Exec, (factor, pattern)); } } -static void GLAPIENTRY save_LineWidth( GLfloat width ) +static void GLAPIENTRY +save_LineWidth(GLfloat width) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LINE_WIDTH, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LINE_WIDTH, 1); if (n) { n[1].f = width; } if (ctx->ExecuteFlag) { - CALL_LineWidth(ctx->Exec, ( width )); + CALL_LineWidth(ctx->Exec, (width)); } } -static void GLAPIENTRY save_ListBase( GLuint base ) +static void GLAPIENTRY +save_ListBase(GLuint base) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LIST_BASE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LIST_BASE, 1); if (n) { n[1].ui = base; } if (ctx->ExecuteFlag) { - CALL_ListBase(ctx->Exec, ( base )); + CALL_ListBase(ctx->Exec, (base)); } } -static void GLAPIENTRY save_LoadIdentity( void ) +static void GLAPIENTRY +save_LoadIdentity(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_IDENTITY, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_LOAD_IDENTITY, 0); if (ctx->ExecuteFlag) { CALL_LoadIdentity(ctx->Exec, ()); } } -static void GLAPIENTRY save_LoadMatrixf( const GLfloat *m ) +static void GLAPIENTRY +save_LoadMatrixf(const GLfloat * m) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_MATRIX, 16 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LOAD_MATRIX, 16); if (n) { GLuint i; - for (i=0;i<16;i++) { - n[1+i].f = m[i]; + for (i = 0; i < 16; i++) { + n[1 + i].f = m[i]; } } if (ctx->ExecuteFlag) { - CALL_LoadMatrixf(ctx->Exec, ( m )); + CALL_LoadMatrixf(ctx->Exec, (m)); } } -static void GLAPIENTRY save_LoadMatrixd( const GLdouble *m ) +static void GLAPIENTRY +save_LoadMatrixd(const GLdouble * m) { GLfloat f[16]; GLint i; @@ -2352,172 +2227,181 @@ static void GLAPIENTRY save_LoadMatrixd( const GLdouble *m ) } -static void GLAPIENTRY save_LoadName( GLuint name ) +static void GLAPIENTRY +save_LoadName(GLuint name) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_NAME, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LOAD_NAME, 1); if (n) { n[1].ui = name; } if (ctx->ExecuteFlag) { - CALL_LoadName(ctx->Exec, ( name )); + CALL_LoadName(ctx->Exec, (name)); } } -static void GLAPIENTRY save_LogicOp( GLenum opcode ) +static void GLAPIENTRY +save_LogicOp(GLenum opcode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LOGIC_OP, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LOGIC_OP, 1); if (n) { n[1].e = opcode; } if (ctx->ExecuteFlag) { - CALL_LogicOp(ctx->Exec, ( opcode )); + CALL_LogicOp(ctx->Exec, (opcode)); } } -static void GLAPIENTRY save_Map1d( GLenum target, GLdouble u1, GLdouble u2, GLint stride, - GLint order, const GLdouble *points) +static void GLAPIENTRY +save_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, + GLint order, const GLdouble * points) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP1, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAP1, 6); if (n) { - GLfloat *pnts = _mesa_copy_map_points1d( target, stride, order, points ); + GLfloat *pnts = _mesa_copy_map_points1d(target, stride, order, points); n[1].e = target; n[2].f = (GLfloat) u1; n[3].f = (GLfloat) u2; - n[4].i = _mesa_evaluator_components(target); /* stride */ + n[4].i = _mesa_evaluator_components(target); /* stride */ n[5].i = order; n[6].data = (void *) pnts; } if (ctx->ExecuteFlag) { - CALL_Map1d(ctx->Exec, ( target, u1, u2, stride, order, points )); + CALL_Map1d(ctx->Exec, (target, u1, u2, stride, order, points)); } } -static void GLAPIENTRY save_Map1f( GLenum target, GLfloat u1, GLfloat u2, GLint stride, - GLint order, const GLfloat *points) +static void GLAPIENTRY +save_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, + GLint order, const GLfloat * points) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP1, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAP1, 6); if (n) { - GLfloat *pnts = _mesa_copy_map_points1f( target, stride, order, points ); + GLfloat *pnts = _mesa_copy_map_points1f(target, stride, order, points); n[1].e = target; n[2].f = u1; n[3].f = u2; - n[4].i = _mesa_evaluator_components(target); /* stride */ + n[4].i = _mesa_evaluator_components(target); /* stride */ n[5].i = order; n[6].data = (void *) pnts; } if (ctx->ExecuteFlag) { - CALL_Map1f(ctx->Exec, ( target, u1, u2, stride, order, points )); + CALL_Map1f(ctx->Exec, (target, u1, u2, stride, order, points)); } } -static void GLAPIENTRY save_Map2d( GLenum target, - GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, - GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, - const GLdouble *points ) +static void GLAPIENTRY +save_Map2d(GLenum target, + GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, + GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, + const GLdouble * points) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP2, 10 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAP2, 10); if (n) { - GLfloat *pnts = _mesa_copy_map_points2d( target, ustride, uorder, - vstride, vorder, points ); + GLfloat *pnts = _mesa_copy_map_points2d(target, ustride, uorder, + vstride, vorder, points); n[1].e = target; n[2].f = (GLfloat) u1; n[3].f = (GLfloat) u2; n[4].f = (GLfloat) v1; n[5].f = (GLfloat) v2; /* XXX verify these strides are correct */ - n[6].i = _mesa_evaluator_components(target) * vorder; /*ustride*/ - n[7].i = _mesa_evaluator_components(target); /*vstride*/ + n[6].i = _mesa_evaluator_components(target) * vorder; /*ustride */ + n[7].i = _mesa_evaluator_components(target); /*vstride */ n[8].i = uorder; n[9].i = vorder; n[10].data = (void *) pnts; } if (ctx->ExecuteFlag) { - CALL_Map2d(ctx->Exec, ( target, - u1, u2, ustride, uorder, - v1, v2, vstride, vorder, points )); + CALL_Map2d(ctx->Exec, (target, + u1, u2, ustride, uorder, + v1, v2, vstride, vorder, points)); } } -static void GLAPIENTRY save_Map2f( GLenum target, - GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, - GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, - const GLfloat *points ) +static void GLAPIENTRY +save_Map2f(GLenum target, + GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, + GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, + const GLfloat * points) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAP2, 10 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAP2, 10); if (n) { - GLfloat *pnts = _mesa_copy_map_points2f( target, ustride, uorder, - vstride, vorder, points ); + GLfloat *pnts = _mesa_copy_map_points2f(target, ustride, uorder, + vstride, vorder, points); n[1].e = target; n[2].f = u1; n[3].f = u2; n[4].f = v1; n[5].f = v2; /* XXX verify these strides are correct */ - n[6].i = _mesa_evaluator_components(target) * vorder; /*ustride*/ - n[7].i = _mesa_evaluator_components(target); /*vstride*/ + n[6].i = _mesa_evaluator_components(target) * vorder; /*ustride */ + n[7].i = _mesa_evaluator_components(target); /*vstride */ n[8].i = uorder; n[9].i = vorder; n[10].data = (void *) pnts; } if (ctx->ExecuteFlag) { - CALL_Map2f(ctx->Exec, ( target, u1, u2, ustride, uorder, - v1, v2, vstride, vorder, points )); + CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder, + v1, v2, vstride, vorder, points)); } } -static void GLAPIENTRY save_MapGrid1f( GLint un, GLfloat u1, GLfloat u2 ) +static void GLAPIENTRY +save_MapGrid1f(GLint un, GLfloat u1, GLfloat u2) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAPGRID1, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAPGRID1, 3); if (n) { n[1].i = un; n[2].f = u1; n[3].f = u2; } if (ctx->ExecuteFlag) { - CALL_MapGrid1f(ctx->Exec, ( un, u1, u2 )); + CALL_MapGrid1f(ctx->Exec, (un, u1, u2)); } } -static void GLAPIENTRY save_MapGrid1d( GLint un, GLdouble u1, GLdouble u2 ) +static void GLAPIENTRY +save_MapGrid1d(GLint un, GLdouble u1, GLdouble u2) { save_MapGrid1f(un, (GLfloat) u1, (GLfloat) u2); } -static void GLAPIENTRY save_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, - GLint vn, GLfloat v1, GLfloat v2 ) +static void GLAPIENTRY +save_MapGrid2f(GLint un, GLfloat u1, GLfloat u2, + GLint vn, GLfloat v1, GLfloat v2) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MAPGRID2, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MAPGRID2, 6); if (n) { n[1].i = un; n[2].f = u1; @@ -2527,31 +2411,33 @@ static void GLAPIENTRY save_MapGrid2f( GLint un, GLfloat u1, GLfloat u2, n[6].f = v2; } if (ctx->ExecuteFlag) { - CALL_MapGrid2f(ctx->Exec, ( un, u1, u2, vn, v1, v2 )); + CALL_MapGrid2f(ctx->Exec, (un, u1, u2, vn, v1, v2)); } } -static void GLAPIENTRY save_MapGrid2d( GLint un, GLdouble u1, GLdouble u2, - GLint vn, GLdouble v1, GLdouble v2 ) +static void GLAPIENTRY +save_MapGrid2d(GLint un, GLdouble u1, GLdouble u2, + GLint vn, GLdouble v1, GLdouble v2) { save_MapGrid2f(un, (GLfloat) u1, (GLfloat) u2, - vn, (GLfloat) v1, (GLfloat) v2); + vn, (GLfloat) v1, (GLfloat) v2); } -static void GLAPIENTRY save_MatrixMode( GLenum mode ) +static void GLAPIENTRY +save_MatrixMode(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MATRIX_MODE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MATRIX_MODE, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_MatrixMode(ctx->Exec, ( mode )); + CALL_MatrixMode(ctx->Exec, (mode)); } } @@ -2563,37 +2449,39 @@ save_Minmax(GLenum target, GLenum internalFormat, GLboolean sink) Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MIN_MAX, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MIN_MAX, 3); if (n) { n[1].e = target; n[2].e = internalFormat; n[3].b = sink; } if (ctx->ExecuteFlag) { - CALL_Minmax(ctx->Exec, ( target, internalFormat, sink )); + CALL_Minmax(ctx->Exec, (target, internalFormat, sink)); } } -static void GLAPIENTRY save_MultMatrixf( const GLfloat *m ) +static void GLAPIENTRY +save_MultMatrixf(const GLfloat * m) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_MULT_MATRIX, 16 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MULT_MATRIX, 16); if (n) { GLuint i; - for (i=0;i<16;i++) { - n[1+i].f = m[i]; + for (i = 0; i < 16; i++) { + n[1 + i].f = m[i]; } } if (ctx->ExecuteFlag) { - CALL_MultMatrixf(ctx->Exec, ( m )); + CALL_MultMatrixf(ctx->Exec, (m)); } } -static void GLAPIENTRY save_MultMatrixd( const GLdouble *m ) +static void GLAPIENTRY +save_MultMatrixd(const GLdouble * m) { GLfloat f[16]; GLint i; @@ -2604,25 +2492,26 @@ static void GLAPIENTRY save_MultMatrixd( const GLdouble *m ) } -static void GLAPIENTRY save_NewList( GLuint list, GLenum mode ) +static void GLAPIENTRY +save_NewList(GLuint list, GLenum mode) { GET_CURRENT_CONTEXT(ctx); /* It's an error to call this function while building a display list */ - _mesa_error( ctx, GL_INVALID_OPERATION, "glNewList" ); + _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList"); (void) list; (void) mode; } -static void GLAPIENTRY save_Ortho( GLdouble left, GLdouble right, - GLdouble bottom, GLdouble top, - GLdouble nearval, GLdouble farval ) +static void GLAPIENTRY +save_Ortho(GLdouble left, GLdouble right, + GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ORTHO, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ORTHO, 6); if (n) { n[1].f = (GLfloat) left; n[2].f = (GLfloat) right; @@ -2632,43 +2521,43 @@ static void GLAPIENTRY save_Ortho( GLdouble left, GLdouble right, n[6].f = (GLfloat) farval; } if (ctx->ExecuteFlag) { - CALL_Ortho(ctx->Exec, ( left, right, bottom, top, nearval, farval )); + CALL_Ortho(ctx->Exec, (left, right, bottom, top, nearval, farval)); } } static void GLAPIENTRY -save_PixelMapfv( GLenum map, GLint mapsize, const GLfloat *values ) +save_PixelMapfv(GLenum map, GLint mapsize, const GLfloat *values) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_MAP, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PIXEL_MAP, 3); if (n) { n[1].e = map; n[2].i = mapsize; - n[3].data = (void *) MALLOC( mapsize * sizeof(GLfloat) ); - MEMCPY( n[3].data, (void *) values, mapsize * sizeof(GLfloat) ); + n[3].data = (void *) _mesa_malloc(mapsize * sizeof(GLfloat)); + MEMCPY(n[3].data, (void *) values, mapsize * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_PixelMapfv(ctx->Exec, ( map, mapsize, values )); + CALL_PixelMapfv(ctx->Exec, (map, mapsize, values)); } } static void GLAPIENTRY -save_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values ) +save_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; GLint i; - if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) { - for (i=0;i<mapsize;i++) { + if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) { + for (i = 0; i < mapsize; i++) { fvalues[i] = (GLfloat) values[i]; } } else { - for (i=0;i<mapsize;i++) { - fvalues[i] = UINT_TO_FLOAT( values[i] ); + for (i = 0; i < mapsize; i++) { + fvalues[i] = UINT_TO_FLOAT(values[i]); } } save_PixelMapfv(map, mapsize, fvalues); @@ -2680,14 +2569,14 @@ save_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values) { GLfloat fvalues[MAX_PIXEL_MAP_TABLE]; GLint i; - if (map==GL_PIXEL_MAP_I_TO_I || map==GL_PIXEL_MAP_S_TO_S) { - for (i=0;i<mapsize;i++) { + if (map == GL_PIXEL_MAP_I_TO_I || map == GL_PIXEL_MAP_S_TO_S) { + for (i = 0; i < mapsize; i++) { fvalues[i] = (GLfloat) values[i]; } } else { - for (i=0;i<mapsize;i++) { - fvalues[i] = USHORT_TO_FLOAT( values[i] ); + for (i = 0; i < mapsize; i++) { + fvalues[i] = USHORT_TO_FLOAT(values[i]); } } save_PixelMapfv(map, mapsize, fvalues); @@ -2695,53 +2584,53 @@ save_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values) static void GLAPIENTRY -save_PixelTransferf( GLenum pname, GLfloat param ) +save_PixelTransferf(GLenum pname, GLfloat param) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_TRANSFER, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PIXEL_TRANSFER, 2); if (n) { n[1].e = pname; n[2].f = param; } if (ctx->ExecuteFlag) { - CALL_PixelTransferf(ctx->Exec, ( pname, param )); + CALL_PixelTransferf(ctx->Exec, (pname, param)); } } static void GLAPIENTRY -save_PixelTransferi( GLenum pname, GLint param ) +save_PixelTransferi(GLenum pname, GLint param) { - save_PixelTransferf( pname, (GLfloat) param ); + save_PixelTransferf(pname, (GLfloat) param); } static void GLAPIENTRY -save_PixelZoom( GLfloat xfactor, GLfloat yfactor ) +save_PixelZoom(GLfloat xfactor, GLfloat yfactor) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PIXEL_ZOOM, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PIXEL_ZOOM, 2); if (n) { n[1].f = xfactor; n[2].f = yfactor; } if (ctx->ExecuteFlag) { - CALL_PixelZoom(ctx->Exec, ( xfactor, yfactor )); + CALL_PixelZoom(ctx->Exec, (xfactor, yfactor)); } } static void GLAPIENTRY -save_PointParameterfvEXT( GLenum pname, const GLfloat *params ) +save_PointParameterfvEXT(GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_POINT_PARAMETERS, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_POINT_PARAMETERS, 4); if (n) { n[1].e = pname; n[2].f = params[0]; @@ -2749,56 +2638,61 @@ save_PointParameterfvEXT( GLenum pname, const GLfloat *params ) n[4].f = params[2]; } if (ctx->ExecuteFlag) { - CALL_PointParameterfvEXT(ctx->Exec, ( pname, params )); + CALL_PointParameterfvEXT(ctx->Exec, (pname, params)); } } -static void GLAPIENTRY save_PointParameterfEXT( GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_PointParameterfEXT(GLenum pname, GLfloat param) { save_PointParameterfvEXT(pname, ¶m); } -static void GLAPIENTRY save_PointParameteriNV( GLenum pname, GLint param ) +static void GLAPIENTRY +save_PointParameteriNV(GLenum pname, GLint param) { GLfloat p = (GLfloat) param; save_PointParameterfvEXT(pname, &p); } -static void GLAPIENTRY save_PointParameterivNV( GLenum pname, const GLint *param ) +static void GLAPIENTRY +save_PointParameterivNV(GLenum pname, const GLint * param) { GLfloat p = (GLfloat) param[0]; save_PointParameterfvEXT(pname, &p); } -static void GLAPIENTRY save_PointSize( GLfloat size ) +static void GLAPIENTRY +save_PointSize(GLfloat size) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_POINT_SIZE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_POINT_SIZE, 1); if (n) { n[1].f = size; } if (ctx->ExecuteFlag) { - CALL_PointSize(ctx->Exec, ( size )); + CALL_PointSize(ctx->Exec, (size)); } } -static void GLAPIENTRY save_PolygonMode( GLenum face, GLenum mode ) +static void GLAPIENTRY +save_PolygonMode(GLenum face, GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_MODE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_MODE, 2); if (n) { n[1].e = face; n[2].e = mode; } if (ctx->ExecuteFlag) { - CALL_PolygonMode(ctx->Exec, ( face, mode )); + CALL_PolygonMode(ctx->Exec, (face, mode)); } } @@ -2806,41 +2700,44 @@ static void GLAPIENTRY save_PolygonMode( GLenum face, GLenum mode ) /* * Polygon stipple must have been upacked already! */ -static void GLAPIENTRY save_PolygonStipple( const GLubyte *pattern ) +static void GLAPIENTRY +save_PolygonStipple(const GLubyte * pattern) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_STIPPLE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_STIPPLE, 1); if (n) { void *data; - n[1].data = MALLOC( 32 * 4 ); - data = n[1].data; /* This needed for Acorn compiler */ - MEMCPY( data, pattern, 32 * 4 ); + n[1].data = _mesa_malloc(32 * 4); + data = n[1].data; /* This needed for Acorn compiler */ + MEMCPY(data, pattern, 32 * 4); } if (ctx->ExecuteFlag) { - CALL_PolygonStipple(ctx->Exec, ( (GLubyte*) pattern )); + CALL_PolygonStipple(ctx->Exec, ((GLubyte *) pattern)); } } -static void GLAPIENTRY save_PolygonOffset( GLfloat factor, GLfloat units ) +static void GLAPIENTRY +save_PolygonOffset(GLfloat factor, GLfloat units) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_POLYGON_OFFSET, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_POLYGON_OFFSET, 2); if (n) { n[1].f = factor; n[2].f = units; } if (ctx->ExecuteFlag) { - CALL_PolygonOffset(ctx->Exec, ( factor, units )); + CALL_PolygonOffset(ctx->Exec, (factor, units)); } } -static void GLAPIENTRY save_PolygonOffsetEXT( GLfloat factor, GLfloat bias ) +static void GLAPIENTRY +save_PolygonOffsetEXT(GLfloat factor, GLfloat bias) { GET_CURRENT_CONTEXT(ctx); /* XXX mult by DepthMaxF here??? */ @@ -2848,107 +2745,115 @@ static void GLAPIENTRY save_PolygonOffsetEXT( GLfloat factor, GLfloat bias ) } -static void GLAPIENTRY save_PopAttrib( void ) +static void GLAPIENTRY +save_PopAttrib(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_ATTRIB, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_POP_ATTRIB, 0); if (ctx->ExecuteFlag) { CALL_PopAttrib(ctx->Exec, ()); } } -static void GLAPIENTRY save_PopMatrix( void ) +static void GLAPIENTRY +save_PopMatrix(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_MATRIX, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_POP_MATRIX, 0); if (ctx->ExecuteFlag) { CALL_PopMatrix(ctx->Exec, ()); } } -static void GLAPIENTRY save_PopName( void ) +static void GLAPIENTRY +save_PopName(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_POP_NAME, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_POP_NAME, 0); if (ctx->ExecuteFlag) { CALL_PopName(ctx->Exec, ()); } } -static void GLAPIENTRY save_PrioritizeTextures( GLsizei num, const GLuint *textures, - const GLclampf *priorities ) +static void GLAPIENTRY +save_PrioritizeTextures(GLsizei num, const GLuint * textures, + const GLclampf * priorities) { GET_CURRENT_CONTEXT(ctx); GLint i; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - for (i=0;i<num;i++) { + for (i = 0; i < num; i++) { Node *n; - n = ALLOC_INSTRUCTION( ctx, OPCODE_PRIORITIZE_TEXTURE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PRIORITIZE_TEXTURE, 2); if (n) { n[1].ui = textures[i]; n[2].f = priorities[i]; } } if (ctx->ExecuteFlag) { - CALL_PrioritizeTextures(ctx->Exec, ( num, textures, priorities )); + CALL_PrioritizeTextures(ctx->Exec, (num, textures, priorities)); } } -static void GLAPIENTRY save_PushAttrib( GLbitfield mask ) +static void GLAPIENTRY +save_PushAttrib(GLbitfield mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_ATTRIB, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PUSH_ATTRIB, 1); if (n) { n[1].bf = mask; } if (ctx->ExecuteFlag) { - CALL_PushAttrib(ctx->Exec, ( mask )); + CALL_PushAttrib(ctx->Exec, (mask)); } } -static void GLAPIENTRY save_PushMatrix( void ) +static void GLAPIENTRY +save_PushMatrix(void) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_MATRIX, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_PUSH_MATRIX, 0); if (ctx->ExecuteFlag) { CALL_PushMatrix(ctx->Exec, ()); } } -static void GLAPIENTRY save_PushName( GLuint name ) +static void GLAPIENTRY +save_PushName(GLuint name) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PUSH_NAME, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PUSH_NAME, 1); if (n) { n[1].ui = name; } if (ctx->ExecuteFlag) { - CALL_PushName(ctx->Exec, ( name )); + CALL_PushName(ctx->Exec, (name)); } } -static void GLAPIENTRY save_RasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_RASTER_POS, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_RASTER_POS, 4); if (n) { n[1].f = x; n[2].f = y; @@ -2956,154 +2861,179 @@ static void GLAPIENTRY save_RasterPos4f( GLfloat x, GLfloat y, GLfloat z, GLfloa n[4].f = w; } if (ctx->ExecuteFlag) { - CALL_RasterPos4f(ctx->Exec, ( x, y, z, w )); + CALL_RasterPos4f(ctx->Exec, (x, y, z, w)); } } -static void GLAPIENTRY save_RasterPos2d(GLdouble x, GLdouble y) +static void GLAPIENTRY +save_RasterPos2d(GLdouble x, GLdouble y) { save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2f(GLfloat x, GLfloat y) +static void GLAPIENTRY +save_RasterPos2f(GLfloat x, GLfloat y) { save_RasterPos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2i(GLint x, GLint y) +static void GLAPIENTRY +save_RasterPos2i(GLint x, GLint y) { save_RasterPos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2s(GLshort x, GLshort y) +static void GLAPIENTRY +save_RasterPos2s(GLshort x, GLshort y) { save_RasterPos4f(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) +static void GLAPIENTRY +save_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) { save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY save_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) +static void GLAPIENTRY +save_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) { save_RasterPos4f(x, y, z, 1.0F); } -static void GLAPIENTRY save_RasterPos3i(GLint x, GLint y, GLint z) +static void GLAPIENTRY +save_RasterPos3i(GLint x, GLint y, GLint z) { save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY save_RasterPos3s(GLshort x, GLshort y, GLshort z) +static void GLAPIENTRY +save_RasterPos3s(GLshort x, GLshort y, GLshort z) { save_RasterPos4f(x, y, z, 1.0F); } -static void GLAPIENTRY save_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) +static void GLAPIENTRY +save_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY save_RasterPos4i(GLint x, GLint y, GLint z, GLint w) +static void GLAPIENTRY +save_RasterPos4i(GLint x, GLint y, GLint z, GLint w) { save_RasterPos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY save_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) +static void GLAPIENTRY +save_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) { save_RasterPos4f(x, y, z, w); } -static void GLAPIENTRY save_RasterPos2dv(const GLdouble *v) +static void GLAPIENTRY +save_RasterPos2dv(const GLdouble * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2fv(const GLfloat *v) +static void GLAPIENTRY +save_RasterPos2fv(const GLfloat * v) { save_RasterPos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2iv(const GLint *v) +static void GLAPIENTRY +save_RasterPos2iv(const GLint * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos2sv(const GLshort *v) +static void GLAPIENTRY +save_RasterPos2sv(const GLshort * v) { save_RasterPos4f(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_RasterPos3dv(const GLdouble *v) +static void GLAPIENTRY +save_RasterPos3dv(const GLdouble * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY save_RasterPos3fv(const GLfloat *v) +static void GLAPIENTRY +save_RasterPos3fv(const GLfloat * v) { save_RasterPos4f(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY save_RasterPos3iv(const GLint *v) +static void GLAPIENTRY +save_RasterPos3iv(const GLint * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY save_RasterPos3sv(const GLshort *v) +static void GLAPIENTRY +save_RasterPos3sv(const GLshort * v) { save_RasterPos4f(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY save_RasterPos4dv(const GLdouble *v) +static void GLAPIENTRY +save_RasterPos4dv(const GLdouble * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], - (GLfloat) v[2], (GLfloat) v[3]); + (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY save_RasterPos4fv(const GLfloat *v) +static void GLAPIENTRY +save_RasterPos4fv(const GLfloat * v) { save_RasterPos4f(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_RasterPos4iv(const GLint *v) +static void GLAPIENTRY +save_RasterPos4iv(const GLint * v) { save_RasterPos4f((GLfloat) v[0], (GLfloat) v[1], - (GLfloat) v[2], (GLfloat) v[3]); + (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY save_RasterPos4sv(const GLshort *v) +static void GLAPIENTRY +save_RasterPos4sv(const GLshort * v) { save_RasterPos4f(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_PassThrough( GLfloat token ) +static void GLAPIENTRY +save_PassThrough(GLfloat token) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PASSTHROUGH, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PASSTHROUGH, 1); if (n) { n[1].f = token; } if (ctx->ExecuteFlag) { - CALL_PassThrough(ctx->Exec, ( token )); + CALL_PassThrough(ctx->Exec, (token)); } } -static void GLAPIENTRY save_ReadBuffer( GLenum mode ) +static void GLAPIENTRY +save_ReadBuffer(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_READ_BUFFER, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_READ_BUFFER, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_ReadBuffer(ctx->Exec, ( mode )); + CALL_ReadBuffer(ctx->Exec, (mode)); } } @@ -3114,12 +3044,12 @@ save_ResetHistogram(GLenum target) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_RESET_HISTOGRAM, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_RESET_HISTOGRAM, 1); if (n) { n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_ResetHistogram(ctx->Exec, ( target )); + CALL_ResetHistogram(ctx->Exec, (target)); } } @@ -3130,22 +3060,23 @@ save_ResetMinmax(GLenum target) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_RESET_MIN_MAX, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_RESET_MIN_MAX, 1); if (n) { n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_ResetMinmax(ctx->Exec, ( target )); + CALL_ResetMinmax(ctx->Exec, (target)); } } -static void GLAPIENTRY save_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ROTATE, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ROTATE, 4); if (n) { n[1].f = angle; n[2].f = x; @@ -3153,46 +3084,50 @@ static void GLAPIENTRY save_Rotatef( GLfloat angle, GLfloat x, GLfloat y, GLfloa n[4].f = z; } if (ctx->ExecuteFlag) { - CALL_Rotatef(ctx->Exec, ( angle, x, y, z )); + CALL_Rotatef(ctx->Exec, (angle, x, y, z)); } } -static void GLAPIENTRY save_Rotated( GLdouble angle, GLdouble x, GLdouble y, GLdouble z ) +static void GLAPIENTRY +save_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) { save_Rotatef((GLfloat) angle, (GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY save_Scalef( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Scalef(GLfloat x, GLfloat y, GLfloat z) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_SCALE, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_SCALE, 3); if (n) { n[1].f = x; n[2].f = y; n[3].f = z; } if (ctx->ExecuteFlag) { - CALL_Scalef(ctx->Exec, ( x, y, z )); + CALL_Scalef(ctx->Exec, (x, y, z)); } } -static void GLAPIENTRY save_Scaled( GLdouble x, GLdouble y, GLdouble z ) +static void GLAPIENTRY +save_Scaled(GLdouble x, GLdouble y, GLdouble z) { save_Scalef((GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY save_Scissor( GLint x, GLint y, GLsizei width, GLsizei height ) +static void GLAPIENTRY +save_Scissor(GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_SCISSOR, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_SCISSOR, 4); if (n) { n[1].i = x; n[2].i = y; @@ -3200,71 +3135,75 @@ static void GLAPIENTRY save_Scissor( GLint x, GLint y, GLsizei width, GLsizei he n[4].i = height; } if (ctx->ExecuteFlag) { - CALL_Scissor(ctx->Exec, ( x, y, width, height )); + CALL_Scissor(ctx->Exec, (x, y, width, height)); } } -static void GLAPIENTRY save_ShadeModel( GLenum mode ) +static void GLAPIENTRY +save_ShadeModel(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_SHADE_MODEL, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_SHADE_MODEL, 1); if (n) { n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_ShadeModel(ctx->Exec, ( mode )); + CALL_ShadeModel(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_StencilFunc( GLenum func, GLint ref, GLuint mask ) +static void GLAPIENTRY +save_StencilFunc(GLenum func, GLint ref, GLuint mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_FUNC, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_STENCIL_FUNC, 3); if (n) { n[1].e = func; n[2].i = ref; n[3].ui = mask; } if (ctx->ExecuteFlag) { - CALL_StencilFunc(ctx->Exec, ( func, ref, mask )); + CALL_StencilFunc(ctx->Exec, (func, ref, mask)); } } -static void GLAPIENTRY save_StencilMask( GLuint mask ) +static void GLAPIENTRY +save_StencilMask(GLuint mask) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_MASK, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_STENCIL_MASK, 1); if (n) { n[1].ui = mask; } if (ctx->ExecuteFlag) { - CALL_StencilMask(ctx->Exec, ( mask )); + CALL_StencilMask(ctx->Exec, (mask)); } } -static void GLAPIENTRY save_StencilOp( GLenum fail, GLenum zfail, GLenum zpass ) +static void GLAPIENTRY +save_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_OP, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_STENCIL_OP, 3); if (n) { n[1].e = fail; n[2].e = zfail; n[3].e = zpass; } if (ctx->ExecuteFlag) { - CALL_StencilOp(ctx->Exec, ( fail, zfail, zpass )); + CALL_StencilOp(ctx->Exec, (fail, zfail, zpass)); } } @@ -3311,7 +3250,7 @@ save_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_STENCIL_OP_SEPARATE, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_STENCIL_OP_SEPARATE, 4); if (n) { n[1].e = face; n[2].e = fail; @@ -3324,12 +3263,13 @@ save_StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass) } -static void GLAPIENTRY save_TexEnvfv( GLenum target, GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_TexEnvfv(GLenum target, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXENV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEXENV, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -3345,49 +3285,53 @@ static void GLAPIENTRY save_TexEnvfv( GLenum target, GLenum pname, const GLfloat } } if (ctx->ExecuteFlag) { - CALL_TexEnvfv(ctx->Exec, ( target, pname, params )); + CALL_TexEnvfv(ctx->Exec, (target, pname, params)); } } -static void GLAPIENTRY save_TexEnvf( GLenum target, GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_TexEnvf(GLenum target, GLenum pname, GLfloat param) { - save_TexEnvfv( target, pname, ¶m ); + save_TexEnvfv(target, pname, ¶m); } -static void GLAPIENTRY save_TexEnvi( GLenum target, GLenum pname, GLint param ) +static void GLAPIENTRY +save_TexEnvi(GLenum target, GLenum pname, GLint param) { GLfloat p[4]; p[0] = (GLfloat) param; p[1] = p[2] = p[3] = 0.0; - save_TexEnvfv( target, pname, p ); + save_TexEnvfv(target, pname, p); } -static void GLAPIENTRY save_TexEnviv( GLenum target, GLenum pname, const GLint *param ) +static void GLAPIENTRY +save_TexEnviv(GLenum target, GLenum pname, const GLint * param) { GLfloat p[4]; if (pname == GL_TEXTURE_ENV_COLOR) { - p[0] = INT_TO_FLOAT( param[0] ); - p[1] = INT_TO_FLOAT( param[1] ); - p[2] = INT_TO_FLOAT( param[2] ); - p[3] = INT_TO_FLOAT( param[3] ); + p[0] = INT_TO_FLOAT(param[0]); + p[1] = INT_TO_FLOAT(param[1]); + p[2] = INT_TO_FLOAT(param[2]); + p[3] = INT_TO_FLOAT(param[3]); } else { p[0] = (GLfloat) param[0]; p[1] = p[2] = p[3] = 0.0F; } - save_TexEnvfv( target, pname, p ); + save_TexEnvfv(target, pname, p); } -static void GLAPIENTRY save_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXGEN, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEXGEN, 6); if (n) { n[1].e = coord; n[2].e = pname; @@ -3397,12 +3341,13 @@ static void GLAPIENTRY save_TexGenfv( GLenum coord, GLenum pname, const GLfloat n[6].f = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexGenfv(ctx->Exec, ( coord, pname, params )); + CALL_TexGenfv(ctx->Exec, (coord, pname, params)); } } -static void GLAPIENTRY save_TexGeniv(GLenum coord, GLenum pname, const GLint *params ) +static void GLAPIENTRY +save_TexGeniv(GLenum coord, GLenum pname, const GLint *params) { GLfloat p[4]; p[0] = (GLfloat) params[0]; @@ -3413,43 +3358,47 @@ static void GLAPIENTRY save_TexGeniv(GLenum coord, GLenum pname, const GLint *pa } -static void GLAPIENTRY save_TexGend(GLenum coord, GLenum pname, GLdouble param ) +static void GLAPIENTRY +save_TexGend(GLenum coord, GLenum pname, GLdouble param) { GLfloat p = (GLfloat) param; - save_TexGenfv( coord, pname, &p ); + save_TexGenfv(coord, pname, &p); } -static void GLAPIENTRY save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params ) +static void GLAPIENTRY +save_TexGendv(GLenum coord, GLenum pname, const GLdouble *params) { GLfloat p[4]; p[0] = (GLfloat) params[0]; p[1] = (GLfloat) params[1]; p[2] = (GLfloat) params[2]; p[3] = (GLfloat) params[3]; - save_TexGenfv( coord, pname, p ); + save_TexGenfv(coord, pname, p); } -static void GLAPIENTRY save_TexGenf( GLenum coord, GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_TexGenf(GLenum coord, GLenum pname, GLfloat param) { save_TexGenfv(coord, pname, ¶m); } -static void GLAPIENTRY save_TexGeni( GLenum coord, GLenum pname, GLint param ) +static void GLAPIENTRY +save_TexGeni(GLenum coord, GLenum pname, GLint param) { - save_TexGeniv( coord, pname, ¶m ); + save_TexGeniv(coord, pname, ¶m); } -static void GLAPIENTRY save_TexParameterfv( GLenum target, - GLenum pname, const GLfloat *params ) +static void GLAPIENTRY +save_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEXPARAMETER, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEXPARAMETER, 6); if (n) { n[1].e = target; n[2].e = pname; @@ -3459,18 +3408,20 @@ static void GLAPIENTRY save_TexParameterfv( GLenum target, n[6].f = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexParameterfv(ctx->Exec, ( target, pname, params )); + CALL_TexParameterfv(ctx->Exec, (target, pname, params)); } } -static void GLAPIENTRY save_TexParameterf( GLenum target, GLenum pname, GLfloat param ) +static void GLAPIENTRY +save_TexParameterf(GLenum target, GLenum pname, GLfloat param) { save_TexParameterfv(target, pname, ¶m); } -static void GLAPIENTRY save_TexParameteri( GLenum target, GLenum pname, GLint param ) +static void GLAPIENTRY +save_TexParameteri(GLenum target, GLenum pname, GLint param) { GLfloat fparam[4]; fparam[0] = (GLfloat) param; @@ -3479,7 +3430,8 @@ static void GLAPIENTRY save_TexParameteri( GLenum target, GLenum pname, GLint pa } -static void GLAPIENTRY save_TexParameteriv( GLenum target, GLenum pname, const GLint *params ) +static void GLAPIENTRY +save_TexParameteriv(GLenum target, GLenum pname, const GLint *params) { GLfloat fparam[4]; fparam[0] = (GLfloat) params[0]; @@ -3488,24 +3440,24 @@ static void GLAPIENTRY save_TexParameteriv( GLenum target, GLenum pname, const G } -static void GLAPIENTRY save_TexImage1D( GLenum target, - GLint level, GLint components, - GLsizei width, GLint border, - GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_TexImage1D(GLenum target, + GLint level, GLint components, + GLsizei width, GLint border, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D) { /* don't compile, execute immediately */ - CALL_TexImage1D(ctx->Exec, ( target, level, components, width, - border, format, type, pixels )); + CALL_TexImage1D(ctx->Exec, (target, level, components, width, + border, format, type, pixels)); } else { GLvoid *image = unpack_image(1, width, 1, 1, format, type, pixels, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE1D, 8 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE1D, 8); if (n) { n[1].e = target; n[2].i = level; @@ -3517,34 +3469,34 @@ static void GLAPIENTRY save_TexImage1D( GLenum target, n[8].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexImage1D(ctx->Exec, ( target, level, components, width, - border, format, type, pixels )); + CALL_TexImage1D(ctx->Exec, (target, level, components, width, + border, format, type, pixels)); } } } -static void GLAPIENTRY save_TexImage2D( GLenum target, - GLint level, GLint components, - GLsizei width, GLsizei height, GLint border, - GLenum format, GLenum type, - const GLvoid *pixels) +static void GLAPIENTRY +save_TexImage2D(GLenum target, + GLint level, GLint components, + GLsizei width, GLsizei height, GLint border, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_2D) { /* don't compile, execute immediately */ - CALL_TexImage2D(ctx->Exec, ( target, level, components, width, - height, border, format, type, pixels )); + CALL_TexImage2D(ctx->Exec, (target, level, components, width, + height, border, format, type, pixels)); } else { GLvoid *image = unpack_image(2, width, height, 1, format, type, pixels, &ctx->Unpack); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE2D, 9 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE2D, 9); if (n) { n[1].e = target; n[2].i = level; @@ -3557,35 +3509,36 @@ static void GLAPIENTRY save_TexImage2D( GLenum target, n[9].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexImage2D(ctx->Exec, ( target, level, components, width, - height, border, format, type, pixels )); + CALL_TexImage2D(ctx->Exec, (target, level, components, width, + height, border, format, type, pixels)); } } } -static void GLAPIENTRY save_TexImage3D( GLenum target, - GLint level, GLint internalFormat, - GLsizei width, GLsizei height, GLsizei depth, - GLint border, - GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_TexImage3D(GLenum target, + GLint level, GLint internalFormat, + GLsizei width, GLsizei height, GLsizei depth, + GLint border, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_3D) { /* don't compile, execute immediately */ - CALL_TexImage3D(ctx->Exec, ( target, level, internalFormat, width, - height, depth, border, format, type, pixels )); + CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width, + height, depth, border, format, type, + pixels)); } else { Node *n; GLvoid *image = unpack_image(3, width, height, depth, format, type, pixels, &ctx->Unpack); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_IMAGE3D, 10 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_IMAGE3D, 10); if (n) { n[1].e = target; n[2].i = level; @@ -3599,26 +3552,28 @@ static void GLAPIENTRY save_TexImage3D( GLenum target, n[10].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexImage3D(ctx->Exec, ( target, level, internalFormat, width, - height, depth, border, format, type, pixels )); + CALL_TexImage3D(ctx->Exec, (target, level, internalFormat, width, + height, depth, border, format, type, + pixels)); } } } -static void GLAPIENTRY save_TexSubImage1D( GLenum target, GLint level, GLint xoffset, - GLsizei width, GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_TexSubImage1D(GLenum target, GLint level, GLint xoffset, + GLsizei width, GLenum format, GLenum type, + const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); Node *n; GLvoid *image = unpack_image(1, width, 1, 1, format, type, pixels, &ctx->Unpack); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE1D, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE1D, 7); if (n) { n[1].e = target; n[2].i = level; @@ -3629,27 +3584,27 @@ static void GLAPIENTRY save_TexSubImage1D( GLenum target, GLint level, GLint xof n[7].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexSubImage1D(ctx->Exec, ( target, level, xoffset, width, - format, type, pixels )); + CALL_TexSubImage1D(ctx->Exec, (target, level, xoffset, width, + format, type, pixels)); } } -static void GLAPIENTRY save_TexSubImage2D( GLenum target, GLint level, - GLint xoffset, GLint yoffset, - GLsizei width, GLsizei height, - GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_TexSubImage2D(GLenum target, GLint level, + GLint xoffset, GLint yoffset, + GLsizei width, GLsizei height, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); Node *n; GLvoid *image = unpack_image(2, width, height, 1, format, type, pixels, &ctx->Unpack); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE2D, 9 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE2D, 9); if (n) { n[1].e = target; n[2].i = level; @@ -3662,27 +3617,27 @@ static void GLAPIENTRY save_TexSubImage2D( GLenum target, GLint level, n[9].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexSubImage2D(ctx->Exec, ( target, level, xoffset, yoffset, - width, height, format, type, pixels )); + CALL_TexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset, + width, height, format, type, pixels)); } } -static void GLAPIENTRY save_TexSubImage3D( GLenum target, GLint level, - GLint xoffset, GLint yoffset,GLint zoffset, - GLsizei width, GLsizei height, GLsizei depth, - GLenum format, GLenum type, - const GLvoid *pixels ) +static void GLAPIENTRY +save_TexSubImage3D(GLenum target, GLint level, + GLint xoffset, GLint yoffset, GLint zoffset, + GLsizei width, GLsizei height, GLsizei depth, + GLenum format, GLenum type, const GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); Node *n; GLvoid *image = unpack_image(3, width, height, depth, format, type, pixels, &ctx->Unpack); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TEX_SUB_IMAGE3D, 11 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TEX_SUB_IMAGE3D, 11); if (n) { n[1].e = target; n[2].i = level; @@ -3697,46 +3652,50 @@ static void GLAPIENTRY save_TexSubImage3D( GLenum target, GLint level, n[11].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_TexSubImage3D(ctx->Exec, ( target, level, - xoffset, yoffset, zoffset, - width, height, depth, format, type, pixels )); + CALL_TexSubImage3D(ctx->Exec, (target, level, + xoffset, yoffset, zoffset, + width, height, depth, format, type, + pixels)); } } -static void GLAPIENTRY save_Translatef( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Translatef(GLfloat x, GLfloat y, GLfloat z) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TRANSLATE, 3 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TRANSLATE, 3); if (n) { n[1].f = x; n[2].f = y; n[3].f = z; } if (ctx->ExecuteFlag) { - CALL_Translatef(ctx->Exec, ( x, y, z )); + CALL_Translatef(ctx->Exec, (x, y, z)); } } -static void GLAPIENTRY save_Translated( GLdouble x, GLdouble y, GLdouble z ) +static void GLAPIENTRY +save_Translated(GLdouble x, GLdouble y, GLdouble z) { save_Translatef((GLfloat) x, (GLfloat) y, (GLfloat) z); } -static void GLAPIENTRY save_Viewport( GLint x, GLint y, GLsizei width, GLsizei height ) +static void GLAPIENTRY +save_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_VIEWPORT, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_VIEWPORT, 4); if (n) { n[1].i = x; n[2].i = y; @@ -3744,17 +3703,18 @@ static void GLAPIENTRY save_Viewport( GLint x, GLint y, GLsizei width, GLsizei h n[4].i = (GLint) height; } if (ctx->ExecuteFlag) { - CALL_Viewport(ctx->Exec, ( x, y, width, height )); + CALL_Viewport(ctx->Exec, (x, y, width, height)); } } -static void GLAPIENTRY save_WindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_WindowPos4fMESA(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_WINDOW_POS, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_WINDOW_POS, 4); if (n) { n[1].f = x; n[2].f = y; @@ -3762,123 +3722,146 @@ static void GLAPIENTRY save_WindowPos4fMESA( GLfloat x, GLfloat y, GLfloat z, GL n[4].f = w; } if (ctx->ExecuteFlag) { - CALL_WindowPos4fMESA(ctx->Exec, ( x, y, z, w )); + CALL_WindowPos4fMESA(ctx->Exec, (x, y, z, w)); } } -static void GLAPIENTRY save_WindowPos2dMESA(GLdouble x, GLdouble y) +static void GLAPIENTRY +save_WindowPos2dMESA(GLdouble x, GLdouble y) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2fMESA(GLfloat x, GLfloat y) +static void GLAPIENTRY +save_WindowPos2fMESA(GLfloat x, GLfloat y) { save_WindowPos4fMESA(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2iMESA(GLint x, GLint y) +static void GLAPIENTRY +save_WindowPos2iMESA(GLint x, GLint y) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2sMESA(GLshort x, GLshort y) +static void GLAPIENTRY +save_WindowPos2sMESA(GLshort x, GLshort y) { save_WindowPos4fMESA(x, y, 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) +static void GLAPIENTRY +save_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) +static void GLAPIENTRY +save_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) { save_WindowPos4fMESA(x, y, z, 1.0F); } -static void GLAPIENTRY save_WindowPos3iMESA(GLint x, GLint y, GLint z) +static void GLAPIENTRY +save_WindowPos3iMESA(GLint x, GLint y, GLint z) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } -static void GLAPIENTRY save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) +static void GLAPIENTRY +save_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) { save_WindowPos4fMESA(x, y, z, 1.0F); } -static void GLAPIENTRY save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w) +static void GLAPIENTRY +save_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w) +static void GLAPIENTRY +save_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w) { save_WindowPos4fMESA((GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } -static void GLAPIENTRY save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) +static void GLAPIENTRY +save_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) { save_WindowPos4fMESA(x, y, z, w); } -static void GLAPIENTRY save_WindowPos2dvMESA(const GLdouble *v) +static void GLAPIENTRY +save_WindowPos2dvMESA(const GLdouble * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2fvMESA(const GLfloat *v) +static void GLAPIENTRY +save_WindowPos2fvMESA(const GLfloat * v) { save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2ivMESA(const GLint *v) +static void GLAPIENTRY +save_WindowPos2ivMESA(const GLint * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos2svMESA(const GLshort *v) +static void GLAPIENTRY +save_WindowPos2svMESA(const GLshort * v) { save_WindowPos4fMESA(v[0], v[1], 0.0F, 1.0F); } -static void GLAPIENTRY save_WindowPos3dvMESA(const GLdouble *v) +static void GLAPIENTRY +save_WindowPos3dvMESA(const GLdouble * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY save_WindowPos3fvMESA(const GLfloat *v) +static void GLAPIENTRY +save_WindowPos3fvMESA(const GLfloat * v) { save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY save_WindowPos3ivMESA(const GLint *v) +static void GLAPIENTRY +save_WindowPos3ivMESA(const GLint * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } -static void GLAPIENTRY save_WindowPos3svMESA(const GLshort *v) +static void GLAPIENTRY +save_WindowPos3svMESA(const GLshort * v) { save_WindowPos4fMESA(v[0], v[1], v[2], 1.0F); } -static void GLAPIENTRY save_WindowPos4dvMESA(const GLdouble *v) +static void GLAPIENTRY +save_WindowPos4dvMESA(const GLdouble * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], - (GLfloat) v[2], (GLfloat) v[3]); + (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY save_WindowPos4fvMESA(const GLfloat *v) +static void GLAPIENTRY +save_WindowPos4fvMESA(const GLfloat * v) { save_WindowPos4fMESA(v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_WindowPos4ivMESA(const GLint *v) +static void GLAPIENTRY +save_WindowPos4ivMESA(const GLint * v) { save_WindowPos4fMESA((GLfloat) v[0], (GLfloat) v[1], - (GLfloat) v[2], (GLfloat) v[3]); + (GLfloat) v[2], (GLfloat) v[3]); } -static void GLAPIENTRY save_WindowPos4svMESA(const GLshort *v) +static void GLAPIENTRY +save_WindowPos4svMESA(const GLshort * v) { save_WindowPos4fMESA(v[0], v[1], v[2], v[3]); } @@ -3886,24 +3869,26 @@ static void GLAPIENTRY save_WindowPos4svMESA(const GLshort *v) /* GL_ARB_multitexture */ -static void GLAPIENTRY save_ActiveTextureARB( GLenum target ) +static void GLAPIENTRY +save_ActiveTextureARB(GLenum target) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ACTIVE_TEXTURE, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ACTIVE_TEXTURE, 1); if (n) { n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_ActiveTextureARB(ctx->Exec, ( target )); + CALL_ActiveTextureARB(ctx->Exec, (target)); } } /* GL_ARB_transpose_matrix */ -static void GLAPIENTRY save_LoadTransposeMatrixdARB( const GLdouble m[16] ) +static void GLAPIENTRY +save_LoadTransposeMatrixdARB(const GLdouble m[16]) { GLfloat tm[16]; _math_transposefd(tm, m); @@ -3911,7 +3896,8 @@ static void GLAPIENTRY save_LoadTransposeMatrixdARB( const GLdouble m[16] ) } -static void GLAPIENTRY save_LoadTransposeMatrixfARB( const GLfloat m[16] ) +static void GLAPIENTRY +save_LoadTransposeMatrixfARB(const GLfloat m[16]) { GLfloat tm[16]; _math_transposef(tm, m); @@ -3920,7 +3906,7 @@ static void GLAPIENTRY save_LoadTransposeMatrixfARB( const GLfloat m[16] ) static void GLAPIENTRY -save_MultTransposeMatrixdARB( const GLdouble m[16] ) +save_MultTransposeMatrixdARB(const GLdouble m[16]) { GLfloat tm[16]; _math_transposefd(tm, m); @@ -3929,7 +3915,7 @@ save_MultTransposeMatrixdARB( const GLdouble m[16] ) static void GLAPIENTRY -save_MultTransposeMatrixfARB( const GLfloat m[16] ) +save_MultTransposeMatrixfARB(const GLfloat m[16]) { GLfloat tm[16]; _math_transposef(tm, m); @@ -3942,26 +3928,27 @@ static void GLAPIENTRY save_CompressedTexImage1DARB(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, - const GLvoid *data) + const GLvoid * data) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D) { /* don't compile, execute immediately */ CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat, - width, border, imageSize, data)); + width, border, imageSize, + data)); } else { Node *n; GLvoid *image; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7); if (n) { n[1].e = target; n[2].i = level; @@ -3972,11 +3959,12 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, n[7].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat, - width, border, imageSize, data)); + CALL_CompressedTexImage1DARB(ctx->Exec, + (target, level, internalFormat, width, + border, imageSize, data)); } } } @@ -3986,26 +3974,27 @@ static void GLAPIENTRY save_CompressedTexImage2DARB(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, - const GLvoid *data) + const GLvoid * data) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_2D) { /* don't compile, execute immediately */ CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat, - width, height, border, imageSize, data)); + width, height, border, + imageSize, data)); } else { Node *n; GLvoid *image; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8); if (n) { n[1].e = target; n[2].i = level; @@ -4017,11 +4006,12 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, n[8].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat, - width, height, border, imageSize, data)); + CALL_CompressedTexImage2DARB(ctx->Exec, + (target, level, internalFormat, width, + height, border, imageSize, data)); } } } @@ -4031,26 +4021,27 @@ static void GLAPIENTRY save_CompressedTexImage3DARB(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, - GLsizei imageSize, const GLvoid *data) + GLsizei imageSize, const GLvoid * data) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_3D) { /* don't compile, execute immediately */ CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat, - width, height, depth, border, imageSize, data)); + width, height, depth, border, + imageSize, data)); } else { Node *n; GLvoid *image; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9); if (n) { n[1].e = target; n[2].i = level; @@ -4063,11 +4054,13 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, n[9].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat, - width, height, depth, border, imageSize, data)); + CALL_CompressedTexImage3DARB(ctx->Exec, + (target, level, internalFormat, width, + height, depth, border, imageSize, + data)); } } } @@ -4076,7 +4069,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, static void GLAPIENTRY save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, - GLsizei imageSize, const GLvoid *data) + GLsizei imageSize, const GLvoid * data) { Node *n; GLvoid *image; @@ -4085,13 +4078,13 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7); if (n) { n[1].e = target; n[2].i = level; @@ -4102,11 +4095,12 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, n[7].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset, - width, format, imageSize, data)); + width, format, imageSize, + data)); } } @@ -4115,7 +4109,7 @@ static void GLAPIENTRY save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, - const GLvoid *data) + const GLvoid * data) { Node *n; GLvoid *image; @@ -4124,13 +4118,13 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9); if (n) { n[1].e = target; n[2].i = level; @@ -4143,11 +4137,12 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, n[9].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage2DARB(ctx->Exec, (target, level, xoffset, yoffset, - width, height, format, imageSize, data)); + CALL_CompressedTexSubImage2DARB(ctx->Exec, + (target, level, xoffset, yoffset, width, + height, format, imageSize, data)); } } @@ -4156,7 +4151,7 @@ static void GLAPIENTRY save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, - GLsizei imageSize, const GLvoid *data) + GLsizei imageSize, const GLvoid * data) { Node *n; GLvoid *image; @@ -4165,13 +4160,13 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); /* make copy of image */ - image = MALLOC(imageSize); + image = _mesa_malloc(imageSize); if (!image) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB"); return; } MEMCPY(image, data, imageSize); - n = ALLOC_INSTRUCTION( ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11); if (n) { n[1].e = target; n[2].i = level; @@ -4186,11 +4181,13 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, n[11].data = image; } else if (image) { - FREE(image); + _mesa_free(image); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage3DARB(ctx->Exec, (target, level, xoffset, yoffset, - zoffset, width, height, depth, format, imageSize, data)); + CALL_CompressedTexSubImage3DARB(ctx->Exec, + (target, level, xoffset, yoffset, + zoffset, width, height, depth, format, + imageSize, data)); } } @@ -4202,13 +4199,13 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_SAMPLE_COVERAGE, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_SAMPLE_COVERAGE, 2); if (n) { n[1].f = value; n[2].b = invert; } if (ctx->ExecuteFlag) { - CALL_SampleCoverageARB(ctx->Exec, ( value, invert )); + CALL_SampleCoverageARB(ctx->Exec, (value, invert)); } } @@ -4223,13 +4220,13 @@ save_BindProgramNV(GLenum target, GLuint id) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BIND_PROGRAM_NV, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BIND_PROGRAM_NV, 2); if (n) { n[1].e = target; n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BindProgramNV(ctx->Exec, ( target, id )); + CALL_BindProgramNV(ctx->Exec, (target, id)); } } #endif /* FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */ @@ -4241,7 +4238,7 @@ save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EXECUTE_PROGRAM_NV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EXECUTE_PROGRAM_NV, 6); if (n) { n[1].e = target; n[2].ui = id; @@ -4258,13 +4255,12 @@ save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) static void GLAPIENTRY save_ProgramParameter4fNV(GLenum target, GLuint index, - GLfloat x, GLfloat y, - GLfloat z, GLfloat w) + GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_PARAMETER4F_NV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_PARAMETER4F_NV, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4280,7 +4276,8 @@ save_ProgramParameter4fNV(GLenum target, GLuint index, static void GLAPIENTRY -save_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params) +save_ProgramParameter4fvNV(GLenum target, GLuint index, + const GLfloat *params) { save_ProgramParameter4fNV(target, index, params[0], params[1], params[2], params[3]); @@ -4289,8 +4286,7 @@ save_ProgramParameter4fvNV(GLenum target, GLuint index, const GLfloat *params) static void GLAPIENTRY save_ProgramParameter4dNV(GLenum target, GLuint index, - GLdouble x, GLdouble y, - GLdouble z, GLdouble w) + GLdouble x, GLdouble y, GLdouble z, GLdouble w) { save_ProgramParameter4fNV(target, index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); @@ -4331,7 +4327,7 @@ save_ProgramParameters4fvNV(GLenum target, GLuint index, static void GLAPIENTRY save_LoadProgramNV(GLenum target, GLuint id, GLsizei len, - const GLubyte *program) + const GLubyte * program) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4345,7 +4341,7 @@ save_LoadProgramNV(GLenum target, GLuint id, GLsizei len, _mesa_memcpy(programCopy, program, len); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_LOAD_PROGRAM_NV, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_LOAD_PROGRAM_NV, 4); if (n) { n[1].e = target; n[2].ui = id; @@ -4359,7 +4355,7 @@ save_LoadProgramNV(GLenum target, GLuint id, GLsizei len, static void GLAPIENTRY -save_RequestResidentProgramsNV(GLsizei num, const GLuint *ids) +save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4370,7 +4366,7 @@ save_RequestResidentProgramsNV(GLsizei num, const GLuint *ids) } _mesa_memcpy(idCopy, ids, num * sizeof(GLuint)); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TRACK_MATRIX_NV, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TRACK_MATRIX_NV, 2); if (n) { n[1].i = num; n[2].data = idCopy; @@ -4388,7 +4384,7 @@ save_TrackMatrixNV(GLenum target, GLuint address, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_TRACK_MATRIX_NV, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_TRACK_MATRIX_NV, 4); if (n) { n[1].e = target; n[2].ui = address; @@ -4413,7 +4409,7 @@ save_ProgramLocalParameter4fARB(GLenum target, GLuint index, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4435,7 +4431,7 @@ save_ProgramLocalParameter4fvARB(GLenum target, GLuint index, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4458,7 +4454,7 @@ save_ProgramLocalParameter4dARB(GLenum target, GLuint index, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4480,7 +4476,7 @@ save_ProgramLocalParameter4dvARB(GLenum target, GLuint index, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_LOCAL_PARAMETER_ARB, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4495,7 +4491,7 @@ save_ProgramLocalParameter4dvARB(GLenum target, GLuint index, } static void GLAPIENTRY -save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name, +save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); @@ -4508,7 +4504,7 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name, _mesa_memcpy(nameCopy, name, len); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6); if (n) { n[1].ui = id; n[2].i = len; @@ -4525,7 +4521,7 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte *name, static void GLAPIENTRY -save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name, +save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte * name, const float v[]) { save_ProgramNamedParameter4fNV(id, len, name, v[0], v[1], v[2], v[3]); @@ -4533,16 +4529,16 @@ save_ProgramNamedParameter4fvNV(GLuint id, GLsizei len, const GLubyte *name, static void GLAPIENTRY -save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte *name, +save_ProgramNamedParameter4dNV(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) x, (GLfloat) y, - (GLfloat) z,(GLfloat) w); + (GLfloat) z, (GLfloat) w); } static void GLAPIENTRY -save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name, +save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte * name, const double v[]) { save_ProgramNamedParameter4fNV(id, len, name, (GLfloat) v[0], @@ -4555,34 +4551,36 @@ save_ProgramNamedParameter4dvNV(GLuint id, GLsizei len, const GLubyte *name, /* GL_EXT_stencil_two_side */ -static void GLAPIENTRY save_ActiveStencilFaceEXT( GLenum face ) +static void GLAPIENTRY +save_ActiveStencilFaceEXT(GLenum face) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ACTIVE_STENCIL_FACE_EXT, 1); if (n) { n[1].e = face; } if (ctx->ExecuteFlag) { - CALL_ActiveStencilFaceEXT(ctx->Exec, ( face )); + CALL_ActiveStencilFaceEXT(ctx->Exec, (face)); } } /* GL_EXT_depth_bounds_test */ -static void GLAPIENTRY save_DepthBoundsEXT( GLclampd zmin, GLclampd zmax ) +static void GLAPIENTRY +save_DepthBoundsEXT(GLclampd zmin, GLclampd zmax) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DEPTH_BOUNDS_EXT, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DEPTH_BOUNDS_EXT, 2); if (n) { n[1].f = (GLfloat) zmin; n[2].f = (GLfloat) zmax; } if (ctx->ExecuteFlag) { - CALL_DepthBoundsEXT(ctx->Exec, ( zmin, zmax )); + CALL_DepthBoundsEXT(ctx->Exec, (zmin, zmax)); } } @@ -4592,7 +4590,7 @@ static void GLAPIENTRY save_DepthBoundsEXT( GLclampd zmin, GLclampd zmax ) static void GLAPIENTRY save_ProgramStringARB(GLenum target, GLenum format, GLsizei len, - const GLvoid *string) + const GLvoid * string) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -4606,7 +4604,7 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len, _mesa_memcpy(programCopy, string, len); ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_STRING_ARB, 4 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_STRING_ARB, 4); if (n) { n[1].e = target; n[2].e = format; @@ -4626,7 +4624,7 @@ save_ProgramEnvParameter4fARB(GLenum target, GLuint index, GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_PROGRAM_ENV_PARAMETER_ARB, 6); if (n) { n[1].e = target; n[2].ui = index; @@ -4636,7 +4634,7 @@ save_ProgramEnvParameter4fARB(GLenum target, GLuint index, n[6].f = w; } if (ctx->ExecuteFlag) { - CALL_ProgramEnvParameter4fARB(ctx->Exec, ( target, index, x, y, z, w)); + CALL_ProgramEnvParameter4fARB(ctx->Exec, (target, index, x, y, z, w)); } } @@ -4656,9 +4654,7 @@ save_ProgramEnvParameter4dARB(GLenum target, GLuint index, { save_ProgramEnvParameter4fARB(target, index, (GLfloat) x, - (GLfloat) y, - (GLfloat) z, - (GLfloat) w); + (GLfloat) y, (GLfloat) z, (GLfloat) w); } @@ -4669,8 +4665,7 @@ save_ProgramEnvParameter4dvARB(GLenum target, GLuint index, save_ProgramEnvParameter4fARB(target, index, (GLfloat) params[0], (GLfloat) params[1], - (GLfloat) params[2], - (GLfloat) params[3]); + (GLfloat) params[2], (GLfloat) params[3]); } #endif /* FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */ @@ -4684,13 +4679,13 @@ save_BeginQueryARB(GLenum target, GLuint id) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BEGIN_QUERY_ARB, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BEGIN_QUERY_ARB, 2); if (n) { n[1].e = target; n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BeginQueryARB(ctx->Exec, ( target, id )); + CALL_BeginQueryARB(ctx->Exec, (target, id)); } } @@ -4701,12 +4696,12 @@ save_EndQueryARB(GLenum target) GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_END_QUERY_ARB, 1 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_END_QUERY_ARB, 1); if (n) { n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_EndQueryARB(ctx->Exec, ( target )); + CALL_EndQueryARB(ctx->Exec, (target)); } } @@ -4714,19 +4709,19 @@ save_EndQueryARB(GLenum target) static void GLAPIENTRY -save_DrawBuffersARB(GLsizei count, const GLenum *buffers) +save_DrawBuffersARB(GLsizei count, const GLenum * buffers) { GET_CURRENT_CONTEXT(ctx); Node *n; ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); - n = ALLOC_INSTRUCTION( ctx, OPCODE_DRAW_BUFFERS_ARB, 1 + MAX_DRAW_BUFFERS ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_DRAW_BUFFERS_ARB, 1 + MAX_DRAW_BUFFERS); if (n) { GLint i; n[1].i = count; if (count > MAX_DRAW_BUFFERS) - count = MAX_DRAW_BUFFERS; + count = MAX_DRAW_BUFFERS; for (i = 0; i < count; i++) { - n[2 + i].e = buffers[i]; + n[2 + i].e = buffers[i]; } } if (ctx->ExecuteFlag) { @@ -4740,10 +4735,10 @@ save_BindFragmentShaderATI(GLuint id) { GET_CURRENT_CONTEXT(ctx); Node *n; - - n = ALLOC_INSTRUCTION( ctx, OPCODE_BIND_FRAGMENT_SHADER_ATI, 1); + + n = ALLOC_INSTRUCTION(ctx, OPCODE_BIND_FRAGMENT_SHADER_ATI, 1); if (n) { - n[1].ui = id; + n[1].ui = id; } if (ctx->ExecuteFlag) { CALL_BindFragmentShaderATI(ctx->Exec, (id)); @@ -4755,14 +4750,14 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value) { GET_CURRENT_CONTEXT(ctx); Node *n; - - n = ALLOC_INSTRUCTION( ctx, OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, 5); + + n = ALLOC_INSTRUCTION(ctx, OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI, 5); if (n) { - n[1].ui = dst; - n[2].f = value[0]; - n[3].f = value[1]; - n[4].f = value[2]; - n[5].f = value[3]; + n[1].ui = dst; + n[2].f = value[0]; + n[3].f = value[1]; + n[4].f = value[2]; + n[5].f = value[3]; } if (ctx->ExecuteFlag) { CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, value)); @@ -4770,12 +4765,13 @@ save_SetFragmentShaderConstantATI(GLuint dst, const GLfloat *value) } #endif -static void save_Attr1fNV( GLenum attr, GLfloat x ) +static void +save_Attr1fNV(GLenum attr, GLfloat x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_1F_NV, 2 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_1F_NV, 2); if (n) { n[1].e = attr; n[2].f = x; @@ -4783,19 +4779,20 @@ static void save_Attr1fNV( GLenum attr, GLfloat x ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 1; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib1fNV(ctx->Exec, ( attr, x )); + CALL_VertexAttrib1fNV(ctx->Exec, (attr, x)); } } -static void save_Attr2fNV( GLenum attr, GLfloat x, GLfloat y ) +static void +save_Attr2fNV(GLenum attr, GLfloat x, GLfloat y) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_2F_NV, 3 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_2F_NV, 3); if (n) { n[1].e = attr; n[2].f = x; @@ -4804,19 +4801,20 @@ static void save_Attr2fNV( GLenum attr, GLfloat x, GLfloat y ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 2; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, 0, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib2fNV(ctx->Exec, ( attr, x, y )); + CALL_VertexAttrib2fNV(ctx->Exec, (attr, x, y)); } } -static void save_Attr3fNV( GLenum attr, GLfloat x, GLfloat y, GLfloat z ) +static void +save_Attr3fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_3F_NV, 4 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_3F_NV, 4); if (n) { n[1].e = attr; n[2].f = x; @@ -4826,20 +4824,20 @@ static void save_Attr3fNV( GLenum attr, GLfloat x, GLfloat y, GLfloat z ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 3; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib3fNV(ctx->Exec, ( attr, x, y, z )); + CALL_VertexAttrib3fNV(ctx->Exec, (attr, x, y, z)); } } -static void save_Attr4fNV( GLenum attr, GLfloat x, GLfloat y, GLfloat z, - GLfloat w ) +static void +save_Attr4fNV(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_4F_NV, 5 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_4F_NV, 5); if (n) { n[1].e = attr; n[2].f = x; @@ -4850,20 +4848,21 @@ static void save_Attr4fNV( GLenum attr, GLfloat x, GLfloat y, GLfloat z, ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 4; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, w); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w); if (ctx->ExecuteFlag) { - CALL_VertexAttrib4fNV(ctx->Exec, ( attr, x, y, z, w )); + CALL_VertexAttrib4fNV(ctx->Exec, (attr, x, y, z, w)); } } -static void save_Attr1fARB( GLenum attr, GLfloat x ) +static void +save_Attr1fARB(GLenum attr, GLfloat x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_1F_ARB, 2 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_1F_ARB, 2); if (n) { n[1].e = attr; n[2].f = x; @@ -4871,19 +4870,20 @@ static void save_Attr1fARB( GLenum attr, GLfloat x ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 1; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, 0, 0, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib1fARB(ctx->Exec, ( attr, x )); + CALL_VertexAttrib1fARB(ctx->Exec, (attr, x)); } } -static void save_Attr2fARB( GLenum attr, GLfloat x, GLfloat y ) +static void +save_Attr2fARB(GLenum attr, GLfloat x, GLfloat y) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_2F_ARB, 3 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_2F_ARB, 3); if (n) { n[1].e = attr; n[2].f = x; @@ -4892,19 +4892,20 @@ static void save_Attr2fARB( GLenum attr, GLfloat x, GLfloat y ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 2; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, 0, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, 0, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib2fARB(ctx->Exec, ( attr, x, y )); + CALL_VertexAttrib2fARB(ctx->Exec, (attr, x, y)); } } -static void save_Attr3fARB( GLenum attr, GLfloat x, GLfloat y, GLfloat z ) +static void +save_Attr3fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_3F_ARB, 4 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_3F_ARB, 4); if (n) { n[1].e = attr; n[2].f = x; @@ -4914,20 +4915,20 @@ static void save_Attr3fARB( GLenum attr, GLfloat x, GLfloat y, GLfloat z ) ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 3; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, 1); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, 1); if (ctx->ExecuteFlag) { - CALL_VertexAttrib3fARB(ctx->Exec, ( attr, x, y, z )); + CALL_VertexAttrib3fARB(ctx->Exec, (attr, x, y, z)); } } -static void save_Attr4fARB( GLenum attr, GLfloat x, GLfloat y, GLfloat z, - GLfloat w ) +static void +save_Attr4fARB(GLenum attr, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_ATTR_4F_ARB, 5 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ATTR_4F_ARB, 5); if (n) { n[1].e = attr; n[2].f = x; @@ -4938,89 +4939,96 @@ static void save_Attr4fARB( GLenum attr, GLfloat x, GLfloat y, GLfloat z, ASSERT(attr < VERT_ATTRIB_MAX); ctx->ListState.ActiveAttribSize[attr] = 4; - ASSIGN_4V( ctx->ListState.CurrentAttrib[attr], x, y, z, w); + ASSIGN_4V(ctx->ListState.CurrentAttrib[attr], x, y, z, w); if (ctx->ExecuteFlag) { - CALL_VertexAttrib4fARB(ctx->Exec, ( attr, x, y, z, w )); + CALL_VertexAttrib4fARB(ctx->Exec, (attr, x, y, z, w)); } } -static void GLAPIENTRY save_EvalCoord1f( GLfloat x ) +static void GLAPIENTRY +save_EvalCoord1f(GLfloat x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_C1, 1 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVAL_C1, 1); if (n) { n[1].f = x; } if (ctx->ExecuteFlag) { - CALL_EvalCoord1f(ctx->Exec, ( x )); + CALL_EvalCoord1f(ctx->Exec, (x)); } } -static void GLAPIENTRY save_EvalCoord1fv( const GLfloat *v ) +static void GLAPIENTRY +save_EvalCoord1fv(const GLfloat * v) { - save_EvalCoord1f( v[0] ); + save_EvalCoord1f(v[0]); } -static void GLAPIENTRY save_EvalCoord2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY +save_EvalCoord2f(GLfloat x, GLfloat y) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_C2, 2 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVAL_C2, 2); if (n) { n[1].f = x; n[2].f = y; } if (ctx->ExecuteFlag) { - CALL_EvalCoord2f(ctx->Exec, ( x, y )); + CALL_EvalCoord2f(ctx->Exec, (x, y)); } } -static void GLAPIENTRY save_EvalCoord2fv( const GLfloat *v ) +static void GLAPIENTRY +save_EvalCoord2fv(const GLfloat * v) { - save_EvalCoord2f( v[0], v[1] ); + save_EvalCoord2f(v[0], v[1]); } -static void GLAPIENTRY save_EvalPoint1( GLint x ) +static void GLAPIENTRY +save_EvalPoint1(GLint x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_P1, 1 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVAL_P1, 1); if (n) { n[1].i = x; } if (ctx->ExecuteFlag) { - CALL_EvalPoint1(ctx->Exec, ( x )); + CALL_EvalPoint1(ctx->Exec, (x)); } } -static void GLAPIENTRY save_EvalPoint2( GLint x, GLint y ) +static void GLAPIENTRY +save_EvalPoint2(GLint x, GLint y) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EVAL_P2, 2 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EVAL_P2, 2); if (n) { n[1].i = x; n[2].i = y; } if (ctx->ExecuteFlag) { - CALL_EvalPoint2(ctx->Exec, ( x, y )); + CALL_EvalPoint2(ctx->Exec, (x, y)); } } -static void GLAPIENTRY save_Indexf( GLfloat x ) +static void GLAPIENTRY +save_Indexf(GLfloat x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_INDEX, 1 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_INDEX, 1); if (n) { n[1].f = x; } @@ -5029,21 +5037,23 @@ static void GLAPIENTRY save_Indexf( GLfloat x ) ctx->ListState.CurrentIndex = x; if (ctx->ExecuteFlag) { - CALL_Indexi(ctx->Exec, ( (GLint) x )); + CALL_Indexi(ctx->Exec, ((GLint) x)); } } -static void GLAPIENTRY save_Indexfv( const GLfloat *v ) +static void GLAPIENTRY +save_Indexfv(const GLfloat * v) { - save_Indexf( v[0] ); + save_Indexf(v[0]); } -static void GLAPIENTRY save_EdgeFlag( GLboolean x ) +static void GLAPIENTRY +save_EdgeFlag(GLboolean x) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_EDGEFLAG, 1 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_EDGEFLAG, 1); if (n) { n[1].b = x; } @@ -5052,22 +5062,24 @@ static void GLAPIENTRY save_EdgeFlag( GLboolean x ) ctx->ListState.CurrentEdgeFlag = x; if (ctx->ExecuteFlag) { - CALL_EdgeFlag(ctx->Exec, ( x )); + CALL_EdgeFlag(ctx->Exec, (x)); } } -static void GLAPIENTRY save_EdgeFlagv( const GLboolean *v ) +static void GLAPIENTRY +save_EdgeFlagv(const GLboolean * v) { - save_EdgeFlag( v[0] ); + save_EdgeFlag(v[0]); } -static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat *param ) +static void GLAPIENTRY +save_Materialfv(GLenum face, GLenum pname, const GLfloat * param) { GET_CURRENT_CONTEXT(ctx); Node *n; int args, i; - SAVE_FLUSH_VERTICES( ctx ); + SAVE_FLUSH_VERTICES(ctx); switch (face) { case GL_BACK: @@ -5075,7 +5087,7 @@ static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat case GL_FRONT_AND_BACK: break; default: - _mesa_compile_error( ctx, GL_INVALID_ENUM, "material(face)" ); + _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(face)"); return; } @@ -5094,40 +5106,41 @@ static void GLAPIENTRY save_Materialfv( GLenum face, GLenum pname, const GLfloat args = 3; break; default: - _mesa_compile_error( ctx, GL_INVALID_ENUM, "material(pname)" ); + _mesa_compile_error(ctx, GL_INVALID_ENUM, "material(pname)"); return; } - n = ALLOC_INSTRUCTION( ctx, OPCODE_MATERIAL, 6 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_MATERIAL, 6); if (n) { n[1].e = face; n[2].e = pname; - for (i = 0 ; i < args ; i++) - n[3+i].f = param[i]; + for (i = 0; i < args; i++) + n[3 + i].f = param[i]; } { - GLuint bitmask = _mesa_material_bitmask( ctx, face, pname, ~0, NULL ); - for (i = 0 ; i < MAT_ATTRIB_MAX ; i++) - if (bitmask & (1<<i)) { - ctx->ListState.ActiveMaterialSize[i] = args; - COPY_SZ_4V( ctx->ListState.CurrentMaterial[i], args, param ); - } + GLuint bitmask = _mesa_material_bitmask(ctx, face, pname, ~0, NULL); + for (i = 0; i < MAT_ATTRIB_MAX; i++) + if (bitmask & (1 << i)) { + ctx->ListState.ActiveMaterialSize[i] = args; + COPY_SZ_4V(ctx->ListState.CurrentMaterial[i], args, param); + } } if (ctx->ExecuteFlag) { - CALL_Materialfv(ctx->Exec, ( face, pname, param )); + CALL_Materialfv(ctx->Exec, (face, pname, param)); } } -static void GLAPIENTRY save_Begin( GLenum mode ) +static void GLAPIENTRY +save_Begin(GLenum mode) { GET_CURRENT_CONTEXT(ctx); Node *n; GLboolean error = GL_FALSE; - if (/*mode < GL_POINTS ||*/ mode > GL_POLYGON) { - _mesa_compile_error( ctx, GL_INVALID_ENUM, "Begin (mode)"); + if ( /*mode < GL_POINTS || */ mode > GL_POLYGON) { + _mesa_compile_error(ctx, GL_INVALID_ENUM, "Begin (mode)"); error = GL_TRUE; } else if (ctx->Driver.CurrentSavePrimitive == PRIM_UNKNOWN) { @@ -5141,7 +5154,7 @@ static void GLAPIENTRY save_Begin( GLenum mode ) ctx->Driver.CurrentSavePrimitive = mode; } else { - _mesa_compile_error( ctx, GL_INVALID_OPERATION, "recursive begin" ); + _mesa_compile_error(ctx, GL_INVALID_OPERATION, "recursive begin"); error = GL_TRUE; } @@ -5149,38 +5162,40 @@ static void GLAPIENTRY save_Begin( GLenum mode ) /* Give the driver an opportunity to hook in an optimized * display list compiler. */ - if (ctx->Driver.NotifySaveBegin( ctx, mode )) - return; + if (ctx->Driver.NotifySaveBegin(ctx, mode)) + return; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_BEGIN, 1 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BEGIN, 1); if (n) { - n[1].e = mode; + n[1].e = mode; } } if (ctx->ExecuteFlag) { - CALL_Begin(ctx->Exec, ( mode )); + CALL_Begin(ctx->Exec, (mode)); } } -static void GLAPIENTRY save_End( void ) +static void GLAPIENTRY +save_End(void) { GET_CURRENT_CONTEXT(ctx); - SAVE_FLUSH_VERTICES( ctx ); - (void) ALLOC_INSTRUCTION( ctx, OPCODE_END, 0 ); + SAVE_FLUSH_VERTICES(ctx); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_END, 0); ctx->Driver.CurrentSavePrimitive = PRIM_OUTSIDE_BEGIN_END; if (ctx->ExecuteFlag) { - CALL_End(ctx->Exec, ( )); + CALL_End(ctx->Exec, ()); } } -static void GLAPIENTRY save_Rectf( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) +static void GLAPIENTRY +save_Rectf(GLfloat a, GLfloat b, GLfloat c, GLfloat d) { GET_CURRENT_CONTEXT(ctx); Node *n; - SAVE_FLUSH_VERTICES( ctx ); - n = ALLOC_INSTRUCTION( ctx, OPCODE_RECTF, 4 ); + SAVE_FLUSH_VERTICES(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_RECTF, 4); if (n) { n[1].f = a; n[2].f = b; @@ -5188,373 +5203,447 @@ static void GLAPIENTRY save_Rectf( GLfloat a, GLfloat b, GLfloat c, GLfloat d ) n[4].f = d; } if (ctx->ExecuteFlag) { - CALL_Rectf(ctx->Exec, ( a, b, c, d )); + CALL_Rectf(ctx->Exec, (a, b, c, d)); } } -static void GLAPIENTRY save_Vertex2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY +save_Vertex2f(GLfloat x, GLfloat y) { - save_Attr2fNV( VERT_ATTRIB_POS, x, y ); + save_Attr2fNV(VERT_ATTRIB_POS, x, y); } -static void GLAPIENTRY save_Vertex2fv( const GLfloat *v ) +static void GLAPIENTRY +save_Vertex2fv(const GLfloat * v) { - save_Attr2fNV( VERT_ATTRIB_POS, v[0], v[1] ); + save_Attr2fNV(VERT_ATTRIB_POS, v[0], v[1]); } -static void GLAPIENTRY save_Vertex3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Vertex3f(GLfloat x, GLfloat y, GLfloat z) { - save_Attr3fNV( VERT_ATTRIB_POS, x, y, z ); + save_Attr3fNV(VERT_ATTRIB_POS, x, y, z); } -static void GLAPIENTRY save_Vertex3fv( const GLfloat *v ) +static void GLAPIENTRY +save_Vertex3fv(const GLfloat * v) { - save_Attr3fNV( VERT_ATTRIB_POS, v[0], v[1], v[2] ); + save_Attr3fNV(VERT_ATTRIB_POS, v[0], v[1], v[2]); } -static void GLAPIENTRY save_Vertex4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - save_Attr4fNV( VERT_ATTRIB_POS, x, y, z, w ); + save_Attr4fNV(VERT_ATTRIB_POS, x, y, z, w); } -static void GLAPIENTRY save_Vertex4fv( const GLfloat *v ) +static void GLAPIENTRY +save_Vertex4fv(const GLfloat * v) { - save_Attr4fNV( VERT_ATTRIB_POS, v[0], v[1], v[2], v[3] ); + save_Attr4fNV(VERT_ATTRIB_POS, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_TexCoord1f( GLfloat x ) +static void GLAPIENTRY +save_TexCoord1f(GLfloat x) { - save_Attr1fNV( VERT_ATTRIB_TEX0, x ); + save_Attr1fNV(VERT_ATTRIB_TEX0, x); } -static void GLAPIENTRY save_TexCoord1fv( const GLfloat *v ) +static void GLAPIENTRY +save_TexCoord1fv(const GLfloat * v) { - save_Attr1fNV( VERT_ATTRIB_TEX0, v[0] ); + save_Attr1fNV(VERT_ATTRIB_TEX0, v[0]); } -static void GLAPIENTRY save_TexCoord2f( GLfloat x, GLfloat y ) +static void GLAPIENTRY +save_TexCoord2f(GLfloat x, GLfloat y) { - save_Attr2fNV( VERT_ATTRIB_TEX0, x, y ); + save_Attr2fNV(VERT_ATTRIB_TEX0, x, y); } -static void GLAPIENTRY save_TexCoord2fv( const GLfloat *v ) +static void GLAPIENTRY +save_TexCoord2fv(const GLfloat * v) { - save_Attr2fNV( VERT_ATTRIB_TEX0, v[0], v[1] ); + save_Attr2fNV(VERT_ATTRIB_TEX0, v[0], v[1]); } -static void GLAPIENTRY save_TexCoord3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_TexCoord3f(GLfloat x, GLfloat y, GLfloat z) { - save_Attr3fNV( VERT_ATTRIB_TEX0, x, y, z ); + save_Attr3fNV(VERT_ATTRIB_TEX0, x, y, z); } -static void GLAPIENTRY save_TexCoord3fv( const GLfloat *v ) +static void GLAPIENTRY +save_TexCoord3fv(const GLfloat * v) { - save_Attr3fNV( VERT_ATTRIB_TEX0, v[0], v[1], v[2] ); + save_Attr3fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2]); } -static void GLAPIENTRY save_TexCoord4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_TexCoord4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - save_Attr4fNV( VERT_ATTRIB_TEX0, x, y, z, w ); + save_Attr4fNV(VERT_ATTRIB_TEX0, x, y, z, w); } -static void GLAPIENTRY save_TexCoord4fv( const GLfloat *v ) +static void GLAPIENTRY +save_TexCoord4fv(const GLfloat * v) { - save_Attr4fNV( VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3] ); + save_Attr4fNV(VERT_ATTRIB_TEX0, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_Normal3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Normal3f(GLfloat x, GLfloat y, GLfloat z) { - save_Attr3fNV( VERT_ATTRIB_NORMAL, x, y, z ); + save_Attr3fNV(VERT_ATTRIB_NORMAL, x, y, z); } -static void GLAPIENTRY save_Normal3fv( const GLfloat *v ) +static void GLAPIENTRY +save_Normal3fv(const GLfloat * v) { - save_Attr3fNV( VERT_ATTRIB_NORMAL, v[0], v[1], v[2] ); + save_Attr3fNV(VERT_ATTRIB_NORMAL, v[0], v[1], v[2]); } -static void GLAPIENTRY save_FogCoordfEXT( GLfloat x ) +static void GLAPIENTRY +save_FogCoordfEXT(GLfloat x) { - save_Attr1fNV( VERT_ATTRIB_FOG, x ); + save_Attr1fNV(VERT_ATTRIB_FOG, x); } -static void GLAPIENTRY save_FogCoordfvEXT( const GLfloat *v ) +static void GLAPIENTRY +save_FogCoordfvEXT(const GLfloat * v) { - save_Attr1fNV( VERT_ATTRIB_FOG, v[0] ); + save_Attr1fNV(VERT_ATTRIB_FOG, v[0]); } -static void GLAPIENTRY save_Color3f( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_Color3f(GLfloat x, GLfloat y, GLfloat z) { - save_Attr3fNV( VERT_ATTRIB_COLOR0, x, y, z ); + save_Attr3fNV(VERT_ATTRIB_COLOR0, x, y, z); } -static void GLAPIENTRY save_Color3fv( const GLfloat *v ) +static void GLAPIENTRY +save_Color3fv(const GLfloat * v) { - save_Attr3fNV( VERT_ATTRIB_COLOR0, v[0], v[1], v[2] ); + save_Attr3fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2]); } -static void GLAPIENTRY save_Color4f( GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_Color4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - save_Attr4fNV( VERT_ATTRIB_COLOR0, x, y, z, w ); + save_Attr4fNV(VERT_ATTRIB_COLOR0, x, y, z, w); } -static void GLAPIENTRY save_Color4fv( const GLfloat *v ) +static void GLAPIENTRY +save_Color4fv(const GLfloat * v) { - save_Attr4fNV( VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3] ); + save_Attr4fNV(VERT_ATTRIB_COLOR0, v[0], v[1], v[2], v[3]); } -static void GLAPIENTRY save_SecondaryColor3fEXT( GLfloat x, GLfloat y, GLfloat z ) +static void GLAPIENTRY +save_SecondaryColor3fEXT(GLfloat x, GLfloat y, GLfloat z) { - save_Attr3fNV( VERT_ATTRIB_COLOR1, x, y, z ); + save_Attr3fNV(VERT_ATTRIB_COLOR1, x, y, z); } -static void GLAPIENTRY save_SecondaryColor3fvEXT( const GLfloat *v ) +static void GLAPIENTRY +save_SecondaryColor3fvEXT(const GLfloat * v) { - save_Attr3fNV( VERT_ATTRIB_COLOR1, v[0], v[1], v[2] ); + save_Attr3fNV(VERT_ATTRIB_COLOR1, v[0], v[1], v[2]); } /* Just call the respective ATTR for texcoord */ -static void GLAPIENTRY save_MultiTexCoord1f( GLenum target, GLfloat x ) +static void GLAPIENTRY +save_MultiTexCoord1f(GLenum target, GLfloat x) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr1fNV( attr, x ); + save_Attr1fNV(attr, x); } -static void GLAPIENTRY save_MultiTexCoord1fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY +save_MultiTexCoord1fv(GLenum target, const GLfloat * v) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr1fNV( attr, v[0] ); + save_Attr1fNV(attr, v[0]); } -static void GLAPIENTRY save_MultiTexCoord2f( GLenum target, GLfloat x, GLfloat y ) +static void GLAPIENTRY +save_MultiTexCoord2f(GLenum target, GLfloat x, GLfloat y) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr2fNV( attr, x, y ); + save_Attr2fNV(attr, x, y); } -static void GLAPIENTRY save_MultiTexCoord2fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY +save_MultiTexCoord2fv(GLenum target, const GLfloat * v) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr2fNV( attr, v[0], v[1] ); + save_Attr2fNV(attr, v[0], v[1]); } -static void GLAPIENTRY save_MultiTexCoord3f( GLenum target, GLfloat x, GLfloat y, - GLfloat z) +static void GLAPIENTRY +save_MultiTexCoord3f(GLenum target, GLfloat x, GLfloat y, GLfloat z) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr3fNV( attr, x, y, z ); + save_Attr3fNV(attr, x, y, z); } -static void GLAPIENTRY save_MultiTexCoord3fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY +save_MultiTexCoord3fv(GLenum target, const GLfloat * v) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr3fNV( attr, v[0], v[1], v[2] ); + save_Attr3fNV(attr, v[0], v[1], v[2]); } -static void GLAPIENTRY save_MultiTexCoord4f( GLenum target, GLfloat x, GLfloat y, - GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_MultiTexCoord4f(GLenum target, GLfloat x, GLfloat y, + GLfloat z, GLfloat w) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr4fNV( attr, x, y, z, w ); + save_Attr4fNV(attr, x, y, z, w); } -static void GLAPIENTRY save_MultiTexCoord4fv( GLenum target, const GLfloat *v ) +static void GLAPIENTRY +save_MultiTexCoord4fv(GLenum target, const GLfloat * v) { GLuint attr = (target & 0x7) + VERT_ATTRIB_TEX0; - save_Attr4fNV( attr, v[0], v[1], v[2], v[3] ); + save_Attr4fNV(attr, v[0], v[1], v[2], v[3]); } -static void enum_error( void ) +/** + * Record a GL_INVALID_VALUE error when a invalid vertex attribute + * index is found. + */ +static void +index_error(void) { - GET_CURRENT_CONTEXT( ctx ); - _mesa_error( ctx, GL_INVALID_ENUM, "VertexAttribfNV" ); + GET_CURRENT_CONTEXT(ctx); + _mesa_error(ctx, GL_INVALID_VALUE, "VertexAttribf(index)"); } + /* First level for NV_vertex_program: * * Check for errors at compile time?. */ -static void GLAPIENTRY save_VertexAttrib1fNV( GLuint index, GLfloat x ) +static void GLAPIENTRY +save_VertexAttrib1fNV(GLuint index, GLfloat x) { if (index < VERT_ATTRIB_MAX) - save_Attr1fNV( index, x ); + save_Attr1fNV(index, x); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib1fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY +save_VertexAttrib1fvNV(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr1fNV( index, v[0] ); + save_Attr1fNV(index, v[0]); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib2fNV( GLuint index, GLfloat x, GLfloat y ) +static void GLAPIENTRY +save_VertexAttrib2fNV(GLuint index, GLfloat x, GLfloat y) { if (index < VERT_ATTRIB_MAX) - save_Attr2fNV( index, x, y ); + save_Attr2fNV(index, x, y); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib2fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY +save_VertexAttrib2fvNV(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr2fNV( index, v[0], v[1] ); + save_Attr2fNV(index, v[0], v[1]); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib3fNV( GLuint index, GLfloat x, GLfloat y, - GLfloat z ) +static void GLAPIENTRY +save_VertexAttrib3fNV(GLuint index, GLfloat x, GLfloat y, GLfloat z) { if (index < VERT_ATTRIB_MAX) - save_Attr3fNV( index, x, y, z ); + save_Attr3fNV(index, x, y, z); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib3fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY +save_VertexAttrib3fvNV(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr3fNV( index, v[0], v[1], v[2] ); + save_Attr3fNV(index, v[0], v[1], v[2]); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib4fNV( GLuint index, GLfloat x, GLfloat y, - GLfloat z, GLfloat w ) +static void GLAPIENTRY +save_VertexAttrib4fNV(GLuint index, GLfloat x, GLfloat y, + GLfloat z, GLfloat w) { if (index < VERT_ATTRIB_MAX) - save_Attr4fNV( index, x, y, z, w ); + save_Attr4fNV(index, x, y, z, w); else - enum_error(); + index_error(); } -static void GLAPIENTRY save_VertexAttrib4fvNV( GLuint index, const GLfloat *v ) +static void GLAPIENTRY +save_VertexAttrib4fvNV(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr4fNV( index, v[0], v[1], v[2], v[3] ); + save_Attr4fNV(index, v[0], v[1], v[2], v[3]); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib1fARB( GLuint index, GLfloat x ) +save_VertexAttrib1fARB(GLuint index, GLfloat x) { if (index < VERT_ATTRIB_MAX) - save_Attr1fARB( index, x ); + save_Attr1fARB(index, x); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib1fvARB( GLuint index, const GLfloat *v ) +save_VertexAttrib1fvARB(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr1fARB( index, v[0] ); + save_Attr1fARB(index, v[0]); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib2fARB( GLuint index, GLfloat x, GLfloat y ) +save_VertexAttrib2fARB(GLuint index, GLfloat x, GLfloat y) { if (index < VERT_ATTRIB_MAX) - save_Attr2fARB( index, x, y ); + save_Attr2fARB(index, x, y); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib2fvARB( GLuint index, const GLfloat *v ) +save_VertexAttrib2fvARB(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr2fARB( index, v[0], v[1] ); + save_Attr2fARB(index, v[0], v[1]); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib3fARB( GLuint index, GLfloat x, GLfloat y, GLfloat z ) +save_VertexAttrib3fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z) { if (index < VERT_ATTRIB_MAX) - save_Attr3fARB( index, x, y, z ); + save_Attr3fARB(index, x, y, z); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib3fvARB( GLuint index, const GLfloat *v ) +save_VertexAttrib3fvARB(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr3fARB( index, v[0], v[1], v[2] ); + save_Attr3fARB(index, v[0], v[1], v[2]); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib4fARB( GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w ) +save_VertexAttrib4fARB(GLuint index, GLfloat x, GLfloat y, GLfloat z, + GLfloat w) { if (index < VERT_ATTRIB_MAX) - save_Attr4fARB( index, x, y, z, w ); + save_Attr4fARB(index, x, y, z, w); else - enum_error(); + index_error(); } static void GLAPIENTRY -save_VertexAttrib4fvARB( GLuint index, const GLfloat *v ) +save_VertexAttrib4fvARB(GLuint index, const GLfloat * v) { if (index < VERT_ATTRIB_MAX) - save_Attr4fARB( index, v[0], v[1], v[2], v[3] ); + save_Attr4fARB(index, v[0], v[1], v[2], v[3]); else - enum_error(); + index_error(); } +#if FEATURE_EXT_framebuffer_blit +static void GLAPIENTRY +save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, + GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, + GLbitfield mask, GLenum filter) +{ + GET_CURRENT_CONTEXT(ctx); + Node *n; + ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); + n = ALLOC_INSTRUCTION(ctx, OPCODE_BLIT_FRAMEBUFFER, 10); + if (n) { + n[1].i = srcX0; + n[2].i = srcY0; + n[3].i = srcX1; + n[4].i = srcY1; + n[5].i = dstX0; + n[6].i = dstY0; + n[7].i = dstX1; + n[8].i = dstY1; + n[9].i = mask; + n[10].e = filter; + } + if (ctx->ExecuteFlag) { + CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1, + dstX0, dstY0, dstX1, dstY1, + mask, filter)); + } +} +#endif - -/* KW: Compile commands +/** + * Save an error-generating command into display list. * - * Will appear in the list before the vertex buffer containing the + * KW: Will appear in the list before the vertex buffer containing the * command that provoked the error. I don't see this as a problem. */ -void -_mesa_save_error( GLcontext *ctx, GLenum error, const char *s ) +static void +save_error(GLcontext *ctx, GLenum error, const char *s) { Node *n; - n = ALLOC_INSTRUCTION( ctx, OPCODE_ERROR, 2 ); + n = ALLOC_INSTRUCTION(ctx, OPCODE_ERROR, 2); if (n) { n[1].e = error; n[2].data = (void *) s; } - /* execute already done */ } -/* +/** * Compile an error into current display list. */ void -_mesa_compile_error( GLcontext *ctx, GLenum error, const char *s ) +_mesa_compile_error(GLcontext *ctx, GLenum error, const char *s) { if (ctx->CompileFlag) - _mesa_save_error( ctx, error, s ); - + save_error(ctx, error, s); if (ctx->ExecuteFlag) - _mesa_error( ctx, error, s ); + _mesa_error(ctx, error, s); } - +/** + * Test if ID names a display list. + */ static GLboolean islist(GLcontext *ctx, GLuint list) { @@ -5579,14 +5668,14 @@ islist(GLcontext *ctx, GLuint list) * the absolute list number, not relative to ListBase. * \param list - display list number */ -static void GLAPIENTRY -execute_list( GLcontext *ctx, GLuint list ) +static void +execute_list(GLcontext *ctx, GLuint list) { struct mesa_display_list *dlist; Node *n; GLboolean done; - if (list == 0 || !islist(ctx,list)) + if (list == 0 || !islist(ctx, list)) return; if (ctx->ListState.CallDepth == MAX_LIST_NESTING) { @@ -5595,96 +5684,100 @@ execute_list( GLcontext *ctx, GLuint list ) } - dlist = (struct mesa_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, list); + dlist = + (struct mesa_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, + list); if (!dlist) return; ctx->ListState.CallStack[ctx->ListState.CallDepth++] = dlist; if (ctx->Driver.BeginCallList) - ctx->Driver.BeginCallList( ctx, dlist ); + ctx->Driver.BeginCallList(ctx, dlist); n = dlist->node; done = GL_FALSE; while (!done) { OpCode opcode = n[0].opcode; - int i = (int)n[0].opcode - (int)OPCODE_EXT_0; + int i = (int) n[0].opcode - (int) OPCODE_EXT_0; if (i >= 0 && i < (GLint) ctx->ListExt.NumOpcodes) { /* this is a driver-extended opcode */ - ctx->ListExt.Opcode[i].Execute(ctx, &n[1]); - n += ctx->ListExt.Opcode[i].Size; + ctx->ListExt.Opcode[i].Execute(ctx, &n[1]); + n += ctx->ListExt.Opcode[i].Size; } else { - switch (opcode) { - case OPCODE_ERROR: - _mesa_error( ctx, n[1].e, (const char *) n[2].data ); - break; + switch (opcode) { + case OPCODE_ERROR: + _mesa_error(ctx, n[1].e, (const char *) n[2].data); + break; case OPCODE_ACCUM: - CALL_Accum(ctx->Exec, ( n[1].e, n[2].f )); - break; + CALL_Accum(ctx->Exec, (n[1].e, n[2].f)); + break; case OPCODE_ALPHA_FUNC: - CALL_AlphaFunc(ctx->Exec, ( n[1].e, n[2].f )); - break; + CALL_AlphaFunc(ctx->Exec, (n[1].e, n[2].f)); + break; case OPCODE_BIND_TEXTURE: - CALL_BindTexture(ctx->Exec, ( n[1].e, n[2].ui )); + CALL_BindTexture(ctx->Exec, (n[1].e, n[2].ui)); break; - case OPCODE_BITMAP: + case OPCODE_BITMAP: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_Bitmap(ctx->Exec, ( (GLsizei) n[1].i, (GLsizei) n[2].i, - n[3].f, n[4].f, n[5].f, n[6].f, (const GLubyte *) n[7].data )); - ctx->Unpack = save; /* restore */ + CALL_Bitmap(ctx->Exec, ((GLsizei) n[1].i, (GLsizei) n[2].i, + n[3].f, n[4].f, n[5].f, n[6].f, + (const GLubyte *) n[7].data)); + ctx->Unpack = save; /* restore */ } - break; - case OPCODE_BLEND_COLOR: - CALL_BlendColor(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); - break; - case OPCODE_BLEND_EQUATION: - CALL_BlendEquation(ctx->Exec, ( n[1].e )); - break; - case OPCODE_BLEND_EQUATION_SEPARATE: - CALL_BlendEquationSeparateEXT(ctx->Exec, ( n[1].e, n[2].e )); - break; - case OPCODE_BLEND_FUNC_SEPARATE: - CALL_BlendFuncSeparateEXT(ctx->Exec, (n[1].e, n[2].e, n[3].e, n[4].e)); - break; + break; + case OPCODE_BLEND_COLOR: + CALL_BlendColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); + break; + case OPCODE_BLEND_EQUATION: + CALL_BlendEquation(ctx->Exec, (n[1].e)); + break; + case OPCODE_BLEND_EQUATION_SEPARATE: + CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e)); + break; + case OPCODE_BLEND_FUNC_SEPARATE: + CALL_BlendFuncSeparateEXT(ctx->Exec, + (n[1].e, n[2].e, n[3].e, n[4].e)); + break; case OPCODE_CALL_LIST: - /* Generated by glCallList(), don't add ListBase */ - if (ctx->ListState.CallDepth<MAX_LIST_NESTING) { - execute_list( ctx, n[1].ui ); + /* Generated by glCallList(), don't add ListBase */ + if (ctx->ListState.CallDepth < MAX_LIST_NESTING) { + execute_list(ctx, n[1].ui); } break; case OPCODE_CALL_LIST_OFFSET: - /* Generated by glCallLists() so we must add ListBase */ + /* Generated by glCallLists() so we must add ListBase */ if (n[2].b) { /* user specified a bad data type at compile time */ _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)"); } else if (ctx->ListState.CallDepth < MAX_LIST_NESTING) { - execute_list( ctx, ctx->List.ListBase + n[1].ui ); + execute_list(ctx, ctx->List.ListBase + n[1].ui); } break; - case OPCODE_CLEAR: - CALL_Clear(ctx->Exec, ( n[1].bf )); - break; - case OPCODE_CLEAR_COLOR: - CALL_ClearColor(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); - break; - case OPCODE_CLEAR_ACCUM: - CALL_ClearAccum(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); - break; - case OPCODE_CLEAR_DEPTH: - CALL_ClearDepth(ctx->Exec, ( (GLclampd) n[1].f )); - break; - case OPCODE_CLEAR_INDEX: - CALL_ClearIndex(ctx->Exec, ( (GLfloat) n[1].ui )); - break; - case OPCODE_CLEAR_STENCIL: - CALL_ClearStencil(ctx->Exec, ( n[1].i )); - break; + case OPCODE_CLEAR: + CALL_Clear(ctx->Exec, (n[1].bf)); + break; + case OPCODE_CLEAR_COLOR: + CALL_ClearColor(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); + break; + case OPCODE_CLEAR_ACCUM: + CALL_ClearAccum(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); + break; + case OPCODE_CLEAR_DEPTH: + CALL_ClearDepth(ctx->Exec, ((GLclampd) n[1].f)); + break; + case OPCODE_CLEAR_INDEX: + CALL_ClearIndex(ctx->Exec, ((GLfloat) n[1].ui)); + break; + case OPCODE_CLEAR_STENCIL: + CALL_ClearStencil(ctx->Exec, (n[1].i)); + break; case OPCODE_CLIP_PLANE: { GLdouble eq[4]; @@ -5692,22 +5785,22 @@ execute_list( GLcontext *ctx, GLuint list ) eq[1] = n[3].f; eq[2] = n[4].f; eq[3] = n[5].f; - CALL_ClipPlane(ctx->Exec, ( n[1].e, eq )); + CALL_ClipPlane(ctx->Exec, (n[1].e, eq)); } break; - case OPCODE_COLOR_MASK: - CALL_ColorMask(ctx->Exec, ( n[1].b, n[2].b, n[3].b, n[4].b )); - break; - case OPCODE_COLOR_MATERIAL: - CALL_ColorMaterial(ctx->Exec, ( n[1].e, n[2].e )); - break; + case OPCODE_COLOR_MASK: + CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b)); + break; + case OPCODE_COLOR_MATERIAL: + CALL_ColorMaterial(ctx->Exec, (n[1].e, n[2].e)); + break; case OPCODE_COLOR_TABLE: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_ColorTable(ctx->Exec, ( n[1].e, n[2].e, n[3].i, n[4].e, - n[5].e, n[6].data )); - ctx->Unpack = save; /* restore */ + CALL_ColorTable(ctx->Exec, (n[1].e, n[2].e, n[3].i, n[4].e, + n[5].e, n[6].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_COLOR_TABLE_PARAMETER_FV: @@ -5717,7 +5810,8 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].f; params[2] = n[5].f; params[3] = n[6].f; - CALL_ColorTableParameterfv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_ColorTableParameterfv(ctx->Exec, + (n[1].e, n[2].e, params)); } break; case OPCODE_COLOR_TABLE_PARAMETER_IV: @@ -5727,38 +5821,41 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].i; params[2] = n[5].i; params[3] = n[6].i; - CALL_ColorTableParameteriv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_ColorTableParameteriv(ctx->Exec, + (n[1].e, n[2].e, params)); } break; case OPCODE_COLOR_SUB_TABLE: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_ColorSubTable(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].e, n[5].e, n[6].data )); - ctx->Unpack = save; /* restore */ + CALL_ColorSubTable(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].e, n[5].e, n[6].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_CONVOLUTION_FILTER_1D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_ConvolutionFilter1D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].e, n[5].e, n[6].data )); - ctx->Unpack = save; /* restore */ + CALL_ConvolutionFilter1D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].e, n[5].e, + n[6].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_CONVOLUTION_FILTER_2D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_ConvolutionFilter2D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].e, n[6].e, n[7].data )); - ctx->Unpack = save; /* restore */ + CALL_ConvolutionFilter2D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].e, n[6].e, + n[7].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_CONVOLUTION_PARAMETER_I: - CALL_ConvolutionParameteri(ctx->Exec, ( n[1].e, n[2].e, n[3].i )); + CALL_ConvolutionParameteri(ctx->Exec, (n[1].e, n[2].e, n[3].i)); break; case OPCODE_CONVOLUTION_PARAMETER_IV: { @@ -5767,11 +5864,12 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].i; params[2] = n[5].i; params[3] = n[6].i; - CALL_ConvolutionParameteriv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_ConvolutionParameteriv(ctx->Exec, + (n[1].e, n[2].e, params)); } break; case OPCODE_CONVOLUTION_PARAMETER_F: - CALL_ConvolutionParameterf(ctx->Exec, ( n[1].e, n[2].e, n[3].f )); + CALL_ConvolutionParameterf(ctx->Exec, (n[1].e, n[2].e, n[3].f)); break; case OPCODE_CONVOLUTION_PARAMETER_FV: { @@ -5780,168 +5878,175 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].f; params[2] = n[5].f; params[3] = n[6].f; - CALL_ConvolutionParameterfv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_ConvolutionParameterfv(ctx->Exec, + (n[1].e, n[2].e, params)); } break; case OPCODE_COPY_COLOR_SUB_TABLE: - CALL_CopyColorSubTable(ctx->Exec, ( n[1].e, n[2].i, - n[3].i, n[4].i, n[5].i )); + CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i, + n[3].i, n[4].i, n[5].i)); break; case OPCODE_COPY_COLOR_TABLE: - CALL_CopyColorSubTable(ctx->Exec, ( n[1].e, n[2].i, - n[3].i, n[4].i, n[5].i )); + CALL_CopyColorSubTable(ctx->Exec, (n[1].e, n[2].i, + n[3].i, n[4].i, n[5].i)); + break; + case OPCODE_COPY_PIXELS: + CALL_CopyPixels(ctx->Exec, (n[1].i, n[2].i, + (GLsizei) n[3].i, (GLsizei) n[4].i, + n[5].e)); break; - case OPCODE_COPY_PIXELS: - CALL_CopyPixels(ctx->Exec, ( n[1].i, n[2].i, - (GLsizei) n[3].i, (GLsizei) n[4].i, n[5].e )); - break; case OPCODE_COPY_TEX_IMAGE1D: - CALL_CopyTexImage1D(ctx->Exec, ( n[1].e, n[2].i, n[3].e, n[4].i, - n[5].i, n[6].i, n[7].i )); + CALL_CopyTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, + n[5].i, n[6].i, n[7].i)); break; case OPCODE_COPY_TEX_IMAGE2D: - CALL_CopyTexImage2D(ctx->Exec, ( n[1].e, n[2].i, n[3].e, n[4].i, - n[5].i, n[6].i, n[7].i, n[8].i )); + CALL_CopyTexImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, + n[5].i, n[6].i, n[7].i, n[8].i)); break; case OPCODE_COPY_TEX_SUB_IMAGE1D: - CALL_CopyTexSubImage1D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i )); + CALL_CopyTexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].i, n[6].i)); break; case OPCODE_COPY_TEX_SUB_IMAGE2D: - CALL_CopyTexSubImage2D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i, n[7].i, n[8].i )); + CALL_CopyTexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].i, n[6].i, n[7].i, + n[8].i)); break; case OPCODE_COPY_TEX_SUB_IMAGE3D: - CALL_CopyTexSubImage3D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i, n[7].i, n[8].i , n[9].i)); + CALL_CopyTexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].i, n[6].i, n[7].i, + n[8].i, n[9].i)); break; - case OPCODE_CULL_FACE: - CALL_CullFace(ctx->Exec, ( n[1].e )); - break; - case OPCODE_DEPTH_FUNC: - CALL_DepthFunc(ctx->Exec, ( n[1].e )); - break; - case OPCODE_DEPTH_MASK: - CALL_DepthMask(ctx->Exec, ( n[1].b )); - break; - case OPCODE_DEPTH_RANGE: - CALL_DepthRange(ctx->Exec, ( (GLclampd) n[1].f, (GLclampd) n[2].f )); - break; - case OPCODE_DISABLE: - CALL_Disable(ctx->Exec, ( n[1].e )); - break; - case OPCODE_DRAW_BUFFER: - CALL_DrawBuffer(ctx->Exec, ( n[1].e )); - break; - case OPCODE_DRAW_PIXELS: + case OPCODE_CULL_FACE: + CALL_CullFace(ctx->Exec, (n[1].e)); + break; + case OPCODE_DEPTH_FUNC: + CALL_DepthFunc(ctx->Exec, (n[1].e)); + break; + case OPCODE_DEPTH_MASK: + CALL_DepthMask(ctx->Exec, (n[1].b)); + break; + case OPCODE_DEPTH_RANGE: + CALL_DepthRange(ctx->Exec, + ((GLclampd) n[1].f, (GLclampd) n[2].f)); + break; + case OPCODE_DISABLE: + CALL_Disable(ctx->Exec, (n[1].e)); + break; + case OPCODE_DRAW_BUFFER: + CALL_DrawBuffer(ctx->Exec, (n[1].e)); + break; + case OPCODE_DRAW_PIXELS: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_DrawPixels(ctx->Exec, ( n[1].i, n[2].i, n[3].e, n[4].e, - n[5].data )); - ctx->Unpack = save; /* restore */ + CALL_DrawPixels(ctx->Exec, (n[1].i, n[2].i, n[3].e, n[4].e, + n[5].data)); + ctx->Unpack = save; /* restore */ } - break; - case OPCODE_ENABLE: - CALL_Enable(ctx->Exec, ( n[1].e )); - break; - case OPCODE_EVALMESH1: - CALL_EvalMesh1(ctx->Exec, ( n[1].e, n[2].i, n[3].i )); - break; - case OPCODE_EVALMESH2: - CALL_EvalMesh2(ctx->Exec, ( n[1].e, n[2].i, n[3].i, n[4].i, n[5].i )); - break; - case OPCODE_FOG: - { - GLfloat p[4]; - p[0] = n[2].f; - p[1] = n[3].f; - p[2] = n[4].f; - p[3] = n[5].f; - CALL_Fogfv(ctx->Exec, ( n[1].e, p )); - } - break; - case OPCODE_FRONT_FACE: - CALL_FrontFace(ctx->Exec, ( n[1].e )); - break; + break; + case OPCODE_ENABLE: + CALL_Enable(ctx->Exec, (n[1].e)); + break; + case OPCODE_EVALMESH1: + CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i)); + break; + case OPCODE_EVALMESH2: + CALL_EvalMesh2(ctx->Exec, + (n[1].e, n[2].i, n[3].i, n[4].i, n[5].i)); + break; + case OPCODE_FOG: + { + GLfloat p[4]; + p[0] = n[2].f; + p[1] = n[3].f; + p[2] = n[4].f; + p[3] = n[5].f; + CALL_Fogfv(ctx->Exec, (n[1].e, p)); + } + break; + case OPCODE_FRONT_FACE: + CALL_FrontFace(ctx->Exec, (n[1].e)); + break; case OPCODE_FRUSTUM: - CALL_Frustum(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f )); + CALL_Frustum(ctx->Exec, + (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f)); + break; + case OPCODE_HINT: + CALL_Hint(ctx->Exec, (n[1].e, n[2].e)); + break; + case OPCODE_HISTOGRAM: + CALL_Histogram(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].b)); + break; + case OPCODE_INDEX_MASK: + CALL_IndexMask(ctx->Exec, (n[1].ui)); + break; + case OPCODE_INIT_NAMES: + CALL_InitNames(ctx->Exec, ()); break; - case OPCODE_HINT: - CALL_Hint(ctx->Exec, ( n[1].e, n[2].e )); - break; - case OPCODE_HISTOGRAM: - CALL_Histogram(ctx->Exec, ( n[1].e, n[2].i, n[3].e, n[4].b )); - break; - case OPCODE_INDEX_MASK: - CALL_IndexMask(ctx->Exec, ( n[1].ui )); - break; - case OPCODE_INIT_NAMES: - CALL_InitNames(ctx->Exec, ()); - break; case OPCODE_LIGHT: - { - GLfloat p[4]; - p[0] = n[3].f; - p[1] = n[4].f; - p[2] = n[5].f; - p[3] = n[6].f; - CALL_Lightfv(ctx->Exec, ( n[1].e, n[2].e, p )); - } - break; + { + GLfloat p[4]; + p[0] = n[3].f; + p[1] = n[4].f; + p[2] = n[5].f; + p[3] = n[6].f; + CALL_Lightfv(ctx->Exec, (n[1].e, n[2].e, p)); + } + break; case OPCODE_LIGHT_MODEL: - { - GLfloat p[4]; - p[0] = n[2].f; - p[1] = n[3].f; - p[2] = n[4].f; - p[3] = n[5].f; - CALL_LightModelfv(ctx->Exec, ( n[1].e, p )); - } - break; - case OPCODE_LINE_STIPPLE: - CALL_LineStipple(ctx->Exec, ( n[1].i, n[2].us )); - break; - case OPCODE_LINE_WIDTH: - CALL_LineWidth(ctx->Exec, ( n[1].f )); - break; - case OPCODE_LIST_BASE: - CALL_ListBase(ctx->Exec, ( n[1].ui )); - break; - case OPCODE_LOAD_IDENTITY: + { + GLfloat p[4]; + p[0] = n[2].f; + p[1] = n[3].f; + p[2] = n[4].f; + p[3] = n[5].f; + CALL_LightModelfv(ctx->Exec, (n[1].e, p)); + } + break; + case OPCODE_LINE_STIPPLE: + CALL_LineStipple(ctx->Exec, (n[1].i, n[2].us)); + break; + case OPCODE_LINE_WIDTH: + CALL_LineWidth(ctx->Exec, (n[1].f)); + break; + case OPCODE_LIST_BASE: + CALL_ListBase(ctx->Exec, (n[1].ui)); + break; + case OPCODE_LOAD_IDENTITY: CALL_LoadIdentity(ctx->Exec, ()); break; - case OPCODE_LOAD_MATRIX: - if (sizeof(Node)==sizeof(GLfloat)) { - CALL_LoadMatrixf(ctx->Exec, ( &n[1].f )); - } - else { - GLfloat m[16]; - GLuint i; - for (i=0;i<16;i++) { - m[i] = n[1+i].f; - } - CALL_LoadMatrixf(ctx->Exec, ( m )); - } - break; - case OPCODE_LOAD_NAME: - CALL_LoadName(ctx->Exec, ( n[1].ui )); - break; - case OPCODE_LOGIC_OP: - CALL_LogicOp(ctx->Exec, ( n[1].e )); - break; - case OPCODE_MAP1: + case OPCODE_LOAD_MATRIX: + if (sizeof(Node) == sizeof(GLfloat)) { + CALL_LoadMatrixf(ctx->Exec, (&n[1].f)); + } + else { + GLfloat m[16]; + GLuint i; + for (i = 0; i < 16; i++) { + m[i] = n[1 + i].f; + } + CALL_LoadMatrixf(ctx->Exec, (m)); + } + break; + case OPCODE_LOAD_NAME: + CALL_LoadName(ctx->Exec, (n[1].ui)); + break; + case OPCODE_LOGIC_OP: + CALL_LogicOp(ctx->Exec, (n[1].e)); + break; + case OPCODE_MAP1: { GLenum target = n[1].e; GLint ustride = _mesa_evaluator_components(target); GLint uorder = n[5].i; GLfloat u1 = n[2].f; GLfloat u2 = n[3].f; - CALL_Map1f(ctx->Exec, ( target, u1, u2, ustride, uorder, - (GLfloat *) n[6].data )); + CALL_Map1f(ctx->Exec, (target, u1, u2, ustride, uorder, + (GLfloat *) n[6].data)); } - break; - case OPCODE_MAP2: + break; + case OPCODE_MAP2: { GLenum target = n[1].e; GLfloat u1 = n[2].f; @@ -5952,135 +6057,140 @@ execute_list( GLcontext *ctx, GLuint list ) GLint vstride = n[7].i; GLint uorder = n[8].i; GLint vorder = n[9].i; - CALL_Map2f(ctx->Exec, ( target, u1, u2, ustride, uorder, - v1, v2, vstride, vorder, - (GLfloat *) n[10].data )); + CALL_Map2f(ctx->Exec, (target, u1, u2, ustride, uorder, + v1, v2, vstride, vorder, + (GLfloat *) n[10].data)); } - break; - case OPCODE_MAPGRID1: - CALL_MapGrid1f(ctx->Exec, ( n[1].i, n[2].f, n[3].f )); - break; - case OPCODE_MAPGRID2: - CALL_MapGrid2f(ctx->Exec, ( n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f)); - break; + break; + case OPCODE_MAPGRID1: + CALL_MapGrid1f(ctx->Exec, (n[1].i, n[2].f, n[3].f)); + break; + case OPCODE_MAPGRID2: + CALL_MapGrid2f(ctx->Exec, + (n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f)); + break; case OPCODE_MATRIX_MODE: - CALL_MatrixMode(ctx->Exec, ( n[1].e )); + CALL_MatrixMode(ctx->Exec, (n[1].e)); break; case OPCODE_MIN_MAX: CALL_Minmax(ctx->Exec, (n[1].e, n[2].e, n[3].b)); break; - case OPCODE_MULT_MATRIX: - if (sizeof(Node)==sizeof(GLfloat)) { - CALL_MultMatrixf(ctx->Exec, ( &n[1].f )); - } - else { - GLfloat m[16]; - GLuint i; - for (i=0;i<16;i++) { - m[i] = n[1+i].f; - } - CALL_MultMatrixf(ctx->Exec, ( m )); - } - break; + case OPCODE_MULT_MATRIX: + if (sizeof(Node) == sizeof(GLfloat)) { + CALL_MultMatrixf(ctx->Exec, (&n[1].f)); + } + else { + GLfloat m[16]; + GLuint i; + for (i = 0; i < 16; i++) { + m[i] = n[1 + i].f; + } + CALL_MultMatrixf(ctx->Exec, (m)); + } + break; case OPCODE_ORTHO: - CALL_Ortho(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f )); + CALL_Ortho(ctx->Exec, + (n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f)); + break; + case OPCODE_PASSTHROUGH: + CALL_PassThrough(ctx->Exec, (n[1].f)); + break; + case OPCODE_PIXEL_MAP: + CALL_PixelMapfv(ctx->Exec, + (n[1].e, n[2].i, (GLfloat *) n[3].data)); + break; + case OPCODE_PIXEL_TRANSFER: + CALL_PixelTransferf(ctx->Exec, (n[1].e, n[2].f)); + break; + case OPCODE_PIXEL_ZOOM: + CALL_PixelZoom(ctx->Exec, (n[1].f, n[2].f)); + break; + case OPCODE_POINT_SIZE: + CALL_PointSize(ctx->Exec, (n[1].f)); + break; + case OPCODE_POINT_PARAMETERS: + { + GLfloat params[3]; + params[0] = n[2].f; + params[1] = n[3].f; + params[2] = n[4].f; + CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params)); + } + break; + case OPCODE_POLYGON_MODE: + CALL_PolygonMode(ctx->Exec, (n[1].e, n[2].e)); + break; + case OPCODE_POLYGON_STIPPLE: + CALL_PolygonStipple(ctx->Exec, ((GLubyte *) n[1].data)); + break; + case OPCODE_POLYGON_OFFSET: + CALL_PolygonOffset(ctx->Exec, (n[1].f, n[2].f)); + break; + case OPCODE_POP_ATTRIB: + CALL_PopAttrib(ctx->Exec, ()); + break; + case OPCODE_POP_MATRIX: + CALL_PopMatrix(ctx->Exec, ()); + break; + case OPCODE_POP_NAME: + CALL_PopName(ctx->Exec, ()); + break; + case OPCODE_PRIORITIZE_TEXTURE: + CALL_PrioritizeTextures(ctx->Exec, (1, &n[1].ui, &n[2].f)); + break; + case OPCODE_PUSH_ATTRIB: + CALL_PushAttrib(ctx->Exec, (n[1].bf)); + break; + case OPCODE_PUSH_MATRIX: + CALL_PushMatrix(ctx->Exec, ()); + break; + case OPCODE_PUSH_NAME: + CALL_PushName(ctx->Exec, (n[1].ui)); + break; + case OPCODE_RASTER_POS: + CALL_RasterPos4f(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); + break; + case OPCODE_READ_BUFFER: + CALL_ReadBuffer(ctx->Exec, (n[1].e)); break; - case OPCODE_PASSTHROUGH: - CALL_PassThrough(ctx->Exec, ( n[1].f )); - break; - case OPCODE_PIXEL_MAP: - CALL_PixelMapfv(ctx->Exec, ( n[1].e, n[2].i, (GLfloat *) n[3].data )); - break; - case OPCODE_PIXEL_TRANSFER: - CALL_PixelTransferf(ctx->Exec, ( n[1].e, n[2].f )); - break; - case OPCODE_PIXEL_ZOOM: - CALL_PixelZoom(ctx->Exec, ( n[1].f, n[2].f )); - break; - case OPCODE_POINT_SIZE: - CALL_PointSize(ctx->Exec, ( n[1].f )); - break; - case OPCODE_POINT_PARAMETERS: - { - GLfloat params[3]; - params[0] = n[2].f; - params[1] = n[3].f; - params[2] = n[4].f; - CALL_PointParameterfvEXT(ctx->Exec, ( n[1].e, params )); - } - break; - case OPCODE_POLYGON_MODE: - CALL_PolygonMode(ctx->Exec, ( n[1].e, n[2].e )); - break; - case OPCODE_POLYGON_STIPPLE: - CALL_PolygonStipple(ctx->Exec, ( (GLubyte *) n[1].data )); - break; - case OPCODE_POLYGON_OFFSET: - CALL_PolygonOffset(ctx->Exec, ( n[1].f, n[2].f )); - break; - case OPCODE_POP_ATTRIB: - CALL_PopAttrib(ctx->Exec, ()); - break; - case OPCODE_POP_MATRIX: - CALL_PopMatrix(ctx->Exec, ()); - break; - case OPCODE_POP_NAME: - CALL_PopName(ctx->Exec, ()); - break; - case OPCODE_PRIORITIZE_TEXTURE: - CALL_PrioritizeTextures(ctx->Exec, ( 1, &n[1].ui, &n[2].f )); - break; - case OPCODE_PUSH_ATTRIB: - CALL_PushAttrib(ctx->Exec, ( n[1].bf )); - break; - case OPCODE_PUSH_MATRIX: - CALL_PushMatrix(ctx->Exec, ()); - break; - case OPCODE_PUSH_NAME: - CALL_PushName(ctx->Exec, ( n[1].ui )); - break; - case OPCODE_RASTER_POS: - CALL_RasterPos4f(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); - break; - case OPCODE_READ_BUFFER: - CALL_ReadBuffer(ctx->Exec, ( n[1].e )); - break; case OPCODE_RESET_HISTOGRAM: - CALL_ResetHistogram(ctx->Exec, ( n[1].e )); + CALL_ResetHistogram(ctx->Exec, (n[1].e)); break; case OPCODE_RESET_MIN_MAX: - CALL_ResetMinmax(ctx->Exec, ( n[1].e )); + CALL_ResetMinmax(ctx->Exec, (n[1].e)); break; case OPCODE_ROTATE: - CALL_Rotatef(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); + CALL_Rotatef(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); break; case OPCODE_SCALE: - CALL_Scalef(ctx->Exec, ( n[1].f, n[2].f, n[3].f )); + CALL_Scalef(ctx->Exec, (n[1].f, n[2].f, n[3].f)); + break; + case OPCODE_SCISSOR: + CALL_Scissor(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i)); + break; + case OPCODE_SHADE_MODEL: + CALL_ShadeModel(ctx->Exec, (n[1].e)); + break; + case OPCODE_STENCIL_FUNC: + CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui)); + break; + case OPCODE_STENCIL_MASK: + CALL_StencilMask(ctx->Exec, (n[1].ui)); + break; + case OPCODE_STENCIL_OP: + CALL_StencilOp(ctx->Exec, (n[1].e, n[2].e, n[3].e)); + break; + case OPCODE_STENCIL_FUNC_SEPARATE: + CALL_StencilFuncSeparate(ctx->Exec, + (n[1].e, n[2].e, n[3].i, n[4].ui)); + break; + case OPCODE_STENCIL_MASK_SEPARATE: + CALL_StencilMaskSeparate(ctx->Exec, (n[1].e, n[2].ui)); + break; + case OPCODE_STENCIL_OP_SEPARATE: + CALL_StencilOpSeparate(ctx->Exec, + (n[1].e, n[2].e, n[3].e, n[4].e)); break; - case OPCODE_SCISSOR: - CALL_Scissor(ctx->Exec, ( n[1].i, n[2].i, n[3].i, n[4].i )); - break; - case OPCODE_SHADE_MODEL: - CALL_ShadeModel(ctx->Exec, ( n[1].e )); - break; - case OPCODE_STENCIL_FUNC: - CALL_StencilFunc(ctx->Exec, ( n[1].e, n[2].i, n[3].ui )); - break; - case OPCODE_STENCIL_MASK: - CALL_StencilMask(ctx->Exec, ( n[1].ui )); - break; - case OPCODE_STENCIL_OP: - CALL_StencilOp(ctx->Exec, ( n[1].e, n[2].e, n[3].e )); - break; - case OPCODE_STENCIL_FUNC_SEPARATE: - CALL_StencilFuncSeparate(ctx->Exec, ( n[1].e, n[2].e, n[3].i, n[4].ui )); - break; - case OPCODE_STENCIL_MASK_SEPARATE: - CALL_StencilMaskSeparate(ctx->Exec, ( n[1].e, n[2].ui )); - break; - case OPCODE_STENCIL_OP_SEPARATE: - CALL_StencilOpSeparate(ctx->Exec, ( n[1].e, n[2].e, n[3].e, n[4].e )); - break; case OPCODE_TEXENV: { GLfloat params[4]; @@ -6088,7 +6198,7 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].f; params[2] = n[5].f; params[3] = n[6].f; - CALL_TexEnvfv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_TexEnvfv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_TEXGEN: @@ -6098,7 +6208,7 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].f; params[2] = n[5].f; params[3] = n[6].f; - CALL_TexGenfv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_TexGenfv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_TEXPARAMETER: @@ -6108,138 +6218,144 @@ execute_list( GLcontext *ctx, GLuint list ) params[1] = n[4].f; params[2] = n[5].f; params[3] = n[6].f; - CALL_TexParameterfv(ctx->Exec, ( n[1].e, n[2].e, params )); + CALL_TexParameterfv(ctx->Exec, (n[1].e, n[2].e, params)); } break; - case OPCODE_TEX_IMAGE1D: + case OPCODE_TEX_IMAGE1D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexImage1D(ctx->Exec, ( - n[1].e, /* target */ - n[2].i, /* level */ - n[3].i, /* components */ - n[4].i, /* width */ - n[5].e, /* border */ - n[6].e, /* format */ - n[7].e, /* type */ - n[8].data )); - ctx->Unpack = save; /* restore */ + CALL_TexImage1D(ctx->Exec, (n[1].e, /* target */ + n[2].i, /* level */ + n[3].i, /* components */ + n[4].i, /* width */ + n[5].e, /* border */ + n[6].e, /* format */ + n[7].e, /* type */ + n[8].data)); + ctx->Unpack = save; /* restore */ } - break; - case OPCODE_TEX_IMAGE2D: + break; + case OPCODE_TEX_IMAGE2D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexImage2D(ctx->Exec, ( - n[1].e, /* target */ - n[2].i, /* level */ - n[3].i, /* components */ - n[4].i, /* width */ - n[5].i, /* height */ - n[6].e, /* border */ - n[7].e, /* format */ - n[8].e, /* type */ - n[9].data )); - ctx->Unpack = save; /* restore */ + CALL_TexImage2D(ctx->Exec, (n[1].e, /* target */ + n[2].i, /* level */ + n[3].i, /* components */ + n[4].i, /* width */ + n[5].i, /* height */ + n[6].e, /* border */ + n[7].e, /* format */ + n[8].e, /* type */ + n[9].data)); + ctx->Unpack = save; /* restore */ } - break; + break; case OPCODE_TEX_IMAGE3D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexImage3D(ctx->Exec, ( - n[1].e, /* target */ - n[2].i, /* level */ - n[3].i, /* components */ - n[4].i, /* width */ - n[5].i, /* height */ - n[6].i, /* depth */ - n[7].e, /* border */ - n[8].e, /* format */ - n[9].e, /* type */ - n[10].data )); - ctx->Unpack = save; /* restore */ + CALL_TexImage3D(ctx->Exec, (n[1].e, /* target */ + n[2].i, /* level */ + n[3].i, /* components */ + n[4].i, /* width */ + n[5].i, /* height */ + n[6].i, /* depth */ + n[7].e, /* border */ + n[8].e, /* format */ + n[9].e, /* type */ + n[10].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_TEX_SUB_IMAGE1D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexSubImage1D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].e, - n[6].e, n[7].data )); - ctx->Unpack = save; /* restore */ + CALL_TexSubImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].e, + n[6].e, n[7].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_TEX_SUB_IMAGE2D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexSubImage2D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].e, - n[6].i, n[7].e, n[8].e, n[9].data )); - ctx->Unpack = save; /* restore */ + CALL_TexSubImage2D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].e, + n[6].i, n[7].e, n[8].e, + n[9].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_TEX_SUB_IMAGE3D: { const struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = ctx->DefaultPacking; - CALL_TexSubImage3D(ctx->Exec, ( n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i, n[7].i, - n[8].i, n[9].e, n[10].e, - n[11].data )); - ctx->Unpack = save; /* restore */ + CALL_TexSubImage3D(ctx->Exec, (n[1].e, n[2].i, n[3].i, + n[4].i, n[5].i, n[6].i, n[7].i, + n[8].i, n[9].e, n[10].e, + n[11].data)); + ctx->Unpack = save; /* restore */ } break; case OPCODE_TRANSLATE: - CALL_Translatef(ctx->Exec, ( n[1].f, n[2].f, n[3].f )); + CALL_Translatef(ctx->Exec, (n[1].f, n[2].f, n[3].f)); break; - case OPCODE_VIEWPORT: - CALL_Viewport(ctx->Exec, (n[1].i, n[2].i, - (GLsizei) n[3].i, (GLsizei) n[4].i)); - break; - case OPCODE_WINDOW_POS: - CALL_WindowPos4fMESA(ctx->Exec, ( n[1].f, n[2].f, n[3].f, n[4].f )); - break; - case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */ - CALL_ActiveTextureARB(ctx->Exec, ( n[1].e )); + case OPCODE_VIEWPORT: + CALL_Viewport(ctx->Exec, (n[1].i, n[2].i, + (GLsizei) n[3].i, (GLsizei) n[4].i)); + break; + case OPCODE_WINDOW_POS: + CALL_WindowPos4fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); break; - case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */ + case OPCODE_ACTIVE_TEXTURE: /* GL_ARB_multitexture */ + CALL_ActiveTextureARB(ctx->Exec, (n[1].e)); + break; + case OPCODE_COMPRESSED_TEX_IMAGE_1D: /* GL_ARB_texture_compression */ CALL_CompressedTexImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, - n[4].i, n[5].i, n[6].i, n[7].data)); + n[4].i, n[5].i, n[6].i, + n[7].data)); break; - case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */ + case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */ CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, - n[4].i, n[5].i, n[6].i, n[7].i, n[8].data)); + n[4].i, n[5].i, n[6].i, + n[7].i, n[8].data)); break; - case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */ + case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */ CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, - n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, n[9].data)); + n[4].i, n[5].i, n[6].i, + n[7].i, n[8].i, + n[9].data)); break; - case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage1DARB(ctx->Exec, (n[1].e, n[2].i, n[3].i, - n[4].i, n[5].e, n[6].i, n[7].data)); + case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */ + CALL_CompressedTexSubImage1DARB(ctx->Exec, + (n[1].e, n[2].i, n[3].i, n[4].i, + n[5].e, n[6].i, n[7].data)); break; - case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i, n[7].e, n[8].i, n[9].data)); + case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D: /* GL_ARB_texture_compress */ + CALL_CompressedTexSubImage2DARB(ctx->Exec, + (n[1].e, n[2].i, n[3].i, n[4].i, + n[5].i, n[6].i, n[7].e, n[8].i, + n[9].data)); break; - case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].i, - n[4].i, n[5].i, n[6].i, n[7].i, n[8].i, - n[9].e, n[10].i, n[11].data)); + case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D: /* GL_ARB_texture_compress */ + CALL_CompressedTexSubImage3DARB(ctx->Exec, + (n[1].e, n[2].i, n[3].i, n[4].i, + n[5].i, n[6].i, n[7].i, n[8].i, + n[9].e, n[10].i, n[11].data)); break; - case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */ + case OPCODE_SAMPLE_COVERAGE: /* GL_ARB_multisample */ CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b)); break; - case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */ - CALL_WindowPos3fMESA(ctx->Exec, ( n[1].f, n[2].f, n[3].f )); - break; + case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */ + CALL_WindowPos3fMESA(ctx->Exec, (n[1].f, n[2].f, n[3].f)); + break; #if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program - case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */ - CALL_BindProgramNV(ctx->Exec, ( n[1].e, n[2].ui )); + case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */ + CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui)); break; #endif #if FEATURE_NV_vertex_program @@ -6255,15 +6371,15 @@ execute_list( GLcontext *ctx, GLuint list ) break; case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV: CALL_RequestResidentProgramsNV(ctx->Exec, (n[1].ui, - (GLuint *) n[2].data)); + (GLuint *) n[2].data)); break; case OPCODE_LOAD_PROGRAM_NV: CALL_LoadProgramNV(ctx->Exec, (n[1].e, n[2].ui, n[3].i, - (const GLubyte *) n[4].data)); + (const GLubyte *) n[4].data)); break; case OPCODE_PROGRAM_PARAMETER4F_NV: CALL_ProgramParameter4fNV(ctx->Exec, (n[1].e, n[2].ui, n[3].f, - n[4].f, n[5].f, n[6].f)); + n[4].f, n[5].f, n[6].f)); break; case OPCODE_TRACK_MATRIX_NV: CALL_TrackMatrixNV(ctx->Exec, (n[1].e, n[2].ui, n[3].e, n[4].e)); @@ -6272,13 +6388,15 @@ execute_list( GLcontext *ctx, GLuint list ) #if FEATURE_NV_fragment_program case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB: - CALL_ProgramLocalParameter4fARB(ctx->Exec, (n[1].e, n[2].ui, n[3].f, - n[4].f, n[5].f, n[6].f)); + CALL_ProgramLocalParameter4fARB(ctx->Exec, + (n[1].e, n[2].ui, n[3].f, n[4].f, + n[5].f, n[6].f)); break; case OPCODE_PROGRAM_NAMED_PARAMETER_NV: CALL_ProgramNamedParameter4fNV(ctx->Exec, (n[1].ui, n[2].i, - (const GLubyte *) n[3].data, - n[4].f, n[5].f, n[6].f, n[7].f)); + (const GLubyte *) n[3]. + data, n[4].f, n[5].f, + n[6].f, n[7].f)); break; #endif @@ -6290,11 +6408,13 @@ execute_list( GLcontext *ctx, GLuint list ) break; #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program case OPCODE_PROGRAM_STRING_ARB: - CALL_ProgramStringARB(ctx->Exec, (n[1].e, n[2].e, n[3].i, n[4].data)); + CALL_ProgramStringARB(ctx->Exec, + (n[1].e, n[2].e, n[3].i, n[4].data)); break; case OPCODE_PROGRAM_ENV_PARAMETER_ARB: CALL_ProgramEnvParameter4fARB(ctx->Exec, (n[1].e, n[2].ui, n[3].f, - n[4].f, n[5].f, n[6].f)); + n[4].f, n[5].f, + n[6].f)); break; #endif #if FEATURE_ARB_occlusion_query @@ -6306,221 +6426,223 @@ execute_list( GLcontext *ctx, GLuint list ) break; #endif case OPCODE_DRAW_BUFFERS_ARB: - { - GLenum buffers[MAX_DRAW_BUFFERS]; - GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS); - for (i = 0; i < count; i++) - buffers[i] = n[2 + i].e; - CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers)); - } + { + GLenum buffers[MAX_DRAW_BUFFERS]; + GLint i, count = MIN2(n[1].i, MAX_DRAW_BUFFERS); + for (i = 0; i < count; i++) + buffers[i] = n[2 + i].e; + CALL_DrawBuffersARB(ctx->Exec, (n[1].i, buffers)); + } break; -#if FEATURE_ATI_fragment_shader - case OPCODE_BIND_FRAGMENT_SHADER_ATI: - CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i)); +#if FEATURE_EXT_framebuffer_blit + case OPCODE_BLIT_FRAMEBUFFER: + CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, + n[5].i, n[6].i, n[7].i, n[8].i, + n[9].i, n[10].e)); break; - case OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI: - { - GLfloat values[4]; - GLuint i, dst = n[1].ui; - - for (i = 0; i < 4; i++) - values[i] = n[1+i].f; - CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values)); - } - break; #endif - case OPCODE_ATTR_1F_NV: - CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f)); - break; - case OPCODE_ATTR_2F_NV: - /* Really shouldn't have to do this - the Node structure - * is convenient, but it would be better to store the data - * packed appropriately so that it can be sent directly - * on. With x86_64 becoming common, this will start to - * matter more. - */ - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib2fvNV(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib2fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f)); - break; - case OPCODE_ATTR_3F_NV: - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib3fvNV(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib3fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f, - n[4].f)); - break; - case OPCODE_ATTR_4F_NV: - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib4fvNV(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib4fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f, - n[4].f, n[5].f)); - break; - case OPCODE_ATTR_1F_ARB: - CALL_VertexAttrib1fARB(ctx->Exec, (n[1].e, n[2].f)); - break; - case OPCODE_ATTR_2F_ARB: - /* Really shouldn't have to do this - the Node structure - * is convenient, but it would be better to store the data - * packed appropriately so that it can be sent directly - * on. With x86_64 becoming common, this will start to - * matter more. - */ - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib2fvARB(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib2fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f)); - break; - case OPCODE_ATTR_3F_ARB: - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib3fvARB(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib3fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f, - n[4].f)); - break; - case OPCODE_ATTR_4F_ARB: - if (sizeof(Node)==sizeof(GLfloat)) - CALL_VertexAttrib4fvARB(ctx->Exec, (n[1].e, &n[2].f)); - else - CALL_VertexAttrib4fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f, - n[4].f, n[5].f)); - break; - case OPCODE_MATERIAL: - if (sizeof(Node)==sizeof(GLfloat)) - CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, &n[3].f)); - else { - GLfloat f[4]; - f[0] = n[3].f; - f[1] = n[4].f; - f[2] = n[5].f; - f[3] = n[6].f; - CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, f)); - } - break; - case OPCODE_INDEX: - CALL_Indexi(ctx->Exec, (n[1].i)); - break; - case OPCODE_EDGEFLAG: - CALL_EdgeFlag(ctx->Exec, (n[1].b)); - break; - case OPCODE_BEGIN: - CALL_Begin(ctx->Exec, (n[1].e)); - break; - case OPCODE_END: - CALL_End(ctx->Exec, ()); - break; - case OPCODE_RECTF: - CALL_Rectf(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); - break; - case OPCODE_EVAL_C1: - CALL_EvalCoord1f(ctx->Exec, (n[1].f)); - break; - case OPCODE_EVAL_C2: - CALL_EvalCoord2f(ctx->Exec, (n[1].f, n[2].f)); - break; - case OPCODE_EVAL_P1: - CALL_EvalPoint1(ctx->Exec, (n[1].i)); - break; - case OPCODE_EVAL_P2: - CALL_EvalPoint2(ctx->Exec, (n[1].i, n[2].i)); - break; +#if FEATURE_ATI_fragment_shader + case OPCODE_BIND_FRAGMENT_SHADER_ATI: + CALL_BindFragmentShaderATI(ctx->Exec, (n[1].i)); + break; + case OPCODE_SET_FRAGMENT_SHADER_CONSTANTS_ATI: + { + GLfloat values[4]; + GLuint i, dst = n[1].ui; + for (i = 0; i < 4; i++) + values[i] = n[1 + i].f; + CALL_SetFragmentShaderConstantATI(ctx->Exec, (dst, values)); + } + break; +#endif + case OPCODE_ATTR_1F_NV: + CALL_VertexAttrib1fNV(ctx->Exec, (n[1].e, n[2].f)); + break; + case OPCODE_ATTR_2F_NV: + /* Really shouldn't have to do this - the Node structure + * is convenient, but it would be better to store the data + * packed appropriately so that it can be sent directly + * on. With x86_64 becoming common, this will start to + * matter more. + */ + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib2fvNV(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib2fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f)); + break; + case OPCODE_ATTR_3F_NV: + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib3fvNV(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib3fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f, + n[4].f)); + break; + case OPCODE_ATTR_4F_NV: + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib4fvNV(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib4fNV(ctx->Exec, (n[1].e, n[2].f, n[3].f, + n[4].f, n[5].f)); + break; + case OPCODE_ATTR_1F_ARB: + CALL_VertexAttrib1fARB(ctx->Exec, (n[1].e, n[2].f)); + break; + case OPCODE_ATTR_2F_ARB: + /* Really shouldn't have to do this - the Node structure + * is convenient, but it would be better to store the data + * packed appropriately so that it can be sent directly + * on. With x86_64 becoming common, this will start to + * matter more. + */ + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib2fvARB(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib2fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f)); + break; + case OPCODE_ATTR_3F_ARB: + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib3fvARB(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib3fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f, + n[4].f)); + break; + case OPCODE_ATTR_4F_ARB: + if (sizeof(Node) == sizeof(GLfloat)) + CALL_VertexAttrib4fvARB(ctx->Exec, (n[1].e, &n[2].f)); + else + CALL_VertexAttrib4fARB(ctx->Exec, (n[1].e, n[2].f, n[3].f, + n[4].f, n[5].f)); + break; + case OPCODE_MATERIAL: + if (sizeof(Node) == sizeof(GLfloat)) + CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, &n[3].f)); + else { + GLfloat f[4]; + f[0] = n[3].f; + f[1] = n[4].f; + f[2] = n[5].f; + f[3] = n[6].f; + CALL_Materialfv(ctx->Exec, (n[1].e, n[2].e, f)); + } + break; + case OPCODE_INDEX: + CALL_Indexi(ctx->Exec, (n[1].i)); + break; + case OPCODE_EDGEFLAG: + CALL_EdgeFlag(ctx->Exec, (n[1].b)); + break; + case OPCODE_BEGIN: + CALL_Begin(ctx->Exec, (n[1].e)); + break; + case OPCODE_END: + CALL_End(ctx->Exec, ()); + break; + case OPCODE_RECTF: + CALL_Rectf(ctx->Exec, (n[1].f, n[2].f, n[3].f, n[4].f)); + break; + case OPCODE_EVAL_C1: + CALL_EvalCoord1f(ctx->Exec, (n[1].f)); + break; + case OPCODE_EVAL_C2: + CALL_EvalCoord2f(ctx->Exec, (n[1].f, n[2].f)); + break; + case OPCODE_EVAL_P1: + CALL_EvalPoint1(ctx->Exec, (n[1].i)); + break; + case OPCODE_EVAL_P2: + CALL_EvalPoint2(ctx->Exec, (n[1].i, n[2].i)); + break; - case OPCODE_CONTINUE: - n = (Node *) n[1].next; - break; - case OPCODE_END_OF_LIST: - done = GL_TRUE; - break; - default: + + case OPCODE_CONTINUE: + n = (Node *) n[1].next; + break; + case OPCODE_END_OF_LIST: + done = GL_TRUE; + break; + default: { char msg[1000]; - _mesa_sprintf(msg, "Error in execute_list: opcode=%d", (int) opcode); + _mesa_sprintf(msg, "Error in execute_list: opcode=%d", + (int) opcode); _mesa_problem(ctx, msg); } done = GL_TRUE; - } + } - /* increment n to point to next compiled command */ - if (opcode!=OPCODE_CONTINUE) { - n += InstSize[opcode]; - } + /* increment n to point to next compiled command */ + if (opcode != OPCODE_CONTINUE) { + n += InstSize[opcode]; + } } } if (ctx->Driver.EndCallList) - ctx->Driver.EndCallList( ctx ); + ctx->Driver.EndCallList(ctx); ctx->ListState.CallStack[ctx->ListState.CallDepth--] = NULL; } - - /**********************************************************************/ /* GL functions */ /**********************************************************************/ - - - -/* +/** * Test if a display list number is valid. */ GLboolean GLAPIENTRY -_mesa_IsList( GLuint list ) +_mesa_IsList(GLuint list) { GET_CURRENT_CONTEXT(ctx); - FLUSH_VERTICES(ctx, 0); /* must be called before assert */ + FLUSH_VERTICES(ctx, 0); /* must be called before assert */ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); return islist(ctx, list); } -/* +/** * Delete a sequence of consecutive display lists. */ void GLAPIENTRY -_mesa_DeleteLists( GLuint list, GLsizei range ) +_mesa_DeleteLists(GLuint list, GLsizei range) { GET_CURRENT_CONTEXT(ctx); GLuint i; - FLUSH_VERTICES(ctx, 0); /* must be called before assert */ + FLUSH_VERTICES(ctx, 0); /* must be called before assert */ ASSERT_OUTSIDE_BEGIN_END(ctx); - if (range<0) { - _mesa_error( ctx, GL_INVALID_VALUE, "glDeleteLists" ); + if (range < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "glDeleteLists"); return; } - for (i=list;i<list+range;i++) { - _mesa_destroy_list( ctx, i ); + for (i = list; i < list + range; i++) { + _mesa_destroy_list(ctx, i); } } - -/* +/** * Return a display list number, n, such that lists n through n+range-1 * are free. */ GLuint GLAPIENTRY -_mesa_GenLists(GLsizei range ) +_mesa_GenLists(GLsizei range) { GET_CURRENT_CONTEXT(ctx); GLuint base; - FLUSH_VERTICES(ctx, 0); /* must be called before assert */ + FLUSH_VERTICES(ctx, 0); /* must be called before assert */ ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); - if (range<0) { - _mesa_error( ctx, GL_INVALID_VALUE, "glGenLists" ); + if (range < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "glGenLists"); return 0; } - if (range==0) { + if (range == 0) { return 0; } @@ -6533,8 +6655,9 @@ _mesa_GenLists(GLsizei range ) if (base) { /* reserve the list IDs by with empty/dummy lists */ GLint i; - for (i=0; i<range; i++) { - _mesa_HashInsert(ctx->Shared->DisplayList, base+i, make_list(base+i, 1)); + for (i = 0; i < range; i++) { + _mesa_HashInsert(ctx->Shared->DisplayList, base + i, + make_list(base + i, 1)); } } @@ -6544,36 +6667,35 @@ _mesa_GenLists(GLsizei range ) } - -/* +/** * Begin a new display list. */ void GLAPIENTRY -_mesa_NewList( GLuint list, GLenum mode ) +_mesa_NewList(GLuint list, GLenum mode) { GET_CURRENT_CONTEXT(ctx); GLint i; - FLUSH_CURRENT(ctx, 0); /* must be called before assert */ + FLUSH_CURRENT(ctx, 0); /* must be called before assert */ ASSERT_OUTSIDE_BEGIN_END(ctx); - if (MESA_VERBOSE&VERBOSE_API) + if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glNewList %u %s\n", list, _mesa_lookup_enum_by_nr(mode)); - if (list==0) { - _mesa_error( ctx, GL_INVALID_VALUE, "glNewList" ); + if (list == 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "glNewList"); return; } - if (mode!=GL_COMPILE && mode!=GL_COMPILE_AND_EXECUTE) { - _mesa_error( ctx, GL_INVALID_ENUM, "glNewList" ); + if (mode != GL_COMPILE && mode != GL_COMPILE_AND_EXECUTE) { + _mesa_error(ctx, GL_INVALID_ENUM, "glNewList"); return; } if (ctx->ListState.CurrentListPtr) { /* already compiling a display list */ - _mesa_error( ctx, GL_INVALID_OPERATION, "glNewList" ); + _mesa_error(ctx, GL_INVALID_OPERATION, "glNewList"); return; } @@ -6582,7 +6704,7 @@ _mesa_NewList( GLuint list, GLenum mode ) /* Allocate new display list */ ctx->ListState.CurrentListNum = list; - ctx->ListState.CurrentList = make_list( list, BLOCK_SIZE ); + ctx->ListState.CurrentList = make_list(list, BLOCK_SIZE); ctx->ListState.CurrentBlock = ctx->ListState.CurrentList->node; ctx->ListState.CurrentListPtr = ctx->ListState.CurrentBlock; ctx->ListState.CurrentPos = 0; @@ -6594,50 +6716,50 @@ _mesa_NewList( GLuint list, GLenum mode ) for (i = 0; i < MAT_ATTRIB_MAX; i++) ctx->ListState.ActiveMaterialSize[i] = 0; - + ctx->ListState.ActiveIndex = 0; ctx->ListState.ActiveEdgeFlag = 0; ctx->Driver.CurrentSavePrimitive = PRIM_UNKNOWN; - ctx->Driver.NewList( ctx, list, mode ); + ctx->Driver.NewList(ctx, list, mode); ctx->CurrentDispatch = ctx->Save; - _glapi_set_dispatch( ctx->CurrentDispatch ); + _glapi_set_dispatch(ctx->CurrentDispatch); } - -/* +/** * End definition of current display list. */ void GLAPIENTRY -_mesa_EndList( void ) +_mesa_EndList(void) { GET_CURRENT_CONTEXT(ctx); SAVE_FLUSH_VERTICES(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); - if (MESA_VERBOSE&VERBOSE_API) + if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glEndList\n"); /* Check that a list is under construction */ if (!ctx->ListState.CurrentListPtr) { - _mesa_error( ctx, GL_INVALID_OPERATION, "glEndList" ); + _mesa_error(ctx, GL_INVALID_OPERATION, "glEndList"); return; } - (void) ALLOC_INSTRUCTION( ctx, OPCODE_END_OF_LIST, 0 ); + (void) ALLOC_INSTRUCTION(ctx, OPCODE_END_OF_LIST, 0); /* Destroy old list, if any */ _mesa_destroy_list(ctx, ctx->ListState.CurrentListNum); /* Install the list */ - _mesa_HashInsert(ctx->Shared->DisplayList, ctx->ListState.CurrentListNum, ctx->ListState.CurrentList); + _mesa_HashInsert(ctx->Shared->DisplayList, ctx->ListState.CurrentListNum, + ctx->ListState.CurrentList); if (MESA_VERBOSE & VERBOSE_DISPLAY_LIST) mesa_print_display_list(ctx->ListState.CurrentListNum); - ctx->Driver.EndList( ctx ); + ctx->Driver.EndList(ctx); ctx->ListState.CurrentList = NULL; ctx->ListState.CurrentListNum = 0; @@ -6646,13 +6768,12 @@ _mesa_EndList( void ) ctx->CompileFlag = GL_FALSE; ctx->CurrentDispatch = ctx->Exec; - _glapi_set_dispatch( ctx->CurrentDispatch ); + _glapi_set_dispatch(ctx->CurrentDispatch); } - void GLAPIENTRY -_mesa_CallList( GLuint list ) +_mesa_CallList(GLuint list) { GLboolean save_compile_flag; GET_CURRENT_CONTEXT(ctx); @@ -6675,23 +6796,22 @@ _mesa_CallList( GLuint list ) ctx->CompileFlag = GL_FALSE; } - execute_list( ctx, list ); + execute_list(ctx, list); ctx->CompileFlag = save_compile_flag; /* also restore API function pointers to point to "save" versions */ if (save_compile_flag) { ctx->CurrentDispatch = ctx->Save; - _glapi_set_dispatch( ctx->CurrentDispatch ); + _glapi_set_dispatch(ctx->CurrentDispatch); } } - -/* +/** * Execute glCallLists: call multiple display lists. */ void GLAPIENTRY -_mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ) +_mesa_CallLists(GLsizei n, GLenum type, const GLvoid * lists) { GET_CURRENT_CONTEXT(ctx); GLuint list; @@ -6702,21 +6822,21 @@ _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ) _mesa_debug(ctx, "glCallLists %d\n", n); switch (type) { - case GL_BYTE: - case GL_UNSIGNED_BYTE: - case GL_SHORT: - case GL_UNSIGNED_SHORT: - case GL_INT: - case GL_UNSIGNED_INT: - case GL_FLOAT: - case GL_2_BYTES: - case GL_3_BYTES: - case GL_4_BYTES: - /* OK */ - break; - default: - _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)"); - return; + case GL_BYTE: + case GL_UNSIGNED_BYTE: + case GL_SHORT: + case GL_UNSIGNED_SHORT: + case GL_INT: + case GL_UNSIGNED_INT: + case GL_FLOAT: + case GL_2_BYTES: + case GL_3_BYTES: + case GL_4_BYTES: + /* OK */ + break; + default: + _mesa_error(ctx, GL_INVALID_ENUM, "glCallLists(type)"); + return; } /* Save the CompileFlag status, turn it off, execute display list, @@ -6725,9 +6845,9 @@ _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ) save_compile_flag = ctx->CompileFlag; ctx->CompileFlag = GL_FALSE; - for (i=0;i<n;i++) { - list = translate_id( i, type, lists ); - execute_list( ctx, ctx->List.ListBase + list ); + for (i = 0; i < n; i++) { + list = translate_id(i, type, lists); + execute_list(ctx, ctx->List.ListBase + list); } ctx->CompileFlag = save_compile_flag; @@ -6735,20 +6855,19 @@ _mesa_CallLists( GLsizei n, GLenum type, const GLvoid *lists ) /* also restore API function pointers to point to "save" versions */ if (save_compile_flag) { ctx->CurrentDispatch = ctx->Save; - _glapi_set_dispatch( ctx->CurrentDispatch ); + _glapi_set_dispatch(ctx->CurrentDispatch); } } - -/* +/** * Set the offset added to list numbers in glCallLists. */ void GLAPIENTRY -_mesa_ListBase( GLuint base ) +_mesa_ListBase(GLuint base) { GET_CURRENT_CONTEXT(ctx); - FLUSH_VERTICES(ctx, 0); /* must be called before assert */ + FLUSH_VERTICES(ctx, 0); /* must be called before assert */ ASSERT_OUTSIDE_BEGIN_END(ctx); ctx->List.ListBase = base; } @@ -6756,658 +6875,732 @@ _mesa_ListBase( GLuint base ) /* Can no longer assume ctx->Exec->Func is equal to _mesa_Func. */ -static void GLAPIENTRY exec_Finish( void ) +static void GLAPIENTRY +exec_Finish(void) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); CALL_Finish(ctx->Exec, ()); } -static void GLAPIENTRY exec_Flush( void ) +static void GLAPIENTRY +exec_Flush(void) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_Flush(ctx->Exec, ( )); + CALL_Flush(ctx->Exec, ()); } -static void GLAPIENTRY exec_GetBooleanv( GLenum pname, GLboolean *params ) +static void GLAPIENTRY +exec_GetBooleanv(GLenum pname, GLboolean *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetBooleanv(ctx->Exec, ( pname, params )); + CALL_GetBooleanv(ctx->Exec, (pname, params)); } -static void GLAPIENTRY exec_GetClipPlane( GLenum plane, GLdouble *equation ) +static void GLAPIENTRY +exec_GetClipPlane(GLenum plane, GLdouble * equation) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetClipPlane(ctx->Exec, ( plane, equation )); + CALL_GetClipPlane(ctx->Exec, (plane, equation)); } -static void GLAPIENTRY exec_GetDoublev( GLenum pname, GLdouble *params ) +static void GLAPIENTRY +exec_GetDoublev(GLenum pname, GLdouble *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetDoublev(ctx->Exec, ( pname, params )); + CALL_GetDoublev(ctx->Exec, (pname, params)); } -static GLenum GLAPIENTRY exec_GetError( void ) +static GLenum GLAPIENTRY +exec_GetError(void) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetError(ctx->Exec, ( )); + return CALL_GetError(ctx->Exec, ()); } -static void GLAPIENTRY exec_GetFloatv( GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetFloatv(GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetFloatv(ctx->Exec, ( pname, params )); + CALL_GetFloatv(ctx->Exec, (pname, params)); } -static void GLAPIENTRY exec_GetIntegerv( GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetIntegerv(GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetIntegerv(ctx->Exec, ( pname, params )); + CALL_GetIntegerv(ctx->Exec, (pname, params)); } -static void GLAPIENTRY exec_GetLightfv( GLenum light, GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetLightfv(GLenum light, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetLightfv(ctx->Exec, ( light, pname, params )); + CALL_GetLightfv(ctx->Exec, (light, pname, params)); } -static void GLAPIENTRY exec_GetLightiv( GLenum light, GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetLightiv(GLenum light, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetLightiv(ctx->Exec, ( light, pname, params )); + CALL_GetLightiv(ctx->Exec, (light, pname, params)); } -static void GLAPIENTRY exec_GetMapdv( GLenum target, GLenum query, GLdouble *v ) +static void GLAPIENTRY +exec_GetMapdv(GLenum target, GLenum query, GLdouble * v) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMapdv(ctx->Exec, ( target, query, v )); + CALL_GetMapdv(ctx->Exec, (target, query, v)); } -static void GLAPIENTRY exec_GetMapfv( GLenum target, GLenum query, GLfloat *v ) +static void GLAPIENTRY +exec_GetMapfv(GLenum target, GLenum query, GLfloat * v) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMapfv(ctx->Exec, ( target, query, v )); + CALL_GetMapfv(ctx->Exec, (target, query, v)); } -static void GLAPIENTRY exec_GetMapiv( GLenum target, GLenum query, GLint *v ) +static void GLAPIENTRY +exec_GetMapiv(GLenum target, GLenum query, GLint * v) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMapiv(ctx->Exec, ( target, query, v )); + CALL_GetMapiv(ctx->Exec, (target, query, v)); } -static void GLAPIENTRY exec_GetMaterialfv( GLenum face, GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetMaterialfv(GLenum face, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMaterialfv(ctx->Exec, ( face, pname, params )); + CALL_GetMaterialfv(ctx->Exec, (face, pname, params)); } -static void GLAPIENTRY exec_GetMaterialiv( GLenum face, GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetMaterialiv(GLenum face, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMaterialiv(ctx->Exec, ( face, pname, params )); + CALL_GetMaterialiv(ctx->Exec, (face, pname, params)); } -static void GLAPIENTRY exec_GetPixelMapfv( GLenum map, GLfloat *values ) +static void GLAPIENTRY +exec_GetPixelMapfv(GLenum map, GLfloat *values) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetPixelMapfv(ctx->Exec, ( map, values )); + CALL_GetPixelMapfv(ctx->Exec, (map, values)); } -static void GLAPIENTRY exec_GetPixelMapuiv( GLenum map, GLuint *values ) +static void GLAPIENTRY +exec_GetPixelMapuiv(GLenum map, GLuint *values) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetPixelMapuiv(ctx->Exec, ( map, values )); + CALL_GetPixelMapuiv(ctx->Exec, (map, values)); } -static void GLAPIENTRY exec_GetPixelMapusv( GLenum map, GLushort *values ) +static void GLAPIENTRY +exec_GetPixelMapusv(GLenum map, GLushort *values) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetPixelMapusv(ctx->Exec, ( map, values )); + CALL_GetPixelMapusv(ctx->Exec, (map, values)); } -static void GLAPIENTRY exec_GetPolygonStipple( GLubyte *dest ) +static void GLAPIENTRY +exec_GetPolygonStipple(GLubyte * dest) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetPolygonStipple(ctx->Exec, ( dest )); + CALL_GetPolygonStipple(ctx->Exec, (dest)); } -static const GLubyte * GLAPIENTRY exec_GetString( GLenum name ) +static const GLubyte *GLAPIENTRY +exec_GetString(GLenum name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetString(ctx->Exec, ( name )); + return CALL_GetString(ctx->Exec, (name)); } -static void GLAPIENTRY exec_GetTexEnvfv( GLenum target, GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetTexEnvfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexEnvfv(ctx->Exec, ( target, pname, params )); + CALL_GetTexEnvfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetTexEnviv( GLenum target, GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetTexEnviv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexEnviv(ctx->Exec, ( target, pname, params )); + CALL_GetTexEnviv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetTexGendv( GLenum coord, GLenum pname, GLdouble *params ) +static void GLAPIENTRY +exec_GetTexGendv(GLenum coord, GLenum pname, GLdouble *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexGendv(ctx->Exec, ( coord, pname, params )); + CALL_GetTexGendv(ctx->Exec, (coord, pname, params)); } -static void GLAPIENTRY exec_GetTexGenfv( GLenum coord, GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetTexGenfv(GLenum coord, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexGenfv(ctx->Exec, ( coord, pname, params )); + CALL_GetTexGenfv(ctx->Exec, (coord, pname, params)); } -static void GLAPIENTRY exec_GetTexGeniv( GLenum coord, GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetTexGeniv(GLenum coord, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexGeniv(ctx->Exec, ( coord, pname, params )); + CALL_GetTexGeniv(ctx->Exec, (coord, pname, params)); } -static void GLAPIENTRY exec_GetTexImage( GLenum target, GLint level, GLenum format, - GLenum type, GLvoid *pixels ) +static void GLAPIENTRY +exec_GetTexImage(GLenum target, GLint level, GLenum format, + GLenum type, GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexImage(ctx->Exec, ( target, level, format, type, pixels )); + CALL_GetTexImage(ctx->Exec, (target, level, format, type, pixels)); } -static void GLAPIENTRY exec_GetTexLevelParameterfv( GLenum target, GLint level, - GLenum pname, GLfloat *params ) +static void GLAPIENTRY +exec_GetTexLevelParameterfv(GLenum target, GLint level, + GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexLevelParameterfv(ctx->Exec, ( target, level, pname, params )); + CALL_GetTexLevelParameterfv(ctx->Exec, (target, level, pname, params)); } -static void GLAPIENTRY exec_GetTexLevelParameteriv( GLenum target, GLint level, - GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetTexLevelParameteriv(GLenum target, GLint level, + GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexLevelParameteriv(ctx->Exec, ( target, level, pname, params )); + CALL_GetTexLevelParameteriv(ctx->Exec, (target, level, pname, params)); } -static void GLAPIENTRY exec_GetTexParameterfv( GLenum target, GLenum pname, - GLfloat *params ) +static void GLAPIENTRY +exec_GetTexParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameterfv(ctx->Exec, ( target, pname, params )); + CALL_GetTexParameterfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) +static void GLAPIENTRY +exec_GetTexParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameteriv(ctx->Exec, ( target, pname, params )); + CALL_GetTexParameteriv(ctx->Exec, (target, pname, params)); } -static GLboolean GLAPIENTRY exec_IsEnabled( GLenum cap ) +static GLboolean GLAPIENTRY +exec_IsEnabled(GLenum cap) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_IsEnabled(ctx->Exec, ( cap )); + return CALL_IsEnabled(ctx->Exec, (cap)); } -static void GLAPIENTRY exec_PixelStoref( GLenum pname, GLfloat param ) +static void GLAPIENTRY +exec_PixelStoref(GLenum pname, GLfloat param) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_PixelStoref(ctx->Exec, ( pname, param )); + CALL_PixelStoref(ctx->Exec, (pname, param)); } -static void GLAPIENTRY exec_PixelStorei( GLenum pname, GLint param ) +static void GLAPIENTRY +exec_PixelStorei(GLenum pname, GLint param) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_PixelStorei(ctx->Exec, ( pname, param )); + CALL_PixelStorei(ctx->Exec, (pname, param)); } -static void GLAPIENTRY exec_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, - GLenum format, GLenum type, GLvoid *pixels ) +static void GLAPIENTRY +exec_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, GLvoid * pixels) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_ReadPixels(ctx->Exec, ( x, y, width, height, format, type, pixels )); + CALL_ReadPixels(ctx->Exec, (x, y, width, height, format, type, pixels)); } -static GLint GLAPIENTRY exec_RenderMode( GLenum mode ) +static GLint GLAPIENTRY +exec_RenderMode(GLenum mode) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_RenderMode(ctx->Exec, ( mode )); + return CALL_RenderMode(ctx->Exec, (mode)); } -static void GLAPIENTRY exec_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer ) +static void GLAPIENTRY +exec_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_FeedbackBuffer(ctx->Exec, ( size, type, buffer )); + CALL_FeedbackBuffer(ctx->Exec, (size, type, buffer)); } -static void GLAPIENTRY exec_SelectBuffer( GLsizei size, GLuint *buffer ) +static void GLAPIENTRY +exec_SelectBuffer(GLsizei size, GLuint * buffer) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_SelectBuffer(ctx->Exec, ( size, buffer )); + CALL_SelectBuffer(ctx->Exec, (size, buffer)); } -static GLboolean GLAPIENTRY exec_AreTexturesResident(GLsizei n, const GLuint *texName, - GLboolean *residences) +static GLboolean GLAPIENTRY +exec_AreTexturesResident(GLsizei n, const GLuint * texName, + GLboolean * residences) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_AreTexturesResident(ctx->Exec, ( n, texName, residences)); + return CALL_AreTexturesResident(ctx->Exec, (n, texName, residences)); } -static void GLAPIENTRY exec_ColorPointer(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr) +static void GLAPIENTRY +exec_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_ColorPointer(ctx->Exec, ( size, type, stride, ptr)); + CALL_ColorPointer(ctx->Exec, (size, type, stride, ptr)); } -static void GLAPIENTRY exec_DeleteTextures( GLsizei n, const GLuint *texName) +static void GLAPIENTRY +exec_DeleteTextures(GLsizei n, const GLuint * texName) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_DeleteTextures(ctx->Exec, ( n, texName)); + CALL_DeleteTextures(ctx->Exec, (n, texName)); } -static void GLAPIENTRY exec_DisableClientState( GLenum cap ) +static void GLAPIENTRY +exec_DisableClientState(GLenum cap) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_DisableClientState(ctx->Exec, ( cap )); + CALL_DisableClientState(ctx->Exec, (cap)); } -static void GLAPIENTRY exec_EdgeFlagPointer(GLsizei stride, const GLvoid *vptr) +static void GLAPIENTRY +exec_EdgeFlagPointer(GLsizei stride, const GLvoid * vptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_EdgeFlagPointer(ctx->Exec, ( stride, vptr)); + CALL_EdgeFlagPointer(ctx->Exec, (stride, vptr)); } -static void GLAPIENTRY exec_EnableClientState( GLenum cap ) +static void GLAPIENTRY +exec_EnableClientState(GLenum cap) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_EnableClientState(ctx->Exec, ( cap )); + CALL_EnableClientState(ctx->Exec, (cap)); } -static void GLAPIENTRY exec_GenTextures( GLsizei n, GLuint *texName ) +static void GLAPIENTRY +exec_GenTextures(GLsizei n, GLuint * texName) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GenTextures(ctx->Exec, ( n, texName )); + CALL_GenTextures(ctx->Exec, (n, texName)); } -static void GLAPIENTRY exec_GetPointerv( GLenum pname, GLvoid **params ) +static void GLAPIENTRY +exec_GetPointerv(GLenum pname, GLvoid **params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetPointerv(ctx->Exec, ( pname, params )); + CALL_GetPointerv(ctx->Exec, (pname, params)); } -static void GLAPIENTRY exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr) +static void GLAPIENTRY +exec_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_IndexPointer(ctx->Exec, ( type, stride, ptr)); + CALL_IndexPointer(ctx->Exec, (type, stride, ptr)); } -static void GLAPIENTRY exec_InterleavedArrays(GLenum format, GLsizei stride, - const GLvoid *pointer) +static void GLAPIENTRY +exec_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_InterleavedArrays(ctx->Exec, ( format, stride, pointer)); + CALL_InterleavedArrays(ctx->Exec, (format, stride, pointer)); } -static GLboolean GLAPIENTRY exec_IsTexture( GLuint texture ) +static GLboolean GLAPIENTRY +exec_IsTexture(GLuint texture) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_IsTexture(ctx->Exec, ( texture )); + return CALL_IsTexture(ctx->Exec, (texture)); } -static void GLAPIENTRY exec_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr ) +static void GLAPIENTRY +exec_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_NormalPointer(ctx->Exec, ( type, stride, ptr )); + CALL_NormalPointer(ctx->Exec, (type, stride, ptr)); } -static void GLAPIENTRY exec_PopClientAttrib(void) +static void GLAPIENTRY +exec_PopClientAttrib(void) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); CALL_PopClientAttrib(ctx->Exec, ()); } -static void GLAPIENTRY exec_PushClientAttrib(GLbitfield mask) +static void GLAPIENTRY +exec_PushClientAttrib(GLbitfield mask) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_PushClientAttrib(ctx->Exec, ( mask)); + CALL_PushClientAttrib(ctx->Exec, (mask)); } -static void GLAPIENTRY exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr) +static void GLAPIENTRY +exec_TexCoordPointer(GLint size, GLenum type, GLsizei stride, + const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_TexCoordPointer(ctx->Exec, ( size, type, stride, ptr)); + CALL_TexCoordPointer(ctx->Exec, (size, type, stride, ptr)); } -static void GLAPIENTRY exec_GetCompressedTexImageARB(GLenum target, GLint level, - GLvoid *img) +static void GLAPIENTRY +exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetCompressedTexImageARB(ctx->Exec, ( target, level, img)); + CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img)); } -static void GLAPIENTRY exec_VertexPointer(GLint size, GLenum type, GLsizei stride, - const GLvoid *ptr) +static void GLAPIENTRY +exec_VertexPointer(GLint size, GLenum type, GLsizei stride, + const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_VertexPointer(ctx->Exec, ( size, type, stride, ptr)); + CALL_VertexPointer(ctx->Exec, (size, type, stride, ptr)); } -static void GLAPIENTRY exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, - GLint x, GLint y, GLsizei width) +static void GLAPIENTRY +exec_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, + GLint x, GLint y, GLsizei width) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_CopyConvolutionFilter1D(ctx->Exec, ( target, internalFormat, x, y, width)); + CALL_CopyConvolutionFilter1D(ctx->Exec, + (target, internalFormat, x, y, width)); } -static void GLAPIENTRY exec_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, - GLint x, GLint y, GLsizei width, - GLsizei height) +static void GLAPIENTRY +exec_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, + GLint x, GLint y, GLsizei width, GLsizei height) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_CopyConvolutionFilter2D(ctx->Exec, ( target, internalFormat, x, y, width, - height)); + CALL_CopyConvolutionFilter2D(ctx->Exec, + (target, internalFormat, x, y, width, + height)); } -static void GLAPIENTRY exec_GetColorTable( GLenum target, GLenum format, - GLenum type, GLvoid *data ) +static void GLAPIENTRY +exec_GetColorTable(GLenum target, GLenum format, GLenum type, GLvoid * data) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetColorTable(ctx->Exec, ( target, format, type, data )); + CALL_GetColorTable(ctx->Exec, (target, format, type, data)); } -static void GLAPIENTRY exec_GetColorTableParameterfv( GLenum target, GLenum pname, - GLfloat *params ) +static void GLAPIENTRY +exec_GetColorTableParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetColorTableParameterfv(ctx->Exec, ( target, pname, params )); + CALL_GetColorTableParameterfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetColorTableParameteriv( GLenum target, GLenum pname, - GLint *params ) +static void GLAPIENTRY +exec_GetColorTableParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetColorTableParameteriv(ctx->Exec, ( target, pname, params )); + CALL_GetColorTableParameteriv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, - GLvoid *image) +static void GLAPIENTRY +exec_GetConvolutionFilter(GLenum target, GLenum format, GLenum type, + GLvoid * image) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetConvolutionFilter(ctx->Exec, ( target, format, type, image)); + CALL_GetConvolutionFilter(ctx->Exec, (target, format, type, image)); } -static void GLAPIENTRY exec_GetConvolutionParameterfv(GLenum target, GLenum pname, - GLfloat *params) +static void GLAPIENTRY +exec_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetConvolutionParameterfv(ctx->Exec, ( target, pname, params)); + CALL_GetConvolutionParameterfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetConvolutionParameteriv(GLenum target, GLenum pname, - GLint *params) +static void GLAPIENTRY +exec_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetConvolutionParameteriv(ctx->Exec, ( target, pname, params)); + CALL_GetConvolutionParameteriv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetHistogram(GLenum target, GLboolean reset, GLenum format, - GLenum type, GLvoid *values) +static void GLAPIENTRY +exec_GetHistogram(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLvoid *values) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetHistogram(ctx->Exec, ( target, reset, format, type, values)); + CALL_GetHistogram(ctx->Exec, (target, reset, format, type, values)); } -static void GLAPIENTRY exec_GetHistogramParameterfv(GLenum target, GLenum pname, - GLfloat *params) +static void GLAPIENTRY +exec_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetHistogramParameterfv(ctx->Exec, ( target, pname, params)); + CALL_GetHistogramParameterfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetHistogramParameteriv(GLenum target, GLenum pname, - GLint *params) +static void GLAPIENTRY +exec_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetHistogramParameteriv(ctx->Exec, ( target, pname, params)); + CALL_GetHistogramParameteriv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetMinmax(GLenum target, GLboolean reset, GLenum format, - GLenum type, GLvoid *values) +static void GLAPIENTRY +exec_GetMinmax(GLenum target, GLboolean reset, GLenum format, + GLenum type, GLvoid *values) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMinmax(ctx->Exec, ( target, reset, format, type, values)); + CALL_GetMinmax(ctx->Exec, (target, reset, format, type, values)); } -static void GLAPIENTRY exec_GetMinmaxParameterfv(GLenum target, GLenum pname, - GLfloat *params) +static void GLAPIENTRY +exec_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMinmaxParameterfv(ctx->Exec, ( target, pname, params)); + CALL_GetMinmaxParameterfv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetMinmaxParameteriv(GLenum target, GLenum pname, - GLint *params) +static void GLAPIENTRY +exec_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetMinmaxParameteriv(ctx->Exec, ( target, pname, params)); + CALL_GetMinmaxParameteriv(ctx->Exec, (target, pname, params)); } -static void GLAPIENTRY exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type, - GLvoid *row, GLvoid *column, GLvoid *span) +static void GLAPIENTRY +exec_GetSeparableFilter(GLenum target, GLenum format, GLenum type, + GLvoid *row, GLvoid *column, GLvoid *span) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetSeparableFilter(ctx->Exec, ( target, format, type, row, column, span)); + CALL_GetSeparableFilter(ctx->Exec, + (target, format, type, row, column, span)); } -static void GLAPIENTRY exec_SeparableFilter2D(GLenum target, GLenum internalFormat, - GLsizei width, GLsizei height, GLenum format, - GLenum type, const GLvoid *row, - const GLvoid *column) +static void GLAPIENTRY +exec_SeparableFilter2D(GLenum target, GLenum internalFormat, + GLsizei width, GLsizei height, GLenum format, + GLenum type, const GLvoid *row, const GLvoid *column) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_SeparableFilter2D(ctx->Exec, ( target, internalFormat, width, height, format, - type, row, column)); + CALL_SeparableFilter2D(ctx->Exec, + (target, internalFormat, width, height, format, + type, row, column)); } -static void GLAPIENTRY exec_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, - GLsizei count, const GLvoid *ptr) +static void GLAPIENTRY +exec_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, + GLsizei count, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_ColorPointerEXT(ctx->Exec, ( size, type, stride, count, ptr)); + CALL_ColorPointerEXT(ctx->Exec, (size, type, stride, count, ptr)); } -static void GLAPIENTRY exec_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, - const GLboolean *ptr) +static void GLAPIENTRY +exec_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_EdgeFlagPointerEXT(ctx->Exec, ( stride, count, ptr)); + CALL_EdgeFlagPointerEXT(ctx->Exec, (stride, count, ptr)); } -static void GLAPIENTRY exec_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, - const GLvoid *ptr) +static void GLAPIENTRY +exec_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, + const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_IndexPointerEXT(ctx->Exec, ( type, stride, count, ptr)); + CALL_IndexPointerEXT(ctx->Exec, (type, stride, count, ptr)); } -static void GLAPIENTRY exec_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, - const GLvoid *ptr) +static void GLAPIENTRY +exec_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, + const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_NormalPointerEXT(ctx->Exec, ( type, stride, count, ptr)); + CALL_NormalPointerEXT(ctx->Exec, (type, stride, count, ptr)); } -static void GLAPIENTRY exec_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, - GLsizei count, const GLvoid *ptr) +static void GLAPIENTRY +exec_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, + GLsizei count, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_TexCoordPointerEXT(ctx->Exec, ( size, type, stride, count, ptr)); + CALL_TexCoordPointerEXT(ctx->Exec, (size, type, stride, count, ptr)); } -static void GLAPIENTRY exec_VertexPointerEXT(GLint size, GLenum type, GLsizei stride, - GLsizei count, const GLvoid *ptr) +static void GLAPIENTRY +exec_VertexPointerEXT(GLint size, GLenum type, GLsizei stride, + GLsizei count, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_VertexPointerEXT(ctx->Exec, ( size, type, stride, count, ptr)); + CALL_VertexPointerEXT(ctx->Exec, (size, type, stride, count, ptr)); } -static void GLAPIENTRY exec_LockArraysEXT(GLint first, GLsizei count) +static void GLAPIENTRY +exec_LockArraysEXT(GLint first, GLsizei count) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_LockArraysEXT(ctx->Exec, ( first, count)); + CALL_LockArraysEXT(ctx->Exec, (first, count)); } -static void GLAPIENTRY exec_UnlockArraysEXT( void ) +static void GLAPIENTRY +exec_UnlockArraysEXT(void) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_UnlockArraysEXT(ctx->Exec, ( )); + CALL_UnlockArraysEXT(ctx->Exec, ()); } -static void GLAPIENTRY exec_ClientActiveTextureARB( GLenum target ) +static void GLAPIENTRY +exec_ClientActiveTextureARB(GLenum target) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); CALL_ClientActiveTextureARB(ctx->Exec, (target)); } -static void GLAPIENTRY exec_SecondaryColorPointerEXT(GLint size, GLenum type, - GLsizei stride, const GLvoid *ptr) +static void GLAPIENTRY +exec_SecondaryColorPointerEXT(GLint size, GLenum type, + GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_SecondaryColorPointerEXT(ctx->Exec, ( size, type, stride, ptr)); + CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr)); } -static void GLAPIENTRY exec_FogCoordPointerEXT(GLenum type, GLsizei stride, - const GLvoid *ptr) +static void GLAPIENTRY +exec_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_FogCoordPointerEXT(ctx->Exec, ( type, stride, ptr)); + CALL_FogCoordPointerEXT(ctx->Exec, (type, stride, ptr)); } /* GL_EXT_multi_draw_arrays */ -static void GLAPIENTRY exec_MultiDrawArraysEXT(GLenum mode, GLint *first, - GLsizei *count, GLsizei primcount) +static void GLAPIENTRY +exec_MultiDrawArraysEXT(GLenum mode, GLint * first, + GLsizei * count, GLsizei primcount) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiDrawArraysEXT(ctx->Exec, ( mode, first, count, primcount )); + CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount)); } /* GL_EXT_multi_draw_arrays */ -static void GLAPIENTRY exec_MultiDrawElementsEXT(GLenum mode, const GLsizei *count, - GLenum type, const GLvoid **indices, - GLsizei primcount) +static void GLAPIENTRY +exec_MultiDrawElementsEXT(GLenum mode, const GLsizei * count, + GLenum type, const GLvoid ** indices, + GLsizei primcount) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiDrawElementsEXT(ctx->Exec, (mode, count, type, indices, primcount)); + CALL_MultiDrawElementsEXT(ctx->Exec, + (mode, count, type, indices, primcount)); } /* GL_IBM_multimode_draw_arrays */ -static void GLAPIENTRY exec_MultiModeDrawArraysIBM(const GLenum *mode, const GLint *first, - const GLsizei *count, GLsizei primcount, - GLint modestride) +static void GLAPIENTRY +exec_MultiModeDrawArraysIBM(const GLenum * mode, const GLint * first, + const GLsizei * count, GLsizei primcount, + GLint modestride) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiModeDrawArraysIBM(ctx->Exec, (mode, first, count, primcount, modestride)); + CALL_MultiModeDrawArraysIBM(ctx->Exec, + (mode, first, count, primcount, modestride)); } /* GL_IBM_multimode_draw_arrays */ -static void GLAPIENTRY exec_MultiModeDrawElementsIBM(const GLenum *mode, - const GLsizei *count, - GLenum type, - const GLvoid * const *indices, - GLsizei primcount, GLint modestride) +static void GLAPIENTRY +exec_MultiModeDrawElementsIBM(const GLenum * mode, + const GLsizei * count, + GLenum type, + const GLvoid * const *indices, + GLsizei primcount, GLint modestride) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiModeDrawElementsIBM(ctx->Exec, (mode, count, type, indices, primcount, - modestride)); + CALL_MultiModeDrawElementsIBM(ctx->Exec, + (mode, count, type, indices, primcount, + modestride)); } - /** * Setup the given dispatch table to point to Mesa's display list * building functions. @@ -7417,15 +7610,15 @@ static void GLAPIENTRY exec_MultiModeDrawElementsIBM(const GLenum *mode, * struct. */ void -_mesa_init_dlist_table( struct _glapi_table *table ) +_mesa_init_dlist_table(struct _glapi_table *table) { - _mesa_loopback_init_api_table( table ); + _mesa_loopback_init_api_table(table); /* GL 1.0 */ SET_Accum(table, save_Accum); SET_AlphaFunc(table, save_AlphaFunc); SET_Bitmap(table, save_Bitmap); - SET_BlendFunc(table, _mesa_BlendFunc); /* loops-back to BlendFuncSeparate */ + SET_BlendFunc(table, _mesa_BlendFunc); /* loops-back to BlendFuncSeparate */ SET_CallList(table, _mesa_save_CallList); SET_CallLists(table, _mesa_save_CallLists); SET_Clear(table, save_Clear); @@ -7823,14 +8016,18 @@ _mesa_init_dlist_table( struct _glapi_table *table ) SET_ProgramNamedParameter4dNV(table, save_ProgramNamedParameter4dNV); SET_ProgramNamedParameter4fvNV(table, save_ProgramNamedParameter4fvNV); SET_ProgramNamedParameter4dvNV(table, save_ProgramNamedParameter4dvNV); - SET_GetProgramNamedParameterfvNV(table, _mesa_GetProgramNamedParameterfvNV); - SET_GetProgramNamedParameterdvNV(table, _mesa_GetProgramNamedParameterdvNV); + SET_GetProgramNamedParameterfvNV(table, + _mesa_GetProgramNamedParameterfvNV); + SET_GetProgramNamedParameterdvNV(table, + _mesa_GetProgramNamedParameterdvNV); SET_ProgramLocalParameter4dARB(table, save_ProgramLocalParameter4dARB); SET_ProgramLocalParameter4dvARB(table, save_ProgramLocalParameter4dvARB); SET_ProgramLocalParameter4fARB(table, save_ProgramLocalParameter4fARB); SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB); - SET_GetProgramLocalParameterdvARB(table, _mesa_GetProgramLocalParameterdvARB); - SET_GetProgramLocalParameterfvARB(table, _mesa_GetProgramLocalParameterfvARB); + SET_GetProgramLocalParameterdvARB(table, + _mesa_GetProgramLocalParameterdvARB); + SET_GetProgramLocalParameterfvARB(table, + _mesa_GetProgramLocalParameterfvARB); #endif /* 262. GL_NV_point_sprite */ @@ -7897,8 +8094,10 @@ _mesa_init_dlist_table( struct _glapi_table *table ) SET_ProgramLocalParameter4fvARB(table, save_ProgramLocalParameter4fvARB); SET_GetProgramEnvParameterdvARB(table, _mesa_GetProgramEnvParameterdvARB); SET_GetProgramEnvParameterfvARB(table, _mesa_GetProgramEnvParameterfvARB); - SET_GetProgramLocalParameterdvARB(table, _mesa_GetProgramLocalParameterdvARB); - SET_GetProgramLocalParameterfvARB(table, _mesa_GetProgramLocalParameterfvARB); + SET_GetProgramLocalParameterdvARB(table, + _mesa_GetProgramLocalParameterdvARB); + SET_GetProgramLocalParameterfvARB(table, + _mesa_GetProgramLocalParameterfvARB); SET_GetProgramivARB(table, _mesa_GetProgramivARB); SET_GetProgramStringARB(table, _mesa_GetProgramStringARB); #endif @@ -7931,43 +8130,47 @@ _mesa_init_dlist_table( struct _glapi_table *table ) #endif SET_DrawBuffersARB(table, save_DrawBuffersARB); +#if FEATURE_EXT_framebuffer_blit + SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT); +#endif + /* 299. GL_EXT_blend_equation_separate */ SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT); } -/*** - *** Debugging code - ***/ -static const char *enum_string( GLenum k ) +static const char * +enum_string(GLenum k) { - return _mesa_lookup_enum_by_nr( k ); + return _mesa_lookup_enum_by_nr(k); } -/* +/** * Print the commands in a display list. For debugging only. * TODO: many commands aren't handled yet. */ -static void GLAPIENTRY print_list( GLcontext *ctx, GLuint list ) +static void GLAPIENTRY +print_list(GLcontext *ctx, GLuint list) { struct mesa_display_list *dlist; Node *n; GLboolean done; - if (!CALL_IsList(GET_DISPATCH(), (list))) { + if (!islist(ctx, list)) { _mesa_printf("%u is not a display list ID\n", list); return; } - dlist = (struct mesa_display_list *) _mesa_HashLookup(ctx->Shared->DisplayList, list); + dlist = (struct mesa_display_list *) + _mesa_HashLookup(ctx->Shared->DisplayList, list); if (!dlist) return; n = dlist->node; - - _mesa_printf("START-LIST %u, address %p\n", list, (void*)n ); + + _mesa_printf("START-LIST %u, address %p\n", list, (void *) n); done = n ? GL_FALSE : GL_TRUE; while (!done) { @@ -7976,256 +8179,255 @@ static void GLAPIENTRY print_list( GLcontext *ctx, GLuint list ) if (i >= 0 && i < (GLint) ctx->ListExt.NumOpcodes) { /* this is a driver-extended opcode */ - ctx->ListExt.Opcode[i].Print(ctx, &n[1]); - n += ctx->ListExt.Opcode[i].Size; + ctx->ListExt.Opcode[i].Print(ctx, &n[1]); + n += ctx->ListExt.Opcode[i].Size; } else { - switch (opcode) { + switch (opcode) { case OPCODE_ACCUM: - _mesa_printf("accum %s %g\n", enum_string(n[1].e), n[2].f ); - break; - case OPCODE_BITMAP: + _mesa_printf("Accum %s %g\n", enum_string(n[1].e), n[2].f); + break; + case OPCODE_BITMAP: _mesa_printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i, - n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data ); - break; + n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data); + break; case OPCODE_CALL_LIST: - _mesa_printf("CallList %d\n", (int) n[1].ui ); + _mesa_printf("CallList %d\n", (int) n[1].ui); break; case OPCODE_CALL_LIST_OFFSET: _mesa_printf("CallList %d + offset %u = %u\n", (int) n[1].ui, - ctx->List.ListBase, ctx->List.ListBase + n[1].ui ); + ctx->List.ListBase, ctx->List.ListBase + n[1].ui); break; case OPCODE_COLOR_TABLE_PARAMETER_FV: _mesa_printf("ColorTableParameterfv %s %s %f %f %f %f\n", - enum_string(n[1].e), enum_string(n[2].e), - n[3].f, n[4].f, n[5].f, n[6].f); + enum_string(n[1].e), enum_string(n[2].e), + n[3].f, n[4].f, n[5].f, n[6].f); break; case OPCODE_COLOR_TABLE_PARAMETER_IV: _mesa_printf("ColorTableParameteriv %s %s %d %d %d %d\n", - enum_string(n[1].e), enum_string(n[2].e), - n[3].i, n[4].i, n[5].i, n[6].i); + enum_string(n[1].e), enum_string(n[2].e), + n[3].i, n[4].i, n[5].i, n[6].i); break; - case OPCODE_DISABLE: + case OPCODE_DISABLE: _mesa_printf("Disable %s\n", enum_string(n[1].e)); - break; - case OPCODE_ENABLE: + break; + case OPCODE_ENABLE: _mesa_printf("Enable %s\n", enum_string(n[1].e)); - break; + break; case OPCODE_FRUSTUM: _mesa_printf("Frustum %g %g %g %g %g %g\n", - n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f ); + n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f); break; - case OPCODE_LINE_STIPPLE: - _mesa_printf("LineStipple %d %x\n", n[1].i, (int) n[2].us ); - break; - case OPCODE_LOAD_IDENTITY: + case OPCODE_LINE_STIPPLE: + _mesa_printf("LineStipple %d %x\n", n[1].i, (int) n[2].us); + break; + case OPCODE_LOAD_IDENTITY: _mesa_printf("LoadIdentity\n"); - break; - case OPCODE_LOAD_MATRIX: + break; + case OPCODE_LOAD_MATRIX: _mesa_printf("LoadMatrix\n"); _mesa_printf(" %8f %8f %8f %8f\n", - n[1].f, n[5].f, n[9].f, n[13].f); + n[1].f, n[5].f, n[9].f, n[13].f); _mesa_printf(" %8f %8f %8f %8f\n", n[2].f, n[6].f, n[10].f, n[14].f); _mesa_printf(" %8f %8f %8f %8f\n", n[3].f, n[7].f, n[11].f, n[15].f); _mesa_printf(" %8f %8f %8f %8f\n", n[4].f, n[8].f, n[12].f, n[16].f); - break; - case OPCODE_MULT_MATRIX: + break; + case OPCODE_MULT_MATRIX: _mesa_printf("MultMatrix (or Rotate)\n"); _mesa_printf(" %8f %8f %8f %8f\n", - n[1].f, n[5].f, n[9].f, n[13].f); + n[1].f, n[5].f, n[9].f, n[13].f); _mesa_printf(" %8f %8f %8f %8f\n", n[2].f, n[6].f, n[10].f, n[14].f); _mesa_printf(" %8f %8f %8f %8f\n", n[3].f, n[7].f, n[11].f, n[15].f); _mesa_printf(" %8f %8f %8f %8f\n", n[4].f, n[8].f, n[12].f, n[16].f); - break; + break; case OPCODE_ORTHO: _mesa_printf("Ortho %g %g %g %g %g %g\n", - n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f ); + n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f); break; - case OPCODE_POP_ATTRIB: + case OPCODE_POP_ATTRIB: _mesa_printf("PopAttrib\n"); - break; - case OPCODE_POP_MATRIX: + break; + case OPCODE_POP_MATRIX: _mesa_printf("PopMatrix\n"); - break; - case OPCODE_POP_NAME: + break; + case OPCODE_POP_NAME: _mesa_printf("PopName\n"); - break; - case OPCODE_PUSH_ATTRIB: - _mesa_printf("PushAttrib %x\n", n[1].bf ); - break; - case OPCODE_PUSH_MATRIX: + break; + case OPCODE_PUSH_ATTRIB: + _mesa_printf("PushAttrib %x\n", n[1].bf); + break; + case OPCODE_PUSH_MATRIX: _mesa_printf("PushMatrix\n"); - break; - case OPCODE_PUSH_NAME: - _mesa_printf("PushName %d\n", (int) n[1].ui ); - break; - case OPCODE_RASTER_POS: + break; + case OPCODE_PUSH_NAME: + _mesa_printf("PushName %d\n", (int) n[1].ui); + break; + case OPCODE_RASTER_POS: _mesa_printf("RasterPos %g %g %g %g\n", - n[1].f, n[2].f,n[3].f,n[4].f); - break; + n[1].f, n[2].f, n[3].f, n[4].f); + break; case OPCODE_ROTATE: _mesa_printf("Rotate %g %g %g %g\n", - n[1].f, n[2].f, n[3].f, n[4].f ); + n[1].f, n[2].f, n[3].f, n[4].f); break; case OPCODE_SCALE: - _mesa_printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f ); + _mesa_printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f); break; case OPCODE_TRANSLATE: - _mesa_printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f ); + _mesa_printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f); break; case OPCODE_BIND_TEXTURE: - _mesa_printf("BindTexture %s %d\n", + _mesa_printf("BindTexture %s %d\n", _mesa_lookup_enum_by_nr(n[1].ui), n[2].ui); - break; + break; case OPCODE_SHADE_MODEL: - _mesa_printf("ShadeModel %s\n", - _mesa_lookup_enum_by_nr(n[1].ui)); - break; - case OPCODE_MAP1: - _mesa_printf("Map1 %s %.3f %.3f %d %d\n", - _mesa_lookup_enum_by_nr(n[1].ui), - n[2].f, n[3].f, n[4].i, n[5].i); - break; - case OPCODE_MAP2: - _mesa_printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n", + _mesa_printf("ShadeModel %s\n", _mesa_lookup_enum_by_nr(n[1].ui)); + break; + case OPCODE_MAP1: + _mesa_printf("Map1 %s %.3f %.3f %d %d\n", + _mesa_lookup_enum_by_nr(n[1].ui), + n[2].f, n[3].f, n[4].i, n[5].i); + break; + case OPCODE_MAP2: + _mesa_printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n", _mesa_lookup_enum_by_nr(n[1].ui), n[2].f, n[3].f, n[4].f, n[5].f, n[6].i, n[7].i, n[8].i, n[9].i); - break; - case OPCODE_MAPGRID1: - _mesa_printf("MapGrid1 %d %.3f %.3f\n", - n[1].i, n[2].f, n[3].f); - break; - case OPCODE_MAPGRID2: - _mesa_printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n", - n[1].i, n[2].f, n[3].f, - n[4].i, n[5].f, n[6].f); - break; - case OPCODE_EVALMESH1: - _mesa_printf("EvalMesh1 %d %d\n", n[1].i, n[2].i); - break; - case OPCODE_EVALMESH2: - _mesa_printf("EvalMesh2 %d %d %d %d\n", + break; + case OPCODE_MAPGRID1: + _mesa_printf("MapGrid1 %d %.3f %.3f\n", n[1].i, n[2].f, n[3].f); + break; + case OPCODE_MAPGRID2: + _mesa_printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n", + n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f); + break; + case OPCODE_EVALMESH1: + _mesa_printf("EvalMesh1 %d %d\n", n[1].i, n[2].i); + break; + case OPCODE_EVALMESH2: + _mesa_printf("EvalMesh2 %d %d %d %d\n", n[1].i, n[2].i, n[3].i, n[4].i); - break; + break; - case OPCODE_ATTR_1F_NV: - _mesa_printf("ATTR_1F_NV attr %d: %f\n", - n[1].i, n[2].f); - break; - case OPCODE_ATTR_2F_NV: - _mesa_printf("ATTR_2F_NV attr %d: %f %f\n", - n[1].i, n[2].f, n[3].f); - break; - case OPCODE_ATTR_3F_NV: - _mesa_printf("ATTR_3F_NV attr %d: %f %f %f\n", - n[1].i, n[2].f, n[3].f, n[4].f); - break; - case OPCODE_ATTR_4F_NV: - _mesa_printf("ATTR_4F_NV attr %d: %f %f %f %f\n", - n[1].i, n[2].f, n[3].f, n[4].f, n[5].f); - break; - case OPCODE_ATTR_1F_ARB: - _mesa_printf("ATTR_1F_ARB attr %d: %f\n", - n[1].i, n[2].f); - break; - case OPCODE_ATTR_2F_ARB: - _mesa_printf("ATTR_2F_ARB attr %d: %f %f\n", - n[1].i, n[2].f, n[3].f); - break; - case OPCODE_ATTR_3F_ARB: - _mesa_printf("ATTR_3F_ARB attr %d: %f %f %f\n", - n[1].i, n[2].f, n[3].f, n[4].f); - break; - case OPCODE_ATTR_4F_ARB: - _mesa_printf("ATTR_4F_ARB attr %d: %f %f %f %f\n", - n[1].i, n[2].f, n[3].f, n[4].f, n[5].f); - break; + case OPCODE_ATTR_1F_NV: + _mesa_printf("ATTR_1F_NV attr %d: %f\n", n[1].i, n[2].f); + break; + case OPCODE_ATTR_2F_NV: + _mesa_printf("ATTR_2F_NV attr %d: %f %f\n", + n[1].i, n[2].f, n[3].f); + break; + case OPCODE_ATTR_3F_NV: + _mesa_printf("ATTR_3F_NV attr %d: %f %f %f\n", + n[1].i, n[2].f, n[3].f, n[4].f); + break; + case OPCODE_ATTR_4F_NV: + _mesa_printf("ATTR_4F_NV attr %d: %f %f %f %f\n", + n[1].i, n[2].f, n[3].f, n[4].f, n[5].f); + break; + case OPCODE_ATTR_1F_ARB: + _mesa_printf("ATTR_1F_ARB attr %d: %f\n", n[1].i, n[2].f); + break; + case OPCODE_ATTR_2F_ARB: + _mesa_printf("ATTR_2F_ARB attr %d: %f %f\n", + n[1].i, n[2].f, n[3].f); + break; + case OPCODE_ATTR_3F_ARB: + _mesa_printf("ATTR_3F_ARB attr %d: %f %f %f\n", + n[1].i, n[2].f, n[3].f, n[4].f); + break; + case OPCODE_ATTR_4F_ARB: + _mesa_printf("ATTR_4F_ARB attr %d: %f %f %f %f\n", + n[1].i, n[2].f, n[3].f, n[4].f, n[5].f); + break; - case OPCODE_MATERIAL: - _mesa_printf("MATERIAL %x %x: %f %f %f %f\n", - n[1].i, n[2].i, n[3].f, n[4].f, n[5].f, n[6].f); - break; - case OPCODE_INDEX: - _mesa_printf("INDEX: %f\n", n[1].f); - break; - case OPCODE_EDGEFLAG: - _mesa_printf("EDGEFLAG: %d\n", n[1].i); - break; - case OPCODE_BEGIN: - _mesa_printf("BEGIN %x\n", n[1].i); - break; - case OPCODE_END: - _mesa_printf("END\n"); - break; - case OPCODE_RECTF: - _mesa_printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f, n[4].f); - break; - case OPCODE_EVAL_C1: - _mesa_printf("EVAL_C1 %f\n", n[1].f); - break; - case OPCODE_EVAL_C2: - _mesa_printf("EVAL_C2 %f %f\n", n[1].f, n[2].f); - break; - case OPCODE_EVAL_P1: - _mesa_printf("EVAL_P1 %d\n", n[1].i); - break; - case OPCODE_EVAL_P2: - _mesa_printf("EVAL_P2 %d %d\n", n[1].i, n[2].i); - break; + case OPCODE_MATERIAL: + _mesa_printf("MATERIAL %x %x: %f %f %f %f\n", + n[1].i, n[2].i, n[3].f, n[4].f, n[5].f, n[6].f); + break; + case OPCODE_INDEX: + _mesa_printf("INDEX: %f\n", n[1].f); + break; + case OPCODE_EDGEFLAG: + _mesa_printf("EDGEFLAG: %d\n", n[1].i); + break; + case OPCODE_BEGIN: + _mesa_printf("BEGIN %x\n", n[1].i); + break; + case OPCODE_END: + _mesa_printf("END\n"); + break; + case OPCODE_RECTF: + _mesa_printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f, + n[4].f); + break; + case OPCODE_EVAL_C1: + _mesa_printf("EVAL_C1 %f\n", n[1].f); + break; + case OPCODE_EVAL_C2: + _mesa_printf("EVAL_C2 %f %f\n", n[1].f, n[2].f); + break; + case OPCODE_EVAL_P1: + _mesa_printf("EVAL_P1 %d\n", n[1].i); + break; + case OPCODE_EVAL_P2: + _mesa_printf("EVAL_P2 %d %d\n", n[1].i, n[2].i); + break; - /* - * meta opcodes/commands - */ + /* + * meta opcodes/commands + */ case OPCODE_ERROR: _mesa_printf("Error: %s %s\n", - enum_string(n[1].e), (const char *)n[2].data ); + enum_string(n[1].e), (const char *) n[2].data); break; - case OPCODE_CONTINUE: + case OPCODE_CONTINUE: _mesa_printf("DISPLAY-LIST-CONTINUE\n"); - n = (Node *) n[1].next; - break; - case OPCODE_END_OF_LIST: + n = (Node *) n[1].next; + break; + case OPCODE_END_OF_LIST: _mesa_printf("END-LIST %u\n", list); - done = GL_TRUE; - break; + done = GL_TRUE; + break; default: if (opcode < 0 || opcode > OPCODE_END_OF_LIST) { - _mesa_printf("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n", - opcode, (void*) n); + _mesa_printf + ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n", + opcode, (void *) n); return; } else { - _mesa_printf("command %d, %u operands\n", opcode, InstSize[opcode]); + _mesa_printf("command %d, %u operands\n", opcode, + InstSize[opcode]); } - } - /* increment n to point to next compiled command */ - if (opcode!=OPCODE_CONTINUE) { - n += InstSize[opcode]; - } + } + /* increment n to point to next compiled command */ + if (opcode != OPCODE_CONTINUE) { + n += InstSize[opcode]; + } } } } -/* +/** * Clients may call this function to help debug display list problems. * This function is _ONLY_FOR_DEBUGGING_PURPOSES_. It may be removed, * changed, or break in the future without notice. */ -void mesa_print_display_list( GLuint list ) +void +mesa_print_display_list(GLuint list) { GET_CURRENT_CONTEXT(ctx); - print_list( ctx, list ); + print_list(ctx, list); } @@ -8233,10 +8435,10 @@ void mesa_print_display_list( GLuint list ) /***** Initialization *****/ /**********************************************************************/ - -void _mesa_save_vtxfmt_init( GLvertexformat *vfmt ) +void +_mesa_save_vtxfmt_init(GLvertexformat * vfmt) { - vfmt->ArrayElement = _ae_loopback_array_elt; /* generic helper */ + vfmt->ArrayElement = _ae_loopback_array_elt; /* generic helper */ vfmt->Begin = save_Begin; vfmt->CallList = _mesa_save_CallList; vfmt->CallLists = _mesa_save_CallLists; @@ -8319,9 +8521,20 @@ void _mesa_save_vtxfmt_init( GLvertexformat *vfmt ) } - -void _mesa_init_display_list( GLcontext * ctx ) +/** + * Initialize display list state for given context. + */ +void +_mesa_init_display_list(GLcontext *ctx) { + static GLboolean tableInitialized = GL_FALSE; + + /* zero-out the instruction size table, just once */ + if (!tableInitialized) { + _mesa_bzero(InstSize, sizeof(InstSize)); + tableInitialized = GL_TRUE; + } + /* Display list */ ctx->ListState.CallDepth = 0; ctx->ExecuteFlag = GL_TRUE; @@ -8334,5 +8547,5 @@ void _mesa_init_display_list( GLcontext * ctx ) /* Display List group */ ctx->List.ListBase = 0; - _mesa_save_vtxfmt_init( &ctx->ListState.ListVtxfmt ); + _mesa_save_vtxfmt_init(&ctx->ListState.ListVtxfmt); } diff --git a/src/mesa/main/dlist.h b/src/mesa/main/dlist.h index 1a5b391e760..9436603d0a5 100644 --- a/src/mesa/main/dlist.h +++ b/src/mesa/main/dlist.h @@ -38,8 +38,6 @@ #if _HAVE_FULL_GL -extern void _mesa_init_lists( void ); - extern void _mesa_destroy_list( GLcontext *ctx, GLuint list ); extern void GLAPIENTRY _mesa_CallList( GLuint list ); @@ -58,35 +56,32 @@ extern void GLAPIENTRY _mesa_ListBase( GLuint base ); extern void GLAPIENTRY _mesa_NewList( GLuint list, GLenum mode ); -extern void _mesa_init_dlist_table( struct _glapi_table *table ); +extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); -extern void _mesa_save_error( GLcontext *ctx, GLenum error, const char *s ); +extern void GLAPIENTRY _mesa_save_CallList( GLuint list ); + + + +extern void _mesa_init_dlist_table( struct _glapi_table *table ); extern void _mesa_compile_error( GLcontext *ctx, GLenum error, const char *s ); -extern void *_mesa_alloc_instruction( GLcontext *ctx, int opcode, GLint sz ); +extern void *_mesa_alloc_instruction(GLcontext *ctx, GLuint opcode, GLuint sz); extern GLint _mesa_alloc_opcode( GLcontext *ctx, GLuint sz, void (*execute)( GLcontext *, void * ), void (*destroy)( GLcontext *, void * ), void (*print)( GLcontext *, void * ) ); -extern void GLAPIENTRY _mesa_save_EvalMesh2(GLenum mode, GLint i1, GLint i2, - GLint j1, GLint j2 ); -extern void GLAPIENTRY _mesa_save_EvalMesh1( GLenum mode, GLint i1, GLint i2 ); -extern void GLAPIENTRY _mesa_save_CallLists( GLsizei n, GLenum type, const GLvoid *lists ); -extern void GLAPIENTRY _mesa_save_CallList( GLuint list ); extern void _mesa_init_display_list( GLcontext * ctx ); + extern void _mesa_save_vtxfmt_init( GLvertexformat *vfmt ); #else /** No-op */ -#define _mesa_init_lists() ((void)0) - -/** No-op */ #define _mesa_destroy_list(c,l) ((void)0) /** No-op */ diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 931aa2cc26c..af54fea30bb 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -759,7 +759,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) /* GL_EXT_secondary_color */ case GL_COLOR_SUM_EXT: - CHECK_EXTENSION(EXT_secondary_color, cap); + CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program, cap); if (ctx->Fog.ColorSumEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_FOG); @@ -821,28 +821,30 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->Point.PointSprite = state; break; -#if FEATURE_NV_vertex_program - case GL_VERTEX_PROGRAM_NV: - CHECK_EXTENSION2(NV_vertex_program, ARB_vertex_program, cap); +#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program + case GL_VERTEX_PROGRAM_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap); if (ctx->VertexProgram.Enabled == state) return; FLUSH_VERTICES(ctx, _NEW_PROGRAM); ctx->VertexProgram.Enabled = state; break; - case GL_VERTEX_PROGRAM_POINT_SIZE_NV: - CHECK_EXTENSION2(NV_vertex_program, ARB_vertex_program, cap); + case GL_VERTEX_PROGRAM_POINT_SIZE_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap); if (ctx->VertexProgram.PointSizeEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_PROGRAM); ctx->VertexProgram.PointSizeEnabled = state; break; - case GL_VERTEX_PROGRAM_TWO_SIDE_NV: - CHECK_EXTENSION2(NV_vertex_program, ARB_vertex_program, cap); + case GL_VERTEX_PROGRAM_TWO_SIDE_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program, cap); if (ctx->VertexProgram.TwoSideEnabled == state) return; FLUSH_VERTICES(ctx, _NEW_PROGRAM); ctx->VertexProgram.TwoSideEnabled = state; break; +#endif +#if FEATURE_NV_vertex_program case GL_MAP1_VERTEX_ATTRIB0_4_NV: case GL_MAP1_VERTEX_ATTRIB1_4_NV: case GL_MAP1_VERTEX_ATTRIB2_4_NV: @@ -1035,6 +1037,12 @@ _mesa_Disable( GLenum cap ) return GL_FALSE; \ } +#undef CHECK_EXTENSION2 +#define CHECK_EXTENSION2(EXT1, EXT2) \ + if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) { \ + _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled"); \ + return GL_FALSE; \ + } /** * Test whether a capability is enabled. @@ -1260,6 +1268,11 @@ _mesa_IsEnabled( GLenum cap ) return (texUnit->Enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE; } + /* GL_EXT_secondary_color */ + case GL_COLOR_SUM_EXT: + CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program); + return ctx->Fog.ColorSumEnabled; + /* GL_ARB_multisample */ case GL_MULTISAMPLE_ARB: CHECK_EXTENSION(ARB_multisample); @@ -1284,18 +1297,21 @@ _mesa_IsEnabled( GLenum cap ) /* GL_NV_point_sprite */ case GL_POINT_SPRITE_NV: + CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite) return ctx->Point.PointSprite; -#if FEATURE_NV_vertex_program - case GL_VERTEX_PROGRAM_NV: - CHECK_EXTENSION(NV_vertex_program); +#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program + case GL_VERTEX_PROGRAM_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program); return ctx->VertexProgram.Enabled; - case GL_VERTEX_PROGRAM_POINT_SIZE_NV: - CHECK_EXTENSION(NV_vertex_program); + case GL_VERTEX_PROGRAM_POINT_SIZE_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program); return ctx->VertexProgram.PointSizeEnabled; - case GL_VERTEX_PROGRAM_TWO_SIDE_NV: - CHECK_EXTENSION(NV_vertex_program); + case GL_VERTEX_PROGRAM_TWO_SIDE_ARB: + CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program); return ctx->VertexProgram.TwoSideEnabled; +#endif +#if FEATURE_NV_vertex_program case GL_VERTEX_ATTRIB_ARRAY0_NV: case GL_VERTEX_ATTRIB_ARRAY1_NV: case GL_VERTEX_ATTRIB_ARRAY2_NV: diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c index 3487797d7fe..ecda0bfb5ed 100644 --- a/src/mesa/main/enums.c +++ b/src/mesa/main/enums.c @@ -502,6 +502,10 @@ static const char enum_string_table[] = "GL_GENERATE_MIPMAP_HINT_SGIS\0" "GL_GENERATE_MIPMAP_SGIS\0" "GL_GEQUAL\0" + "GL_GL_DRAW_FRAMEBUFFER_BINDING_EXT\0" + "GL_GL_DRAW_FRAMEBUFFER_EXT\0" + "GL_GL_READ_FRAMEBUFFER_BINDING_EXT\0" + "GL_GL_READ_FRAMEBUFFER_EXT\0" "GL_GL_TIME_ELAPSED_EXT\0" "GL_GREATER\0" "GL_GREEN\0" @@ -1650,7 +1654,7 @@ static const char enum_string_table[] = "GL_ZOOM_Y\0" ; -static const enum_elt all_enums[1613] = +static const enum_elt all_enums[1617] = { { 0, 0x00000600 }, /* GL_2D */ { 6, 0x00001407 }, /* GL_2_BYTES */ @@ -2119,1232 +2123,1236 @@ static const enum_elt all_enums[1613] = { 9525, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */ { 9554, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */ { 9578, 0x00000206 }, /* GL_GEQUAL */ - { 9588, 0x000088BF }, /* GL_GL_TIME_ELAPSED_EXT */ - { 9611, 0x00000204 }, /* GL_GREATER */ - { 9622, 0x00001904 }, /* GL_GREEN */ - { 9631, 0x00000D19 }, /* GL_GREEN_BIAS */ - { 9645, 0x00000D53 }, /* GL_GREEN_BITS */ - { 9659, 0x00000D18 }, /* GL_GREEN_SCALE */ - { 9674, 0x00008000 }, /* GL_HINT_BIT */ - { 9686, 0x00008024 }, /* GL_HISTOGRAM */ - { 9699, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */ - { 9723, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */ - { 9751, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */ - { 9774, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */ - { 9801, 0x00008024 }, /* GL_HISTOGRAM_EXT */ - { 9818, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */ - { 9838, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */ - { 9862, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */ - { 9886, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */ - { 9914, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */ - { 9942, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */ - { 9974, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */ - { 9996, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */ - { 10022, 0x0000802D }, /* GL_HISTOGRAM_SINK */ - { 10040, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */ - { 10062, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */ - { 10081, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */ - { 10104, 0x0000862A }, /* GL_IDENTITY_NV */ - { 10119, 0x00008150 }, /* GL_IGNORE_BORDER_HP */ - { 10139, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */ - { 10179, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */ - { 10217, 0x00001E02 }, /* GL_INCR */ - { 10225, 0x00008507 }, /* GL_INCR_WRAP */ - { 10238, 0x00008507 }, /* GL_INCR_WRAP_EXT */ - { 10255, 0x00008077 }, /* GL_INDEX_ARRAY */ - { 10270, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */ - { 10300, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */ - { 10334, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */ - { 10357, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */ - { 10379, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */ - { 10399, 0x00000D51 }, /* GL_INDEX_BITS */ - { 10413, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */ - { 10434, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */ - { 10452, 0x00000C30 }, /* GL_INDEX_MODE */ - { 10466, 0x00000D13 }, /* GL_INDEX_OFFSET */ - { 10482, 0x00000D12 }, /* GL_INDEX_SHIFT */ - { 10497, 0x00000C21 }, /* GL_INDEX_WRITEMASK */ - { 10516, 0x00001404 }, /* GL_INT */ - { 10523, 0x00008049 }, /* GL_INTENSITY */ - { 10536, 0x0000804C }, /* GL_INTENSITY12 */ - { 10551, 0x0000804C }, /* GL_INTENSITY12_EXT */ - { 10570, 0x0000804D }, /* GL_INTENSITY16 */ - { 10585, 0x0000804D }, /* GL_INTENSITY16_EXT */ - { 10604, 0x0000804A }, /* GL_INTENSITY4 */ - { 10618, 0x0000804A }, /* GL_INTENSITY4_EXT */ - { 10636, 0x0000804B }, /* GL_INTENSITY8 */ - { 10650, 0x0000804B }, /* GL_INTENSITY8_EXT */ - { 10668, 0x00008049 }, /* GL_INTENSITY_EXT */ - { 10685, 0x00008575 }, /* GL_INTERPOLATE */ - { 10700, 0x00008575 }, /* GL_INTERPOLATE_ARB */ - { 10719, 0x00008575 }, /* GL_INTERPOLATE_EXT */ - { 10738, 0x00008B53 }, /* GL_INT_VEC2_ARB */ - { 10754, 0x00008B54 }, /* GL_INT_VEC3_ARB */ - { 10770, 0x00008B55 }, /* GL_INT_VEC4_ARB */ - { 10786, 0x00000500 }, /* GL_INVALID_ENUM */ - { 10802, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */ - { 10839, 0x00000502 }, /* GL_INVALID_OPERATION */ - { 10860, 0x00000501 }, /* GL_INVALID_VALUE */ - { 10877, 0x0000862B }, /* GL_INVERSE_NV */ - { 10891, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */ - { 10915, 0x0000150A }, /* GL_INVERT */ - { 10925, 0x00001E00 }, /* GL_KEEP */ - { 10933, 0x00000406 }, /* GL_LEFT */ - { 10941, 0x00000203 }, /* GL_LEQUAL */ - { 10951, 0x00000201 }, /* GL_LESS */ - { 10959, 0x00004000 }, /* GL_LIGHT0 */ - { 10969, 0x00004001 }, /* GL_LIGHT1 */ - { 10979, 0x00004002 }, /* GL_LIGHT2 */ - { 10989, 0x00004003 }, /* GL_LIGHT3 */ - { 10999, 0x00004004 }, /* GL_LIGHT4 */ - { 11009, 0x00004005 }, /* GL_LIGHT5 */ - { 11019, 0x00004006 }, /* GL_LIGHT6 */ - { 11029, 0x00004007 }, /* GL_LIGHT7 */ - { 11039, 0x00000B50 }, /* GL_LIGHTING */ - { 11051, 0x00000040 }, /* GL_LIGHTING_BIT */ - { 11067, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */ - { 11090, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */ - { 11119, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */ - { 11152, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */ - { 11180, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */ - { 11204, 0x00001B01 }, /* GL_LINE */ - { 11212, 0x00002601 }, /* GL_LINEAR */ - { 11222, 0x00001208 }, /* GL_LINEAR_ATTENUATION */ - { 11244, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */ - { 11274, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */ - { 11305, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */ - { 11329, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */ - { 11354, 0x00000001 }, /* GL_LINES */ - { 11363, 0x00000004 }, /* GL_LINE_BIT */ - { 11375, 0x00000002 }, /* GL_LINE_LOOP */ - { 11388, 0x00000707 }, /* GL_LINE_RESET_TOKEN */ - { 11408, 0x00000B20 }, /* GL_LINE_SMOOTH */ - { 11423, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */ - { 11443, 0x00000B24 }, /* GL_LINE_STIPPLE */ - { 11459, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */ - { 11483, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */ - { 11506, 0x00000003 }, /* GL_LINE_STRIP */ - { 11520, 0x00000702 }, /* GL_LINE_TOKEN */ - { 11534, 0x00000B21 }, /* GL_LINE_WIDTH */ - { 11548, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */ - { 11574, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */ - { 11594, 0x00000B32 }, /* GL_LIST_BASE */ - { 11607, 0x00020000 }, /* GL_LIST_BIT */ - { 11619, 0x00000B33 }, /* GL_LIST_INDEX */ - { 11633, 0x00000B30 }, /* GL_LIST_MODE */ - { 11646, 0x00000101 }, /* GL_LOAD */ - { 11654, 0x00000BF1 }, /* GL_LOGIC_OP */ - { 11666, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */ - { 11683, 0x00001909 }, /* GL_LUMINANCE */ - { 11696, 0x00008041 }, /* GL_LUMINANCE12 */ - { 11711, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */ - { 11734, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */ - { 11761, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */ - { 11783, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */ - { 11809, 0x00008041 }, /* GL_LUMINANCE12_EXT */ - { 11828, 0x00008042 }, /* GL_LUMINANCE16 */ - { 11843, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */ - { 11866, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */ - { 11893, 0x00008042 }, /* GL_LUMINANCE16_EXT */ - { 11912, 0x0000803F }, /* GL_LUMINANCE4 */ - { 11926, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */ - { 11947, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */ - { 11972, 0x0000803F }, /* GL_LUMINANCE4_EXT */ - { 11990, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */ - { 12011, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */ - { 12036, 0x00008040 }, /* GL_LUMINANCE8 */ - { 12050, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */ - { 12071, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */ - { 12096, 0x00008040 }, /* GL_LUMINANCE8_EXT */ - { 12114, 0x0000190A }, /* GL_LUMINANCE_ALPHA */ - { 12133, 0x00000D90 }, /* GL_MAP1_COLOR_4 */ - { 12149, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */ - { 12169, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */ - { 12191, 0x00000D91 }, /* GL_MAP1_INDEX */ - { 12205, 0x00000D92 }, /* GL_MAP1_NORMAL */ - { 12220, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */ - { 12244, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */ - { 12268, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */ - { 12292, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */ - { 12316, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */ - { 12333, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */ - { 12350, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */ - { 12378, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */ - { 12407, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */ - { 12436, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */ - { 12465, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */ - { 12494, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */ - { 12523, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */ - { 12552, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */ - { 12580, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */ - { 12608, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */ - { 12636, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */ - { 12664, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */ - { 12692, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */ - { 12720, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */ - { 12748, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */ - { 12776, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */ - { 12804, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */ - { 12820, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */ - { 12840, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */ - { 12862, 0x00000DB1 }, /* GL_MAP2_INDEX */ - { 12876, 0x00000DB2 }, /* GL_MAP2_NORMAL */ - { 12891, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */ - { 12915, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */ - { 12939, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */ - { 12963, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */ - { 12987, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */ - { 13004, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */ - { 13021, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */ - { 13049, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */ - { 13078, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */ - { 13107, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */ - { 13136, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */ - { 13165, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */ - { 13194, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */ - { 13223, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */ - { 13251, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */ - { 13279, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */ - { 13307, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */ - { 13335, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */ - { 13363, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */ - { 13391, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */ - { 13419, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */ - { 13447, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */ - { 13475, 0x00000D10 }, /* GL_MAP_COLOR */ - { 13488, 0x00000D11 }, /* GL_MAP_STENCIL */ - { 13503, 0x000088C0 }, /* GL_MATRIX0_ARB */ - { 13518, 0x00008630 }, /* GL_MATRIX0_NV */ - { 13532, 0x000088CA }, /* GL_MATRIX10_ARB */ - { 13548, 0x000088CB }, /* GL_MATRIX11_ARB */ - { 13564, 0x000088CC }, /* GL_MATRIX12_ARB */ - { 13580, 0x000088CD }, /* GL_MATRIX13_ARB */ - { 13596, 0x000088CE }, /* GL_MATRIX14_ARB */ - { 13612, 0x000088CF }, /* GL_MATRIX15_ARB */ - { 13628, 0x000088D0 }, /* GL_MATRIX16_ARB */ - { 13644, 0x000088D1 }, /* GL_MATRIX17_ARB */ - { 13660, 0x000088D2 }, /* GL_MATRIX18_ARB */ - { 13676, 0x000088D3 }, /* GL_MATRIX19_ARB */ - { 13692, 0x000088C1 }, /* GL_MATRIX1_ARB */ - { 13707, 0x00008631 }, /* GL_MATRIX1_NV */ - { 13721, 0x000088D4 }, /* GL_MATRIX20_ARB */ - { 13737, 0x000088D5 }, /* GL_MATRIX21_ARB */ - { 13753, 0x000088D6 }, /* GL_MATRIX22_ARB */ - { 13769, 0x000088D7 }, /* GL_MATRIX23_ARB */ - { 13785, 0x000088D8 }, /* GL_MATRIX24_ARB */ - { 13801, 0x000088D9 }, /* GL_MATRIX25_ARB */ - { 13817, 0x000088DA }, /* GL_MATRIX26_ARB */ - { 13833, 0x000088DB }, /* GL_MATRIX27_ARB */ - { 13849, 0x000088DC }, /* GL_MATRIX28_ARB */ - { 13865, 0x000088DD }, /* GL_MATRIX29_ARB */ - { 13881, 0x000088C2 }, /* GL_MATRIX2_ARB */ - { 13896, 0x00008632 }, /* GL_MATRIX2_NV */ - { 13910, 0x000088DE }, /* GL_MATRIX30_ARB */ - { 13926, 0x000088DF }, /* GL_MATRIX31_ARB */ - { 13942, 0x000088C3 }, /* GL_MATRIX3_ARB */ - { 13957, 0x00008633 }, /* GL_MATRIX3_NV */ - { 13971, 0x000088C4 }, /* GL_MATRIX4_ARB */ - { 13986, 0x00008634 }, /* GL_MATRIX4_NV */ - { 14000, 0x000088C5 }, /* GL_MATRIX5_ARB */ - { 14015, 0x00008635 }, /* GL_MATRIX5_NV */ - { 14029, 0x000088C6 }, /* GL_MATRIX6_ARB */ - { 14044, 0x00008636 }, /* GL_MATRIX6_NV */ - { 14058, 0x000088C7 }, /* GL_MATRIX7_ARB */ - { 14073, 0x00008637 }, /* GL_MATRIX7_NV */ - { 14087, 0x000088C8 }, /* GL_MATRIX8_ARB */ - { 14102, 0x000088C9 }, /* GL_MATRIX9_ARB */ - { 14117, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */ - { 14143, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */ - { 14177, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */ - { 14208, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */ - { 14241, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */ - { 14272, 0x00000BA0 }, /* GL_MATRIX_MODE */ - { 14287, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */ - { 14309, 0x00008008 }, /* GL_MAX */ - { 14316, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */ - { 14339, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */ - { 14365, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */ - { 14398, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */ - { 14424, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */ - { 14458, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */ - { 14477, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */ - { 14506, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */ - { 14538, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */ - { 14574, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */ - { 14614, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */ - { 14640, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */ - { 14670, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */ - { 14695, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */ - { 14724, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */ - { 14753, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */ - { 14786, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */ - { 14810, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */ - { 14834, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */ - { 14858, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */ - { 14883, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */ - { 14901, 0x00008008 }, /* GL_MAX_EXT */ - { 14912, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */ - { 14951, 0x00000D31 }, /* GL_MAX_LIGHTS */ - { 14965, 0x00000B31 }, /* GL_MAX_LIST_NESTING */ - { 14985, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */ - { 15023, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */ - { 15052, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */ - { 15076, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */ - { 15104, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */ - { 15127, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */ - { 15164, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */ - { 15200, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */ - { 15227, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ - { 15256, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */ - { 15290, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ - { 15326, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ - { 15353, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */ - { 15385, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */ - { 15421, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */ - { 15450, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ - { 15479, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */ - { 15507, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */ - { 15545, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ - { 15589, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ - { 15632, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */ - { 15666, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ - { 15705, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */ - { 15742, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */ - { 15780, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ - { 15823, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ - { 15866, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */ - { 15896, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */ - { 15927, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */ - { 15963, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */ - { 15999, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */ - { 16029, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */ - { 16063, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */ - { 16096, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */ - { 16125, 0x00008504 }, /* GL_MAX_SHININESS_NV */ - { 16145, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */ - { 16169, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */ - { 16195, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */ - { 16226, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */ - { 16250, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */ - { 16284, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */ - { 16304, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */ - { 16331, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */ - { 16352, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */ - { 16377, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */ - { 16402, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */ - { 16437, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */ - { 16463, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */ - { 16489, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ - { 16527, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */ - { 16564, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */ - { 16588, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */ - { 16609, 0x00008007 }, /* GL_MIN */ - { 16616, 0x0000802E }, /* GL_MINMAX */ - { 16626, 0x0000802E }, /* GL_MINMAX_EXT */ - { 16640, 0x0000802F }, /* GL_MINMAX_FORMAT */ - { 16657, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */ - { 16678, 0x00008030 }, /* GL_MINMAX_SINK */ - { 16693, 0x00008030 }, /* GL_MINMAX_SINK_EXT */ - { 16712, 0x00008007 }, /* GL_MIN_EXT */ - { 16723, 0x00008370 }, /* GL_MIRRORED_REPEAT */ - { 16742, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */ - { 16765, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */ - { 16788, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */ - { 16808, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */ - { 16828, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */ - { 16858, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */ - { 16886, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */ - { 16914, 0x00001700 }, /* GL_MODELVIEW */ - { 16927, 0x00001700 }, /* GL_MODELVIEW0_ARB */ - { 16945, 0x0000872A }, /* GL_MODELVIEW10_ARB */ - { 16964, 0x0000872B }, /* GL_MODELVIEW11_ARB */ - { 16983, 0x0000872C }, /* GL_MODELVIEW12_ARB */ - { 17002, 0x0000872D }, /* GL_MODELVIEW13_ARB */ - { 17021, 0x0000872E }, /* GL_MODELVIEW14_ARB */ - { 17040, 0x0000872F }, /* GL_MODELVIEW15_ARB */ - { 17059, 0x00008730 }, /* GL_MODELVIEW16_ARB */ - { 17078, 0x00008731 }, /* GL_MODELVIEW17_ARB */ - { 17097, 0x00008732 }, /* GL_MODELVIEW18_ARB */ - { 17116, 0x00008733 }, /* GL_MODELVIEW19_ARB */ - { 17135, 0x0000850A }, /* GL_MODELVIEW1_ARB */ - { 17153, 0x00008734 }, /* GL_MODELVIEW20_ARB */ - { 17172, 0x00008735 }, /* GL_MODELVIEW21_ARB */ - { 17191, 0x00008736 }, /* GL_MODELVIEW22_ARB */ - { 17210, 0x00008737 }, /* GL_MODELVIEW23_ARB */ - { 17229, 0x00008738 }, /* GL_MODELVIEW24_ARB */ - { 17248, 0x00008739 }, /* GL_MODELVIEW25_ARB */ - { 17267, 0x0000873A }, /* GL_MODELVIEW26_ARB */ - { 17286, 0x0000873B }, /* GL_MODELVIEW27_ARB */ - { 17305, 0x0000873C }, /* GL_MODELVIEW28_ARB */ - { 17324, 0x0000873D }, /* GL_MODELVIEW29_ARB */ - { 17343, 0x00008722 }, /* GL_MODELVIEW2_ARB */ - { 17361, 0x0000873E }, /* GL_MODELVIEW30_ARB */ - { 17380, 0x0000873F }, /* GL_MODELVIEW31_ARB */ - { 17399, 0x00008723 }, /* GL_MODELVIEW3_ARB */ - { 17417, 0x00008724 }, /* GL_MODELVIEW4_ARB */ - { 17435, 0x00008725 }, /* GL_MODELVIEW5_ARB */ - { 17453, 0x00008726 }, /* GL_MODELVIEW6_ARB */ - { 17471, 0x00008727 }, /* GL_MODELVIEW7_ARB */ - { 17489, 0x00008728 }, /* GL_MODELVIEW8_ARB */ - { 17507, 0x00008729 }, /* GL_MODELVIEW9_ARB */ - { 17525, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */ - { 17545, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */ - { 17572, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */ - { 17597, 0x00002100 }, /* GL_MODULATE */ - { 17609, 0x00008744 }, /* GL_MODULATE_ADD_ATI */ - { 17629, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */ - { 17656, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */ - { 17681, 0x00000103 }, /* GL_MULT */ - { 17689, 0x0000809D }, /* GL_MULTISAMPLE */ - { 17704, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */ - { 17724, 0x0000809D }, /* GL_MULTISAMPLE_ARB */ - { 17743, 0x20000000 }, /* GL_MULTISAMPLE_BIT */ - { 17762, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */ - { 17786, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */ - { 17809, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */ - { 17839, 0x00002A25 }, /* GL_N3F_V3F */ - { 17850, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */ - { 17870, 0x0000150E }, /* GL_NAND */ - { 17878, 0x00002600 }, /* GL_NEAREST */ - { 17889, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */ - { 17920, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */ - { 17952, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */ - { 17977, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */ - { 18003, 0x00000200 }, /* GL_NEVER */ - { 18012, 0x00001102 }, /* GL_NICEST */ - { 18022, 0x00000000 }, /* GL_NONE */ - { 18030, 0x00001505 }, /* GL_NOOP */ - { 18038, 0x00001508 }, /* GL_NOR */ - { 18045, 0x00000BA1 }, /* GL_NORMALIZE */ - { 18058, 0x00008075 }, /* GL_NORMAL_ARRAY */ - { 18074, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */ - { 18105, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */ - { 18140, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */ - { 18164, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */ - { 18187, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */ - { 18208, 0x00008511 }, /* GL_NORMAL_MAP */ - { 18222, 0x00008511 }, /* GL_NORMAL_MAP_ARB */ - { 18240, 0x00008511 }, /* GL_NORMAL_MAP_NV */ - { 18257, 0x00000205 }, /* GL_NOTEQUAL */ - { 18269, 0x00000000 }, /* GL_NO_ERROR */ - { 18281, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */ - { 18315, 0x000086A2 }, /* GL_NUM_TEXTURE_COMPRESSED_FORMATS_ARB */ - { 18353, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */ - { 18385, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */ - { 18427, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */ - { 18457, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */ - { 18497, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */ - { 18528, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */ - { 18557, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */ - { 18585, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */ - { 18615, 0x00002401 }, /* GL_OBJECT_LINEAR */ - { 18632, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */ - { 18658, 0x00002501 }, /* GL_OBJECT_PLANE */ - { 18674, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */ - { 18709, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */ - { 18731, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */ - { 18750, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */ - { 18780, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */ - { 18801, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */ - { 18829, 0x00000001 }, /* GL_ONE */ - { 18836, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */ - { 18864, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */ - { 18896, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */ - { 18924, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */ - { 18956, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */ - { 18979, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */ - { 19002, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */ - { 19025, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */ - { 19048, 0x00008598 }, /* GL_OPERAND0_ALPHA */ - { 19066, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */ - { 19088, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */ - { 19110, 0x00008590 }, /* GL_OPERAND0_RGB */ - { 19126, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */ - { 19146, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */ - { 19166, 0x00008599 }, /* GL_OPERAND1_ALPHA */ - { 19184, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */ - { 19206, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */ - { 19228, 0x00008591 }, /* GL_OPERAND1_RGB */ - { 19244, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */ - { 19264, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */ - { 19284, 0x0000859A }, /* GL_OPERAND2_ALPHA */ - { 19302, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */ - { 19324, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */ - { 19346, 0x00008592 }, /* GL_OPERAND2_RGB */ - { 19362, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */ - { 19382, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */ - { 19402, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */ - { 19423, 0x00008593 }, /* GL_OPERAND3_RGB_NV */ - { 19442, 0x00001507 }, /* GL_OR */ - { 19448, 0x00000A01 }, /* GL_ORDER */ - { 19457, 0x0000150D }, /* GL_OR_INVERTED */ - { 19472, 0x0000150B }, /* GL_OR_REVERSE */ - { 19486, 0x00000505 }, /* GL_OUT_OF_MEMORY */ - { 19503, 0x00000D05 }, /* GL_PACK_ALIGNMENT */ - { 19521, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */ - { 19542, 0x00008758 }, /* GL_PACK_INVERT_MESA */ - { 19562, 0x00000D01 }, /* GL_PACK_LSB_FIRST */ - { 19580, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */ - { 19599, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */ - { 19619, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */ - { 19639, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */ - { 19657, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */ - { 19676, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */ - { 19701, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */ - { 19725, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */ - { 19746, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */ - { 19768, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */ - { 19790, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */ - { 19815, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */ - { 19839, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */ - { 19860, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */ - { 19882, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */ - { 19904, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */ - { 19926, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */ - { 19957, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */ - { 19977, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */ - { 20002, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */ - { 20022, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */ - { 20047, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */ - { 20067, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */ - { 20092, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */ - { 20112, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */ - { 20137, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */ - { 20157, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */ - { 20182, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */ - { 20202, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */ - { 20227, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */ - { 20247, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */ - { 20272, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */ - { 20292, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */ - { 20317, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */ - { 20337, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */ - { 20362, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */ - { 20382, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */ - { 20407, 0x00000020 }, /* GL_PIXEL_MODE_BIT */ - { 20425, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */ - { 20458, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */ - { 20483, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */ - { 20518, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */ - { 20545, 0x00001B00 }, /* GL_POINT */ - { 20554, 0x00000000 }, /* GL_POINTS */ - { 20564, 0x00000002 }, /* GL_POINT_BIT */ - { 20577, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */ - { 20607, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */ - { 20641, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */ - { 20675, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */ - { 20710, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */ - { 20739, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */ - { 20772, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */ - { 20805, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */ - { 20839, 0x00000B11 }, /* GL_POINT_SIZE */ - { 20853, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */ - { 20879, 0x00008127 }, /* GL_POINT_SIZE_MAX */ - { 20897, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */ - { 20919, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */ - { 20941, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */ - { 20964, 0x00008126 }, /* GL_POINT_SIZE_MIN */ - { 20982, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */ - { 21004, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */ - { 21026, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */ - { 21049, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */ - { 21069, 0x00000B10 }, /* GL_POINT_SMOOTH */ - { 21085, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */ - { 21106, 0x00008861 }, /* GL_POINT_SPRITE_ARB */ - { 21126, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */ - { 21155, 0x00008861 }, /* GL_POINT_SPRITE_NV */ - { 21174, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */ - { 21200, 0x00000701 }, /* GL_POINT_TOKEN */ - { 21215, 0x00000009 }, /* GL_POLYGON */ - { 21226, 0x00000008 }, /* GL_POLYGON_BIT */ - { 21241, 0x00000B40 }, /* GL_POLYGON_MODE */ - { 21257, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */ - { 21280, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */ - { 21305, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */ - { 21328, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */ - { 21351, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */ - { 21375, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */ - { 21399, 0x00000B41 }, /* GL_POLYGON_SMOOTH */ - { 21417, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */ - { 21440, 0x00000B42 }, /* GL_POLYGON_STIPPLE */ - { 21459, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */ - { 21482, 0x00000703 }, /* GL_POLYGON_TOKEN */ - { 21499, 0x00001203 }, /* GL_POSITION */ - { 21511, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */ - { 21543, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */ - { 21579, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */ - { 21612, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */ - { 21649, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */ - { 21680, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */ - { 21715, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */ - { 21747, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */ - { 21783, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */ - { 21816, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */ - { 21848, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */ - { 21884, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */ - { 21917, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */ - { 21954, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */ - { 21984, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */ - { 22018, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */ - { 22049, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */ - { 22084, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */ - { 22115, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */ - { 22150, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */ - { 22182, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */ - { 22218, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */ - { 22248, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */ - { 22282, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */ - { 22313, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */ - { 22348, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */ - { 22380, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */ - { 22411, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */ - { 22446, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */ - { 22478, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */ - { 22514, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */ - { 22543, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */ - { 22576, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */ - { 22606, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */ - { 22640, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */ - { 22679, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */ - { 22712, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */ - { 22752, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */ - { 22786, 0x00008578 }, /* GL_PREVIOUS */ - { 22798, 0x00008578 }, /* GL_PREVIOUS_ARB */ - { 22814, 0x00008578 }, /* GL_PREVIOUS_EXT */ - { 22830, 0x00008577 }, /* GL_PRIMARY_COLOR */ - { 22847, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */ - { 22868, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */ - { 22889, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */ - { 22922, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */ - { 22954, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */ - { 22977, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */ - { 23000, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */ - { 23030, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */ - { 23059, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */ - { 23087, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */ - { 23109, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */ - { 23137, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */ - { 23165, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */ - { 23187, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */ - { 23208, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ - { 23248, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ - { 23287, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */ - { 23317, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ - { 23352, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */ - { 23385, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */ - { 23419, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ - { 23458, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ - { 23497, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */ - { 23519, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */ - { 23545, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */ - { 23569, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */ - { 23592, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */ - { 23614, 0x00008628 }, /* GL_PROGRAM_STRING_NV */ - { 23635, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */ - { 23656, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */ - { 23683, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */ - { 23715, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */ - { 23747, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */ - { 23782, 0x00001701 }, /* GL_PROJECTION */ - { 23796, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */ - { 23817, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */ - { 23843, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */ - { 23864, 0x00008025 }, /* GL_PROXY_HISTOGRAM */ - { 23883, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */ - { 23906, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */ - { 23945, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */ - { 23983, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */ - { 24003, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */ - { 24027, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */ - { 24047, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */ - { 24071, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */ - { 24091, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */ - { 24124, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */ - { 24150, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */ - { 24180, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */ - { 24211, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */ - { 24241, 0x00002003 }, /* GL_Q */ - { 24246, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */ - { 24271, 0x00000007 }, /* GL_QUADS */ - { 24280, 0x00008614 }, /* GL_QUAD_MESH_SUN */ - { 24297, 0x00000008 }, /* GL_QUAD_STRIP */ - { 24311, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */ - { 24333, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */ - { 24359, 0x00008866 }, /* GL_QUERY_RESULT */ - { 24375, 0x00008866 }, /* GL_QUERY_RESULT_ARB */ - { 24395, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */ - { 24421, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */ - { 24451, 0x00002002 }, /* GL_R */ - { 24456, 0x00002A10 }, /* GL_R3_G3_B2 */ - { 24468, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */ - { 24501, 0x00000C02 }, /* GL_READ_BUFFER */ - { 24516, 0x000088B8 }, /* GL_READ_ONLY */ - { 24529, 0x000088B8 }, /* GL_READ_ONLY_ARB */ - { 24546, 0x000088BA }, /* GL_READ_WRITE */ - { 24560, 0x000088BA }, /* GL_READ_WRITE_ARB */ - { 24578, 0x00001903 }, /* GL_RED */ - { 24585, 0x00008016 }, /* GL_REDUCE */ - { 24595, 0x00008016 }, /* GL_REDUCE_EXT */ - { 24609, 0x00000D15 }, /* GL_RED_BIAS */ - { 24621, 0x00000D52 }, /* GL_RED_BITS */ - { 24633, 0x00000D14 }, /* GL_RED_SCALE */ - { 24646, 0x00008512 }, /* GL_REFLECTION_MAP */ - { 24664, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */ - { 24686, 0x00008512 }, /* GL_REFLECTION_MAP_NV */ - { 24707, 0x00001C00 }, /* GL_RENDER */ - { 24717, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */ - { 24745, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */ - { 24765, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */ - { 24792, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */ - { 24828, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */ - { 24854, 0x00001F01 }, /* GL_RENDERER */ - { 24866, 0x00000C40 }, /* GL_RENDER_MODE */ - { 24881, 0x00002901 }, /* GL_REPEAT */ - { 24891, 0x00001E01 }, /* GL_REPLACE */ - { 24902, 0x00008062 }, /* GL_REPLACE_EXT */ - { 24917, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */ - { 24940, 0x0000803A }, /* GL_RESCALE_NORMAL */ - { 24958, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */ - { 24980, 0x00000102 }, /* GL_RETURN */ - { 24990, 0x00001907 }, /* GL_RGB */ - { 24997, 0x00008052 }, /* GL_RGB10 */ - { 25006, 0x00008059 }, /* GL_RGB10_A2 */ - { 25018, 0x00008059 }, /* GL_RGB10_A2_EXT */ - { 25034, 0x00008052 }, /* GL_RGB10_EXT */ - { 25047, 0x00008053 }, /* GL_RGB12 */ - { 25056, 0x00008053 }, /* GL_RGB12_EXT */ - { 25069, 0x00008054 }, /* GL_RGB16 */ - { 25078, 0x00008054 }, /* GL_RGB16_EXT */ - { 25091, 0x0000804E }, /* GL_RGB2_EXT */ - { 25103, 0x0000804F }, /* GL_RGB4 */ - { 25111, 0x0000804F }, /* GL_RGB4_EXT */ - { 25123, 0x000083A1 }, /* GL_RGB4_S3TC */ - { 25136, 0x00008050 }, /* GL_RGB5 */ - { 25144, 0x00008057 }, /* GL_RGB5_A1 */ - { 25155, 0x00008057 }, /* GL_RGB5_A1_EXT */ - { 25170, 0x00008050 }, /* GL_RGB5_EXT */ - { 25182, 0x00008051 }, /* GL_RGB8 */ - { 25190, 0x00008051 }, /* GL_RGB8_EXT */ - { 25202, 0x00001908 }, /* GL_RGBA */ - { 25210, 0x0000805A }, /* GL_RGBA12 */ - { 25220, 0x0000805A }, /* GL_RGBA12_EXT */ - { 25234, 0x0000805B }, /* GL_RGBA16 */ - { 25244, 0x0000805B }, /* GL_RGBA16_EXT */ - { 25258, 0x00008055 }, /* GL_RGBA2 */ - { 25267, 0x00008055 }, /* GL_RGBA2_EXT */ - { 25280, 0x00008056 }, /* GL_RGBA4 */ - { 25289, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */ - { 25308, 0x00008056 }, /* GL_RGBA4_EXT */ - { 25321, 0x000083A3 }, /* GL_RGBA4_S3TC */ - { 25335, 0x00008058 }, /* GL_RGBA8 */ - { 25344, 0x00008058 }, /* GL_RGBA8_EXT */ - { 25357, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */ - { 25375, 0x00000C31 }, /* GL_RGBA_MODE */ - { 25388, 0x000083A2 }, /* GL_RGBA_S3TC */ - { 25401, 0x000083A0 }, /* GL_RGB_S3TC */ - { 25413, 0x00008573 }, /* GL_RGB_SCALE */ - { 25426, 0x00008573 }, /* GL_RGB_SCALE_ARB */ - { 25443, 0x00008573 }, /* GL_RGB_SCALE_EXT */ - { 25460, 0x00000407 }, /* GL_RIGHT */ - { 25469, 0x00002000 }, /* GL_S */ - { 25474, 0x000080A9 }, /* GL_SAMPLES */ - { 25485, 0x000086B4 }, /* GL_SAMPLES_3DFX */ - { 25501, 0x000080A9 }, /* GL_SAMPLES_ARB */ - { 25516, 0x00008914 }, /* GL_SAMPLES_PASSED */ - { 25534, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */ - { 25556, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */ - { 25584, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */ - { 25616, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */ - { 25639, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */ - { 25666, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */ - { 25684, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */ - { 25707, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */ - { 25729, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */ - { 25748, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */ - { 25771, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */ - { 25797, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */ - { 25827, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */ - { 25852, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */ - { 25881, 0x00080000 }, /* GL_SCISSOR_BIT */ - { 25896, 0x00000C10 }, /* GL_SCISSOR_BOX */ - { 25911, 0x00000C11 }, /* GL_SCISSOR_TEST */ - { 25927, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */ - { 25952, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */ - { 25992, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */ - { 26036, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */ - { 26069, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */ - { 26099, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */ - { 26131, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */ - { 26161, 0x00001C02 }, /* GL_SELECT */ - { 26171, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */ - { 26199, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */ - { 26224, 0x00008012 }, /* GL_SEPARABLE_2D */ - { 26240, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */ - { 26267, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */ - { 26298, 0x0000150F }, /* GL_SET */ - { 26305, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */ - { 26326, 0x00000B54 }, /* GL_SHADE_MODEL */ - { 26341, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */ - { 26364, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */ - { 26394, 0x00001601 }, /* GL_SHININESS */ - { 26407, 0x00001402 }, /* GL_SHORT */ - { 26416, 0x000081F9 }, /* GL_SINGLE_COLOR */ - { 26432, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */ - { 26452, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */ - { 26471, 0x00001D01 }, /* GL_SMOOTH */ - { 26481, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */ - { 26514, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */ - { 26541, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */ - { 26574, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */ - { 26601, 0x00008588 }, /* GL_SOURCE0_ALPHA */ - { 26618, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */ - { 26639, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */ - { 26660, 0x00008580 }, /* GL_SOURCE0_RGB */ - { 26675, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */ - { 26694, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */ - { 26713, 0x00008589 }, /* GL_SOURCE1_ALPHA */ - { 26730, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */ - { 26751, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */ - { 26772, 0x00008581 }, /* GL_SOURCE1_RGB */ - { 26787, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */ - { 26806, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */ - { 26825, 0x0000858A }, /* GL_SOURCE2_ALPHA */ - { 26842, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */ - { 26863, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */ - { 26884, 0x00008582 }, /* GL_SOURCE2_RGB */ - { 26899, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */ - { 26918, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */ - { 26937, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */ - { 26957, 0x00008583 }, /* GL_SOURCE3_RGB_NV */ - { 26975, 0x00001202 }, /* GL_SPECULAR */ - { 26987, 0x00002402 }, /* GL_SPHERE_MAP */ - { 27001, 0x00001206 }, /* GL_SPOT_CUTOFF */ - { 27016, 0x00001204 }, /* GL_SPOT_DIRECTION */ - { 27034, 0x00001205 }, /* GL_SPOT_EXPONENT */ - { 27051, 0x00008588 }, /* GL_SRC0_ALPHA */ - { 27065, 0x00008580 }, /* GL_SRC0_RGB */ - { 27077, 0x00008589 }, /* GL_SRC1_ALPHA */ - { 27091, 0x00008581 }, /* GL_SRC1_RGB */ - { 27103, 0x0000858A }, /* GL_SRC2_ALPHA */ - { 27117, 0x00008582 }, /* GL_SRC2_RGB */ - { 27129, 0x00000302 }, /* GL_SRC_ALPHA */ - { 27142, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */ - { 27164, 0x00000300 }, /* GL_SRC_COLOR */ - { 27177, 0x00000503 }, /* GL_STACK_OVERFLOW */ - { 27195, 0x00000504 }, /* GL_STACK_UNDERFLOW */ - { 27214, 0x000088E6 }, /* GL_STATIC_COPY */ - { 27229, 0x000088E6 }, /* GL_STATIC_COPY_ARB */ - { 27248, 0x000088E4 }, /* GL_STATIC_DRAW */ - { 27263, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */ - { 27282, 0x000088E5 }, /* GL_STATIC_READ */ - { 27297, 0x000088E5 }, /* GL_STATIC_READ_ARB */ - { 27316, 0x00001802 }, /* GL_STENCIL */ - { 27327, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */ - { 27353, 0x00000D57 }, /* GL_STENCIL_BITS */ - { 27369, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */ - { 27391, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */ - { 27414, 0x00000B94 }, /* GL_STENCIL_FAIL */ - { 27430, 0x00000B92 }, /* GL_STENCIL_FUNC */ - { 27446, 0x00001901 }, /* GL_STENCIL_INDEX */ - { 27463, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */ - { 27486, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */ - { 27508, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */ - { 27530, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */ - { 27552, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */ - { 27573, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */ - { 27600, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */ - { 27627, 0x00000B97 }, /* GL_STENCIL_REF */ - { 27642, 0x00000B90 }, /* GL_STENCIL_TEST */ - { 27658, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */ - { 27687, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */ - { 27709, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */ - { 27730, 0x00000C33 }, /* GL_STEREO */ - { 27740, 0x000088E2 }, /* GL_STREAM_COPY */ - { 27755, 0x000088E2 }, /* GL_STREAM_COPY_ARB */ - { 27774, 0x000088E0 }, /* GL_STREAM_DRAW */ - { 27789, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */ - { 27808, 0x000088E1 }, /* GL_STREAM_READ */ - { 27823, 0x000088E1 }, /* GL_STREAM_READ_ARB */ - { 27842, 0x00000D50 }, /* GL_SUBPIXEL_BITS */ - { 27859, 0x000084E7 }, /* GL_SUBTRACT */ - { 27871, 0x000084E7 }, /* GL_SUBTRACT_ARB */ - { 27887, 0x00002001 }, /* GL_T */ - { 27892, 0x00002A2A }, /* GL_T2F_C3F_V3F */ - { 27907, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */ - { 27926, 0x00002A29 }, /* GL_T2F_C4UB_V3F */ - { 27942, 0x00002A2B }, /* GL_T2F_N3F_V3F */ - { 27957, 0x00002A27 }, /* GL_T2F_V3F */ - { 27968, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */ - { 27987, 0x00002A28 }, /* GL_T4F_V4F */ - { 27998, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */ - { 28021, 0x00001702 }, /* GL_TEXTURE */ - { 28032, 0x000084C0 }, /* GL_TEXTURE0 */ - { 28044, 0x000084C0 }, /* GL_TEXTURE0_ARB */ - { 28060, 0x000084C1 }, /* GL_TEXTURE1 */ - { 28072, 0x000084CA }, /* GL_TEXTURE10 */ - { 28085, 0x000084CA }, /* GL_TEXTURE10_ARB */ - { 28102, 0x000084CB }, /* GL_TEXTURE11 */ - { 28115, 0x000084CB }, /* GL_TEXTURE11_ARB */ - { 28132, 0x000084CC }, /* GL_TEXTURE12 */ - { 28145, 0x000084CC }, /* GL_TEXTURE12_ARB */ - { 28162, 0x000084CD }, /* GL_TEXTURE13 */ - { 28175, 0x000084CD }, /* GL_TEXTURE13_ARB */ - { 28192, 0x000084CE }, /* GL_TEXTURE14 */ - { 28205, 0x000084CE }, /* GL_TEXTURE14_ARB */ - { 28222, 0x000084CF }, /* GL_TEXTURE15 */ - { 28235, 0x000084CF }, /* GL_TEXTURE15_ARB */ - { 28252, 0x000084D0 }, /* GL_TEXTURE16 */ - { 28265, 0x000084D0 }, /* GL_TEXTURE16_ARB */ - { 28282, 0x000084D1 }, /* GL_TEXTURE17 */ - { 28295, 0x000084D1 }, /* GL_TEXTURE17_ARB */ - { 28312, 0x000084D2 }, /* GL_TEXTURE18 */ - { 28325, 0x000084D2 }, /* GL_TEXTURE18_ARB */ - { 28342, 0x000084D3 }, /* GL_TEXTURE19 */ - { 28355, 0x000084D3 }, /* GL_TEXTURE19_ARB */ - { 28372, 0x000084C1 }, /* GL_TEXTURE1_ARB */ - { 28388, 0x000084C2 }, /* GL_TEXTURE2 */ - { 28400, 0x000084D4 }, /* GL_TEXTURE20 */ - { 28413, 0x000084D4 }, /* GL_TEXTURE20_ARB */ - { 28430, 0x000084D5 }, /* GL_TEXTURE21 */ - { 28443, 0x000084D5 }, /* GL_TEXTURE21_ARB */ - { 28460, 0x000084D6 }, /* GL_TEXTURE22 */ - { 28473, 0x000084D6 }, /* GL_TEXTURE22_ARB */ - { 28490, 0x000084D7 }, /* GL_TEXTURE23 */ - { 28503, 0x000084D7 }, /* GL_TEXTURE23_ARB */ - { 28520, 0x000084D8 }, /* GL_TEXTURE24 */ - { 28533, 0x000084D8 }, /* GL_TEXTURE24_ARB */ - { 28550, 0x000084D9 }, /* GL_TEXTURE25 */ - { 28563, 0x000084D9 }, /* GL_TEXTURE25_ARB */ - { 28580, 0x000084DA }, /* GL_TEXTURE26 */ - { 28593, 0x000084DA }, /* GL_TEXTURE26_ARB */ - { 28610, 0x000084DB }, /* GL_TEXTURE27 */ - { 28623, 0x000084DB }, /* GL_TEXTURE27_ARB */ - { 28640, 0x000084DC }, /* GL_TEXTURE28 */ - { 28653, 0x000084DC }, /* GL_TEXTURE28_ARB */ - { 28670, 0x000084DD }, /* GL_TEXTURE29 */ - { 28683, 0x000084DD }, /* GL_TEXTURE29_ARB */ - { 28700, 0x000084C2 }, /* GL_TEXTURE2_ARB */ - { 28716, 0x000084C3 }, /* GL_TEXTURE3 */ - { 28728, 0x000084DE }, /* GL_TEXTURE30 */ - { 28741, 0x000084DE }, /* GL_TEXTURE30_ARB */ - { 28758, 0x000084DF }, /* GL_TEXTURE31 */ - { 28771, 0x000084DF }, /* GL_TEXTURE31_ARB */ - { 28788, 0x000084C3 }, /* GL_TEXTURE3_ARB */ - { 28804, 0x000084C4 }, /* GL_TEXTURE4 */ - { 28816, 0x000084C4 }, /* GL_TEXTURE4_ARB */ - { 28832, 0x000084C5 }, /* GL_TEXTURE5 */ - { 28844, 0x000084C5 }, /* GL_TEXTURE5_ARB */ - { 28860, 0x000084C6 }, /* GL_TEXTURE6 */ - { 28872, 0x000084C6 }, /* GL_TEXTURE6_ARB */ - { 28888, 0x000084C7 }, /* GL_TEXTURE7 */ - { 28900, 0x000084C7 }, /* GL_TEXTURE7_ARB */ - { 28916, 0x000084C8 }, /* GL_TEXTURE8 */ - { 28928, 0x000084C8 }, /* GL_TEXTURE8_ARB */ - { 28944, 0x000084C9 }, /* GL_TEXTURE9 */ - { 28956, 0x000084C9 }, /* GL_TEXTURE9_ARB */ - { 28972, 0x00000DE0 }, /* GL_TEXTURE_1D */ - { 28986, 0x00000DE1 }, /* GL_TEXTURE_2D */ - { 29000, 0x0000806F }, /* GL_TEXTURE_3D */ - { 29014, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */ - { 29036, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */ - { 29062, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */ - { 29084, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */ - { 29106, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */ - { 29128, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */ - { 29150, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */ - { 29178, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */ - { 29210, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */ - { 29243, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */ - { 29275, 0x00040000 }, /* GL_TEXTURE_BIT */ - { 29290, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */ - { 29311, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */ - { 29336, 0x00001005 }, /* GL_TEXTURE_BORDER */ - { 29354, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */ - { 29378, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */ - { 29409, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */ - { 29439, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */ - { 29469, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */ - { 29504, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */ - { 29535, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */ - { 29573, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */ - { 29600, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */ - { 29632, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ - { 29666, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */ - { 29690, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */ - { 29718, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */ - { 29742, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */ - { 29770, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */ - { 29803, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */ - { 29827, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */ - { 29849, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */ - { 29871, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */ - { 29897, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */ - { 29931, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */ - { 29964, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */ - { 30001, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */ - { 30029, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */ - { 30061, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */ - { 30084, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */ - { 30122, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */ - { 30164, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */ - { 30195, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */ - { 30223, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */ - { 30253, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */ - { 30281, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */ - { 30301, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */ - { 30325, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */ - { 30356, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */ - { 30391, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */ - { 30422, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */ - { 30457, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */ - { 30488, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */ - { 30523, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */ - { 30554, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */ - { 30589, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */ - { 30620, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */ - { 30655, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ - { 30686, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */ - { 30721, 0x00008071 }, /* GL_TEXTURE_DEPTH */ - { 30738, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */ - { 30760, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */ - { 30786, 0x00002300 }, /* GL_TEXTURE_ENV */ - { 30801, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */ - { 30822, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */ - { 30842, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */ - { 30868, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */ - { 30888, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */ - { 30905, 0x00000C62 }, /* GL_TEXTURE_GEN_R */ - { 30922, 0x00000C60 }, /* GL_TEXTURE_GEN_S */ - { 30939, 0x00000C61 }, /* GL_TEXTURE_GEN_T */ - { 30956, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */ - { 30981, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */ - { 31003, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */ - { 31029, 0x00001001 }, /* GL_TEXTURE_HEIGHT */ - { 31047, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */ - { 31073, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */ - { 31099, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */ - { 31129, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */ - { 31156, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */ - { 31181, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */ - { 31201, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */ - { 31225, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */ - { 31252, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */ - { 31279, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */ - { 31306, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */ - { 31332, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */ - { 31362, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */ - { 31384, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */ - { 31402, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */ - { 31432, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */ - { 31460, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */ - { 31488, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */ - { 31516, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */ - { 31537, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */ - { 31556, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */ - { 31578, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */ - { 31597, 0x00008066 }, /* GL_TEXTURE_PRIORITY */ - { 31617, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */ - { 31642, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */ - { 31666, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */ - { 31686, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */ - { 31710, 0x00008067 }, /* GL_TEXTURE_RESIDENT */ - { 31730, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */ - { 31753, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */ - { 31778, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */ - { 31812, 0x00001000 }, /* GL_TEXTURE_WIDTH */ - { 31829, 0x00008072 }, /* GL_TEXTURE_WRAP_R */ - { 31847, 0x00002802 }, /* GL_TEXTURE_WRAP_S */ - { 31865, 0x00002803 }, /* GL_TEXTURE_WRAP_T */ - { 31883, 0x00008648 }, /* GL_TRACK_MATRIX_NV */ - { 31902, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */ - { 31931, 0x00001000 }, /* GL_TRANSFORM_BIT */ - { 31948, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */ - { 31974, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */ - { 32004, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */ - { 32036, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */ - { 32066, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */ - { 32100, 0x0000862C }, /* GL_TRANSPOSE_NV */ - { 32116, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */ - { 32147, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */ - { 32182, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */ - { 32210, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */ - { 32242, 0x00000004 }, /* GL_TRIANGLES */ - { 32255, 0x00000006 }, /* GL_TRIANGLE_FAN */ - { 32271, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */ - { 32292, 0x00000005 }, /* GL_TRIANGLE_STRIP */ - { 32310, 0x00000001 }, /* GL_TRUE */ - { 32318, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */ - { 32338, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */ - { 32361, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */ - { 32381, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */ - { 32402, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */ - { 32424, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */ - { 32446, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */ - { 32466, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */ - { 32487, 0x00001401 }, /* GL_UNSIGNED_BYTE */ - { 32504, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */ - { 32531, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */ - { 32554, 0x00001405 }, /* GL_UNSIGNED_INT */ - { 32570, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */ - { 32597, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */ - { 32621, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */ - { 32652, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */ - { 32676, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */ - { 32704, 0x00001403 }, /* GL_UNSIGNED_SHORT */ - { 32722, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */ - { 32752, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */ - { 32778, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */ - { 32808, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */ - { 32834, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */ - { 32858, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */ - { 32886, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */ - { 32914, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */ - { 32941, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */ - { 32973, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */ - { 33004, 0x00002A20 }, /* GL_V2F */ - { 33011, 0x00002A21 }, /* GL_V3F */ - { 33018, 0x00001F00 }, /* GL_VENDOR */ - { 33028, 0x00001F02 }, /* GL_VERSION */ - { 33039, 0x00008074 }, /* GL_VERTEX_ARRAY */ - { 33055, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */ - { 33086, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */ - { 33121, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */ - { 33145, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */ - { 33166, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */ - { 33189, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */ - { 33210, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */ - { 33237, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */ - { 33265, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */ - { 33293, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */ - { 33321, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */ - { 33349, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */ - { 33377, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */ - { 33405, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */ - { 33432, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */ - { 33459, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */ - { 33486, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */ - { 33513, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */ - { 33540, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */ - { 33567, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */ - { 33594, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */ - { 33621, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */ - { 33648, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */ - { 33686, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */ - { 33728, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */ - { 33763, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */ - { 33801, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */ - { 33836, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */ - { 33868, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */ - { 33902, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */ - { 33934, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */ - { 33954, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */ - { 33976, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */ - { 34005, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */ - { 34026, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */ - { 34059, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */ - { 34091, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */ - { 34122, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */ - { 34152, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */ - { 34173, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */ - { 34200, 0x00000BA2 }, /* GL_VIEWPORT */ - { 34212, 0x00000800 }, /* GL_VIEWPORT_BIT */ - { 34228, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */ - { 34248, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */ - { 34279, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */ - { 34314, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */ - { 34342, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */ - { 34367, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */ - { 34394, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */ - { 34419, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */ - { 34443, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */ - { 34462, 0x000088B9 }, /* GL_WRITE_ONLY */ - { 34476, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */ - { 34494, 0x00001506 }, /* GL_XOR */ - { 34501, 0x000085B9 }, /* GL_YCBCR_422_APPLE */ - { 34520, 0x00008757 }, /* GL_YCBCR_MESA */ - { 34534, 0x00000000 }, /* GL_ZERO */ - { 34542, 0x00000D16 }, /* GL_ZOOM_X */ - { 34552, 0x00000D17 }, /* GL_ZOOM_Y */ + { 9588, 0x00008CA6 }, /* GL_GL_DRAW_FRAMEBUFFER_BINDING_EXT */ + { 9623, 0x00008CA9 }, /* GL_GL_DRAW_FRAMEBUFFER_EXT */ + { 9650, 0x00008CAA }, /* GL_GL_READ_FRAMEBUFFER_BINDING_EXT */ + { 9685, 0x00008CA8 }, /* GL_GL_READ_FRAMEBUFFER_EXT */ + { 9712, 0x000088BF }, /* GL_GL_TIME_ELAPSED_EXT */ + { 9735, 0x00000204 }, /* GL_GREATER */ + { 9746, 0x00001904 }, /* GL_GREEN */ + { 9755, 0x00000D19 }, /* GL_GREEN_BIAS */ + { 9769, 0x00000D53 }, /* GL_GREEN_BITS */ + { 9783, 0x00000D18 }, /* GL_GREEN_SCALE */ + { 9798, 0x00008000 }, /* GL_HINT_BIT */ + { 9810, 0x00008024 }, /* GL_HISTOGRAM */ + { 9823, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */ + { 9847, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */ + { 9875, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */ + { 9898, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */ + { 9925, 0x00008024 }, /* GL_HISTOGRAM_EXT */ + { 9942, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */ + { 9962, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */ + { 9986, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */ + { 10010, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */ + { 10038, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */ + { 10066, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */ + { 10098, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */ + { 10120, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */ + { 10146, 0x0000802D }, /* GL_HISTOGRAM_SINK */ + { 10164, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */ + { 10186, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */ + { 10205, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */ + { 10228, 0x0000862A }, /* GL_IDENTITY_NV */ + { 10243, 0x00008150 }, /* GL_IGNORE_BORDER_HP */ + { 10263, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */ + { 10303, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */ + { 10341, 0x00001E02 }, /* GL_INCR */ + { 10349, 0x00008507 }, /* GL_INCR_WRAP */ + { 10362, 0x00008507 }, /* GL_INCR_WRAP_EXT */ + { 10379, 0x00008077 }, /* GL_INDEX_ARRAY */ + { 10394, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */ + { 10424, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */ + { 10458, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */ + { 10481, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */ + { 10503, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */ + { 10523, 0x00000D51 }, /* GL_INDEX_BITS */ + { 10537, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */ + { 10558, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */ + { 10576, 0x00000C30 }, /* GL_INDEX_MODE */ + { 10590, 0x00000D13 }, /* GL_INDEX_OFFSET */ + { 10606, 0x00000D12 }, /* GL_INDEX_SHIFT */ + { 10621, 0x00000C21 }, /* GL_INDEX_WRITEMASK */ + { 10640, 0x00001404 }, /* GL_INT */ + { 10647, 0x00008049 }, /* GL_INTENSITY */ + { 10660, 0x0000804C }, /* GL_INTENSITY12 */ + { 10675, 0x0000804C }, /* GL_INTENSITY12_EXT */ + { 10694, 0x0000804D }, /* GL_INTENSITY16 */ + { 10709, 0x0000804D }, /* GL_INTENSITY16_EXT */ + { 10728, 0x0000804A }, /* GL_INTENSITY4 */ + { 10742, 0x0000804A }, /* GL_INTENSITY4_EXT */ + { 10760, 0x0000804B }, /* GL_INTENSITY8 */ + { 10774, 0x0000804B }, /* GL_INTENSITY8_EXT */ + { 10792, 0x00008049 }, /* GL_INTENSITY_EXT */ + { 10809, 0x00008575 }, /* GL_INTERPOLATE */ + { 10824, 0x00008575 }, /* GL_INTERPOLATE_ARB */ + { 10843, 0x00008575 }, /* GL_INTERPOLATE_EXT */ + { 10862, 0x00008B53 }, /* GL_INT_VEC2_ARB */ + { 10878, 0x00008B54 }, /* GL_INT_VEC3_ARB */ + { 10894, 0x00008B55 }, /* GL_INT_VEC4_ARB */ + { 10910, 0x00000500 }, /* GL_INVALID_ENUM */ + { 10926, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */ + { 10963, 0x00000502 }, /* GL_INVALID_OPERATION */ + { 10984, 0x00000501 }, /* GL_INVALID_VALUE */ + { 11001, 0x0000862B }, /* GL_INVERSE_NV */ + { 11015, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */ + { 11039, 0x0000150A }, /* GL_INVERT */ + { 11049, 0x00001E00 }, /* GL_KEEP */ + { 11057, 0x00000406 }, /* GL_LEFT */ + { 11065, 0x00000203 }, /* GL_LEQUAL */ + { 11075, 0x00000201 }, /* GL_LESS */ + { 11083, 0x00004000 }, /* GL_LIGHT0 */ + { 11093, 0x00004001 }, /* GL_LIGHT1 */ + { 11103, 0x00004002 }, /* GL_LIGHT2 */ + { 11113, 0x00004003 }, /* GL_LIGHT3 */ + { 11123, 0x00004004 }, /* GL_LIGHT4 */ + { 11133, 0x00004005 }, /* GL_LIGHT5 */ + { 11143, 0x00004006 }, /* GL_LIGHT6 */ + { 11153, 0x00004007 }, /* GL_LIGHT7 */ + { 11163, 0x00000B50 }, /* GL_LIGHTING */ + { 11175, 0x00000040 }, /* GL_LIGHTING_BIT */ + { 11191, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */ + { 11214, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */ + { 11243, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */ + { 11276, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */ + { 11304, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */ + { 11328, 0x00001B01 }, /* GL_LINE */ + { 11336, 0x00002601 }, /* GL_LINEAR */ + { 11346, 0x00001208 }, /* GL_LINEAR_ATTENUATION */ + { 11368, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */ + { 11398, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */ + { 11429, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */ + { 11453, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */ + { 11478, 0x00000001 }, /* GL_LINES */ + { 11487, 0x00000004 }, /* GL_LINE_BIT */ + { 11499, 0x00000002 }, /* GL_LINE_LOOP */ + { 11512, 0x00000707 }, /* GL_LINE_RESET_TOKEN */ + { 11532, 0x00000B20 }, /* GL_LINE_SMOOTH */ + { 11547, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */ + { 11567, 0x00000B24 }, /* GL_LINE_STIPPLE */ + { 11583, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */ + { 11607, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */ + { 11630, 0x00000003 }, /* GL_LINE_STRIP */ + { 11644, 0x00000702 }, /* GL_LINE_TOKEN */ + { 11658, 0x00000B21 }, /* GL_LINE_WIDTH */ + { 11672, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */ + { 11698, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */ + { 11718, 0x00000B32 }, /* GL_LIST_BASE */ + { 11731, 0x00020000 }, /* GL_LIST_BIT */ + { 11743, 0x00000B33 }, /* GL_LIST_INDEX */ + { 11757, 0x00000B30 }, /* GL_LIST_MODE */ + { 11770, 0x00000101 }, /* GL_LOAD */ + { 11778, 0x00000BF1 }, /* GL_LOGIC_OP */ + { 11790, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */ + { 11807, 0x00001909 }, /* GL_LUMINANCE */ + { 11820, 0x00008041 }, /* GL_LUMINANCE12 */ + { 11835, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */ + { 11858, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */ + { 11885, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */ + { 11907, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */ + { 11933, 0x00008041 }, /* GL_LUMINANCE12_EXT */ + { 11952, 0x00008042 }, /* GL_LUMINANCE16 */ + { 11967, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */ + { 11990, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */ + { 12017, 0x00008042 }, /* GL_LUMINANCE16_EXT */ + { 12036, 0x0000803F }, /* GL_LUMINANCE4 */ + { 12050, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */ + { 12071, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */ + { 12096, 0x0000803F }, /* GL_LUMINANCE4_EXT */ + { 12114, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */ + { 12135, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */ + { 12160, 0x00008040 }, /* GL_LUMINANCE8 */ + { 12174, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */ + { 12195, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */ + { 12220, 0x00008040 }, /* GL_LUMINANCE8_EXT */ + { 12238, 0x0000190A }, /* GL_LUMINANCE_ALPHA */ + { 12257, 0x00000D90 }, /* GL_MAP1_COLOR_4 */ + { 12273, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */ + { 12293, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */ + { 12315, 0x00000D91 }, /* GL_MAP1_INDEX */ + { 12329, 0x00000D92 }, /* GL_MAP1_NORMAL */ + { 12344, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */ + { 12368, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */ + { 12392, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */ + { 12416, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */ + { 12440, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */ + { 12457, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */ + { 12474, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */ + { 12502, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */ + { 12531, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */ + { 12560, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */ + { 12589, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */ + { 12618, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */ + { 12647, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */ + { 12676, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */ + { 12704, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */ + { 12732, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */ + { 12760, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */ + { 12788, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */ + { 12816, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */ + { 12844, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */ + { 12872, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */ + { 12900, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */ + { 12928, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */ + { 12944, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */ + { 12964, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */ + { 12986, 0x00000DB1 }, /* GL_MAP2_INDEX */ + { 13000, 0x00000DB2 }, /* GL_MAP2_NORMAL */ + { 13015, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */ + { 13039, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */ + { 13063, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */ + { 13087, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */ + { 13111, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */ + { 13128, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */ + { 13145, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */ + { 13173, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */ + { 13202, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */ + { 13231, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */ + { 13260, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */ + { 13289, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */ + { 13318, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */ + { 13347, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */ + { 13375, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */ + { 13403, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */ + { 13431, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */ + { 13459, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */ + { 13487, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */ + { 13515, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */ + { 13543, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */ + { 13571, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */ + { 13599, 0x00000D10 }, /* GL_MAP_COLOR */ + { 13612, 0x00000D11 }, /* GL_MAP_STENCIL */ + { 13627, 0x000088C0 }, /* GL_MATRIX0_ARB */ + { 13642, 0x00008630 }, /* GL_MATRIX0_NV */ + { 13656, 0x000088CA }, /* GL_MATRIX10_ARB */ + { 13672, 0x000088CB }, /* GL_MATRIX11_ARB */ + { 13688, 0x000088CC }, /* GL_MATRIX12_ARB */ + { 13704, 0x000088CD }, /* GL_MATRIX13_ARB */ + { 13720, 0x000088CE }, /* GL_MATRIX14_ARB */ + { 13736, 0x000088CF }, /* GL_MATRIX15_ARB */ + { 13752, 0x000088D0 }, /* GL_MATRIX16_ARB */ + { 13768, 0x000088D1 }, /* GL_MATRIX17_ARB */ + { 13784, 0x000088D2 }, /* GL_MATRIX18_ARB */ + { 13800, 0x000088D3 }, /* GL_MATRIX19_ARB */ + { 13816, 0x000088C1 }, /* GL_MATRIX1_ARB */ + { 13831, 0x00008631 }, /* GL_MATRIX1_NV */ + { 13845, 0x000088D4 }, /* GL_MATRIX20_ARB */ + { 13861, 0x000088D5 }, /* GL_MATRIX21_ARB */ + { 13877, 0x000088D6 }, /* GL_MATRIX22_ARB */ + { 13893, 0x000088D7 }, /* GL_MATRIX23_ARB */ + { 13909, 0x000088D8 }, /* GL_MATRIX24_ARB */ + { 13925, 0x000088D9 }, /* GL_MATRIX25_ARB */ + { 13941, 0x000088DA }, /* GL_MATRIX26_ARB */ + { 13957, 0x000088DB }, /* GL_MATRIX27_ARB */ + { 13973, 0x000088DC }, /* GL_MATRIX28_ARB */ + { 13989, 0x000088DD }, /* GL_MATRIX29_ARB */ + { 14005, 0x000088C2 }, /* GL_MATRIX2_ARB */ + { 14020, 0x00008632 }, /* GL_MATRIX2_NV */ + { 14034, 0x000088DE }, /* GL_MATRIX30_ARB */ + { 14050, 0x000088DF }, /* GL_MATRIX31_ARB */ + { 14066, 0x000088C3 }, /* GL_MATRIX3_ARB */ + { 14081, 0x00008633 }, /* GL_MATRIX3_NV */ + { 14095, 0x000088C4 }, /* GL_MATRIX4_ARB */ + { 14110, 0x00008634 }, /* GL_MATRIX4_NV */ + { 14124, 0x000088C5 }, /* GL_MATRIX5_ARB */ + { 14139, 0x00008635 }, /* GL_MATRIX5_NV */ + { 14153, 0x000088C6 }, /* GL_MATRIX6_ARB */ + { 14168, 0x00008636 }, /* GL_MATRIX6_NV */ + { 14182, 0x000088C7 }, /* GL_MATRIX7_ARB */ + { 14197, 0x00008637 }, /* GL_MATRIX7_NV */ + { 14211, 0x000088C8 }, /* GL_MATRIX8_ARB */ + { 14226, 0x000088C9 }, /* GL_MATRIX9_ARB */ + { 14241, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */ + { 14267, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */ + { 14301, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */ + { 14332, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */ + { 14365, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */ + { 14396, 0x00000BA0 }, /* GL_MATRIX_MODE */ + { 14411, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */ + { 14433, 0x00008008 }, /* GL_MAX */ + { 14440, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */ + { 14463, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */ + { 14489, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */ + { 14522, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */ + { 14548, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */ + { 14582, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */ + { 14601, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */ + { 14630, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */ + { 14662, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */ + { 14698, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */ + { 14738, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */ + { 14764, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */ + { 14794, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */ + { 14819, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */ + { 14848, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */ + { 14877, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */ + { 14910, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */ + { 14934, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */ + { 14958, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */ + { 14982, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */ + { 15007, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */ + { 15025, 0x00008008 }, /* GL_MAX_EXT */ + { 15036, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */ + { 15075, 0x00000D31 }, /* GL_MAX_LIGHTS */ + { 15089, 0x00000B31 }, /* GL_MAX_LIST_NESTING */ + { 15109, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */ + { 15147, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */ + { 15176, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */ + { 15200, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */ + { 15228, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */ + { 15251, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */ + { 15288, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */ + { 15324, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */ + { 15351, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ + { 15380, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */ + { 15414, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ + { 15450, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ + { 15477, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */ + { 15509, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */ + { 15545, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */ + { 15574, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ + { 15603, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */ + { 15631, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */ + { 15669, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ + { 15713, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ + { 15756, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */ + { 15790, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ + { 15829, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */ + { 15866, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */ + { 15904, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ + { 15947, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ + { 15990, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */ + { 16020, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */ + { 16051, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */ + { 16087, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */ + { 16123, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */ + { 16153, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */ + { 16187, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */ + { 16220, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */ + { 16249, 0x00008504 }, /* GL_MAX_SHININESS_NV */ + { 16269, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */ + { 16293, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */ + { 16319, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */ + { 16350, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */ + { 16374, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */ + { 16408, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */ + { 16428, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */ + { 16455, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */ + { 16476, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */ + { 16501, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */ + { 16526, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */ + { 16561, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */ + { 16587, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */ + { 16613, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ + { 16651, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */ + { 16688, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */ + { 16712, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */ + { 16733, 0x00008007 }, /* GL_MIN */ + { 16740, 0x0000802E }, /* GL_MINMAX */ + { 16750, 0x0000802E }, /* GL_MINMAX_EXT */ + { 16764, 0x0000802F }, /* GL_MINMAX_FORMAT */ + { 16781, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */ + { 16802, 0x00008030 }, /* GL_MINMAX_SINK */ + { 16817, 0x00008030 }, /* GL_MINMAX_SINK_EXT */ + { 16836, 0x00008007 }, /* GL_MIN_EXT */ + { 16847, 0x00008370 }, /* GL_MIRRORED_REPEAT */ + { 16866, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */ + { 16889, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */ + { 16912, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */ + { 16932, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */ + { 16952, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */ + { 16982, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */ + { 17010, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */ + { 17038, 0x00001700 }, /* GL_MODELVIEW */ + { 17051, 0x00001700 }, /* GL_MODELVIEW0_ARB */ + { 17069, 0x0000872A }, /* GL_MODELVIEW10_ARB */ + { 17088, 0x0000872B }, /* GL_MODELVIEW11_ARB */ + { 17107, 0x0000872C }, /* GL_MODELVIEW12_ARB */ + { 17126, 0x0000872D }, /* GL_MODELVIEW13_ARB */ + { 17145, 0x0000872E }, /* GL_MODELVIEW14_ARB */ + { 17164, 0x0000872F }, /* GL_MODELVIEW15_ARB */ + { 17183, 0x00008730 }, /* GL_MODELVIEW16_ARB */ + { 17202, 0x00008731 }, /* GL_MODELVIEW17_ARB */ + { 17221, 0x00008732 }, /* GL_MODELVIEW18_ARB */ + { 17240, 0x00008733 }, /* GL_MODELVIEW19_ARB */ + { 17259, 0x0000850A }, /* GL_MODELVIEW1_ARB */ + { 17277, 0x00008734 }, /* GL_MODELVIEW20_ARB */ + { 17296, 0x00008735 }, /* GL_MODELVIEW21_ARB */ + { 17315, 0x00008736 }, /* GL_MODELVIEW22_ARB */ + { 17334, 0x00008737 }, /* GL_MODELVIEW23_ARB */ + { 17353, 0x00008738 }, /* GL_MODELVIEW24_ARB */ + { 17372, 0x00008739 }, /* GL_MODELVIEW25_ARB */ + { 17391, 0x0000873A }, /* GL_MODELVIEW26_ARB */ + { 17410, 0x0000873B }, /* GL_MODELVIEW27_ARB */ + { 17429, 0x0000873C }, /* GL_MODELVIEW28_ARB */ + { 17448, 0x0000873D }, /* GL_MODELVIEW29_ARB */ + { 17467, 0x00008722 }, /* GL_MODELVIEW2_ARB */ + { 17485, 0x0000873E }, /* GL_MODELVIEW30_ARB */ + { 17504, 0x0000873F }, /* GL_MODELVIEW31_ARB */ + { 17523, 0x00008723 }, /* GL_MODELVIEW3_ARB */ + { 17541, 0x00008724 }, /* GL_MODELVIEW4_ARB */ + { 17559, 0x00008725 }, /* GL_MODELVIEW5_ARB */ + { 17577, 0x00008726 }, /* GL_MODELVIEW6_ARB */ + { 17595, 0x00008727 }, /* GL_MODELVIEW7_ARB */ + { 17613, 0x00008728 }, /* GL_MODELVIEW8_ARB */ + { 17631, 0x00008729 }, /* GL_MODELVIEW9_ARB */ + { 17649, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */ + { 17669, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */ + { 17696, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */ + { 17721, 0x00002100 }, /* GL_MODULATE */ + { 17733, 0x00008744 }, /* GL_MODULATE_ADD_ATI */ + { 17753, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */ + { 17780, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */ + { 17805, 0x00000103 }, /* GL_MULT */ + { 17813, 0x0000809D }, /* GL_MULTISAMPLE */ + { 17828, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */ + { 17848, 0x0000809D }, /* GL_MULTISAMPLE_ARB */ + { 17867, 0x20000000 }, /* GL_MULTISAMPLE_BIT */ + { 17886, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */ + { 17910, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */ + { 17933, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */ + { 17963, 0x00002A25 }, /* GL_N3F_V3F */ + { 17974, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */ + { 17994, 0x0000150E }, /* GL_NAND */ + { 18002, 0x00002600 }, /* GL_NEAREST */ + { 18013, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */ + { 18044, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */ + { 18076, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */ + { 18101, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */ + { 18127, 0x00000200 }, /* GL_NEVER */ + { 18136, 0x00001102 }, /* GL_NICEST */ + { 18146, 0x00000000 }, /* GL_NONE */ + { 18154, 0x00001505 }, /* GL_NOOP */ + { 18162, 0x00001508 }, /* GL_NOR */ + { 18169, 0x00000BA1 }, /* GL_NORMALIZE */ + { 18182, 0x00008075 }, /* GL_NORMAL_ARRAY */ + { 18198, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */ + { 18229, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */ + { 18264, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */ + { 18288, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */ + { 18311, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */ + { 18332, 0x00008511 }, /* GL_NORMAL_MAP */ + { 18346, 0x00008511 }, /* GL_NORMAL_MAP_ARB */ + { 18364, 0x00008511 }, /* GL_NORMAL_MAP_NV */ + { 18381, 0x00000205 }, /* GL_NOTEQUAL */ + { 18393, 0x00000000 }, /* GL_NO_ERROR */ + { 18405, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */ + { 18439, 0x000086A2 }, /* GL_NUM_TEXTURE_COMPRESSED_FORMATS_ARB */ + { 18477, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */ + { 18509, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */ + { 18551, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */ + { 18581, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */ + { 18621, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */ + { 18652, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */ + { 18681, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */ + { 18709, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */ + { 18739, 0x00002401 }, /* GL_OBJECT_LINEAR */ + { 18756, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */ + { 18782, 0x00002501 }, /* GL_OBJECT_PLANE */ + { 18798, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */ + { 18833, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */ + { 18855, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */ + { 18874, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */ + { 18904, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */ + { 18925, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */ + { 18953, 0x00000001 }, /* GL_ONE */ + { 18960, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */ + { 18988, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */ + { 19020, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */ + { 19048, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */ + { 19080, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */ + { 19103, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */ + { 19126, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */ + { 19149, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */ + { 19172, 0x00008598 }, /* GL_OPERAND0_ALPHA */ + { 19190, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */ + { 19212, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */ + { 19234, 0x00008590 }, /* GL_OPERAND0_RGB */ + { 19250, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */ + { 19270, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */ + { 19290, 0x00008599 }, /* GL_OPERAND1_ALPHA */ + { 19308, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */ + { 19330, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */ + { 19352, 0x00008591 }, /* GL_OPERAND1_RGB */ + { 19368, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */ + { 19388, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */ + { 19408, 0x0000859A }, /* GL_OPERAND2_ALPHA */ + { 19426, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */ + { 19448, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */ + { 19470, 0x00008592 }, /* GL_OPERAND2_RGB */ + { 19486, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */ + { 19506, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */ + { 19526, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */ + { 19547, 0x00008593 }, /* GL_OPERAND3_RGB_NV */ + { 19566, 0x00001507 }, /* GL_OR */ + { 19572, 0x00000A01 }, /* GL_ORDER */ + { 19581, 0x0000150D }, /* GL_OR_INVERTED */ + { 19596, 0x0000150B }, /* GL_OR_REVERSE */ + { 19610, 0x00000505 }, /* GL_OUT_OF_MEMORY */ + { 19627, 0x00000D05 }, /* GL_PACK_ALIGNMENT */ + { 19645, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */ + { 19666, 0x00008758 }, /* GL_PACK_INVERT_MESA */ + { 19686, 0x00000D01 }, /* GL_PACK_LSB_FIRST */ + { 19704, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */ + { 19723, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */ + { 19743, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */ + { 19763, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */ + { 19781, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */ + { 19800, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */ + { 19825, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */ + { 19849, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */ + { 19870, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */ + { 19892, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */ + { 19914, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */ + { 19939, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */ + { 19963, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */ + { 19984, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */ + { 20006, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */ + { 20028, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */ + { 20050, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */ + { 20081, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */ + { 20101, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */ + { 20126, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */ + { 20146, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */ + { 20171, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */ + { 20191, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */ + { 20216, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */ + { 20236, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */ + { 20261, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */ + { 20281, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */ + { 20306, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */ + { 20326, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */ + { 20351, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */ + { 20371, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */ + { 20396, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */ + { 20416, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */ + { 20441, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */ + { 20461, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */ + { 20486, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */ + { 20506, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */ + { 20531, 0x00000020 }, /* GL_PIXEL_MODE_BIT */ + { 20549, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */ + { 20582, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */ + { 20607, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */ + { 20642, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */ + { 20669, 0x00001B00 }, /* GL_POINT */ + { 20678, 0x00000000 }, /* GL_POINTS */ + { 20688, 0x00000002 }, /* GL_POINT_BIT */ + { 20701, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */ + { 20731, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */ + { 20765, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */ + { 20799, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */ + { 20834, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */ + { 20863, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */ + { 20896, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */ + { 20929, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */ + { 20963, 0x00000B11 }, /* GL_POINT_SIZE */ + { 20977, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */ + { 21003, 0x00008127 }, /* GL_POINT_SIZE_MAX */ + { 21021, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */ + { 21043, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */ + { 21065, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */ + { 21088, 0x00008126 }, /* GL_POINT_SIZE_MIN */ + { 21106, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */ + { 21128, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */ + { 21150, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */ + { 21173, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */ + { 21193, 0x00000B10 }, /* GL_POINT_SMOOTH */ + { 21209, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */ + { 21230, 0x00008861 }, /* GL_POINT_SPRITE_ARB */ + { 21250, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */ + { 21279, 0x00008861 }, /* GL_POINT_SPRITE_NV */ + { 21298, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */ + { 21324, 0x00000701 }, /* GL_POINT_TOKEN */ + { 21339, 0x00000009 }, /* GL_POLYGON */ + { 21350, 0x00000008 }, /* GL_POLYGON_BIT */ + { 21365, 0x00000B40 }, /* GL_POLYGON_MODE */ + { 21381, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */ + { 21404, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */ + { 21429, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */ + { 21452, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */ + { 21475, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */ + { 21499, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */ + { 21523, 0x00000B41 }, /* GL_POLYGON_SMOOTH */ + { 21541, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */ + { 21564, 0x00000B42 }, /* GL_POLYGON_STIPPLE */ + { 21583, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */ + { 21606, 0x00000703 }, /* GL_POLYGON_TOKEN */ + { 21623, 0x00001203 }, /* GL_POSITION */ + { 21635, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */ + { 21667, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */ + { 21703, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */ + { 21736, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */ + { 21773, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */ + { 21804, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */ + { 21839, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */ + { 21871, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */ + { 21907, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */ + { 21940, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */ + { 21972, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */ + { 22008, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */ + { 22041, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */ + { 22078, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */ + { 22108, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */ + { 22142, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */ + { 22173, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */ + { 22208, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */ + { 22239, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */ + { 22274, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */ + { 22306, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */ + { 22342, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */ + { 22372, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */ + { 22406, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */ + { 22437, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */ + { 22472, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */ + { 22504, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */ + { 22535, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */ + { 22570, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */ + { 22602, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */ + { 22638, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */ + { 22667, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */ + { 22700, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */ + { 22730, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */ + { 22764, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */ + { 22803, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */ + { 22836, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */ + { 22876, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */ + { 22910, 0x00008578 }, /* GL_PREVIOUS */ + { 22922, 0x00008578 }, /* GL_PREVIOUS_ARB */ + { 22938, 0x00008578 }, /* GL_PREVIOUS_EXT */ + { 22954, 0x00008577 }, /* GL_PRIMARY_COLOR */ + { 22971, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */ + { 22992, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */ + { 23013, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */ + { 23046, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */ + { 23078, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */ + { 23101, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */ + { 23124, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */ + { 23154, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */ + { 23183, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */ + { 23211, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */ + { 23233, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */ + { 23261, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */ + { 23289, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */ + { 23311, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */ + { 23332, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ + { 23372, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ + { 23411, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */ + { 23441, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ + { 23476, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */ + { 23509, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */ + { 23543, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ + { 23582, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ + { 23621, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */ + { 23643, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */ + { 23669, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */ + { 23693, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */ + { 23716, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */ + { 23738, 0x00008628 }, /* GL_PROGRAM_STRING_NV */ + { 23759, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */ + { 23780, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */ + { 23807, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */ + { 23839, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */ + { 23871, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */ + { 23906, 0x00001701 }, /* GL_PROJECTION */ + { 23920, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */ + { 23941, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */ + { 23967, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */ + { 23988, 0x00008025 }, /* GL_PROXY_HISTOGRAM */ + { 24007, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */ + { 24030, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */ + { 24069, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */ + { 24107, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */ + { 24127, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */ + { 24151, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */ + { 24171, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */ + { 24195, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */ + { 24215, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */ + { 24248, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */ + { 24274, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */ + { 24304, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */ + { 24335, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */ + { 24365, 0x00002003 }, /* GL_Q */ + { 24370, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */ + { 24395, 0x00000007 }, /* GL_QUADS */ + { 24404, 0x00008614 }, /* GL_QUAD_MESH_SUN */ + { 24421, 0x00000008 }, /* GL_QUAD_STRIP */ + { 24435, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */ + { 24457, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */ + { 24483, 0x00008866 }, /* GL_QUERY_RESULT */ + { 24499, 0x00008866 }, /* GL_QUERY_RESULT_ARB */ + { 24519, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */ + { 24545, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */ + { 24575, 0x00002002 }, /* GL_R */ + { 24580, 0x00002A10 }, /* GL_R3_G3_B2 */ + { 24592, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */ + { 24625, 0x00000C02 }, /* GL_READ_BUFFER */ + { 24640, 0x000088B8 }, /* GL_READ_ONLY */ + { 24653, 0x000088B8 }, /* GL_READ_ONLY_ARB */ + { 24670, 0x000088BA }, /* GL_READ_WRITE */ + { 24684, 0x000088BA }, /* GL_READ_WRITE_ARB */ + { 24702, 0x00001903 }, /* GL_RED */ + { 24709, 0x00008016 }, /* GL_REDUCE */ + { 24719, 0x00008016 }, /* GL_REDUCE_EXT */ + { 24733, 0x00000D15 }, /* GL_RED_BIAS */ + { 24745, 0x00000D52 }, /* GL_RED_BITS */ + { 24757, 0x00000D14 }, /* GL_RED_SCALE */ + { 24770, 0x00008512 }, /* GL_REFLECTION_MAP */ + { 24788, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */ + { 24810, 0x00008512 }, /* GL_REFLECTION_MAP_NV */ + { 24831, 0x00001C00 }, /* GL_RENDER */ + { 24841, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */ + { 24869, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */ + { 24889, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */ + { 24916, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */ + { 24952, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */ + { 24978, 0x00001F01 }, /* GL_RENDERER */ + { 24990, 0x00000C40 }, /* GL_RENDER_MODE */ + { 25005, 0x00002901 }, /* GL_REPEAT */ + { 25015, 0x00001E01 }, /* GL_REPLACE */ + { 25026, 0x00008062 }, /* GL_REPLACE_EXT */ + { 25041, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */ + { 25064, 0x0000803A }, /* GL_RESCALE_NORMAL */ + { 25082, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */ + { 25104, 0x00000102 }, /* GL_RETURN */ + { 25114, 0x00001907 }, /* GL_RGB */ + { 25121, 0x00008052 }, /* GL_RGB10 */ + { 25130, 0x00008059 }, /* GL_RGB10_A2 */ + { 25142, 0x00008059 }, /* GL_RGB10_A2_EXT */ + { 25158, 0x00008052 }, /* GL_RGB10_EXT */ + { 25171, 0x00008053 }, /* GL_RGB12 */ + { 25180, 0x00008053 }, /* GL_RGB12_EXT */ + { 25193, 0x00008054 }, /* GL_RGB16 */ + { 25202, 0x00008054 }, /* GL_RGB16_EXT */ + { 25215, 0x0000804E }, /* GL_RGB2_EXT */ + { 25227, 0x0000804F }, /* GL_RGB4 */ + { 25235, 0x0000804F }, /* GL_RGB4_EXT */ + { 25247, 0x000083A1 }, /* GL_RGB4_S3TC */ + { 25260, 0x00008050 }, /* GL_RGB5 */ + { 25268, 0x00008057 }, /* GL_RGB5_A1 */ + { 25279, 0x00008057 }, /* GL_RGB5_A1_EXT */ + { 25294, 0x00008050 }, /* GL_RGB5_EXT */ + { 25306, 0x00008051 }, /* GL_RGB8 */ + { 25314, 0x00008051 }, /* GL_RGB8_EXT */ + { 25326, 0x00001908 }, /* GL_RGBA */ + { 25334, 0x0000805A }, /* GL_RGBA12 */ + { 25344, 0x0000805A }, /* GL_RGBA12_EXT */ + { 25358, 0x0000805B }, /* GL_RGBA16 */ + { 25368, 0x0000805B }, /* GL_RGBA16_EXT */ + { 25382, 0x00008055 }, /* GL_RGBA2 */ + { 25391, 0x00008055 }, /* GL_RGBA2_EXT */ + { 25404, 0x00008056 }, /* GL_RGBA4 */ + { 25413, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */ + { 25432, 0x00008056 }, /* GL_RGBA4_EXT */ + { 25445, 0x000083A3 }, /* GL_RGBA4_S3TC */ + { 25459, 0x00008058 }, /* GL_RGBA8 */ + { 25468, 0x00008058 }, /* GL_RGBA8_EXT */ + { 25481, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */ + { 25499, 0x00000C31 }, /* GL_RGBA_MODE */ + { 25512, 0x000083A2 }, /* GL_RGBA_S3TC */ + { 25525, 0x000083A0 }, /* GL_RGB_S3TC */ + { 25537, 0x00008573 }, /* GL_RGB_SCALE */ + { 25550, 0x00008573 }, /* GL_RGB_SCALE_ARB */ + { 25567, 0x00008573 }, /* GL_RGB_SCALE_EXT */ + { 25584, 0x00000407 }, /* GL_RIGHT */ + { 25593, 0x00002000 }, /* GL_S */ + { 25598, 0x000080A9 }, /* GL_SAMPLES */ + { 25609, 0x000086B4 }, /* GL_SAMPLES_3DFX */ + { 25625, 0x000080A9 }, /* GL_SAMPLES_ARB */ + { 25640, 0x00008914 }, /* GL_SAMPLES_PASSED */ + { 25658, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */ + { 25680, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */ + { 25708, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */ + { 25740, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */ + { 25763, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */ + { 25790, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */ + { 25808, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */ + { 25831, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */ + { 25853, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */ + { 25872, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */ + { 25895, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */ + { 25921, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */ + { 25951, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */ + { 25976, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */ + { 26005, 0x00080000 }, /* GL_SCISSOR_BIT */ + { 26020, 0x00000C10 }, /* GL_SCISSOR_BOX */ + { 26035, 0x00000C11 }, /* GL_SCISSOR_TEST */ + { 26051, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */ + { 26076, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */ + { 26116, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */ + { 26160, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */ + { 26193, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */ + { 26223, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */ + { 26255, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */ + { 26285, 0x00001C02 }, /* GL_SELECT */ + { 26295, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */ + { 26323, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */ + { 26348, 0x00008012 }, /* GL_SEPARABLE_2D */ + { 26364, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */ + { 26391, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */ + { 26422, 0x0000150F }, /* GL_SET */ + { 26429, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */ + { 26450, 0x00000B54 }, /* GL_SHADE_MODEL */ + { 26465, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */ + { 26488, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */ + { 26518, 0x00001601 }, /* GL_SHININESS */ + { 26531, 0x00001402 }, /* GL_SHORT */ + { 26540, 0x000081F9 }, /* GL_SINGLE_COLOR */ + { 26556, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */ + { 26576, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */ + { 26595, 0x00001D01 }, /* GL_SMOOTH */ + { 26605, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */ + { 26638, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */ + { 26665, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */ + { 26698, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */ + { 26725, 0x00008588 }, /* GL_SOURCE0_ALPHA */ + { 26742, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */ + { 26763, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */ + { 26784, 0x00008580 }, /* GL_SOURCE0_RGB */ + { 26799, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */ + { 26818, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */ + { 26837, 0x00008589 }, /* GL_SOURCE1_ALPHA */ + { 26854, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */ + { 26875, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */ + { 26896, 0x00008581 }, /* GL_SOURCE1_RGB */ + { 26911, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */ + { 26930, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */ + { 26949, 0x0000858A }, /* GL_SOURCE2_ALPHA */ + { 26966, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */ + { 26987, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */ + { 27008, 0x00008582 }, /* GL_SOURCE2_RGB */ + { 27023, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */ + { 27042, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */ + { 27061, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */ + { 27081, 0x00008583 }, /* GL_SOURCE3_RGB_NV */ + { 27099, 0x00001202 }, /* GL_SPECULAR */ + { 27111, 0x00002402 }, /* GL_SPHERE_MAP */ + { 27125, 0x00001206 }, /* GL_SPOT_CUTOFF */ + { 27140, 0x00001204 }, /* GL_SPOT_DIRECTION */ + { 27158, 0x00001205 }, /* GL_SPOT_EXPONENT */ + { 27175, 0x00008588 }, /* GL_SRC0_ALPHA */ + { 27189, 0x00008580 }, /* GL_SRC0_RGB */ + { 27201, 0x00008589 }, /* GL_SRC1_ALPHA */ + { 27215, 0x00008581 }, /* GL_SRC1_RGB */ + { 27227, 0x0000858A }, /* GL_SRC2_ALPHA */ + { 27241, 0x00008582 }, /* GL_SRC2_RGB */ + { 27253, 0x00000302 }, /* GL_SRC_ALPHA */ + { 27266, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */ + { 27288, 0x00000300 }, /* GL_SRC_COLOR */ + { 27301, 0x00000503 }, /* GL_STACK_OVERFLOW */ + { 27319, 0x00000504 }, /* GL_STACK_UNDERFLOW */ + { 27338, 0x000088E6 }, /* GL_STATIC_COPY */ + { 27353, 0x000088E6 }, /* GL_STATIC_COPY_ARB */ + { 27372, 0x000088E4 }, /* GL_STATIC_DRAW */ + { 27387, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */ + { 27406, 0x000088E5 }, /* GL_STATIC_READ */ + { 27421, 0x000088E5 }, /* GL_STATIC_READ_ARB */ + { 27440, 0x00001802 }, /* GL_STENCIL */ + { 27451, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */ + { 27477, 0x00000D57 }, /* GL_STENCIL_BITS */ + { 27493, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */ + { 27515, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */ + { 27538, 0x00000B94 }, /* GL_STENCIL_FAIL */ + { 27554, 0x00000B92 }, /* GL_STENCIL_FUNC */ + { 27570, 0x00001901 }, /* GL_STENCIL_INDEX */ + { 27587, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */ + { 27610, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */ + { 27632, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */ + { 27654, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */ + { 27676, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */ + { 27697, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */ + { 27724, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */ + { 27751, 0x00000B97 }, /* GL_STENCIL_REF */ + { 27766, 0x00000B90 }, /* GL_STENCIL_TEST */ + { 27782, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */ + { 27811, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */ + { 27833, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */ + { 27854, 0x00000C33 }, /* GL_STEREO */ + { 27864, 0x000088E2 }, /* GL_STREAM_COPY */ + { 27879, 0x000088E2 }, /* GL_STREAM_COPY_ARB */ + { 27898, 0x000088E0 }, /* GL_STREAM_DRAW */ + { 27913, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */ + { 27932, 0x000088E1 }, /* GL_STREAM_READ */ + { 27947, 0x000088E1 }, /* GL_STREAM_READ_ARB */ + { 27966, 0x00000D50 }, /* GL_SUBPIXEL_BITS */ + { 27983, 0x000084E7 }, /* GL_SUBTRACT */ + { 27995, 0x000084E7 }, /* GL_SUBTRACT_ARB */ + { 28011, 0x00002001 }, /* GL_T */ + { 28016, 0x00002A2A }, /* GL_T2F_C3F_V3F */ + { 28031, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */ + { 28050, 0x00002A29 }, /* GL_T2F_C4UB_V3F */ + { 28066, 0x00002A2B }, /* GL_T2F_N3F_V3F */ + { 28081, 0x00002A27 }, /* GL_T2F_V3F */ + { 28092, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */ + { 28111, 0x00002A28 }, /* GL_T4F_V4F */ + { 28122, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */ + { 28145, 0x00001702 }, /* GL_TEXTURE */ + { 28156, 0x000084C0 }, /* GL_TEXTURE0 */ + { 28168, 0x000084C0 }, /* GL_TEXTURE0_ARB */ + { 28184, 0x000084C1 }, /* GL_TEXTURE1 */ + { 28196, 0x000084CA }, /* GL_TEXTURE10 */ + { 28209, 0x000084CA }, /* GL_TEXTURE10_ARB */ + { 28226, 0x000084CB }, /* GL_TEXTURE11 */ + { 28239, 0x000084CB }, /* GL_TEXTURE11_ARB */ + { 28256, 0x000084CC }, /* GL_TEXTURE12 */ + { 28269, 0x000084CC }, /* GL_TEXTURE12_ARB */ + { 28286, 0x000084CD }, /* GL_TEXTURE13 */ + { 28299, 0x000084CD }, /* GL_TEXTURE13_ARB */ + { 28316, 0x000084CE }, /* GL_TEXTURE14 */ + { 28329, 0x000084CE }, /* GL_TEXTURE14_ARB */ + { 28346, 0x000084CF }, /* GL_TEXTURE15 */ + { 28359, 0x000084CF }, /* GL_TEXTURE15_ARB */ + { 28376, 0x000084D0 }, /* GL_TEXTURE16 */ + { 28389, 0x000084D0 }, /* GL_TEXTURE16_ARB */ + { 28406, 0x000084D1 }, /* GL_TEXTURE17 */ + { 28419, 0x000084D1 }, /* GL_TEXTURE17_ARB */ + { 28436, 0x000084D2 }, /* GL_TEXTURE18 */ + { 28449, 0x000084D2 }, /* GL_TEXTURE18_ARB */ + { 28466, 0x000084D3 }, /* GL_TEXTURE19 */ + { 28479, 0x000084D3 }, /* GL_TEXTURE19_ARB */ + { 28496, 0x000084C1 }, /* GL_TEXTURE1_ARB */ + { 28512, 0x000084C2 }, /* GL_TEXTURE2 */ + { 28524, 0x000084D4 }, /* GL_TEXTURE20 */ + { 28537, 0x000084D4 }, /* GL_TEXTURE20_ARB */ + { 28554, 0x000084D5 }, /* GL_TEXTURE21 */ + { 28567, 0x000084D5 }, /* GL_TEXTURE21_ARB */ + { 28584, 0x000084D6 }, /* GL_TEXTURE22 */ + { 28597, 0x000084D6 }, /* GL_TEXTURE22_ARB */ + { 28614, 0x000084D7 }, /* GL_TEXTURE23 */ + { 28627, 0x000084D7 }, /* GL_TEXTURE23_ARB */ + { 28644, 0x000084D8 }, /* GL_TEXTURE24 */ + { 28657, 0x000084D8 }, /* GL_TEXTURE24_ARB */ + { 28674, 0x000084D9 }, /* GL_TEXTURE25 */ + { 28687, 0x000084D9 }, /* GL_TEXTURE25_ARB */ + { 28704, 0x000084DA }, /* GL_TEXTURE26 */ + { 28717, 0x000084DA }, /* GL_TEXTURE26_ARB */ + { 28734, 0x000084DB }, /* GL_TEXTURE27 */ + { 28747, 0x000084DB }, /* GL_TEXTURE27_ARB */ + { 28764, 0x000084DC }, /* GL_TEXTURE28 */ + { 28777, 0x000084DC }, /* GL_TEXTURE28_ARB */ + { 28794, 0x000084DD }, /* GL_TEXTURE29 */ + { 28807, 0x000084DD }, /* GL_TEXTURE29_ARB */ + { 28824, 0x000084C2 }, /* GL_TEXTURE2_ARB */ + { 28840, 0x000084C3 }, /* GL_TEXTURE3 */ + { 28852, 0x000084DE }, /* GL_TEXTURE30 */ + { 28865, 0x000084DE }, /* GL_TEXTURE30_ARB */ + { 28882, 0x000084DF }, /* GL_TEXTURE31 */ + { 28895, 0x000084DF }, /* GL_TEXTURE31_ARB */ + { 28912, 0x000084C3 }, /* GL_TEXTURE3_ARB */ + { 28928, 0x000084C4 }, /* GL_TEXTURE4 */ + { 28940, 0x000084C4 }, /* GL_TEXTURE4_ARB */ + { 28956, 0x000084C5 }, /* GL_TEXTURE5 */ + { 28968, 0x000084C5 }, /* GL_TEXTURE5_ARB */ + { 28984, 0x000084C6 }, /* GL_TEXTURE6 */ + { 28996, 0x000084C6 }, /* GL_TEXTURE6_ARB */ + { 29012, 0x000084C7 }, /* GL_TEXTURE7 */ + { 29024, 0x000084C7 }, /* GL_TEXTURE7_ARB */ + { 29040, 0x000084C8 }, /* GL_TEXTURE8 */ + { 29052, 0x000084C8 }, /* GL_TEXTURE8_ARB */ + { 29068, 0x000084C9 }, /* GL_TEXTURE9 */ + { 29080, 0x000084C9 }, /* GL_TEXTURE9_ARB */ + { 29096, 0x00000DE0 }, /* GL_TEXTURE_1D */ + { 29110, 0x00000DE1 }, /* GL_TEXTURE_2D */ + { 29124, 0x0000806F }, /* GL_TEXTURE_3D */ + { 29138, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */ + { 29160, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */ + { 29186, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */ + { 29208, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */ + { 29230, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */ + { 29252, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */ + { 29274, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */ + { 29302, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */ + { 29334, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */ + { 29367, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */ + { 29399, 0x00040000 }, /* GL_TEXTURE_BIT */ + { 29414, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */ + { 29435, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */ + { 29460, 0x00001005 }, /* GL_TEXTURE_BORDER */ + { 29478, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */ + { 29502, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */ + { 29533, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */ + { 29563, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */ + { 29593, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */ + { 29628, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */ + { 29659, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */ + { 29697, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */ + { 29724, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */ + { 29756, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ + { 29790, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */ + { 29814, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */ + { 29842, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */ + { 29866, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */ + { 29894, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */ + { 29927, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */ + { 29951, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */ + { 29973, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */ + { 29995, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */ + { 30021, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */ + { 30055, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */ + { 30088, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */ + { 30125, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */ + { 30153, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */ + { 30185, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */ + { 30208, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */ + { 30246, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */ + { 30288, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */ + { 30319, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */ + { 30347, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */ + { 30377, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */ + { 30405, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */ + { 30425, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */ + { 30449, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */ + { 30480, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */ + { 30515, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */ + { 30546, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */ + { 30581, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */ + { 30612, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */ + { 30647, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */ + { 30678, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */ + { 30713, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */ + { 30744, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */ + { 30779, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ + { 30810, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */ + { 30845, 0x00008071 }, /* GL_TEXTURE_DEPTH */ + { 30862, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */ + { 30884, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */ + { 30910, 0x00002300 }, /* GL_TEXTURE_ENV */ + { 30925, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */ + { 30946, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */ + { 30966, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */ + { 30992, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */ + { 31012, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */ + { 31029, 0x00000C62 }, /* GL_TEXTURE_GEN_R */ + { 31046, 0x00000C60 }, /* GL_TEXTURE_GEN_S */ + { 31063, 0x00000C61 }, /* GL_TEXTURE_GEN_T */ + { 31080, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */ + { 31105, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */ + { 31127, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */ + { 31153, 0x00001001 }, /* GL_TEXTURE_HEIGHT */ + { 31171, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */ + { 31197, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */ + { 31223, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */ + { 31253, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */ + { 31280, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */ + { 31305, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */ + { 31325, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */ + { 31349, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */ + { 31376, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */ + { 31403, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */ + { 31430, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */ + { 31456, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */ + { 31486, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */ + { 31508, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */ + { 31526, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */ + { 31556, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */ + { 31584, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */ + { 31612, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */ + { 31640, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */ + { 31661, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */ + { 31680, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */ + { 31702, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */ + { 31721, 0x00008066 }, /* GL_TEXTURE_PRIORITY */ + { 31741, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */ + { 31766, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */ + { 31790, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */ + { 31810, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */ + { 31834, 0x00008067 }, /* GL_TEXTURE_RESIDENT */ + { 31854, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */ + { 31877, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */ + { 31902, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */ + { 31936, 0x00001000 }, /* GL_TEXTURE_WIDTH */ + { 31953, 0x00008072 }, /* GL_TEXTURE_WRAP_R */ + { 31971, 0x00002802 }, /* GL_TEXTURE_WRAP_S */ + { 31989, 0x00002803 }, /* GL_TEXTURE_WRAP_T */ + { 32007, 0x00008648 }, /* GL_TRACK_MATRIX_NV */ + { 32026, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */ + { 32055, 0x00001000 }, /* GL_TRANSFORM_BIT */ + { 32072, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */ + { 32098, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */ + { 32128, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */ + { 32160, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */ + { 32190, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */ + { 32224, 0x0000862C }, /* GL_TRANSPOSE_NV */ + { 32240, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */ + { 32271, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */ + { 32306, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */ + { 32334, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */ + { 32366, 0x00000004 }, /* GL_TRIANGLES */ + { 32379, 0x00000006 }, /* GL_TRIANGLE_FAN */ + { 32395, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */ + { 32416, 0x00000005 }, /* GL_TRIANGLE_STRIP */ + { 32434, 0x00000001 }, /* GL_TRUE */ + { 32442, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */ + { 32462, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */ + { 32485, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */ + { 32505, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */ + { 32526, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */ + { 32548, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */ + { 32570, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */ + { 32590, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */ + { 32611, 0x00001401 }, /* GL_UNSIGNED_BYTE */ + { 32628, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */ + { 32655, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */ + { 32678, 0x00001405 }, /* GL_UNSIGNED_INT */ + { 32694, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */ + { 32721, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */ + { 32745, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */ + { 32776, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */ + { 32800, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */ + { 32828, 0x00001403 }, /* GL_UNSIGNED_SHORT */ + { 32846, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */ + { 32876, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */ + { 32902, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */ + { 32932, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */ + { 32958, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */ + { 32982, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */ + { 33010, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */ + { 33038, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */ + { 33065, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */ + { 33097, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */ + { 33128, 0x00002A20 }, /* GL_V2F */ + { 33135, 0x00002A21 }, /* GL_V3F */ + { 33142, 0x00001F00 }, /* GL_VENDOR */ + { 33152, 0x00001F02 }, /* GL_VERSION */ + { 33163, 0x00008074 }, /* GL_VERTEX_ARRAY */ + { 33179, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */ + { 33210, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */ + { 33245, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */ + { 33269, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */ + { 33290, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */ + { 33313, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */ + { 33334, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */ + { 33361, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */ + { 33389, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */ + { 33417, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */ + { 33445, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */ + { 33473, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */ + { 33501, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */ + { 33529, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */ + { 33556, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */ + { 33583, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */ + { 33610, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */ + { 33637, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */ + { 33664, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */ + { 33691, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */ + { 33718, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */ + { 33745, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */ + { 33772, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */ + { 33810, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */ + { 33852, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */ + { 33887, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */ + { 33925, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */ + { 33960, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */ + { 33992, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */ + { 34026, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */ + { 34058, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */ + { 34078, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */ + { 34100, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */ + { 34129, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */ + { 34150, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */ + { 34183, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */ + { 34215, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */ + { 34246, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */ + { 34276, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */ + { 34297, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */ + { 34324, 0x00000BA2 }, /* GL_VIEWPORT */ + { 34336, 0x00000800 }, /* GL_VIEWPORT_BIT */ + { 34352, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */ + { 34372, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */ + { 34403, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */ + { 34438, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */ + { 34466, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */ + { 34491, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */ + { 34518, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */ + { 34543, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */ + { 34567, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */ + { 34586, 0x000088B9 }, /* GL_WRITE_ONLY */ + { 34600, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */ + { 34618, 0x00001506 }, /* GL_XOR */ + { 34625, 0x000085B9 }, /* GL_YCBCR_422_APPLE */ + { 34644, 0x00008757 }, /* GL_YCBCR_MESA */ + { 34658, 0x00000000 }, /* GL_ZERO */ + { 34666, 0x00000D16 }, /* GL_ZOOM_X */ + { 34676, 0x00000D17 }, /* GL_ZOOM_Y */ }; -static const unsigned reduced_enums[1233] = +static const unsigned reduced_enums[1236] = { 26, /* GL_ALL_CLIENT_ATTRIB_BITS */ 389, /* GL_FALSE */ - 562, /* GL_LINES */ - 564, /* GL_LINE_LOOP */ - 571, /* GL_LINE_STRIP */ - 1516, /* GL_TRIANGLES */ - 1519, /* GL_TRIANGLE_STRIP */ - 1517, /* GL_TRIANGLE_FAN */ - 1113, /* GL_QUADS */ - 1115, /* GL_QUAD_STRIP */ - 1003, /* GL_POLYGON */ - 1015, /* GL_POLYGON_STIPPLE_BIT */ - 969, /* GL_PIXEL_MODE_BIT */ - 549, /* GL_LIGHTING_BIT */ + 566, /* GL_LINES */ + 568, /* GL_LINE_LOOP */ + 575, /* GL_LINE_STRIP */ + 1520, /* GL_TRIANGLES */ + 1523, /* GL_TRIANGLE_STRIP */ + 1521, /* GL_TRIANGLE_FAN */ + 1117, /* GL_QUADS */ + 1119, /* GL_QUAD_STRIP */ + 1007, /* GL_POLYGON */ + 1019, /* GL_POLYGON_STIPPLE_BIT */ + 973, /* GL_PIXEL_MODE_BIT */ + 553, /* GL_LIGHTING_BIT */ 405, /* GL_FOG_BIT */ 8, /* GL_ACCUM */ - 580, /* GL_LOAD */ - 1153, /* GL_RETURN */ - 842, /* GL_MULT */ + 584, /* GL_LOAD */ + 1157, /* GL_RETURN */ + 846, /* GL_MULT */ 19, /* GL_ADD */ - 858, /* GL_NEVER */ - 539, /* GL_LESS */ + 862, /* GL_NEVER */ + 543, /* GL_LESS */ 379, /* GL_EQUAL */ - 538, /* GL_LEQUAL */ - 468, /* GL_GREATER */ - 873, /* GL_NOTEQUAL */ + 542, /* GL_LEQUAL */ + 472, /* GL_GREATER */ + 877, /* GL_NOTEQUAL */ 466, /* GL_GEQUAL */ 42, /* GL_ALWAYS */ - 1277, /* GL_SRC_COLOR */ - 902, /* GL_ONE_MINUS_SRC_COLOR */ - 1275, /* GL_SRC_ALPHA */ - 901, /* GL_ONE_MINUS_SRC_ALPHA */ + 1281, /* GL_SRC_COLOR */ + 906, /* GL_ONE_MINUS_SRC_COLOR */ + 1279, /* GL_SRC_ALPHA */ + 905, /* GL_ONE_MINUS_SRC_ALPHA */ 359, /* GL_DST_ALPHA */ - 899, /* GL_ONE_MINUS_DST_ALPHA */ + 903, /* GL_ONE_MINUS_DST_ALPHA */ 360, /* GL_DST_COLOR */ - 900, /* GL_ONE_MINUS_DST_COLOR */ - 1276, /* GL_SRC_ALPHA_SATURATE */ + 904, /* GL_ONE_MINUS_DST_COLOR */ + 1280, /* GL_SRC_ALPHA_SATURATE */ 454, /* GL_FRONT_LEFT */ 455, /* GL_FRONT_RIGHT */ 64, /* GL_BACK_LEFT */ 65, /* GL_BACK_RIGHT */ 451, /* GL_FRONT */ 63, /* GL_BACK */ - 537, /* GL_LEFT */ - 1193, /* GL_RIGHT */ + 541, /* GL_LEFT */ + 1197, /* GL_RIGHT */ 452, /* GL_FRONT_AND_BACK */ 58, /* GL_AUX0 */ 59, /* GL_AUX1 */ 60, /* GL_AUX2 */ 61, /* GL_AUX3 */ - 529, /* GL_INVALID_ENUM */ - 532, /* GL_INVALID_VALUE */ - 531, /* GL_INVALID_OPERATION */ - 1278, /* GL_STACK_OVERFLOW */ - 1279, /* GL_STACK_UNDERFLOW */ - 927, /* GL_OUT_OF_MEMORY */ - 530, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */ + 533, /* GL_INVALID_ENUM */ + 536, /* GL_INVALID_VALUE */ + 535, /* GL_INVALID_OPERATION */ + 1282, /* GL_STACK_OVERFLOW */ + 1283, /* GL_STACK_UNDERFLOW */ + 931, /* GL_OUT_OF_MEMORY */ + 534, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */ 0, /* GL_2D */ 2, /* GL_3D */ 3, /* GL_3D_COLOR */ 4, /* GL_3D_COLOR_TEXTURE */ 6, /* GL_4D_COLOR_TEXTURE */ - 947, /* GL_PASS_THROUGH_TOKEN */ - 1002, /* GL_POINT_TOKEN */ - 572, /* GL_LINE_TOKEN */ - 1016, /* GL_POLYGON_TOKEN */ + 951, /* GL_PASS_THROUGH_TOKEN */ + 1006, /* GL_POINT_TOKEN */ + 576, /* GL_LINE_TOKEN */ + 1020, /* GL_POLYGON_TOKEN */ 69, /* GL_BITMAP_TOKEN */ 358, /* GL_DRAW_PIXEL_TOKEN */ 248, /* GL_COPY_PIXEL_TOKEN */ - 565, /* GL_LINE_RESET_TOKEN */ + 569, /* GL_LINE_RESET_TOKEN */ 382, /* GL_EXP */ 383, /* GL_EXP2 */ 279, /* GL_CW */ 106, /* GL_CCW */ 127, /* GL_COEFF */ - 924, /* GL_ORDER */ + 928, /* GL_ORDER */ 315, /* GL_DOMAIN */ 256, /* GL_CURRENT_COLOR */ 259, /* GL_CURRENT_INDEX */ @@ -3356,33 +3364,33 @@ static const unsigned reduced_enums[1233] = 272, /* GL_CURRENT_RASTER_POSITION */ 273, /* GL_CURRENT_RASTER_POSITION_VALID */ 270, /* GL_CURRENT_RASTER_DISTANCE */ - 996, /* GL_POINT_SMOOTH */ - 985, /* GL_POINT_SIZE */ - 995, /* GL_POINT_SIZE_RANGE */ - 986, /* GL_POINT_SIZE_GRANULARITY */ - 566, /* GL_LINE_SMOOTH */ - 573, /* GL_LINE_WIDTH */ - 575, /* GL_LINE_WIDTH_RANGE */ - 574, /* GL_LINE_WIDTH_GRANULARITY */ - 568, /* GL_LINE_STIPPLE */ - 569, /* GL_LINE_STIPPLE_PATTERN */ - 570, /* GL_LINE_STIPPLE_REPEAT */ - 579, /* GL_LIST_MODE */ - 733, /* GL_MAX_LIST_NESTING */ - 576, /* GL_LIST_BASE */ - 578, /* GL_LIST_INDEX */ - 1005, /* GL_POLYGON_MODE */ - 1012, /* GL_POLYGON_SMOOTH */ - 1014, /* GL_POLYGON_STIPPLE */ + 1000, /* GL_POINT_SMOOTH */ + 989, /* GL_POINT_SIZE */ + 999, /* GL_POINT_SIZE_RANGE */ + 990, /* GL_POINT_SIZE_GRANULARITY */ + 570, /* GL_LINE_SMOOTH */ + 577, /* GL_LINE_WIDTH */ + 579, /* GL_LINE_WIDTH_RANGE */ + 578, /* GL_LINE_WIDTH_GRANULARITY */ + 572, /* GL_LINE_STIPPLE */ + 573, /* GL_LINE_STIPPLE_PATTERN */ + 574, /* GL_LINE_STIPPLE_REPEAT */ + 583, /* GL_LIST_MODE */ + 737, /* GL_MAX_LIST_NESTING */ + 580, /* GL_LIST_BASE */ + 582, /* GL_LIST_INDEX */ + 1009, /* GL_POLYGON_MODE */ + 1016, /* GL_POLYGON_SMOOTH */ + 1018, /* GL_POLYGON_STIPPLE */ 367, /* GL_EDGE_FLAG */ 249, /* GL_CULL_FACE */ 250, /* GL_CULL_FACE_MODE */ 453, /* GL_FRONT_FACE */ - 548, /* GL_LIGHTING */ - 553, /* GL_LIGHT_MODEL_LOCAL_VIEWER */ - 554, /* GL_LIGHT_MODEL_TWO_SIDE */ - 550, /* GL_LIGHT_MODEL_AMBIENT */ - 1231, /* GL_SHADE_MODEL */ + 552, /* GL_LIGHTING */ + 557, /* GL_LIGHT_MODEL_LOCAL_VIEWER */ + 558, /* GL_LIGHT_MODEL_TWO_SIDE */ + 554, /* GL_LIGHT_MODEL_AMBIENT */ + 1235, /* GL_SHADE_MODEL */ 158, /* GL_COLOR_MATERIAL_FACE */ 159, /* GL_COLOR_MATERIAL_PARAMETER */ 157, /* GL_COLOR_MATERIAL */ @@ -3399,24 +3407,24 @@ static const unsigned reduced_enums[1233] = 292, /* GL_DEPTH_CLEAR_VALUE */ 303, /* GL_DEPTH_FUNC */ 12, /* GL_ACCUM_CLEAR_VALUE */ - 1302, /* GL_STENCIL_TEST */ - 1290, /* GL_STENCIL_CLEAR_VALUE */ - 1292, /* GL_STENCIL_FUNC */ - 1304, /* GL_STENCIL_VALUE_MASK */ - 1291, /* GL_STENCIL_FAIL */ - 1299, /* GL_STENCIL_PASS_DEPTH_FAIL */ - 1300, /* GL_STENCIL_PASS_DEPTH_PASS */ - 1301, /* GL_STENCIL_REF */ - 1305, /* GL_STENCIL_WRITEMASK */ - 706, /* GL_MATRIX_MODE */ - 863, /* GL_NORMALIZE */ - 1594, /* GL_VIEWPORT */ - 837, /* GL_MODELVIEW_STACK_DEPTH */ - 1095, /* GL_PROJECTION_STACK_DEPTH */ - 1496, /* GL_TEXTURE_STACK_DEPTH */ - 835, /* GL_MODELVIEW_MATRIX */ - 1094, /* GL_PROJECTION_MATRIX */ - 1481, /* GL_TEXTURE_MATRIX */ + 1306, /* GL_STENCIL_TEST */ + 1294, /* GL_STENCIL_CLEAR_VALUE */ + 1296, /* GL_STENCIL_FUNC */ + 1308, /* GL_STENCIL_VALUE_MASK */ + 1295, /* GL_STENCIL_FAIL */ + 1303, /* GL_STENCIL_PASS_DEPTH_FAIL */ + 1304, /* GL_STENCIL_PASS_DEPTH_PASS */ + 1305, /* GL_STENCIL_REF */ + 1309, /* GL_STENCIL_WRITEMASK */ + 710, /* GL_MATRIX_MODE */ + 867, /* GL_NORMALIZE */ + 1598, /* GL_VIEWPORT */ + 841, /* GL_MODELVIEW_STACK_DEPTH */ + 1099, /* GL_PROJECTION_STACK_DEPTH */ + 1500, /* GL_TEXTURE_STACK_DEPTH */ + 839, /* GL_MODELVIEW_MATRIX */ + 1098, /* GL_PROJECTION_MATRIX */ + 1485, /* GL_TEXTURE_MATRIX */ 56, /* GL_ATTRIB_STACK_DEPTH */ 117, /* GL_CLIENT_ATTRIB_STACK_DEPTH */ 39, /* GL_ALPHA_TEST */ @@ -3426,161 +3434,161 @@ static const unsigned reduced_enums[1233] = 73, /* GL_BLEND_DST */ 80, /* GL_BLEND_SRC */ 70, /* GL_BLEND */ - 582, /* GL_LOGIC_OP_MODE */ - 507, /* GL_INDEX_LOGIC_OP */ + 586, /* GL_LOGIC_OP_MODE */ + 511, /* GL_INDEX_LOGIC_OP */ 156, /* GL_COLOR_LOGIC_OP */ 62, /* GL_AUX_BUFFERS */ 325, /* GL_DRAW_BUFFER */ - 1125, /* GL_READ_BUFFER */ - 1214, /* GL_SCISSOR_BOX */ - 1215, /* GL_SCISSOR_TEST */ - 506, /* GL_INDEX_CLEAR_VALUE */ - 511, /* GL_INDEX_WRITEMASK */ + 1129, /* GL_READ_BUFFER */ + 1218, /* GL_SCISSOR_BOX */ + 1219, /* GL_SCISSOR_TEST */ + 510, /* GL_INDEX_CLEAR_VALUE */ + 515, /* GL_INDEX_WRITEMASK */ 153, /* GL_COLOR_CLEAR_VALUE */ 185, /* GL_COLOR_WRITEMASK */ - 508, /* GL_INDEX_MODE */ - 1187, /* GL_RGBA_MODE */ + 512, /* GL_INDEX_MODE */ + 1191, /* GL_RGBA_MODE */ 324, /* GL_DOUBLEBUFFER */ - 1306, /* GL_STEREO */ - 1146, /* GL_RENDER_MODE */ - 948, /* GL_PERSPECTIVE_CORRECTION_HINT */ - 997, /* GL_POINT_SMOOTH_HINT */ - 567, /* GL_LINE_SMOOTH_HINT */ - 1013, /* GL_POLYGON_SMOOTH_HINT */ + 1310, /* GL_STEREO */ + 1150, /* GL_RENDER_MODE */ + 952, /* GL_PERSPECTIVE_CORRECTION_HINT */ + 1001, /* GL_POINT_SMOOTH_HINT */ + 571, /* GL_LINE_SMOOTH_HINT */ + 1017, /* GL_POLYGON_SMOOTH_HINT */ 425, /* GL_FOG_HINT */ - 1462, /* GL_TEXTURE_GEN_S */ - 1463, /* GL_TEXTURE_GEN_T */ - 1461, /* GL_TEXTURE_GEN_R */ - 1460, /* GL_TEXTURE_GEN_Q */ - 961, /* GL_PIXEL_MAP_I_TO_I */ - 967, /* GL_PIXEL_MAP_S_TO_S */ - 963, /* GL_PIXEL_MAP_I_TO_R */ - 959, /* GL_PIXEL_MAP_I_TO_G */ - 957, /* GL_PIXEL_MAP_I_TO_B */ - 955, /* GL_PIXEL_MAP_I_TO_A */ - 965, /* GL_PIXEL_MAP_R_TO_R */ - 953, /* GL_PIXEL_MAP_G_TO_G */ - 951, /* GL_PIXEL_MAP_B_TO_B */ - 949, /* GL_PIXEL_MAP_A_TO_A */ - 962, /* GL_PIXEL_MAP_I_TO_I_SIZE */ - 968, /* GL_PIXEL_MAP_S_TO_S_SIZE */ - 964, /* GL_PIXEL_MAP_I_TO_R_SIZE */ - 960, /* GL_PIXEL_MAP_I_TO_G_SIZE */ - 958, /* GL_PIXEL_MAP_I_TO_B_SIZE */ - 956, /* GL_PIXEL_MAP_I_TO_A_SIZE */ - 966, /* GL_PIXEL_MAP_R_TO_R_SIZE */ - 954, /* GL_PIXEL_MAP_G_TO_G_SIZE */ - 952, /* GL_PIXEL_MAP_B_TO_B_SIZE */ - 950, /* GL_PIXEL_MAP_A_TO_A_SIZE */ - 1528, /* GL_UNPACK_SWAP_BYTES */ - 1523, /* GL_UNPACK_LSB_FIRST */ - 1524, /* GL_UNPACK_ROW_LENGTH */ - 1527, /* GL_UNPACK_SKIP_ROWS */ - 1526, /* GL_UNPACK_SKIP_PIXELS */ - 1521, /* GL_UNPACK_ALIGNMENT */ - 936, /* GL_PACK_SWAP_BYTES */ - 931, /* GL_PACK_LSB_FIRST */ - 932, /* GL_PACK_ROW_LENGTH */ - 935, /* GL_PACK_SKIP_ROWS */ - 934, /* GL_PACK_SKIP_PIXELS */ - 928, /* GL_PACK_ALIGNMENT */ - 659, /* GL_MAP_COLOR */ - 660, /* GL_MAP_STENCIL */ - 510, /* GL_INDEX_SHIFT */ - 509, /* GL_INDEX_OFFSET */ - 1135, /* GL_RED_SCALE */ - 1133, /* GL_RED_BIAS */ - 1611, /* GL_ZOOM_X */ - 1612, /* GL_ZOOM_Y */ - 472, /* GL_GREEN_SCALE */ - 470, /* GL_GREEN_BIAS */ + 1466, /* GL_TEXTURE_GEN_S */ + 1467, /* GL_TEXTURE_GEN_T */ + 1465, /* GL_TEXTURE_GEN_R */ + 1464, /* GL_TEXTURE_GEN_Q */ + 965, /* GL_PIXEL_MAP_I_TO_I */ + 971, /* GL_PIXEL_MAP_S_TO_S */ + 967, /* GL_PIXEL_MAP_I_TO_R */ + 963, /* GL_PIXEL_MAP_I_TO_G */ + 961, /* GL_PIXEL_MAP_I_TO_B */ + 959, /* GL_PIXEL_MAP_I_TO_A */ + 969, /* GL_PIXEL_MAP_R_TO_R */ + 957, /* GL_PIXEL_MAP_G_TO_G */ + 955, /* GL_PIXEL_MAP_B_TO_B */ + 953, /* GL_PIXEL_MAP_A_TO_A */ + 966, /* GL_PIXEL_MAP_I_TO_I_SIZE */ + 972, /* GL_PIXEL_MAP_S_TO_S_SIZE */ + 968, /* GL_PIXEL_MAP_I_TO_R_SIZE */ + 964, /* GL_PIXEL_MAP_I_TO_G_SIZE */ + 962, /* GL_PIXEL_MAP_I_TO_B_SIZE */ + 960, /* GL_PIXEL_MAP_I_TO_A_SIZE */ + 970, /* GL_PIXEL_MAP_R_TO_R_SIZE */ + 958, /* GL_PIXEL_MAP_G_TO_G_SIZE */ + 956, /* GL_PIXEL_MAP_B_TO_B_SIZE */ + 954, /* GL_PIXEL_MAP_A_TO_A_SIZE */ + 1532, /* GL_UNPACK_SWAP_BYTES */ + 1527, /* GL_UNPACK_LSB_FIRST */ + 1528, /* GL_UNPACK_ROW_LENGTH */ + 1531, /* GL_UNPACK_SKIP_ROWS */ + 1530, /* GL_UNPACK_SKIP_PIXELS */ + 1525, /* GL_UNPACK_ALIGNMENT */ + 940, /* GL_PACK_SWAP_BYTES */ + 935, /* GL_PACK_LSB_FIRST */ + 936, /* GL_PACK_ROW_LENGTH */ + 939, /* GL_PACK_SKIP_ROWS */ + 938, /* GL_PACK_SKIP_PIXELS */ + 932, /* GL_PACK_ALIGNMENT */ + 663, /* GL_MAP_COLOR */ + 664, /* GL_MAP_STENCIL */ + 514, /* GL_INDEX_SHIFT */ + 513, /* GL_INDEX_OFFSET */ + 1139, /* GL_RED_SCALE */ + 1137, /* GL_RED_BIAS */ + 1615, /* GL_ZOOM_X */ + 1616, /* GL_ZOOM_Y */ + 476, /* GL_GREEN_SCALE */ + 474, /* GL_GREEN_BIAS */ 86, /* GL_BLUE_SCALE */ 84, /* GL_BLUE_BIAS */ 38, /* GL_ALPHA_SCALE */ 36, /* GL_ALPHA_BIAS */ 305, /* GL_DEPTH_SCALE */ 286, /* GL_DEPTH_BIAS */ - 729, /* GL_MAX_EVAL_ORDER */ - 732, /* GL_MAX_LIGHTS */ - 714, /* GL_MAX_CLIP_PLANES */ - 774, /* GL_MAX_TEXTURE_SIZE */ - 738, /* GL_MAX_PIXEL_MAP_TABLE */ - 710, /* GL_MAX_ATTRIB_STACK_DEPTH */ - 735, /* GL_MAX_MODELVIEW_STACK_DEPTH */ - 736, /* GL_MAX_NAME_STACK_DEPTH */ - 764, /* GL_MAX_PROJECTION_STACK_DEPTH */ - 775, /* GL_MAX_TEXTURE_STACK_DEPTH */ - 785, /* GL_MAX_VIEWPORT_DIMS */ - 711, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */ - 1313, /* GL_SUBPIXEL_BITS */ - 505, /* GL_INDEX_BITS */ - 1134, /* GL_RED_BITS */ - 471, /* GL_GREEN_BITS */ + 733, /* GL_MAX_EVAL_ORDER */ + 736, /* GL_MAX_LIGHTS */ + 718, /* GL_MAX_CLIP_PLANES */ + 778, /* GL_MAX_TEXTURE_SIZE */ + 742, /* GL_MAX_PIXEL_MAP_TABLE */ + 714, /* GL_MAX_ATTRIB_STACK_DEPTH */ + 739, /* GL_MAX_MODELVIEW_STACK_DEPTH */ + 740, /* GL_MAX_NAME_STACK_DEPTH */ + 768, /* GL_MAX_PROJECTION_STACK_DEPTH */ + 779, /* GL_MAX_TEXTURE_STACK_DEPTH */ + 789, /* GL_MAX_VIEWPORT_DIMS */ + 715, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */ + 1317, /* GL_SUBPIXEL_BITS */ + 509, /* GL_INDEX_BITS */ + 1138, /* GL_RED_BITS */ + 475, /* GL_GREEN_BITS */ 85, /* GL_BLUE_BITS */ 37, /* GL_ALPHA_BITS */ 287, /* GL_DEPTH_BITS */ - 1288, /* GL_STENCIL_BITS */ + 1292, /* GL_STENCIL_BITS */ 14, /* GL_ACCUM_RED_BITS */ 13, /* GL_ACCUM_GREEN_BITS */ 10, /* GL_ACCUM_BLUE_BITS */ 9, /* GL_ACCUM_ALPHA_BITS */ - 851, /* GL_NAME_STACK_DEPTH */ + 855, /* GL_NAME_STACK_DEPTH */ 57, /* GL_AUTO_NORMAL */ - 605, /* GL_MAP1_COLOR_4 */ - 608, /* GL_MAP1_INDEX */ - 609, /* GL_MAP1_NORMAL */ - 610, /* GL_MAP1_TEXTURE_COORD_1 */ - 611, /* GL_MAP1_TEXTURE_COORD_2 */ - 612, /* GL_MAP1_TEXTURE_COORD_3 */ - 613, /* GL_MAP1_TEXTURE_COORD_4 */ - 614, /* GL_MAP1_VERTEX_3 */ - 615, /* GL_MAP1_VERTEX_4 */ - 632, /* GL_MAP2_COLOR_4 */ - 635, /* GL_MAP2_INDEX */ - 636, /* GL_MAP2_NORMAL */ - 637, /* GL_MAP2_TEXTURE_COORD_1 */ - 638, /* GL_MAP2_TEXTURE_COORD_2 */ - 639, /* GL_MAP2_TEXTURE_COORD_3 */ - 640, /* GL_MAP2_TEXTURE_COORD_4 */ - 641, /* GL_MAP2_VERTEX_3 */ - 642, /* GL_MAP2_VERTEX_4 */ - 606, /* GL_MAP1_GRID_DOMAIN */ - 607, /* GL_MAP1_GRID_SEGMENTS */ - 633, /* GL_MAP2_GRID_DOMAIN */ - 634, /* GL_MAP2_GRID_SEGMENTS */ - 1390, /* GL_TEXTURE_1D */ - 1391, /* GL_TEXTURE_2D */ + 609, /* GL_MAP1_COLOR_4 */ + 612, /* GL_MAP1_INDEX */ + 613, /* GL_MAP1_NORMAL */ + 614, /* GL_MAP1_TEXTURE_COORD_1 */ + 615, /* GL_MAP1_TEXTURE_COORD_2 */ + 616, /* GL_MAP1_TEXTURE_COORD_3 */ + 617, /* GL_MAP1_TEXTURE_COORD_4 */ + 618, /* GL_MAP1_VERTEX_3 */ + 619, /* GL_MAP1_VERTEX_4 */ + 636, /* GL_MAP2_COLOR_4 */ + 639, /* GL_MAP2_INDEX */ + 640, /* GL_MAP2_NORMAL */ + 641, /* GL_MAP2_TEXTURE_COORD_1 */ + 642, /* GL_MAP2_TEXTURE_COORD_2 */ + 643, /* GL_MAP2_TEXTURE_COORD_3 */ + 644, /* GL_MAP2_TEXTURE_COORD_4 */ + 645, /* GL_MAP2_VERTEX_3 */ + 646, /* GL_MAP2_VERTEX_4 */ + 610, /* GL_MAP1_GRID_DOMAIN */ + 611, /* GL_MAP1_GRID_SEGMENTS */ + 637, /* GL_MAP2_GRID_DOMAIN */ + 638, /* GL_MAP2_GRID_SEGMENTS */ + 1394, /* GL_TEXTURE_1D */ + 1395, /* GL_TEXTURE_2D */ 392, /* GL_FEEDBACK_BUFFER_POINTER */ 393, /* GL_FEEDBACK_BUFFER_SIZE */ 394, /* GL_FEEDBACK_BUFFER_TYPE */ - 1224, /* GL_SELECTION_BUFFER_POINTER */ - 1225, /* GL_SELECTION_BUFFER_SIZE */ - 1499, /* GL_TEXTURE_WIDTH */ - 1467, /* GL_TEXTURE_HEIGHT */ - 1423, /* GL_TEXTURE_COMPONENTS */ - 1407, /* GL_TEXTURE_BORDER_COLOR */ - 1406, /* GL_TEXTURE_BORDER */ + 1228, /* GL_SELECTION_BUFFER_POINTER */ + 1229, /* GL_SELECTION_BUFFER_SIZE */ + 1503, /* GL_TEXTURE_WIDTH */ + 1471, /* GL_TEXTURE_HEIGHT */ + 1427, /* GL_TEXTURE_COMPONENTS */ + 1411, /* GL_TEXTURE_BORDER_COLOR */ + 1410, /* GL_TEXTURE_BORDER */ 316, /* GL_DONT_CARE */ 390, /* GL_FASTEST */ - 859, /* GL_NICEST */ + 863, /* GL_NICEST */ 43, /* GL_AMBIENT */ 313, /* GL_DIFFUSE */ - 1264, /* GL_SPECULAR */ - 1017, /* GL_POSITION */ - 1267, /* GL_SPOT_DIRECTION */ - 1268, /* GL_SPOT_EXPONENT */ - 1266, /* GL_SPOT_CUTOFF */ + 1268, /* GL_SPECULAR */ + 1021, /* GL_POSITION */ + 1271, /* GL_SPOT_DIRECTION */ + 1272, /* GL_SPOT_EXPONENT */ + 1270, /* GL_SPOT_CUTOFF */ 223, /* GL_CONSTANT_ATTENUATION */ - 557, /* GL_LINEAR_ATTENUATION */ - 1112, /* GL_QUADRATIC_ATTENUATION */ + 561, /* GL_LINEAR_ATTENUATION */ + 1116, /* GL_QUADRATIC_ATTENUATION */ 198, /* GL_COMPILE */ 199, /* GL_COMPILE_AND_EXECUTE */ 101, /* GL_BYTE */ - 1529, /* GL_UNSIGNED_BYTE */ - 1235, /* GL_SHORT */ - 1538, /* GL_UNSIGNED_SHORT */ - 512, /* GL_INT */ - 1532, /* GL_UNSIGNED_INT */ + 1533, /* GL_UNSIGNED_BYTE */ + 1239, /* GL_SHORT */ + 1542, /* GL_UNSIGNED_SHORT */ + 516, /* GL_INT */ + 1536, /* GL_UNSIGNED_INT */ 397, /* GL_FLOAT */ 1, /* GL_2_BYTES */ 5, /* GL_3_BYTES */ @@ -3591,284 +3599,284 @@ static const unsigned reduced_enums[1233] = 47, /* GL_AND_REVERSE */ 246, /* GL_COPY */ 46, /* GL_AND_INVERTED */ - 861, /* GL_NOOP */ - 1607, /* GL_XOR */ - 923, /* GL_OR */ - 862, /* GL_NOR */ + 865, /* GL_NOOP */ + 1611, /* GL_XOR */ + 927, /* GL_OR */ + 866, /* GL_NOR */ 380, /* GL_EQUIV */ - 535, /* GL_INVERT */ - 926, /* GL_OR_REVERSE */ + 539, /* GL_INVERT */ + 930, /* GL_OR_REVERSE */ 247, /* GL_COPY_INVERTED */ - 925, /* GL_OR_INVERTED */ - 852, /* GL_NAND */ - 1229, /* GL_SET */ + 929, /* GL_OR_INVERTED */ + 856, /* GL_NAND */ + 1233, /* GL_SET */ 377, /* GL_EMISSION */ - 1234, /* GL_SHININESS */ + 1238, /* GL_SHININESS */ 44, /* GL_AMBIENT_AND_DIFFUSE */ 155, /* GL_COLOR_INDEXES */ - 802, /* GL_MODELVIEW */ - 1093, /* GL_PROJECTION */ - 1325, /* GL_TEXTURE */ + 806, /* GL_MODELVIEW */ + 1097, /* GL_PROJECTION */ + 1329, /* GL_TEXTURE */ 128, /* GL_COLOR */ 284, /* GL_DEPTH */ - 1286, /* GL_STENCIL */ + 1290, /* GL_STENCIL */ 154, /* GL_COLOR_INDEX */ - 1293, /* GL_STENCIL_INDEX */ + 1297, /* GL_STENCIL_INDEX */ 293, /* GL_DEPTH_COMPONENT */ - 1130, /* GL_RED */ - 469, /* GL_GREEN */ + 1134, /* GL_RED */ + 473, /* GL_GREEN */ 83, /* GL_BLUE */ 27, /* GL_ALPHA */ - 1154, /* GL_RGB */ - 1173, /* GL_RGBA */ - 583, /* GL_LUMINANCE */ - 604, /* GL_LUMINANCE_ALPHA */ + 1158, /* GL_RGB */ + 1177, /* GL_RGBA */ + 587, /* GL_LUMINANCE */ + 608, /* GL_LUMINANCE_ALPHA */ 68, /* GL_BITMAP */ - 974, /* GL_POINT */ - 555, /* GL_LINE */ + 978, /* GL_POINT */ + 559, /* GL_LINE */ 395, /* GL_FILL */ - 1139, /* GL_RENDER */ + 1143, /* GL_RENDER */ 391, /* GL_FEEDBACK */ - 1223, /* GL_SELECT */ + 1227, /* GL_SELECT */ 396, /* GL_FLAT */ - 1239, /* GL_SMOOTH */ - 536, /* GL_KEEP */ - 1148, /* GL_REPLACE */ - 496, /* GL_INCR */ + 1243, /* GL_SMOOTH */ + 540, /* GL_KEEP */ + 1152, /* GL_REPLACE */ + 500, /* GL_INCR */ 281, /* GL_DECR */ - 1551, /* GL_VENDOR */ - 1145, /* GL_RENDERER */ - 1552, /* GL_VERSION */ + 1555, /* GL_VENDOR */ + 1149, /* GL_RENDERER */ + 1556, /* GL_VERSION */ 384, /* GL_EXTENSIONS */ - 1194, /* GL_S */ - 1316, /* GL_T */ - 1122, /* GL_R */ - 1111, /* GL_Q */ - 838, /* GL_MODULATE */ + 1198, /* GL_S */ + 1320, /* GL_T */ + 1126, /* GL_R */ + 1115, /* GL_Q */ + 842, /* GL_MODULATE */ 280, /* GL_DECAL */ - 1457, /* GL_TEXTURE_ENV_MODE */ - 1456, /* GL_TEXTURE_ENV_COLOR */ - 1455, /* GL_TEXTURE_ENV */ + 1461, /* GL_TEXTURE_ENV_MODE */ + 1460, /* GL_TEXTURE_ENV_COLOR */ + 1459, /* GL_TEXTURE_ENV */ 385, /* GL_EYE_LINEAR */ - 885, /* GL_OBJECT_LINEAR */ - 1265, /* GL_SPHERE_MAP */ - 1459, /* GL_TEXTURE_GEN_MODE */ - 887, /* GL_OBJECT_PLANE */ + 889, /* GL_OBJECT_LINEAR */ + 1269, /* GL_SPHERE_MAP */ + 1463, /* GL_TEXTURE_GEN_MODE */ + 891, /* GL_OBJECT_PLANE */ 386, /* GL_EYE_PLANE */ - 853, /* GL_NEAREST */ - 556, /* GL_LINEAR */ - 857, /* GL_NEAREST_MIPMAP_NEAREST */ - 561, /* GL_LINEAR_MIPMAP_NEAREST */ - 856, /* GL_NEAREST_MIPMAP_LINEAR */ - 560, /* GL_LINEAR_MIPMAP_LINEAR */ - 1480, /* GL_TEXTURE_MAG_FILTER */ - 1488, /* GL_TEXTURE_MIN_FILTER */ - 1501, /* GL_TEXTURE_WRAP_S */ - 1502, /* GL_TEXTURE_WRAP_T */ + 857, /* GL_NEAREST */ + 560, /* GL_LINEAR */ + 861, /* GL_NEAREST_MIPMAP_NEAREST */ + 565, /* GL_LINEAR_MIPMAP_NEAREST */ + 860, /* GL_NEAREST_MIPMAP_LINEAR */ + 564, /* GL_LINEAR_MIPMAP_LINEAR */ + 1484, /* GL_TEXTURE_MAG_FILTER */ + 1492, /* GL_TEXTURE_MIN_FILTER */ + 1505, /* GL_TEXTURE_WRAP_S */ + 1506, /* GL_TEXTURE_WRAP_T */ 107, /* GL_CLAMP */ - 1147, /* GL_REPEAT */ - 1011, /* GL_POLYGON_OFFSET_UNITS */ - 1010, /* GL_POLYGON_OFFSET_POINT */ - 1009, /* GL_POLYGON_OFFSET_LINE */ - 1123, /* GL_R3_G3_B2 */ - 1549, /* GL_V2F */ - 1550, /* GL_V3F */ + 1151, /* GL_REPEAT */ + 1015, /* GL_POLYGON_OFFSET_UNITS */ + 1014, /* GL_POLYGON_OFFSET_POINT */ + 1013, /* GL_POLYGON_OFFSET_LINE */ + 1127, /* GL_R3_G3_B2 */ + 1553, /* GL_V2F */ + 1554, /* GL_V3F */ 104, /* GL_C4UB_V2F */ 105, /* GL_C4UB_V3F */ 102, /* GL_C3F_V3F */ - 850, /* GL_N3F_V3F */ + 854, /* GL_N3F_V3F */ 103, /* GL_C4F_N3F_V3F */ - 1321, /* GL_T2F_V3F */ - 1323, /* GL_T4F_V4F */ - 1319, /* GL_T2F_C4UB_V3F */ - 1317, /* GL_T2F_C3F_V3F */ - 1320, /* GL_T2F_N3F_V3F */ - 1318, /* GL_T2F_C4F_N3F_V3F */ - 1322, /* GL_T4F_C4F_N3F_V4F */ + 1325, /* GL_T2F_V3F */ + 1327, /* GL_T4F_V4F */ + 1323, /* GL_T2F_C4UB_V3F */ + 1321, /* GL_T2F_C3F_V3F */ + 1324, /* GL_T2F_N3F_V3F */ + 1322, /* GL_T2F_C4F_N3F_V3F */ + 1326, /* GL_T4F_C4F_N3F_V4F */ 120, /* GL_CLIP_PLANE0 */ 121, /* GL_CLIP_PLANE1 */ 122, /* GL_CLIP_PLANE2 */ 123, /* GL_CLIP_PLANE3 */ 124, /* GL_CLIP_PLANE4 */ 125, /* GL_CLIP_PLANE5 */ - 540, /* GL_LIGHT0 */ - 541, /* GL_LIGHT1 */ - 542, /* GL_LIGHT2 */ - 543, /* GL_LIGHT3 */ - 544, /* GL_LIGHT4 */ - 545, /* GL_LIGHT5 */ - 546, /* GL_LIGHT6 */ - 547, /* GL_LIGHT7 */ - 473, /* GL_HINT_BIT */ + 544, /* GL_LIGHT0 */ + 545, /* GL_LIGHT1 */ + 546, /* GL_LIGHT2 */ + 547, /* GL_LIGHT3 */ + 548, /* GL_LIGHT4 */ + 549, /* GL_LIGHT5 */ + 550, /* GL_LIGHT6 */ + 551, /* GL_LIGHT7 */ + 477, /* GL_HINT_BIT */ 225, /* GL_CONSTANT_COLOR */ - 897, /* GL_ONE_MINUS_CONSTANT_COLOR */ + 901, /* GL_ONE_MINUS_CONSTANT_COLOR */ 220, /* GL_CONSTANT_ALPHA */ - 895, /* GL_ONE_MINUS_CONSTANT_ALPHA */ + 899, /* GL_ONE_MINUS_CONSTANT_ALPHA */ 71, /* GL_BLEND_COLOR */ 456, /* GL_FUNC_ADD */ - 786, /* GL_MIN */ - 708, /* GL_MAX */ + 790, /* GL_MIN */ + 712, /* GL_MAX */ 76, /* GL_BLEND_EQUATION */ 460, /* GL_FUNC_SUBTRACT */ 458, /* GL_FUNC_REVERSE_SUBTRACT */ 228, /* GL_CONVOLUTION_1D */ 229, /* GL_CONVOLUTION_2D */ - 1226, /* GL_SEPARABLE_2D */ + 1230, /* GL_SEPARABLE_2D */ 232, /* GL_CONVOLUTION_BORDER_MODE */ 236, /* GL_CONVOLUTION_FILTER_SCALE */ 234, /* GL_CONVOLUTION_FILTER_BIAS */ - 1131, /* GL_REDUCE */ + 1135, /* GL_REDUCE */ 238, /* GL_CONVOLUTION_FORMAT */ 242, /* GL_CONVOLUTION_WIDTH */ 240, /* GL_CONVOLUTION_HEIGHT */ - 721, /* GL_MAX_CONVOLUTION_WIDTH */ - 719, /* GL_MAX_CONVOLUTION_HEIGHT */ - 1050, /* GL_POST_CONVOLUTION_RED_SCALE */ - 1046, /* GL_POST_CONVOLUTION_GREEN_SCALE */ - 1041, /* GL_POST_CONVOLUTION_BLUE_SCALE */ - 1037, /* GL_POST_CONVOLUTION_ALPHA_SCALE */ - 1048, /* GL_POST_CONVOLUTION_RED_BIAS */ - 1044, /* GL_POST_CONVOLUTION_GREEN_BIAS */ - 1039, /* GL_POST_CONVOLUTION_BLUE_BIAS */ - 1035, /* GL_POST_CONVOLUTION_ALPHA_BIAS */ - 474, /* GL_HISTOGRAM */ - 1097, /* GL_PROXY_HISTOGRAM */ - 490, /* GL_HISTOGRAM_WIDTH */ - 480, /* GL_HISTOGRAM_FORMAT */ - 486, /* GL_HISTOGRAM_RED_SIZE */ - 482, /* GL_HISTOGRAM_GREEN_SIZE */ - 477, /* GL_HISTOGRAM_BLUE_SIZE */ - 475, /* GL_HISTOGRAM_ALPHA_SIZE */ - 484, /* GL_HISTOGRAM_LUMINANCE_SIZE */ - 488, /* GL_HISTOGRAM_SINK */ - 787, /* GL_MINMAX */ - 789, /* GL_MINMAX_FORMAT */ - 791, /* GL_MINMAX_SINK */ - 1324, /* GL_TABLE_TOO_LARGE_EXT */ - 1531, /* GL_UNSIGNED_BYTE_3_3_2 */ - 1540, /* GL_UNSIGNED_SHORT_4_4_4_4 */ - 1542, /* GL_UNSIGNED_SHORT_5_5_5_1 */ - 1536, /* GL_UNSIGNED_INT_8_8_8_8 */ - 1533, /* GL_UNSIGNED_INT_10_10_10_2 */ - 1008, /* GL_POLYGON_OFFSET_FILL */ - 1007, /* GL_POLYGON_OFFSET_FACTOR */ - 1006, /* GL_POLYGON_OFFSET_BIAS */ - 1151, /* GL_RESCALE_NORMAL */ + 725, /* GL_MAX_CONVOLUTION_WIDTH */ + 723, /* GL_MAX_CONVOLUTION_HEIGHT */ + 1054, /* GL_POST_CONVOLUTION_RED_SCALE */ + 1050, /* GL_POST_CONVOLUTION_GREEN_SCALE */ + 1045, /* GL_POST_CONVOLUTION_BLUE_SCALE */ + 1041, /* GL_POST_CONVOLUTION_ALPHA_SCALE */ + 1052, /* GL_POST_CONVOLUTION_RED_BIAS */ + 1048, /* GL_POST_CONVOLUTION_GREEN_BIAS */ + 1043, /* GL_POST_CONVOLUTION_BLUE_BIAS */ + 1039, /* GL_POST_CONVOLUTION_ALPHA_BIAS */ + 478, /* GL_HISTOGRAM */ + 1101, /* GL_PROXY_HISTOGRAM */ + 494, /* GL_HISTOGRAM_WIDTH */ + 484, /* GL_HISTOGRAM_FORMAT */ + 490, /* GL_HISTOGRAM_RED_SIZE */ + 486, /* GL_HISTOGRAM_GREEN_SIZE */ + 481, /* GL_HISTOGRAM_BLUE_SIZE */ + 479, /* GL_HISTOGRAM_ALPHA_SIZE */ + 488, /* GL_HISTOGRAM_LUMINANCE_SIZE */ + 492, /* GL_HISTOGRAM_SINK */ + 791, /* GL_MINMAX */ + 793, /* GL_MINMAX_FORMAT */ + 795, /* GL_MINMAX_SINK */ + 1328, /* GL_TABLE_TOO_LARGE_EXT */ + 1535, /* GL_UNSIGNED_BYTE_3_3_2 */ + 1544, /* GL_UNSIGNED_SHORT_4_4_4_4 */ + 1546, /* GL_UNSIGNED_SHORT_5_5_5_1 */ + 1540, /* GL_UNSIGNED_INT_8_8_8_8 */ + 1537, /* GL_UNSIGNED_INT_10_10_10_2 */ + 1012, /* GL_POLYGON_OFFSET_FILL */ + 1011, /* GL_POLYGON_OFFSET_FACTOR */ + 1010, /* GL_POLYGON_OFFSET_BIAS */ + 1155, /* GL_RESCALE_NORMAL */ 32, /* GL_ALPHA4 */ 34, /* GL_ALPHA8 */ 28, /* GL_ALPHA12 */ 30, /* GL_ALPHA16 */ - 594, /* GL_LUMINANCE4 */ - 600, /* GL_LUMINANCE8 */ - 584, /* GL_LUMINANCE12 */ - 590, /* GL_LUMINANCE16 */ - 595, /* GL_LUMINANCE4_ALPHA4 */ - 598, /* GL_LUMINANCE6_ALPHA2 */ - 601, /* GL_LUMINANCE8_ALPHA8 */ - 587, /* GL_LUMINANCE12_ALPHA4 */ - 585, /* GL_LUMINANCE12_ALPHA12 */ - 591, /* GL_LUMINANCE16_ALPHA16 */ - 513, /* GL_INTENSITY */ - 518, /* GL_INTENSITY4 */ - 520, /* GL_INTENSITY8 */ - 514, /* GL_INTENSITY12 */ - 516, /* GL_INTENSITY16 */ - 1163, /* GL_RGB2_EXT */ - 1164, /* GL_RGB4 */ - 1167, /* GL_RGB5 */ - 1171, /* GL_RGB8 */ - 1155, /* GL_RGB10 */ - 1159, /* GL_RGB12 */ - 1161, /* GL_RGB16 */ - 1178, /* GL_RGBA2 */ - 1180, /* GL_RGBA4 */ - 1168, /* GL_RGB5_A1 */ - 1184, /* GL_RGBA8 */ - 1156, /* GL_RGB10_A2 */ - 1174, /* GL_RGBA12 */ - 1176, /* GL_RGBA16 */ - 1493, /* GL_TEXTURE_RED_SIZE */ - 1465, /* GL_TEXTURE_GREEN_SIZE */ - 1404, /* GL_TEXTURE_BLUE_SIZE */ - 1393, /* GL_TEXTURE_ALPHA_SIZE */ - 1478, /* GL_TEXTURE_LUMINANCE_SIZE */ - 1469, /* GL_TEXTURE_INTENSITY_SIZE */ - 1149, /* GL_REPLACE_EXT */ - 1101, /* GL_PROXY_TEXTURE_1D */ - 1103, /* GL_PROXY_TEXTURE_2D */ - 1497, /* GL_TEXTURE_TOO_LARGE_EXT */ - 1490, /* GL_TEXTURE_PRIORITY */ - 1495, /* GL_TEXTURE_RESIDENT */ - 1396, /* GL_TEXTURE_BINDING_1D */ - 1397, /* GL_TEXTURE_BINDING_2D */ - 1398, /* GL_TEXTURE_BINDING_3D */ - 933, /* GL_PACK_SKIP_IMAGES */ - 929, /* GL_PACK_IMAGE_HEIGHT */ - 1525, /* GL_UNPACK_SKIP_IMAGES */ - 1522, /* GL_UNPACK_IMAGE_HEIGHT */ - 1392, /* GL_TEXTURE_3D */ - 1105, /* GL_PROXY_TEXTURE_3D */ - 1452, /* GL_TEXTURE_DEPTH */ - 1500, /* GL_TEXTURE_WRAP_R */ - 709, /* GL_MAX_3D_TEXTURE_SIZE */ - 1553, /* GL_VERTEX_ARRAY */ - 864, /* GL_NORMAL_ARRAY */ + 598, /* GL_LUMINANCE4 */ + 604, /* GL_LUMINANCE8 */ + 588, /* GL_LUMINANCE12 */ + 594, /* GL_LUMINANCE16 */ + 599, /* GL_LUMINANCE4_ALPHA4 */ + 602, /* GL_LUMINANCE6_ALPHA2 */ + 605, /* GL_LUMINANCE8_ALPHA8 */ + 591, /* GL_LUMINANCE12_ALPHA4 */ + 589, /* GL_LUMINANCE12_ALPHA12 */ + 595, /* GL_LUMINANCE16_ALPHA16 */ + 517, /* GL_INTENSITY */ + 522, /* GL_INTENSITY4 */ + 524, /* GL_INTENSITY8 */ + 518, /* GL_INTENSITY12 */ + 520, /* GL_INTENSITY16 */ + 1167, /* GL_RGB2_EXT */ + 1168, /* GL_RGB4 */ + 1171, /* GL_RGB5 */ + 1175, /* GL_RGB8 */ + 1159, /* GL_RGB10 */ + 1163, /* GL_RGB12 */ + 1165, /* GL_RGB16 */ + 1182, /* GL_RGBA2 */ + 1184, /* GL_RGBA4 */ + 1172, /* GL_RGB5_A1 */ + 1188, /* GL_RGBA8 */ + 1160, /* GL_RGB10_A2 */ + 1178, /* GL_RGBA12 */ + 1180, /* GL_RGBA16 */ + 1497, /* GL_TEXTURE_RED_SIZE */ + 1469, /* GL_TEXTURE_GREEN_SIZE */ + 1408, /* GL_TEXTURE_BLUE_SIZE */ + 1397, /* GL_TEXTURE_ALPHA_SIZE */ + 1482, /* GL_TEXTURE_LUMINANCE_SIZE */ + 1473, /* GL_TEXTURE_INTENSITY_SIZE */ + 1153, /* GL_REPLACE_EXT */ + 1105, /* GL_PROXY_TEXTURE_1D */ + 1107, /* GL_PROXY_TEXTURE_2D */ + 1501, /* GL_TEXTURE_TOO_LARGE_EXT */ + 1494, /* GL_TEXTURE_PRIORITY */ + 1499, /* GL_TEXTURE_RESIDENT */ + 1400, /* GL_TEXTURE_BINDING_1D */ + 1401, /* GL_TEXTURE_BINDING_2D */ + 1402, /* GL_TEXTURE_BINDING_3D */ + 937, /* GL_PACK_SKIP_IMAGES */ + 933, /* GL_PACK_IMAGE_HEIGHT */ + 1529, /* GL_UNPACK_SKIP_IMAGES */ + 1526, /* GL_UNPACK_IMAGE_HEIGHT */ + 1396, /* GL_TEXTURE_3D */ + 1109, /* GL_PROXY_TEXTURE_3D */ + 1456, /* GL_TEXTURE_DEPTH */ + 1504, /* GL_TEXTURE_WRAP_R */ + 713, /* GL_MAX_3D_TEXTURE_SIZE */ + 1557, /* GL_VERTEX_ARRAY */ + 868, /* GL_NORMAL_ARRAY */ 129, /* GL_COLOR_ARRAY */ - 499, /* GL_INDEX_ARRAY */ - 1431, /* GL_TEXTURE_COORD_ARRAY */ + 503, /* GL_INDEX_ARRAY */ + 1435, /* GL_TEXTURE_COORD_ARRAY */ 368, /* GL_EDGE_FLAG_ARRAY */ - 1557, /* GL_VERTEX_ARRAY_SIZE */ - 1559, /* GL_VERTEX_ARRAY_TYPE */ - 1558, /* GL_VERTEX_ARRAY_STRIDE */ - 869, /* GL_NORMAL_ARRAY_TYPE */ - 868, /* GL_NORMAL_ARRAY_STRIDE */ + 1561, /* GL_VERTEX_ARRAY_SIZE */ + 1563, /* GL_VERTEX_ARRAY_TYPE */ + 1562, /* GL_VERTEX_ARRAY_STRIDE */ + 873, /* GL_NORMAL_ARRAY_TYPE */ + 872, /* GL_NORMAL_ARRAY_STRIDE */ 133, /* GL_COLOR_ARRAY_SIZE */ 135, /* GL_COLOR_ARRAY_TYPE */ 134, /* GL_COLOR_ARRAY_STRIDE */ - 504, /* GL_INDEX_ARRAY_TYPE */ - 503, /* GL_INDEX_ARRAY_STRIDE */ - 1435, /* GL_TEXTURE_COORD_ARRAY_SIZE */ - 1437, /* GL_TEXTURE_COORD_ARRAY_TYPE */ - 1436, /* GL_TEXTURE_COORD_ARRAY_STRIDE */ + 508, /* GL_INDEX_ARRAY_TYPE */ + 507, /* GL_INDEX_ARRAY_STRIDE */ + 1439, /* GL_TEXTURE_COORD_ARRAY_SIZE */ + 1441, /* GL_TEXTURE_COORD_ARRAY_TYPE */ + 1440, /* GL_TEXTURE_COORD_ARRAY_STRIDE */ 372, /* GL_EDGE_FLAG_ARRAY_STRIDE */ - 1556, /* GL_VERTEX_ARRAY_POINTER */ - 867, /* GL_NORMAL_ARRAY_POINTER */ + 1560, /* GL_VERTEX_ARRAY_POINTER */ + 871, /* GL_NORMAL_ARRAY_POINTER */ 132, /* GL_COLOR_ARRAY_POINTER */ - 502, /* GL_INDEX_ARRAY_POINTER */ - 1434, /* GL_TEXTURE_COORD_ARRAY_POINTER */ + 506, /* GL_INDEX_ARRAY_POINTER */ + 1438, /* GL_TEXTURE_COORD_ARRAY_POINTER */ 371, /* GL_EDGE_FLAG_ARRAY_POINTER */ - 843, /* GL_MULTISAMPLE */ - 1200, /* GL_SAMPLE_ALPHA_TO_COVERAGE */ - 1202, /* GL_SAMPLE_ALPHA_TO_ONE */ - 1207, /* GL_SAMPLE_COVERAGE */ - 1204, /* GL_SAMPLE_BUFFERS */ - 1195, /* GL_SAMPLES */ - 1211, /* GL_SAMPLE_COVERAGE_VALUE */ - 1209, /* GL_SAMPLE_COVERAGE_INVERT */ + 847, /* GL_MULTISAMPLE */ + 1204, /* GL_SAMPLE_ALPHA_TO_COVERAGE */ + 1206, /* GL_SAMPLE_ALPHA_TO_ONE */ + 1211, /* GL_SAMPLE_COVERAGE */ + 1208, /* GL_SAMPLE_BUFFERS */ + 1199, /* GL_SAMPLES */ + 1215, /* GL_SAMPLE_COVERAGE_VALUE */ + 1213, /* GL_SAMPLE_COVERAGE_INVERT */ 160, /* GL_COLOR_MATRIX */ 162, /* GL_COLOR_MATRIX_STACK_DEPTH */ - 716, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */ - 1033, /* GL_POST_COLOR_MATRIX_RED_SCALE */ - 1029, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */ - 1024, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */ - 1020, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */ - 1031, /* GL_POST_COLOR_MATRIX_RED_BIAS */ - 1027, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */ - 1022, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */ - 1018, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */ - 1414, /* GL_TEXTURE_COLOR_TABLE_SGI */ - 1106, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */ - 1416, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ + 720, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */ + 1037, /* GL_POST_COLOR_MATRIX_RED_SCALE */ + 1033, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */ + 1028, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */ + 1024, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */ + 1035, /* GL_POST_COLOR_MATRIX_RED_BIAS */ + 1031, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */ + 1026, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */ + 1022, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */ + 1418, /* GL_TEXTURE_COLOR_TABLE_SGI */ + 1110, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */ + 1420, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */ 75, /* GL_BLEND_DST_RGB */ 82, /* GL_BLEND_SRC_RGB */ 74, /* GL_BLEND_DST_ALPHA */ 81, /* GL_BLEND_SRC_ALPHA */ 166, /* GL_COLOR_TABLE */ - 1043, /* GL_POST_CONVOLUTION_COLOR_TABLE */ - 1026, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */ - 1096, /* GL_PROXY_COLOR_TABLE */ - 1100, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */ - 1099, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */ + 1047, /* GL_POST_CONVOLUTION_COLOR_TABLE */ + 1030, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */ + 1100, /* GL_PROXY_COLOR_TABLE */ + 1104, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */ + 1103, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */ 182, /* GL_COLOR_TABLE_SCALE */ 169, /* GL_COLOR_TABLE_BIAS */ 172, /* GL_COLOR_TABLE_FORMAT */ @@ -3881,86 +3889,86 @@ static const unsigned reduced_enums[1233] = 176, /* GL_COLOR_TABLE_INTENSITY_SIZE */ 66, /* GL_BGR */ 67, /* GL_BGRA */ - 728, /* GL_MAX_ELEMENTS_VERTICES */ - 727, /* GL_MAX_ELEMENTS_INDICES */ - 1468, /* GL_TEXTURE_INDEX_SIZE_EXT */ + 732, /* GL_MAX_ELEMENTS_VERTICES */ + 731, /* GL_MAX_ELEMENTS_INDICES */ + 1472, /* GL_TEXTURE_INDEX_SIZE_EXT */ 126, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */ - 991, /* GL_POINT_SIZE_MIN */ - 987, /* GL_POINT_SIZE_MAX */ - 981, /* GL_POINT_FADE_THRESHOLD_SIZE */ - 977, /* GL_POINT_DISTANCE_ATTENUATION */ + 995, /* GL_POINT_SIZE_MIN */ + 991, /* GL_POINT_SIZE_MAX */ + 985, /* GL_POINT_FADE_THRESHOLD_SIZE */ + 981, /* GL_POINT_DISTANCE_ATTENUATION */ 108, /* GL_CLAMP_TO_BORDER */ 111, /* GL_CLAMP_TO_EDGE */ - 1489, /* GL_TEXTURE_MIN_LOD */ - 1487, /* GL_TEXTURE_MAX_LOD */ - 1395, /* GL_TEXTURE_BASE_LEVEL */ - 1486, /* GL_TEXTURE_MAX_LEVEL */ - 493, /* GL_IGNORE_BORDER_HP */ + 1493, /* GL_TEXTURE_MIN_LOD */ + 1491, /* GL_TEXTURE_MAX_LOD */ + 1399, /* GL_TEXTURE_BASE_LEVEL */ + 1490, /* GL_TEXTURE_MAX_LEVEL */ + 497, /* GL_IGNORE_BORDER_HP */ 224, /* GL_CONSTANT_BORDER_HP */ - 1150, /* GL_REPLICATE_BORDER_HP */ + 1154, /* GL_REPLICATE_BORDER_HP */ 230, /* GL_CONVOLUTION_BORDER_COLOR */ - 892, /* GL_OCCLUSION_TEST_HP */ - 893, /* GL_OCCLUSION_TEST_RESULT_HP */ - 558, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */ - 1408, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */ - 1410, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */ - 1412, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */ - 1413, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */ - 1411, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */ - 1409, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */ - 712, /* GL_MAX_CLIPMAP_DEPTH_SGIX */ - 713, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */ - 1053, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */ - 1055, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */ - 1052, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */ - 1054, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */ - 1476, /* GL_TEXTURE_LOD_BIAS_S_SGIX */ - 1477, /* GL_TEXTURE_LOD_BIAS_T_SGIX */ - 1475, /* GL_TEXTURE_LOD_BIAS_R_SGIX */ + 896, /* GL_OCCLUSION_TEST_HP */ + 897, /* GL_OCCLUSION_TEST_RESULT_HP */ + 562, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */ + 1412, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */ + 1414, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */ + 1416, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */ + 1417, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */ + 1415, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */ + 1413, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */ + 716, /* GL_MAX_CLIPMAP_DEPTH_SGIX */ + 717, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */ + 1057, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */ + 1059, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */ + 1056, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */ + 1058, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */ + 1480, /* GL_TEXTURE_LOD_BIAS_S_SGIX */ + 1481, /* GL_TEXTURE_LOD_BIAS_T_SGIX */ + 1479, /* GL_TEXTURE_LOD_BIAS_R_SGIX */ 462, /* GL_GENERATE_MIPMAP */ 463, /* GL_GENERATE_MIPMAP_HINT */ 428, /* GL_FOG_OFFSET_SGIX */ 429, /* GL_FOG_OFFSET_VALUE_SGIX */ - 1422, /* GL_TEXTURE_COMPARE_SGIX */ - 1421, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */ - 1472, /* GL_TEXTURE_LEQUAL_R_SGIX */ - 1464, /* GL_TEXTURE_GEQUAL_R_SGIX */ + 1426, /* GL_TEXTURE_COMPARE_SGIX */ + 1425, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */ + 1476, /* GL_TEXTURE_LEQUAL_R_SGIX */ + 1468, /* GL_TEXTURE_GEQUAL_R_SGIX */ 294, /* GL_DEPTH_COMPONENT16 */ 297, /* GL_DEPTH_COMPONENT24 */ 300, /* GL_DEPTH_COMPONENT32 */ 251, /* GL_CULL_VERTEX_EXT */ 253, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */ 252, /* GL_CULL_VERTEX_EYE_POSITION_EXT */ - 1604, /* GL_WRAP_BORDER_SUN */ - 1415, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */ - 551, /* GL_LIGHT_MODEL_COLOR_CONTROL */ - 1236, /* GL_SINGLE_COLOR */ - 1227, /* GL_SEPARATE_SPECULAR_COLOR */ - 1233, /* GL_SHARED_TEXTURE_PALETTE_EXT */ - 1530, /* GL_UNSIGNED_BYTE_2_3_3_REV */ - 1543, /* GL_UNSIGNED_SHORT_5_6_5 */ - 1544, /* GL_UNSIGNED_SHORT_5_6_5_REV */ - 1541, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */ - 1539, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */ - 1537, /* GL_UNSIGNED_INT_8_8_8_8_REV */ - 1535, /* GL_UNSIGNED_INT_2_10_10_10_REV */ - 1484, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */ - 1485, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */ - 1483, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */ - 794, /* GL_MIRRORED_REPEAT */ - 1189, /* GL_RGB_S3TC */ - 1166, /* GL_RGB4_S3TC */ - 1188, /* GL_RGBA_S3TC */ - 1183, /* GL_RGBA4_S3TC */ - 1186, /* GL_RGBA_DXT5_S3TC */ - 1181, /* GL_RGBA4_DXT5_S3TC */ + 1608, /* GL_WRAP_BORDER_SUN */ + 1419, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */ + 555, /* GL_LIGHT_MODEL_COLOR_CONTROL */ + 1240, /* GL_SINGLE_COLOR */ + 1231, /* GL_SEPARATE_SPECULAR_COLOR */ + 1237, /* GL_SHARED_TEXTURE_PALETTE_EXT */ + 1534, /* GL_UNSIGNED_BYTE_2_3_3_REV */ + 1547, /* GL_UNSIGNED_SHORT_5_6_5 */ + 1548, /* GL_UNSIGNED_SHORT_5_6_5_REV */ + 1545, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */ + 1543, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */ + 1541, /* GL_UNSIGNED_INT_8_8_8_8_REV */ + 1539, /* GL_UNSIGNED_INT_2_10_10_10_REV */ + 1488, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */ + 1489, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */ + 1487, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */ + 798, /* GL_MIRRORED_REPEAT */ + 1193, /* GL_RGB_S3TC */ + 1170, /* GL_RGB4_S3TC */ + 1192, /* GL_RGBA_S3TC */ + 1187, /* GL_RGBA4_S3TC */ + 1190, /* GL_RGBA_DXT5_S3TC */ + 1185, /* GL_RGBA4_DXT5_S3TC */ 217, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */ 212, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */ 213, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */ 214, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */ - 855, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */ - 854, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */ - 559, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */ + 859, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */ + 858, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */ + 563, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */ 415, /* GL_FOG_COORDINATE_SOURCE */ 407, /* GL_FOG_COORD */ 431, /* GL_FRAGMENT_DEPTH */ @@ -3971,286 +3979,286 @@ static const unsigned reduced_enums[1233] = 409, /* GL_FOG_COORDINATE_ARRAY */ 164, /* GL_COLOR_SUM */ 275, /* GL_CURRENT_SECONDARY_COLOR */ - 1220, /* GL_SECONDARY_COLOR_ARRAY_SIZE */ - 1222, /* GL_SECONDARY_COLOR_ARRAY_TYPE */ - 1221, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */ - 1219, /* GL_SECONDARY_COLOR_ARRAY_POINTER */ - 1216, /* GL_SECONDARY_COLOR_ARRAY */ + 1224, /* GL_SECONDARY_COLOR_ARRAY_SIZE */ + 1226, /* GL_SECONDARY_COLOR_ARRAY_TYPE */ + 1225, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */ + 1223, /* GL_SECONDARY_COLOR_ARRAY_POINTER */ + 1220, /* GL_SECONDARY_COLOR_ARRAY */ 24, /* GL_ALIASED_POINT_SIZE_RANGE */ 23, /* GL_ALIASED_LINE_WIDTH_RANGE */ - 1326, /* GL_TEXTURE0 */ - 1328, /* GL_TEXTURE1 */ - 1350, /* GL_TEXTURE2 */ - 1372, /* GL_TEXTURE3 */ - 1378, /* GL_TEXTURE4 */ - 1380, /* GL_TEXTURE5 */ - 1382, /* GL_TEXTURE6 */ - 1384, /* GL_TEXTURE7 */ - 1386, /* GL_TEXTURE8 */ - 1388, /* GL_TEXTURE9 */ - 1329, /* GL_TEXTURE10 */ - 1331, /* GL_TEXTURE11 */ - 1333, /* GL_TEXTURE12 */ - 1335, /* GL_TEXTURE13 */ - 1337, /* GL_TEXTURE14 */ - 1339, /* GL_TEXTURE15 */ - 1341, /* GL_TEXTURE16 */ - 1343, /* GL_TEXTURE17 */ - 1345, /* GL_TEXTURE18 */ - 1347, /* GL_TEXTURE19 */ - 1351, /* GL_TEXTURE20 */ - 1353, /* GL_TEXTURE21 */ - 1355, /* GL_TEXTURE22 */ - 1357, /* GL_TEXTURE23 */ - 1359, /* GL_TEXTURE24 */ - 1361, /* GL_TEXTURE25 */ - 1363, /* GL_TEXTURE26 */ - 1365, /* GL_TEXTURE27 */ - 1367, /* GL_TEXTURE28 */ - 1369, /* GL_TEXTURE29 */ - 1373, /* GL_TEXTURE30 */ - 1375, /* GL_TEXTURE31 */ + 1330, /* GL_TEXTURE0 */ + 1332, /* GL_TEXTURE1 */ + 1354, /* GL_TEXTURE2 */ + 1376, /* GL_TEXTURE3 */ + 1382, /* GL_TEXTURE4 */ + 1384, /* GL_TEXTURE5 */ + 1386, /* GL_TEXTURE6 */ + 1388, /* GL_TEXTURE7 */ + 1390, /* GL_TEXTURE8 */ + 1392, /* GL_TEXTURE9 */ + 1333, /* GL_TEXTURE10 */ + 1335, /* GL_TEXTURE11 */ + 1337, /* GL_TEXTURE12 */ + 1339, /* GL_TEXTURE13 */ + 1341, /* GL_TEXTURE14 */ + 1343, /* GL_TEXTURE15 */ + 1345, /* GL_TEXTURE16 */ + 1347, /* GL_TEXTURE17 */ + 1349, /* GL_TEXTURE18 */ + 1351, /* GL_TEXTURE19 */ + 1355, /* GL_TEXTURE20 */ + 1357, /* GL_TEXTURE21 */ + 1359, /* GL_TEXTURE22 */ + 1361, /* GL_TEXTURE23 */ + 1363, /* GL_TEXTURE24 */ + 1365, /* GL_TEXTURE25 */ + 1367, /* GL_TEXTURE26 */ + 1369, /* GL_TEXTURE27 */ + 1371, /* GL_TEXTURE28 */ + 1373, /* GL_TEXTURE29 */ + 1377, /* GL_TEXTURE30 */ + 1379, /* GL_TEXTURE31 */ 16, /* GL_ACTIVE_TEXTURE */ 114, /* GL_CLIENT_ACTIVE_TEXTURE */ - 776, /* GL_MAX_TEXTURE_UNITS */ - 1509, /* GL_TRANSPOSE_MODELVIEW_MATRIX */ - 1512, /* GL_TRANSPOSE_PROJECTION_MATRIX */ - 1514, /* GL_TRANSPOSE_TEXTURE_MATRIX */ - 1506, /* GL_TRANSPOSE_COLOR_MATRIX */ - 1314, /* GL_SUBTRACT */ - 767, /* GL_MAX_RENDERBUFFER_SIZE_EXT */ + 780, /* GL_MAX_TEXTURE_UNITS */ + 1513, /* GL_TRANSPOSE_MODELVIEW_MATRIX */ + 1516, /* GL_TRANSPOSE_PROJECTION_MATRIX */ + 1518, /* GL_TRANSPOSE_TEXTURE_MATRIX */ + 1510, /* GL_TRANSPOSE_COLOR_MATRIX */ + 1318, /* GL_SUBTRACT */ + 771, /* GL_MAX_RENDERBUFFER_SIZE_EXT */ 200, /* GL_COMPRESSED_ALPHA */ 204, /* GL_COMPRESSED_LUMINANCE */ 205, /* GL_COMPRESSED_LUMINANCE_ALPHA */ 202, /* GL_COMPRESSED_INTENSITY */ 208, /* GL_COMPRESSED_RGB */ 209, /* GL_COMPRESSED_RGBA */ - 1429, /* GL_TEXTURE_COMPRESSION_HINT */ - 1491, /* GL_TEXTURE_RECTANGLE_ARB */ - 1401, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */ - 1109, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */ - 765, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */ + 1433, /* GL_TEXTURE_COMPRESSION_HINT */ + 1495, /* GL_TEXTURE_RECTANGLE_ARB */ + 1405, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */ + 1113, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */ + 769, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */ 306, /* GL_DEPTH_STENCIL_NV */ - 1534, /* GL_UNSIGNED_INT_24_8_NV */ - 772, /* GL_MAX_TEXTURE_LOD_BIAS */ - 1482, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */ - 773, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */ - 1458, /* GL_TEXTURE_FILTER_CONTROL */ - 1473, /* GL_TEXTURE_LOD_BIAS */ + 1538, /* GL_UNSIGNED_INT_24_8_NV */ + 776, /* GL_MAX_TEXTURE_LOD_BIAS */ + 1486, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */ + 777, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */ + 1462, /* GL_TEXTURE_FILTER_CONTROL */ + 1477, /* GL_TEXTURE_LOD_BIAS */ 187, /* GL_COMBINE4 */ - 768, /* GL_MAX_SHININESS_NV */ - 769, /* GL_MAX_SPOT_EXPONENT_NV */ - 497, /* GL_INCR_WRAP */ + 772, /* GL_MAX_SHININESS_NV */ + 773, /* GL_MAX_SPOT_EXPONENT_NV */ + 501, /* GL_INCR_WRAP */ 282, /* GL_DECR_WRAP */ - 814, /* GL_MODELVIEW1_ARB */ - 870, /* GL_NORMAL_MAP */ - 1136, /* GL_REFLECTION_MAP */ - 1438, /* GL_TEXTURE_CUBE_MAP */ - 1399, /* GL_TEXTURE_BINDING_CUBE_MAP */ - 1446, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */ - 1440, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */ - 1448, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */ - 1442, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */ - 1450, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ - 1444, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */ - 1107, /* GL_PROXY_TEXTURE_CUBE_MAP */ - 723, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */ - 849, /* GL_MULTISAMPLE_FILTER_HINT_NV */ + 818, /* GL_MODELVIEW1_ARB */ + 874, /* GL_NORMAL_MAP */ + 1140, /* GL_REFLECTION_MAP */ + 1442, /* GL_TEXTURE_CUBE_MAP */ + 1403, /* GL_TEXTURE_BINDING_CUBE_MAP */ + 1450, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */ + 1444, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */ + 1452, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */ + 1446, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */ + 1454, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */ + 1448, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */ + 1111, /* GL_PROXY_TEXTURE_CUBE_MAP */ + 727, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */ + 853, /* GL_MULTISAMPLE_FILTER_HINT_NV */ 423, /* GL_FOG_DISTANCE_MODE_NV */ 388, /* GL_EYE_RADIAL_NV */ 387, /* GL_EYE_PLANE_ABSOLUTE_NV */ 186, /* GL_COMBINE */ 193, /* GL_COMBINE_RGB */ 188, /* GL_COMBINE_ALPHA */ - 1190, /* GL_RGB_SCALE */ + 1194, /* GL_RGB_SCALE */ 20, /* GL_ADD_SIGNED */ - 523, /* GL_INTERPOLATE */ + 527, /* GL_INTERPOLATE */ 219, /* GL_CONSTANT */ - 1059, /* GL_PRIMARY_COLOR */ - 1056, /* GL_PREVIOUS */ - 1247, /* GL_SOURCE0_RGB */ - 1253, /* GL_SOURCE1_RGB */ - 1259, /* GL_SOURCE2_RGB */ - 1263, /* GL_SOURCE3_RGB_NV */ - 1244, /* GL_SOURCE0_ALPHA */ - 1250, /* GL_SOURCE1_ALPHA */ - 1256, /* GL_SOURCE2_ALPHA */ - 1262, /* GL_SOURCE3_ALPHA_NV */ - 906, /* GL_OPERAND0_RGB */ - 912, /* GL_OPERAND1_RGB */ - 918, /* GL_OPERAND2_RGB */ - 922, /* GL_OPERAND3_RGB_NV */ - 903, /* GL_OPERAND0_ALPHA */ - 909, /* GL_OPERAND1_ALPHA */ - 915, /* GL_OPERAND2_ALPHA */ - 921, /* GL_OPERAND3_ALPHA_NV */ - 1608, /* GL_YCBCR_422_APPLE */ - 1545, /* GL_UNSIGNED_SHORT_8_8_APPLE */ - 1547, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */ - 1238, /* GL_SLICE_ACCUM_SUN */ - 1114, /* GL_QUAD_MESH_SUN */ - 1518, /* GL_TRIANGLE_MESH_SUN */ - 1585, /* GL_VERTEX_PROGRAM_ARB */ - 1593, /* GL_VERTEX_STATE_PROGRAM_NV */ - 1578, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */ - 1581, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */ - 1582, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */ - 1583, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */ + 1063, /* GL_PRIMARY_COLOR */ + 1060, /* GL_PREVIOUS */ + 1251, /* GL_SOURCE0_RGB */ + 1257, /* GL_SOURCE1_RGB */ + 1263, /* GL_SOURCE2_RGB */ + 1267, /* GL_SOURCE3_RGB_NV */ + 1248, /* GL_SOURCE0_ALPHA */ + 1254, /* GL_SOURCE1_ALPHA */ + 1260, /* GL_SOURCE2_ALPHA */ + 1266, /* GL_SOURCE3_ALPHA_NV */ + 910, /* GL_OPERAND0_RGB */ + 916, /* GL_OPERAND1_RGB */ + 922, /* GL_OPERAND2_RGB */ + 926, /* GL_OPERAND3_RGB_NV */ + 907, /* GL_OPERAND0_ALPHA */ + 913, /* GL_OPERAND1_ALPHA */ + 919, /* GL_OPERAND2_ALPHA */ + 925, /* GL_OPERAND3_ALPHA_NV */ + 1612, /* GL_YCBCR_422_APPLE */ + 1549, /* GL_UNSIGNED_SHORT_8_8_APPLE */ + 1551, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */ + 1242, /* GL_SLICE_ACCUM_SUN */ + 1118, /* GL_QUAD_MESH_SUN */ + 1522, /* GL_TRIANGLE_MESH_SUN */ + 1589, /* GL_VERTEX_PROGRAM_ARB */ + 1597, /* GL_VERTEX_STATE_PROGRAM_NV */ + 1582, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */ + 1585, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */ + 1586, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */ + 1587, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */ 277, /* GL_CURRENT_VERTEX_ATTRIB_ARB */ - 1072, /* GL_PROGRAM_LENGTH_ARB */ - 1086, /* GL_PROGRAM_STRING_ARB */ - 836, /* GL_MODELVIEW_PROJECTION_NV */ - 492, /* GL_IDENTITY_NV */ - 533, /* GL_INVERSE_NV */ - 1511, /* GL_TRANSPOSE_NV */ - 534, /* GL_INVERSE_TRANSPOSE_NV */ - 751, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */ - 750, /* GL_MAX_PROGRAM_MATRICES_ARB */ - 662, /* GL_MATRIX0_NV */ - 674, /* GL_MATRIX1_NV */ - 686, /* GL_MATRIX2_NV */ - 690, /* GL_MATRIX3_NV */ - 692, /* GL_MATRIX4_NV */ - 694, /* GL_MATRIX5_NV */ - 696, /* GL_MATRIX6_NV */ - 698, /* GL_MATRIX7_NV */ + 1076, /* GL_PROGRAM_LENGTH_ARB */ + 1090, /* GL_PROGRAM_STRING_ARB */ + 840, /* GL_MODELVIEW_PROJECTION_NV */ + 496, /* GL_IDENTITY_NV */ + 537, /* GL_INVERSE_NV */ + 1515, /* GL_TRANSPOSE_NV */ + 538, /* GL_INVERSE_TRANSPOSE_NV */ + 755, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */ + 754, /* GL_MAX_PROGRAM_MATRICES_ARB */ + 666, /* GL_MATRIX0_NV */ + 678, /* GL_MATRIX1_NV */ + 690, /* GL_MATRIX2_NV */ + 694, /* GL_MATRIX3_NV */ + 696, /* GL_MATRIX4_NV */ + 698, /* GL_MATRIX5_NV */ + 700, /* GL_MATRIX6_NV */ + 702, /* GL_MATRIX7_NV */ 263, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */ 260, /* GL_CURRENT_MATRIX_ARB */ - 1588, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */ - 1590, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */ - 1084, /* GL_PROGRAM_PARAMETER_NV */ - 1580, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */ - 1088, /* GL_PROGRAM_TARGET_NV */ - 1085, /* GL_PROGRAM_RESIDENT_NV */ - 1503, /* GL_TRACK_MATRIX_NV */ - 1504, /* GL_TRACK_MATRIX_TRANSFORM_NV */ - 1586, /* GL_VERTEX_PROGRAM_BINDING_NV */ - 1066, /* GL_PROGRAM_ERROR_POSITION_ARB */ + 1592, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */ + 1594, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */ + 1088, /* GL_PROGRAM_PARAMETER_NV */ + 1584, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */ + 1092, /* GL_PROGRAM_TARGET_NV */ + 1089, /* GL_PROGRAM_RESIDENT_NV */ + 1507, /* GL_TRACK_MATRIX_NV */ + 1508, /* GL_TRACK_MATRIX_TRANSFORM_NV */ + 1590, /* GL_VERTEX_PROGRAM_BINDING_NV */ + 1070, /* GL_PROGRAM_ERROR_POSITION_ARB */ 291, /* GL_DEPTH_CLAMP_NV */ - 1560, /* GL_VERTEX_ATTRIB_ARRAY0_NV */ - 1567, /* GL_VERTEX_ATTRIB_ARRAY1_NV */ - 1568, /* GL_VERTEX_ATTRIB_ARRAY2_NV */ - 1569, /* GL_VERTEX_ATTRIB_ARRAY3_NV */ - 1570, /* GL_VERTEX_ATTRIB_ARRAY4_NV */ - 1571, /* GL_VERTEX_ATTRIB_ARRAY5_NV */ - 1572, /* GL_VERTEX_ATTRIB_ARRAY6_NV */ - 1573, /* GL_VERTEX_ATTRIB_ARRAY7_NV */ - 1574, /* GL_VERTEX_ATTRIB_ARRAY8_NV */ - 1575, /* GL_VERTEX_ATTRIB_ARRAY9_NV */ - 1561, /* GL_VERTEX_ATTRIB_ARRAY10_NV */ - 1562, /* GL_VERTEX_ATTRIB_ARRAY11_NV */ - 1563, /* GL_VERTEX_ATTRIB_ARRAY12_NV */ - 1564, /* GL_VERTEX_ATTRIB_ARRAY13_NV */ - 1565, /* GL_VERTEX_ATTRIB_ARRAY14_NV */ - 1566, /* GL_VERTEX_ATTRIB_ARRAY15_NV */ - 616, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */ - 623, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */ - 624, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */ - 625, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */ - 626, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */ - 627, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */ - 628, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */ - 629, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */ - 630, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */ - 631, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */ - 617, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */ - 618, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */ - 619, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */ - 620, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */ - 621, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */ - 622, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */ - 643, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */ - 650, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */ - 651, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */ - 652, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */ - 653, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */ - 654, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */ - 655, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */ - 1065, /* GL_PROGRAM_BINDING_ARB */ - 657, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */ - 658, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */ - 644, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */ - 645, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */ - 646, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */ - 647, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */ - 648, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */ - 649, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */ - 1427, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */ - 1424, /* GL_TEXTURE_COMPRESSED */ - 875, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */ + 1564, /* GL_VERTEX_ATTRIB_ARRAY0_NV */ + 1571, /* GL_VERTEX_ATTRIB_ARRAY1_NV */ + 1572, /* GL_VERTEX_ATTRIB_ARRAY2_NV */ + 1573, /* GL_VERTEX_ATTRIB_ARRAY3_NV */ + 1574, /* GL_VERTEX_ATTRIB_ARRAY4_NV */ + 1575, /* GL_VERTEX_ATTRIB_ARRAY5_NV */ + 1576, /* GL_VERTEX_ATTRIB_ARRAY6_NV */ + 1577, /* GL_VERTEX_ATTRIB_ARRAY7_NV */ + 1578, /* GL_VERTEX_ATTRIB_ARRAY8_NV */ + 1579, /* GL_VERTEX_ATTRIB_ARRAY9_NV */ + 1565, /* GL_VERTEX_ATTRIB_ARRAY10_NV */ + 1566, /* GL_VERTEX_ATTRIB_ARRAY11_NV */ + 1567, /* GL_VERTEX_ATTRIB_ARRAY12_NV */ + 1568, /* GL_VERTEX_ATTRIB_ARRAY13_NV */ + 1569, /* GL_VERTEX_ATTRIB_ARRAY14_NV */ + 1570, /* GL_VERTEX_ATTRIB_ARRAY15_NV */ + 620, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */ + 627, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */ + 628, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */ + 629, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */ + 630, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */ + 631, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */ + 632, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */ + 633, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */ + 634, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */ + 635, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */ + 621, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */ + 622, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */ + 623, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */ + 624, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */ + 625, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */ + 626, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */ + 647, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */ + 654, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */ + 655, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */ + 656, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */ + 657, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */ + 658, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */ + 659, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */ + 1069, /* GL_PROGRAM_BINDING_ARB */ + 661, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */ + 662, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */ + 648, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */ + 649, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */ + 650, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */ + 651, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */ + 652, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */ + 653, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */ + 1431, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */ + 1428, /* GL_TEXTURE_COMPRESSED */ + 879, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */ 218, /* GL_COMPRESSED_TEXTURE_FORMATS */ - 784, /* GL_MAX_VERTEX_UNITS_ARB */ + 788, /* GL_MAX_VERTEX_UNITS_ARB */ 18, /* GL_ACTIVE_VERTEX_UNITS_ARB */ - 1603, /* GL_WEIGHT_SUM_UNITY_ARB */ - 1584, /* GL_VERTEX_BLEND_ARB */ + 1607, /* GL_WEIGHT_SUM_UNITY_ARB */ + 1588, /* GL_VERTEX_BLEND_ARB */ 278, /* GL_CURRENT_WEIGHT_ARB */ - 1602, /* GL_WEIGHT_ARRAY_TYPE_ARB */ - 1601, /* GL_WEIGHT_ARRAY_STRIDE_ARB */ - 1600, /* GL_WEIGHT_ARRAY_SIZE_ARB */ - 1599, /* GL_WEIGHT_ARRAY_POINTER_ARB */ - 1596, /* GL_WEIGHT_ARRAY_ARB */ + 1606, /* GL_WEIGHT_ARRAY_TYPE_ARB */ + 1605, /* GL_WEIGHT_ARRAY_STRIDE_ARB */ + 1604, /* GL_WEIGHT_ARRAY_SIZE_ARB */ + 1603, /* GL_WEIGHT_ARRAY_POINTER_ARB */ + 1600, /* GL_WEIGHT_ARRAY_ARB */ 317, /* GL_DOT3_RGB */ 318, /* GL_DOT3_RGBA */ 216, /* GL_COMPRESSED_RGB_FXT1_3DFX */ 211, /* GL_COMPRESSED_RGBA_FXT1_3DFX */ - 844, /* GL_MULTISAMPLE_3DFX */ - 1205, /* GL_SAMPLE_BUFFERS_3DFX */ - 1196, /* GL_SAMPLES_3DFX */ - 825, /* GL_MODELVIEW2_ARB */ - 828, /* GL_MODELVIEW3_ARB */ - 829, /* GL_MODELVIEW4_ARB */ - 830, /* GL_MODELVIEW5_ARB */ - 831, /* GL_MODELVIEW6_ARB */ - 832, /* GL_MODELVIEW7_ARB */ - 833, /* GL_MODELVIEW8_ARB */ - 834, /* GL_MODELVIEW9_ARB */ - 804, /* GL_MODELVIEW10_ARB */ - 805, /* GL_MODELVIEW11_ARB */ - 806, /* GL_MODELVIEW12_ARB */ - 807, /* GL_MODELVIEW13_ARB */ - 808, /* GL_MODELVIEW14_ARB */ - 809, /* GL_MODELVIEW15_ARB */ - 810, /* GL_MODELVIEW16_ARB */ - 811, /* GL_MODELVIEW17_ARB */ - 812, /* GL_MODELVIEW18_ARB */ - 813, /* GL_MODELVIEW19_ARB */ - 815, /* GL_MODELVIEW20_ARB */ - 816, /* GL_MODELVIEW21_ARB */ - 817, /* GL_MODELVIEW22_ARB */ - 818, /* GL_MODELVIEW23_ARB */ - 819, /* GL_MODELVIEW24_ARB */ - 820, /* GL_MODELVIEW25_ARB */ - 821, /* GL_MODELVIEW26_ARB */ - 822, /* GL_MODELVIEW27_ARB */ - 823, /* GL_MODELVIEW28_ARB */ - 824, /* GL_MODELVIEW29_ARB */ - 826, /* GL_MODELVIEW30_ARB */ - 827, /* GL_MODELVIEW31_ARB */ + 848, /* GL_MULTISAMPLE_3DFX */ + 1209, /* GL_SAMPLE_BUFFERS_3DFX */ + 1200, /* GL_SAMPLES_3DFX */ + 829, /* GL_MODELVIEW2_ARB */ + 832, /* GL_MODELVIEW3_ARB */ + 833, /* GL_MODELVIEW4_ARB */ + 834, /* GL_MODELVIEW5_ARB */ + 835, /* GL_MODELVIEW6_ARB */ + 836, /* GL_MODELVIEW7_ARB */ + 837, /* GL_MODELVIEW8_ARB */ + 838, /* GL_MODELVIEW9_ARB */ + 808, /* GL_MODELVIEW10_ARB */ + 809, /* GL_MODELVIEW11_ARB */ + 810, /* GL_MODELVIEW12_ARB */ + 811, /* GL_MODELVIEW13_ARB */ + 812, /* GL_MODELVIEW14_ARB */ + 813, /* GL_MODELVIEW15_ARB */ + 814, /* GL_MODELVIEW16_ARB */ + 815, /* GL_MODELVIEW17_ARB */ + 816, /* GL_MODELVIEW18_ARB */ + 817, /* GL_MODELVIEW19_ARB */ + 819, /* GL_MODELVIEW20_ARB */ + 820, /* GL_MODELVIEW21_ARB */ + 821, /* GL_MODELVIEW22_ARB */ + 822, /* GL_MODELVIEW23_ARB */ + 823, /* GL_MODELVIEW24_ARB */ + 824, /* GL_MODELVIEW25_ARB */ + 825, /* GL_MODELVIEW26_ARB */ + 826, /* GL_MODELVIEW27_ARB */ + 827, /* GL_MODELVIEW28_ARB */ + 828, /* GL_MODELVIEW29_ARB */ + 830, /* GL_MODELVIEW30_ARB */ + 831, /* GL_MODELVIEW31_ARB */ 322, /* GL_DOT3_RGB_EXT */ 320, /* GL_DOT3_RGBA_EXT */ - 798, /* GL_MIRROR_CLAMP_EXT */ - 801, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */ - 839, /* GL_MODULATE_ADD_ATI */ - 840, /* GL_MODULATE_SIGNED_ADD_ATI */ - 841, /* GL_MODULATE_SUBTRACT_ATI */ - 1609, /* GL_YCBCR_MESA */ - 930, /* GL_PACK_INVERT_MESA */ + 802, /* GL_MIRROR_CLAMP_EXT */ + 805, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */ + 843, /* GL_MODULATE_ADD_ATI */ + 844, /* GL_MODULATE_SIGNED_ADD_ATI */ + 845, /* GL_MODULATE_SUBTRACT_ATI */ + 1613, /* GL_YCBCR_MESA */ + 934, /* GL_PACK_INVERT_MESA */ 97, /* GL_BUFFER_SIZE */ 99, /* GL_BUFFER_USAGE */ 432, /* GL_FRAGMENT_PROGRAM_ARB */ - 1063, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */ - 1091, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */ - 1090, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */ - 1075, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ - 1081, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ - 1080, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ - 740, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */ - 763, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */ - 762, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */ - 753, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ - 759, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ - 758, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ - 725, /* GL_MAX_DRAW_BUFFERS_ARB */ + 1067, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */ + 1095, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */ + 1094, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */ + 1079, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ + 1085, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ + 1084, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ + 744, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */ + 767, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */ + 766, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */ + 757, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */ + 763, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */ + 762, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */ + 729, /* GL_MAX_DRAW_BUFFERS_ARB */ 326, /* GL_DRAW_BUFFER0_ARB */ 340, /* GL_DRAW_BUFFER1_ARB */ 342, /* GL_DRAW_BUFFER2_ARB */ @@ -4268,156 +4276,156 @@ static const unsigned reduced_enums[1233] = 336, /* GL_DRAW_BUFFER14_ARB */ 338, /* GL_DRAW_BUFFER15_ARB */ 77, /* GL_BLEND_EQUATION_ALPHA_EXT */ - 707, /* GL_MATRIX_PALETTE_ARB */ - 734, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */ - 737, /* GL_MAX_PALETTE_MATRICES_ARB */ + 711, /* GL_MATRIX_PALETTE_ARB */ + 738, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */ + 741, /* GL_MAX_PALETTE_MATRICES_ARB */ 266, /* GL_CURRENT_PALETTE_MATRIX_ARB */ - 701, /* GL_MATRIX_INDEX_ARRAY_ARB */ + 705, /* GL_MATRIX_INDEX_ARRAY_ARB */ 261, /* GL_CURRENT_MATRIX_INDEX_ARB */ - 703, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */ - 705, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */ - 704, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */ - 702, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */ - 1453, /* GL_TEXTURE_DEPTH_SIZE */ + 707, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */ + 709, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */ + 708, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */ + 706, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */ + 1457, /* GL_TEXTURE_DEPTH_SIZE */ 310, /* GL_DEPTH_TEXTURE_MODE */ - 1419, /* GL_TEXTURE_COMPARE_MODE */ - 1417, /* GL_TEXTURE_COMPARE_FUNC */ + 1423, /* GL_TEXTURE_COMPARE_MODE */ + 1421, /* GL_TEXTURE_COMPARE_FUNC */ 196, /* GL_COMPARE_R_TO_TEXTURE */ - 998, /* GL_POINT_SPRITE_ARB */ + 1002, /* GL_POINT_SPRITE_ARB */ 244, /* GL_COORD_REPLACE_ARB */ - 1001, /* GL_POINT_SPRITE_R_MODE_NV */ - 1116, /* GL_QUERY_COUNTER_BITS */ + 1005, /* GL_POINT_SPRITE_R_MODE_NV */ + 1120, /* GL_QUERY_COUNTER_BITS */ 267, /* GL_CURRENT_QUERY */ - 1118, /* GL_QUERY_RESULT */ - 1120, /* GL_QUERY_RESULT_AVAILABLE */ - 781, /* GL_MAX_VERTEX_ATTRIBS_ARB */ - 1579, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */ + 1122, /* GL_QUERY_RESULT */ + 1124, /* GL_QUERY_RESULT_AVAILABLE */ + 785, /* GL_MAX_VERTEX_ATTRIBS_ARB */ + 1583, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */ 308, /* GL_DEPTH_STENCIL_TO_RGBA_NV */ 307, /* GL_DEPTH_STENCIL_TO_BGRA_NV */ - 770, /* GL_MAX_TEXTURE_COORDS_ARB */ - 771, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */ - 1068, /* GL_PROGRAM_ERROR_STRING_ARB */ - 1070, /* GL_PROGRAM_FORMAT_ASCII_ARB */ - 1069, /* GL_PROGRAM_FORMAT_ARB */ - 1498, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */ + 774, /* GL_MAX_TEXTURE_COORDS_ARB */ + 775, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */ + 1072, /* GL_PROGRAM_ERROR_STRING_ARB */ + 1074, /* GL_PROGRAM_FORMAT_ASCII_ARB */ + 1073, /* GL_PROGRAM_FORMAT_ARB */ + 1502, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */ 289, /* GL_DEPTH_BOUNDS_TEST_EXT */ 288, /* GL_DEPTH_BOUNDS_EXT */ 48, /* GL_ARRAY_BUFFER */ 373, /* GL_ELEMENT_ARRAY_BUFFER */ 50, /* GL_ARRAY_BUFFER_BINDING */ 375, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */ - 1554, /* GL_VERTEX_ARRAY_BUFFER_BINDING */ - 865, /* GL_NORMAL_ARRAY_BUFFER_BINDING */ + 1558, /* GL_VERTEX_ARRAY_BUFFER_BINDING */ + 869, /* GL_NORMAL_ARRAY_BUFFER_BINDING */ 130, /* GL_COLOR_ARRAY_BUFFER_BINDING */ - 500, /* GL_INDEX_ARRAY_BUFFER_BINDING */ - 1432, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */ + 504, /* GL_INDEX_ARRAY_BUFFER_BINDING */ + 1436, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */ 369, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */ - 1217, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */ + 1221, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */ 410, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */ - 1597, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */ - 1576, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */ - 1071, /* GL_PROGRAM_INSTRUCTIONS_ARB */ - 746, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */ - 1077, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ - 755, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ - 1089, /* GL_PROGRAM_TEMPORARIES_ARB */ - 761, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */ - 1079, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */ - 757, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */ - 1083, /* GL_PROGRAM_PARAMETERS_ARB */ - 760, /* GL_MAX_PROGRAM_PARAMETERS_ARB */ - 1078, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */ - 756, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */ - 1064, /* GL_PROGRAM_ATTRIBS_ARB */ - 741, /* GL_MAX_PROGRAM_ATTRIBS_ARB */ - 1076, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */ - 754, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */ - 1062, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */ - 739, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */ - 1074, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ - 752, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ - 747, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */ - 743, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */ - 1092, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */ - 1508, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */ - 1126, /* GL_READ_ONLY */ - 1605, /* GL_WRITE_ONLY */ - 1128, /* GL_READ_WRITE */ + 1601, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */ + 1580, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */ + 1075, /* GL_PROGRAM_INSTRUCTIONS_ARB */ + 750, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */ + 1081, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ + 759, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */ + 1093, /* GL_PROGRAM_TEMPORARIES_ARB */ + 765, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */ + 1083, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */ + 761, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */ + 1087, /* GL_PROGRAM_PARAMETERS_ARB */ + 764, /* GL_MAX_PROGRAM_PARAMETERS_ARB */ + 1082, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */ + 760, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */ + 1068, /* GL_PROGRAM_ATTRIBS_ARB */ + 745, /* GL_MAX_PROGRAM_ATTRIBS_ARB */ + 1080, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */ + 758, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */ + 1066, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */ + 743, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */ + 1078, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ + 756, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */ + 751, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */ + 747, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */ + 1096, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */ + 1512, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */ + 1130, /* GL_READ_ONLY */ + 1609, /* GL_WRITE_ONLY */ + 1132, /* GL_READ_WRITE */ 91, /* GL_BUFFER_ACCESS */ 93, /* GL_BUFFER_MAPPED */ 95, /* GL_BUFFER_MAP_POINTER */ - 467, /* GL_GL_TIME_ELAPSED_EXT */ - 661, /* GL_MATRIX0_ARB */ - 673, /* GL_MATRIX1_ARB */ - 685, /* GL_MATRIX2_ARB */ - 689, /* GL_MATRIX3_ARB */ - 691, /* GL_MATRIX4_ARB */ - 693, /* GL_MATRIX5_ARB */ - 695, /* GL_MATRIX6_ARB */ - 697, /* GL_MATRIX7_ARB */ - 699, /* GL_MATRIX8_ARB */ - 700, /* GL_MATRIX9_ARB */ - 663, /* GL_MATRIX10_ARB */ - 664, /* GL_MATRIX11_ARB */ - 665, /* GL_MATRIX12_ARB */ - 666, /* GL_MATRIX13_ARB */ - 667, /* GL_MATRIX14_ARB */ - 668, /* GL_MATRIX15_ARB */ - 669, /* GL_MATRIX16_ARB */ - 670, /* GL_MATRIX17_ARB */ - 671, /* GL_MATRIX18_ARB */ - 672, /* GL_MATRIX19_ARB */ - 675, /* GL_MATRIX20_ARB */ - 676, /* GL_MATRIX21_ARB */ - 677, /* GL_MATRIX22_ARB */ - 678, /* GL_MATRIX23_ARB */ - 679, /* GL_MATRIX24_ARB */ - 680, /* GL_MATRIX25_ARB */ - 681, /* GL_MATRIX26_ARB */ - 682, /* GL_MATRIX27_ARB */ - 683, /* GL_MATRIX28_ARB */ - 684, /* GL_MATRIX29_ARB */ - 687, /* GL_MATRIX30_ARB */ - 688, /* GL_MATRIX31_ARB */ - 1309, /* GL_STREAM_DRAW */ - 1311, /* GL_STREAM_READ */ - 1307, /* GL_STREAM_COPY */ - 1282, /* GL_STATIC_DRAW */ - 1284, /* GL_STATIC_READ */ - 1280, /* GL_STATIC_COPY */ + 471, /* GL_GL_TIME_ELAPSED_EXT */ + 665, /* GL_MATRIX0_ARB */ + 677, /* GL_MATRIX1_ARB */ + 689, /* GL_MATRIX2_ARB */ + 693, /* GL_MATRIX3_ARB */ + 695, /* GL_MATRIX4_ARB */ + 697, /* GL_MATRIX5_ARB */ + 699, /* GL_MATRIX6_ARB */ + 701, /* GL_MATRIX7_ARB */ + 703, /* GL_MATRIX8_ARB */ + 704, /* GL_MATRIX9_ARB */ + 667, /* GL_MATRIX10_ARB */ + 668, /* GL_MATRIX11_ARB */ + 669, /* GL_MATRIX12_ARB */ + 670, /* GL_MATRIX13_ARB */ + 671, /* GL_MATRIX14_ARB */ + 672, /* GL_MATRIX15_ARB */ + 673, /* GL_MATRIX16_ARB */ + 674, /* GL_MATRIX17_ARB */ + 675, /* GL_MATRIX18_ARB */ + 676, /* GL_MATRIX19_ARB */ + 679, /* GL_MATRIX20_ARB */ + 680, /* GL_MATRIX21_ARB */ + 681, /* GL_MATRIX22_ARB */ + 682, /* GL_MATRIX23_ARB */ + 683, /* GL_MATRIX24_ARB */ + 684, /* GL_MATRIX25_ARB */ + 685, /* GL_MATRIX26_ARB */ + 686, /* GL_MATRIX27_ARB */ + 687, /* GL_MATRIX28_ARB */ + 688, /* GL_MATRIX29_ARB */ + 691, /* GL_MATRIX30_ARB */ + 692, /* GL_MATRIX31_ARB */ + 1313, /* GL_STREAM_DRAW */ + 1315, /* GL_STREAM_READ */ + 1311, /* GL_STREAM_COPY */ + 1286, /* GL_STATIC_DRAW */ + 1288, /* GL_STATIC_READ */ + 1284, /* GL_STATIC_COPY */ 363, /* GL_DYNAMIC_DRAW */ 365, /* GL_DYNAMIC_READ */ 361, /* GL_DYNAMIC_COPY */ - 971, /* GL_PIXEL_PACK_BUFFER_EXT */ - 973, /* GL_PIXEL_UNPACK_BUFFER_EXT */ - 970, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */ - 972, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */ - 744, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ - 742, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ - 745, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ - 749, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ - 748, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */ - 1303, /* GL_STENCIL_TEST_TWO_SIDE_EXT */ + 975, /* GL_PIXEL_PACK_BUFFER_EXT */ + 977, /* GL_PIXEL_UNPACK_BUFFER_EXT */ + 974, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */ + 976, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */ + 748, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ + 746, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */ + 749, /* GL_MAX_PROGRAM_IF_DEPTH_NV */ + 753, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */ + 752, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */ + 1307, /* GL_STENCIL_TEST_TWO_SIDE_EXT */ 15, /* GL_ACTIVE_STENCIL_FACE_EXT */ - 799, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */ - 1198, /* GL_SAMPLES_PASSED */ + 803, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */ + 1202, /* GL_SAMPLES_PASSED */ 433, /* GL_FRAGMENT_SHADER_ARB */ - 1592, /* GL_VERTEX_SHADER_ARB */ - 1082, /* GL_PROGRAM_OBJECT_ARB */ - 1230, /* GL_SHADER_OBJECT_ARB */ - 731, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */ - 783, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */ - 780, /* GL_MAX_VARYING_FLOATS_ARB */ - 782, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ - 718, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */ - 890, /* GL_OBJECT_TYPE_ARB */ - 889, /* GL_OBJECT_SUBTYPE_ARB */ + 1596, /* GL_VERTEX_SHADER_ARB */ + 1086, /* GL_PROGRAM_OBJECT_ARB */ + 1234, /* GL_SHADER_OBJECT_ARB */ + 735, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */ + 787, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */ + 784, /* GL_MAX_VARYING_FLOATS_ARB */ + 786, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ + 722, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */ + 894, /* GL_OBJECT_TYPE_ARB */ + 893, /* GL_OBJECT_SUBTYPE_ARB */ 401, /* GL_FLOAT_VEC2_ARB */ 402, /* GL_FLOAT_VEC3_ARB */ 403, /* GL_FLOAT_VEC4_ARB */ - 526, /* GL_INT_VEC2_ARB */ - 527, /* GL_INT_VEC3_ARB */ - 528, /* GL_INT_VEC4_ARB */ + 530, /* GL_INT_VEC2_ARB */ + 531, /* GL_INT_VEC3_ARB */ + 532, /* GL_INT_VEC4_ARB */ 87, /* GL_BOOL_ARB */ 88, /* GL_BOOL_VEC2_ARB */ 89, /* GL_BOOL_VEC3_ARB */ @@ -4425,32 +4433,35 @@ static const unsigned reduced_enums[1233] = 398, /* GL_FLOAT_MAT2_ARB */ 399, /* GL_FLOAT_MAT3_ARB */ 400, /* GL_FLOAT_MAT4_ARB */ - 883, /* GL_OBJECT_DELETE_STATUS_ARB */ - 882, /* GL_OBJECT_COMPILE_STATUS_ARB */ - 886, /* GL_OBJECT_LINK_STATUS_ARB */ - 891, /* GL_OBJECT_VALIDATE_STATUS_ARB */ - 884, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */ - 881, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */ - 879, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */ - 880, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */ - 888, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */ - 877, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */ - 878, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */ - 939, /* GL_PALETTE4_RGB8_OES */ - 941, /* GL_PALETTE4_RGBA8_OES */ - 937, /* GL_PALETTE4_R5_G6_B5_OES */ - 940, /* GL_PALETTE4_RGBA4_OES */ - 938, /* GL_PALETTE4_RGB5_A1_OES */ - 944, /* GL_PALETTE8_RGB8_OES */ - 946, /* GL_PALETTE8_RGBA8_OES */ - 942, /* GL_PALETTE8_R5_G6_B5_OES */ - 945, /* GL_PALETTE8_RGBA4_OES */ - 943, /* GL_PALETTE8_RGB5_A1_OES */ - 495, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */ - 494, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */ - 999, /* GL_POINT_SPRITE_COORD_ORIGIN */ + 887, /* GL_OBJECT_DELETE_STATUS_ARB */ + 886, /* GL_OBJECT_COMPILE_STATUS_ARB */ + 890, /* GL_OBJECT_LINK_STATUS_ARB */ + 895, /* GL_OBJECT_VALIDATE_STATUS_ARB */ + 888, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */ + 885, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */ + 883, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */ + 884, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */ + 892, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */ + 881, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */ + 882, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */ + 943, /* GL_PALETTE4_RGB8_OES */ + 945, /* GL_PALETTE4_RGBA8_OES */ + 941, /* GL_PALETTE4_R5_G6_B5_OES */ + 944, /* GL_PALETTE4_RGBA4_OES */ + 942, /* GL_PALETTE4_RGB5_A1_OES */ + 948, /* GL_PALETTE8_RGB8_OES */ + 950, /* GL_PALETTE8_RGBA8_OES */ + 946, /* GL_PALETTE8_R5_G6_B5_OES */ + 949, /* GL_PALETTE8_RGBA4_OES */ + 947, /* GL_PALETTE8_RGB5_A1_OES */ + 499, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */ + 498, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */ + 1003, /* GL_POINT_SPRITE_COORD_ORIGIN */ 439, /* GL_FRAMEBUFFER_BINDING_EXT */ - 1140, /* GL_RENDERBUFFER_BINDING_EXT */ + 1144, /* GL_RENDERBUFFER_BINDING_EXT */ + 470, /* GL_GL_READ_FRAMEBUFFER_EXT */ + 468, /* GL_GL_DRAW_FRAMEBUFFER_EXT */ + 469, /* GL_GL_READ_FRAMEBUFFER_BINDING_EXT */ 435, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */ 434, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */ 438, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */ @@ -4466,7 +4477,7 @@ static const unsigned reduced_enums[1233] = 448, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */ 450, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */ 449, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */ - 715, /* GL_MAX_COLOR_ATTACHMENTS_EXT */ + 719, /* GL_MAX_COLOR_ATTACHMENTS_EXT */ 136, /* GL_COLOR_ATTACHMENT0_EXT */ 143, /* GL_COLOR_ATTACHMENT1_EXT */ 144, /* GL_COLOR_ATTACHMENT2_EXT */ @@ -4484,24 +4495,24 @@ static const unsigned reduced_enums[1233] = 141, /* GL_COLOR_ATTACHMENT14_EXT */ 142, /* GL_COLOR_ATTACHMENT15_EXT */ 285, /* GL_DEPTH_ATTACHMENT_EXT */ - 1287, /* GL_STENCIL_ATTACHMENT_EXT */ + 1291, /* GL_STENCIL_ATTACHMENT_EXT */ 441, /* GL_FRAMEBUFFER_EXT */ - 1141, /* GL_RENDERBUFFER_EXT */ - 1144, /* GL_RENDERBUFFER_WIDTH_EXT */ - 1142, /* GL_RENDERBUFFER_HEIGHT_EXT */ - 1143, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */ - 1298, /* GL_STENCIL_INDEX_EXT */ - 1295, /* GL_STENCIL_INDEX1_EXT */ - 1296, /* GL_STENCIL_INDEX4_EXT */ - 1297, /* GL_STENCIL_INDEX8_EXT */ - 1294, /* GL_STENCIL_INDEX16_EXT */ + 1145, /* GL_RENDERBUFFER_EXT */ + 1148, /* GL_RENDERBUFFER_WIDTH_EXT */ + 1146, /* GL_RENDERBUFFER_HEIGHT_EXT */ + 1147, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */ + 1302, /* GL_STENCIL_INDEX_EXT */ + 1299, /* GL_STENCIL_INDEX1_EXT */ + 1300, /* GL_STENCIL_INDEX4_EXT */ + 1301, /* GL_STENCIL_INDEX8_EXT */ + 1298, /* GL_STENCIL_INDEX16_EXT */ 381, /* GL_EVAL_BIT */ - 1124, /* GL_RASTER_POSITION_UNCLIPPED_IBM */ - 577, /* GL_LIST_BIT */ - 1403, /* GL_TEXTURE_BIT */ - 1213, /* GL_SCISSOR_BIT */ + 1128, /* GL_RASTER_POSITION_UNCLIPPED_IBM */ + 581, /* GL_LIST_BIT */ + 1407, /* GL_TEXTURE_BIT */ + 1217, /* GL_SCISSOR_BIT */ 25, /* GL_ALL_ATTRIB_BITS */ - 846, /* GL_MULTISAMPLE_BIT */ + 850, /* GL_MULTISAMPLE_BIT */ }; #define Elements(x) sizeof(x)/sizeof(*x) diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c index 1655fd66e6e..7d498a82791 100644 --- a/src/mesa/main/execmem.c +++ b/src/mesa/main/execmem.c @@ -36,14 +36,13 @@ -#ifdef __linux__ +#if defined(__linux__) && !defined(XFree86Server) /* * Allocate a large block of memory which can hold code then dole it out * in pieces by means of the generic memory manager code. */ - #include <unistd.h> #include <sys/mman.h> #include "mm.h" diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 850fff6ff1d..448a7c5a122 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -179,7 +179,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx) #if FEATURE_ARB_fragment_program ctx->Extensions.ARB_fragment_program = GL_TRUE; #endif -#if 0 && FEATURE_ARB_fragment_shader +#if FEATURE_ARB_fragment_shader ctx->Extensions.ARB_fragment_shader = GL_TRUE; #endif /*ctx->Extensions.ARB_half_float_pixel = GL_TRUE;*/ @@ -189,10 +189,10 @@ _mesa_enable_sw_extensions(GLcontext *ctx) ctx->Extensions.ARB_occlusion_query = GL_TRUE; #endif ctx->Extensions.ARB_point_sprite = GL_TRUE; -#if 0 && FEATURE_ARB_shader_objects +#if FEATURE_ARB_shader_objects ctx->Extensions.ARB_shader_objects = GL_TRUE; #endif -#if 0 && FEATURE_ARB_shading_language_100 +#if FEATURE_ARB_shading_language_100 ctx->Extensions.ARB_shading_language_100 = GL_TRUE; #endif ctx->Extensions.ARB_shadow = GL_TRUE; @@ -207,7 +207,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx) #if FEATURE_ARB_vertex_program ctx->Extensions.ARB_vertex_program = GL_TRUE; #endif -#if 0 && FEATURE_ARB_vertex_shader +#if FEATURE_ARB_vertex_shader ctx->Extensions.ARB_vertex_shader = GL_TRUE; #endif #if FEATURE_ARB_vertex_buffer_object @@ -229,6 +229,8 @@ _mesa_enable_sw_extensions(GLcontext *ctx) ctx->Extensions.EXT_fog_coord = GL_TRUE; #if FEATURE_EXT_framebuffer_object ctx->Extensions.EXT_framebuffer_object = GL_TRUE; +#endif +#if FEATURE_EXT_framebuffer_blit ctx->Extensions.EXT_framebuffer_blit = GL_TRUE; #endif ctx->Extensions.EXT_histogram = GL_TRUE; @@ -365,19 +367,19 @@ void _mesa_enable_2_0_extensions(GLcontext *ctx) { ctx->Extensions.ARB_draw_buffers = GL_TRUE; -#if 0 && FEATURE_ARB_fragment_shader +#if FEATURE_ARB_fragment_shader ctx->Extensions.ARB_fragment_shader = GL_TRUE; #endif ctx->Extensions.ARB_point_sprite = GL_TRUE; ctx->Extensions.ARB_texture_non_power_of_two = GL_TRUE; -#if 0 && FEATURE_ARB_shader_objects +#if FEATURE_ARB_shader_objects ctx->Extensions.ARB_shader_objects = GL_TRUE; #endif -#if 0 && FEATURE_ARB_shading_language_100 +#if FEATURE_ARB_shading_language_100 ctx->Extensions.ARB_shading_language_100 = GL_TRUE; #endif ctx->Extensions.EXT_stencil_two_side = GL_FALSE; /* yes, turn it off */ -#if 0 && FEATURE_ARB_vertex_shader +#if FEATURE_ARB_vertex_shader ctx->Extensions.ARB_vertex_shader = GL_TRUE; #endif } diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index fdc1ad300b1..8c5bde6edd9 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -937,13 +937,14 @@ check_begin_texture_render(GLcontext *ctx, struct gl_framebuffer *fb) static void check_end_texture_render(GLcontext *ctx, struct gl_framebuffer *fb) { - GLuint i; - ASSERT(ctx->Driver.FinishRenderTexture); - for (i = 0; i < BUFFER_COUNT; i++) { - struct gl_renderbuffer_attachment *att = fb->Attachment + i; - struct gl_texture_object *texObj = att->Texture; - if (texObj) { - ctx->Driver.FinishRenderTexture(ctx, att); + if (ctx->Driver.FinishRenderTexture) { + GLuint i; + for (i = 0; i < BUFFER_COUNT; i++) { + struct gl_renderbuffer_attachment *att = fb->Attachment + i; + struct gl_texture_object *texObj = att->Texture; + if (texObj) { + ctx->Driver.FinishRenderTexture(ctx, att); + } } } } @@ -1067,6 +1068,10 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) if (ctx->Driver.BindFramebuffer) { ctx->Driver.BindFramebuffer(ctx, target, newFb); } + + if (ctx->Driver.BindFramebuffer) { + ctx->Driver.BindFramebuffer(ctx, target, newFb); + } } diff --git a/src/mesa/main/fog.c b/src/mesa/main/fog.c index d3b8a923aae..df99c6519f6 10064 |