diff options
189 files changed, 5942 insertions, 6429 deletions
diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index c07857502..e9f315f6b 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -923,9 +923,25 @@ FcObjectFini (void); FcPrivate FcValue FcValueCanonicalize (const FcValue *v); +FcPrivate FcValueListPtr +FcValueListCreate (void); + FcPrivate void FcValueListDestroy (FcValueListPtr l); +FcPrivate FcValueListPtr +FcValueListPrepend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding); + +FcPrivate FcValueListPtr +FcValueListAppend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding); + +FcPrivate FcValueListPtr +FcValueListDuplicate(FcValueListPtr orig); + FcPrivate FcPatternElt * FcPatternObjectFindElt (const FcPattern *p, FcObject object); @@ -933,6 +949,12 @@ FcPrivate FcPatternElt * FcPatternObjectInsertElt (FcPattern *p, FcObject object); FcPrivate FcBool +FcPatternObjectListAdd (FcPattern *p, + FcObject object, + FcValueListPtr list, + FcBool append); + +FcPrivate FcBool FcPatternObjectAddWithBinding (FcPattern *p, FcObject object, FcValue value, diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c index 623538bd3..970339201 100644 --- a/fontconfig/src/fcmatch.c +++ b/fontconfig/src/fcmatch.c @@ -432,7 +432,7 @@ FcFontRenderPrepare (FcConfig *config, FcPattern *new; int i; FcPatternElt *fe, *pe, *fel, *pel; - FcValue v, vl; + FcValue v; FcResult result; assert (pat != NULL); @@ -440,7 +440,7 @@ FcFontRenderPrepare (FcConfig *config, new = FcPatternCreate (); if (!new) - return 0; + return NULL; for (i = 0; i < font->num; i++) { fe = &FcPatternElts(font)[i]; @@ -478,47 +478,74 @@ FcFontRenderPrepare (FcConfig *config, FcPatternEltValues(fe), &v, NULL, NULL, &result)) { FcPatternDestroy (new); - return 0; + return NULL; } if (fel && pel) { int n = 1, j; + FcValueListPtr l1, l2, ln = NULL, ll = NULL; match = FcObjectToMatcher (pel->object, FcTrue); if (!FcCompareValueList (pel->object, match, FcPatternEltValues (pel), - FcPatternEltValues (fel), &vl, NULL, &n, &result)) + FcPatternEltValues (fel), NULL, NULL, &n, &result)) { FcPatternDestroy (new); return NULL; } - else - { - FcValueListPtr l; - for (j = 0, l = FcPatternEltValues (fe); - j < n && l != NULL; - j++, l = FcValueListNext (l)); - if (l) - v = FcValueCanonicalize (&l->value); + for (j = 0, l1 = FcPatternEltValues (fe), l2 = FcPatternEltValues (fel); + l1 != NULL || l2 != NULL; + j++, l1 = l1 ? FcValueListNext (l1) : NULL, l2 = l2 ? FcValueListNext (l2) : NULL) + { + if (j == n) + { + if (l1) + ln = FcValueListPrepend (ln, + FcValueCanonicalize (&l1->value), + FcValueBindingStrong); + if (l2) + ll = FcValueListPrepend (ll, + FcValueCanonicalize (&l2->value), + FcValueBindingStrong); + } else - v = FcValueCanonicalize (&FcPatternEltValues (fe)->value); + { + if (l1) + ln = FcValueListAppend (ln, + FcValueCanonicalize (&l1->value), + FcValueBindingStrong); + if (l2) + ll = FcValueListAppend (ll, + FcValueCanonicalize (&l2->value), + FcValueBindingStrong); + } } + FcPatternObjectListAdd (new, fe->object, ln, FcFalse); + FcPatternObjectListAdd (new, fel->object, ll, FcFalse); + + continue; } else if (fel) { - vl = FcValueCanonicalize (&FcPatternEltValues (fel)->value); + FcValueListPtr l1, l2; + + copy_lang: + l1 = FcValueListDuplicate (FcPatternEltValues (fe)); + l2 = FcValueListDuplicate (FcPatternEltValues (fel)); + FcPatternObjectListAdd (new, fe->object, l1, FcFalse); + FcPatternObjectListAdd (new, fel->object, l2, FcFalse); + + continue; } } else { - v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); if (fel) - vl = FcValueCanonicalize (&FcPatternEltValues (fel)->value); + goto copy_lang; + v = FcValueCanonicalize(&FcPatternEltValues (fe)->value); } FcPatternObjectAdd (new, fe->object, v, FcFalse); - if (fel) - FcPatternObjectAdd (new, fel->object, vl, FcFalse); } for (i = 0; i < pat->num; i++) { diff --git a/fontconfig/src/fcpat.c b/fontconfig/src/fcpat.c index ebd6e57e2..62e47ca7e 100644 --- a/fontconfig/src/fcpat.c +++ b/fontconfig/src/fcpat.c @@ -120,6 +120,20 @@ FcValueSave (FcValue v) return v; } +FcValueListPtr +FcValueListCreate (void) +{ + FcValueListPtr ret; + + ret = calloc (1, sizeof (FcValueList)); + if (ret) + { + FcMemAlloc(FC_MEM_VALLIST, sizeof (FcValueList)); + } + + return ret; +} + void FcValueListDestroy (FcValueListPtr l) { @@ -151,6 +165,81 @@ FcValueListDestroy (FcValueListPtr l) } } +FcValueListPtr +FcValueListPrepend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding) +{ + FcValueListPtr new; + + if (value.type == FcTypeVoid) + return vallist; + new = FcValueListCreate (); + if (!new) + return vallist; + + new->value = FcValueSave (value); + new->binding = binding; + new->next = vallist; + + return new; +} + +FcValueListPtr +FcValueListAppend (FcValueListPtr vallist, + FcValue value, + FcValueBinding binding) +{ + FcValueListPtr new, last; + + if (value.type == FcTypeVoid) + return vallist; + new = FcValueListCreate (); + if (!new) + return vallist; + + new->value = FcValueSave (value); + new->binding = binding; + new->next = NULL; + + if (vallist) + { + for (last = vallist; FcValueListNext (last); last = FcValueListNext (last)); + + last->next = new; + } + else + vallist = new; + + return vallist; +} + +FcValueListPtr +FcValueListDuplicate(FcValueListPtr orig) +{ + FcValueListPtr new = NULL, l, t = NULL; + FcValue v; + + for (l = orig; l != NULL; l = FcValueListNext (l)) + { + if (!new) + { + t = new = FcValueListCreate(); + } + else + { + t->next = FcValueListCreate(); + t = FcValueListNext (t); + } + v = FcValueCanonicalize (&l->value); + t->value = FcValueSave (v); + t->binding = l->binding; + t->next = NULL; + } + + return new; +} + FcBool FcValueEqual (FcValue va, FcValue vb) { @@ -461,6 +550,59 @@ FcPatternEqualSubset (const FcPattern *pai, const FcPattern *pbi, const FcObject } FcBool +FcPatternObjectListAdd (FcPattern *p, + FcObject object, + FcValueListPtr list, + FcBool append) +{ + FcPatternElt *e; + FcValueListPtr l, *prev; + + if (p->ref == FC_REF_CONSTANT) + goto bail0; + + /* + * Make sure the stored type is valid for built-in objects + */ + for (l = list; l != NULL; l = FcValueListNext (l)) + { + if (!FcObjectValidType (object, l->value.type)) + { + if (FcDebug() & FC_DBG_OBJTYPES) + { + printf ("FcPattern object %s does not accept value ", + FcObjectName (object)); + FcValuePrint (l->value); + } + goto bail0; + } + } + + e = FcPatternObjectInsertElt (p, object); + if (!e) + goto bail0; + + if (append) + { + for (prev = &e->values; *prev; prev = &(*prev)->next) + ; + *prev = list; + } + else + { + for (prev = &list; *prev; prev = &(*prev)->next) + ; + *prev = e->values; + e->values = list; + } + + return FcTrue; + +bail0: + return FcFalse; +} + +FcBool FcPatternObjectAddWithBinding (FcPattern *p, FcObject object, FcValue value, @@ -473,12 +615,10 @@ FcPatternObjectAddWithBinding (FcPattern *p, if (p->ref == FC_REF_CONSTANT) goto bail0; - new = malloc (sizeof (FcValueList)); + new = FcValueListCreate (); if (!new) goto bail0; - memset(new, 0, sizeof (FcValueList)); - FcMemAlloc (FC_MEM_VALLIST, sizeof (FcValueList)); value = FcValueSave (value); if (value.type == FcTypeVoid) goto bail1; diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 27a01b193..ec66223f1 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -2616,7 +2616,7 @@ def _man_request(self, name, cookie_type, void, aux): (cookie_type, self.c_reply_name, base_func_name)) f.write('.SH ERRORS\n') if hasattr(self, "doc") and self.doc: - for errtype, errtext in self.doc.errors.iteritems(): + for errtype, errtext in self.doc.errors.items(): f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error')))) errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext) f.write('%s\n' % (errtext)) @@ -2634,7 +2634,7 @@ def _man_request(self, name, cookie_type, void, aux): see = ['.BR %s (3)' % 'xcb-requests'] if self.doc.example: see.append('.BR %s (3)' % 'xcb-examples') - for seename, seetype in self.doc.see.iteritems(): + for seename, seetype in self.doc.see.items(): if seetype == 'program': see.append('.BR %s (1)' % seename) elif seetype == 'event': @@ -2764,7 +2764,7 @@ def _man_event(self, name): see = ['.BR %s (3)' % 'xcb_generic_event_t'] if self.doc.example: see.append('.BR %s (3)' % 'xcb-examples') - for seename, seetype in self.doc.see.iteritems(): + for seename, seetype in self.doc.see.items(): if seetype == 'program': see.append('.BR %s (1)' % seename) elif seetype == 'event': @@ -2908,7 +2908,7 @@ Refer to the README file in xcb/proto for more info. # Ensure the man subdirectory exists try: os.mkdir('man') -except OSError, e: +except OSError as e: if e.errno != errno.EEXIST: raise diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am index 5e0071c04..b22458ec8 100644 --- a/mesalib/Makefile.am +++ b/mesalib/Makefile.am @@ -61,7 +61,15 @@ PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION) EXTRA_FILES = \ aclocal.m4 \ configure \ + bin/ar-lib \ + bin/compile \ + bin/config.sub \ + bin/config.guess \ + bin/depcomp \ bin/install-sh \ + bin/ltmain.sh \ + bin/missing \ + bin/ylwrap \ src/glsl/glsl_parser.cc \ src/glsl/glsl_parser.h \ src/glsl/glsl_lexer.cc \ @@ -76,7 +84,59 @@ EXTRA_FILES = \ src/mesa/main/api_exec_es2_remap_helper.h \ src/mesa/program/lex.yy.c \ src/mesa/program/program_parse.tab.c \ - src/mesa/program/program_parse.tab.h + src/mesa/program/program_parse.tab.h \ + src/gallium/drivers/r600/Makefile.in \ + src/gallium/drivers/r300/Makefile.in \ + src/gallium/drivers/Makefile.in \ + src/gallium/Makefile.in \ + src/gallium/auxiliary/pipe-loader/Makefile.in \ + src/gallium/targets/opencl/Makefile.in \ + src/gallium/state_trackers/clover/Makefile.in \ + src/mapi/glapi/tests/Makefile.in \ + src/mapi/glapi/Makefile.in \ + src/mapi/glapi/gen/Makefile.in \ + src/mapi/es1api/Makefile.in \ + src/mapi/shared-glapi/tests/Makefile.in \ + src/mapi/shared-glapi/Makefile.in \ + src/mapi/vgapi/Makefile.in \ + src/mapi/es2api/Makefile.in \ + src/glsl/tests/Makefile.in \ + src/glsl/glcpp/Makefile.in \ + src/glsl/builtin_compiler/Makefile.in \ + src/glsl/Makefile.in \ + src/gtest/Makefile.in \ + src/egl/drivers/Makefile.in \ + src/egl/drivers/glx/Makefile.in \ + src/egl/drivers/dri2/Makefile.in \ + src/egl/Makefile.in \ + src/egl/main/Makefile.in \ + src/egl/wayland/Makefile.in \ + src/egl/wayland/wayland-drm/Makefile.in \ + src/egl/wayland/wayland-egl/Makefile.in \ + src/Makefile.in \ + src/glx/tests/Makefile.in \ + src/glx/Makefile.in \ + src/gbm/Makefile.in \ + src/mesa/drivers/Makefile.in \ + src/mesa/drivers/dri/common/Makefile.in \ + src/mesa/drivers/dri/i965/Makefile.in \ + src/mesa/drivers/dri/r200/Makefile.in \ + src/mesa/drivers/dri/Makefile.in \ + src/mesa/drivers/dri/radeon/Makefile.in \ + src/mesa/drivers/dri/swrast/Makefile.in \ + src/mesa/drivers/dri/nouveau/Makefile.in \ + src/mesa/drivers/dri/i915/Makefile.in \ + src/mesa/drivers/osmesa/Makefile.in \ + src/mesa/drivers/x11/Makefile.in \ + src/mesa/Makefile.in \ + src/mesa/libdricore/Makefile.in \ + src/mesa/x86-64/Makefile.in \ + src/mesa/program/Makefile.in \ + src/mesa/main/tests/Makefile.in \ + src/mesa/main/tests/hash_table/Makefile.in \ + src/mesa/x86/Makefile.in \ + Makefile.in + IGNORE_FILES = \ -x autogen.sh @@ -86,7 +146,7 @@ parsers: configure -@touch $(top_builddir)/configs/current $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h - $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h + $(MAKE) -C src/mesa/program lex.yy.c program_parse.tab.c program_parse.tab.h # Everything for new a Mesa release: ARCHIVES = $(PACKAGE_NAME).tar.gz \ diff --git a/mesalib/acinclude.m4 b/mesalib/acinclude.m4 index a5b389d5d..aba48a362 100644 --- a/mesalib/acinclude.m4 +++ b/mesalib/acinclude.m4 @@ -17,7 +17,7 @@ AC_DEFUN([MESA_PIC_FLAGS], AC_ARG_VAR([PIC_FLAGS], [compiler flags for PIC code]) AC_ARG_ENABLE([pic], [AS_HELP_STRING([--disable-pic], - [compile PIC objects @<:@default=enabled for shared builds + [don't compile PIC objects @<:@default=enabled for shared builds on supported platforms@:>@])], [enable_pic="$enableval" test "x$enable_pic" = x && enable_pic=auto], diff --git a/mesalib/bin/get-pick-list.sh b/mesalib/bin/get-pick-list.sh index 72880907b..a141afe26 100644 --- a/mesalib/bin/get-pick-list.sh +++ b/mesalib/bin/get-pick-list.sh @@ -12,8 +12,8 @@ git log --reverse --pretty=%H -i --grep='^[[:space:]]*NOTE: This is a candidate' while read sha do # Check to see whether the patch is on the ignore list. - if [ -f .git/cherry-ignore ] ; then - if grep -q ^$sha .git/cherry-ignore ; then + if [ -f bin/.cherry-ignore ] ; then + if grep -q ^$sha bin/.cherry-ignore ; then continue fi fi diff --git a/mesalib/configs/current.in b/mesalib/configs/current.in index 1802271f9..62edfa5da 100644 --- a/mesalib/configs/current.in +++ b/mesalib/configs/current.in @@ -144,7 +144,7 @@ GLAPI_LIB_DEPS = @GLAPI_LIB_DEPS@ DRI_LIB_DEPS = @DRI_LIB_DEPS@ GALLIUM_DRI_LIB_DEPS = @GALLIUM_DRI_LIB_DEPS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ -LIBDRM_LIB = @LIBDRM_LIBS@ +LIBDRM_LIBS = @LIBDRM_LIBS@ DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ GLPROTO_CFLAGS = @GLPROTO_CFLAGS@ EXPAT_INCLUDES = @EXPAT_INCLUDES@ diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 9a3fde185..f484dc4d6 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -877,7 +877,7 @@ cygwin*) esac AC_ARG_ENABLE([driglx-direct], [AS_HELP_STRING([--disable-driglx-direct], - [enable direct rendering in GLX and EGL for DRI \ + [disable direct rendering in GLX and EGL for DRI \ @<:@default=auto@:>@])], [driglx_direct="$enableval"], [driglx_direct="$driglx_direct_default"]) @@ -1675,8 +1675,8 @@ if test "x$enable_gallium_llvm" = xyes; then fi LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` LLVM_BINDIR=`$LLVM_CONFIG --bindir` - LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags` - LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags` + LLVM_CXXFLAGS=`$LLVM_CONFIG --cxxflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g' -e 's/-Wcovered-switch-default//g'` + LLVM_CPPFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g' -e 's/-Wcovered-switch-default//g'` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` DEFINES="${DEFINES} -DHAVE_LLVM=`echo $LLVM_VERSION | sed -e 's/\([[0-9]]\)\.\([[0-9]]\)/0x0\10\2/g'`" @@ -2013,6 +2013,8 @@ AC_CONFIG_FILES([configs/current src/mesa/drivers/x11/Makefile src/mesa/libdricore/Makefile src/mesa/main/tests/Makefile + src/mesa/main/tests/hash_table/Makefile + src/mesa/program/Makefile src/mesa/x86-64/Makefile src/mesa/x86/Makefile]) diff --git a/mesalib/docs/README.VMS b/mesalib/docs/README.VMS deleted file mode 100644 index 6b02909d5..000000000 --- a/mesalib/docs/README.VMS +++ /dev/null @@ -1,38 +0,0 @@ - -VMS support contributed by Jouk Jansen (joukj@hrem.stm.tudelft.nl) - - -The latest version was tested on a VMSAlpha7.2 system using DECC6.0, but -probably also works for other versions. - -At the moment only the libraries LIBMESGL.EXE/LIBMESGL.OLB, -LIBMESAGLU.EXE/LIBMESAGLU.OLB and LIBGLUT.EXE/LIBGLUT.OLB and the demos of the -directory [.DEMOS] can be build. -However, feel free to create the missing "decrip.mms-files" in the other -directories. - - The make files were tested -using the DIGITAL make utility called MMS. There is also a public domain -clone available (MMK) and I think, but it is not tested, that this -utility will give (hardly) any problem. - -To make everything just type MMS (or MMK) in the main directory of -mesagl. For MMS the deafult makefile is called descrip.mms, and -that is what I have called it. I included alse some config files, -all having mms somewhere in the name which all the makefiles need -(just as your unix makefiles). - -On Alpha platforms at default a sharable images for the libraries are created. -To get a static library make it by typing MMS/MACRO=(NOSHARE=1). -On VAX platforms only static libraries can be build. - -23-sep-2005 -changed default compilation to use /float=ieee/ieee=denorm. The reason for -this is that it makes Mesa on OpenVMS better compatible with other platforms -and other packages for VMS that I maintain. -For more information see - http://nchrem.tnw.tudelft.nl/openvms - https://bugs.freedesktop.org/show_bug.cgi?id=4270 -You may want to compile Mesa to use VAX-floating point arithmetic, instead -of IEEE floating point by removing the /float=IEEE/denorm flag from the -compiler options in the descrip.mms files. diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index ba0b21044..546a32f53 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,14 @@ <h1>News</h1> +<h2>November 16, 2012</h2> + +<p> +<a href="relnotes-9.0.1.html">Mesa 9.0.1</a> is released. +This is a bug fix release. +</p> + + <h2>October 24, 2012</h2> <p> diff --git a/mesalib/docs/relnotes-9.0.1.html b/mesalib/docs/relnotes-9.0.1.html new file mode 100644 index 000000000..50e8b70fd --- /dev/null +++ b/mesalib/docs/relnotes-9.0.1.html @@ -0,0 +1,167 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8"> + <title>Mesa Release Notes</title> + <link rel="stylesheet" type="text/css" href="mesa.css"> +</head> +<body> + +<div class="header"> + <h1>The Mesa 3D Graphics Library</h1> +</div> + +<iframe src="contents.html"></iframe> +<div class="content"> + +<h1>Mesa 9.0.1 Release Notes / November 16th, 2012</h1> + +<p> +Mesa 9.0.1 is a bug fix release which fixes bugs found since the 9.0 release. +</p> +<p> +Mesa 9.0 implements the OpenGL 3.1 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 3.1. OpenGL +3.1 is <strong>only</strong> available if requested at context creation +because GL_ARB_compatibility is not supported. +</p> + +<h2>MD5 checksums</h2> +<pre> +97d6554c05ea7449398afe3a0ede7018 MesaLib-9.0.1.tar.bz2 +fd0fd5a6e56bc3dd210c80e42baef975 MesaLib-9.0.1.tar.gz +c2683d957acd530a00f747f50317186f MesaLib-9.0.1.zip +</pre> + +<h2>New features</h2> +<p>None.</p> + +<h2>Bug fixes</h2> + +<p>This list is likely incomplete.</p> + +<ul> +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=44912">Bug 44912</a> - [bisected] WebGL conformance/textures/texture-mips tests fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=55856">Bug 55856</a> - kwin with gles window content is not updating (gen4)</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56057">Bug 56057</a> - INTEL_swap_event not correctly listed</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=56211">Bug 56211</a> - src/mesa/state_tracker/st_cb_texture.c:1123:copy_image_data_to_texture: Assertion `u_minify(stImage->pt->height0, src_level) == stImage->base.Height' failed.</li> + +<!-- <li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=">Bug </a> - </li> --> +</ul> + + +<h2>Changes</h2> +<p>The full set of changes can be viewed by using the following GIT command:</p> + +<pre> + git log mesa-9.0..mesa-9.0.1 +</pre> + +<p>Adam Jackson (1):</p> +<ul> + <li>glx: Add GLXBadProfileARB to the error string list</li> +</ul> + +<p>Andreas Boll (7):</p> +<ul> + <li>docs: add news item for 9.0 release</li> + <li>mesa: add get-pick-list.sh script into bin/</li> + <li>mesa: add initial .cherry-ignore file for the 9.0 branch</li> + <li>mesa: use .cherry-ignore in the get-pick-list.sh script</li> + <li>build: add config.sub and config.guess to tarballs target</li> + <li>build: add missing Makefile.in files to tarballs target</li> + <li>build: add missing files to tarballs target</li> +</ul> + +<p>Brian Paul (2):</p> +<ul> + <li>mesa: don't call TexImage driver hooks for zero-sized images</li> + <li>mesa: fix error check for zero-sized compressed subtexture</li> +</ul> + +<p>Fredrik Höglund (1):</p> +<ul> + <li>egl_dri2/x11: Fix eglPostSubBufferNV()</li> +</ul> + +<p>Ian Romanick (5):</p> +<ul> + <li>docs: Add 9.0 release md5sums</li> + <li>i965: Fix regression in depth texture rendering on pre-SNB</li> + <li>glx: Set sRGBCapable to a default value</li> + <li>docs: Add 9.0.1 release notes</li> + <li>mesa: Bump version to 9.0.1</li> +</ul> + +<p>Imre Deak (7):</p> +<ul> + <li>mesa: glGet: fix indentation of _mesa_init_get_hash</li> + <li>mesa: glGet: fix indentation of find_value</li> + <li>mesa: glGet: fix indentation of print_table_stats</li> + <li>mesa: glGet: fix API check for EGL_image_external enums</li> + <li>glapi: rename/move GL_POLYGON_OFFSET_BIAS to its extension section</li> + <li>mesa: glGet: fix parameter lookup for apps using multiple APIs</li> + <li>glget: fix make check for glGet GL_POLYGON_OFFSET_BIAS</li> +</ul> + +<p>Jonas Ã…dahl (1):</p> +<ul> + <li>wayland: Destroy frame callback when destroying surface</li> +</ul> + +<p>Kenneth Graunke (1):</p> +<ul> + <li>glsl: Allow ir_if in the linker's move_non_declarations function.</li> +</ul> + +<p>Kristian Høgsberg (5):</p> +<ul> + <li>gbm: Reject buffers that are not wl_drm buffers in gbm_bo_import()</li> + <li>gbm: Use the kms dumb ioctls for cursor instead of libkms</li> + <li>egl/wayland: Update to Wayland 0.99 API</li> + <li>wayland: Remove 0.85 compatibility #ifdefs</li> + <li>wayland: Drop support for ill-defined, unused wl_egl_pixmap</li> +</ul> + +<p>Marcin Slusarz (1):</p> +<ul> + <li>nouveau: use pre-calculated stride for resource_get_handle</li> +</ul> + +<p>Matt Turner (4):</p> +<ul> + <li>egl: Return EGL_BAD_MATCH for invalid profile attributes</li> + <li>Re-add HAVE_PTHREADS preprocessor macro</li> + <li>build: Ship install-sh in the tarball</li> + <li>ralloc: Annotate printf functions with PRINTFLIKE(...)</li> +</ul> + +<p>Michel Dänzer (2):</p> +<ul> + <li>st/mesa: Fix source miptree level for copying data to finalized miptree.</li> + <li>st/mesa: Fix assertions for copying texture image to finalized miptree.</li> +</ul> + +<p>Owen W. Taylor (1):</p> +<ul> + <li>glx: Fix listing of INTEL_swap_event in glXQueryExtensionsString()</li> +</ul> + +<p>Quentin Glidic (1):</p> +<ul> + <li>intel: Add missing #include <time.h></li> +</ul> + +<p>Tomeu Vizoso (1):</p> +<ul> + <li>mesa/es: Define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT enum for all GLs</li> +</ul> + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes-9.1.html b/mesalib/docs/relnotes-9.1.html index 97247fb3a..3a8c77bfc 100644 --- a/mesalib/docs/relnotes-9.1.html +++ b/mesalib/docs/relnotes-9.1.html @@ -61,6 +61,7 @@ Note: some of the new features are only available with certain drivers. <li>Removed i965's broken hardware implementation of GL_NV_vertex_program</li> <li>Removed swrast support for GL_NV_vertex_program</li> <li>Removed swrast support for GL_NV_fragment_program</li> +<li>Removed OpenVMS support (unmaintained and broken)</li> </ul> </div> diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index ab8a70671..a4654025e 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -22,6 +22,7 @@ The release notes summarize what's new or changed in each Mesa release. <ul> <li><a href="relnotes-9.1.html">9.1 release notes</a> +<li><a href="relnotes-9.0.1.html">9.0.1 release notes</a> <li><a href="relnotes-9.0.html">9.0 release notes</a> <li><a href="relnotes-8.0.5.html">8.0.5 release notes</a> <li><a href="relnotes-8.0.4.html">8.0.4 release notes</a> diff --git a/mesalib/include/EGL/eglext.h b/mesalib/include/EGL/eglext.h index 974b2c06d..a5c9009e1 100644 --- a/mesalib/include/EGL/eglext.h +++ b/mesalib/include/EGL/eglext.h @@ -34,7 +34,7 @@ extern "C" { /* Header file version number */ /* Current version at http://www.khronos.org/registry/egl/ */ -/* $Revision: 19332 $ on $Date: 2012-09-28 17:56:20 -0700 (Fri, 28 Sep 2012) $ */ +/* $Revision: 19571 $ on $Date: 2012-10-31 10:10:33 -0700 (Wed, 31 Oct 2012) $ */ #define EGL_EGLEXT_VERSION 14 #ifndef EGL_KHR_config_attribs @@ -462,6 +462,14 @@ typedef EGLStreamKHR (EGLAPIENTRYP PFNEGLCREATESTREAMFROMFILEDESCRIPTORKHRPROC)( #define EGL_MULTIVIEW_VIEW_COUNT_EXT 0x3134 #endif +#ifndef EGL_KHR_wait_sync +#define EGL_KHR_wait_sync 1 +#ifdef EGL_EGLEXT_PROTOTYPES +EGLAPI EGLint EGLAPIENTRY eglWaitSyncKHR(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); +#endif /* EGL_EGLEXT_PROTOTYPES */ +typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCKHRPROC)(EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); +#endif + #include <EGL/eglmesaext.h> #ifdef __cplusplus diff --git a/mesalib/include/GL/glx.h b/mesalib/include/GL/glx.h index a3a7d97c9..acbd9e2c9 100644 --- a/mesalib/include/GL/glx.h +++ b/mesalib/include/GL/glx.h @@ -27,21 +27,8 @@ #define GLX_H -#ifdef __VMS -#include <GL/vms_x_fix.h> -# ifdef __cplusplus -/* VMS Xlib.h gives problems with C++. - * this avoids a bunch of trivial warnings */ -#pragma message disable nosimpint -#endif -#endif #include <X11/Xlib.h> #include <X11/Xutil.h> -#ifdef __VMS -# ifdef __cplusplus -#pragma message enable nosimpint -#endif -#endif #include <GL/gl.h> diff --git a/mesalib/include/GL/vms_x_fix.h b/mesalib/include/GL/vms_x_fix.h deleted file mode 100644 index 24cba473d..000000000 --- a/mesalib/include/GL/vms_x_fix.h +++ /dev/null @@ -1,1224 +0,0 @@ -/*************************************************************************** - * * - * Author : Jouk Jansen (joukj@hrem.nano.tudelft.nl) * - * * - * Last revision : 31 August 2006 * - * * - * Repair definitions of Runtime library functions when compiling with * - * /name=(as_is) on OpenVMS * - * * - ***************************************************************************/ - -#ifndef VMS_X_FIX -#define VMS_X_FIX - -#define decw$_select DECW$_SELECT -#define DtSaverGetWindows DTSAVERGETWINDOWS -#define MrmFetchWidget MRMFETCHWIDGET -#define MrmInitialize MRMINITIALIZE -#define MrmOpenHierarchy MRMOPENHIERARCHY -#define MrmRegisterNames MRMREGISTERNAMES -#define XAddExtension XADDEXTENSION -#define XAddHosts XADDHOSTS -#define XAllocClassHint XALLOCCLASSHINT -#define XAllocColor XALLOCCOLOR -#define XAllocColorCells XALLOCCOLORCELLS -#define XAllocIconSize XALLOCICONSIZE -#define XAllocNamedColor XALLOCNAMEDCOLOR -#define XAllocSizeHints XALLOCSIZEHINTS -#define XAllocStandardColormap XALLOCSTANDARDCOLORMAP -#define XAllocWMHints XALLOCWMHINTS -#define XAllowEvents XALLOWEVENTS -#define XAutoRepeatOff XAUTOREPEATOFF -#define XAutoRepeatOn XAUTOREPEATON -#define XBaseFontNameListOfFontSet XBASEFONTNAMELISTOFFONTSET -#define XBell XBELL -#define XBitmapPad XBITMAPPAD -#define XBlackPixel XBLACKPIXEL -#define XBlackPixelOfScreen XBLACKPIXELOFSCREEN -#define XCellsOfScreen XCELLSOFSCREEN -#define XChangeActivePointerGrab XCHANGEACTIVEPOINTERGRAB -#define XChangeGC XCHANGEGC -#define XChangeKeyboardControl XCHANGEKEYBOARDCONTROL -#define XChangePointerControl XCHANGEPOINTERCONTROL -#define XChangeProperty XCHANGEPROPERTY -#define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES -#define XCheckIfEvent XCHECKIFEVENT -#define XCheckMaskEvent XCHECKMASKEVENT -#define XCheckTypedEvent XCHECKTYPEDEVENT -#define XCheckTypedWindowEvent XCHECKTYPEDWINDOWEVENT -#define XCheckWindowEvent XCHECKWINDOWEVENT -#define XClearArea XCLEARAREA -#define XClearWindow XCLEARWINDOW -#define XClipBox XCLIPBOX -#define XCloseDisplay XCLOSEDISPLAY -#define XCloseIM XCLOSEIM -#define XConfigureWindow XCONFIGUREWINDOW -#define XConvertSelection XCONVERTSELECTION -#define XCopyArea XCOPYAREA -#define XCopyColormapAndFree XCOPYCOLORMAPANDFREE -#define XCopyGC XCOPYGC -#define XCopyPlane XCOPYPLANE -#define XCreateBitmapFromData XCREATEBITMAPFROMDATA -#define XCreateColormap XCREATECOLORMAP -#define XCreateFontCursor XCREATEFONTCURSOR -#define XCreateFontSet XCREATEFONTSET -#define XCreateGC XCREATEGC -#define XCreateGlyphCursor XCREATEGLYPHCURSOR -#define XCreateIC XCREATEIC -#define XCreateImage XCREATEIMAGE -#define XCreatePixmap XCREATEPIXMAP -#define XCreatePixmapCursor XCREATEPIXMAPCURSOR -#define XCreatePixmapFromBitmapData XCREATEPIXMAPFROMBITMAPDATA -#define XCreateRegion XCREATEREGION -#define XCreateSimpleWindow XCREATESIMPLEWINDOW -#define XCreateWindow XCREATEWINDOW -#define XDefaultColormap XDEFAULTCOLORMAP -#define XDefaultColormapOfScreen XDEFAULTCOLORMAPOFSCREEN -#define XDefaultDepth XDEFAULTDEPTH -#define XDefaultDepthOfScreen XDEFAULTDEPTHOFSCREEN -#define XDefaultGC XDEFAULTGC -#define XDefaultRootWindow XDEFAULTROOTWINDOW -#define XDefaultScreen XDEFAULTSCREEN -#define XDefaultScreenOfDisplay XDEFAULTSCREENOFDISPLAY -#define XDefaultVisual XDEFAULTVISUAL -#define XDefaultVisualOfScreen XDEFAULTVISUALOFSCREEN -#define XDefineCursor XDEFINECURSOR -#define XDeleteContext XDELETECONTEXT -#define XDeleteProperty XDELETEPROPERTY -#define XDestroyIC XDESTROYIC -#define XDestroyRegion XDESTROYREGION -#define XDestroySubwindows XDESTROYSUBWINDOWS -#define XDestroyWindow XDESTROYWINDOW -#define XDisableAccessControl XDISABLEACCESSCONTROL -#define XDisplayCells XDISPLAYCELLS -#define XDisplayHeight XDISPLAYHEIGHT -#define XDisplayKeycodes XDISPLAYKEYCODES -#define XDisplayName XDISPLAYNAME -#define XDisplayOfIM XDISPLAYOFIM -#define XDisplayOfScreen XDISPLAYOFSCREEN -#define XDisplayString XDISPLAYSTRING -#define XDisplayWidth XDISPLAYWIDTH -#define XDoesBackingStore XDOESBACKINGSTORE -#define XDrawArc XDRAWARC -#define XDrawArcs XDRAWARCS -#define XDrawImageString XDRAWIMAGESTRING -#define XDrawImageString16 XDRAWIMAGESTRING16 -#define XDrawLine XDRAWLINE -#define XDrawLines XDRAWLINES -#define XDrawPoint XDRAWPOINT -#define XDrawPoints XDRAWPOINTS -#define XDrawRectangle XDRAWRECTANGLE -#define XDrawRectangles XDRAWRECTANGLES -#define XDrawSegments XDRAWSEGMENTS -#define XDrawString XDRAWSTRING -#define XDrawString16 XDRAWSTRING16 -#define XDrawText XDRAWTEXT -#define XDrawText16 XDRAWTEXT16 -#define XESetCloseDisplay XESETCLOSEDISPLAY -#define XEmptyRegion XEMPTYREGION -#define XEnableAccessControl XENABLEACCESSCONTROL -#define XEqualRegion XEQUALREGION -#define XEventsQueued XEVENTSQUEUED -#define XExtendedMaxRequestSize XEXTENDEDMAXREQUESTSIZE -#define XExtentsOfFontSet XEXTENTSOFFONTSET -#define XFetchBuffer XFETCHBUFFER -#define XFetchBytes XFETCHBYTES -#define XFetchName XFETCHNAME -#define XFillArc XFILLARC -#define XFillArcs XFILLARCS -#define XFillPolygon XFILLPOLYGON -#define XFillRectangle XFILLRECTANGLE -#define XFillRectangles XFILLRECTANGLES -#define XFilterEvent XFILTEREVENT -#define XFindContext XFINDCONTEXT -#define XFlush XFLUSH -#define XFontsOfFontSet XFONTSOFFONTSET -#define XForceScreenSaver XFORCESCREENSAVER -#define XFree XFREE -#define XFreeColormap XFREECOLORMAP -#define XFreeColors XFREECOLORS -#define XFreeCursor XFREECURSOR -#define XFreeDeviceList XFREEDEVICELIST -#define XFreeDeviceState XFREEDEVICESTATE -#define XFreeFont XFREEFONT -#define XFreeFontInfo XFREEFONTINFO -#define XFreeFontNames XFREEFONTNAMES -#define XFreeFontSet XFREEFONTSET -#define XFreeGC XFREEGC -#define XFreeModifiermap XFREEMODIFIERMAP -#define XFreePixmap XFREEPIXMAP -#define XFreeStringList XFREESTRINGLIST -#define XGContextFromGC XGCONTEXTFROMGC -#define XGeometry XGEOMETRY -#define XGetAtomName XGETATOMNAME -#define XGetClassHint XGETCLASSHINT -#define XGetCommand XGETCOMMAND -#define XGetDefault XGETDEFAULT -#define XGetErrorDatabaseText XGETERRORDATABASETEXT -#define XGetErrorText XGETERRORTEXT -#define XGetExtensionVersion XGETEXTENSIONVERSION -#define XGetFontProperty XGETFONTPROPERTY -#define XGetGCValues XGETGCVALUES -#define XGetGeometry XGETGEOMETRY -#define XGetICValues XGETICVALUES -#define XGetIMValues XGETIMVALUES -#define XGetIconName XGETICONNAME -#define XGetIconSizes XGETICONSIZES -#define XGetImage XGETIMAGE -#define XGetInputFocus XGETINPUTFOCUS -#define XGetKeyboardControl XGETKEYBOARDCONTROL -#define XGetKeyboardMapping XGETKEYBOARDMAPPING -#define XGetModifierMapping XGETMODIFIERMAPPING -#define XGetMotionEvents XGETMOTIONEVENTS -#define XGetNormalHints XGETNORMALHINTS -#define XGetPointerControl XGETPOINTERCONTROL -#define XGetPointerMapping XGETPOINTERMAPPING -#define XGetRGBColormaps XGETRGBCOLORMAPS -#define XGetScreenSaver XGETSCREENSAVER -#define XGetSelectionOwner XGETSELECTIONOWNER -#define XGetStandardColormap XGETSTANDARDCOLORMAP -#define XGetSubImage XGETSUBIMAGE -#define XGetTextProperty XGETTEXTPROPERTY -#define XGetVisualInfo XGETVISUALINFO -#define XGetWMColormapWindows XGETWMCOLORMAPWINDOWS -#define XGetWMHints XGETWMHINTS -#define XGetWMIconName XGETWMICONNAME -#define XGetWMName XGETWMNAME -#define XGetWMNormalHints XGETWMNORMALHINTS -#define XGetWindowAttributes XGETWINDOWATTRIBUTES -#define XGetWindowProperty XGETWINDOWPROPERTY -#define XGrabButton XGRABBUTTON -#define XGrabKeyboard XGRABKEYBOARD -#define XGrabPointer XGRABPOINTER -#define XGrabServer XGRABSERVER -#define XHeightMMOfScreen XHEIGHTMMOFSCREEN -#define XHeightOfScreen XHEIGHTOFSCREEN -#define XIconifyWindow XICONIFYWINDOW -#define XIfEvent XIFEVENT -#define XInitExtension XINITEXTENSION -#define XInitImage XINITIMAGE -#define XInstallColormap XINSTALLCOLORMAP -#define XInternAtom XINTERNATOM -#define XInternAtoms XINTERNATOMS -#define XIntersectRegion XINTERSECTREGION -#define XKeycodeToKeysym XKEYCODETOKEYSYM -#define XKeysymToKeycode XKEYSYMTOKEYCODE -#define XKeysymToString XKEYSYMTOSTRING -#define XKillClient XKILLCLIENT -#define XListDepths XLISTDEPTHS -#define XListFonts XLISTFONTS -#define XListFontsWithInfo XLISTFONTSWITHINFO -#define XListHosts XLISTHOSTS -#define XListInputDevices XLISTINPUTDEVICES -#define XListInstalledColormaps XLISTINSTALLEDCOLORMAPS -#define XListPixmapFormats XLISTPIXMAPFORMATS -#define XListProperties XLISTPROPERTIES -#define XLoadFont XLOADFONT -#define XLoadQueryFont XLOADQUERYFONT -#define XLookupColor XLOOKUPCOLOR -#define XLookupKeysym XLOOKUPKEYSYM -#define XLookupString XLOOKUPSTRING -#define XLowerWindow XLOWERWINDOW -#define XMapRaised XMAPRAISED -#define XMapSubwindows XMAPSUBWINDOWS -#define XMapWindow XMAPWINDOW -#define XMaskEvent XMASKEVENT -#define XMatchVisualInfo XMATCHVISUALINFO -#define XMaxRequestSize XMAXREQUESTSIZE -#define XMissingExtension XMISSINGEXTENSION -#define XMoveResizeWindow XMOVERESIZEWINDOW -#define XMoveWindow XMOVEWINDOW -#define XNextEvent XNEXTEVENT -#define XNextRequest XNEXTREQUEST -#define XNoOp XNOOP -#define XOffsetRegion XOFFSETREGION -#define XOpenDevice XOPENDEVICE -#define XOpenDisplay XOPENDISPLAY -#define XOpenIM XOPENIM -#define XParseColor XPARSECOLOR -#define XParseGeometry XPARSEGEOMETRY -#define XPeekEvent XPEEKEVENT -#define XPeekIfEvent XPEEKIFEVENT -#define XPending XPENDING -#define XPointInRegion XPOINTINREGION -#define XPolygonRegion XPOLYGONREGION -#define XPutBackEvent XPUTBACKEVENT -#define XPutImage XPUTIMAGE -#define XQLength XQLENGTH -#define XQueryBestCursor XQUERYBESTCURSOR -#define XQueryBestStipple XQUERYBESTSTIPPLE -#define XQueryColor XQUERYCOLOR -#define XQueryColors XQUERYCOLORS -#define XQueryDeviceState XQUERYDEVICESTATE -#define XQueryExtension XQUERYEXTENSION -#define XQueryFont XQUERYFONT -#define XQueryKeymap XQUERYKEYMAP -#define XQueryPointer XQUERYPOINTER -#define XQueryTree XQUERYTREE -#define XRaiseWindow XRAISEWINDOW -#define XReadBitmapFile XREADBITMAPFILE -#define XRecolorCursor XRECOLORCURSOR -#define XReconfigureWMWindow XRECONFIGUREWMWINDOW -#define XRectInRegion XRECTINREGION -#define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING -#define XRemoveHosts XREMOVEHOSTS -#define XReparentWindow XREPARENTWINDOW -#define XResetScreenSaver XRESETSCREENSAVER -#define XResizeWindow XRESIZEWINDOW -#define XResourceManagerString XRESOURCEMANAGERSTRING -#define XRestackWindows XRESTACKWINDOWS -#define XRotateBuffers XROTATEBUFFERS -#define XRootWindow XROOTWINDOW -#define XRootWindowOfScreen XROOTWINDOWOFSCREEN -#define XSaveContext XSAVECONTEXT -#define XScreenNumberOfScreen XSCREENNUMBEROFSCREEN -#define XScreenOfDisplay XSCREENOFDISPLAY -#define XSelectAsyncEvent XSELECTASYNCEVENT -#define XSelectAsyncInput XSELECTASYNCINPUT -#define XSelectExtensionEvent XSELECTEXTENSIONEVENT -#define XSelectInput XSELECTINPUT -#define XSendEvent XSENDEVENT -#define XServerVendor XSERVERVENDOR -#define XSetArcMode XSETARCMODE -#define XSetBackground XSETBACKGROUND -#define XSetClassHint XSETCLASSHINT -#define XSetClipMask XSETCLIPMASK -#define XSetClipOrigin XSETCLIPORIGIN -#define XSetClipRectangles XSETCLIPRECTANGLES -#define XSetCloseDownMode XSETCLOSEDOWNMODE -#define XSetCommand XSETCOMMAND -#define XSetDashes XSETDASHES -#define XSetErrorHandler XSETERRORHANDLER -#define XSetExtensionErrorHandler XSETEXTENSIONERRORHANDLER -#define XSetFillRule XSETFILLRULE -#define XSetFillStyle XSETFILLSTYLE -#define XSetFont XSETFONT -#define XSetForeground XSETFOREGROUND -#define XSetFunction XSETFUNCTION -#define XSetGraphicsExposures XSETGRAPHICSEXPOSURES -#define XSetICFocus XSETICFOCUS -#define XSetICValues XSETICVALUES -#define XSetIOErrorHandler XSETIOERRORHANDLER -#define XSetIconName XSETICONNAME -#define XSetInputFocus XSETINPUTFOCUS -#define XSetLineAttributes XSETLINEATTRIBUTES -#define XSetLocaleModifiers XSETLOCALEMODIFIERS -#define XSetNormalHints XSETNORMALHINTS -#define XSetPlaneMask XSETPLANEMASK -#define XSetRegion XSETREGION -#define XSetRGBColormaps XSETRGBCOLORMAPS -#define XSetScreenSaver XSETSCREENSAVER -#define XSetSelectionOwner XSETSELECTIONOWNER -#define XSetStandardProperties XSETSTANDARDPROPERTIES -#define XSetState XSETSTATE -#define XSetStipple XSETSTIPPLE -#define XSetSubwindowMode XSETSUBWINDOWMODE -#define XSetTSOrigin XSETTSORIGIN -#define XSetTextProperty XSETTEXTPROPERTY -#define XSetTile XSETTILE -#define XSetTransientForHint XSETTRANSIENTFORHINT -#define XSetWMClientMachine XSETWMCLIENTMACHINE -#define XSetWMColormapWindows XSETWMCOLORMAPWINDOWS -#define XSetWMHints XSETWMHINTS -#define XSetWMIconName XSETWMICONNAME -#define XSetWMName XSETWMNAME -#define XSetWMNormalHints XSETWMNORMALHINTS -#define XSetWMProperties XSETWMPROPERTIES -#define XSetWMProtocols XSETWMPROTOCOLS -#define XSetWMSizeHints XSETWMSIZEHINTS -#define XSetWindowBackground XSETWINDOWBACKGROUND -#define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP -#define XSetWindowBorder XSETWINDOWBORDER -#define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP -#define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH -#define XSetWindowColormap XSETWINDOWCOLORMAP -#define XShapeCombineMask XSHAPECOMBINEMASK -#define XShapeCombineRectangles XSHAPECOMBINERECTANGLES -#define XShapeGetRectangles XSHAPEGETRECTANGLES -#define XShapeQueryExtension XSHAPEQUERYEXTENSION -#define XShmAttach XSHMATTACH -#define XShmCreateImage XSHMCREATEIMAGE -#define XShmCreatePixmap XSHMCREATEPIXMAP -#define XShmDetach XSHMDETACH -#define XShmGetEventBase XSHMGETEVENTBASE -#define XShmPutImage XSHMPUTIMAGE -#define XShmQueryExtension XSHMQUERYEXTENSION -#define XShmQueryVersion XSHMQUERYVERSION -#define XShrinkRegion XSHRINKREGION -#define XStoreBuffer XSTOREBUFFER -#define XStoreBytes XSTOREBYTES -#define XStoreColor XSTORECOLOR -#define XStoreColors XSTORECOLORS -#define XStoreName XSTORENAME -#define XStringListToTextProperty XSTRINGLISTTOTEXTPROPERTY -#define XStringToKeysym XSTRINGTOKEYSYM -#define XSubtractRegion XSUBTRACTREGION -#define XSupportsLocale XSUPPORTSLOCALE -#define XSync XSYNC -#define XSynchronize XSYNCHRONIZE -#define XTextExtents XTEXTEXTENTS -#define XTextExtents16 XTEXTEXTENTS16 -#define XTextPropertyToStringList XTEXTPROPERTYTOSTRINGLIST -#define XTextWidth XTEXTWIDTH -#define XTextWidth16 XTEXTWIDTH16 -#define XTranslateCoordinates XTRANSLATECOORDINATES -#define XUndefineCursor XUNDEFINECURSOR -#define XUngrabButton XUNGRABBUTTON -#define XUngrabKeyboard XUNGRABKEYBOARD -#define XUngrabPointer XUNGRABPOINTER -#define XUngrabServer XUNGRABSERVER -#define XUninstallColormap XUNINSTALLCOLORMAP -#define XUnionRectWithRegion XUNIONRECTWITHREGION -#define XUnionRegion XUNIONREGION -#define XUniqueContext XUNIQUECONTEXT -#define XUnloadFont XUNLOADFONT -#define XUnmapWindow XUNMAPWINDOW -#define XUnsetICFocus XUNSETICFOCUS -#define XVaCreateNestedList XVACREATENESTEDLIST -#define XVisualIDFromVisual XVISUALIDFROMVISUAL -#define XWMGeometry XWMGEOMETRY -#define XWarpPointer XWARPPOINTER -#define XWhitePixel XWHITEPIXEL -#define XWhitePixelOfScreen XWHITEPIXELOFSCREEN -#define XWidthMMOfScreen XWIDTHMMOFSCREEN -#define XWidthOfScreen XWIDTHOFSCREEN -#define XWindowEvent XWINDOWEVENT -#define XWithdrawWindow XWITHDRAWWINDOW -#define XXorRegion XXORREGION -#define XcmsQueryColor XCMSQUERYCOLOR -#define XdbeAllocateBackBufferName XDBEALLOCATEBACKBUFFERNAME -#define XdbeFreeVisualInfo XDBEFREEVISUALINFO -#define XdbeGetVisualInfo XDBEGETVISUALINFO -#define XdbeQueryExtension XDBEQUERYEXTENSION -#define XdbeSwapBuffers XDBESWAPBUFFERS -#define XextAddDisplay XEXTADDDISPLAY -#define XextFindDisplay XEXTFINDDISPLAY -#define XextRemoveDisplay XEXTREMOVEDISPLAY -#define XkbSetDetectableAutoRepeat XKBSETDETECTABLEAUTOREPEAT -#define XmActivateProtocol XMACTIVATEPROTOCOL -#define XmAddProtocolCallback XMADDPROTOCOLCALLBACK -#define XmAddProtocols XMADDPROTOCOLS -#define XmChangeColor XMCHANGECOLOR -#define XmClipboardCopy XMCLIPBOARDCOPY -#define XmClipboardCopyByName XMCLIPBOARDCOPYBYNAME -#define XmClipboardEndCopy XMCLIPBOARDENDCOPY -#define XmClipboardEndRetrieve XMCLIPBOARDENDRETRIEVE -#define XmClipboardInquireCount XMCLIPBOARDINQUIRECOUNT -#define XmClipboardInquireFormat XMCLIPBOARDINQUIREFORMAT -#define XmClipboardInquireLength XMCLIPBOARDINQUIRELENGTH -#define XmClipboardLock XMCLIPBOARDLOCK -#define XmClipboardRetrieve XMCLIPBOARDRETRIEVE -#define XmClipboardStartCopy XMCLIPBOARDSTARTCOPY -#define XmClipboardStartRetrieve XMCLIPBOARDSTARTRETRIEVE -#define XmClipboardUnlock XMCLIPBOARDUNLOCK -#define XmCommandError XMCOMMANDERROR -#define XmCommandGetChild XMCOMMANDGETCHILD -#define XmCommandSetValue XMCOMMANDSETVALUE -#define XmCreateArrowButton XMCREATEARROWBUTTON -#define XmCreateArrowButtonGadget XMCREATEARROWBUTTONGADGET -#define XmCreateBulletinBoardDialog XMCREATEBULLETINBOARDDIALOG -#define XmCreateCascadeButton XMCREATECASCADEBUTTON -#define XmCreateCascadeButtonGadget XMCREATECASCADEBUTTONGADGET -#define XmCreateDialogShell XMCREATEDIALOGSHELL -#define XmCreateDragIcon XMCREATEDRAGICON -#define XmCreateDrawingArea XMCREATEDRAWINGAREA -#define XmCreateDrawnButton XMCREATEDRAWNBUTTON -#define XmCreateErrorDialog XMCREATEERRORDIALOG -#define XmCreateFileSelectionBox XMCREATEFILESELECTIONBOX -#define XmCreateFileSelectionDialog XMCREATEFILESELECTIONDIALOG -#define XmCreateForm XMCREATEFORM -#define XmCreateFormDialog XMCREATEFORMDIALOG -#define XmCreateFrame XMCREATEFRAME -#define XmCreateInformationDialog XMCREATEINFORMATIONDIALOG -#define XmCreateLabel XMCREATELABEL -#define XmCreateLabelGadget XMCREATELABELGADGET -#define XmCreateList XMCREATELIST -#define XmCreateMainWindow XMCREATEMAINWINDOW -#define XmCreateMenuBar XMCREATEMENUBAR -#define XmCreateMessageBox XMCREATEMESSAGEBOX -#define XmCreateMessageDialog XMCREATEMESSAGEDIALOG -#define XmCreateOptionMenu XMCREATEOPTIONMENU -#define XmCreatePanedWindow XMCREATEPANEDWINDOW -#define XmCreatePopupMenu XMCREATEPOPUPMENU -#define XmCreatePromptDialog XMCREATEPROMPTDIALOG -#define XmCreatePulldownMenu XMCREATEPULLDOWNMENU -#define XmCreatePushButton XMCREATEPUSHBUTTON -#define XmCreatePushButtonGadget XMCREATEPUSHBUTTONGADGET -#define XmCreateQuestionDialog XMCREATEQUESTIONDIALOG -#define XmCreateRadioBox XMCREATERADIOBOX -#define XmCreateRowColumn XMCREATEROWCOLUMN -#define XmCreateScale XMCREATESCALE -#define XmCreateScrollBar XMCREATESCROLLBAR -#define XmCreateScrolledList XMCREATESCROLLEDLIST -#define XmCreateScrolledText XMCREATESCROLLEDTEXT -#define XmCreateScrolledWindow XMCREATESCROLLEDWINDOW -#define XmCreateSelectionDialog XMCREATESELECTIONDIALOG -#define XmCreateSeparator XMCREATESEPARATOR -#define XmCreateSeparatorGadget XMCREATESEPARATORGADGET -#define XmCreateSimpleMenuBar XMCREATESIMPLEMENUBAR -#define XmCreateTemplateDialog XMCREATETEMPLATEDIALOG -#define XmCreateText XMCREATETEXT -#define XmCreateTextField XMCREATETEXTFIELD -#define XmCreateToggleButton XMCREATETOGGLEBUTTON -#define XmCreateToggleButtonGadget XMCREATETOGGLEBUTTONGADGET -#define XmCreateWarningDialog XMCREATEWARNINGDIALOG -#define XmCvtCTToXmString XMCVTCTTOXMSTRING -#define XmDestroyPixmap XMDESTROYPIXMAP -#define XmDragStart XMDRAGSTART -#define XmDropSiteRegister XMDROPSITEREGISTER -#define XmDropSiteUnregister XMDROPSITEUNREGISTER -#define XmDropSiteUpdate XMDROPSITEUPDATE -#define XmDropTransferStart XMDROPTRANSFERSTART -#define XmFileSelectionBoxGetChild XMFILESELECTIONBOXGETCHILD -#define XmFileSelectionDoSearch XMFILESELECTIONDOSEARCH -#define XmFontListAppendEntry XMFONTLISTAPPENDENTRY -#define XmFontListCopy XMFONTLISTCOPY -#define XmFontListCreate XMFONTLISTCREATE -#define XmFontListEntryCreate XMFONTLISTENTRYCREATE -#define XmFontListEntryFree XMFONTLISTENTRYFREE -#define XmFontListEntryGetFont XMFONTLISTENTRYGETFONT -#define XmFontListEntryGetTag XMFONTLISTENTRYGETTAG -#define XmFontListEntryLoad XMFONTLISTENTRYLOAD -#define XmFontListFree XMFONTLISTFREE -#define XmFontListFreeFontContext XMFONTLISTFREEFONTCONTEXT -#define XmFontListGetNextFont XMFONTLISTGETNEXTFONT -#define XmFontListInitFontContext XMFONTLISTINITFONTCONTEXT -#define XmFontListNextEntry XMFONTLISTNEXTENTRY -#define XmGetColors XMGETCOLORS -#define XmGetColorCalculation XMGETCOLORCALCULATION -#define XmGetFocusWidget XMGETFOCUSWIDGET -#define XmGetMenuCursor XMGETMENUCURSOR -#define XmGetPixmap XMGETPIXMAP -#define XmGetPixmapByDepth XMGETPIXMAPBYDEPTH -#define XmGetTearOffControl XMGETTEAROFFCONTROL -#define XmGetXmDisplay XMGETXMDISPLAY -#define XmImMbLookupString XMIMMBLOOKUPSTRING -#define XmImRegister XMIMREGISTER -#define XmImSetFocusValues XMIMSETFOCUSVALUES -#define XmImSetValues XMIMSETVALUES -#define XmImUnregister XMIMUNREGISTER -#define XmImUnsetFocus XMIMUNSETFOCUS -#define XmInstallImage XMINSTALLIMAGE -#define XmInternAtom XMINTERNATOM -#define XmIsMotifWMRunning XMISMOTIFWMRUNNING -#define XmListAddItem XMLISTADDITEM -#define XmListAddItemUnselected XMLISTADDITEMUNSELECTED -#define XmListAddItems XMLISTADDITEMS -#define XmListAddItemsUnselected XMLISTADDITEMSUNSELECTED -#define XmListDeleteAllItems XMLISTDELETEALLITEMS -#define XmListDeleteItem XMLISTDELETEITEM -#define XmListDeleteItemsPos XMLISTDELETEITEMSPOS -#define XmListDeletePos XMLISTDELETEPOS -#define XmListDeselectAllItems XMLISTDESELECTALLITEMS -#define XmListDeselectPos XMLISTDESELECTPOS -#define XmListGetKbdItemPos XMLISTGETKBDITEMPOS -#define XmListGetMatchPos XMLISTGETMATCHPOS -#define XmListGetSelectedPos XMLISTGETSELECTEDPOS -#define XmListItemExists XMLISTITEMEXISTS -#define XmListItemPos XMLISTITEMPOS -#define XmListPosSelected XMLISTPOSSELECTED -#define XmListReplaceItems XMLISTREPLACEITEMS -#define XmListReplaceItemsPos XMLISTREPLACEITEMSPOS -#define XmListSelectItem XMLISTSELECTITEM -#define XmListSelectPos XMLISTSELECTPOS -#define XmListSetBottomPos XMLISTSETBOTTOMPOS -#define XmListSetItem XMLISTSETITEM -#define XmListSetKbdItemPos XMLISTSETKBDITEMPOS -#define XmListSetPos XMLISTSETPOS -#define XmMainWindowSetAreas XMMAINWINDOWSETAREAS -#define XmMenuPosition XMMENUPOSITION -#define XmMessageBoxGetChild XMMESSAGEBOXGETCHILD -#define XmOptionButtonGadget XMOPTIONBUTTONGADGET -#define XmOptionLabelGadget XMOPTIONLABELGADGET -#define XmProcessTraversal XMPROCESSTRAVERSAL -#define XmQmotif XMQMOTIF -#define XmRemoveProtocolCallback XMREMOVEPROTOCOLCALLBACK -#define XmRemoveProtocols XMREMOVEPROTOCOLS -#define XmRemoveTabGroup XMREMOVETABGROUP -#define XmRepTypeGetId XMREPTYPEGETID -#define XmRepTypeGetRecord XMREPTYPEGETRECORD -#define XmRepTypeInstallTearOffModelCon XMREPTYPEINSTALLTEAROFFMODELCON -#define XmRepTypeRegister XMREPTYPEREGISTER -#define XmRepTypeValidValue XMREPTYPEVALIDVALUE -#define XmScrollBarGetValues XMSCROLLBARGETVALUES -#define XmScrollBarSetValues XMSCROLLBARSETVALUES -#define XmScrolledWindowSetAreas XMSCROLLEDWINDOWSETAREAS -#define XmSelectionBoxGetChild XMSELECTIONBOXGETCHILD -#define XmSetColorCalculation XMSETCOLORCALCULATION -#define XmStringByteCompare XMSTRINGBYTECOMPARE -#define XmStringCompare XMSTRINGCOMPARE -#define XmStringConcat XMSTRINGCONCAT -#define XmStringCopy XMSTRINGCOPY -#define XmStringCreate XMSTRINGCREATE -#define XmStringCreateLocalized XMSTRINGCREATELOCALIZED -#define XmStringCreateLtoR XMSTRINGCREATELTOR -#define XmStringCreateSimple XMSTRINGCREATESIMPLE -#define XmStringDraw XMSTRINGDRAW -#define XmStringDrawUnderline XMSTRINGDRAWUNDERLINE -#define XmStringExtent XMSTRINGEXTENT -#define XmStringFree XMSTRINGFREE -#define XmStringFreeContext XMSTRINGFREECONTEXT -#define XmStringGetLtoR XMSTRINGGETLTOR -#define XmStringGetNextComponent XMSTRINGGETNEXTCOMPONENT -#define XmStringGetNextSegment XMSTRINGGETNEXTSEGMENT -#define XmStringInitContext XMSTRINGINITCONTEXT -#define XmStringLength XMSTRINGLENGTH -#define XmStringLtoRCreate XMSTRINGLTORCREATE -#define XmStringNConcat XMSTRINGNCONCAT -#define XmStringSegmentCreate XMSTRINGSEGMENTCREATE -#define XmStringSeparatorCreate XMSTRINGSEPARATORCREATE -#define XmStringWidth XMSTRINGWIDTH -#define XmTextClearSelection XMTEXTCLEARSELECTION -#define XmTextCopy XMTEXTCOPY -#define XmTextCut XMTEXTCUT -#define XmTextFieldClearSelection XMTEXTFIELDCLEARSELECTION -#define XmTextFieldCopy XMTEXTFIELDCOPY -#define XmTextFieldCut XMTEXTFIELDCUT -#define XmTextFieldGetEditable XMTEXTFIELDGETEDITABLE -#define XmTextFieldGetInsertionPosition XMTEXTFIELDGETINSERTIONPOSITION -#define XmTextFieldGetLastPosition XMTEXTFIELDGETLASTPOSITION -#define XmTextFieldGetMaxLength XMTEXTFIELDGETMAXLENGTH -#define XmTextFieldGetSelection XMTEXTFIELDGETSELECTION -#define XmTextFieldGetSelectionPosition XMTEXTFIELDGETSELECTIONPOSITION -#define XmTextFieldGetString XMTEXTFIELDGETSTRING -#define XmTextFieldInsert XMTEXTFIELDINSERT -#define XmTextFieldPaste XMTEXTFIELDPASTE -#define XmTextFieldRemove XMTEXTFIELDREMOVE -#define XmTextFieldReplace XMTEXTFIELDREPLACE -#define XmTextFieldSetAddMode XMTEXTFIELDSETADDMODE -#define XmTextFieldSetHighlight XMTEXTFIELDSETHIGHLIGHT -#define XmTextFieldSetInsertionPosition XMTEXTFIELDSETINSERTIONPOSITION -#define XmTextFieldSetMaxLength XMTEXTFIELDSETMAXLENGTH -#define XmTextFieldSetSelection XMTEXTFIELDSETSELECTION -#define XmTextFieldSetString XMTEXTFIELDSETSTRING -#define XmTextFieldShowPosition XMTEXTFIELDSHOWPOSITION -#define XmTextGetCursorPosition XMTEXTGETCURSORPOSITION -#define XmTextGetEditable XMTEXTGETEDITABLE -#define XmTextGetInsertionPosition XMTEXTGETINSERTIONPOSITION -#define XmTextGetLastPosition XMTEXTGETLASTPOSITION -#define XmTextGetMaxLength XMTEXTGETMAXLENGTH -#define XmTextGetSelection XMTEXTGETSELECTION -#define XmTextGetSelectionPosition XMTEXTGETSELECTIONPOSITION -#define XmTextGetString XMTEXTGETSTRING -#define XmTextInsert XMTEXTINSERT -#define XmTextPaste XMTEXTPASTE -#define XmTextPosToXY XMTEXTPOSTOXY -#define XmTextRemove XMTEXTREMOVE -#define XmTextReplace XMTEXTREPLACE -#define XmTextSetCursorPosition XMTEXTSETCURSORPOSITION -#define XmTextSetEditable XMTEXTSETEDITABLE -#define XmTextSetHighlight XMTEXTSETHIGHLIGHT -#define XmTextSetInsertionPosition XMTEXTSETINSERTIONPOSITION -#define XmTextSetSelection XMTEXTSETSELECTION -#define XmTextSetString XMTEXTSETSTRING -#define XmTextSetTopCharacter XMTEXTSETTOPCHARACTER -#define XmTextShowPosition XMTEXTSHOWPOSITION -#define XmToggleButtonGadgetGetState XMTOGGLEBUTTONGADGETGETSTATE -#define XmToggleButtonGadgetSetState XMTOGGLEBUTTONGADGETSETSTATE -#define XmToggleButtonGetState XMTOGGLEBUTTONGETSTATE -#define XmToggleButtonSetState XMTOGGLEBUTTONSETSTATE -#define XmUninstallImage XMUNINSTALLIMAGE -#define XmUpdateDisplay XMUPDATEDISPLAY -#define XmVaCreateSimpleRadioBox XMVACREATESIMPLERADIOBOX -#define XmbDrawString XMBDRAWSTRING -#define XmbLookupString XMBLOOKUPSTRING -#define XmbResetIC XMBRESETIC -#define XmbSetWMProperties XMBSETWMPROPERTIES -#define XmbTextEscapement XMBTEXTESCAPEMENT -#define XmbTextExtents XMBTEXTEXTENTS -#define XmbTextListToTextProperty XMBTEXTLISTTOTEXTPROPERTY -#define XmbTextPropertyToTextList XMBTEXTPROPERTYTOTEXTLIST -#define XmbufCreateBuffers XMBUFCREATEBUFFERS -#define XmbufDestroyBuffers XMBUFDESTROYBUFFERS -#define XmbufDisplayBuffers XMBUFDISPLAYBUFFERS -#define XmbufQueryExtension XMBUFQUERYEXTENSION -#define Xmemory_free XMEMORY_FREE -#define Xmemory_malloc XMEMORY_MALLOC -#define XmuClientWindow XMUCLIENTWINDOW -#define XmuConvertStandardSelection XMUCONVERTSTANDARDSELECTION -#define XmuCvtStringToBitmap XMUCVTSTRINGTOBITMAP -#define XmuInternAtom XMUINTERNATOM -#define XmuInternStrings XMUINTERNSTRINGS -#define XmuLookupStandardColormap XMULOOKUPSTANDARDCOLORMAP -#define XmuPrintDefaultErrorMessage XMUPRINTDEFAULTERRORMESSAGE -#define XrmCombineDatabase XRMCOMBINEDATABASE -#define XrmCombineFileDatabase XRMCOMBINEFILEDATABASE -#define XrmDestroyDatabase XRMDESTROYDATABASE -#define XrmGetDatabase XRMGETDATABASE -#define XrmGetFileDatabase XRMGETFILEDATABASE -#define XrmGetResource XRMGETRESOURCE -#define XrmGetStringDatabase XRMGETSTRINGDATABASE -#define XrmInitialize XRMINITIALIZE -#define XrmMergeDatabases XRMMERGEDATABASES -#define XrmParseCommand XRMPARSECOMMAND -#define XrmPermStringToQuark XRMPERMSTRINGTOQUARK -#define XrmPutFileDatabase XRMPUTFILEDATABASE -#define XrmPutLineResource XRMPUTLINERESOURCE -#define XrmPutStringResource XRMPUTSTRINGRESOURCE -#define XrmQGetResource XRMQGETRESOURCE -#define XrmQPutStringResource XRMQPUTSTRINGRESOURCE -#define XrmQuarkToString XRMQUARKTOSTRING -#define XrmSetDatabase XRMSETDATABASE -#define XrmStringToBindingQuarkList XRMSTRINGTOBINDINGQUARKLIST -#define XrmStringToQuark XRMSTRINGTOQUARK -#define XtAddCallback XTADDCALLBACK -#define XtAddCallbacks XTADDCALLBACKS -#define XtAddConverter XTADDCONVERTER -#define XtAddEventHandler XTADDEVENTHANDLER -#define XtAddExposureToRegion XTADDEXPOSURETOREGION -#define XtAddGrab XTADDGRAB -#define XtAddRawEventHandler XTADDRAWEVENTHANDLER -#define XtAllocateGC XTALLOCATEGC -#define XtAppAddActions XTAPPADDACTIONS -#define XtAppAddInput XTAPPADDINPUT -#define XtAppAddTimeOut XTAPPADDTIMEOUT -#define XtAppAddWorkProc XTAPPADDWORKPROC -#define XtAppCreateShell XTAPPCREATESHELL -#define XtAppError XTAPPERROR -#define XtAppErrorMsg XTAPPERRORMSG -#define XtAppGetErrorDatabase XTAPPGETERRORDATABASE -#define XtAppGetErrorDatabaseText XTAPPGETERRORDATABASETEXT -#define XtAppSetErrorMsgHandler XTAPPSETERRORMSGHANDLER -#define XtAppInitialize XTAPPINITIALIZE -#define XtAppMainLoop XTAPPMAINLOOP -#define XtAppNextEvent XTAPPNEXTEVENT -#define XtAppPeekEvent XTAPPPEEKEVENT -#define XtAppPending XTAPPPENDING -#define XtAppProcessEvent XTAPPPROCESSEVENT -#define XtAppSetErrorHandler XTAPPSETERRORHANDLER -#define XtAppSetFallbackResources XTAPPSETFALLBACKRESOURCES -#define XtAppSetTypeConverter XTAPPSETTYPECONVERTER -#define XtAppSetWarningHandler XTAPPSETWARNINGHANDLER -#define XtAppWarningMsg XTAPPWARNINGMSG -#define XtAppSetWarningMsgHandler XTAPPSETWARNINGMSGHANDLER -#define XtAppWarning XTAPPWARNING -#define XtAugmentTranslations XTAUGMENTTRANSLATIONS -#define XtCallActionProc XTCALLACTIONPROC -#define XtCallCallbackList XTCALLCALLBACKLIST -#define XtCallCallbacks XTCALLCALLBACKS -#define XtCallConverter XTCALLCONVERTER -#define XtCalloc XTCALLOC -#ifndef NOXTDISPLAY -#define XtClass XTCLASS -#endif -#define XtCloseDisplay XTCLOSEDISPLAY -#define XtConfigureWidget XTCONFIGUREWIDGET -#define XtConvert XTCONVERT -#define XtConvertAndStore XTCONVERTANDSTORE -#define XtCreateApplicationContext XTCREATEAPPLICATIONCONTEXT -#define XtCreateManagedWidget XTCREATEMANAGEDWIDGET -#define XtCreatePopupShell XTCREATEPOPUPSHELL -#define XtCreateWidget XTCREATEWIDGET -#define XtCreateWindow XTCREATEWINDOW -#define XtCvtStringToFont XTCVTSTRINGTOFONT -#define XtDatabase XTDATABASE -#define XtDestroyApplicationContext XTDESTROYAPPLICATIONCONTEXT -#define XtDestroyWidget XTDESTROYWIDGET -#define XtDisownSelection XTDISOWNSELECTION -#define XtDispatchEvent XTDISPATCHEVENT -#ifndef NOXTDISPLAY -#define XtDisplay XTDISPLAY -#endif -#define XtDisplayInitialize XTDISPLAYINITIALIZE -#define XtDisplayOfObject XTDISPLAYOFOBJECT -#define XtDisplayStringConvWarning XTDISPLAYSTRINGCONVWARNING -#define XtDisplayToApplicationContext XTDISPLAYTOAPPLICATIONCONTEXT -#define XtError XTERROR -#define XtErrorMsg XTERRORMSG -#define XtFree XTFREE -#define XtGetActionKeysym XTGETACTIONKEYSYM -#define XtGetActionList XTGETACTIONLIST -#define XtGetApplicationNameAndClass XTGETAPPLICATIONNAMEANDCLASS -#define XtGetApplicationResources XTGETAPPLICATIONRESOURCES -#define XtGetClassExtension XTGETCLASSEXTENSION -#define XtGetConstraintResourceList XTGETCONSTRAINTRESOURCELIST -#define XtGetGC XTGETGC -#define XtGetMultiClickTime XTGETMULTICLICKTIME -#define XtGetResourceList XTGETRESOURCELIST -#define XtGetSelectionValue XTGETSELECTIONVALUE -#define XtGetSelectionValues XTGETSELECTIONVALUES -#define XtGetSubresources XTGETSUBRESOURCES -#define XtGetValues XTGETVALUES -#define XtGrabButton XTGRABBUTTON -#define XtGrabKeyboard XTGRABKEYBOARD -#define XtGrabPointer XTGRABPOINTER -#define XtHasCallbacks XTHASCALLBACKS -#define XtInitialize XTINITIALIZE -#define XtInitializeWidgetClass XTINITIALIZEWIDGETCLASS -#define XtInsertEventHandler XTINSERTEVENTHANDLER -#define XtInsertRawEventHandler XTINSERTRAWEVENTHANDLER -#define XtInstallAccelerators XTINSTALLACCELERATORS -#define XtIsManaged XTISMANAGED -#define XtIsObject XTISOBJECT -#ifndef NOXTDISPLAY -#define XtIsRealized XTISREALIZED -#endif -#define XtIsSensitive XTISSENSITIVE -#define XtIsSubclass XTISSUBCLASS -#define XtLastTimestampProcessed XTLASTTIMESTAMPPROCESSED -#define XtMainLoop XTMAINLOOP -#define XtMakeGeometryRequest XTMAKEGEOMETRYREQUEST -#define XtMakeResizeRequest XTMAKERESIZEREQUEST -#define XtMalloc XTMALLOC -#define XtManageChild XTMANAGECHILD -#define XtManageChildren XTMANAGECHILDREN -#define XtMergeArgLists XTMERGEARGLISTS -#define XtMoveWidget XTMOVEWIDGET -#define XtName XTNAME -#define XtNameToWidget XTNAMETOWIDGET -#define XtOpenApplication XTOPENAPPLICATION -#define XtOpenDisplay XTOPENDISPLAY -#define XtOverrideTranslations XTOVERRIDETRANSLATIONS -#define XtOwnSelection XTOWNSELECTION -#ifndef NOXTDISPLAY -#define XtParent XTPARENT -#endif -#define XtParseAcceleratorTable XTPARSEACCELERATORTABLE -#define XtParseTranslationTable XTPARSETRANSLATIONTABLE -#define XtPopdown XTPOPDOWN -#define XtPopup XTPOPUP -#define XtPopupSpringLoaded XTPOPUPSPRINGLOADED -#define XtQueryGeometry XTQUERYGEOMETRY -#define XtRealizeWidget XTREALIZEWIDGET -#define XtRealloc XTREALLOC -#define XtRegisterDrawable _XTREGISTERWINDOW -#define XtRegisterGrabAction XTREGISTERGRABACTION -#define XtReleaseGC XTRELEASEGC -#define XtRemoveAllCallbacks XTREMOVEALLCALLBACKS -#define XtRemoveCallback XTREMOVECALLBACK -#define XtRemoveEventHandler XTREMOVEEVENTHANDLER -#define XtRemoveGrab XTREMOVEGRAB -#define XtRemoveInput XTREMOVEINPUT -#define XtRemoveTimeOut XTREMOVETIMEOUT -#define XtRemoveWorkProc XTREMOVEWORKPROC -#define XtResizeWidget XTRESIZEWIDGET -#define XtResolvePathname XTRESOLVEPATHNAME -#ifndef NOXTDISPLAY -#define XtScreen XTSCREEN -#endif -#define XtScreenDatabase XTSCREENDATABASE -#define XtScreenOfObject XTSCREENOFOBJECT -#define XtSessionReturnToken XTSESSIONRETURNTOKEN -#define XtSetErrorHandler XTSETERRORHANDLER -#define XtSetKeyboardFocus XTSETKEYBOARDFOCUS -#define XtSetLanguageProc XTSETLANGUAGEPROC -#define XtSetMappedWhenManaged XTSETMAPPEDWHENMANAGED -#define XtSetSensitive XTSETSENSITIVE -#define XtSetTypeConverter XTSETTYPECONVERTER -#define XtSetValues XTSETVALUES -#define XtShellStrings XTSHELLSTRINGS -#define XtStringConversionWarning XTSTRINGCONVERSIONWARNING -#define XtStrings XTSTRINGS -#define XtToolkitInitialize XTTOOLKITINITIALIZE -#define XtTranslateCoords XTTRANSLATECOORDS -#define XtTranslateKeycode XTTRANSLATEKEYCODE -#define XtUngrabButton XTUNGRABBUTTON -#define XtUngrabKeyboard XTUNGRABKEYBOARD -#define XtUngrabPointer XTUNGRABPOINTER -#define XtUnmanageChild XTUNMANAGECHILD -#define XtUnmanageChildren XTUNMANAGECHILDREN -#define XtUnrealizeWidget XTUNREALIZEWIDGET -#define XtUnregisterDrawable _XTUNREGISTERWINDOW -#define XtVaAppCreateShell XTVAAPPCREATESHELL -#define XtVaCreateManagedWidget XTVACREATEMANAGEDWIDGET -#define XtVaCreatePopupShell XTVACREATEPOPUPSHELL -#define XtVaCreateWidget XTVACREATEWIDGET -#define XtVaGetApplicationResources XTVAGETAPPLICATIONRESOURCES -#define XtVaGetValues XTVAGETVALUES -#define XtVaSetValues XTVASETVALUES -#define XtWarning XTWARNING -#define XtWarningMsg XTWARNINGMSG -#define XtWidgetToApplicationContext XTWIDGETTOAPPLICATIONCONTEXT -#ifndef NOXTDISPLAY -#define XtWindow XTWINDOW -#endif -#define XtWindowOfObject XTWINDOWOFOBJECT -#define XtWindowToWidget XTWINDOWTOWIDGET -#define XwcDrawImageString XWCDRAWIMAGESTRING -#define XwcDrawString XWCDRAWSTRING -#define XwcFreeStringList XWCFREESTRINGLIST -#define XwcTextEscapement XWCTEXTESCAPEMENT -#define XwcTextExtents XWCTEXTEXTENTS -#define XwcTextListToTextProperty XWCTEXTLISTTOTEXTPROPERTY -#define XwcLookupString XWCLOOKUPSTRING -#define XwcTextPropertyToTextList XWCTEXTPROPERTYTOTEXTLIST -#define _XAllocTemp _XALLOCTEMP -#define _XDeqAsyncHandler _XDEQASYNCHANDLER -#define _XEatData _XEATDATA -#define _XFlush _XFLUSH -#define _XFreeTemp _XFREETEMP -#define _XGetAsyncReply _XGETASYNCREPLY -#define _XInitImageFuncPtrs _XINITIMAGEFUNCPTRS -#define _XRead _XREAD -#define _XReadPad _XREADPAD -#define _XRegisterFilterByType _XREGISTERFILTERBYTYPE -#define _XReply _XREPLY -#define _XSend _XSEND -#define _XUnregisterFilter _XUNREGISTERFILTER -#define _XVIDtoVisual _XVIDTOVISUAL -#define _XmBottomShadowColorDefault _XMBOTTOMSHADOWCOLORDEFAULT -#define _XmClearBorder _XMCLEARBORDER -#define _XmConfigureObject _XMCONFIGUREOBJECT -#define _XmDestroyParentCallback _XMDESTROYPARENTCALLBACK -#define _XmDrawArrow _XMDRAWARROW -#define _XmDrawShadows _XMDRAWSHADOWS -#define _XmFontListGetDefaultFont _XMFONTLISTGETDEFAULTFONT -#define _XmFromHorizontalPixels _XMFROMHORIZONTALPIXELS -#define _XmFromVerticalPixels _XMFROMVERTICALPIXELS -#define _XmGetClassExtensionPtr _XMGETCLASSEXTENSIONPTR -#define _XmGetDefaultFontList _XMGETDEFAULTFONTLIST -#define _XmGetTextualDragIcon _XMGETTEXTUALDRAGICON -#define _XmGetWidgetExtData _XMGETWIDGETEXTDATA -#define _XmGrabKeyboard _XMGRABKEYBOARD -#define _XmGrabPointer _XMGRABPOINTER -#define _XmInheritClass _XMINHERITCLASS -#define _XmInputForGadget _XMINPUTFORGADGET -#define _XmInputInGadget _XMINPUTINGADGET -#define _XmMakeGeometryRequest _XMMAKEGEOMETRYREQUEST -#define _XmMenuPopDown _XMMENUPOPDOWN -#define _XmMoveObject _XMMOVEOBJECT -#define _XmNavigChangeManaged _XMNAVIGCHANGEMANAGED -#define _XmOSBuildFileList _XMOSBUILDFILELIST -#define _XmOSFileCompare _XMOSFILECOMPARE -#define _XmOSFindPatternPart _XMOSFINDPATTERNPART -#define _XmOSQualifyFileSpec _XMOSQUALIFYFILESPEC -#define _XmPostPopupMenu _XMPOSTPOPUPMENU -#define _XmPrimitiveEnter _XMPRIMITIVEENTER -#define _XmPrimitiveLeave _XMPRIMITIVELEAVE -#define _XmRedisplayGadgets _XMREDISPLAYGADGETS -#define _XmShellIsExclusive _XMSHELLISEXCLUSIVE -#define _XmStringDraw _XMSTRINGDRAW -#define _XmStringGetTextConcat _XMSTRINGGETTEXTCONCAT -#define _XmStrings _XMSTRINGS -#define _XmToHorizontalPixels _XMTOHORIZONTALPIXELS -#define _XmToVerticalPixels _XMTOVERTICALPIXELS -#define _XmTopShadowColorDefault _XMTOPSHADOWCOLORDEFAULT -#define _Xm_fastPtr _XM_FASTPTR -#define _XtCheckSubclassFlag _XTCHECKSUBCLASSFLAG -#define _XtCopyFromArg _XTCOPYFROMARG -#define _XtCountVaList _XTCOUNTVALIST -#define _XtInherit _XTINHERIT -#define _XtInheritTranslations _XTINHERITTRANSLATIONS -#define _XtIsSubclassOf _XTISSUBCLASSOF -#define _XtVaToArgList _XTVATOARGLIST -#define applicationShellWidgetClass APPLICATIONSHELLWIDGETCLASS -#define cli$dcl_parse CLI$DCL_PARSE -#define cli$get_value CLI$GET_VALUE -#define cli$present CLI$PRESENT -#define compositeClassRec COMPOSITECLASSREC -#define compositeWidgetClass COMPOSITEWIDGETCLASS -#define constraintClassRec CONSTRAINTCLASSREC -#define constraintWidgetClass CONSTRAINTWIDGETCLASS -#define coreWidgetClass COREWIDGETCLASS -#define exe$getspi EXE$GETSPI -#define lbr$close LBR$CLOSE -#define lbr$get_header LBR$GET_HEADER -#define lbr$get_index LBR$GET_INDEX -#define lbr$get_record LBR$GET_RECORD -#define lbr$ini_control LBR$INI_CONTROL -#define lbr$lookup_key LBR$LOOKUP_KEY -#define lbr$open LBR$OPEN -#define lbr$output_help LBR$OUTPUT_HELP -#define lib$add_times LIB$ADD_TIMES -#define lib$addx LIB$ADDX -#define lib$create_dir LIB$CREATE_DIR -#define lib$create_vm_zone LIB$CREATE_VM_ZONE -#define lib$cvt_from_internal_time LIB$CVT_FROM_INTERNAL_TIME -#define lib$cvt_htb LIB$CVT_HTB -#define lib$cvt_vectim LIB$CVT_VECTIM -#define lib$day LIB$DAY -#define lib$day_of_week LIB$DAY_OF_WEEK -#define lib$delete_symbol LIB$DELETE_SYMBOL -#define lib$delete_vm_zone LIB$DELETE_VM_ZONE -#define lib$disable_ctrl LIB$DISABLE_CTRL -#define lib$ediv LIB$EDIV -#define lib$emul LIB$EMUL -#define lib$enable_ctrl LIB$ENABLE_CTRL -#define lib$find_vm_zone LIB$FIND_VM_ZONE -#define lib$format_date_time LIB$FORMAT_DATE_TIME -#define lib$free_timer LIB$FREE_TIMER -#define lib$free_vm LIB$FREE_VM -#define lib$get_ef LIB$GET_EF -#define lib$get_foreign LIB$GET_FOREIGN -#define lib$get_input LIB$GET_INPUT -#define lib$get_users_language LIB$GET_USERS_LANGUAGE -#define lib$get_vm LIB$GET_VM -#define lib$get_symbol LIB$GET_SYMBOL -#define lib$getdvi LIB$GETDVI -#define lib$init_date_time_context LIB$INIT_DATE_TIME_CONTEXT -#define lib$init_timer LIB$INIT_TIMER -#define lib$find_file LIB$FIND_FILE -#define lib$find_file_end LIB$FIND_FILE_END -#define lib$find_image_symbol LIB$FIND_IMAGE_SYMBOL -#define lib$mult_delta_time LIB$MULT_DELTA_TIME -#define lib$put_output LIB$PUT_OUTPUT -#define lib$rename_file LIB$RENAME_FILE -#define lib$reset_vm_zone LIB$RESET_VM_ZONE -#define lib$set_symbol LIB$SET_SYMBOL -#define lib$sfree1_dd LIB$SFREE1_DD -#define lib$show_vm LIB$SHOW_VM -#define lib$show_vm_zone LIB$SHOW_VM_ZONE -#define lib$spawn LIB$SPAWN -#define lib$stat_timer LIB$STAT_TIMER -#define lib$subx LIB$SUBX -#define lib$sub_times LIB$SUB_TIMES -#define lib$wait LIB$WAIT -#define mail$send_add_address MAIL$SEND_ADD_ADDRESS -#define mail$send_add_attribute MAIL$SEND_ADD_ATTRIBUTE -#define mail$send_add_bodypart MAIL$SEND_ADD_BODYPART -#define mail$send_begin MAIL$SEND_BEGIN -#define mail$send_end MAIL$SEND_END -#define mail$send_message MAIL$SEND_MESSAGE -#define ncs$convert NCS$CONVERT -#define ncs$get_cf NCS$GET_CF -#define objectClass OBJECTCLASS -#define objectClassRec OBJECTCLASSREC -#define overrideShellClassRec OVERRIDESHELLCLASSREC -#define overrideShellWidgetClass OVERRIDESHELLWIDGETCLASS -#define pthread_attr_create PTHREAD_ATTR_CREATE -#define pthread_attr_delete PTHREAD_ATTR_DELETE -#define pthread_attr_destroy PTHREAD_ATTR_DESTROY -#define pthread_attr_getdetach_np PTHREAD_ATTR_GETDETACH_NP -#define pthread_attr_getguardsize_np PTHREAD_ATTR_GETGUARDSIZE_NP -#define pthread_attr_getinheritsched PTHREAD_ATTR_GETINHERITSCHED -#define pthread_attr_getprio PTHREAD_ATTR_GETPRIO -#define pthread_attr_getsched PTHREAD_ATTR_GETSCHED -#define pthread_attr_getschedparam PTHREAD_ATTR_GETSCHEDPARAM -#define pthread_attr_getschedpolicy PTHREAD_ATTR_GETSCHEDPOLICY -#define pthread_attr_getstacksize PTHREAD_ATTR_GETSTACKSIZE -#define pthread_attr_init PTHREAD_ATTR_INIT -#define pthread_attr_setdetach_np PTHREAD_ATTR_SETDETACH_NP -#define pthread_attr_setdetachstate PTHREAD_ATTR_SETDETACHSTATE -#define pthread_attr_setguardsize_np PTHREAD_ATTR_SETGUARDSIZE_NP -#define pthread_attr_setinheritsched PTHREAD_ATTR_SETINHERITSCHED -#define pthread_attr_setprio PTHREAD_ATTR_SETPRIO -#define pthread_attr_setsched PTHREAD_ATTR_SETSCHED -#define pthread_attr_setschedparam PTHREAD_ATTR_SETSCHEDPARAM -#define pthread_attr_setschedpolicy PTHREAD_ATTR_SETSCHEDPOLICY -#ifndef pthread_attr_setscope -# define pthread_attr_setscope PTHREAD_ATTR_SETSCOPE -#endif -#define pthread_attr_setstacksize PTHREAD_ATTR_SETSTACKSIZE -#define pthread_cancel PTHREAD_CANCEL -#define pthread_cancel_e PTHREAD_CANCEL_E -#define pthread_cond_broadcast PTHREAD_COND_BROADCAST -#define pthread_cond_destroy PTHREAD_COND_DESTROY -#define pthread_cond_init PTHREAD_COND_INIT -#define pthread_cond_sig_preempt_int_np PTHREAD_COND_SIG_PREEMPT_INT_NP -#define pthread_cond_signal PTHREAD_COND_SIGNAL -#define pthread_cond_signal_int_np PTHREAD_COND_SIGNAL_INT_NP -#define pthread_cond_timedwait PTHREAD_COND_TIMEDWAIT -#define pthread_cond_wait PTHREAD_COND_WAIT -#define pthread_condattr_create PTHREAD_CONDATTR_CREATE -#define pthread_condattr_delete PTHREAD_CONDATTR_DELETE -#define pthread_condattr_init PTHREAD_CONDATTR_INIT -#define pthread_create PTHREAD_CREATE -#define pthread_delay_np PTHREAD_DELAY_NP -#define pthread_detach PTHREAD_DETACH -#define pthread_equal PTHREAD_EQUAL -#define pthread_exc_fetch_fp_np PTHREAD_EXC_FETCH_FP_NP -#define pthread_exc_handler_np PTHREAD_EXC_HANDLER_NP -#define pthread_exc_matches_np PTHREAD_EXC_MATCHES_NP -#define pthread_exc_pop_ctx_np PTHREAD_EXC_POP_CTX_NP -#define pthread_exc_push_ctx_np PTHREAD_EXC_PUSH_CTX_NP -#define pthread_exc_raise_np PTHREAD_EXC_RAISE_NP -#define pthread_exc_savecontext_np PTHREAD_EXC_SAVECONTEXT_NP -#define pthread_exit PTHREAD_EXIT -#define pthread_get_expiration_np PTHREAD_GET_EXPIRATION_NP -#define pthread_getprio PTHREAD_GETPRIO -#define pthread_getschedparam PTHREAD_GETSCHEDPARAM -#define pthread_getscheduler PTHREAD_GETSCHEDULER -#define pthread_getspecific PTHREAD_GETSPECIFIC -#define pthread_getunique_np PTHREAD_GETUNIQUE_NP -#define pthread_join PTHREAD_JOIN -#define pthread_join32 PTHREAD_JOIN32 -#define pthread_key_create PTHREAD_KEY_CREATE -#define pthread_key_delete PTHREAD_KEY_DELETE -#define pthread_keycreate PTHREAD_KEYCREATE -#define pthread_kill PTHREAD_KILL -#define pthread_lock_global_np PTHREAD_LOCK_GLOBAL_NP -#define pthread_mutex_destroy PTHREAD_MUTEX_DESTROY -#define pthread_mutex_init PTHREAD_MUTEX_INIT -#define pthread_mutex_lock PTHREAD_MUTEX_LOCK -#define pthread_mutex_trylock PTHREAD_MUTEX_TRYLOCK -#define pthread_mutex_unlock PTHREAD_MUTEX_UNLOCK -#define pthread_mutexattr_create PTHREAD_MUTEXATTR_CREATE -#define pthread_mutexattr_delete PTHREAD_MUTEXATTR_DELETE -#define pthread_mutexattr_destroy PTHREAD_MUTEXATTR_DESTROY -#define pthread_mutexattr_getkind_np PTHREAD_MUTEXATTR_GETKIND_NP -#define pthread_mutexattr_init PTHREAD_MUTEXATTR_INIT -#define pthread_mutexattr_setkind_np PTHREAD_MUTEXATTR_SETKIND_NP -#define pthread_mutexattr_settype_np PTHREAD_MUTEXATTR_SETTYPE_NP -#define pthread_once PTHREAD_ONCE -#define pthread_resume_np PTHREAD_RESUME_NP -#define pthread_self PTHREAD_SELF -#define pthread_setasynccancel PTHREAD_SETASYNCCANCEL -#define pthread_setcancel PTHREAD_SETCANCEL -#define pthread_setcancelstate PTHREAD_SETCANCELSTATE -#define pthread_setcanceltype PTHREAD_SETCANCELTYPE -#define pthread_setprio PTHREAD_SETPRIO -#define pthread_setschedparam PTHREAD_SETSCHEDPARAM -#define pthread_setscheduler PTHREAD_SETSCHEDULER -#define pthread_setspecific PTHREAD_SETSPECIFIC -#define pthread_suspend_np PTHREAD_SUSPEND_NP -#define pthread_testcancel PTHREAD_TESTCANCEL -#define pthread_unlock_global_np PTHREAD_UNLOCK_GLOBAL_NP -#define pthread_yield PTHREAD_YIELD -#define pthread_yield_np PTHREAD_YIELD_NP -#define rectObjClass RECTOBJCLASS -#define rectObjClassRec RECTOBJCLASSREC -#define sessionShellWidgetClass SESSIONSHELLWIDGETCLASS -#define shellWidgetClass SHELLWIDGETCLASS -#define shmat SHMAT -#define shmctl SHMCTL -#define shmdt SHMDT -#define shmget SHMGET -#define smg$create_key_table SMG$CREATE_KEY_TABLE -#define smg$create_virtual_keyboard SMG$CREATE_VIRTUAL_KEYBOARD -#define smg$read_composed_line SMG$READ_COMPOSED_LINE -#define sys$add_ident SYS$ADD_IDENT -#define sys$asctoid SYS$ASCTOID -#define sys$assign SYS$ASSIGN -#define sys$bintim SYS$BINTIM -#define sys$cancel SYS$CANCEL -#define sys$cantim SYS$CANTIM -#define sys$check_access SYS$CHECK_ACCESS -#define sys$close SYS$CLOSE -#define sys$connect SYS$CONNECT -#define sys$create SYS$CREATE -#define sys$create_user_profile SYS$CREATE_USER_PROFILE -#define sys$crembx SYS$CREMBX -#define sys$creprc SYS$CREPRC -#define sys$crmpsc SYS$CRMPSC -#define sys$dassgn SYS$DASSGN -#define sys$dclast SYS$DCLAST -#define sys$dclexh SYS$DCLEXH -#define sys$delprc SYS$DELPRC -#define sys$deq SYS$DEQ -#define sys$dgblsc SYS$DGBLSC -#define sys$display SYS$DISPLAY -#define sys$enq SYS$ENQ -#define sys$enqw SYS$ENQW -#define sys$erase SYS$ERASE -#define sys$fao SYS$FAO -#define sys$faol SYS$FAOL -#define sys$find_held SYS$FIND_HELD -#define sys$finish_rdb SYS$FINISH_RDB -#define sys$flush SYS$FLUSH -#define sys$forcex SYS$FORCEX -#define sys$get SYS$GET -#define sys$get_security SYS$GET_SECURITY -#define sys$getdviw SYS$GETDVIW -#define sys$getjpi SYS$GETJPI -#define sys$getjpiw SYS$GETJPIW -#define sys$getlkiw SYS$GETLKIW -#define sys$getmsg SYS$GETMSG -#define sys$getsyi SYS$GETSYI -#define sys$getsyiw SYS$GETSYIW -#define sys$gettim SYS$GETTIM -#define sys$getuai SYS$GETUAI -#define sys$grantid SYS$GRANTID -#define sys$hash_password SYS$HASH_PASSWORD -#define sys$hiber SYS$HIBER -#define sys$mgblsc SYS$MGBLSC -#define sys$numtim SYS$NUMTIM -#define sys$open SYS$OPEN -#define sys$parse SYS$PARSE -#define sys$parse_acl SYS$PARSE_ACL -#define sys$parse_acl SYS$PARSE_ACL -#define sys$persona_assume SYS$PERSONA_ASSUME -#define sys$persona_create SYS$PERSONA_CREATE -#define sys$persona_delete SYS$PERSONA_DELETE -#define sys$process_scan SYS$PROCESS_SCAN -#define sys$put SYS$PUT -#define sys$qio SYS$QIO -#define sys$qiow SYS$QIOW -#define sys$read SYS$READ -#define sys$resched SYS$RESCHED -#define sys$rewind SYS$REWIND -#define sys$search SYS$SEARCH -#define sys$set_security SYS$SET_SECURITY -#define sys$setast SYS$SETAST -#define sys$setef SYS$SETEF -#define sys$setimr SYS$SETIMR -#define sys$setpri SYS$SETPRI -#define sys$setprn SYS$SETPRN -#define sys$setprv SYS$SETPRV -#define sys$setswm SYS$SETSWM -#define sys$setuai SYS$SETUAI -#define sys$sndopr SYS$SNDOPR -#define sys$synch SYS$SYNCH -#define sys$trnlnm SYS$TRNLNM -#define sys$update SYS$UPDATE -#define sys$wake SYS$WAKE -#define sys$write SYS$WRITE -#define topLevelShellClassRec TOPLEVELSHELLCLASSREC -#define topLevelShellWidgetClass TOPLEVELSHELLWIDGETCLASS -#define transientShellWidgetClass TRANSIENTSHELLWIDGETCLASS -#define vendorShellClassRec VENDORSHELLCLASSREC -#define vendorShellWidgetClass VENDORSHELLWIDGETCLASS -#define widgetClass WIDGETCLASS -#define widgetClassRec WIDGETCLASSREC -#define wmShellClassRec WMSHELLCLASSREC -#define wmShellWidgetClass WMSHELLWIDGETCLASS -#define x$soft_ast_lib_lock X$SOFT_AST_LIB_LOCK -#define x$soft_ast_lock_depth X$SOFT_AST_LOCK_DEPTH -#define x$soft_reenable_asts X$SOFT_REENABLE_ASTS -#define xmArrowButtonWidgetClass XMARROWBUTTONWIDGETCLASS -#define xmBulletinBoardWidgetClass XMBULLETINBOARDWIDGETCLASS -#define xmCascadeButtonClassRec XMCASCADEBUTTONCLASSREC -#define xmCascadeButtonGadgetClass XMCASCADEBUTTONGADGETCLASS -#define xmCascadeButtonWidgetClass XMCASCADEBUTTONWIDGETCLASS -#define xmCommandWidgetClass XMCOMMANDWIDGETCLASS -#define xmDialogShellWidgetClass XMDIALOGSHELLWIDGETCLASS -#define xmDrawingAreaWidgetClass XMDRAWINGAREAWIDGETCLASS -#define xmDrawnButtonWidgetClass XMDRAWNBUTTONWIDGETCLASS -#define xmFileSelectionBoxWidgetClass XMFILESELECTIONBOXWIDGETCLASS -#define xmFormWidgetClass XMFORMWIDGETCLASS -#define xmFrameWidgetClass XMFRAMEWIDGETCLASS -#define xmGadgetClass XMGADGETCLASS -#define xmLabelGadgetClass XMLABELGADGETCLASS -#define xmLabelWidgetClass XMLABELWIDGETCLASS -#define xmListWidgetClass XMLISTWIDGETCLASS -#define xmMainWindowWidgetClass XMMAINWINDOWWIDGETCLASS -#define xmManagerClassRec XMMANAGERCLASSREC -#define xmManagerWidgetClass XMMANAGERWIDGETCLASS -#define xmMenuShellWidgetClass XMMENUSHELLWIDGETCLASS -#define xmMessageBoxWidgetClass XMMESSAGEBOXWIDGETCLASS -#define xmPrimitiveClassRec XMPRIMITIVECLASSREC -#define xmPrimitiveWidgetClass XMPRIMITIVEWIDGETCLASS -#define xmPushButtonClassRec XMPUSHBUTTONCLASSREC -#define xmPushButtonGadgetClass XMPUSHBUTTONGADGETCLASS -#define xmPushButtonWidgetClass XMPUSHBUTTONWIDGETCLASS -#define xmRowColumnWidgetClass XMROWCOLUMNWIDGETCLASS -#define xmSashWidgetClass XMSASHWIDGETCLASS -#define xmScaleWidgetClass XMSCALEWIDGETCLASS -#define xmScrollBarWidgetClass XMSCROLLBARWIDGETCLASS -#define xmScrolledWindowClassRec XMSCROLLEDWINDOWCLASSREC -#define xmScrolledWindowWidgetClass XMSCROLLEDWINDOWWIDGETCLASS -#define xmSeparatorGadgetClass XMSEPARATORGADGETCLASS -#define xmSeparatorWidgetClass XMSEPARATORWIDGETCLASS -#define xmTextFieldWidgetClass XMTEXTFIELDWIDGETCLASS -#define xmTextWidgetClass XMTEXTWIDGETCLASS -#define xmToggleButtonGadgetClass XMTOGGLEBUTTONGADGETCLASS -#define xmToggleButtonWidgetClass XMTOGGLEBUTTONWIDGETCLASS - -#if (__VMS_VER < 80200000) -# define SetReqLen(req,n,badlen) \ - if ((req->length + n) > (unsigned)65535) { \ - n = badlen; \ - req->length += n; \ - } else \ - req->length += n -#endif - -#ifdef __cplusplus -extern "C" { -#endif -extern void XtFree(char*); -#ifdef __cplusplus -} -#endif - -#endif diff --git a/mesalib/include/GLES/glext.h b/mesalib/include/GLES/glext.h index 130e4b063..5b46ae6d0 100644 --- a/mesalib/include/GLES/glext.h +++ b/mesalib/include/GLES/glext.h @@ -1,7 +1,7 @@ #ifndef __glext_h_ #define __glext_h_ -/* $Revision: 13240 $ on $Date:: 2010-12-17 15:16:00 -0800 #$ */ +/* $Revision: 19260 $ on $Date:: 2012-09-20 11:30:36 -0700 #$ */ #ifdef __cplusplus extern "C" { @@ -165,6 +165,9 @@ typedef void* GLeglImageOES; #define GL_DEPTH24_STENCIL8_OES 0x88F0 #endif +/* GL_OES_required_internalformat */ +/* No new tokens introduced by this extension. */ + /* GL_OES_rgb8_rgba8 */ #ifndef GL_OES_rgb8_rgba8 #define GL_RGB8_OES 0x8051 @@ -240,7 +243,7 @@ typedef void* GLeglImageOES; * APPLE extension tokens *------------------------------------------------------------------------*/ -/* GL_APPLE_texture_2D_limited_npot */ +/* GL_APPLE_copy_texture_levels */ /* No new tokens introduced by this extension. */ /* GL_APPLE_framebuffer_multisample */ @@ -254,6 +257,41 @@ typedef void* GLeglImageOES; #define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA #endif +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync + +/* These types are defined with reference to <inttypes.h> + * in the Apple extension spec, but here we use the Khronos + * portable types in khrplatform.h, and assume those types + * are always defined. + * If any other extensions using these types are defined, + * the typedefs must move out of this block and be shared. + */ +typedef khronos_int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef struct __GLsync *GLsync; + +#define GL_SYNC_OBJECT_APPLE 0x8A53 +#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 +#define GL_OBJECT_TYPE_APPLE 0x9112 +#define GL_SYNC_CONDITION_APPLE 0x9113 +#define GL_SYNC_STATUS_APPLE 0x9114 +#define GL_SYNC_FLAGS_APPLE 0x9115 +#define GL_SYNC_FENCE_APPLE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 +#define GL_UNSIGNALED_APPLE 0x9118 +#define GL_SIGNALED_APPLE 0x9119 +#define GL_ALREADY_SIGNALED_APPLE 0x911A +#define GL_TIMEOUT_EXPIRED_APPLE 0x911B +#define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_WAIT_FAILED_APPLE 0x911D +#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#endif + +/* GL_APPLE_texture_2D_limited_npot */ +/* No new tokens introduced by this extension. */ + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_BGRA_EXT 0x80E1 @@ -288,6 +326,25 @@ typedef void* GLeglImageOES; #define GL_STENCIL_EXT 0x1802 #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_MAP_READ_BIT_EXT 0x0001 +#define GL_MAP_WRITE_BIT_EXT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 +#endif + +/* GL_EXT_multisampled_render_to_texture */ +#ifndef GL_EXT_multisampled_render_to_texture +#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 +#define GL_MAX_SAMPLES_EXT 0x8D57 +#endif + /* GL_EXT_multi_draw_arrays */ /* No new tokens introduced by this extension. */ @@ -298,6 +355,32 @@ typedef void* GLeglImageOES; #define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 #endif +/* GL_EXT_robustness */ +#ifndef GL_EXT_robustness +/* reuse GL_NO_ERROR */ +#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 +#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 +#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 +#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 +#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 +#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 +#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 +#endif + +/* GL_EXT_sRGB */ +#ifndef GL_EXT_sRGB +#define GL_SRGB_EXT 0x8C40 +#define GL_SRGB_ALPHA_EXT 0x8C42 +#define GL_SRGB8_ALPHA8_EXT 0x8C43 +#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 +#endif + +/* GL_EXT_texture_compression_dxt1 */ +#ifndef GL_EXT_texture_compression_dxt1 +#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#endif + /* GL_EXT_texture_filter_anisotropic */ #ifndef GL_EXT_texture_filter_anisotropic #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE @@ -316,6 +399,27 @@ typedef void* GLeglImageOES; #define GL_TEXTURE_LOD_BIAS_EXT 0x8501 #endif +/* GL_EXT_texture_storage */ +#ifndef GL_EXT_texture_storage +#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F +#define GL_ALPHA8_EXT 0x803C +#define GL_LUMINANCE8_EXT 0x8040 +#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 +#define GL_RGBA32F_EXT 0x8814 +#define GL_RGB32F_EXT 0x8815 +#define GL_ALPHA32F_EXT 0x8816 +#define GL_LUMINANCE32F_EXT 0x8818 +#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 +/* reuse GL_RGBA16F_EXT */ +#define GL_RGB16F_EXT 0x881B +#define GL_ALPHA16F_EXT 0x881C +#define GL_LUMINANCE16F_EXT 0x881E +#define GL_LUMINANCE_ALPHA16F_EXT 0x881F +#define GL_RGB10_A2_EXT 0x8059 +#define GL_RGB10_EXT 0x8052 +#define GL_BGRA8_EXT 0x93A1 +#endif + /*------------------------------------------------------------------------* * IMG extension tokens *------------------------------------------------------------------------*/ @@ -716,6 +820,11 @@ typedef void (GL_APIENTRYP PFNGLWEIGHTPOINTEROESPROC) (GLint size, GLenum type, #define GL_OES_packed_depth_stencil 1 #endif +/* GL_OES_required_internalformat */ +#ifndef GL_OES_required_internalformat +#define GL_OES_required_internalformat 1 +#endif + /* GL_OES_query_matrix */ #ifndef GL_OES_query_matrix #define GL_OES_query_matrix 1 @@ -837,9 +946,13 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); * APPLE extension functions *------------------------------------------------------------------------*/ -/* GL_APPLE_texture_2D_limited_npot */ -#ifndef GL_APPLE_texture_2D_limited_npot -#define GL_APPLE_texture_2D_limited_npot 1 +/* GL_APPLE_copy_texture_levels */ +#ifndef GL_APPLE_copy_texture_levels +#define GL_APPLE_copy_texture_levels 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); +#endif +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); #endif /* GL_APPLE_framebuffer_multisample */ @@ -853,6 +966,32 @@ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); #endif +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync +#define GL_APPLE_sync 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); +GL_API GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); +GL_API void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); +GL_API GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_API void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_API void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); +GL_API void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif +typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); +typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); +typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); +typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); +typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif + +/* GL_APPLE_texture_2D_limited_npot */ +#ifndef GL_APPLE_texture_2D_limited_npot +#define GL_APPLE_texture_2D_limited_npot 1 +#endif + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_APPLE_texture_format_BGRA8888 1 @@ -890,6 +1029,28 @@ GL_API void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttac typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_EXT_map_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API void GL_APIENTRY *glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +GL_API void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); +#endif +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); +#endif + +/* GL_EXT_multisampled_render_to_texture */ +#ifndef GL_EXT_multisampled_render_to_texture +#define GL_EXT_multisampled_render_to_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); +GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); +#endif +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); +#endif + /* GL_EXT_multi_draw_arrays */ #ifndef GL_EXT_multi_draw_arrays #define GL_EXT_multi_draw_arrays 1 @@ -906,6 +1067,31 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL #define GL_EXT_read_format_bgra 1 #endif +/* GL_EXT_robustness */ +#ifndef GL_EXT_robustness +#define GL_EXT_robustness 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); +GL_API void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +GL_API void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params); +GL_API void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); +#endif +typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); +typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); +#endif + +/* GL_EXT_sRGB */ +#ifndef GL_EXT_sRGB +#define GL_EXT_sRGB 1 +#endif + +/* GL_EXT_texture_compression_dxt1 */ +#ifndef GL_EXT_texture_compression_dxt1 +#define GL_EXT_texture_compression_dxt1 1 +#endif + /* GL_EXT_texture_filter_anisotropic */ #ifndef GL_EXT_texture_filter_anisotropic #define GL_EXT_texture_filter_anisotropic 1 @@ -921,6 +1107,25 @@ typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GL #define GL_EXT_texture_lod_bias 1 #endif +/* GL_EXT_texture_storage */ +#ifndef GL_EXT_texture_storage +#define GL_EXT_texture_storage 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_API void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GL_API void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GL_API void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +GL_API void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +GL_API void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +GL_API void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +#endif +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); +#endif + /*------------------------------------------------------------------------* * IMG extension functions *------------------------------------------------------------------------*/ @@ -958,8 +1163,8 @@ typedef void (GL_APIENTRYP PFNGLCLIPPLANEXIMGPROC) (GLenum p, const GLfixed *eqn GL_API void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); GL_API void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); #endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); #endif /*------------------------------------------------------------------------* diff --git a/mesalib/include/GLES2/gl2.h b/mesalib/include/GLES2/gl2.h index e1d3b87cc..b7fe76ee1 100644 --- a/mesalib/include/GLES2/gl2.h +++ b/mesalib/include/GLES2/gl2.h @@ -1,7 +1,7 @@ #ifndef __gl2_h_ #define __gl2_h_ -/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ +/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */ #include <GLES2/gl2platform.h> @@ -431,7 +431,6 @@ typedef khronos_ssize_t GLsizeiptr; #define GL_RGB5_A1 0x8057 #define GL_RGB565 0x8D62 #define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_STENCIL_INDEX 0x1901 #define GL_STENCIL_INDEX8 0x8D48 #define GL_RENDERBUFFER_WIDTH 0x8D42 @@ -569,7 +568,7 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length); +GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); diff --git a/mesalib/include/GLES2/gl2ext.h b/mesalib/include/GLES2/gl2ext.h index c21e2acfc..65b8e80d2 100644 --- a/mesalib/include/GLES2/gl2ext.h +++ b/mesalib/include/GLES2/gl2ext.h @@ -1,7 +1,7 @@ #ifndef __gl2ext_h_ #define __gl2ext_h_ -/* $Revision: 18099 $ on $Date:: 2012-06-06 09:16:19 -0700 #$ */ +/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ #ifdef __cplusplus extern "C" { @@ -94,7 +94,23 @@ typedef void* GLeglImageOES; #endif /* GL_OES_required_internalformat */ -/* No new tokens introduced by this extension. */ +#ifndef GL_OES_required_internalformat +#define GL_ALPHA8_OES 0x803C +#define GL_DEPTH_COMPONENT16_OES 0x81A5 +/* reuse GL_DEPTH_COMPONENT24_OES */ +/* reuse GL_DEPTH24_STENCIL8_OES */ +/* reuse GL_DEPTH_COMPONENT32_OES */ +#define GL_LUMINANCE4_ALPHA4_OES 0x8043 +#define GL_LUMINANCE8_ALPHA8_OES 0x8045 +#define GL_LUMINANCE8_OES 0x8040 +#define GL_RGBA4_OES 0x8056 +#define GL_RGB5_A1_OES 0x8057 +#define GL_RGB565_OES 0x8D62 +/* reuse GL_RGB8_OES */ +/* reuse GL_RGBA8_OES */ +/* reuse GL_RGB10_EXT */ +/* reuse GL_RGB10_A2_EXT */ +#endif /* GL_OES_rgb8_rgba8 */ #ifndef GL_OES_rgb8_rgba8 @@ -117,6 +133,10 @@ typedef void* GLeglImageOES; #define GL_STENCIL_INDEX4_OES 0x8D47 #endif +#ifndef GL_OES_surfaceless_context +#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 +#endif + /* GL_OES_texture_3D */ #ifndef GL_OES_texture_3D #define GL_TEXTURE_WRAP_R_OES 0x8072 @@ -159,6 +179,85 @@ typedef void* GLeglImageOES; #endif /*------------------------------------------------------------------------* + * KHR extension tokens + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 +#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 +#define GL_DEBUG_SOURCE_API 0x8246 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GL_DEBUG_SOURCE_OTHER 0x824B +#define GL_DEBUG_TYPE_ERROR 0x824C +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GL_DEBUG_TYPE_OTHER 0x8251 +#define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_BUFFER 0x82E0 +#define GL_SHADER 0x82E1 +#define GL_PROGRAM 0x82E2 +#define GL_QUERY 0x82E3 +/* PROGRAM_PIPELINE only in GL */ +#define GL_SAMPLER 0x82E6 +/* DISPLAY_LIST only in GL */ +#define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GL_DEBUG_SEVERITY_LOW 0x9148 +#define GL_DEBUG_OUTPUT 0x92E0 +#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#endif + +/*------------------------------------------------------------------------* * AMD extension tokens *------------------------------------------------------------------------*/ @@ -245,13 +344,9 @@ typedef void* GLeglImageOES; * APPLE extension tokens *------------------------------------------------------------------------*/ -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - +/* GL_APPLE_copy_texture_levels */ +/* No new tokens introduced by this extension. */ + /* GL_APPLE_framebuffer_multisample */ #ifndef GL_APPLE_framebuffer_multisample #define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB @@ -263,6 +358,47 @@ typedef void* GLeglImageOES; #define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA #endif +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_RGB_422_APPLE 0x8A1F +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync + +#ifndef __gl3_h_ +/* These types are defined with reference to <inttypes.h> + * in the Apple extension spec, but here we use the Khronos + * portable types in khrplatform.h, and assume those types + * are always defined. + * If any other extensions using these types are defined, + * the typedefs must move out of this block and be shared. + */ +typedef khronos_int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef struct __GLsync *GLsync; +#endif + +#define GL_SYNC_OBJECT_APPLE 0x8A53 +#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 +#define GL_OBJECT_TYPE_APPLE 0x9112 +#define GL_SYNC_CONDITION_APPLE 0x9113 +#define GL_SYNC_STATUS_APPLE 0x9114 +#define GL_SYNC_FLAGS_APPLE 0x9115 +#define GL_SYNC_FENCE_APPLE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 +#define GL_UNSIGNALED_APPLE 0x9118 +#define GL_SIGNALED_APPLE 0x9119 +#define GL_ALREADY_SIGNALED_APPLE 0x911A +#define GL_TIMEOUT_EXPIRED_APPLE 0x911B +#define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_WAIT_FAILED_APPLE 0x911D +#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#endif + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_BGRA_EXT 0x80E1 @@ -277,6 +413,11 @@ typedef void* GLeglImageOES; * ARM extension tokens *------------------------------------------------------------------------*/ +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 +#endif + /* GL_ARM_mali_shader_binary */ #ifndef GL_ARM_mali_shader_binary #define GL_MALI_SHADER_BINARY_ARM 0x8F60 @@ -325,12 +466,32 @@ typedef void* GLeglImageOES; #define GL_STENCIL_EXT 0x1802 #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_MAP_READ_BIT_EXT 0x0001 +#define GL_MAP_WRITE_BIT_EXT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 +#endif + /* GL_EXT_multisampled_render_to_texture */ #ifndef GL_EXT_multisampled_render_to_texture #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -#define GL_RENDERBUFFER_SAMPLES_EXT 0x9133 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x9134 -#define GL_MAX_SAMPLES_EXT 0x9135 +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ +#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 +#define GL_MAX_SAMPLES_EXT 0x8D57 +#endif + +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_COLOR_ATTACHMENT_EXT 0x90F0 +#define GL_MULTIVIEW_EXT 0x90F1 +#define GL_DRAW_BUFFER_EXT 0x0C01 +#define GL_READ_BUFFER_EXT 0x0C02 +#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 #endif /* GL_EXT_multi_draw_arrays */ @@ -374,6 +535,11 @@ typedef void* GLeglImageOES; #define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A #endif +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 +#endif + /* GL_EXT_shader_texture_lod */ /* No new tokens introduced by this extension. */ @@ -617,6 +783,14 @@ typedef void* GLeglImageOES; #define GL_ALPHA_TEST_REF_QCOM 0x0BC2 #endif +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 +#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 +#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 +#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 +#endif + /* GL_QCOM_driver_control */ /* No new tokens introduced by this extension. */ @@ -812,6 +986,10 @@ typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum #define GL_OES_stencil4 1 #endif +#ifndef GL_OES_surfaceless_context +#define GL_OES_surfaceless_context 1 +#endif + /* GL_OES_texture_3D */ #ifndef GL_OES_texture_3D #define GL_OES_texture_3D 1 @@ -882,6 +1060,43 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); #endif /*------------------------------------------------------------------------* + * KHR extension functions + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +#define GL_KHR_debug 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); +GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); +GL_APICALL void GL_APIENTRY glPopDebugGroup (void); +GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); +#endif +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); +typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); +typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); +typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_KHR_texture_compression_astc_ldr 1 +#endif + + +/*------------------------------------------------------------------------* * AMD extension functions *------------------------------------------------------------------------*/ @@ -994,9 +1209,13 @@ typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shad * APPLE extension functions *------------------------------------------------------------------------*/ -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 +/* GL_APPLE_copy_texture_levels */ +#ifndef GL_APPLE_copy_texture_levels +#define GL_APPLE_copy_texture_levels 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); +#endif +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); #endif /* GL_APPLE_framebuffer_multisample */ @@ -1010,6 +1229,32 @@ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); #endif +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_APPLE_rgb_422 1 +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync +#define GL_APPLE_sync 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); +GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); +GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); +GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); +GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif +typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); +typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); +typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); +typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); +typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_APPLE_texture_format_BGRA8888 1 @@ -1024,6 +1269,11 @@ typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); * ARM extension functions *------------------------------------------------------------------------*/ +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_ARM_mali_program_binary 1 +#endif + /* GL_ARM_mali_shader_binary */ #ifndef GL_ARM_mali_shader_binary #define GL_ARM_mali_shader_binary 1 @@ -1081,6 +1331,17 @@ GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numA typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_EXT_map_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); +#endif +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); +#endif + /* GL_EXT_multisampled_render_to_texture */ #ifndef GL_EXT_multisampled_render_to_texture #define GL_EXT_multisampled_render_to_texture 1 @@ -1092,6 +1353,19 @@ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum t typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); #endif +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_EXT_multiview_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); +GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); +GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); +#endif +typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); +typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); +typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); +#endif + #ifndef GL_EXT_multi_draw_arrays #define GL_EXT_multi_draw_arrays 1 #ifdef GL_GLEXT_PROTOTYPES @@ -1210,6 +1484,11 @@ typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); #endif +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_EXT_shader_framebuffer_fetch 1 +#endif + /* GL_EXT_shader_texture_lod */ #ifndef GL_EXT_shader_texture_lod #define GL_EXT_shader_texture_lod 1 @@ -1323,8 +1602,8 @@ typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); #endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMG) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMG) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); +typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); #endif /*------------------------------------------------------------------------* @@ -1434,6 +1713,11 @@ GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); #endif +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_QCOM_binning_control 1 +#endif + /* GL_QCOM_driver_control */ #ifndef GL_QCOM_driver_control #define GL_QCOM_driver_control 1 diff --git a/mesalib/src/gallium/auxiliary/Makefile b/mesalib/src/gallium/auxiliary/Makefile index 3ba3f9c40..dc2800337 100644 --- a/mesalib/src/gallium/auxiliary/Makefile +++ b/mesalib/src/gallium/auxiliary/Makefile @@ -13,6 +13,7 @@ C_SOURCES += \ $(GALLIVM_SOURCES) CPP_SOURCES += \ $(GALLIVM_CPP_SOURCES) +CXXFLAGS += $(LLVM_CXXFLAGS) endif diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index 0c1430e23..e788b6594 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -900,7 +900,7 @@ void util_blitter_cache_all_shaders(struct blitter_context *blitter) target == PIPE_TEXTURE_2D_ARRAY)) { continue; } - if (!has_arraytex && + if (!has_cubearraytex && (target == PIPE_TEXTURE_CUBE_ARRAY)) continue; @@ -1891,6 +1891,12 @@ static boolean is_box_inside_resource(const struct pipe_resource *res, height = u_minify(res->height0, level); depth = res->array_size; break; + case PIPE_TEXTURE_CUBE_ARRAY: + width = u_minify(res->width0, level); + height = u_minify(res->height0, level); + depth = res->array_size; + assert(res->array_size % 6 == 0); + break; case PIPE_MAX_TEXTURE_TYPES:; } diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.h b/mesalib/src/gallium/auxiliary/util/u_debug.h index 14d319c2c..3b42c2f07 100644 --- a/mesalib/src/gallium/auxiliary/util/u_debug.h +++ b/mesalib/src/gallium/auxiliary/util/u_debug.h @@ -275,7 +275,7 @@ struct debug_named_value * ... * @endcode */ -#define DEBUG_NAMED_VALUE(__symbol) DEBUG_NAMED_VALUE_WITH_DESCRIPTION(__symbol, NULL) +#define DEBUG_NAMED_VALUE(__symbol) {#__symbol, (unsigned long)__symbol, NULL} #define DEBUG_NAMED_VALUE_WITH_DESCRIPTION(__symbol, __desc) {#__symbol, (unsigned long)__symbol, __desc} #define DEBUG_NAMED_VALUE_END {NULL, 0, NULL} diff --git a/mesalib/src/gallium/auxiliary/util/u_format.c b/mesalib/src/gallium/auxiliary/util/u_format.c index a41c468a9..f572a612e 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format.c +++ b/mesalib/src/gallium/auxiliary/util/u_format.c @@ -61,30 +61,6 @@ util_format_is_float(enum pipe_format format) } -/** - * Return the number of logical channels in the given format by - * examining swizzles. - * XXX this could be made into a public function if useful elsewhere. - */ -static unsigned -nr_logical_channels(const struct util_format_description *desc) -{ - boolean swizzle_used[UTIL_FORMAT_SWIZZLE_MAX]; - - memset(swizzle_used, 0, sizeof(swizzle_used)); - - swizzle_used[desc->swizzle[0]] = TRUE; - swizzle_used[desc->swizzle[1]] = TRUE; - swizzle_used[desc->swizzle[2]] = TRUE; - swizzle_used[desc->swizzle[3]] = TRUE; - - return (swizzle_used[UTIL_FORMAT_SWIZZLE_X] + - swizzle_used[UTIL_FORMAT_SWIZZLE_Y] + - swizzle_used[UTIL_FORMAT_SWIZZLE_Z] + - swizzle_used[UTIL_FORMAT_SWIZZLE_W]); -} - - /** Test if the format contains RGB, but not alpha */ boolean util_format_is_rgb_no_alpha(enum pipe_format format) @@ -94,7 +70,7 @@ util_format_is_rgb_no_alpha(enum pipe_format format) if ((desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB || desc->colorspace == UTIL_FORMAT_COLORSPACE_SRGB) && - nr_logical_channels(desc) == 3) { + desc->swizzle[3] == UTIL_FORMAT_SWIZZLE_1) { return TRUE; } return FALSE; diff --git a/mesalib/src/gallium/auxiliary/util/u_prim.h b/mesalib/src/gallium/auxiliary/util/u_prim.h index 070df643d..d62c636f2 100644 --- a/mesalib/src/gallium/auxiliary/util/u_prim.h +++ b/mesalib/src/gallium/auxiliary/util/u_prim.h @@ -118,7 +118,9 @@ static INLINE unsigned u_reduced_prim( unsigned pipe_prim ) return PIPE_PRIM_POINTS; case PIPE_PRIM_LINES: + case PIPE_PRIM_LINES_ADJACENCY: case PIPE_PRIM_LINE_STRIP: + case PIPE_PRIM_LINE_STRIP_ADJACENCY: case PIPE_PRIM_LINE_LOOP: return PIPE_PRIM_LINES; diff --git a/mesalib/src/gallium/auxiliary/util/u_rect.h b/mesalib/src/gallium/auxiliary/util/u_rect.h index 4cb90d3c3..8fccae8c4 100644 --- a/mesalib/src/gallium/auxiliary/util/u_rect.h +++ b/mesalib/src/gallium/auxiliary/util/u_rect.h @@ -31,6 +31,10 @@ #include "pipe/p_compiler.h" +#ifdef __cplusplus +extern "C" { +#endif + struct u_rect { int x0, x1; int y0, y1; @@ -75,6 +79,10 @@ u_rect_possible_intersection(const struct u_rect *a, } } +#ifdef __cplusplus +} +#endif + #include "pipe/p_format.h" #include "util/u_pack_color.h" @@ -88,6 +96,10 @@ u_rect_possible_intersection(const struct u_rect *a, */ #include "pipe/p_format.h" +#ifdef __cplusplus +extern "C" { +#endif + extern void util_copy_rect(ubyte * dst, enum pipe_format format, unsigned dst_stride, unsigned dst_x, unsigned dst_y, @@ -99,5 +111,8 @@ util_fill_rect(ubyte * dst, enum pipe_format format, unsigned dst_stride, unsigned dst_x, unsigned dst_y, unsigned width, unsigned height, union util_color *uc); +#ifdef __cplusplus +} +#endif #endif /* U_RECT_H */ diff --git a/mesalib/src/gallium/auxiliary/util/u_snprintf.c b/mesalib/src/gallium/auxiliary/util/u_snprintf.c index e16f103e3..a24b6ff38 100644 --- a/mesalib/src/gallium/auxiliary/util/u_snprintf.c +++ b/mesalib/src/gallium/auxiliary/util/u_snprintf.c @@ -167,7 +167,7 @@ #if HAVE_CONFIG_H #include <config.h> #else -#ifdef _WIN32 +#ifdef _MSC_VER #define vsnprintf util_vsnprintf #define snprintf util_snprintf #define HAVE_VSNPRINTF 0 diff --git a/mesalib/src/gallium/auxiliary/util/u_string.h b/mesalib/src/gallium/auxiliary/util/u_string.h index 15630ad07..fca73ffc7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_string.h +++ b/mesalib/src/gallium/auxiliary/util/u_string.h @@ -35,7 +35,7 @@ #ifndef U_STRING_H_ #define U_STRING_H_ -#if !defined(_WIN32) && !defined(XF86_LIBC_H) +#if !defined(_MSC_VER) && !defined(XF86_LIBC_H) #include <stdio.h> #endif #include <stddef.h> @@ -64,7 +64,7 @@ util_strchrnul(const char *s, char c) #endif -#ifdef _WIN32 +#ifdef _MSC_VER int util_vsnprintf(char *, size_t, const char *, va_list); int util_snprintf(char *str, size_t size, const char *format, ...); diff --git a/mesalib/src/gallium/auxiliary/util/u_surface.c b/mesalib/src/gallium/auxiliary/util/u_surface.c index 304da9070..e99431ef8 100644 --- a/mesalib/src/gallium/auxiliary/util/u_surface.c +++ b/mesalib/src/gallium/auxiliary/util/u_surface.c @@ -129,11 +129,11 @@ util_resource_copy_region(struct pipe_context *pipe, const struct pipe_box *src_box) { struct pipe_transfer *src_trans, *dst_trans; - void *dst_map; - const void *src_map; + uint8_t *dst_map; + const uint8_t *src_map; enum pipe_format src_format, dst_format; - unsigned w = src_box->width; - unsigned h = src_box->height; + struct pipe_box dst_box; + int z; assert(src && dst); if (!src || !dst) @@ -145,44 +145,62 @@ util_resource_copy_region(struct pipe_context *pipe, src_format = src->format; dst_format = dst->format; - src_map = pipe_transfer_map(pipe, - src, - src_level, - src_box->z, - PIPE_TRANSFER_READ, - src_box->x, src_box->y, w, h, &src_trans); - - dst_map = pipe_transfer_map(pipe, - dst, - dst_level, - dst_z, - PIPE_TRANSFER_WRITE, - dst_x, dst_y, w, h, &dst_trans); - assert(util_format_get_blocksize(dst_format) == util_format_get_blocksize(src_format)); assert(util_format_get_blockwidth(dst_format) == util_format_get_blockwidth(src_format)); assert(util_format_get_blockheight(dst_format) == util_format_get_blockheight(src_format)); + + src_map = pipe->transfer_map(pipe, + src, + src_level, + PIPE_TRANSFER_READ, + src_box, &src_trans); assert(src_map); + if (!src_map) { + goto no_src_map; + } + + dst_box.x = dst_x; + dst_box.y = dst_y; + dst_box.z = dst_z; + dst_box.width = src_box->width; + dst_box.height = src_box->height; + dst_box.depth = src_box->depth; + + dst_map = pipe->transfer_map(pipe, + dst, + dst_level, + PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE, + &dst_box, &dst_trans); assert(dst_map); + if (!dst_map) { + goto no_dst_map; + } - if (src_map && dst_map) { - if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) { - memcpy(dst_map, src_map, w); - } else { + if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) { + assert(src_box->height == 1); + assert(src_box->depth == 1); + memcpy(dst_map, src_map, src_box->width); + } else { + for (z = 0; z < src_box->depth; ++z) { util_copy_rect(dst_map, dst_format, dst_trans->stride, 0, 0, - w, h, + src_box->width, src_box->height, src_map, src_trans->stride, - 0, - 0); + 0, 0); + + dst_map += dst_trans->layer_stride; + src_map += src_trans->layer_stride; } } - pipe->transfer_unmap(pipe, src_trans); pipe->transfer_unmap(pipe, dst_trans); +no_dst_map: + pipe->transfer_unmap(pipe, src_trans); +no_src_map: + ; } @@ -271,7 +289,8 @@ util_clear_depth_stencil(struct pipe_context *pipe, if (dst_map) { unsigned dst_stride = dst_trans->stride; - unsigned zstencil = util_pack_z_stencil(dst->texture->format, depth, stencil); + uint64_t zstencil = util_pack64_z_stencil(dst->texture->format, + depth, stencil); unsigned i, j; assert(dst_trans->stride > 0); @@ -279,10 +298,10 @@ util_clear_depth_stencil(struct pipe_context *pipe, case 1: assert(dst->format == PIPE_FORMAT_S8_UINT); if(dst_stride == width) - memset(dst_map, (ubyte) zstencil, height * width); + memset(dst_map, (uint8_t) zstencil, height * width); else { for (i = 0; i < height; i++) { - memset(dst_map, (ubyte) zstencil, width); + memset(dst_map, (uint8_t) zstencil, width); dst_map += dst_stride; } } @@ -301,7 +320,7 @@ util_clear_depth_stencil(struct pipe_context *pipe, for (i = 0; i < height; i++) { uint32_t *row = (uint32_t *)dst_map; for (j = 0; j < width; j++) - *row++ = zstencil; + *row++ = (uint32_t) zstencil; dst_map += dst_stride; } } @@ -319,19 +338,13 @@ util_clear_depth_stencil(struct pipe_context *pipe, uint32_t *row = (uint32_t *)dst_map; for (j = 0; j < width; j++) { uint32_t tmp = *row & dst_mask; - *row++ = tmp | (zstencil & ~dst_mask); + *row++ = tmp | ((uint32_t) zstencil & ~dst_mask); } dst_map += dst_stride; } } break; case 8: - { - uint64_t zstencil = util_pack64_z_stencil(dst->texture->format, - depth, stencil); - - assert(dst->format == PIPE_FORMAT_Z32_FLOAT_S8X24_UINT); - if (!need_rmw) { for (i = 0; i < height; i++) { uint64_t *row = (uint64_t *)dst_map; @@ -358,7 +371,6 @@ util_clear_depth_stencil(struct pipe_context *pipe, } } break; - } default: assert(0); break; diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk index f975d03d1..f5006ab03 100644 --- a/mesalib/src/glsl/Android.mk +++ b/mesalib/src/glsl/Android.mk @@ -36,8 +36,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ - $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) + $(LIBGLSL_FILES) LOCAL_C_INCLUDES := \ external/astl/include \ @@ -59,7 +58,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ $(LIBGLCPP_FILES) \ $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) \ $(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \ $(GLSL_COMPILER_CXX_FILES) diff --git a/mesalib/src/glsl/Makefile.am b/mesalib/src/glsl/Makefile.am index 6fb3d2d9d..ea7617685 100644 --- a/mesalib/src/glsl/Makefile.am +++ b/mesalib/src/glsl/Makefile.am @@ -43,7 +43,6 @@ libglsl_la_SOURCES = \ glsl_lexer.ll \ glsl_parser.cc \ $(LIBGLSL_FILES) \ - $(LIBGLSL_CXX_FILES) \ builtin_function.cpp libglsl_la_LIBADD = glcpp/libglcpp.la diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources index aafb53eae..5e098fc05 100644 --- a/mesalib/src/glsl/Makefile.sources +++ b/mesalib/src/glsl/Makefile.sources @@ -15,10 +15,6 @@ LIBGLCPP_GENERATED_FILES = \ # libglsl LIBGLSL_FILES = \ - $(GLSL_SRCDIR)/strtod.c \ - $(GLSL_SRCDIR)/ralloc.c - -LIBGLSL_CXX_FILES = \ $(GLSL_SRCDIR)/ast_expr.cpp \ $(GLSL_SRCDIR)/ast_function.cpp \ $(GLSL_SRCDIR)/ast_to_hir.cpp \ @@ -85,7 +81,9 @@ LIBGLSL_CXX_FILES = \ $(GLSL_SRCDIR)/opt_structure_splitting.cpp \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ - $(GLSL_SRCDIR)/s_expression.cpp + $(GLSL_SRCDIR)/s_expression.cpp \ + $(GLSL_SRCDIR)/strtod.c \ + $(GLSL_SRCDIR)/ralloc.c # glsl_compiler @@ -95,7 +93,7 @@ GLSL_COMPILER_CXX_FILES = \ # builtin_compiler # -# This is built before libglsl to generate builtin_funciton.cpp for libglsl. +# This is built before libglsl to generate builtin_function.cpp for libglsl. # For this to work, a dummy version of builtin_function.cpp, # builtin_stubs.cpp, is used. diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript index 89014ee3c..0cf25c07b 100644 --- a/mesalib/src/glsl/SConscript +++ b/mesalib/src/glsl/SConscript @@ -46,7 +46,7 @@ glsl_sources = [ source_lists = env.ParseSourceList('Makefile.sources') # add non-generated sources -for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES', 'LIBGLSL_CXX_FILES'): +for l in ('LIBGLCPP_FILES', 'LIBGLSL_FILES'): glsl_sources += source_lists[l] if env['msvc']: diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am index 72032b524..d6f85a7f4 100644 --- a/mesalib/src/glsl/builtin_compiler/Makefile.am +++ b/mesalib/src/glsl/builtin_compiler/Makefile.am @@ -35,6 +35,7 @@ AM_CFLAGS = \ -I $(top_srcdir)/src/mesa \ -I $(GLSL_SRCDIR) \ -I $(GLSL_SRCDIR)/glcpp \ + -I $(GLSL_BUILDDIR) \ $(DEFINES_FOR_BUILD) AM_CXXFLAGS = $(AM_CFLAGS) @@ -51,7 +52,7 @@ builtin_compiler_SOURCES = \ $(GLSL_SRCDIR)/glcpp/glcpp-parse.y \ $(LIBGLCPP_FILES) \ $(GLSL_SRCDIR)/glsl_lexer.ll \ - $(GLSL_SRCDIR)/glsl_parser.cc \ + $(GLSL_BUILDDIR)/glsl_parser.cc \ $(LIBGLSL_FILES) \ $(LIBGLSL_CXX_FILES) \ $(top_srcdir)/src/mesa/program/hash_table.c \ diff --git a/mesalib/src/glsl/glcpp/Makefile.am b/mesalib/src/glsl/glcpp/Makefile.am index 87affce1c..04d8cda01 100644 --- a/mesalib/src/glsl/glcpp/Makefile.am +++ b/mesalib/src/glsl/glcpp/Makefile.am @@ -22,6 +22,8 @@ include ../Makefile.sources +TESTS = tests/glcpp-test + AM_CFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ diff --git a/mesalib/src/glsl/glcpp/glcpp-parse.y b/mesalib/src/glsl/glcpp/glcpp-parse.y index 40c43c63e..b0537c3b0 100644 --- a/mesalib/src/glsl/glcpp/glcpp-parse.y +++ b/mesalib/src/glsl/glcpp/glcpp-parse.y @@ -190,6 +190,14 @@ line: control_line { ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n"); } +| HASH_LINE pp_tokens NEWLINE { + if (parser->skip_stack == NULL || + parser->skip_stack->type == SKIP_NO_SKIP) + { + _glcpp_parser_expand_and_lex_from (parser, + LINE_EXPANDED, $2); + } + } | text_line { _glcpp_parser_print_expanded_token_list (parser, $1); ralloc_asprintf_rewrite_tail (&parser->output, &parser->output_length, "\n"); @@ -244,14 +252,6 @@ control_line: } ralloc_free ($2); } -| HASH_LINE pp_tokens NEWLINE { - if (parser->skip_stack == NULL || - parser->skip_stack->type == SKIP_NO_SKIP) - { - _glcpp_parser_expand_and_lex_from (parser, - LINE_EXPANDED, $2); - } - } | HASH_IF conditional_tokens NEWLINE { /* Be careful to only evaluate the 'if' expression if * we are not skipping. When we are skipping, we @@ -327,12 +327,12 @@ control_line: glcpp_warning(& @1, parser, "ignoring illegal #elif without expression"); } } -| HASH_ELSE NEWLINE { +| HASH_ELSE { _glcpp_parser_skip_stack_change_if (parser, & @1, "else", 1); - } -| HASH_ENDIF NEWLINE { + } NEWLINE +| HASH_ENDIF { _glcpp_parser_skip_stack_pop (parser, & @1); - } + } NEWLINE | HASH_VERSION integer_constant NEWLINE { macro_t *macro = hash_table_find (parser->defines, "__VERSION__"); if (macro) { @@ -1150,46 +1150,49 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api) parser->new_source_number = 0; /* Add pre-defined macros. */ - add_builtin_define(parser, "GL_ARB_draw_buffers", 1); - add_builtin_define(parser, "GL_ARB_texture_rectangle", 1); + if (extensions != NULL) { + if (extensions->OES_EGL_image_external) + add_builtin_define(parser, "GL_OES_EGL_image_external", 1); + } if (api == API_OPENGLES2) add_builtin_define(parser, "GL_ES", 1); + else { + add_builtin_define(parser, "GL_ARB_draw_buffers", 1); + add_builtin_define(parser, "GL_ARB_texture_rectangle", 1); - if (extensions != NULL) { - if (extensions->EXT_texture_array) { - add_builtin_define(parser, "GL_EXT_texture_array", 1); - } + if (extensions != NULL) { + if (extensions->EXT_texture_array) { + add_builtin_define(parser, "GL_EXT_texture_array", 1); + } - if (extensions->ARB_fragment_coord_conventions) - add_builtin_define(parser, "GL_ARB_fragment_coord_conventions", - 1); + if (extensions->ARB_fragment_coord_conventions) + add_builtin_define(parser, "GL_ARB_fragment_coord_conventions", + 1); - if (extensions->ARB_explicit_attrib_location) - add_builtin_define(parser, "GL_ARB_explicit_attrib_location", 1); + if (extensions->ARB_explicit_attrib_location) + add_builtin_define(parser, "GL_ARB_explicit_attrib_location", 1); - if (extensions->ARB_shader_texture_lod) - add_builtin_define(parser, "GL_ARB_shader_texture_lod", 1); + if (extensions->ARB_shader_texture_lod) + add_builtin_define(parser, "GL_ARB_shader_texture_lod", 1); - if (extensions->ARB_draw_instanced) - add_builtin_define(parser, "GL_ARB_draw_instanced", 1); + if (extensions->ARB_draw_instanced) + add_builtin_define(parser, "GL_ARB_draw_instanced", 1); - if (extensions->ARB_conservative_depth) { - add_builtin_define(parser, "GL_AMD_conservative_depth", 1); - add_builtin_define(parser, "GL_ARB_conservative_depth", 1); - } + if (extensions->ARB_conservative_depth) { + add_builtin_define(parser, "GL_AMD_conservative_depth", 1); + add_builtin_define(parser, "GL_ARB_conservative_depth", 1); + } - if (extensions->OES_EGL_image_external) - add_builtin_define(parser, "GL_OES_EGL_image_external", 1); - - if (extensions->ARB_shader_bit_encoding) - add_builtin_define(parser, "GL_ARB_shader_bit_encoding", 1); + if (extensions->ARB_shader_bit_encoding) + add_builtin_define(parser, "GL_ARB_shader_bit_encoding", 1); - if (extensions->ARB_uniform_buffer_object) - add_builtin_define(parser, "GL_ARB_uniform_buffer_object", 1); + if (extensions->ARB_uniform_buffer_object) + add_builtin_define(parser, "GL_ARB_uniform_buffer_object", 1); - if (extensions->ARB_texture_cube_map_array) - add_builtin_define(parser, "GL_ARB_texture_cube_map_array", 1); + if (extensions->ARB_texture_cube_map_array) + add_builtin_define(parser, "GL_ARB_texture_cube_map_array", 1); + } } language_version = 110; diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 86371b5e6..3b2ab962b 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -2010,8 +2010,7 @@ is_varying_var(GLenum shaderType, const ir_variable *var) { /* Only fragment shaders will take a varying variable as an input */ if (shaderType == GL_FRAGMENT_SHADER && - var->mode == ir_var_in && - var->explicit_location) { + var->mode == ir_var_in) { switch (var->location) { case FRAG_ATTRIB_WPOS: case FRAG_ATTRIB_FACE: diff --git a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp index 789f62afe..f85875f49 100644 --- a/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp +++ b/mesalib/src/glsl/lower_vec_index_to_cond_assign.cpp @@ -68,9 +68,9 @@ ir_rvalue * ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue *ir) { ir_dereference_array *orig_deref = ir->as_dereference_array(); - ir_assignment *assign; - ir_variable *index, *var; - ir_dereference *deref; + ir_assignment *assign, *value_assign; + ir_variable *index, *var, *value; + ir_dereference *deref, *deref_value; unsigned i; if (!orig_deref) @@ -95,6 +95,14 @@ ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue assign = new(base_ir) ir_assignment(deref, orig_deref->array_index, NULL); list.push_tail(assign); + /* Store the value inside a temp, thus avoiding matrixes duplication */ + value = new(base_ir) ir_variable(orig_deref->array->type, "vec_value_tmp", + ir_var_temporary); + list.push_tail(value); + deref_value = new(base_ir) ir_dereference_variable(value); + value_assign = new(base_ir) ir_assignment(deref_value, orig_deref->array); + list.push_tail(value_assign); + /* Temporary where we store whichever value we swizzle out. */ var = new(base_ir) ir_variable(ir->type, "vec_index_tmp_v", ir_var_temporary); @@ -117,7 +125,7 @@ ir_vec_index_to_cond_assign_visitor::convert_vec_index_to_cond_assign(ir_rvalue * underlying variable. */ ir_rvalue *swizzle = - new(base_ir) ir_swizzle(orig_deref->array->clone(mem_ctx, NULL), + new(base_ir) ir_swizzle(deref_value->clone(mem_ctx, NULL), i, 0, 0, 0, 1); deref = new(base_ir) ir_dereference_variable(var); diff --git a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index 2bffc4e08..5eb53b14e 100644 --- a/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -10,9 +10,9 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysAPPLE" offset="assign" static_dispatch="false"> + <function name="DeleteVertexArraysAPPLE" static_dispatch="false" alias="DeleteVertexArrays"> <param name="n" type="GLsizei"/> - <param name="arrays" type="const GLuint *" count="n"/> + <param name="arrays" type="const GLuint *"/> </function> <function name="GenVertexArraysAPPLE" offset="assign" @@ -21,7 +21,7 @@ <param name="arrays" type="GLuint *" count="n" output="true"/> </function> - <function name="IsVertexArrayAPPLE" offset="assign" static_dispatch="false"> + <function name="IsVertexArrayAPPLE" static_dispatch="false" alias="IsVertexArray"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml index 7acf27155..edc10436e 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_color_buffer_float.xml @@ -14,10 +14,9 @@ <enum name="CLAMP_READ_COLOR_ARB" value="0x891C"/> <enum name="FIXED_ONLY_ARB" value="0x891D"/> - <function name="ClampColorARB" offset="assign"> + <function name="ClampColorARB" alias="ClampColor"> <param name="target" type="GLenum"/> <param name="clamp" type="GLenum"/> - <glx rop="234"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml index 3d4717267..45184eb04 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers.xml @@ -55,10 +55,9 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="bufs" type="const GLenum *" count="n"/> - <glx rop="233" large="true"/> + <function name="DrawBuffersARB" alias="DrawBuffers"> + <param name="n" type="GLsizei"/> + <param name="bufs" type="const GLenum *"/> </function> </category> @@ -115,7 +114,7 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersATI" alias="DrawBuffersARB"> + <function name="DrawBuffersATI" alias="DrawBuffers"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml index c08017aa5..0b6947cc5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_draw_buffers_blend.xml @@ -8,25 +8,24 @@ <category name="GL_ARB_draw_buffers_blend" number="69"> - <function name="BlendEquationiARB" offset="assign" mesa_name="-ARB"> + <function name="BlendEquationiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="BlendEquationSeparateiARB" offset="assign" - mesa_name="-ARB"> + <function name="BlendEquationSeparateiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> - <function name="BlendFunciARB" offset="assign" mesa_name="-ARB"> + <function name="BlendFunciARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="src" type="GLenum"/> <param name="dst" type="GLenum"/> </function> - <function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB"> + <function name="BlendFuncSeparateiARB" offset="assign"> <param name="buf" type="GLuint"/> <param name="srcRGB" type="GLenum"/> <param name="dstRGB" type="GLenum"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml index c9649aced..87eda93eb 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_framebuffer_object.xml @@ -140,33 +140,38 @@ - <function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0"> + <function name="IsRenderbuffer" es2="2.0" offset="assign"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1422"/> </function> - <function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0"> + <function name="BindRenderbuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4316"/> </function> - <function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT" - es2="2.0"> + <function name="DeleteRenderbuffers" + es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> + <glx rop="4317"/> </function> - <function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0"> + <function name="GenRenderbuffers" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> + <glx vendorpriv="1423" always_array="true"/> </function> - <function name="RenderbufferStorage" alias="RenderbufferStorageEXT" - es2="2.0"> + <function name="RenderbufferStorage" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> + <glx rop="4318"/> </function> <function name="RenderbufferStorageMultisample" offset="assign" es2="3.0"> @@ -178,91 +183,101 @@ <glx rop="4331"/> </function> - <function name="GetRenderbufferParameteriv" - alias="GetRenderbufferParameterivEXT" es2="2.0"> + <function name="GetRenderbufferParameteriv" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> + <glx vendorpriv="1424"/> </function> - <function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0"> + <function name="IsFramebuffer" es2="2.0" offset="assign"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1425"/> </function> - <function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0"> + <function name="BindFramebuffer" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> + <glx rop="4319"/> </function> - <function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT" - es2="2.0"> + <function name="DeleteFramebuffers" + es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> + <glx rop="4320"/> </function> - <function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0"> + <function name="GenFramebuffers" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> + <glx vendorpriv="1426" always_array="true"/> </function> - <function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT" - es2="2.0"> + <function name="CheckFramebufferStatus" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <return type="GLenum"/> + <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1D" alias="FramebufferTexture1DEXT"> + <function name="FramebufferTexture1D" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> + <glx rop="4321"/> </function> - <function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT" - es2="2.0"> + <function name="FramebufferTexture2D" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> + <glx rop="4322"/> </function> - <function name="FramebufferTexture3D" alias="FramebufferTexture3DEXT"> + <function name="FramebufferTexture3D" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="zoffset" type="GLint"/> + <glx rop="4323"/> </function> - <function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0"> + <function name="FramebufferTextureLayer" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="layer" type="GLint"/> + <glx rop="237"/> </function> - <function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT" - es2="2.0"> + <function name="FramebufferRenderbuffer" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> + <glx rop="4324"/> </function> - <function name="GetFramebufferAttachmentParameteriv" - alias="GetFramebufferAttachmentParameterivEXT" es2="2.0"> + <function name="GetFramebufferAttachmentParameteriv" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> + <glx vendorpriv="1428"/> </function> - <function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0"> + <function name="BlitFramebuffer" es2="3.0" offset="assign"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> @@ -273,10 +288,12 @@ <param name="dstY1" type="GLint"/> <param name="mask" type="GLbitfield"/> <param name="filter" type="GLenum"/> + <glx rop="4330"/> </function> - <function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0"> + <function name="GenerateMipmap" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> + <glx rop="4325"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml index 73f0a9c3d..e62047c9b 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml @@ -38,7 +38,7 @@ <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> </function> - <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayerEXT"> + <function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml index 9a30b0c9e..907a9d4b8 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_instanced_arrays.xml @@ -10,7 +10,7 @@ <enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/> - <function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB"> + <function name="VertexAttribDivisorARB" alias="VertexAttribDivisor"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml index 8884591ca..ae0d689e5 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_texture_buffer_object.xml @@ -11,7 +11,7 @@ <enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/> <enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/> - <function name="TexBufferARB" offset="assign" mesa_name="-ARB"> + <function name="TexBufferARB" alias="TexBuffer"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> diff --git a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml index 872548d1a..f2277d2bc 100644 --- a/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml +++ b/mesalib/src/mapi/glapi/gen/ARB_vertex_array_object.xml @@ -14,9 +14,9 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0"> + <function name="DeleteVertexArrays" es2="3.0" offset="assign"> <param name="n" type="GLsizei"/> - <param name="arrays" type="const GLuint *"/> + <param name="arrays" type="const GLuint *" count="n"/> </function> <function name="GenVertexArrays" offset="assign" es2="3.0"> @@ -24,7 +24,7 @@ <param name="arrays" type="GLuint *"/> </function> - <function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0"> + <function name="IsVertexArray" es2="3.0" offset="assign"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml index affd55a5f..7a22651c2 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_draw_buffers2.xml @@ -8,7 +8,7 @@ <category name="GL_EXT_draw_buffers2" number="340"> - <function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="ColorMaskIndexedEXT" alias="ColorMaski"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -16,29 +16,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT"> + <function name="GetBooleanIndexedvEXT" alias="GetBooleani_v"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT"> + <function name="GetIntegerIndexedvEXT" alias="GetIntegeri_v"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="EnableIndexedEXT" alias="Enablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name="DisableIndexedEXT" alias="Disablei"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT"> + <function name ="IsEnabledIndexedEXT" alias="IsEnabledi"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml index 4f418f7b6..85a05f6ed 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_framebuffer_object.xml @@ -15,19 +15,19 @@ <enum name="STENCIL_INDEX16_EXT" value="0x8D49"/> <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT" count="1" value="0x8CD0"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT" count="1" value="0x8CD1"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT" count="1" value="0x8CD2"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT" count="1" value="0x8CD3"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT" count="1" value="0x8CD4"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> <enum name="COLOR_ATTACHMENT0_EXT" value="0x8CE0"/> @@ -73,122 +73,105 @@ </enum> <enum name="INVALID_FRAMEBUFFER_OPERATION_EXT" value="0x0506"/> - <function name="IsRenderbufferEXT" offset="assign"> + <function name="IsRenderbufferEXT" alias="IsRenderbuffer"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1422"/> </function> - <function name="BindRenderbufferEXT" offset="assign"> + <function name="BindRenderbufferEXT" alias="BindRenderbuffer"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4316"/> </function> - <function name="DeleteRenderbuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="renderbuffers" type="const GLuint *" count="n"/> - <glx rop="4317"/> + <function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers"> + <param name="n" type="GLsizei"/> + <param name="renderbuffers" type="const GLuint *"/> </function> - <function name="GenRenderbuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="renderbuffers" type="GLuint *" count="n" output="true"/> - <glx vendorpriv="1423" always_array="true"/> + <function name="GenRenderbuffersEXT" alias="GenRenderbuffers"> + <param name="n" type="GLsizei"/> + <param name="renderbuffers" type="GLuint *"/> </function> - <function name="RenderbufferStorageEXT" offset="assign"> + <function name="RenderbufferStorageEXT" alias="RenderbufferStorage"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> - <glx rop="4318"/> </function> - <function name="GetRenderbufferParameterivEXT" offset="assign"> + <function name="GetRenderbufferParameterivEXT" alias="GetRenderbufferParameteriv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true"/> - <glx vendorpriv="1424"/> + <param name="params" type="GLint *"/> </function> - <function name="IsFramebufferEXT" offset="assign"> + <function name="IsFramebufferEXT" alias="IsFramebuffer"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1425"/> </function> - <function name="BindFramebufferEXT" offset="assign"> + <function name="BindFramebufferEXT" alias="BindFramebuffer"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> - <glx rop="4319"/> </function> - <function name="DeleteFramebuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="framebuffers" type="const GLuint *" count="n"/> - <glx rop="4320"/> + <function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers"> + <param name="n" type="GLsizei"/> + <param name="framebuffers" type="const GLuint *"/> </function> - <function name="GenFramebuffersEXT" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="framebuffers" type="GLuint *" count="n" output="true"/> - <glx vendorpriv="1426" always_array="true"/> + <function name="GenFramebuffersEXT" alias="GenFramebuffers"> + <param name="n" type="GLsizei"/> + <param name="framebuffers" type="GLuint *"/> </function> - <function name="CheckFramebufferStatusEXT" offset="assign"> + <function name="CheckFramebufferStatusEXT" alias="CheckFramebufferStatus"> <param name="target" type="GLenum"/> <return type="GLenum"/> - <glx vendorpriv="1427"/> </function> - <function name="FramebufferTexture1DEXT" offset="assign"> + <function name="FramebufferTexture1DEXT" alias="FramebufferTexture1D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> - <glx rop="4321"/> </function> - <function name="FramebufferTexture2DEXT" offset="assign"> + <function name="FramebufferTexture2DEXT" alias="FramebufferTexture2D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> - <glx rop="4322"/> </function> - <function name="FramebufferTexture3DEXT" offset="assign"> + <function name="FramebufferTexture3DEXT" alias="FramebufferTexture3D"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="textarget" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="zoffset" type="GLint"/> - <glx rop="4323"/> </function> - <function name="FramebufferRenderbufferEXT" offset="assign"> + <function name="FramebufferRenderbufferEXT" alias="FramebufferRenderbuffer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="renderbuffertarget" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> - <glx rop="4324"/> </function> - <function name="GetFramebufferAttachmentParameterivEXT" offset="assign"> + <function name="GetFramebufferAttachmentParameterivEXT" alias="GetFramebufferAttachmentParameteriv"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true"/> - <glx vendorpriv="1428"/> + <param name="params" type="GLint *"/> </function> - <function name="GenerateMipmapEXT" offset="assign"> + <function name="GenerateMipmapEXT" alias="GenerateMipmap"> <param name="target" type="GLenum"/> - <glx rop="4325"/> </function> </category> @@ -201,7 +184,7 @@ <enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA"> <size name="Get" mode="get"/> </enum> - <function name="BlitFramebufferEXT" offset="assign" static_dispatch="false"> + <function name="BlitFramebufferEXT" static_dispatch="false" alias="BlitFramebuffer"> <param name="srcX0" type="GLint"/> <param name="srcY0" type="GLint"/> <param name="srcX1" type="GLint"/> @@ -212,7 +195,6 @@ <param name="dstY1" type="GLint"/> <param name="mask" type="GLbitfield"/> <param name="filter" type="GLenum"/> - <glx rop="4330"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml index b008f2e65..d204c3fc7 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml @@ -96,8 +96,7 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1ivEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI1ivEXT" alias="VertexAttribI1iv"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> @@ -117,8 +116,7 @@ <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uivEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI1uivEXT" alias="VertexAttribI1uiv"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> @@ -138,31 +136,27 @@ <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4bvEXT" alias="VertexAttribI4bv"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4svEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4svEXT" alias="VertexAttribI4sv"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4ubvEXT" alias="VertexAttribI4ubv"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usvEXT" offset="assign" exec="loopback" - mesa_name="-EXT"> + <function name="VertexAttribI4usvEXT" alias="VertexAttribI4usv"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT"> + <function name="VertexAttribIPointerEXT" alias="VertexAttribIPointer"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -170,37 +164,37 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetVertexAttribIivEXT" alias="GetVertexAttribIiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetVertexAttribIuivEXT" alias="GetVertexAttribIuiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform1uiEXT" alias="Uniform1ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform2uiEXT" alias="Uniform2ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform3uiEXT" alias="Uniform3ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform4uiEXT" alias="Uniform4ui"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -208,43 +202,43 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform1uivEXT" alias="Uniform1uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform2uivEXT" alias="Uniform2uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform3uivEXT" alias="Uniform3uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT"> + <function name="Uniform4uivEXT" alias="Uniform4uiv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetUniformuivEXT" alias="GetUniformuiv"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT"> + <function name="BindFragDataLocationEXT" alias="BindFragDataLocation"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT"> + <function name="GetFragDataLocationEXT" alias="GetFragDataLocation"> <return type="GLint"/> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml index 71d2c7290..eb872098d 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_provoking_vertex.xml @@ -13,7 +13,7 @@ <enum name="PROVOKING_VERTEX_EXT" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT" value="0x8E4C"/> - <function name="ProvokingVertexEXT" offset="assign"> + <function name="ProvokingVertexEXT" alias="ProvokingVertex"> <param name="mode" type="GLenum"/> </function> @@ -26,7 +26,7 @@ <enum name="PROVOKING_VERTEX" value="0x8E4F"/> <enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION" value="0x8E4C"/> - <function name="ProvokingVertex" alias="ProvokingVertexEXT"> + <function name="ProvokingVertex" offset="assign"> <param name="mode" type="GLenum"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml index b5b8bd406..c68c1fceb 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_array.xml @@ -26,16 +26,15 @@ </enum> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT" count="1" value="0x8CD4"> - <size name="GetFramebufferAttachmentParameterivEXT" mode="get"/> + <size name="GetFramebufferAttachmentParameteriv" mode="get"/> </enum> - <function name="FramebufferTextureLayerEXT" offset="assign"> + <function name="FramebufferTextureLayerEXT" alias="FramebufferTextureLayer"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> <param name="texture" type="GLuint"/> <param name="level" type="GLint"/> <param name="layer" type="GLint"/> - <glx rop="237"/> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml index dac399964..aca21f4b1 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_texture_integer.xml @@ -69,25 +69,25 @@ <param name="a" type="GLuint"/> </function> - <function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT"> + <function name="TexParameterIivEXT" alias="TexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="TexParameterIuivEXT" alias="TexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetTexParameterIivEXT" alias="GetTexParameterIiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT"> + <function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> diff --git a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml index e9b27582a..e4b310ec3 100644 --- a/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml +++ b/mesalib/src/mapi/glapi/gen/EXT_transform_feedback.xml @@ -24,7 +24,7 @@ <enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/> <enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/> - <function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferRangeEXT" alias="BindBufferRange"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -39,29 +39,27 @@ <param name="offset" type="GLintptr"/> </function> - <function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT"> + <function name="BindBufferBaseEXT" alias="BindBufferBase"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="BeginTransformFeedbackEXT" alias="BeginTransformFeedback"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT"> + <function name="EndTransformFeedbackEXT" alias="EndTransformFeedback"> </function> - <function name="TransformFeedbackVaryingsEXT" offset="assign" - mesa_name="-EXT"> + <function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const char **"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVaryingEXT" offset="assign" - mesa_name="-EXT"> + <function name="GetTransformFeedbackVaryingEXT" alias="GetTransformFeedbackVarying"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index ad12102c6..83b5d499a 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -150,14 +150,15 @@ <return type="const GLubyte *"/> </function> - <function name="ClampColor" alias="ClampColorARB"> + <function name="ClampColor" offset="assign"> <param name="target" type="GLenum"/> <param name="clamp" type="GLenum"/> + <glx rop="234"/> </function> <!-- These functions alias ones form GL_ARB_draw_buffers2 --> - <function name="ColorMaski" alias="ColorMaskIndexedEXT"> + <function name="ColorMaski" offset="assign"> <param name="buf" type="GLuint"/> <param name="r" type="GLboolean"/> <param name="g" type="GLboolean"/> @@ -165,29 +166,29 @@ <param name="a" type="GLboolean"/> </function> - <function name="GetBooleani_v" alias="GetBooleanIndexedvEXT"> + <function name="GetBooleani_v" offset="assign"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLboolean *"/> </function> - <function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0"> + <function name="GetIntegeri_v" es2="3.0" offset="assign"> <param name="value" type="GLenum"/> <param name="index" type="GLuint"/> <param name="data" type="GLint *"/> </function> - <function name="Enablei" alias="EnableIndexedEXT"> + <function name="Enablei" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="Disablei" alias="DisableIndexedEXT"> + <function name="Disablei" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> </function> - <function name="IsEnabledi" alias="IsEnabledIndexedEXT"> + <function name="IsEnabledi" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <return type="GLboolean"/> @@ -195,26 +196,26 @@ <!-- These functions alias ones form GL_EXT_transform_feedback --> - <function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0"> + <function name="GetFragDataLocation" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> </function> - <function name="BindFragDataLocation" alias="BindFragDataLocationEXT"> + <function name="BindFragDataLocation" offset="assign"> <param name="program" type="GLuint"/> <param name="colorNumber" type="GLuint"/> <param name="name" type="const GLchar *"/> </function> - <function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0"> + <function name="BeginTransformFeedback" es2="3.0" offset="assign"> <param name="mode" type="GLenum"/> </function> - <function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0"> + <function name="EndTransformFeedback" es2="3.0" offset="assign"> </function> - <function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0"> + <function name="BindBufferRange" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> @@ -222,20 +223,20 @@ <param name="size" type="GLsizeiptr"/> </function> - <function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0"> + <function name="BindBufferBase" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> <param name="buffer" type="GLuint"/> </function> - <function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0"> + <function name="TransformFeedbackVaryings" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="varyings" type="const GLchar * const *"/> <param name="bufferMode" type="GLenum"/> </function> - <function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0"> + <function name="GetTransformFeedbackVarying" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -247,17 +248,17 @@ <!-- These functions alias ones from GL_NV_conditional_render --> - <function name="BeginConditionalRender" alias="BeginConditionalRenderNV"> + <function name="BeginConditionalRender" offset="assign"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRender" alias="EndConditionalRenderNV"> + <function name="EndConditionalRender" offset="assign"> </function> <!-- These functions alias ones from GL_EXT_gpu_shader4 --> - <function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0"> + <function name="VertexAttribIPointer" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> @@ -265,13 +266,13 @@ <param name="pointer" type="const GLvoid *"/> </function> - <function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0"> + <function name="GetVertexAttribIiv" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0"> + <function name="GetVertexAttribIuiv" es2="3.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -329,7 +330,7 @@ <param name="w" type="GLuint"/> </function> - <function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT"> + <function name="VertexAttribI1iv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *"/> </function> @@ -349,7 +350,7 @@ <param name="v" type="const GLint *"/> </function> - <function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT"> + <function name="VertexAttribI1uiv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *"/> </function> @@ -369,51 +370,51 @@ <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT"> + <function name="VertexAttribI4bv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttribI4sv" alias="VertexAttribI4svEXT"> + <function name="VertexAttribI4sv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT"> + <function name="VertexAttribI4ubv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT"> + <function name="VertexAttribI4usv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *"/> </function> - <function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0"> + <function name="GetUniformuiv" es2="3.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLuint *"/> </function> - <function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0"> + <function name="Uniform1ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> </function> - <function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0"> + <function name="Uniform2ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> </function> - <function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0"> + <function name="Uniform3ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> <param name="z" type="GLuint"/> </function> - <function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0"> + <function name="Uniform4ui" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="x" type="GLuint"/> <param name="y" type="GLuint"/> @@ -421,25 +422,25 @@ <param name="w" type="GLuint"/> </function> - <function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0"> + <function name="Uniform1uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0"> + <function name="Uniform2uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0"> + <function name="Uniform3uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> </function> - <function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0"> + <function name="Uniform4uiv" es2="3.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLuint *"/> @@ -447,25 +448,25 @@ <!-- These functions alias ones from GL_EXT_texture_integer --> - <function name="TexParameterIiv" alias="TexParameterIivEXT"> + <function name="TexParameterIiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *"/> </function> - <function name="TexParameterIuiv" alias="TexParameterIuivEXT"> + <function name="TexParameterIuiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLuint *"/> </function> - <function name="GetTexParameterIiv" alias="GetTexParameterIivEXT"> + <function name="GetTexParameterIiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *"/> </function> - <function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT"> + <function name="GetTexParameterIuiv" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *"/> @@ -556,13 +557,13 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="TexBuffer" offset="assign" alias="TexBufferARB"> + <function name="TexBuffer" offset="assign"> <param name="target" type="GLenum"/> <param name="internalFormat" type="GLenum"/> <param name="buffer" type="GLuint"/> </function> - <function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV"> + <function name="PrimitiveRestartIndex" offset="assign"> <param name="index" type="GLuint"/> </function> @@ -625,8 +626,7 @@ <enum name="TEXTURE_SWIZZLE_A" value="0x8E45"/> <enum name="TEXTURE_SWIZZLE_RGBA" value="0x8E46"/> - <function name="VertexAttribDivisor" offset="assign" es2="3.0" - alias="VertexAttribDivisorARB"> + <function name="VertexAttribDivisor" offset="assign" es2="3.0"> <param name="index" type="GLuint"/> <param name="divisor" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml index 8bb5c22ca..926b26294 100644 --- a/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml +++ b/mesalib/src/mapi/glapi/gen/NV_conditional_render.xml @@ -13,12 +13,12 @@ <enum name="QUERY_BY_REGION_WAIT_NV" value="0x8E15"/> <enum name="QUERY_BY_REGION_NO_WAIT_NV" value="0x8E16"/> - <function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV"> + <function name="BeginConditionalRenderNV" alias="BeginConditionalRender"> <param name="query" type="GLuint"/> <param name="mode" type="GLenum"/> </function> - <function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV"> + <function name="EndConditionalRenderNV" alias="EndConditionalRender"> </function> </category> diff --git a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml index d19fc8cf1..39edafe31 100644 --- a/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml +++ b/mesalib/src/mapi/glapi/gen/NV_primitive_restart.xml @@ -15,7 +15,7 @@ exec="dynamic"> </function> - <function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV"> + <function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex"> <param name="index" type="GLuint"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml index ad775728f..d62d6e2ec 100644 --- a/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml +++ b/mesalib/src/mapi/glapi/gen/OES_fixed_point.xml @@ -13,53 +13,52 @@ <type name="clampx" size="4" /> <!-- OpenGL ES 1.0 --> - <function name="AlphaFuncxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="AlphaFuncxOES" static_dispatch="false" + es1="1.0" alias="AlphaFuncx"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClearColorxOES" static_dispatch="false" + es1="1.0" alias="ClearColorx"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClearDepthxOES" static_dispatch="false" + es1="1.0" alias="ClearDepthx"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="Color4xOES" static_dispatch="false" + es1="1.0" alias="Color4x"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="DepthRangexOES" static_dispatch="false" + es1="1.0" alias="DepthRangex"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0" - exec="es" mesa_name="-OES"> + <function name="FogxOES" static_dispatch="false" es1="1.0" alias="Fogx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="FogxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FogxvOES" static_dispatch="false" + es1="1.0" alias="Fogxv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="FrustumxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FrustumxOES" static_dispatch="false" + es1="1.0" alias="Frustumx"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -68,63 +67,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightModelxOES" static_dispatch="false" + es1="1.0" alias="LightModelx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightModelxvOES" static_dispatch="false" + es1="1.0" alias="LightModelxv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="LightxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightxOES" static_dispatch="false" + es1="1.0" alias="Lightx"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LightxvOES" static_dispatch="false" + es1="1.0" alias="Lightxv"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="LineWidthxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="LineWidthxOES" static_dispatch="false" + es1="1.0" alias="LineWidthx"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> - <param name="m" type="const GLfixed *" count="16"/> + <function name="LoadMatrixxOES" static_dispatch="false" + es1="1.0" alias="LoadMatrixx"> + <param name="m" type="const GLfixed *"/> </function> - <function name="MaterialxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MaterialxOES" static_dispatch="false" + es1="1.0" alias="Materialx"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="MaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MaterialxvOES" static_dispatch="false" + es1="1.0" alias="Materialxv"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="MultMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> - <param name="m" type="const GLfixed *" count="16"/> + <function name="MultMatrixxOES" static_dispatch="false" + es1="1.0" alias="MultMatrixx"> + <param name="m" type="const GLfixed *"/> </function> - <function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="MultiTexCoord4xOES" static_dispatch="false" + es1="1.0" alias="MultiTexCoord4x"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -132,15 +131,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3xOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="Normal3xOES" static_dispatch="false" + es1="1.0" alias="Normal3x"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="OrthoxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="OrthoxOES" static_dispatch="false" + es1="1.0" alias="Orthox"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -149,149 +148,149 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointSizexOES" static_dispatch="false" + es1="1.0" alias="PointSizex"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PolygonOffsetxOES" static_dispatch="false" + es1="1.0" alias="PolygonOffsetx"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="RotatexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="RotatexOES" static_dispatch="false" + es1="1.0" alias="Rotatex"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="SampleCoveragexOES" static_dispatch="false" + es1="1.0" alias="SampleCoveragex"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="ScalexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ScalexOES" static_dispatch="false" + es1="1.0" alias="Scalex"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexEnvxOES" static_dispatch="false" + es1="1.0" alias="TexEnvx"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexEnvxvOES" static_dispatch="false" + es1="1.0" alias="TexEnvxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexParameterxOES" static_dispatch="false" + es1="1.0" alias="TexParameterx"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TranslatexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TranslatexOES" static_dispatch="false" + es1="1.0" alias="Translatex"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- OpenGL ES 1.1 --> - <function name="ClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClipPlanexOES" static_dispatch="false" + es1="1.0" alias="ClipPlanex"> <param name="plane" type="GLenum"/> - <param name="equation" type="const GLfixed *" count="4"/> + <param name="equation" type="const GLfixed *"/> </function> - <function name="GetClipPlanexOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false" mesa_name="-OES"> + <function name="GetClipPlanexOES" static_dispatch="false" + es1="1.0" desktop="false" alias="GetClipPlanex"> <param name="plane" type="GLenum"/> - <param name="equation" type="GLfixed *" output="true" count="4"/> + <param name="equation" type="GLfixed *"/> </function> - <function name="GetFixedvOES" offset="assign" static_dispatch="false" - es1="1.0" mesa_name="-OES"> + <function name="GetFixedvOES" static_dispatch="false" + es1="1.0" alias="GetFixedv"> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetLightxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetLightxvOES" static_dispatch="false" + es1="1.0" alias="GetLightxv"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetMaterialxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetMaterialxvOES" static_dispatch="false" + es1="1.0" alias="GetMaterialxv"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetTexEnvxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetTexEnvxvOES" static_dispatch="false" + es1="1.0" alias="GetTexEnvxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="GetTexParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> + <function name="GetTexParameterxvOES" + static_dispatch="false" es1="1.0" alias="GetTexParameterxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfixed *" output="true" variable_param="pname"/> + <param name="params" type="GLfixed *"/> </function> - <function name="PointParameterxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointParameterxOES" static_dispatch="false" + es1="1.0" alias="PointParameterx"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxvOES" offset="assign" - static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES"> + <function name="PointParameterxvOES" + static_dispatch="false" es1="1.0" alias="PointParameterxv"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="TexParameterxvOES" static_dispatch="false" + es1="1.0" alias="TexParameterxv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfixed *" variable_param="pname"/> + <param name="params" type="const GLfixed *"/> </function> <!-- texgen --> <function name="GetTexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> <function name="TexGenxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> </function> <function name="TexGenxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="check" desktop="false"> + es1="1.0" desktop="false"> <param name="coord" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> diff --git a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml index 8a6c27194..8346b64ee 100644 --- a/mesalib/src/mapi/glapi/gen/OES_single_precision.xml +++ b/mesalib/src/mapi/glapi/gen/OES_single_precision.xml @@ -11,10 +11,10 @@ <param name="depth" type="GLclampf"/> </function> - <function name="ClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="ClipPlanefOES" static_dispatch="false" + es1="1.0" alias="ClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="const GLfloat *" count="4"/> + <param name="equation" type="const GLfloat *"/> </function> <function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false" @@ -23,14 +23,14 @@ <param name="zFar" type="GLclampf"/> </function> - <function name="GetClipPlanefOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false" mesa_name="-OES"> + <function name="GetClipPlanefOES" static_dispatch="false" + es1="1.0" desktop="false" alias="GetClipPlanef"> <param name="plane" type="GLenum"/> - <param name="equation" type="GLfloat *" output="true" count="4"/> + <param name="equation" type="GLfloat *"/> </function> - <function name="FrustumfOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="FrustumfOES" static_dispatch="false" + es1="1.0" alias="Frustumf"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -39,8 +39,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="OrthofOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" mesa_name="-OES"> + <function name="OrthofOES" static_dispatch="false" + es1="1.0" alias="Orthof"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index c0bbbfae1..0f6746d2a 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -10,7 +10,7 @@ <enum name="BLEND_EQUATION_RGB_OES" value="0x8009"/> <enum name="BLEND_EQUATION_ALPHA_OES" value="0x883D"/> - <function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT" + <function name="BlendEquationSeparateOES" alias="BlendEquationSeparate" static_dispatch="false" es1="1.0"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> @@ -24,7 +24,7 @@ <enum name="BLEND_DST_ALPHA_OES" value="0x80CA"/> <enum name="BLEND_SRC_ALPHA_OES" value="0x80CB"/> - <function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT" + <function name="BlendFuncSeparateOES" alias="BlendFuncSeparate" static_dispatch="false" es1="1.0"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> @@ -73,7 +73,7 @@ <enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/> <function name="DrawTexiOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> @@ -82,12 +82,12 @@ </function> <function name="DrawTexivOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLint *" count="5"/> </function> <function name="DrawTexfOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> @@ -96,12 +96,12 @@ </function> <function name="DrawTexfvOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLfloat *" count="5"/> </function> <function name="DrawTexsOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> @@ -110,12 +110,12 @@ </function> <function name="DrawTexsvOES" offset="assign" static_dispatch="false" - es1="1.0" desktop="false" mesa_name="-OES"> + es1="1.0" desktop="false"> <param name="coords" type="const GLshort *" count="5"/> </function> <function name="DrawTexxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> @@ -124,7 +124,7 @@ </function> <function name="DrawTexxvOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="coords" type="const GLfixed *" count="5"/> </function> @@ -177,39 +177,39 @@ <enum name="RENDERBUFFER_STENCIL_SIZE_OES" value="0x8D55"/> <enum name="RGB565_OES" value="0x8D62"/> - <function name="BindFramebufferOES" alias="BindFramebufferEXT" + <function name="BindFramebufferOES" alias="BindFramebuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="framebuffer" type="GLuint"/> </function> - <function name="BindRenderbufferOES" alias="BindRenderbufferEXT" + <function name="BindRenderbufferOES" alias="BindRenderbuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="renderbuffer" type="GLuint"/> </function> <function name="CheckFramebufferStatusOES" - alias="CheckFramebufferStatusEXT" static_dispatch="false" + alias="CheckFramebufferStatus" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <return type="GLenum"/> </function> - <function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT" + <function name="DeleteFramebuffersOES" alias="DeleteFramebuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="const GLuint *" count="n"/> </function> - <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT" + <function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="const GLuint *" count="n"/> </function> <function name="FramebufferRenderbufferOES" - alias="FramebufferRenderbufferEXT" static_dispatch="false" + alias="FramebufferRenderbuffer" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -217,7 +217,7 @@ <param name="renderbuffer" type="GLuint"/> </function> - <function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT" + <function name="FramebufferTexture2DOES" alias="FramebufferTexture2D" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -226,25 +226,25 @@ <param name="level" type="GLint"/> </function> - <function name="GenerateMipmapOES" alias="GenerateMipmapEXT" + <function name="GenerateMipmapOES" alias="GenerateMipmap" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> </function> - <function name="GenFramebuffersOES" alias="GenFramebuffersEXT" + <function name="GenFramebuffersOES" alias="GenFramebuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="framebuffers" type="GLuint *" count="n" output="true"/> </function> - <function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT" + <function name="GenRenderbuffersOES" alias="GenRenderbuffers" static_dispatch="false" es1="1.0"> <param name="n" type="GLsizei" counter="true"/> <param name="renderbuffers" type="GLuint *" count="n" output="true"/> </function> <function name="GetFramebufferAttachmentParameterivOES" - alias="GetFramebufferAttachmentParameterivEXT" + alias="GetFramebufferAttachmentParameteriv" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -253,26 +253,26 @@ </function> <function name="GetRenderbufferParameterivOES" - alias="GetRenderbufferParameterivEXT" static_dispatch="false" + alias="GetRenderbufferParameteriv" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> </function> - <function name="IsFramebufferOES" alias="IsFramebufferEXT" + <function name="IsFramebufferOES" alias="IsFramebuffer" static_dispatch="false" es1="1.0"> <param name="framebuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="IsRenderbufferOES" alias="IsRenderbufferEXT" + <function name="IsRenderbufferOES" alias="IsRenderbuffer" static_dispatch="false" es1="1.0"> <param name="renderbuffer" type="GLuint"/> <return type="GLboolean"/> </function> - <function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT" + <function name="RenderbufferStorageOES" alias="RenderbufferStorage" static_dispatch="false" es1="1.0"> <param name="target" type="GLenum"/> <param name="internalformat" type="GLenum"/> @@ -343,8 +343,7 @@ <enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/> <function name="PointSizePointerOES" offset="assign" - static_dispatch="false" es1="1.0" desktop="false" - mesa_name="-OES"> + static_dispatch="false" es1="1.0" desktop="false"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> @@ -360,7 +359,7 @@ <!-- optional for es1.0 --> <category name="GL_OES_query_matrix" number="16"> <function name="QueryMatrixxOES" offset="assign" static_dispatch="false" - es1="1.0" exec="es" desktop="false"> + es1="1.0" desktop="false"> <param name="mantissa" type="GLfixed *" count="16" /> <param name="exponent" type="GLint *" count="16" /> <return type="GLbitfield"/> @@ -460,21 +459,21 @@ <enum name="BUFFER_MAPPED_OES" value="0x88BC"/> <enum name="BUFFER_MAP_POINTER_OES" value="0x88BD"/> - <function name="GetBufferPointervOES" alias="GetBufferPointervARB" + <function name="GetBufferPointervOES" alias="GetBufferPointerv" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **"/> </function> - <function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false" + <function name="MapBufferOES" alias="MapBuffer" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> </function> - <function name="UnmapBufferOES" alias="UnmapBufferARB" + <function name="UnmapBufferOES" alias="UnmapBuffer" static_dispatch="false" es1="1.0" es2="2.0"> <param name="target" type="GLenum"/> <return type="GLboolean"/> @@ -506,7 +505,7 @@ <enum name="SAMPLER_3D_OES" value="0x8B5F"/> <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/> - <function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB" + <function name="CompressedTexImage3DOES" alias="CompressedTexImage3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> @@ -520,7 +519,7 @@ </function> <function name="CompressedTexSubImage3DOES" - alias="CompressedTexSubImage3DARB" static_dispatch="false" + alias="CompressedTexSubImage3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> @@ -548,7 +547,7 @@ <param name="height" type="GLsizei"/> </function> - <function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT" + <function name="FramebufferTexture3DOES" alias="FramebufferTexture3D" static_dispatch="false" es2="2.0"> <param name="target" type="GLenum"/> <param name="attachment" type="GLenum"/> @@ -680,7 +679,7 @@ <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE" + <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays" es2="2.0"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *" count="n"/> @@ -691,7 +690,7 @@ <param name="arrays" type="GLuint *" output="true" count="n"/> </function> - <function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0"> + <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> @@ -766,7 +765,7 @@ <size name="Get" mode="get"/> </enum> - <function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0"> + <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd index 066d5da52..ab321fad0 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.dtd +++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd @@ -40,8 +40,7 @@ es2 CDATA "none" deprecated CDATA "none" exec NMTOKEN #IMPLIED - desktop (true | false) "true" - mesa_name CDATA #IMPLIED> + desktop (true | false) "true"> <!ATTLIST size name NMTOKEN #REQUIRED count NMTOKEN #IMPLIED mode (get | set) "set"> diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 9645fdb81..a47316a83 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -1164,27 +1164,25 @@ </function> <function name="Color3b" offset="9" vectorequiv="Color3bv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="Color3bv" offset="10" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3bv" offset="10" deprecated="3.1"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="6"/> </function> <function name="Color3d" offset="11" vectorequiv="Color3dv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="Color3dv" offset="12" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3dv" offset="12" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="7"/> </function> @@ -1202,94 +1200,87 @@ </function> <function name="Color3i" offset="15" vectorequiv="Color3iv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="Color3iv" offset="16" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3iv" offset="16" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="9"/> </function> <function name="Color3s" offset="17" vectorequiv="Color3sv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="Color3sv" offset="18" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3sv" offset="18" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="10"/> </function> <function name="Color3ub" offset="19" vectorequiv="Color3ubv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="Color3ubv" offset="20" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3ubv" offset="20" deprecated="3.1"> <param name="v" type="const GLubyte *" count="3"/> <glx rop="11"/> </function> <function name="Color3ui" offset="21" vectorequiv="Color3uiv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="Color3uiv" offset="22" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3uiv" offset="22" deprecated="3.1"> <param name="v" type="const GLuint *" count="3"/> <glx rop="12"/> </function> <function name="Color3us" offset="23" vectorequiv="Color3usv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="Color3usv" offset="24" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color3usv" offset="24" deprecated="3.1"> <param name="v" type="const GLushort *" count="3"/> <glx rop="13"/> </function> <function name="Color4b" offset="25" vectorequiv="Color4bv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> <param name="alpha" type="GLbyte"/> </function> - <function name="Color4bv" offset="26" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4bv" offset="26" deprecated="3.1"> <param name="v" type="const GLbyte *" count="4"/> <glx rop="14"/> </function> <function name="Color4d" offset="27" vectorequiv="Color4dv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> <param name="alpha" type="GLdouble"/> </function> - <function name="Color4dv" offset="28" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4dv" offset="28" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="15"/> </function> @@ -1308,71 +1299,66 @@ </function> <function name="Color4i" offset="31" vectorequiv="Color4iv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> <param name="alpha" type="GLint"/> </function> - <function name="Color4iv" offset="32" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4iv" offset="32" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="17"/> </function> <function name="Color4s" offset="33" vectorequiv="Color4sv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> <param name="alpha" type="GLshort"/> </function> - <function name="Color4sv" offset="34" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4sv" offset="34" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="18"/> </function> <function name="Color4ub" offset="35" vectorequiv="Color4ubv" es1="1.1" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> <param name="alpha" type="GLubyte"/> </function> - <function name="Color4ubv" offset="36" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4ubv" offset="36" deprecated="3.1"> <param name="v" type="const GLubyte *" count="4"/> <glx rop="19"/> </function> <function name="Color4ui" offset="37" vectorequiv="Color4uiv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> <param name="alpha" type="GLuint"/> </function> - <function name="Color4uiv" offset="38" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4uiv" offset="38" deprecated="3.1"> <param name="v" type="const GLuint *" count="4"/> <glx rop="20"/> </function> <function name="Color4us" offset="39" vectorequiv="Color4usv" - deprecated="3.1" exec="loopback" mesa_name="+_f"> + deprecated="3.1"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> <param name="alpha" type="GLushort"/> </function> - <function name="Color4usv" offset="40" deprecated="3.1" exec="loopback" - mesa_name="+_f"> + <function name="Color4usv" offset="40" deprecated="3.1"> <param name="v" type="const GLushort *" count="4"/> <glx rop="21"/> </function> @@ -1382,7 +1368,7 @@ <param name="flag" type="GLboolean"/> </function> - <function name="EdgeFlagv" offset="42" deprecated="3.1" exec="loopback"> + <function name="EdgeFlagv" offset="42" deprecated="3.1"> <param name="flag" type="const GLboolean *" count="1"/> <glx rop="22"/> </function> @@ -1391,12 +1377,11 @@ <glx rop="23"/> </function> - <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1" - exec="loopback"> + <function name="Indexd" offset="44" vectorequiv="Indexdv" deprecated="3.1"> <param name="c" type="GLdouble"/> </function> - <function name="Indexdv" offset="45" deprecated="3.1" exec="loopback"> + <function name="Indexdv" offset="45" deprecated="3.1"> <param name="c" type="const GLdouble *" count="1"/> <glx rop="24"/> </function> @@ -1411,46 +1396,44 @@ <glx rop="25"/> </function> - <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1" - exec="loopback"> + <function name="Indexi" offset="48" vectorequiv="Indexiv" deprecated="3.1"> <param name="c" type="GLint"/> </function> - <function name="Indexiv" offset="49" deprecated="3.1" exec="loopback"> + <function name="Indexiv" offset="49" deprecated="3.1"> <param name="c" type="const GLint *" count="1"/> <glx rop="26"/> </function> - <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1" - exec="loopback"> + <function name="Indexs" offset="50" vectorequiv="Indexsv" deprecated="3.1"> <param name="c" type="GLshort"/> </function> - <function name="Indexsv" offset="51" deprecated="3.1" exec="loopback"> + <function name="Indexsv" offset="51" deprecated="3.1"> <param name="c" type="const GLshort *" count="1"/> <glx rop="27"/> </function> <function name="Normal3b" offset="52" vectorequiv="Normal3bv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLbyte"/> <param name="ny" type="GLbyte"/> <param name="nz" type="GLbyte"/> </function> - <function name="Normal3bv" offset="53" deprecated="3.1" exec="loopback"> + <function name="Normal3bv" offset="53" deprecated="3.1"> <param name="v" type="const GLbyte *" count="3"/> <glx rop="28"/> </function> <function name="Normal3d" offset="54" vectorequiv="Normal3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLdouble"/> <param name="ny" type="GLdouble"/> <param name="nz" type="GLdouble"/> </function> - <function name="Normal3dv" offset="55" deprecated="3.1" exec="loopback"> + <function name="Normal3dv" offset="55" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="29"/> </function> @@ -1468,25 +1451,25 @@ </function> <function name="Normal3i" offset="58" vectorequiv="Normal3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLint"/> <param name="ny" type="GLint"/> <param name="nz" type="GLint"/> </function> - <function name="Normal3iv" offset="59" deprecated="3.1" exec="loopback"> + <function name="Normal3iv" offset="59" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="31"/> </function> <function name="Normal3s" offset="60" vectorequiv="Normal3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="nx" type="GLshort"/> <param name="ny" type="GLshort"/> <param name="nz" type="GLshort"/> </function> - <function name="Normal3sv" offset="61" deprecated="3.1" exec="loopback"> + <function name="Normal3sv" offset="61" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="32"/> </function> @@ -1635,15 +1618,14 @@ <glx rop="44"/> </function> - <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1" - exec="loopback"> + <function name="Rectd" offset="86" vectorequiv="Rectdv" deprecated="3.1"> <param name="x1" type="GLdouble"/> <param name="y1" type="GLdouble"/> <param name="x2" type="GLdouble"/> <param name="y2" type="GLdouble"/> </function> - <function name="Rectdv" offset="87" deprecated="3.1" exec="loopback"> + <function name="Rectdv" offset="87" deprecated="3.1"> <param name="v1" type="const GLdouble *" count="2"/> <param name="v2" type="const GLdouble *" count="2"/> <glx rop="45"/> @@ -1657,46 +1639,44 @@ <param name="y2" type="GLfloat"/> </function> - <function name="Rectfv" offset="89" deprecated="3.1" exec="loopback"> + <function name="Rectfv" offset="89" deprecated="3.1"> <param name="v1" type="const GLfloat *" count="2"/> <param name="v2" type="const GLfloat *" count="2"/> <glx rop="46"/> </function> - <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1" - exec="loopback"> + <function name="Recti" offset="90" vectorequiv="Rectiv" deprecated="3.1"> <param name="x1" type="GLint"/> <param name="y1" type="GLint"/> <param name="x2" type="GLint"/> <param name="y2" type="GLint"/> </function> - <function name="Rectiv" offset="91" deprecated="3.1" exec="loopback"> + <function name="Rectiv" offset="91" deprecated="3.1"> <param name="v1" type="const GLint *" count="2"/> <param name="v2" type="const GLint *" count="2"/> <glx rop="47"/> </function> - <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1" - exec="loopback"> + <function name="Rects" offset="92" vectorequiv="Rectsv" deprecated="3.1"> <param name="x1" type="GLshort"/> <param name="y1" type="GLshort"/> <param name="x2" type="GLshort"/> <param name="y2" type="GLshort"/> </function> - <function name="Rectsv" offset="93" deprecated="3.1" exec="loopback"> + <function name="Rectsv" offset="93" deprecated="3.1"> <param name="v1" type="const GLshort *" count="2"/> <param name="v2" type="const GLshort *" count="2"/> <glx rop="48"/> </function> <function name="TexCoord1d" offset="94" vectorequiv="TexCoord1dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> </function> - <function name="TexCoord1dv" offset="95" deprecated="3.1" exec="loopback"> + <function name="TexCoord1dv" offset="95" deprecated="3.1"> <param name="v" type="const GLdouble *" count="1"/> <glx rop="49"/> </function> @@ -1713,32 +1693,32 @@ </function> <function name="TexCoord1i" offset="98" vectorequiv="TexCoord1iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> </function> - <function name="TexCoord1iv" offset="99" deprecated="3.1" exec="loopback"> + <function name="TexCoord1iv" offset="99" deprecated="3.1"> <param name="v" type="const GLint *" count="1"/> <glx rop="51"/> </function> <function name="TexCoord1s" offset="100" vectorequiv="TexCoord1sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> </function> - <function name="TexCoord1sv" offset="101" deprecated="3.1" exec="loopback"> + <function name="TexCoord1sv" offset="101" deprecated="3.1"> <param name="v" type="const GLshort *" count="1"/> <glx rop="52"/> </function> <function name="TexCoord2d" offset="102" vectorequiv="TexCoord2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="TexCoord2dv" offset="103" deprecated="3.1" exec="loopback"> + <function name="TexCoord2dv" offset="103" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="53"/> </function> @@ -1756,35 +1736,35 @@ </function> <function name="TexCoord2i" offset="106" vectorequiv="TexCoord2iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="TexCoord2iv" offset="107" deprecated="3.1" exec="loopback"> + <function name="TexCoord2iv" offset="107" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="55"/> </function> <function name="TexCoord2s" offset="108" vectorequiv="TexCoord2sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="TexCoord2sv" offset="109" deprecated="3.1" exec="loopback"> + <function name="TexCoord2sv" offset="109" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="56"/> </function> <function name="TexCoord3d" offset="110" vectorequiv="TexCoord3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="TexCoord3dv" offset="111" deprecated="3.1" exec="loopback"> + <function name="TexCoord3dv" offset="111" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="57"/> </function> @@ -1803,38 +1783,38 @@ </function> <function name="TexCoord3i" offset="114" vectorequiv="TexCoord3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="TexCoord3iv" offset="115" deprecated="3.1" exec="loopback"> + <function name="TexCoord3iv" offset="115" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="59"/> </function> <function name="TexCoord3s" offset="116" vectorequiv="TexCoord3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="TexCoord3sv" offset="117" deprecated="3.1" exec="loopback"> + <function name="TexCoord3sv" offset="117" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="60"/> </function> <function name="TexCoord4d" offset="118" vectorequiv="TexCoord4dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> <param name="q" type="GLdouble"/> </function> - <function name="TexCoord4dv" offset="119" deprecated="3.1" exec="loopback"> + <function name="TexCoord4dv" offset="119" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="61"/> </function> @@ -1854,38 +1834,38 @@ </function> <function name="TexCoord4i" offset="122" vectorequiv="TexCoord4iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> <param name="q" type="GLint"/> </function> - <function name="TexCoord4iv" offset="123" deprecated="3.1" exec="loopback"> + <function name="TexCoord4iv" offset="123" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="63"/> </function> <function name="TexCoord4s" offset="124" vectorequiv="TexCoord4sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> <param name="q" type="GLshort"/> </function> - <function name="TexCoord4sv" offset="125" deprecated="3.1" exec="loopback"> + <function name="TexCoord4sv" offset="125" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="64"/> </function> <function name="Vertex2d" offset="126" vectorequiv="Vertex2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="Vertex2dv" offset="127" deprecated="3.1" exec="loopback"> + <function name="Vertex2dv" offset="127" deprecated="3.1"> <param name="v" type="const GLdouble *" count="2"/> <glx rop="65"/> </function> @@ -1903,35 +1883,35 @@ </function> <function name="Vertex2i" offset="130" vectorequiv="Vertex2iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="Vertex2iv" offset="131" deprecated="3.1" exec="loopback"> + <function name="Vertex2iv" offset="131" deprecated="3.1"> <param name="v" type="const GLint *" count="2"/> <glx rop="67"/> </function> <function name="Vertex2s" offset="132" vectorequiv="Vertex2sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="Vertex2sv" offset="133" deprecated="3.1" exec="loopback"> + <function name="Vertex2sv" offset="133" deprecated="3.1"> <param name="v" type="const GLshort *" count="2"/> <glx rop="68"/> </function> <function name="Vertex3d" offset="134" vectorequiv="Vertex3dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="Vertex3dv" offset="135" deprecated="3.1" exec="loopback"> + <function name="Vertex3dv" offset="135" deprecated="3.1"> <param name="v" type="const GLdouble *" count="3"/> <glx rop="69"/> </function> @@ -1950,38 +1930,38 @@ </function> <function name="Vertex3i" offset="138" vectorequiv="Vertex3iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="Vertex3iv" offset="139" deprecated="3.1" exec="loopback"> + <function name="Vertex3iv" offset="139" deprecated="3.1"> <param name="v" type="const GLint *" count="3"/> <glx rop="71"/> </function> <function name="Vertex3s" offset="140" vectorequiv="Vertex3sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="Vertex3sv" offset="141" deprecated="3.1" exec="loopback"> + <function name="Vertex3sv" offset="141" deprecated="3.1"> <param name="v" type="const GLshort *" count="3"/> <glx rop="72"/> </function> <function name="Vertex4d" offset="142" vectorequiv="Vertex4dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="Vertex4dv" offset="143" deprecated="3.1" exec="loopback"> + <function name="Vertex4dv" offset="143" deprecated="3.1"> <param name="v" type="const GLdouble *" count="4"/> <glx rop="73"/> </function> @@ -2001,27 +1981,27 @@ </function> <function name="Vertex4i" offset="146" vectorequiv="Vertex4iv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> <param name="w" type="GLint"/> </function> - <function name="Vertex4iv" offset="147" deprecated="3.1" exec="loopback"> + <function name="Vertex4iv" offset="147" deprecated="3.1"> <param name="v" type="const GLint *" count="4"/> <glx rop="75"/> </function> <function name="Vertex4s" offset="148" vectorequiv="Vertex4sv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="Vertex4sv" offset="149" deprecated="3.1" exec="loopback"> + <function name="Vertex4sv" offset="149" deprecated="3.1"> <param name="v" type="const GLshort *" count="4"/> <glx rop="76"/> </function> @@ -2141,8 +2121,7 @@ <glx rop="95"/> </function> - <function name="Materialf" offset="169" es1="1.0" deprecated="3.1" - exec="loopback"> + <function name="Materialf" offset="169" es1="1.0" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> @@ -2157,14 +2136,14 @@ <glx rop="97"/> </function> - <function name="Materiali" offset="171" deprecated="3.1" exec="loopback"> + <function name="Materiali" offset="171" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="98"/> </function> - <function name="Materialiv" offset="172" deprecated="3.1" exec="loopback"> + <function name="Materialiv" offset="172" deprecated="3.1"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> @@ -2545,12 +2524,11 @@ </function> <function name="EvalCoord1d" offset="228" vectorequiv="EvalCoord1dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="u" type="GLdouble"/> </function> - <function name="EvalCoord1dv" offset="229" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord1dv" offset="229" deprecated="3.1"> <param name="u" type="const GLdouble *" count="1"/> <glx rop="151"/> </function> @@ -2560,20 +2538,18 @@ <param name="u" type="GLfloat"/> </function> - <function name="EvalCoord1fv" offset="231" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord1fv" offset="231" deprecated="3.1"> <param name="u" type="const GLfloat *" count="1"/> <glx rop="152"/> </function> <function name="EvalCoord2d" offset="232" vectorequiv="EvalCoord2dv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="u" type="GLdouble"/> <param name="v" type="GLdouble"/> </function> - <function name="EvalCoord2dv" offset="233" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord2dv" offset="233" deprecated="3.1"> <param name="u" type="const GLdouble *" count="2"/> <glx rop="153"/> </function> @@ -2584,8 +2560,7 @@ <param name="v" type="GLfloat"/> </function> - <function name="EvalCoord2fv" offset="235" deprecated="3.1" - exec="loopback"> + <function name="EvalCoord2fv" offset="235" deprecated="3.1"> <param name="u" type="const GLfloat *" count="2"/> <glx rop="154"/> </function> @@ -3439,11 +3414,11 @@ </function> <function name="Indexub" offset="315" vectorequiv="Indexubv" - deprecated="3.1" exec="loopback"> + deprecated="3.1"> <param name="c" type="GLubyte"/> </function> - <function name="Indexubv" offset="316" deprecated="3.1" exec="loopback"> + <function name="Indexubv" offset="316" deprecated="3.1"> <param name="c" type="const GLubyte *" count="1"/> <glx rop="194"/> </function> @@ -4343,26 +4318,29 @@ <enum name="DOT3_RGB" value="0x86AE"/> <enum name="DOT3_RGBA" value="0x86AF"/> - <function name="ActiveTexture" alias="ActiveTextureARB" es1="1.0" - es2="2.0"> + <function name="ActiveTexture" es1="1.0" + es2="2.0" offset="374"> <param name="texture" type="GLenum"/> + <glx rop="197"/> </function> - <function name="ClientActiveTexture" alias="ClientActiveTextureARB" - es1="1.0" deprecated="3.1"> + <function name="ClientActiveTexture" + es1="1.0" deprecated="3.1" offset="375"> <param name="texture" type="GLenum"/> + <glx handcode="true"/> </function> - <function name="MultiTexCoord1d" alias="MultiTexCoord1dARB" - deprecated="3.1"> + <function name="MultiTexCoord1d" + deprecated="3.1" offset="376"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dv" alias="MultiTexCoord1dvARB" - deprecated="3.1"> + <function name="MultiTexCoord1dv" + deprecated="3.1" offset="377"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="1"/> + <glx rop="198"/> </function> <function name="MultiTexCoord1f" alias="MultiTexCoord1fARB" @@ -4377,41 +4355,44 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord1i" alias="MultiTexCoord1iARB" - deprecated="3.1"> + <function name="MultiTexCoord1i" + deprecated="3.1" offset="380"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1iv" alias="MultiTexCoord1ivARB" - deprecated="3.1"> + <function name="MultiTexCoord1iv" + deprecated="3.1" offset="381"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="1"/> + <glx rop="200"/> </function> - <function name="MultiTexCoord1s" alias="MultiTexCoord1sARB" - deprecated="3.1"> + <function name="MultiTexCoord1s" + deprecated="3.1" offset="382"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1sv" alias="MultiTexCoord1svARB" - deprecated="3.1"> + <function name="MultiTexCoord1sv" + deprecated="3.1" offset="383"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="1"/> + <glx rop="201"/> </function> - <function name="MultiTexCoord2d" alias="MultiTexCoord2dARB" - deprecated="3.1"> + <function name="MultiTexCoord2d" + deprecated="3.1" offset="384"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dv" alias="MultiTexCoord2dvARB" - deprecated="3.1"> + <function name="MultiTexCoord2dv" + deprecated="3.1" offset="385"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="2"/> + <glx rop="202"/> </function> <function name="MultiTexCoord2f" alias="MultiTexCoord2fARB" @@ -4427,44 +4408,47 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord2i" alias="MultiTexCoord2iARB" - deprecated="3.1"> + <function name="MultiTexCoord2i" + deprecated="3.1" offset="388"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2iv" alias="MultiTexCoord2ivARB" - deprecated="3.1"> + <function name="MultiTexCoord2iv" + deprecated="3.1" offset="389"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="2"/> + <glx rop="204"/> </function> - <function name="MultiTexCoord2s" alias="MultiTexCoord2sARB" - deprecated="3.1"> + <function name="MultiTexCoord2s" + deprecated="3.1" offset="390"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2sv" alias="MultiTexCoord2svARB" - deprecated="3.1"> + <function name="MultiTexCoord2sv" + deprecated="3.1" offset="391"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="2"/> + <glx rop="205"/> </function> - <function name="MultiTexCoord3d" alias="MultiTexCoord3dARB" - deprecated="3.1"> + <function name="MultiTexCoord3d" + deprecated="3.1" offset="392"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dv" alias="MultiTexCoord3dvARB" - deprecated="3.1"> + <function name="MultiTexCoord3dv" + deprecated="3.1" offset="393"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="206"/> </function> <function name="MultiTexCoord3f" alias="MultiTexCoord3fARB" @@ -4481,36 +4465,38 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord3i" alias="MultiTexCoord3iARB" - deprecated="3.1"> + <function name="MultiTexCoord3i" + deprecated="3.1" offset="396"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3iv" alias="MultiTexCoord3ivARB" - deprecated="3.1"> + <function name="MultiTexCoord3iv" + deprecated="3.1" offset="397"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="3"/> + <glx rop="208"/> </function> - <function name="MultiTexCoord3s" alias="MultiTexCoord3sARB" - deprecated="3.1"> + <function name="MultiTexCoord3s" + deprecated="3.1" offset="398"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3sv" alias="MultiTexCoord3svARB" - deprecated="3.1"> + <function name="MultiTexCoord3sv" + deprecated="3.1" offset="399"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="209"/> </function> - <function name="MultiTexCoord4d" alias="MultiTexCoord4dARB" - deprecated="3.1"> + <function name="MultiTexCoord4d" + deprecated="3.1" offset="400"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -4518,10 +4504,11 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dv" alias="MultiTexCoord4dvARB" - deprecated="3.1"> + <function name="MultiTexCoord4dv" + deprecated="3.1" offset="401"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="4"/> + <glx rop="210"/> </function> <function name="MultiTexCoord4f" alias="MultiTexCoord4fARB" es1="1.0" @@ -4539,8 +4526,8 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="MultiTexCoord4i" alias="MultiTexCoord4iARB" - deprecated="3.1"> + <function name="MultiTexCoord4i" + deprecated="3.1" offset="404"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -4548,14 +4535,15 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4iv" alias="MultiTexCoord4ivARB" - deprecated="3.1"> + <function name="MultiTexCoord4iv" + deprecated="3.1" offset="405"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="4"/> + <glx rop="212"/> </function> - <function name="MultiTexCoord4s" alias="MultiTexCoord4sARB" - deprecated="3.1"> + <function name="MultiTexCoord4s" + deprecated="3.1" offset="406"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -4563,39 +4551,45 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4sv" alias="MultiTexCoord4svARB" - deprecated="3.1"> + <function name="MultiTexCoord4sv" + deprecated="3.1" offset="407"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="213"/> </function> - <function name="LoadTransposeMatrixf" alias="LoadTransposeMatrixfARB" - deprecated="3.1"> + <function name="LoadTransposeMatrixf" + deprecated="3.1" offset="assign"> <param name="m" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="LoadTransposeMatrixd" alias="LoadTransposeMatrixdARB" - deprecated="3.1"> + <function name="LoadTransposeMatrixd" + deprecated="3.1" offset="assign"> <param name="m" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="MultTransposeMatrixf" alias="MultTransposeMatrixfARB" - deprecated="3.1"> + <function name="MultTransposeMatrixf" + deprecated="3.1" offset="assign"> <param name="m" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="MultTransposeMatrixd" alias="MultTransposeMatrixdARB" - deprecated="3.1"> + <function name="MultTransposeMatrixd" + deprecated="3.1" offset="assign"> <param name="m" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="SampleCoverage" alias="SampleCoverageARB" es1="1.0" - es2="2.0"> + <function name="SampleCoverage" es1="1.0" + es2="2.0" offset="assign"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> + <glx rop="229"/> </function> - <function name="CompressedTexImage3D" alias="CompressedTexImage3DARB" es2="3.0"> + <function name="CompressedTexImage3D" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -4603,33 +4597,36 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="216" handcode="client"/> </function> - <function name="CompressedTexImage2D" alias="CompressedTexImage2DARB" - es1="1.0" es2="2.0"> + <function name="CompressedTexImage2D" + es1="1.0" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="215" handcode="client"/> </function> - <function name="CompressedTexImage1D" alias="CompressedTexImage1DARB"> + <function name="CompressedTexImage1D" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="214" handcode="client"/> </function> - <function name="CompressedTexSubImage3D" alias="CompressedTexSubImage3DARB" es2="3.0"> + <function name="CompressedTexSubImage3D" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4639,12 +4636,13 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="219" handcode="client"/> </function> - <function name="CompressedTexSubImage2D" alias="CompressedTexSubImage2DARB" - es1="1.0" es2="2.0"> + <function name="CompressedTexSubImage2D" + es1="1.0" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -4652,24 +4650,27 @@ <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="218" handcode="client"/> </function> - <function name="CompressedTexSubImage1D" alias="CompressedTexSubImage1DARB"> + <function name="CompressedTexSubImage1D" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> <param name="width" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei"/> - <param name="data" type="const GLvoid *"/> + <param name="imageSize" type="GLsizei" counter="true"/> + <param name="data" type="const GLvoid *" count="imageSize"/> + <glx rop="217" handcode="client"/> </function> - <function name="GetCompressedTexImage" alias="GetCompressedTexImageARB"> + <function name="GetCompressedTexImage" offset="assign"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="img" type="GLvoid *" output="true"/> + <glx sop="160" handcode="true"/> </function> </category> @@ -4687,19 +4688,19 @@ <size name="Get" mode="get"/> </enum> <enum name="POINT_SIZE_MIN" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_SIZE_MAX" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> <size name="Get" mode="get"/> </enum> <enum name="GENERATE_MIPMAP" count="1" value="0x8191"> @@ -4788,11 +4789,12 @@ </enum> <enum name="COMPARE_R_TO_TEXTURE" value="0x884E"/> - <function name="BlendFuncSeparate" alias="BlendFuncSeparateEXT" es2="2.0"> + <function name="BlendFuncSeparate" es2="2.0" offset="assign"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> <param name="dfactorAlpha" type="GLenum"/> + <glx rop="4134"/> </function> <function name="FogCoordf" alias="FogCoordfEXT" deprecated="3.1"> @@ -4803,26 +4805,29 @@ <param name="coord" type="const GLfloat *"/> </function> - <function name="FogCoordd" alias="FogCoorddEXT" deprecated="3.1"> + <function name="FogCoordd" deprecated="3.1" offset="assign"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddv" alias="FogCoorddvEXT" deprecated="3.1"> - <param name="coord" type="const GLdouble *"/> + <function name="FogCoorddv" deprecated="3.1" offset="assign"> + <param name="coord" type="const GLdouble *" count="1"/> + <glx rop="4125"/> </function> - <function name="FogCoordPointer" alias="FogCoordPointerEXT" - deprecated="3.1"> + <function name="FogCoordPointer" + deprecated="3.1" offset="assign"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> - <function name="MultiDrawArrays" alias="MultiDrawArraysEXT"> + <function name="MultiDrawArrays" offset="assign"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> + <glx handcode="true"/> </function> <function name="MultiDrawElements" alias="MultiDrawElementsEXT"> @@ -4833,48 +4838,54 @@ <param name="primcount" type="GLsizei"/> </function> - <function name="PointParameterf" alias="PointParameterfEXT" es1="1.1"> + <function name="PointParameterf" es1="1.1" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> + <glx rop="2065"/> </function> - <function name="PointParameterfv" alias="PointParameterfvEXT" es1="1.1"> + <function name="PointParameterfv" es1="1.1" offset="assign"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *"/> + <param name="params" type="const GLfloat *" variable_param="pname"/> + <glx rop="2066"/> </function> - <function name="PointParameteri" alias="PointParameteriNV"> + <function name="PointParameteri" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> + <glx rop="4221"/> </function> - <function name="PointParameteriv" alias="PointParameterivNV"> + <function name="PointParameteriv" offset="assign"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *"/> + <param name="params" type="const GLint *" variable_param="pname"/> + <glx rop="4222"/> </function> - <function name="SecondaryColor3b" alias="SecondaryColor3bEXT" - deprecated="3.1"> + <function name="SecondaryColor3b" + deprecated="3.1" offset="assign"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bv" alias="SecondaryColor3bvEXT" - deprecated="3.1"> - <param name="v" type="const GLbyte *"/> + <function name="SecondaryColor3bv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLbyte *" count="3"/> + <glx rop="4126"/> </function> - <function name="SecondaryColor3d" alias="SecondaryColor3dEXT" - deprecated="3.1"> + <function name="SecondaryColor3d" + deprecated="3.1" offset="assign"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dv" alias="SecondaryColor3dvEXT" - deprecated="3.1"> - <param name="v" type="const GLdouble *"/> + <function name="SecondaryColor3dv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="4130"/> </function> <function name="SecondaryColor3f" alias="SecondaryColor3fEXT" @@ -4889,148 +4900,169 @@ <param name="v" type="const GLfloat *"/> </function> - <function name="SecondaryColor3i" alias="SecondaryColor3iEXT" - deprecated="3.1"> + <function name="SecondaryColor3i" + deprecated="3.1" offset="assign"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3iv" alias="SecondaryColor3ivEXT" - deprecated="3.1"> - <param name="v" type="const GLint *"/> + <function name="SecondaryColor3iv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLint *" count="3"/> + <glx rop="4128"/> </function> - <function name="SecondaryColor3s" alias="SecondaryColor3sEXT" - deprecated="3.1"> + <function name="SecondaryColor3s" + deprecated="3.1" offset="assign"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3sv" alias="SecondaryColor3svEXT" - deprecated="3.1"> - <param name="v" type="const GLshort *"/> + <function name="SecondaryColor3sv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="4127"/> </function> - <function name="SecondaryColor3ub" alias="SecondaryColor3ubEXT" - deprecated="3.1"> + <function name="SecondaryColor3ub" + deprecated="3.1" offset="assign"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubv" alias="SecondaryColor3ubvEXT" - deprecated="3.1"> - <param name="v" type="const GLubyte *"/> + <function name="SecondaryColor3ubv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLubyte *" count="3"/> + <glx rop="4131"/> </function> - <function name="SecondaryColor3ui" alias="SecondaryColor3uiEXT" - deprecated="3.1"> + <function name="SecondaryColor3ui" + deprecated="3.1" offset="assign"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uiv" alias="SecondaryColor3uivEXT" - deprecated="3.1"> - <param name="v" type="const GLuint *"/> + <function name="SecondaryColor3uiv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLuint *" count="3"/> + <glx rop="4133"/> </function> - <function name="SecondaryColor3us" alias="SecondaryColor3usEXT" - deprecated="3.1"> + <function name="SecondaryColor3us" + deprecated="3.1" offset="assign"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usv" alias="SecondaryColor3usvEXT" - deprecated="3.1"> - <param name="v" type="const GLushort *"/> + <function name="SecondaryColor3usv" + deprecated="3.1" offset="assign"> + <param name="v" type="const GLushort *" count="3"/> + <glx rop="4132"/> </function> - <function name="SecondaryColorPointer" alias="SecondaryColorPointerEXT" - deprecated="3.1"> + <function name="SecondaryColorPointer" + deprecated="3.1" offset="assign"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2d" alias="WindowPos2dMESA" deprecated="3.1"> + <function name="WindowPos2d" deprecated="3.1" offset="assign"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> + <glx handcode="true"/> </function> - <function name="WindowPos2dv" alias="WindowPos2dvMESA" deprecated="3.1"> + <function name="WindowPos2dv" deprecated="3.1" offset="assign"> <param name="v" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2f" alias="WindowPos2fMESA" deprecated="3.1"> + <function name="WindowPos2f" deprecated="3.1" offset="assign"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> + <glx handcode="true"/> </function> - <function name="WindowPos2fv" alias="WindowPos2fvMESA" deprecated="3.1"> + <function name="WindowPos2fv" deprecated="3.1" offset="assign"> <param name="v" type="const GLfloat *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2i" alias="WindowPos2iMESA" deprecated="3.1"> + <function name="WindowPos2i" deprecated="3.1" offset="assign"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> + <glx handcode="true"/> </function> - <function name="WindowPos2iv" alias="WindowPos2ivMESA" deprecated="3.1"> + <function name="WindowPos2iv" deprecated="3.1" offset="assign"> <param name="v" type="const GLint *"/> + <glx handcode="true"/> </function> - <function name="WindowPos2s" alias="WindowPos2sMESA" deprecated="3.1"> + <function name="WindowPos2s" deprecated="3.1" offset="assign"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> + <glx handcode="true"/> </function> - <function name="WindowPos2sv" alias="WindowPos2svMESA" deprecated="3.1"> + <function name="WindowPos2sv" deprecated="3.1" offset="assign"> <param name="v" type="const GLshort *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3d" alias="WindowPos3dMESA" deprecated="3.1"> + <function name="WindowPos3d" deprecated="3.1" offset="assign"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> + <glx handcode="true"/> </function> - <function name="WindowPos3dv" alias="WindowPos3dvMESA" deprecated="3.1"> + <function name="WindowPos3dv" deprecated="3.1" offset="assign"> <param name="v" type="const GLdouble *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3f" alias="WindowPos3fMESA" deprecated="3.1"> + <function name="WindowPos3f" deprecated="3.1" offset="assign"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fv" alias="WindowPos3fvMESA" deprecated="3.1"> - <param name="v" type="const GLfloat *"/> + <function name="WindowPos3fv" deprecated="3.1" offset="assign"> + <param name="v" type="const GLfloat *" count="3"/> + <glx rop="230"/> </function> - <function name="WindowPos3i" alias="WindowPos3iMESA" deprecated="3.1"> + <function name="WindowPos3i" deprecated="3.1" offset="assign"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> + <glx handcode="true"/> </function> - <function name="WindowPos3iv" alias="WindowPos3ivMESA" deprecated="3.1"> + <function name="WindowPos3iv" deprecated="3.1" offset="assign"> <param name="v" type="const GLint *"/> + <glx handcode="true"/> </function> - <function name="WindowPos3s" alias="WindowPos3sMESA" deprecated="3.1"> + <function name="WindowPos3s" deprecated="3.1" offset="assign"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> + <glx handcode="true"/> </function> - <function name="WindowPos3sv" alias="WindowPos3svMESA" deprecated="3.1"> + <function name="WindowPos3sv" deprecated="3.1" offset="assign"> <param name="v" type="const GLshort *"/> + <glx handcode="true"/> </function> </category> @@ -5099,113 +5131,132 @@ <type name="intptr" size="4" glx_name="CARD32"/> <type name="sizeiptr" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBuffer" alias="BindBufferARB" es1="1.1" es2="2.0"> + <function name="BindBuffer" es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> + <glx ignore="true"/> </function> - <function name="BufferData" alias="BufferDataARB" es1="1.1" es2="2.0"> + <function name="BufferData" es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="const GLvoid *"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/> <param name="usage" type="GLenum"/> + <glx ignore="true"/> </function> - <function name="BufferSubData" alias="BufferSubDataARB" es1="1.1" - es2="2.0"> + <function name="BufferSubData" es1="1.1" + es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="const GLvoid *"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="const GLvoid *" count="size"/> + <glx ignore="true"/> </function> - <function name="DeleteBuffers" alias="DeleteBuffersARB" es1="1.1" - es2="2.0"> - <param name="n" type="GLsizei"/> - <param name="buffer" type="const GLuint *"/> + <function name="DeleteBuffers" es1="1.1" + es2="2.0" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="buffer" type="const GLuint *" count="n"/> + <glx ignore="true"/> </function> - <function name="GenBuffers" alias="GenBuffersARB" es1="1.1" es2="2.0"> + <function name="GenBuffers" es1="1.1" es2="2.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="buffer" type="GLuint *" output="true" count="n"/> + <glx ignore="true"/> </function> - <function name="GetBufferParameteriv" alias="GetBufferParameterivARB" - es1="1.1" es2="2.0"> + <function name="GetBufferParameteriv" + es1="1.1" es2="2.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx ignore="true"/> </function> - <function name="GetBufferPointerv" alias="GetBufferPointervARB" es2="3.0"> + <function name="GetBufferPointerv" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLvoid **" output="true"/> + <glx ignore="true"/> </function> - <function name="GetBufferSubData" alias="GetBufferSubDataARB"> + <function name="GetBufferSubData" offset="assign"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptr"/> - <param name="size" type="GLsizeiptr"/> - <param name="data" type="GLvoid *" output="true"/> + <param name="size" type="GLsizeiptr" counter="true"/> + <param name="data" type="GLvoid *" output="true" count="size"/> + <glx ignore="true"/> </function> - <function name="IsBuffer" alias="IsBufferARB" es1="1.1" es2="2.0"> + <function name="IsBuffer" es1="1.1" es2="2.0" offset="assign"> <param name="buffer" type="GLuint"/> <return type="GLboolean"/> + <glx ignore="true"/> </function> - <function name="MapBuffer" alias="MapBufferARB"> + <function name="MapBuffer" offset="assign"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> + <glx ignore="true"/> </function> - <function name="UnmapBuffer" alias="UnmapBufferARB" es2="3.0"> + <function name="UnmapBuffer" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <return type="GLboolean"/> + <glx ignore="true"/> </function> - <function name="GenQueries" alias="GenQueriesARB" es2="3.0"> + <function name="GenQueries" es2="3.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="ids" type="GLuint *" output="true" count="n"/> + <glx sop="162" always_array="true"/> </function> - <function name="DeleteQueries" alias="DeleteQueriesARB" es2="3.0"> - <param name="n" type="GLsizei"/> - <param name="ids" type="const GLuint *"/> + <function name="DeleteQueries" es2="3.0" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="ids" type="const GLuint *" count="n"/> + <glx sop="161"/> </function> - <function name="IsQuery" alias="IsQueryARB" es2="3.0"> + <function name="IsQuery" es2="3.0" offset="assign"> <param name="id" type="GLuint"/> <return type="GLboolean"/> + <glx sop="163"/> </function> - <function name="BeginQuery" alias="BeginQueryARB" es2="3.0"> + <function name="BeginQuery" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> + <glx rop="231"/> </function> - <function name="EndQuery" alias="EndQueryARB" es2="3.0"> + <function name="EndQuery" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> + <glx rop="232"/> </function> - <function name="GetQueryiv" alias="GetQueryivARB" es2="3.0"> + <function name="GetQueryiv" es2="3.0" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx sop="164"/> </function> - <function name="GetQueryObjectiv" alias="GetQueryObjectivARB"> + <function name="GetQueryObjectiv" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> + <glx sop="165"/> </function> - <function name="GetQueryObjectuiv" alias="GetQueryObjectuivARB" es2="3.0"> + <function name="GetQueryObjectuiv" es2="3.0" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint *" output="true" variable_param="pname"/> + <glx sop="166"/> </function> </category> @@ -5295,8 +5346,8 @@ <enum name="SHADING_LANGUAGE_VERSION" value="0x8B8C"/> <enum name="CURRENT_PROGRAM" value="0x8B8D"/> <enum name="POINT_SPRITE_COORD_ORIGIN" count="1" value="0x8CA0"> - <size name="PointParameterfvEXT"/> - <size name="PointParameterivNV"/> + <size name="PointParameterfv"/> + <size name="PointParameteriv"/> </enum> <enum name="LOWER_LEFT" value="0x8CA1"/> <enum name="UPPER_LEFT" value="0x8CA2"/> @@ -5304,15 +5355,17 @@ <enum name="STENCIL_BACK_VALUE_MASK" value="0x8CA4"/> <enum name="STENCIL_BACK_WRITEMASK" value="0x8CA5"/> - <function name="BlendEquationSeparate" alias="BlendEquationSeparateEXT" - es2="2.0"> + <function name="BlendEquationSeparate" + es2="2.0" offset="assign"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> + <glx rop="4228"/> </function> - <function name="DrawBuffers" alias="DrawBuffersARB" es2="3.0"> + <function name="DrawBuffers" es2="3.0" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="bufs" type="const GLenum *" count="n"/> + <glx rop="233" large="true"/> </function> <function name="StencilFuncSeparate" offset="assign" es2="2.0"> @@ -5343,17 +5396,19 @@ <glx ignore="true"/> </function> - <function name="BindAttribLocation" alias="BindAttribLocationARB" - es2="2.0"> + <function name="BindAttribLocation" + es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="name" type="const GLchar *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="CompileShader" alias="CompileShaderARB" es2="2.0"> + <function name="CompileShader" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="CreateProgram" offset="assign" es2="2.0"> @@ -5383,19 +5438,20 @@ <glx ignore="true"/> </function> - <function name="DisableVertexAttribArray" - alias="DisableVertexAttribArrayARB" es2="2.0"> + <function name="DisableVertexAttribArray" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <glx ignore="true"/> + <glx handcode="true"/> </function> - <function name="EnableVertexAttribArray" alias="EnableVertexAttribArrayARB" - es2="2.0"> + <function name="EnableVertexAttribArray" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <glx ignore="true"/> + <glx handcode="true"/> </function> - <function name="GetActiveAttrib" alias="GetActiveAttribARB" es2="2.0"> + <function name="GetActiveAttrib" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei "/> @@ -5404,9 +5460,10 @@ <param name="type" type="GLenum *" output="true"/> <param name="name" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetActiveUniform" alias="GetActiveUniformARB" es2="2.0"> + <function name="GetActiveUniform" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> @@ -5415,6 +5472,7 @@ <param name="type" type="GLenum *" output="true"/> <param name="name" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="GetAttachedShaders" offset="assign" es2="2.0"> @@ -5425,11 +5483,12 @@ <glx ignore="true"/> </function> - <function name="GetAttribLocation" alias="GetAttribLocationARB" es2="2.0"> + <function name="GetAttribLocation" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> <function name="GetProgramiv" offset="assign" es2="2.0"> @@ -5462,63 +5521,71 @@ <glx ignore="true"/> </function> - <function name="GetShaderSource" alias="GetShaderSourceARB" es2="2.0"> + <function name="GetShaderSource" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <param name="bufSize" type="GLsizei"/> <param name="length" type="GLsizei *" output="true"/> <param name="source" type="GLchar *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformLocation" alias="GetUniformLocationARB" - es2="2.0"> + <function name="GetUniformLocation" + es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="name" type="const GLchar *"/> <return type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformfv" alias="GetUniformfvARB" es2="2.0"> + <function name="GetUniformfv" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> <param name="params" type="GLfloat *" output="true"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="GetUniformiv" alias="GetUniformivARB" es2="2.0"> + <function name="GetUniformiv" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <param name="location" type="GLint"/> - <param name="params" type="GLint *"/> + <param name="params" type="GLint *" output="true"/> + <glx ignore="true"/> <glx ignore="true"/> </function> - <function name="GetVertexAttribdv" alias="GetVertexAttribdvARB"> + <function name="GetVertexAttribdv" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLdouble *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1301"/> </function> - <function name="GetVertexAttribfv" alias="GetVertexAttribfvARB" es2="2.0"> + <function name="GetVertexAttribfv" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1302"/> </function> - <function name="GetVertexAttribiv" alias="GetVertexAttribivARB" es2="2.0"> + <function name="GetVertexAttribiv" es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true" variable_param="pname"/> <glx ignore="true"/> + <glx handcode="client" vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointerv" alias="GetVertexAttribPointervNV" - es2="2.0"> + <function name="GetVertexAttribPointerv" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> <glx ignore="true"/> + <glx handcode="true"/> </function> <function name="IsProgram" offset="assign" es2="2.0"> @@ -5533,162 +5600,186 @@ <glx ignore="true"/> </function> - <function name="LinkProgram" alias="LinkProgramARB" es2="2.0"> + <function name="LinkProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="ShaderSource" alias="ShaderSourceARB" es2="2.0"> + <function name="ShaderSource" es2="2.0" offset="assign"> <param name="shader" type="GLuint"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLchar * const *"/> <param name="length" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UseProgram" alias="UseProgramObjectARB" es2="2.0"> + <function name="UseProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1f" alias="Uniform1fARB" es2="2.0"> + <function name="Uniform1f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2f" alias="Uniform2fARB" es2="2.0"> + <function name="Uniform2f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3f" alias="Uniform3fARB" es2="2.0"> + <function name="Uniform3f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4f" alias="Uniform4fARB" es2="2.0"> + <function name="Uniform4f" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <param name="v3" type="GLfloat"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1i" alias="Uniform1iARB" es2="2.0"> + <function name="Uniform1i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2i" alias="Uniform2iARB" es2="2.0"> + <function name="Uniform2i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3i" alias="Uniform3iARB" es2="2.0"> + <function name="Uniform3i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4i" alias="Uniform4iARB" es2="2.0"> + <function name="Uniform4i" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <param name="v3" type="GLint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1fv" alias="Uniform1fvARB" es2="2.0"> + <function name="Uniform1fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2fv" alias="Uniform2fvARB" es2="2.0"> + <function name="Uniform2fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3fv" alias="Uniform3fvARB" es2="2.0"> + <function name="Uniform3fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4fv" alias="Uniform4fvARB" es2="2.0"> + <function name="Uniform4fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform1iv" alias="Uniform1ivARB" es2="2.0"> + <function name="Uniform1iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform2iv" alias="Uniform2ivARB" es2="2.0"> + <function name="Uniform2iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform3iv" alias="Uniform3ivARB" es2="2.0"> + <function name="Uniform3iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="Uniform4iv" alias="Uniform4ivARB" es2="2.0"> + <function name="Uniform4iv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix2fv" alias="UniformMatrix2fvARB" es2="2.0"> + <function name="UniformMatrix2fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix3fv" alias="UniformMatrix3fvARB" es2="2.0"> + <function name="UniformMatrix3fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="UniformMatrix4fv" alias="UniformMatrix4fvARB" es2="2.0"> + <function name="UniformMatrix4fv" es2="2.0" offset="assign"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="ValidateProgram" alias="ValidateProgramARB" es2="2.0"> + <function name="ValidateProgram" es2="2.0" offset="assign"> <param name="program" type="GLuint"/> <glx ignore="true"/> + <glx ignore="true"/> </function> - <function name="VertexAttrib1d" alias="VertexAttrib1dARB"> + <function name="VertexAttrib1d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dv" alias="VertexAttrib1dvARB"> + <function name="VertexAttrib1dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="1"/> + <glx rop="4197" doubles_in_order="true"/> </function> <function name="VertexAttrib1f" alias="VertexAttrib1fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5698,23 +5789,25 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib1s" alias="VertexAttrib1sARB"> + <function name="VertexAttrib1s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1sv" alias="VertexAttrib1svARB"> + <function name="VertexAttrib1sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="1"/> + <glx rop="4189"/> </function> - <function name="VertexAttrib2d" alias="VertexAttrib2dARB"> + <function name="VertexAttrib2d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dv" alias="VertexAttrib2dvARB"> + <function name="VertexAttrib2dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="2"/> + <glx rop="4198" doubles_in_order="true"/> </function> <function name="VertexAttrib2f" alias="VertexAttrib2fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5725,25 +5818,27 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib2s" alias="VertexAttrib2sARB"> + <function name="VertexAttrib2s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2sv" alias="VertexAttrib2svARB"> + <function name="VertexAttrib2sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="2"/> + <glx rop="4190"/> </function> - <function name="VertexAttrib3d" alias="VertexAttrib3dARB"> + <function name="VertexAttrib3d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dv" alias="VertexAttrib3dvARB"> + <function name="VertexAttrib3dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="3"/> + <glx rop="4199" doubles_in_order="true"/> </function> <function name="VertexAttrib3f" alias="VertexAttrib3fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5755,62 +5850,71 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib3s" alias="VertexAttrib3sARB"> + <function name="VertexAttrib3s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3sv" alias="VertexAttrib3svARB"> + <function name="VertexAttrib3sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="3"/> + <glx rop="4191"/> </function> - <function name="VertexAttrib4Nbv" alias="VertexAttrib4NbvARB"> + <function name="VertexAttrib4Nbv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *"/> + <param name="v" type="const GLbyte *" count="4"/> + <glx rop="4235"/> </function> - <function name="VertexAttrib4Niv" alias="VertexAttrib4NivARB"> + <function name="VertexAttrib4Niv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *"/> + <param name="v" type="const GLint *" count="4"/> + <glx rop="4237"/> </function> - <function name="VertexAttrib4Nsv" alias="VertexAttrib4NsvARB"> + <function name="VertexAttrib4Nsv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="4236"/> </function> - <function name="VertexAttrib4Nub" alias="VertexAttrib4NubARB"> + <function name="VertexAttrib4Nub" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> <param name="z" type="GLubyte"/> <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4Nubv" alias="VertexAttrib4NubvARB"> + <function name="VertexAttrib4Nubv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *"/> + <param name="v" type="const GLubyte *" count="4"/> + <glx rop="4201"/> </function> - <function name="VertexAttrib4Nuiv" alias="VertexAttrib4NuivARB"> + <function name="VertexAttrib4Nuiv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *"/> + <param name="v" type="const GLuint *" count="4"/> + <glx rop="4239"/> </function> - <function name="VertexAttrib4Nusv" alias="VertexAttrib4NusvARB"> + <function name="VertexAttrib4Nusv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *"/> + <param name="v" type="const GLushort *" count="4"/> + <glx rop="4238"/> </function> - <function name="VertexAttrib4bv" alias="VertexAttrib4bvARB"> + <function name="VertexAttrib4bv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLbyte *" count="4"/> + <glx rop="4230"/> </function> - <function name="VertexAttrib4d" alias="VertexAttrib4dARB"> + <function name="VertexAttrib4d" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dv" alias="VertexAttrib4dvARB"> + <function name="VertexAttrib4dv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *"/> + <param name="v" type="const GLdouble *" count="4"/> + <glx rop="4200" doubles_in_order="true"/> </function> <function name="VertexAttrib4f" alias="VertexAttrib4fARB" es2="2.0"> <param name="index" type="GLuint"/> @@ -5823,42 +5927,48 @@ <param name="index" type="GLuint"/> <param name="v" type="const GLfloat *"/> </function> - <function name="VertexAttrib4iv" alias="VertexAttrib4ivARB"> + <function name="VertexAttrib4iv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLint *" count="4"/> + <glx rop="4231"/> </function> - <function name="VertexAttrib4s" alias="VertexAttrib4sARB"> + <function name="VertexAttrib4s" offset="assign"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4sv" alias="VertexAttrib4svARB"> + <function name="VertexAttrib4sv" offset="assign"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *"/> + <param name="v" type="const GLshort *" count="4"/> + <glx rop="4192"/> </function> - <function name="VertexAttrib4ubv" alias="VertexAttrib4ubvARB"> + <function name="VertexAttrib4ubv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> + <glx rop="4232"/> </function> - <function name="VertexAttrib4uiv" alias="VertexAttrib4uivARB"> + <function name="VertexAttrib4uiv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLuint *" count="4"/> + <glx rop="4234"/> </function> - <function name="VertexAttrib4usv" alias="VertexAttrib4usvARB"> + <function name="VertexAttrib4usv" offset="assign"> <param name="index" type="GLuint"/> <param name="v" type="const GLushort *" count="4"/> + <glx rop="4233"/> </function> - <function name="VertexAttribPointer" alias="VertexAttribPointerARB" - es2="2.0"> + <function name="VertexAttribPointer" + es2="2.0" offset="assign"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> + <glx handcode="true"/> </function> </category> @@ -5983,26 +6093,23 @@ <size name="Get" mode="get"/> </enum> - <function name="ActiveTextureARB" offset="374"> + <function name="ActiveTextureARB" alias="ActiveTexture"> <param name="texture" type="GLenum"/> - <glx rop="197"/> </function> - <function name="ClientActiveTextureARB" offset="375"> + <function name="ClientActiveTextureARB" alias="ClientActiveTexture"> <param name="texture" type="GLenum"/> - <glx handcode="true"/> </function> - <function name="MultiTexCoord1dARB" offset="376" - vectorequiv="MultiTexCoord1dvARB" exec="loopback"> + <function name="MultiTexCoord1dARB" + vectorequiv="MultiTexCoord1dv" alias="MultiTexCoord1d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> </function> - <function name="MultiTexCoord1dvARB" offset="377" exec="loopback"> + <function name="MultiTexCoord1dvARB" alias="MultiTexCoord1dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="1"/> - <glx rop="198"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord1fARB" offset="378" @@ -6017,41 +6124,38 @@ <glx rop="199"/> </function> - <function name="MultiTexCoord1iARB" offset="380" - vectorequiv="MultiTexCoord1ivARB" exec="loopback"> + <function name="MultiTexCoord1iARB" + vectorequiv="MultiTexCoord1iv" alias="MultiTexCoord1i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> </function> - <function name="MultiTexCoord1ivARB" offset="381" exec="loopback"> + <function name="MultiTexCoord1ivARB" alias="MultiTexCoord1iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="1"/> - <glx rop="200"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord1sARB" offset="382" - vectorequiv="MultiTexCoord1svARB" exec="loopback"> + <function name="MultiTexCoord1sARB" + vectorequiv="MultiTexCoord1sv" alias="MultiTexCoord1s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> </function> - <function name="MultiTexCoord1svARB" offset="383" exec="loopback"> + <function name="MultiTexCoord1svARB" alias="MultiTexCoord1sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="1"/> - <glx rop="201"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord2dARB" offset="384" - vectorequiv="MultiTexCoord2dvARB" exec="loopback"> + <function name="MultiTexCoord2dARB" + vectorequiv="MultiTexCoord2dv" alias="MultiTexCoord2d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> </function> - <function name="MultiTexCoord2dvARB" offset="385" exec="loopback"> + <function name="MultiTexCoord2dvARB" alias="MultiTexCoord2dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="2"/> - <glx rop="202"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord2fARB" offset="386" @@ -6067,44 +6171,41 @@ <glx rop="203"/> </function> - <function name="MultiTexCoord2iARB" offset="388" - vectorequiv="MultiTexCoord2ivARB" exec="loopback"> + <function name="MultiTexCoord2iARB" + vectorequiv="MultiTexCoord2iv" alias="MultiTexCoord2i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> </function> - <function name="MultiTexCoord2ivARB" offset="389" exec="loopback"> + <function name="MultiTexCoord2ivARB" alias="MultiTexCoord2iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="2"/> - <glx rop="204"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord2sARB" offset="390" - vectorequiv="MultiTexCoord2svARB" exec="loopback"> + <function name="MultiTexCoord2sARB" + vectorequiv="MultiTexCoord2sv" alias="MultiTexCoord2s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> </function> - <function name="MultiTexCoord2svARB" offset="391" exec="loopback"> + <function name="MultiTexCoord2svARB" alias="MultiTexCoord2sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="2"/> - <glx rop="205"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord3dARB" offset="392" - vectorequiv="MultiTexCoord3dvARB" exec="loopback"> + <function name="MultiTexCoord3dARB" + vectorequiv="MultiTexCoord3dv" alias="MultiTexCoord3d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> <param name="r" type="GLdouble"/> </function> - <function name="MultiTexCoord3dvARB" offset="393" exec="loopback"> + <function name="MultiTexCoord3dvARB" alias="MultiTexCoord3dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="206"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord3fARB" offset="394" @@ -6121,36 +6222,34 @@ <glx rop="207"/> </function> - <function name="MultiTexCoord3iARB" offset="396" - vectorequiv="MultiTexCoord3ivARB" exec="loopback"> + <function name="MultiTexCoord3iARB" + vectorequiv="MultiTexCoord3iv" alias="MultiTexCoord3i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> <param name="r" type="GLint"/> </function> - <function name="MultiTexCoord3ivARB" offset="397" exec="loopback"> + <function name="MultiTexCoord3ivARB" alias="MultiTexCoord3iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="3"/> - <glx rop="208"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord3sARB" offset="398" - vectorequiv="MultiTexCoord3svARB" exec="loopback"> + <function name="MultiTexCoord3sARB" + vectorequiv="MultiTexCoord3sv" alias="MultiTexCoord3s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> <param name="r" type="GLshort"/> </function> - <function name="MultiTexCoord3svARB" offset="399" exec="loopback"> + <function name="MultiTexCoord3svARB" alias="MultiTexCoord3sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="209"/> + <param name="v" type="const GLshort *"/> </function> - <function name="MultiTexCoord4dARB" offset="400" - vectorequiv="MultiTexCoord4dvARB" exec="loopback"> + <function name="MultiTexCoord4dARB" + vectorequiv="MultiTexCoord4dv" alias="MultiTexCoord4d"> <param name="target" type="GLenum"/> <param name="s" type="GLdouble"/> <param name="t" type="GLdouble"/> @@ -6158,10 +6257,9 @@ <param name="q" type="GLdouble"/> </function> - <function name="MultiTexCoord4dvARB" offset="401" exec="loopback"> + <function name="MultiTexCoord4dvARB" alias="MultiTexCoord4dv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLdouble *" count="4"/> - <glx rop="210"/> + <param name="v" type="const GLdouble *"/> </function> <function name="MultiTexCoord4fARB" offset="402" @@ -6179,8 +6277,8 @@ <glx rop="211"/> </function> - <function name="MultiTexCoord4iARB" offset="404" - vectorequiv="MultiTexCoord4ivARB" exec="loopback"> + <function name="MultiTexCoord4iARB" + vectorequiv="MultiTexCoord4iv" alias="MultiTexCoord4i"> <param name="target" type="GLenum"/> <param name="s" type="GLint"/> <param name="t" type="GLint"/> @@ -6188,14 +6286,13 @@ <param name="q" type="GLint"/> </function> - <function name="MultiTexCoord4ivARB" offset="405" exec="loopback"> + <function name="MultiTexCoord4ivARB" alias="MultiTexCoord4iv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="212"/> + <param name="v" type="const GLint *"/> </function> - <function name="MultiTexCoord4sARB" offset="406" - vectorequiv="MultiTexCoord4svARB" exec="loopback"> + <function name="MultiTexCoord4sARB" + vectorequiv="MultiTexCoord4sv" alias="MultiTexCoord4s"> <param name="target" type="GLenum"/> <param name="s" type="GLshort"/> <param name="t" type="GLshort"/> @@ -6203,10 +6300,9 @@ <param name="q" type="GLshort"/> </function> - <function name="MultiTexCoord4svARB" offset="407" exec="loopback"> + <function name="MultiTexCoord4svARB" alias="MultiTexCoord4sv"> <param name="target" type="GLenum"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="213"/> + <param name="v" type="const GLshort *"/> </function> </category> @@ -6218,24 +6314,20 @@ <enum name="TRANSPOSE_TEXTURE_MATRIX_ARB" value="0x84E5"/> <enum name="TRANSPOSE_COLOR_MATRIX_ARB" value="0x84E6"/> - <function name="LoadTransposeMatrixfARB" offset="assign"> + <function name="LoadTransposeMatrixfARB" alias="LoadTransposeMatrixf"> <param name="m" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="LoadTransposeMatrixdARB" offset="assign"> + <function name="LoadTransposeMatrixdARB" alias="LoadTransposeMatrixd"> <param name="m" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="MultTransposeMatrixfARB" offset="assign"> + <function name="MultTransposeMatrixfARB" alias="MultTransposeMatrixf"> <param name="m" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="MultTransposeMatrixdARB" offset="assign"> + <function name="MultTransposeMatrixdARB" alias="MultTransposeMatrixd"> <param name="m" type="const GLdouble *"/> - <glx handcode="true"/> </function> </category> @@ -6268,10 +6360,9 @@ </enum> <enum name="MULTISAMPLE_BIT_ARB" value="0x20000000"/> - <function name="SampleCoverageARB" offset="assign"> + <function name="SampleCoverageARB" alias="SampleCoverage"> <param name="value" type="GLclampf"/> <param name="invert" type="GLboolean"/> - <glx rop="229"/> </function> </category> @@ -6328,7 +6419,7 @@ </enum> <enum name="TEXTURE_COMPRESSED_FORMATS_ARB" value="0x86A3"/> - <function name="CompressedTexImage3DARB" offset="assign"> + <function name="CompressedTexImage3DARB" alias="CompressedTexImage3D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> @@ -6336,35 +6427,32 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="216" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexImage2DARB" offset="assign"> + <function name="CompressedTexImage2DARB" alias="CompressedTexImage2D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="215" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexImage1DARB" offset="assign"> + <function name="CompressedTexImage1DARB" alias="CompressedTexImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="internalformat" type="GLenum"/> <param name="width" type="GLsizei"/> <param name="border" type="GLint"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="214" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage3DARB" offset="assign"> + <function name="CompressedTexSubImage3DARB" alias="CompressedTexSubImage3D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -6374,12 +6462,11 @@ <param name="height" type="GLsizei"/> <param name="depth" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="219" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage2DARB" offset="assign"> + <function name="CompressedTexSubImage2DARB" alias="CompressedTexSubImage2D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> @@ -6387,33 +6474,30 @@ <param name="width" type="GLsizei"/> <param name="height" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="218" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="CompressedTexSubImage1DARB" offset="assign"> + <function name="CompressedTexSubImage1DARB" alias="CompressedTexSubImage1D"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> <param name="xoffset" type="GLint"/> <param name="width" type="GLsizei"/> <param name="format" type="GLenum"/> - <param name="imageSize" type="GLsizei" counter="true"/> - <param name="data" type="const GLvoid *" count="imageSize"/> - <glx rop="217" handcode="client"/> + <param name="imageSize" type="GLsizei"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="GetCompressedTexImageARB" offset="assign"> + <function name="GetCompressedTexImageARB" alias="GetCompressedTexImage"> <param name="target" type="GLenum"/> <param name="level" type="GLint"/> - <param name="img" type="GLvoid *" output="true"/> + <param name="img" type="GLvoid *"/> <!-- This has to be hand coded because the image size is in the "wrong" place. Technically, this should be a 'always_array="true"' case. The size field in the reply would be at offset 12. However, the size is actually at offset 16. This is where the 'width' is in a GetTexImage reply. --> - <glx sop="160" handcode="true"/> </function> </category> @@ -6423,25 +6507,25 @@ <category name="GL_ARB_point_parameters" number="14"> <enum name="POINT_SIZE_MIN_ARB" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_ARB" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_ARB" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_ARB" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfARB" alias="PointParameterfEXT"> + <function name="PointParameterfARB" alias="PointParameterf"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="2065"/> </function> - <function name="PointParameterfvARB" alias="PointParameterfvEXT"> + <function name="PointParameterfvARB" alias="PointParameterfv"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="2066"/> @@ -6771,79 +6855,79 @@ </category> <category name="GL_ARB_window_pos" number="25"> - <function name="WindowPos2dARB" alias="WindowPos2dMESA"> + <function name="WindowPos2dARB" alias="WindowPos2d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="WindowPos2fARB" alias="WindowPos2fMESA"> + <function name="WindowPos2fARB" alias="WindowPos2f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> </function> - <function name="WindowPos2iARB" alias="WindowPos2iMESA"> + <function name="WindowPos2iARB" alias="WindowPos2i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> </function> - <function name="WindowPos2sARB" alias="WindowPos2sMESA"> + <function name="WindowPos2sARB" alias="WindowPos2s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="WindowPos2dvARB" alias="WindowPos2dvMESA"> + <function name="WindowPos2dvARB" alias="WindowPos2dv"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos2fvARB" alias="WindowPos2fvMESA"> + <function name="WindowPos2fvARB" alias="WindowPos2fv"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos2ivARB" alias="WindowPos2ivMESA"> + <function name="WindowPos2ivARB" alias="WindowPos2iv"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos2svARB" alias="WindowPos2svMESA"> + <function name="WindowPos2svARB" alias="WindowPos2sv"> <param name="v" type="const GLshort *"/> </function> - <function name="WindowPos3dARB" alias="WindowPos3dMESA"> + <function name="WindowPos3dARB" alias="WindowPos3d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="WindowPos3fARB" alias="WindowPos3fMESA"> + <function name="WindowPos3fARB" alias="WindowPos3f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3iARB" alias="WindowPos3iMESA"> + <function name="WindowPos3iARB" alias="WindowPos3i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> </function> - <function name="WindowPos3sARB" alias="WindowPos3sMESA"> + <function name="WindowPos3sARB" alias="WindowPos3s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="WindowPos3dvARB" alias="WindowPos3dvMESA"> + <function name="WindowPos3dvARB" alias="WindowPos3dv"> <param name="v" type="const GLdouble *"/> </function> - <function name="WindowPos3fvARB" alias="WindowPos3fvMESA"> + <function name="WindowPos3fvARB" alias="WindowPos3fv"> <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3ivARB" alias="WindowPos3ivMESA"> + <function name="WindowPos3ivARB" alias="WindowPos3iv"> <param name="v" type="const GLint *"/> </function> - <function name="WindowPos3svARB" alias="WindowPos3svMESA"> + <function name="WindowPos3svARB" alias="WindowPos3sv"> <param name="v" type="const GLshort *"/> </function> </category> @@ -6853,35 +6937,35 @@ <size name="Get" mode="get"/> </enum> <enum name="VERTEX_PROGRAM_ARB" count="1" value="0x8620"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> <size name="Get" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_ENABLED_ARB" count="1" value="0x8622"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_SIZE_ARB" count="1" value="0x8623"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_STRIDE_ARB" count="1" value="0x8624"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_TYPE_ARB" count="1" value="0x8625"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="CURRENT_VERTEX_ATTRIB_ARB" count="1" value="0x8626"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="PROGRAM_LENGTH_ARB" count="1" value="0x8627"> <size name="GetProgramivARB" mode="get"/> @@ -7026,37 +7110,33 @@ <enum name="MATRIX30_ARB" value="0x88DE"/> <enum name="MATRIX31_ARB" value="0x88DF"/> - <function name="GetVertexAttribdvARB" offset="assign"> + <function name="GetVertexAttribdvARB" alias="GetVertexAttribdv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLdouble *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1301"/> + <param name="params" type="GLdouble *"/> </function> - <function name="GetVertexAttribfvARB" offset="assign"> + <function name="GetVertexAttribfvARB" alias="GetVertexAttribfv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLfloat *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1302"/> + <param name="params" type="GLfloat *"/> </function> - <function name="GetVertexAttribivARB" offset="assign"> + <function name="GetVertexAttribivARB" alias="GetVertexAttribiv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx handcode="client" vendorpriv="1303"/> + <param name="params" type="GLint *"/> </function> - <function name="VertexAttrib1dARB" offset="assign" - vectorequiv="VertexAttrib1dvARB" exec="loopback"> + <function name="VertexAttrib1dARB" + vectorequiv="VertexAttrib1dv" alias="VertexAttrib1d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib1dvARB" alias="VertexAttrib1dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="1"/> - <glx rop="4197" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib1fARB" offset="assign" @@ -7071,29 +7151,27 @@ <glx rop="4193"/> </function> - <function name="VertexAttrib1sARB" offset="assign" - vectorequiv="VertexAttrib1svARB" exec="loopback"> + <function name="VertexAttrib1sARB" + vectorequiv="VertexAttrib1sv" alias="VertexAttrib1s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib1svARB" alias="VertexAttrib1sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="1"/> - <glx rop="4189"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib2dARB" offset="assign" - vectorequiv="VertexAttrib2dvARB" exec="loopback"> + <function name="VertexAttrib2dARB" + vectorequiv="VertexAttrib2dv" alias="VertexAttrib2d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib2dvARB" alias="VertexAttrib2dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="2"/> - <glx rop="4198" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib2fARB" offset="assign" @@ -7109,31 +7187,29 @@ <glx rop="4194"/> </function> - <function name="VertexAttrib2sARB" offset="assign" - vectorequiv="VertexAttrib2svARB" exec="loopback"> + <function name="VertexAttrib2sARB" + vectorequiv="VertexAttrib2sv" alias="VertexAttrib2s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib2svARB" alias="VertexAttrib2sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="2"/> - <glx rop="4190"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib3dARB" offset="assign" - vectorequiv="VertexAttrib3dvARB" exec="loopback"> + <function name="VertexAttrib3dARB" + vectorequiv="VertexAttrib3dv" alias="VertexAttrib3d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib3dvARB" alias="VertexAttrib3dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="4199" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib3fARB" offset="assign" @@ -7150,22 +7226,21 @@ <glx rop="4195"/> </function> - <function name="VertexAttrib3sARB" offset="assign" - vectorequiv="VertexAttrib3svARB" exec="loopback"> + <function name="VertexAttrib3sARB" + vectorequiv="VertexAttrib3sv" alias="VertexAttrib3s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib3svARB" alias="VertexAttrib3sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="4191"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4dARB" offset="assign" - vectorequiv="VertexAttrib4dvARB" exec="loopback"> + <function name="VertexAttrib4dARB" + vectorequiv="VertexAttrib4dv" alias="VertexAttrib4d"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -7173,10 +7248,9 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4dvARB" alias="VertexAttrib4dv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLdouble *" count="4"/> - <glx rop="4200" doubles_in_order="true"/> + <param name="v" type="const GLdouble *"/> </function> <function name="VertexAttrib4fARB" offset="assign" @@ -7194,8 +7268,8 @@ <glx rop="4196"/> </function> - <function name="VertexAttrib4sARB" offset="assign" - vectorequiv="VertexAttrib4svARB" exec="loopback"> + <function name="VertexAttrib4sARB" + vectorequiv="VertexAttrib4sv" alias="VertexAttrib4s"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -7203,14 +7277,13 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4svARB" alias="VertexAttrib4sv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="4192"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4NubARB" offset="assign" - vectorequiv="VertexAttrib4NubvARB" exec="loopback"> + <function name="VertexAttrib4NubARB" + vectorequiv="VertexAttrib4Nubv" alias="VertexAttrib4Nub"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -7218,90 +7291,76 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4NubvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NubvARB" alias="VertexAttrib4Nubv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *" count="4"/> - <glx rop="4201"/> + <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttrib4bvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4bvARB" alias="VertexAttrib4bv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *" count="4"/> - <glx rop="4230"/> + <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttrib4ivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4ivARB" alias="VertexAttrib4iv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="4231"/> + <param name="v" type="const GLint *"/> </function> - <function name="VertexAttrib4ubvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4ubvARB" alias="VertexAttrib4ubv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLubyte *" count="4"/> - <glx rop="4232"/> + <param name="v" type="const GLubyte *"/> </function> - <function name="VertexAttrib4usvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4usvARB" alias="VertexAttrib4usv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *" count="4"/> - <glx rop="4233"/> + <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttrib4uivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4uivARB" alias="VertexAttrib4uiv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *" count="4"/> - <glx rop="4234"/> + <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttrib4NbvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NbvARB" alias="VertexAttrib4Nbv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLbyte *" count="4"/> - <glx rop="4235"/> + <param name="v" type="const GLbyte *"/> </function> - <function name="VertexAttrib4NsvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NsvARB" alias="VertexAttrib4Nsv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLshort *" count="4"/> - <glx rop="4236"/> + <param name="v" type="const GLshort *"/> </function> - <function name="VertexAttrib4NivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NivARB" alias="VertexAttrib4Niv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLint *" count="4"/> - <glx rop="4237"/> + <param name="v" type="const GLint *"/> </function> - <function name="VertexAttrib4NusvARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NusvARB" alias="VertexAttrib4Nusv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLushort *" count="4"/> - <glx rop="4238"/> + <param name="v" type="const GLushort *"/> </function> - <function name="VertexAttrib4NuivARB" offset="assign" exec="loopback"> + <function name="VertexAttrib4NuivARB" alias="VertexAttrib4Nuiv"> <param name="index" type="GLuint"/> - <param name="v" type="const GLuint *" count="4"/> - <glx rop="4239"/> + <param name="v" type="const GLuint *"/> </function> - <function name="VertexAttribPointerARB" offset="assign"> + <function name="VertexAttribPointerARB" alias="VertexAttribPointer"> <param name="index" type="GLuint"/> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="normalized" type="GLboolean"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> - <function name="EnableVertexAttribArrayARB" offset="assign"> + <function name="EnableVertexAttribArrayARB" alias="EnableVertexAttribArray"> <param name="index" type="GLuint"/> - <glx handcode="true"/> </function> - <function name="DisableVertexAttribArrayARB" offset="assign"> + <function name="DisableVertexAttribArrayARB" alias="DisableVertexAttribArray"> <param name="index" type="GLuint"/> - <glx handcode="true"/> </function> <function name="ProgramStringARB" offset="assign" deprecated="3.1"> @@ -7312,24 +7371,28 @@ <glx rop="4217" large="true"/> </function> - <function name="BindProgramARB" alias="BindProgramNV"> + <function name="BindProgramARB" offset="assign"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> + <glx rop="4180"/> </function> - <function name="DeleteProgramsARB" alias="DeleteProgramsNV"> - <param name="n" type="GLsizei"/> - <param name="programs" type="const GLuint *"/> + <function name="DeleteProgramsARB" offset="assign"> + <param name="n" type="GLsizei" counter="true"/> + <param name="programs" type="const GLuint *" count="n"/> + <glx vendorpriv="1294"/> </function> - <function name="GenProgramsARB" alias="GenProgramsNV"> + <function name="GenProgramsARB" offset="assign"> <param name="n" type="GLsizei" counter="true"/> <param name="programs" type="GLuint *" output="true" count="n"/> + <glx vendorpriv="1295" always_array="true"/> </function> - <function name="IsProgramARB" alias="IsProgramNV"> + <function name="IsProgramARB" offset="assign"> <param name="program" type="GLuint"/> <return type="GLboolean"/> + <glx vendorpriv="1304"/> </function> <function name="ProgramEnvParameter4dARB" offset="assign" @@ -7463,7 +7526,7 @@ <glx vendorpriv="1308" handcode="server" always_array="true"/> </function> - <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointervNV"> + <function name="GetVertexAttribPointervARB" alias="GetVertexAttribPointerv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="pointer" type="GLvoid **" output="true"/> @@ -7520,10 +7583,10 @@ <category name="GL_ARB_vertex_buffer_object" number="28"> <enum name="BUFFER_SIZE_ARB" count="1" value="0x8764"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_USAGE_ARB" count="1" value="0x8765"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="ARRAY_BUFFER_BINDING_ARB" count="1" value="0x8894"> <size name="Get" mode="get"/> @@ -7559,18 +7622,18 @@ <size name="Get" mode="get"/> </enum> <enum name="VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB" count="1" value="0x889F"> - <size name="GetVertexAttribdvARB" mode="get"/> - <size name="GetVertexAttribfvARB" mode="get"/> - <size name="GetVertexAttribivARB" mode="get"/> + <size name="GetVertexAttribdv" mode="get"/> + <size name="GetVertexAttribfv" mode="get"/> + <size name="GetVertexAttribiv" mode="get"/> </enum> <enum name="READ_ONLY_ARB" value="0x88B8"/> <enum name="WRITE_ONLY_ARB" value="0x88B9"/> <enum name="READ_WRITE_ARB" value="0x88BA"/> <enum name="BUFFER_ACCESS_ARB" count="1" value="0x88BB"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_MAPPED_ARB" count="1" value="0x88BC"> - <size name="GetBufferParameterivARB" mode="get"/> + <size name="GetBufferParameteriv" mode="get"/> </enum> <enum name="BUFFER_MAP_POINTER_ARB" value="0x88BD"/> <enum name="STREAM_DRAW_ARB" value="0x88E0"/> @@ -7586,147 +7649,128 @@ <type name="intptrARB" size="4" glx_name="CARD32"/> <type name="sizeiptrARB" size="4" unsigned="true" glx_name="CARD32"/> - <function name="BindBufferARB" offset="assign"> + <function name="BindBufferARB" alias="BindBuffer"> <param name="target" type="GLenum"/> <param name="buffer" type="GLuint"/> - <glx ignore="true"/> </function> - <function name="BufferDataARB" offset="assign"> + <function name="BufferDataARB" alias="BufferData"> <param name="target" type="GLenum"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="const GLvoid *" count="size" img_null_flag="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="const GLvoid *"/> <param name="usage" type="GLenum"/> - <glx ignore="true"/> </function> - <function name="BufferSubDataARB" offset="assign"> + <function name="BufferSubDataARB" alias="BufferSubData"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="const GLvoid *" count="size"/> - <glx ignore="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="const GLvoid *"/> </function> - <function name="DeleteBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="buffer" type="const GLuint *" count="n"/> - <glx ignore="true"/> + <function name="DeleteBuffersARB" alias="DeleteBuffers"> + <param name="n" type="GLsizei"/> + <param name="buffer" type="const GLuint *"/> </function> - <function name="GenBuffersARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="buffer" type="GLuint *" output="true" count="n"/> - <glx ignore="true"/> + <function name="GenBuffersARB" alias="GenBuffers"> + <param name="n" type="GLsizei"/> + <param name="buffer" type="GLuint *"/> </function> - <function name="GetBufferParameterivARB" offset="assign"> + <function name="GetBufferParameterivARB" alias="GetBufferParameteriv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx ignore="true"/> + <param name="params" type="GLint *"/> </function> - <function name="GetBufferPointervARB" offset="assign"> + <function name="GetBufferPointervARB" alias="GetBufferPointerv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLvoid **" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLvoid **"/> </function> - <function name="GetBufferSubDataARB" offset="assign"> + <function name="GetBufferSubDataARB" alias="GetBufferSubData"> <param name="target" type="GLenum"/> <param name="offset" type="GLintptrARB"/> - <param name="size" type="GLsizeiptrARB" counter="true"/> - <param name="data" type="GLvoid *" output="true" count="size"/> - <glx ignore="true"/> + <param name="size" type="GLsizeiptrARB"/> + <param name="data" type="GLvoid *"/> </function> - <function name="IsBufferARB" offset="assign"> + <function name="IsBufferARB" alias="IsBuffer"> <param name="buffer" type="GLuint"/> <return type="GLboolean"/> - <glx ignore="true"/> </function> - <function name="MapBufferARB" offset="assign"> + <function name="MapBufferARB" alias="MapBuffer"> <param name="target" type="GLenum"/> <param name="access" type="GLenum"/> <return type="GLvoid *"/> - <glx ignore="true"/> </function> - <function name="UnmapBufferARB" offset="assign"> + <function name="UnmapBufferARB" alias="UnmapBuffer"> <param name="target" type="GLenum"/> <return type="GLboolean"/> - <glx ignore="true"/> </function> </category> <category name="GL_ARB_occlusion_query" number="29"> <enum name="QUERY_COUNTER_BITS_ARB" count="1" value="0x8864"> - <size name="GetQueryivARB" mode="get"/> + <size name="GetQueryiv" mode="get"/> </enum> <enum name="CURRENT_QUERY_ARB" count="1" value="0x8865"> - <size name="GetQueryivARB" mode="get"/> + <size name="GetQueryiv" mode="get"/> </enum> <enum name="QUERY_RESULT_ARB" count="1" value="0x8866"> - <size name="GetQueryObjectivARB" mode="get"/> - <size name="GetQueryObjectuivARB" mode="get"/> + <size name="GetQueryObjectiv" mode="get"/> + <size name="GetQueryObjectuiv" mode="get"/> </enum> <enum name="QUERY_RESULT_AVAILABLE_ARB" count="1" value="0x8867"> - <size name="GetQueryObjectivARB" mode="get"/> - <size name="GetQueryObjectuivARB" mode="get"/> + <size name="GetQueryObjectiv" mode="get"/> + <size name="GetQueryObjectuiv" mode="get"/> </enum> <enum name="SAMPLES_PASSED_ARB" value="0x8914"/> - <function name="GenQueriesARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="ids" type="GLuint *" output="true" count="n"/> - <glx sop="162" always_array="true"/> + <function name="GenQueriesARB" alias="GenQueries"> + <param name="n" type="GLsizei"/> + <param name="ids" type="GLuint *"/> </function> - <function name="DeleteQueriesARB" offset="assign"> - <param name="n" type="GLsizei" counter="true"/> - <param name="ids" type="const GLuint *" count="n"/> - <glx sop="161"/> + <function name="DeleteQueriesARB" alias="DeleteQueries"> + <param name="n" type="GLsizei"/> + <param name="ids" type="const GLuint *"/> </function> - <function name="IsQueryARB" offset="assign"> + <function name="IsQueryARB" alias="IsQuery"> <param name="id" type="GLuint"/> <return type="GLboolean"/> - <glx sop="163"/> </function> - <function name="BeginQueryARB" offset="assign"> + <function name="BeginQueryARB" alias="BeginQuery"> <param name="target" type="GLenum"/> <param name="id" type="GLuint"/> - <glx rop="231"/> </function> - <function name="EndQueryARB" offset="assign"> + <function name="EndQueryARB" alias="EndQuery"> <param name="target" type="GLenum"/> - <glx rop="232"/> </function> - <function name="GetQueryivARB" offset="assign"> + <function name="GetQueryivARB" alias="GetQueryiv"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx sop="164"/> + <param name="params" type="GLint *"/> </function> - <function name="GetQueryObjectivARB" offset="assign"> + <function name="GetQueryObjectivARB" alias="GetQueryObjectiv"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLint *" output="true" variable_param="pname"/> - <glx sop="165"/> + <param name="params" type="GLint *"/> </function> - <function name="GetQueryObjectuivARB" offset="assign"> + <function name="GetQueryObjectuivARB" alias="GetQueryObjectuiv"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="params" type="GLuint *" output="true" variable_param="pname"/> - <glx sop="166"/> + <param name="params" type="GLuint *"/> </function> </category> @@ -7784,17 +7828,15 @@ <glx ignore="true"/> </function> - <function name="ShaderSourceARB" offset="assign"> + <function name="ShaderSourceARB" alias="ShaderSource"> <param name="shader" type="GLhandleARB"/> <param name="count" type="GLsizei"/> <param name="string" type="const GLcharARB **"/> <param name="length" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="CompileShaderARB" offset="assign"> + <function name="CompileShaderARB" alias="CompileShader"> <param name="shader" type="GLhandleARB"/> - <glx ignore="true"/> </function> <function name="CreateProgramObjectARB" offset="assign"> @@ -7808,159 +7850,137 @@ <glx ignore="true"/> </function> - <function name="LinkProgramARB" offset="assign"> + <function name="LinkProgramARB" alias="LinkProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="UseProgramObjectARB" offset="assign"> + <function name="UseProgramObjectARB" alias="UseProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="ValidateProgramARB" offset="assign"> + <function name="ValidateProgramARB" alias="ValidateProgram"> <param name="program" type="GLhandleARB"/> - <glx ignore="true"/> </function> - <function name="Uniform1fARB" offset="assign"> + <function name="Uniform1fARB" alias="Uniform1f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform2fARB" offset="assign"> + <function name="Uniform2fARB" alias="Uniform2f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform3fARB" offset="assign"> + <function name="Uniform3fARB" alias="Uniform3f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform4fARB" offset="assign"> + <function name="Uniform4fARB" alias="Uniform4f"> <param name="location" type="GLint"/> <param name="v0" type="GLfloat"/> <param name="v1" type="GLfloat"/> <param name="v2" type="GLfloat"/> <param name="v3" type="GLfloat"/> - <glx ignore="true"/> </function> - <function name="Uniform1iARB" offset="assign"> + <function name="Uniform1iARB" alias="Uniform1i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform2iARB" offset="assign"> + <function name="Uniform2iARB" alias="Uniform2i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform3iARB" offset="assign"> + <function name="Uniform3iARB" alias="Uniform3i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform4iARB" offset="assign"> + <function name="Uniform4iARB" alias="Uniform4i"> <param name="location" type="GLint"/> <param name="v0" type="GLint"/> <param name="v1" type="GLint"/> <param name="v2" type="GLint"/> <param name="v3" type="GLint"/> - <glx ignore="true"/> </function> - <function name="Uniform1fvARB" offset="assign"> + <function name="Uniform1fvARB" alias="Uniform1fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform2fvARB" offset="assign"> + <function name="Uniform2fvARB" alias="Uniform2fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform3fvARB" offset="assign"> + <function name="Uniform3fvARB" alias="Uniform3fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform4fvARB" offset="assign"> + <function name="Uniform4fvARB" alias="Uniform4fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="Uniform1ivARB" offset="assign"> + <function name="Uniform1ivARB" alias="Uniform1iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform2ivARB" offset="assign"> + <function name="Uniform2ivARB" alias="Uniform2iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform3ivARB" offset="assign"> + <function name="Uniform3ivARB" alias="Uniform3iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="Uniform4ivARB" offset="assign"> + <function name="Uniform4ivARB" alias="Uniform4iv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="value" type="const GLint *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix2fvARB" offset="assign"> + <function name="UniformMatrix2fvARB" alias="UniformMatrix2fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix3fvARB" offset="assign"> + <function name="UniformMatrix3fvARB" alias="UniformMatrix3fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> - <function name="UniformMatrix4fvARB" offset="assign"> + <function name="UniformMatrix4fvARB" alias="UniformMatrix4fv"> <param name="location" type="GLint"/> <param name="count" type="GLsizei"/> <param name="transpose" type="GLboolean"/> <param name="value" type="const GLfloat *"/> - <glx ignore="true"/> </function> <function name="GetObjectParameterfvARB" offset="assign"> @@ -7993,44 +8013,39 @@ <glx ignore="true"/> </function> - <function name="GetUniformLocationARB" offset="assign"> + <function name="GetUniformLocationARB" alias="GetUniformLocation"> <param name="program" type="GLhandleARB"/> <param name="name" type="const GLcharARB *"/> <return type="GLint"/> - <glx ignore="true"/> </function> - <function name="GetActiveUniformARB" offset="assign"> + <function name="GetActiveUniformARB" alias="GetActiveUniform"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="size" type="GLint *" output="true"/> - <param name="type" type="GLenum *" output="true"/> - <param name="name" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="size" type="GLint *"/> + <param name="type" type="GLenum *"/> + <param name="name" type="GLcharARB *"/> </function> - <function name="GetUniformfvARB" offset="assign"> + <function name="GetUniformfvARB" alias="GetUniformfv"> <param name="program" type="GLhandleARB"/> <param name="location" type="GLint"/> - <param name="params" type="GLfloat *" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLfloat *"/> </function> - <function name="GetUniformivARB" offset="assign"> + <function name="GetUniformivARB" alias="GetUniformiv"> <param name="program" type="GLhandleARB"/> <param name="location" type="GLint"/> - <param name="params" type="GLint *" output="true"/> - <glx ignore="true"/> + <param name="params" type="GLint *"/> </function> - <function name="GetShaderSourceARB" offset="assign"> + <function name="GetShaderSourceARB" alias="GetShaderSource"> <param name="shader" type="GLhandleARB"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="source" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="source" type="GLcharARB *"/> </function> </category> @@ -8043,29 +8058,26 @@ <enum name="OBJECT_ACTIVE_ATTRIBUTES_ARB" value="0x8B89"/> <enum name="OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB" value="0x8B8A"/> - <function name="BindAttribLocationARB" offset="assign"> + <function name="BindAttribLocationARB" alias="BindAttribLocation"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="name" type="const GLcharARB *"/> - <glx ignore="true"/> </function> - <function name="GetActiveAttribARB" offset="assign"> + <function name="GetActiveAttribARB" alias="GetActiveAttrib"> <param name="program" type="GLhandleARB"/> <param name="index" type="GLuint"/> <param name="bufSize" type="GLsizei"/> - <param name="length" type="GLsizei *" output="true"/> - <param name="size" type="GLint *" output="true"/> - <param name="type" type="GLenum *" output="true"/> - <param name="name" type="GLcharARB *" output="true"/> - <glx ignore="true"/> + <param name="length" type="GLsizei *"/> + <param name="size" type="GLint *"/> + <param name="type" type="GLenum *"/> + <param name="name" type="GLcharARB *"/> </function> - <function name="GetAttribLocationARB" offset="assign"> + <function name="GetAttribLocationARB" alias="GetAttribLocation"> <param name="program" type="GLhandleARB"/> <param name="name" type="const GLcharARB *"/> <return type="GLint"/> - <glx ignore="true"/> </function> </category> @@ -8207,12 +8219,12 @@ <enum name="TIMESTAMP" value="0x8E28"/> <type name="int64" size="8"/> <type name="uint64" unsigned="true" size="8"/> - <function name="GetQueryObjecti64v" alias="GetQueryObjecti64vEXT" static_dispatch="false"> + <function name="GetQueryObjecti64v" static_dispatch="false" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> </function> - <function name="GetQueryObjectui64v" alias="GetQueryObjectui64vEXT" static_dispatch="false"> + <function name="GetQueryObjectui64v" static_dispatch="false" offset="assign"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint64 *"/> @@ -9302,28 +9314,26 @@ <category name="GL_EXT_point_parameters" number="54"> <enum name="POINT_SIZE_MIN_EXT" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_EXT" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfEXT" offset="assign" mesa_name="-EXT"> + <function name="PointParameterfEXT" alias="PointParameterf"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> - <glx rop="2065"/> </function> - <function name="PointParameterfvEXT" offset="assign" mesa_name="-EXT"> + <function name="PointParameterfvEXT" alias="PointParameterfv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLfloat *" variable_param="pname"/> - <glx rop="2066"/> + <param name="params" type="const GLfloat *"/> </function> </category> @@ -10028,32 +10038,26 @@ </category> <category name="GL_EXT_secondary_color" number="145"> - <function name="SecondaryColor3bEXT" offset="assign" - vectorequiv="SecondaryColor3bvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3bEXT" + vectorequiv="SecondaryColor3bv" alias="SecondaryColor3b"> <param name="red" type="GLbyte"/> <param name="green" type="GLbyte"/> <param name="blue" type="GLbyte"/> </function> - <function name="SecondaryColor3bvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLbyte *" count="3"/> - <glx rop="4126"/> + <function name="SecondaryColor3bvEXT" alias="SecondaryColor3bv"> + <param name="v" type="const GLbyte *"/> </function> - <function name="SecondaryColor3dEXT" offset="assign" - vectorequiv="SecondaryColor3dvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3dEXT" + vectorequiv="SecondaryColor3dv" alias="SecondaryColor3d"> <param name="red" type="GLdouble"/> <param name="green" type="GLdouble"/> <param name="blue" type="GLdouble"/> </function> - <function name="SecondaryColor3dvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLdouble *" count="3"/> - <glx rop="4130"/> + <function name="SecondaryColor3dvEXT" alias="SecondaryColor3dv"> + <param name="v" type="const GLdouble *"/> </function> <function name="SecondaryColor3fEXT" offset="assign" vectorequiv="SecondaryColor3fvEXT"> @@ -10067,82 +10071,66 @@ <glx rop="4129"/> </function> - <function name="SecondaryColor3iEXT" offset="assign" - vectorequiv="SecondaryColor3ivEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3iEXT" + vectorequiv="SecondaryColor3iv" alias="SecondaryColor3i"> <param name="red" type="GLint"/> <param name="green" type="GLint"/> <param name="blue" type="GLint"/> </function> - <function name="SecondaryColor3ivEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLint *" count="3"/> - <glx rop="4128"/> + <function name="SecondaryColor3ivEXT" alias="SecondaryColor3iv"> + <param name="v" type="const GLint *"/> </function> - <function name="SecondaryColor3sEXT" offset="assign" - vectorequiv="SecondaryColor3svEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3sEXT" + vectorequiv="SecondaryColor3sv" alias="SecondaryColor3s"> <param name="red" type="GLshort"/> <param name="green" type="GLshort"/> <param name="blue" type="GLshort"/> </function> - <function name="SecondaryColor3svEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLshort *" count="3"/> - <glx rop="4127"/> + <function name="SecondaryColor3svEXT" alias="SecondaryColor3sv"> + <param name="v" type="const GLshort *"/> </function> - <function name="SecondaryColor3ubEXT" offset="assign" - vectorequiv="SecondaryColor3ubvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3ubEXT" + vectorequiv="SecondaryColor3ubv" alias="SecondaryColor3ub"> <param name="red" type="GLubyte"/> <param name="green" type="GLubyte"/> <param name="blue" type="GLubyte"/> </function> - <function name="SecondaryColor3ubvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLubyte *" count="3"/> - <glx rop="4131"/> + <function name="SecondaryColor3ubvEXT" alias="SecondaryColor3ubv"> + <param name="v" type="const GLubyte *"/> </function> - <function name="SecondaryColor3uiEXT" offset="assign" - vectorequiv="SecondaryColor3uivEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3uiEXT" + vectorequiv="SecondaryColor3uiv" alias="SecondaryColor3ui"> <param name="red" type="GLuint"/> <param name="green" type="GLuint"/> <param name="blue" type="GLuint"/> </function> - <function name="SecondaryColor3uivEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLuint *" count="3"/> - <glx rop="4133"/> + <function name="SecondaryColor3uivEXT" alias="SecondaryColor3uiv"> + <param name="v" type="const GLuint *"/> </function> - <function name="SecondaryColor3usEXT" offset="assign" - vectorequiv="SecondaryColor3usvEXT" exec="loopback" - mesa_name="+_f"> + <function name="SecondaryColor3usEXT" + vectorequiv="SecondaryColor3usv" alias="SecondaryColor3us"> <param name="red" type="GLushort"/> <param name="green" type="GLushort"/> <param name="blue" type="GLushort"/> </function> - <function name="SecondaryColor3usvEXT" offset="assign" exec="loopback" - mesa_name="+_f"> - <param name="v" type="const GLushort *" count="3"/> - <glx rop="4132"/> + <function name="SecondaryColor3usvEXT" alias="SecondaryColor3usv"> + <param name="v" type="const GLushort *"/> </function> - <function name="SecondaryColorPointerEXT" offset="assign"> + <function name="SecondaryColorPointerEXT" alias="SecondaryColorPointer"> <param name="size" type="GLint"/> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> </category> @@ -10153,12 +10141,11 @@ </category> <category name="GL_EXT_multi_draw_arrays" number="148"> - <function name="MultiDrawArraysEXT" offset="assign" es1="1.0" es2="2.0"> + <function name="MultiDrawArraysEXT" es1="1.0" es2="2.0" alias="MultiDrawArrays"> <param name="mode" type="GLenum"/> <param name="first" type="const GLint *"/> <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> - <glx handcode="true"/> </function> <function name="MultiDrawElementsEXT" offset="assign" es1="1.0" es2="2.0" @@ -10183,21 +10170,18 @@ <glx rop="4124"/> </function> - <function name="FogCoorddEXT" offset="assign" vectorequiv="FogCoorddvEXT" - exec="loopback"> + <function name="FogCoorddEXT" vectorequiv="FogCoorddv" alias="FogCoordd"> <param name="coord" type="GLdouble"/> </function> - <function name="FogCoorddvEXT" offset="assign" exec="loopback"> - <param name="coord" type="const GLdouble *" count="1"/> - <glx rop="4125"/> + <function name="FogCoorddvEXT" alias="FogCoorddv"> + <param name="coord" type="const GLdouble *"/> </function> - <function name="FogCoordPointerEXT" offset="assign"> + <function name="FogCoordPointerEXT" alias="FogCoordPointer"> <param name="type" type="GLenum"/> <param name="stride" type="GLsizei"/> <param name="pointer" type="const GLvoid *"/> - <glx handcode="true"/> </function> </category> @@ -10788,12 +10772,11 @@ <!-- Extension number 172 is a WGL extension. --> <category name="GL_EXT_blend_func_separate" number="173"> - <function name="BlendFuncSeparateEXT" offset="assign"> + <function name="BlendFuncSeparateEXT" alias="BlendFuncSeparate"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> <param name="dfactorAlpha" type="GLenum"/> - <glx rop="4134"/> </function> </category> @@ -11040,95 +11023,80 @@ </category> <category name="GL_MESA_window_pos" number="197"> - <function name="WindowPos2dMESA" offset="assign"> + <function name="WindowPos2dMESA" alias="WindowPos2d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> - <glx handcode="true"/> </function> - <function name="WindowPos2dvMESA" offset="assign"> + <function name="WindowPos2dvMESA" alias="WindowPos2dv"> <param name="v" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2fMESA" offset="assign"> + <function name="WindowPos2fMESA" alias="WindowPos2f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> - <glx handcode="true"/> </function> - <function name="WindowPos2fvMESA" offset="assign"> + <function name="WindowPos2fvMESA" alias="WindowPos2fv"> <param name="v" type="const GLfloat *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2iMESA" offset="assign"> + <function name="WindowPos2iMESA" alias="WindowPos2i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> - <glx handcode="true"/> </function> - <function name="WindowPos2ivMESA" offset="assign"> + <function name="WindowPos2ivMESA" alias="WindowPos2iv"> <param name="v" type="const GLint *"/> - <glx handcode="true"/> </function> - <function name="WindowPos2sMESA" offset="assign"> + <function name="WindowPos2sMESA" alias="WindowPos2s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> - <glx handcode="true"/> </function> - <function name="WindowPos2svMESA" offset="assign"> + <function name="WindowPos2svMESA" alias="WindowPos2sv"> <param name="v" type="const GLshort *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3dMESA" offset="assign"> + <function name="WindowPos3dMESA" alias="WindowPos3d"> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> - <glx handcode="true"/> </function> - <function name="WindowPos3dvMESA" offset="assign"> + <function name="WindowPos3dvMESA" alias="WindowPos3dv"> <param name="v" type="const GLdouble *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3fMESA" offset="assign" vectorequiv="WindowPos3fvMESA"> + <function name="WindowPos3fMESA" vectorequiv="WindowPos3fv" alias="WindowPos3f"> <param name="x" type="GLfloat"/> <param name="y" type="GLfloat"/> <param name="z" type="GLfloat"/> </function> - <function name="WindowPos3fvMESA" offset="assign"> - <param name="v" type="const GLfloat *" count="3"/> - <glx rop="230"/> + <function name="WindowPos3fvMESA" alias="WindowPos3fv"> + <param name="v" type="const GLfloat *"/> </function> - <function name="WindowPos3iMESA" offset="assign"> + <function name="WindowPos3iMESA" alias="WindowPos3i"> <param name="x" type="GLint"/> <param name="y" type="GLint"/> <param name="z" type="GLint"/> - <glx handcode="true"/> </function> - <function name="WindowPos3ivMESA" offset="assign"> + <function name="WindowPos3ivMESA" alias="WindowPos3iv"> <param name="v" type="const GLint *"/> - <glx handcode="true"/> </function> - <function name="WindowPos3sMESA" offset="assign"> + <function name="WindowPos3sMESA" alias="WindowPos3s"> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> - <glx handcode="true"/> </function> - <function name="WindowPos3svMESA" offset="assign"> + <function name="WindowPos3svMESA" alias="WindowPos3sv"> <param name="v" type="const GLshort *"/> - <glx handcode="true"/> </function> <function name="WindowPos4dMESA" offset="assign" deprecated="3.1"> @@ -11609,18 +11577,14 @@ <glx vendorpriv="1293"/> </function> - <function name="BindProgramNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> + <function name="BindProgramNV" deprecated="3.1" alias="BindProgramARB"> <param name="target" type="GLenum"/> <param name="program" type="GLuint"/> - <glx rop="4180"/> </function> - <function name="DeleteProgramsNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> - <param name="n" type="GLsizei" counter="true"/> - <param name="programs" type="const GLuint *" count="n"/> - <glx vendorpriv="1294"/> + <function name="DeleteProgramsNV" deprecated="3.1" alias="DeleteProgramsARB"> + <param name="n" type="GLsizei"/> + <param name="programs" type="const GLuint *"/> </function> <function name="ExecuteProgramNV" offset="assign" deprecated="3.1" @@ -11631,11 +11595,9 @@ <glx rop="4181"/> </function> - <function name="GenProgramsNV" offset="assign" deprecated="3.1" - mesa_name="-NV"> - <param name="n" type="GLsizei" counter="true"/> - <param name="programs" type="GLuint *" output="true" count="n"/> - <glx vendorpriv="1295" always_array="true"/> + <function name="GenProgramsNV" deprecated="3.1" alias="GenProgramsARB"> + <param name="n" type="GLsizei"/> + <param name="programs" type="GLuint *"/> </function> <!-- This isn't 100% correct. Currently, the only valid value of pname @@ -11711,19 +11673,15 @@ <glx vendorpriv="1303"/> </function> - <function name="GetVertexAttribPointervNV" offset="assign" - mesa_name="-NV+ARB"> + <function name="GetVertexAttribPointervNV" alias="GetVertexAttribPointerv"> <param name="index" type="GLuint"/> <param name="pname" type="GLenum"/> - <param name="pointer" type="GLvoid **" output="true"/> - <glx handcode="true"/> + <param name="pointer" type="GLvoid **"/> </function> - <function name="IsProgramNV" offset="assign" deprecated="3.1" - mesa_name="-NV+ARB"> + <function name="IsProgramNV" deprecated="3.1" alias="IsProgramARB"> <param name="program" type="GLuint"/> <return type="GLboolean"/> - <glx vendorpriv="1304"/> </function> <function name="LoadProgramNV" offset="assign" deprecated="3.1" @@ -11810,49 +11768,46 @@ </function> <function name="VertexAttrib1sNV" offset="assign" - vectorequiv="VertexAttrib1svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib1svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> </function> - <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib1svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="1"/> <glx rop="4265"/> </function> <function name="VertexAttrib2sNV" offset="assign" - vectorequiv="VertexAttrib2svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib2svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> </function> - <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib2svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="2"/> <glx rop="4266"/> </function> <function name="VertexAttrib3sNV" offset="assign" - vectorequiv="VertexAttrib3svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib3svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> <param name="z" type="GLshort"/> </function> - <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib3svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="3"/> <glx rop="4267"/> </function> <function name="VertexAttrib4sNV" offset="assign" - vectorequiv="VertexAttrib4svNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib4svNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLshort"/> <param name="y" type="GLshort"/> @@ -11860,8 +11815,7 @@ <param name="w" type="GLshort"/> </function> - <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLshort *" count="4"/> <glx rop="4268"/> @@ -11930,49 +11884,46 @@ </function> <function name="VertexAttrib1dNV" offset="assign" - vectorequiv="VertexAttrib1dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib1dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> </function> - <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib1dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="1"/> <glx rop="4273" doubles_in_order="true"/> </function> <function name="VertexAttrib2dNV" offset="assign" - vectorequiv="VertexAttrib2dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib2dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> </function> - <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib2dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="2"/> <glx rop="4274" doubles_in_order="true"/> </function> <function name="VertexAttrib3dNV" offset="assign" - vectorequiv="VertexAttrib3dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib3dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> <param name="z" type="GLdouble"/> </function> - <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib3dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="3"/> <glx rop="4275" doubles_in_order="true"/> </function> <function name="VertexAttrib4dNV" offset="assign" - vectorequiv="VertexAttrib4dvNV" deprecated="3.1" exec="loopback"> + vectorequiv="VertexAttrib4dvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLdouble"/> <param name="y" type="GLdouble"/> @@ -11980,16 +11931,14 @@ <param name="w" type="GLdouble"/> </function> - <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLdouble *" count="4"/> <glx rop="4276" doubles_in_order="true"/> </function> <function name="VertexAttrib4ubNV" offset="assign" - vectorequiv="VertexAttrib4ubvNV" deprecated="3.1" - exec="loopback"> + vectorequiv="VertexAttrib4ubvNV" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="x" type="GLubyte"/> <param name="y" type="GLubyte"/> @@ -11997,111 +11946,97 @@ <param name="w" type="GLubyte"/> </function> - <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttrib4ubvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="v" type="const GLubyte *" count="4"/> <glx rop="4277"/> </function> - <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n"/> <glx rop="4202"/> </function> - <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="2"/> <glx rop="4203"/> </function> - <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="3"/> <glx rop="4204"/> </function> - <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4svNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLshort *" count="n" count_scale="4"/> <glx rop="4205"/> </function> - <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n"/> <glx rop="4206"/> </function> - <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="2"/> <glx rop="4207"/> </function> - <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="3"/> <glx rop="4208"/> </function> - <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4fvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLfloat *" count="n" count_scale="4"/> <glx rop="4209"/> </function> - <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs1dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n"/> <glx rop="4210" doubles_in_order="true"/> </function> - <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs2dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="2"/> <glx rop="4211" doubles_in_order="true"/> </function> - <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs3dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="3"/> <glx rop="4212" doubles_in_order="true"/> </function> - <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4dvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLdouble *" count="n" count_scale="4"/> <glx rop="4213" doubles_in_order="true"/> </function> - <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1" - exec="loopback"> + <function name="VertexAttribs4ubvNV" offset="assign" deprecated="3.1"> <param name="index" type="GLuint"/> <param name="n" type="GLsizei" counter="true"/> <param name="v" type="const GLubyte *" count="n" count_scale="4"/> @@ -12471,16 +12406,16 @@ added for this extension. --> <enum name="POINT_SIZE_MIN_EXT" count="1" value="0x8126"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_SIZE_MAX_EXT" count="1" value="0x8127"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_EXT" count="1" value="0x8128"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_EXT" count="3" value="0x8129"> - <size name="PointParameterivNV"/> + <size name="PointParameteriv"/> </enum> <enum name="POINT_SPRITE_NV" count="1" value="0x8861"> @@ -12493,21 +12428,19 @@ <size name="GetTexEnviv" mode="get"/> </enum> <enum name="POINT_SPRITE_R_MODE_NV" count="1" value="0x8863"> - <size name="PointParameterfvEXT"/> - <size name="PointParameterivNV"/> + <size name="PointParameterfv"/> + <size name="PointParameteriv"/> <size name="Get" mode="get"/> </enum> - <function name="PointParameteriNV" offset="assign" mesa_name="-NV"> + <function name="PointParameteriNV" alias="PointParameteri"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> - <glx rop="4221"/> </function> - <function name="PointParameterivNV" offset="assign" mesa_name="-NV"> + <function name="PointParameterivNV" alias="PointParameteriv"> <param name="pname" type="GLenum"/> - <param name="params" type="const GLint *" variable_param="pname"/> - <glx rop="4222"/> + <param name="params" type="const GLint *"/> </function> </category> @@ -12684,10 +12617,9 @@ <size name="Get" mode="get"/> </enum> - <function name="BlendEquationSeparateEXT" offset="assign" static_dispatch="false"> + <function name="BlendEquationSeparateEXT" static_dispatch="false" alias="BlendEquationSeparate"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> - <glx rop="4228"/> </function> </category> @@ -12846,7 +12778,7 @@ <!-- Unnumbered extensions sorted by name. --> <category name="GL_ATI_blend_equation_separate"> - <function name="BlendEquationSeparateATI" alias="BlendEquationSeparateEXT" static_dispatch="false"> + <function name="BlendEquationSeparateATI" alias="BlendEquationSeparate" static_dispatch="false"> <param name="modeRGB" type="GLenum"/> <param name="modeA" type="GLenum"/> </function> @@ -12904,12 +12836,12 @@ <enum name="TIME_ELAPSED_EXT" value="0x88BF"/> <type name="int64EXT" size="8"/> <type name="uint64EXT" unsigned="true" size="8"/> - <function name="GetQueryObjecti64vEXT" offset="assign" static_dispatch="false"> + <function name="GetQueryObjecti64vEXT" static_dispatch="false" alias="GetQueryObjecti64v"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64EXT *"/> </function> - <function name="GetQueryObjectui64vEXT" offset="assign" static_dispatch="false"> + <function name="GetQueryObjectui64vEXT" static_dispatch="false" alias="GetQueryObjectui64v"> <param name="id" type="GLuint"/> <param name="pname" type="GLenum"/> <param name="params" type="GLuint64EXT *"/> @@ -12917,7 +12849,7 @@ </category> <category name="GL_INGR_blend_func_separate"> - <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparateEXT" static_dispatch="false"> + <function name="BlendFuncSeparateINGR" alias="BlendFuncSeparate" static_dispatch="false"> <param name="sfactorRGB" type="GLenum"/> <param name="dfactorRGB" type="GLenum"/> <param name="sfactorAlpha" type="GLenum"/> @@ -12965,24 +12897,24 @@ <category name="GL_SGIS_point_parameters"> <enum name="POINT_SIZE_MIN_SGIS" count="1" value="0x8126"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_SIZE_MAX_SGIS" count="1" value="0x8127"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_FADE_THRESHOLD_SIZE_SGIS" count="1" value="0x8128"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> <enum name="POINT_DISTANCE_ATTENUATION_SGIS" count="3" value="0x8129"> - <size name="PointParameterfvEXT"/> + <size name="PointParameterfv"/> </enum> - <function name="PointParameterfSGIS" alias="PointParameterfEXT" static_dispatch="false"> + <function name="PointParameterfSGIS" alias="PointParameterf" static_dispatch="false"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> </function> - <function name="PointParameterfvSGIS" alias="PointParameterfvEXT" static_dispatch="false"> + <function name="PointParameterfvSGIS" alias="PointParameterfv" static_dispatch="false"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py index 47f8dd5b9..227e9fcd9 100644 --- a/mesalib/src/mapi/glapi/gen/gl_XML.py +++ b/mesalib/src/mapi/glapi/gen/gl_XML.py @@ -594,47 +594,6 @@ class gl_parameter(object): return self.type_expr.format_string() -# Regular expression used to parse "mesa_name" attributes. A -# mesa_name attribute describes how to adjust a GL function name -# suffix to obtain the name of the function in Mesa that implements -# the functionality. The attribute string consists of a part preceded -# by a "-", indicating the suffix to remove, and a part preceded by a -# "+" indicating the suffix to add. Either part is optional. -# -# For example: -# -# <function name="EnableIndexedEXT" mesa_name="-EXT">...</function> -# <function name="IsProgramNV" mesa_name="-NV+ARB">...</function> -# -# means that EnableIndexedEXT is implemented by a Mesa function called -# _mesa_EnableIndexed, and IsProgramNV is implemented by a Mesa function -# called _mesa_IsProgramARB. -# -# Note: the prefix "_mesa_" is handled separately, by the "exec" -# attribute. -name_modification_regexp = re.compile( - r'^(-(?P<minus>[a-zA-Z0-9_]+))?(\+(?P<plus>[a-zA-Z0-9_]+))?$') - - -# Interpret a "mesa_name" attribute (see above) to determine the -# appropriate suffix for the Mesa function implementing a piece of GL -# functionality, and return the properly suffixed name. -def interpret_name_modification(name, mod): - m = name_modification_regexp.match(mod) - if m is None: - raise Exception('Unintelligible mesa_name property: {0!r}'.format(mod)) - new_name = name - if m.group('minus'): - if not new_name.endswith(m.group('minus')): - raise Exception( - 'Cannot subtract suffix {0!r} from function {1}'.format( - m.group('minus'), name)) - new_name = new_name[:-len(m.group('minus'))] - if m.group('plus'): - new_name += m.group('plus') - return new_name - - class gl_function( gl_item ): def __init__(self, element, context): self.context = context @@ -649,7 +608,6 @@ class gl_function( gl_item ): self.exec_flavor = 'mesa' self.desktop = True self.deprecated = None - self.mesa_name = None # self.entry_point_api_map[name][api] is a decimal value # indicating the earliest version of the given API in which @@ -725,8 +683,8 @@ class gl_function( gl_item ): else: true_name = name - # Only try to set the offset and mesa_name when a - # non-alias entry-point is being processed. + # Only try to set the offset when a non-alias entry-point + # is being processed. offset = element.nsProp( "offset", None ) if offset: @@ -738,12 +696,6 @@ class gl_function( gl_item ): if offset == "assign": self.assign_offset = 1 - mesa_name = element.nsProp('mesa_name', None) - if mesa_name is None: - self.mesa_name = name - else: - self.mesa_name = interpret_name_modification(name, mesa_name) - if not self.name: self.name = true_name diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml index 205f74fa9..18b0eb4ec 100644 --- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml @@ -18,53 +18,53 @@ <type name="fixed" size="4" /> <type name="clampx" size="4" /> - <function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="AlphaFuncx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="func" type="GLenum"/> <param name="ref" type="GLclampx"/> </function> - <function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="ClearColorx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="red" type="GLclampx"/> <param name="green" type="GLclampx"/> <param name="blue" type="GLclampx"/> <param name="alpha" type="GLclampx"/> </function> - <function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="ClearDepthx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="depth" type="GLclampx"/> </function> - <function name="Color4x" alias="Color4xOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Color4x" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="red" type="GLfixed"/> <param name="green" type="GLfixed"/> <param name="blue" type="GLfixed"/> <param name="alpha" type="GLfixed"/> </function> - <function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="DepthRangex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="zNear" type="GLclampx"/> <param name="zFar" type="GLclampx"/> </function> - <function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0" - desktop="false"> + <function name="Fogx" static_dispatch="false" es1="1.0" + desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0" - desktop="false"> + <function name="Fogxv" static_dispatch="false" es1="1.0" + desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Frustumx" alias="FrustumxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Frustumx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -73,63 +73,63 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="LightModelx" alias="LightModelxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LightModelx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="LightModelxv" alias="LightModelxvOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="LightModelxv" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="Lightx" alias="LightxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Lightx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Lightxv" alias="LightxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Lightxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LineWidthx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="width" type="GLfixed"/> </function> - <function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="LoadMatrixx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="Materialx" alias="MaterialxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Materialx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Materialxv" alias="MaterialxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Materialxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="MultMatrixx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="m" type="const GLfixed *" count="16"/> </function> - <function name="MultiTexCoord4x" alias="MultiTexCoord4xOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="MultiTexCoord4x" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="s" type="GLfixed"/> <param name="t" type="GLfixed"/> @@ -137,15 +137,15 @@ <param name="q" type="GLfixed"/> </function> - <function name="Normal3x" alias="Normal3xOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Normal3x" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="nx" type="GLfixed"/> <param name="ny" type="GLfixed"/> <param name="nz" type="GLfixed"/> </function> - <function name="Orthox" alias="OrthoxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Orthox" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfixed"/> <param name="right" type="GLfixed"/> <param name="bottom" type="GLfixed"/> @@ -154,69 +154,69 @@ <param name="zFar" type="GLfixed"/> </function> - <function name="PointSizex" alias="PointSizexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="PointSizex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="size" type="GLfixed"/> </function> - <function name="PolygonOffsetx" alias="PolygonOffsetxOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="PolygonOffsetx" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="factor" type="GLfixed"/> <param name="units" type="GLfixed"/> </function> - <function name="Rotatex" alias="RotatexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Rotatex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="angle" type="GLfixed"/> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="SampleCoveragex" alias="SampleCoveragexOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="SampleCoveragex" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="value" type="GLclampx"/> <param name="invert" type="GLboolean"/> </function> - <function name="Scalex" alias="ScalexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Scalex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> - <function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="TexEnvx" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="TexEnvxv" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> - <function name="TexParameterx" alias="TexParameterxOES" - static_dispatch="false" es1="1.0" desktop="false"> + <function name="TexParameterx" + static_dispatch="false" es1="1.0" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="Translatex" alias="TranslatexOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Translatex" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="x" type="GLfixed"/> <param name="y" type="GLfixed"/> <param name="z" type="GLfixed"/> </function> <!-- from GL_OES_single_precision --> - <function name="Frustumf" alias="FrustumfOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Frustumf" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -225,8 +225,8 @@ <param name="zFar" type="GLfloat"/> </function> - <function name="Orthof" alias="OrthofOES" static_dispatch="false" - es1="1.0" desktop="false"> + <function name="Orthof" static_dispatch="false" + es1="1.0" desktop="false" offset="assign"> <param name="left" type="GLfloat"/> <param name="right" type="GLfloat"/> <param name="bottom" type="GLfloat"/> @@ -238,80 +238,80 @@ <category name="es1.1"> <!-- from GL_OES_fixed_point --> - <function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="ClipPlanex" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfixed *" count="4"/> </function> - <function name="GetClipPlanex" alias="GetClipPlanexOES" - static_dispatch="false" es1="1.1"> + <function name="GetClipPlanex" + static_dispatch="false" es1="1.1" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfixed *" output="true" count="4"/> </function> - <function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetFixedv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetLightxv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="light" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetMaterialxv" alias="GetMaterialxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="GetMaterialxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="face" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="GetTexEnvxv" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="GetTexParameterxv" alias="GetTexParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="GetTexParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfixed *" output="true" variable_param="pname"/> </function> - <function name="PointParameterx" alias="PointParameterxOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="PointParameterx" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="param" type="GLfixed"/> </function> - <function name="PointParameterxv" alias="PointParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="PointParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *"/> </function> - <function name="TexParameterxv" alias="TexParameterxvOES" - static_dispatch="false" es1="1.1" desktop="false"> + <function name="TexParameterxv" + static_dispatch="false" es1="1.1" desktop="false" offset="assign"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="const GLfixed *" variable_param="pname"/> </function> <!-- from GL_OES_single_precision --> - <function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false" - es1="1.1" desktop="false"> + <function name="ClipPlanef" static_dispatch="false" + es1="1.1" desktop="false" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="const GLfloat *" count="4"/> </function> - <function name="GetClipPlanef" alias="GetClipPlanefOES" - static_dispatch="false" es1="1.1"> + <function name="GetClipPlanef" + static_dispatch="false" es1="1.1" offset="assign"> <param name="plane" type="GLenum"/> <param name="equation" type="GLfloat *" output="true" count="4"/> </function> diff --git a/mesalib/src/mapi/glapi/gen/gl_genexec.py b/mesalib/src/mapi/glapi/gen/gl_genexec.py index adfa5957e..9b716894c 100644 --- a/mesalib/src/mapi/glapi/gen/gl_genexec.py +++ b/mesalib/src/mapi/glapi/gen/gl_genexec.py @@ -32,10 +32,7 @@ import sys, getopt exec_flavor_map = { - 'check': '_check_', 'dynamic': None, - 'es': '_es_', - 'loopback': 'loopback_', 'mesa': '_mesa_', 'skip': None, } @@ -189,7 +186,7 @@ class PrintCode(gl_XML.gl_print_base): # dynamically. continue settings_by_condition[condition].append( - 'SET_{0}(exec, {1}{2});'.format(f.name, prefix, f.mesa_name)) + 'SET_{0}(exec, {1}{0});'.format(f.name, prefix, f.name)) # Print out an if statement for each unique condition, with # the SET_* calls nested inside it. for condition in sorted(settings_by_condition.keys()): diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk index ce6d65bbd..5f0d73cff 100644 --- a/mesalib/src/mesa/Android.gen.mk +++ b/mesalib/src/mesa/Android.gen.mk @@ -32,9 +32,6 @@ intermediates := $(call local-intermediates-dir) # This is the list of auto-generated files: sources and headers sources := \ main/enums.c \ - main/api_exec.c \ - program/program_parse.tab.c \ - program/lex.yy.c \ main/dispatch.h \ main/remap_helper.h \ main/get_hash.h @@ -62,30 +59,12 @@ dispatch_deps := \ $(wildcard $(glapi)/*.py) \ $(wildcard $(glapi)/*.xml) -define local-l-to-c - @mkdir -p $(dir $@) - @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" - $(hide) $(LEX) -o$@ $< -endef - -define mesa_local-y-to-c-and-h - @mkdir -p $(dir $@) - @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" - $(hide) $(YACC) -o $@ -p "_mesa_program_" $< -endef - define es-gen @mkdir -p $(dir $@) @echo "Gen ES: $(PRIVATE_MODULE) <= $(notdir $(@))" $(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@ endef -$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y - $(mesa_local-y-to-c-and-h) - -$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l - $(local-l-to-c) - $(intermediates)/main/git_sha1.h: @mkdir -p $(dir $@) @echo "GIT-SHA1: $(PRIVATE_MODULE) <= git" diff --git a/mesalib/src/mesa/Android.libmesa_dricore.mk b/mesalib/src/mesa/Android.libmesa_dricore.mk new file mode 100644 index 000000000..093d7a189 --- /dev/null +++ b/mesalib/src/mesa/Android.libmesa_dricore.mk @@ -0,0 +1,67 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# ---------------------------------------------------------------------- +# libmesa_dricore.a +# ---------------------------------------------------------------------- + +ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) + +LOCAL_PATH := $(call my-dir) + +# Import the following variables: +# MESA_FILES +# X86_FILES +include $(LOCAL_PATH)/sources.mak + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_dricore +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +MESA_ENABLED_APIS := ES1 ES2 GL + +LOCAL_SRC_FILES := \ + $(MESA_FILES) + +ifeq ($(strip $(MESA_ENABLE_ASM)),true) +ifeq ($(TARGET_ARCH),x86) + LOCAL_SRC_FILES += $(X86_FILES) +endif # x86 +endif # MESA_ENABLE_ASM + +LOCAL_CFLAGS := \ + $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) + +LOCAL_C_INCLUDES := \ + $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/glsl + +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_program + +include $(LOCAL_PATH)/Android.gen.mk +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_CLASSIC diff --git a/mesalib/src/mesa/Android.libmesa_glsl_utils.mk b/mesalib/src/mesa/Android.libmesa_glsl_utils.mk new file mode 100644 index 000000000..480275795 --- /dev/null +++ b/mesalib/src/mesa/Android.libmesa_glsl_utils.mk @@ -0,0 +1,59 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +# +# The libmesa_glsl_utils libraries allow us to avoid a circular dependency +# between core mesa and glsl. +# + +# --------------------------------------- +# libmesa_glsl_utils.a for target +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_glsl_utils + +LOCAL_SRC_FILES := \ + program/hash_table.c \ + program/symbol_table.c + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +# --------------------------------------- +# libmesa_glsl_utils.a for host +# --------------------------------------- + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_glsl_utils +LOCAL_IS_HOST_MODULE := true + +LOCAL_SRC_FILES := \ + program/hash_table.c \ + program/symbol_table.c + +include $(MESA_COMMON_MK) +include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/mesalib/src/mesa/Android.libmesa_st_mesa.mk b/mesalib/src/mesa/Android.libmesa_st_mesa.mk new file mode 100644 index 000000000..79914caf1 --- /dev/null +++ b/mesalib/src/mesa/Android.libmesa_st_mesa.mk @@ -0,0 +1,65 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# ---------------------------------------------------------------------- +# libmesa_st_mesa.a +# ---------------------------------------------------------------------- + +ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) + +LOCAL_PATH := $(call my-dir) + +# Import variables: +# MESA_GALLIUM_FILES. +# X86_FILES +include $(LOCAL_PATH)/sources.mak + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_st_mesa + +MESA_ENABLED_APIS := ES1 ES2 + +LOCAL_SRC_FILES := \ + $(MESA_GALLIUM_FILES) + +ifeq ($(strip $(MESA_ENABLE_ASM)),true) +ifeq ($(TARGET_ARCH),x86) + LOCAL_SRC_FILES += $(X86_FILES) +endif # x86 +endif # MESA_ENABLE_ASM + +LOCAL_C_INCLUDES := \ + $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ + $(MESA_TOP)/src/gallium/auxiliary \ + $(MESA_TOP)/src/gallium/include \ + $(MESA_TOP)/src/glsl \ + $(MESA_TOP)/src/mapi + +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libmesa_program + +include $(LOCAL_PATH)/Android.gen.mk +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) + +endif # MESA_BUILD_GALLIUM diff --git a/mesalib/src/mesa/Android.mesa_gen_matypes.mk b/mesalib/src/mesa/Android.mesa_gen_matypes.mk new file mode 100644 index 000000000..6e301f904 --- /dev/null +++ b/mesalib/src/mesa/Android.mesa_gen_matypes.mk @@ -0,0 +1,48 @@ +# Copyright 2012 Intel Corporation +# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> +# Copyright (C) 2010-2011 LunarG Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# --------------------------------------------------------------------- +# host executable: mesa_gen_matypes +# --------------------------------------------------------------------- + +ifeq ($(strip $(MESA_ENABLE_ASM)),true) +ifeq ($(TARGET_ARCH),x86) + +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := mesa_gen_matypes +LOCAL_IS_HOST_MODULE := true + +LOCAL_C_INCLUDES := \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/glsl + +LOCAL_SRC_FILES := \ + x86/gen_matypes.c + +include $(MESA_COMMON_MK) +include $(BUILD_HOST_EXECUTABLE) + +endif # x86 +endif # MESA_ENABLE_ASM diff --git a/mesalib/src/mesa/Android.mk b/mesalib/src/mesa/Android.mk index c32b1c0c1..20f781948 100644 --- a/mesalib/src/mesa/Android.mk +++ b/mesalib/src/mesa/Android.mk @@ -1,7 +1,4 @@ -# Mesa 3-D graphics library -# -# Copyright (C) 2010-2011 Chia-I Wu <olvaffe@gmail.com> -# Copyright (C) 2010-2011 LunarG Inc. +# Copyright 2012 Intel Corporation # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -21,131 +18,11 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -# Android.mk for core mesa - LOCAL_PATH := $(call my-dir) -# Import the following variables: -# MESA_CXX_FILES -# MESA_GALLIUM_CXX_FILES -# MESA_GALLIUM_FILES -# MESA_FILES -# X86_FILES -include $(LOCAL_PATH)/sources.mak - -MESA_ENABLED_APIS := ES1 ES2 - -common_C_INCLUDES := \ - $(MESA_TOP)/src/mapi \ - $(MESA_TOP)/src/glsl - -common_ASM := - -# --------------------------------------- -# Build mesa_gen_matypes for host -# --------------------------------------- - -ifeq ($(strip $(MESA_ENABLE_ASM)),true) -ifeq ($(TARGET_ARCH),x86) -common_ASM += $(X86_FILES) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := x86/gen_matypes.c -LOCAL_CFLAGS := $(common_CFLAGS) -LOCAL_C_INCLUDES := $(common_C_INCLUDES) -LOCAL_MODULE := mesa_gen_matypes -LOCAL_IS_HOST_MODULE := true -include $(MESA_COMMON_MK) -include $(BUILD_HOST_EXECUTABLE) - -endif # x86 -endif # MESA_ENABLE_ASM - -# --------------------------------------- -# Build libmesa_st_mesa -# --------------------------------------- - -ifeq ($(strip $(MESA_BUILD_GALLIUM)),true) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - $(MESA_GALLIUM_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ - $(common_ASM) - -LOCAL_CFLAGS := $(common_CFLAGS) - -LOCAL_C_INCLUDES := \ - $(common_C_INCLUDES) \ - $(MESA_TOP)/src/gallium/include \ - $(MESA_TOP)/src/gallium/auxiliary - -LOCAL_MODULE := libmesa_st_mesa - -include $(LOCAL_PATH)/Android.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) -endif # MESA_BUILD_GALLIUM - -# --------------------------------------- -# Build libmesa_dricore for DRI modules -# --------------------------------------- - -ifeq ($(strip $(MESA_BUILD_CLASSIC)),true) - -include $(CLEAR_VARS) - -LOCAL_MODULE := libmesa_dricore -LOCAL_MODULE_CLASS := STATIC_LIBRARIES - -MESA_ENABLED_APIS += GL -LOCAL_CFLAGS := \ - $(common_CFLAGS) \ - $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) - -LOCAL_C_INCLUDES := \ - $(common_C_INCLUDES) - -LOCAL_SRC_FILES := \ - $(MESA_FILES) \ - $(MESA_CXX_FILES) \ - $(common_ASM) - -include $(LOCAL_PATH)/Android.gen.mk -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -endif # MESA_BUILD_CLASSIC - -# --------------------------------------- -# Build libmesa_glsl_utils -# -# It is used to avoid circular dependency between core mesa and glsl. -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - program/hash_table.c \ - program/symbol_table.c - -LOCAL_MODULE := libmesa_glsl_utils - -include $(MESA_COMMON_MK) -include $(BUILD_STATIC_LIBRARY) - -# --------------------------------------- -# Build libmesa_glsl_utils for host -# --------------------------------------- - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - program/hash_table.c \ - program/symbol_table.c - -LOCAL_MODULE := libmesa_glsl_utils -LOCAL_IS_HOST_MODULE := true +include $(LOCAL_PATH)/Android.mesa_gen_matypes.mk +include $(LOCAL_PATH)/Android.libmesa_glsl_utils.mk +include $(LOCAL_PATH)/Android.libmesa_dricore.mk +include $(LOCAL_PATH)/Android.libmesa_st_mesa.mk -include $(MESA_COMMON_MK) -include $(BUILD_HOST_STATIC_LIBRARY) +include $(LOCAL_PATH)/program/Android.mk diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index 1f897257e..9809ee437 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -23,7 +23,7 @@ if NEED_LIBDRICORE DRICORE_SUBDIR = libdricore endif -SUBDIRS = x86 x86-64 . $(DRICORE_SUBDIR) drivers +SUBDIRS = program x86 x86-64 . $(DRICORE_SUBDIR) drivers gldir = $(includedir)/GL gl_HEADERS = $(top_srcdir)/include/GL/*.h @@ -53,22 +53,11 @@ include $(GLAPI)/glapi_gen.mk BUILT_SOURCES = \ main/git_sha1.h \ - main/get_hash.h \ - program/program_parse.tab.c \ - program/program_parse.tab.h \ - program/lex.yy.c + main/get_hash.h CLEANFILES = \ $(BUILT_SOURCES) \ git_sha1.h.tmp -program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y - $(MKDIR_P) program - $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $< - -program/lex.yy.c: program/program_lexer.l - $(MKDIR_P) program - $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< - GET_HASH_GEN = main/get_hash_generator.py GET_HASH_GEN_FLAGS := $(patsubst -DFEATURE_%=1,-a %, \ $(patsubst -DFEATURE_%=0,,$(API_DEFINES))) @@ -122,18 +111,23 @@ endif libmesa_la_SOURCES = \ $(MESA_FILES) \ - $(MESA_CXX_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) -libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la +libmesa_la_LIBADD = \ + $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/mesa/program/libprogram.la \ + $() libmesa_la_LDFLAGS = libmesagallium_la_SOURCES = \ $(MESA_GALLIUM_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ $(MESA_ASM_FILES_FOR_ARCH) -libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la +libmesagallium_la_LIBADD = \ + $(top_builddir)/src/glsl/libglsl.la \ + $(top_builddir)/src/mesa/program/libprogram.la \ + $() + libmesagallium_la_LDFLAGS = if HAVE_GALLIUM diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript index 4c3355bd9..be1ed5f60 100644 --- a/mesalib/src/mesa/SConscript +++ b/mesalib/src/mesa/SConscript @@ -81,6 +81,7 @@ main_sources = [ 'main/getstring.c', 'main/glformats.c', 'main/hash.c', + 'main/hash_table.c', 'main/hint.c', 'main/histogram.c', 'main/image.c', diff --git a/mesalib/src/mesa/descrip.mms b/mesalib/src/mesa/descrip.mms deleted file mode 100644 index dbfa336a9..000000000 --- a/mesalib/src/mesa/descrip.mms +++ /dev/null @@ -1,27 +0,0 @@ -# Makefile for Mesa for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Date last revision : 7 March 2007 - -all : - set default [.main] - $(MMS)$(MMSQUALIFIERS) - set default [-.glapi] - $(MMS)$(MMSQUALIFIERS) - set default [-.shader] - $(MMS)$(MMSQUALIFIERS) - set default [-.drivers.common] - $(MMS)$(MMSQUALIFIERS) - set default [-.x11] - $(MMS)$(MMSQUALIFIERS) - set default [-.osmesa] - $(MMS)$(MMSQUALIFIERS) - set default [--.math] - $(MMS)$(MMSQUALIFIERS) - set default [-.tnl] - $(MMS)$(MMSQUALIFIERS) - set default [-.swrast] - $(MMS)$(MMSQUALIFIERS) - set default [-.swrast_setup] - $(MMS)$(MMSQUALIFIERS) - set default [-.vbo] - $(MMS)$(MMSQUALIFIERS) diff --git a/mesalib/src/mesa/drivers/common/descrip.mms b/mesalib/src/mesa/drivers/common/descrip.mms deleted file mode 100644 index d5bbc69df..000000000 --- a/mesalib/src/mesa/drivers/common/descrip.mms +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 29 September 2008 - -.first - define gl [----.include.gl] - define math [--.math] - define tnl [--.tnl] - define swrast [--.swrast] - define glapi [--.glapi] - define shader [--.shader] - define main [--.main] - -.include [----]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [----.include],[--.main],[--.glapi],[--.shader] -LIBDIR = [----.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)\ - /float=ieee/ieee=denorm/warn=disable=(PTRMISMATCH) - -SOURCES = driverfuncs.c - -OBJECTS =driverfuncs.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -driverfuncs.obj : driverfuncs.c diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c index 1f2a8a696..417dbd041 100644 --- a/mesalib/src/mesa/drivers/common/meta.c +++ b/mesalib/src/mesa/drivers/common/meta.c @@ -356,8 +356,8 @@ compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB GLchar *info; shader = _mesa_CreateShaderObjectARB(target); - _mesa_ShaderSourceARB(shader, 1, &source, NULL); - _mesa_CompileShaderARB(shader); + _mesa_ShaderSource(shader, 1, &source, NULL); + _mesa_CompileShader(shader); _mesa_GetShaderiv(shader, GL_COMPILE_STATUS, &ok); if (ok) @@ -393,7 +393,7 @@ link_program_with_debug(struct gl_context *ctx, GLuint program) GLint ok, size; GLchar *info; - _mesa_LinkProgramARB(program); + _mesa_LinkProgram(program); _mesa_GetProgramiv(program, GL_LINK_STATUS, &ok); if (ok) @@ -604,7 +604,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) _mesa_reference_shader_program(ctx, &save->ActiveShader, ctx->Shader.ActiveProgram); - _mesa_UseProgramObjectARB(0); + _mesa_UseProgram(0); } } @@ -629,7 +629,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled; if (ctx->Texture.Unit[u].Enabled || ctx->Texture.Unit[u].TexGenEnabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + u); + _mesa_ActiveTexture(GL_TEXTURE0 + u); _mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE); if (ctx->Extensions.ARB_texture_cube_map) _mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE); @@ -659,8 +659,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) } /* set defaults for unit[0] */ - _mesa_ActiveTextureARB(GL_TEXTURE0); - _mesa_ClientActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); + _mesa_ClientActiveTexture(GL_TEXTURE0); if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) { _mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); } @@ -676,10 +676,10 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) 16 * sizeof(GLfloat)); save->MatrixMode = ctx->Transform.MatrixMode; /* set 1:1 vertex:pixel coordinate transform */ - _mesa_ActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); _mesa_MatrixMode(GL_TEXTURE); _mesa_LoadIdentity(); - _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture); + _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture); _mesa_MatrixMode(GL_MODELVIEW); _mesa_LoadIdentity(); _mesa_MatrixMode(GL_PROJECTION); @@ -737,7 +737,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) * regardless of the internal implementation of the metaops. */ if (ctx->Color.ClampFragmentColor != GL_TRUE) - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } if (state & MESA_META_CLAMP_VERTEX_COLOR) { @@ -746,7 +746,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state) /* Generally in here we never want vertex color clamping -- * result clamping is only dependent on fragment clamping. */ - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, GL_FALSE); } if (state & MESA_META_CONDITIONAL_RENDER) { @@ -832,7 +832,7 @@ _mesa_meta_end(struct gl_context *ctx) save->ColorMask[i][2], save->ColorMask[i][3]); } else { - _mesa_ColorMaskIndexed(i, + _mesa_ColorMaski(i, save->ColorMask[i][0], save->ColorMask[i][1], save->ColorMask[i][2], @@ -1001,16 +1001,16 @@ _mesa_meta_end(struct gl_context *ctx) } /* restore current unit state */ - _mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit); - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit); + _mesa_ActiveTexture(GL_TEXTURE0 + save->ActiveUnit); + _mesa_ClientActiveTexture(GL_TEXTURE0 + save->ClientActiveUnit); } if (state & MESA_META_TRANSFORM) { GLuint activeTexture = ctx->Texture.CurrentUnit; - _mesa_ActiveTextureARB(GL_TEXTURE0); + _mesa_ActiveTexture(GL_TEXTURE0); _mesa_MatrixMode(GL_TEXTURE); _mesa_LoadMatrixf(save->TextureMatrix); - _mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture); + _mesa_ActiveTexture(GL_TEXTURE0 + activeTexture); _mesa_MatrixMode(GL_MODELVIEW); _mesa_LoadMatrixf(save->ModelviewMatrix); @@ -1034,7 +1034,7 @@ _mesa_meta_end(struct gl_context *ctx) if (state & MESA_META_VERTEX) { /* restore vertex buffer object */ - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name); _mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL); /* restore vertex array object */ @@ -1054,11 +1054,11 @@ _mesa_meta_end(struct gl_context *ctx) } if (state & MESA_META_CLAMP_FRAGMENT_COLOR) { - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor); } if (state & MESA_META_CLAMP_VERTEX_COLOR) { - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor); } if (state & MESA_META_CONDITIONAL_RENDER) { @@ -1326,12 +1326,12 @@ setup_drawpix_texture(struct gl_context *ctx, _mesa_reference_buffer_object(ctx, &save_unpack_obj, ctx->Unpack.BufferObj); - _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0); + _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0); /* create empty texture */ _mesa_TexImage2D(tex->Target, 0, tex->IntFormat, tex->Width, tex->Height, 0, format, type, NULL); if (save_unpack_obj != NULL) - _mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, + _mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, save_unpack_obj->Name); /* load image */ _mesa_TexSubImage2D(tex->Target, 0, @@ -1372,8 +1372,8 @@ init_blit_depth_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &blit->DepthFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); + _mesa_GenProgramsARB(1, &blit->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -1498,7 +1498,7 @@ blitframebuffer_texture(struct gl_context *ctx, verts[3].s = s0; verts[3].t = t1; - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); @@ -1583,9 +1583,9 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, _mesa_BindVertexArray(blit->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &blit->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &blit->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -1596,7 +1596,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, } else { _mesa_BindVertexArray(blit->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO); } /* Try faster, direct texture approach first */ @@ -1634,7 +1634,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, verts[3].t = tex->Ttop; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_set_enable(ctx, tex->Target, GL_TRUE); @@ -1661,7 +1661,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx, setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); _mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); _mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE); @@ -1693,13 +1693,13 @@ static void meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit) { if (blit->ArrayObj) { - _mesa_DeleteVertexArraysAPPLE(1, &blit->ArrayObj); + _mesa_DeleteVertexArrays(1, &blit->ArrayObj); blit->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &blit->VBO); + _mesa_DeleteBuffers(1, &blit->VBO); blit->VBO = 0; } if (blit->DepthFP) { - _mesa_DeletePrograms(1, &blit->DepthFP); + _mesa_DeleteProgramsARB(1, &blit->DepthFP); blit->DepthFP = 0; } } @@ -1739,8 +1739,8 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) _mesa_BindVertexArray(clear->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &clear->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_GenBuffers(1, &clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* setup vertex arrays */ _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); @@ -1750,7 +1750,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) } else { _mesa_BindVertexArray(clear->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); } /* GL_COLOR_BUFFER_BIT */ @@ -1758,7 +1758,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) /* leave colormask, glDrawBuffer state as-is */ /* Clears never have the color clamped. */ - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } else { ASSERT(metaSave & MESA_META_COLOR_MASK); @@ -1819,7 +1819,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers) } /* upload new vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); } @@ -1870,30 +1870,30 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) _mesa_BindVertexArray(clear->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &clear->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_GenBuffers(1, &clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* setup vertex arrays */ - _mesa_VertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0); - _mesa_EnableVertexAttribArrayARB(0); + _mesa_VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0); + _mesa_EnableVertexAttribArray(0); vs = _mesa_CreateShaderObjectARB(GL_VERTEX_SHADER); - _mesa_ShaderSourceARB(vs, 1, &vs_source, NULL); - _mesa_CompileShaderARB(vs); + _mesa_ShaderSource(vs, 1, &vs_source, NULL); + _mesa_CompileShader(vs); fs = _mesa_CreateShaderObjectARB(GL_FRAGMENT_SHADER); - _mesa_ShaderSourceARB(fs, 1, &fs_source, NULL); - _mesa_CompileShaderARB(fs); + _mesa_ShaderSource(fs, 1, &fs_source, NULL); + _mesa_CompileShader(fs); clear->ShaderProg = _mesa_CreateProgramObjectARB(); _mesa_AttachShader(clear->ShaderProg, fs); _mesa_DeleteObjectARB(fs); _mesa_AttachShader(clear->ShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position"); - _mesa_LinkProgramARB(clear->ShaderProg); + _mesa_BindAttribLocation(clear->ShaderProg, 0, "position"); + _mesa_LinkProgram(clear->ShaderProg); - clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg, + clear->ColorLocation = _mesa_GetUniformLocation(clear->ShaderProg, "color"); if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) { @@ -1905,7 +1905,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) _mesa_DeleteObjectARB(fs); _mesa_AttachShader(clear->IntegerShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(clear->IntegerShaderProg, 0, "position"); + _mesa_BindAttribLocation(clear->IntegerShaderProg, 0, "position"); /* Note that user-defined out attributes get automatically assigned * locations starting from 0, so we don't need to explicitly @@ -1915,7 +1915,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear) link_program_with_debug(ctx, clear->IntegerShaderProg); clear->IntegerColorLocation = - _mesa_GetUniformLocationARB(clear->IntegerShaderProg, "color"); + _mesa_GetUniformLocation(clear->IntegerShaderProg, "color"); } } @@ -1924,9 +1924,9 @@ meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear) { if (clear->ArrayObj == 0) return; - _mesa_DeleteVertexArraysAPPLE(1, &clear->ArrayObj); + _mesa_DeleteVertexArrays(1, &clear->ArrayObj); clear->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &clear->VBO); + _mesa_DeleteBuffers(1, &clear->VBO); clear->VBO = 0; _mesa_DeleteObjectARB(clear->ShaderProg); clear->ShaderProg = 0; @@ -1980,24 +1980,24 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers) meta_glsl_clear_init(ctx, clear); if (fb->_IntegerColor) { - _mesa_UseProgramObjectARB(clear->IntegerShaderProg); - _mesa_Uniform4ivARB(clear->IntegerColorLocation, 1, + _mesa_UseProgram(clear->IntegerShaderProg); + _mesa_Uniform4iv(clear->IntegerColorLocation, 1, ctx->Color.ClearColor.i); } else { - _mesa_UseProgramObjectARB(clear->ShaderProg); - _mesa_Uniform4fvARB(clear->ColorLocation, 1, + _mesa_UseProgram(clear->ShaderProg); + _mesa_Uniform4fv(clear->ColorLocation, 1, ctx->Color.ClearColor.f); } _mesa_BindVertexArray(clear->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO); /* GL_COLOR_BUFFER_BIT */ if (buffers & BUFFER_BITS_COLOR) { /* leave colormask, glDrawBuffer state as-is */ /* Clears never have the color clamped. */ - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE); } else { ASSERT(metaSave & MESA_META_COLOR_MASK); @@ -2042,7 +2042,7 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers) verts[3].z = z; /* upload new vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* draw quad */ @@ -2098,9 +2098,9 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, _mesa_BindVertexArray(copypix->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, ©pix->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, ©pix->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2111,7 +2111,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, } else { _mesa_BindVertexArray(copypix->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO); } newTex = alloc_texture(tex, width, height, intFormat); @@ -2146,7 +2146,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, verts[3].t = tex->Ttop; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } /* Alloc/setup texture */ @@ -2260,8 +2260,8 @@ init_draw_stencil_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &drawpix->StencilFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); + _mesa_GenProgramsARB(1, &drawpix->StencilFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -2294,8 +2294,8 @@ init_draw_depth_pixels(struct gl_context *ctx) texTarget = "2D"; _mesa_snprintf(program2, sizeof(program2), program, texTarget); - _mesa_GenPrograms(1, &drawpix->DepthFP); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); + _mesa_GenProgramsARB(1, &drawpix->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); _mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, strlen(program2), (const GLubyte *) program2); } @@ -2452,9 +2452,9 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, _mesa_BindVertexArray(drawpix->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &vbo); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &vbo); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, vbo); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2490,7 +2490,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, /* set stencil bits to 1 where needed */ _mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) { @@ -2511,7 +2511,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, if (!drawpix->DepthFP) init_draw_depth_pixels(ctx); - _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); + _mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP); _mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE); /* polygon color = current raster color */ @@ -2532,7 +2532,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx, _mesa_set_enable(ctx, tex->Target, GL_FALSE); - _mesa_DeleteBuffersARB(1, &vbo); + _mesa_DeleteBuffers(1, &vbo); /* restore unpack params */ ctx->Unpack = unpackSave; @@ -2629,9 +2629,9 @@ _mesa_meta_Bitmap(struct gl_context *ctx, _mesa_BindVertexArrayAPPLE(bitmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &bitmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &bitmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -2644,7 +2644,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, } else { _mesa_BindVertexArray(bitmap->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO); } newTex = alloc_texture(tex, width, height, texIntFormat); @@ -2687,7 +2687,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, } /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } /* choose different foreground/background alpha values */ @@ -2770,11 +2770,11 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, * Test that we can actually render in the texture's format. */ if (!mipmap->FBO) - _mesa_GenFramebuffersEXT(1, &mipmap->FBO); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO); + _mesa_GenFramebuffers(1, &mipmap->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO); if (target == GL_TEXTURE_1D) { - _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel); } @@ -2782,21 +2782,21 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target, /* other work is needed to enable 3D mipmap generation */ else if (target == GL_TEXTURE_3D) { GLint zoffset = 0; - _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel, zoffset); } #endif else { /* 2D / cube */ - _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, srcLevel); } - status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { return GL_TRUE; @@ -2975,8 +2975,8 @@ setup_ff_generate_mipmap(struct gl_context *ctx, _mesa_BindVertexArrayAPPLE(mipmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &mipmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_GenBuffers(1, &mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); /* setup vertex arrays */ _mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); _mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(tex)); @@ -3058,13 +3058,13 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, _mesa_BindVertexArray(mipmap->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &mipmap->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_GenBuffers(1, &mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); /* setup vertex arrays */ - _mesa_VertexAttribPointerARB(0, 2, GL_FLOAT, GL_FALSE, + _mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(struct vertex), OFFSET(x)); - _mesa_VertexAttribPointerARB(1, 3, GL_FLOAT, GL_FALSE, + _mesa_VertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, sizeof(struct vertex), OFFSET(tex)); } @@ -3133,10 +3133,10 @@ setup_glsl_generate_mipmap(struct gl_context *ctx, _mesa_DeleteObjectARB(fs); _mesa_AttachShader(mipmap->ShaderProg, vs); _mesa_DeleteObjectARB(vs); - _mesa_BindAttribLocationARB(mipmap->ShaderProg, 0, "position"); - _mesa_BindAttribLocationARB(mipmap->ShaderProg, 1, "texcoords"); - _mesa_EnableVertexAttribArrayARB(0); - _mesa_EnableVertexAttribArrayARB(1); + _mesa_BindAttribLocation(mipmap->ShaderProg, 0, "position"); + _mesa_BindAttribLocation(mipmap->ShaderProg, 1, "texcoords"); + _mesa_EnableVertexAttribArray(0); + _mesa_EnableVertexAttribArray(1); link_program_with_debug(ctx, mipmap->ShaderProg); sampler->shader_prog = mipmap->ShaderProg; ralloc_free(mem_ctx); @@ -3149,9 +3149,9 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx, { if (mipmap->ArrayObj == 0) return; - _mesa_DeleteVertexArraysAPPLE(1, &mipmap->ArrayObj); + _mesa_DeleteVertexArrays(1, &mipmap->ArrayObj); mipmap->ArrayObj = 0; - _mesa_DeleteBuffersARB(1, &mipmap->VBO); + _mesa_DeleteBuffers(1, &mipmap->VBO); mipmap->VBO = 0; _mesa_DeleteObjectARB(mipmap->sampler_1d.shader_prog); @@ -3219,7 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, */ if (use_glsl_version) { setup_glsl_generate_mipmap(ctx, mipmap, target); - _mesa_UseProgramObjectARB(mipmap->ShaderProg); + _mesa_UseProgram(mipmap->ShaderProg); } else { setup_ff_generate_mipmap(ctx, mipmap); @@ -3227,7 +3227,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } _mesa_BindVertexArray(mipmap->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO); samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ? ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0; @@ -3236,7 +3236,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_BindTexture(target, texObj->Name); if (!mipmap->FBO) { - _mesa_GenFramebuffersEXT(1, &mipmap->FBO); + _mesa_GenFramebuffers(1, &mipmap->FBO); } if (!mipmap->Sampler) { @@ -3264,7 +3264,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler); } - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO); if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE); @@ -3291,7 +3291,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, verts[3].y = 1.0F; /* upload vertex data */ - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts, GL_DYNAMIC_DRAW_ARB); /* texture is already locked, unlock now */ @@ -3345,7 +3345,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, /* Set to draw into the current dstLevel */ if (target == GL_TEXTURE_1D) { - _mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, @@ -3353,7 +3353,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } else if (target == GL_TEXTURE_3D) { GLint zoffset = 0; /* XXX unfinished */ - _mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, target, texObj->Name, @@ -3361,7 +3361,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, } else { /* 2D / cube */ - _mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, + _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, faceTarget, texObj->Name, @@ -3371,7 +3371,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT); /* sanity check */ - status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); + status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT); if (status != GL_FRAMEBUFFER_COMPLETE_EXT) { _mesa_problem(ctx, "Unexpected incomplete framebuffer in " "_mesa_meta_GenerateMipmap()"); @@ -3397,7 +3397,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, if (genMipmapSave) _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave); } @@ -3574,23 +3574,23 @@ decompress_texture_image(struct gl_context *ctx, /* Create/bind FBO/renderbuffer */ if (decompress->FBO == 0) { - _mesa_GenFramebuffersEXT(1, &decompress->FBO); - _mesa_GenRenderbuffersEXT(1, &decompress->RBO); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO); - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO); - _mesa_FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, + _mesa_GenFramebuffers(1, &decompress->FBO); + _mesa_GenRenderbuffers(1, &decompress->RBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO); + _mesa_FramebufferRenderbuffer(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, decompress->RBO); } else { - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO); } /* alloc dest surface */ if (width > decompress->Width || height > decompress->Height) { - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO); - _mesa_RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO); + _mesa_RenderbufferStorage(GL_RENDERBUFFER_EXT, GL_RGBA, width, height); decompress->Width = width; decompress->Height = height; @@ -3603,9 +3603,9 @@ decompress_texture_image(struct gl_context *ctx, _mesa_BindVertexArray(decompress->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &decompress->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &decompress->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* setup vertex arrays */ @@ -3616,7 +3616,7 @@ decompress_texture_image(struct gl_context *ctx, } else { _mesa_BindVertexArray(decompress->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO); } if (!decompress->Sampler) { @@ -3652,7 +3652,7 @@ decompress_texture_image(struct gl_context *ctx, verts[3].y = height; /* upload new vertex data */ - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); /* setup texture state */ _mesa_BindTexture(target, texObj->Name); @@ -3713,13 +3713,13 @@ decompress_texture_image(struct gl_context *ctx, /* restore fbo bindings */ if (fboDrawSave == fboReadSave) { - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboDrawSave); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboDrawSave); } else { - _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave); - _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fboReadSave); + _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave); + _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, fboReadSave); } - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, rbSave); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, rbSave); } @@ -3784,9 +3784,9 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_BindVertexArray(drawtex->ArrayObj); /* create vertex array buffer */ - _mesa_GenBuffersARB(1, &drawtex->VBO); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO); - _mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), + _mesa_GenBuffers(1, &drawtex->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), NULL, GL_DYNAMIC_DRAW_ARB); /* client active texture is not part of the array object */ @@ -3796,17 +3796,17 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); _mesa_EnableClientState(GL_VERTEX_ARRAY); for (i = 0; i < ctx->Const.MaxTextureUnits; i++) { - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ClientActiveTexture(GL_TEXTURE0 + i); _mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(st[i])); _mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY); } /* restore client active texture */ - _mesa_ClientActiveTextureARB(GL_TEXTURE0 + active_texture); + _mesa_ClientActiveTexture(GL_TEXTURE0 + active_texture); } else { _mesa_BindVertexArray(drawtex->ArrayObj); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); } /* vertex positions, texcoords */ @@ -3871,7 +3871,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, verts[3].st[i][1] = t1; } - _mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); + _mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/mesalib/src/mesa/drivers/dri/common/utils.c b/mesalib/src/mesa/drivers/dri/common/utils.c index 3e99f3d1e..062712bf3 100644 --- a/mesalib/src/mesa/drivers/dri/common/utils.c +++ b/mesalib/src/mesa/drivers/dri/common/utils.c @@ -149,13 +149,7 @@ driGetRendererString( char * buffer, const char * hardware_name, * If the function fails and returns \c GL_FALSE, this * value will be unmodified, but some elements in the * linked list may be modified. - * \param fb_format Format of the framebuffer. Currently only \c GL_RGB, - * \c GL_RGBA, \c GL_BGR, and \c GL_BGRA are supported. - * \param fb_type Type of the pixels in the framebuffer. Currently only - * \c GL_UNSIGNED_SHORT_5_6_5, - * \c GL_UNSIGNED_SHORT_5_6_5_REV, - * \c GL_UNSIGNED_INT_8_8_8_8, and - * \c GL_UNSIGNED_INT_8_8_8_8_REV are supported. + * \param format Mesa gl_format enum describing the pixel format * \param depth_bits Array of depth buffer sizes to be exposed. * \param stencil_bits Array of stencil buffer sizes to be exposed. * \param num_depth_stencil_bits Number of entries in both \c depth_bits and @@ -174,16 +168,10 @@ driGetRendererString( char * buffer, const char * hardware_name, * \c GLX_DIRECT_COLOR. * * \returns - * \c GL_TRUE on success or \c GL_FALSE on failure. Currently the only - * cause of failure is a bad parameter (i.e., unsupported \c fb_format or - * \c fb_type). - * - * \todo - * There is currently no way to support packed RGB modes (i.e., modes with - * exactly 3 bytes per pixel) or floating-point modes. This could probably - * be done by creating some new, private enums with clever names likes - * \c GL_UNSIGNED_3BYTE_8_8_8, \c GL_4FLOAT_32_32_32_32, - * \c GL_4HALF_16_16_16_16, etc. We can cross that bridge when we come to it. + * Pointer to any array of pointers to the \c __DRIconfig structures created + * for the specified formats. If there is an error, \c NULL is returned. + * Currently the only cause of failure is a bad parameter (i.e., unsupported + * \c format). */ __DRIconfig ** driCreateConfigs(gl_format format, diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index e639049df..45ef3c246 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -192,18 +192,16 @@ swrastFillInModes(__DRIscreen *psp, static const __DRIconfig ** dri_init_screen(__DRIscreen * psp) { - __DRIconfig **configs8, **configs16, **configs24, **configs32; + __DRIconfig **configs16, **configs24, **configs32; TRACE; psp->extensions = dri_screen_extensions; - configs8 = swrastFillInModes(psp, 8, 8, 0, 1); configs16 = swrastFillInModes(psp, 16, 16, 0, 1); configs24 = swrastFillInModes(psp, 24, 24, 8, 1); configs32 = swrastFillInModes(psp, 32, 24, 8, 1); - configs16 = driConcatConfigs(configs8, configs16); configs24 = driConcatConfigs(configs16, configs24); configs32 = driConcatConfigs(configs24, configs32); diff --git a/mesalib/src/mesa/main/api_arrayelt.c b/mesalib/src/mesa/main/api_arrayelt.c index 20b8ff4d1..0fa242997 100644 --- a/mesalib/src/mesa/main/api_arrayelt.c +++ b/mesalib/src/mesa/main/api_arrayelt.c @@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v) static void GLAPIENTRY VertexAttrib1dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib1dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib2dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib2dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib3dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib3dv(GET_DISPATCH(), (index, v)); } static void GLAPIENTRY VertexAttrib4dvARB(GLuint index, const GLdouble *v) { - CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v)); + CALL_VertexAttrib4dv(GET_DISPATCH(), (index, v)); } @@ -1114,7 +1114,7 @@ VertexAttribI3bv(GLuint index, const GLbyte *v) static void GLAPIENTRY VertexAttribI4bv(GLuint index, const GLbyte *v) { - CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4bv(GET_DISPATCH(), (index, v)); } @@ -1139,7 +1139,7 @@ VertexAttribI3ubv(GLuint index, const GLubyte *v) static void GLAPIENTRY VertexAttribI4ubv(GLuint index, const GLubyte *v) { - CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4ubv(GET_DISPATCH(), (index, v)); } @@ -1165,7 +1165,7 @@ VertexAttribI3sv(GLuint index, const GLshort *v) static void GLAPIENTRY VertexAttribI4sv(GLuint index, const GLshort *v) { - CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4sv(GET_DISPATCH(), (index, v)); } @@ -1190,7 +1190,7 @@ VertexAttribI3usv(GLuint index, const GLushort *v) static void GLAPIENTRY VertexAttribI4usv(GLuint index, const GLushort *v) { - CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v)); + CALL_VertexAttribI4usv(GET_DISPATCH(), (index, v)); } @@ -1405,14 +1405,14 @@ GLboolean _ae_create_context( struct gl_context *ctx ) return GL_TRUE; /* These _gloffset_* values may not be compile-time constants */ - SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT; - SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT; - SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT; - SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT; - SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT; - SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT; + SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bv; + SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubv; + SecondaryColorFuncs[2] = _gloffset_SecondaryColor3sv; + SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usv; + SecondaryColorFuncs[4] = _gloffset_SecondaryColor3iv; + SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uiv; SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT; - SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT; + SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dv; FogCoordFuncs[0] = -1; FogCoordFuncs[1] = -1; @@ -1421,7 +1421,7 @@ GLboolean _ae_create_context( struct gl_context *ctx ) FogCoordFuncs[4] = -1; FogCoordFuncs[5] = -1; FogCoordFuncs[6] = _gloffset_FogCoordfvEXT; - FogCoordFuncs[7] = _gloffset_FogCoorddvEXT; + FogCoordFuncs[7] = _gloffset_FogCoorddv; ctx->aelt_context = calloc(1, sizeof(AEcontext)); if (!ctx->aelt_context) diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c index 331553086..6b66319a9 100644 --- a/mesalib/src/mesa/main/api_loopback.c +++ b/mesalib/src/mesa/main/api_loopback.c @@ -88,7 +88,7 @@ void GLAPIENTRY -loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) +_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue ) { COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -97,41 +97,41 @@ loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ) } void GLAPIENTRY -loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ) +_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, 1.0 ); } void GLAPIENTRY -loopback_Color3i_f( GLint red, GLint green, GLint blue ) +_mesa_Color3i( GLint red, GLint green, GLint blue ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), 1.0); } void GLAPIENTRY -loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ) +_mesa_Color3s( GLshort red, GLshort green, GLshort blue ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), SHORT_TO_FLOAT(blue), 1.0); } void GLAPIENTRY -loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ) +_mesa_Color3ui( GLuint red, GLuint green, GLuint blue ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), 1.0 ); } void GLAPIENTRY -loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ) +_mesa_Color3us( GLushort red, GLushort green, GLushort blue ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), 1.0 ); } void GLAPIENTRY -loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) +_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), UBYTE_TO_FLOAT(blue), 1.0 ); @@ -139,48 +139,48 @@ loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ) void GLAPIENTRY -loopback_Color3bv_f( const GLbyte *v ) +_mesa_Color3bv( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3dv_f( const GLdouble *v ) +_mesa_Color3dv( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0 ); } void GLAPIENTRY -loopback_Color3iv_f( const GLint *v ) +_mesa_Color3iv( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3sv_f( const GLshort *v ) +_mesa_Color3sv( const GLshort *v ) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3uiv_f( const GLuint *v ) +_mesa_Color3uiv( const GLuint *v ) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3usv_f( const GLushort *v ) +_mesa_Color3usv( const GLushort *v ) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), 1.0 ); } void GLAPIENTRY -loopback_Color3ubv_f( const GLubyte *v ) +_mesa_Color3ubv( const GLubyte *v ) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), 1.0 ); @@ -188,7 +188,7 @@ loopback_Color3ubv_f( const GLubyte *v ) void GLAPIENTRY -loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, +_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ) { COLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -196,21 +196,21 @@ loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, } void GLAPIENTRY -loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, +_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ) { COLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue, (GLfloat) alpha ); } void GLAPIENTRY -loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ) +_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha ) { COLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), INT_TO_FLOAT(blue), INT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, +_mesa_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ) { COLORF( SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), @@ -218,21 +218,21 @@ loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, } void GLAPIENTRY -loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ) +_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ) { COLORF( UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), UINT_TO_FLOAT(blue), UINT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, GLushort alpha ) +_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ) { COLORF( USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), USHORT_TO_FLOAT(blue), USHORT_TO_FLOAT(alpha) ); } void GLAPIENTRY -loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) +_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) { COLORF( UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), UBYTE_TO_FLOAT(blue), UBYTE_TO_FLOAT(alpha) ); @@ -240,7 +240,7 @@ loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ) void GLAPIENTRY -loopback_Color4iv_f( const GLint *v ) +_mesa_Color4iv( const GLint *v ) { COLORF( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3]) ); @@ -248,21 +248,21 @@ loopback_Color4iv_f( const GLint *v ) void GLAPIENTRY -loopback_Color4bv_f( const GLbyte *v ) +_mesa_Color4bv( const GLbyte *v ) { COLORF( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4dv_f( const GLdouble *v ) +_mesa_Color4dv( const GLdouble *v ) { COLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Color4sv_f( const GLshort *v) +_mesa_Color4sv( const GLshort *v) { COLORF( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3]) ); @@ -270,21 +270,21 @@ loopback_Color4sv_f( const GLshort *v) void GLAPIENTRY -loopback_Color4uiv_f( const GLuint *v) +_mesa_Color4uiv( const GLuint *v) { COLORF( UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4usv_f( const GLushort *v) +_mesa_Color4usv( const GLushort *v) { COLORF( USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3]) ); } void GLAPIENTRY -loopback_Color4ubv_f( const GLubyte *v) +_mesa_Color4ubv( const GLubyte *v) { COLORF( UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3]) ); @@ -292,565 +292,565 @@ loopback_Color4ubv_f( const GLubyte *v) void GLAPIENTRY -loopback_FogCoorddEXT( GLdouble d ) +_mesa_FogCoordd( GLdouble d ) { FOGCOORDF( (GLfloat) d ); } void GLAPIENTRY -loopback_FogCoorddvEXT( const GLdouble *v ) +_mesa_FogCoorddv( const GLdouble *v ) { FOGCOORDF( (GLfloat) *v ); } void GLAPIENTRY -loopback_Indexd( GLdouble c ) +_mesa_Indexd( GLdouble c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexi( GLint c ) +_mesa_Indexi( GLint c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexs( GLshort c ) +_mesa_Indexs( GLshort c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexub( GLubyte c ) +_mesa_Indexub( GLubyte c ) { INDEX( (GLfloat) c ); } void GLAPIENTRY -loopback_Indexdv( const GLdouble *c ) +_mesa_Indexdv( const GLdouble *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexiv( const GLint *c ) +_mesa_Indexiv( const GLint *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexsv( const GLshort *c ) +_mesa_Indexsv( const GLshort *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_Indexubv( const GLubyte *c ) +_mesa_Indexubv( const GLubyte *c ) { INDEX( (GLfloat) *c ); } void GLAPIENTRY -loopback_EdgeFlagv(const GLboolean *flag) +_mesa_EdgeFlagv(const GLboolean *flag) { CALL_EdgeFlag(GET_DISPATCH(), (*flag)); } void GLAPIENTRY -loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) +_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ) { NORMAL( BYTE_TO_FLOAT(nx), BYTE_TO_FLOAT(ny), BYTE_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) +_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ) { NORMAL((GLfloat) nx, (GLfloat) ny, (GLfloat) nz); } void GLAPIENTRY -loopback_Normal3i( GLint nx, GLint ny, GLint nz ) +_mesa_Normal3i( GLint nx, GLint ny, GLint nz ) { NORMAL( INT_TO_FLOAT(nx), INT_TO_FLOAT(ny), INT_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ) +_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz ) { NORMAL( SHORT_TO_FLOAT(nx), SHORT_TO_FLOAT(ny), SHORT_TO_FLOAT(nz) ); } void GLAPIENTRY -loopback_Normal3bv( const GLbyte *v ) +_mesa_Normal3bv( const GLbyte *v ) { NORMAL( BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_Normal3dv( const GLdouble *v ) +_mesa_Normal3dv( const GLdouble *v ) { NORMAL( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Normal3iv( const GLint *v ) +_mesa_Normal3iv( const GLint *v ) { NORMAL( INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_Normal3sv( const GLshort *v ) +_mesa_Normal3sv( const GLshort *v ) { NORMAL( SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]) ); } void GLAPIENTRY -loopback_TexCoord1d( GLdouble s ) +_mesa_TexCoord1d( GLdouble s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord1i( GLint s ) +_mesa_TexCoord1i( GLint s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord1s( GLshort s ) +_mesa_TexCoord1s( GLshort s ) { TEXCOORD1((GLfloat) s); } void GLAPIENTRY -loopback_TexCoord2d( GLdouble s, GLdouble t ) +_mesa_TexCoord2d( GLdouble s, GLdouble t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord2s( GLshort s, GLshort t ) +_mesa_TexCoord2s( GLshort s, GLshort t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord2i( GLint s, GLint t ) +_mesa_TexCoord2i( GLint s, GLint t ) { TEXCOORD2((GLfloat) s,(GLfloat) t); } void GLAPIENTRY -loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) +_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord3i( GLint s, GLint t, GLint r ) +_mesa_TexCoord3i( GLint s, GLint t, GLint r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ) +_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r ) { TEXCOORD3((GLfloat) s,(GLfloat) t,(GLfloat) r); } void GLAPIENTRY -loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) +_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) +_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) +_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ) { TEXCOORD4((GLfloat) s,(GLfloat) t,(GLfloat) r,(GLfloat) q); } void GLAPIENTRY -loopback_TexCoord1dv( const GLdouble *v ) +_mesa_TexCoord1dv( const GLdouble *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord1iv( const GLint *v ) +_mesa_TexCoord1iv( const GLint *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord1sv( const GLshort *v ) +_mesa_TexCoord1sv( const GLshort *v ) { TEXCOORD1((GLfloat) v[0]); } void GLAPIENTRY -loopback_TexCoord2dv( const GLdouble *v ) +_mesa_TexCoord2dv( const GLdouble *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord2iv( const GLint *v ) +_mesa_TexCoord2iv( const GLint *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord2sv( const GLshort *v ) +_mesa_TexCoord2sv( const GLshort *v ) { TEXCOORD2((GLfloat) v[0],(GLfloat) v[1]); } void GLAPIENTRY -loopback_TexCoord3dv( const GLdouble *v ) +_mesa_TexCoord3dv( const GLdouble *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord3iv( const GLint *v ) +_mesa_TexCoord3iv( const GLint *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord3sv( const GLshort *v ) +_mesa_TexCoord3sv( const GLshort *v ) { TEXCOORD3((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2]); } void GLAPIENTRY -loopback_TexCoord4dv( const GLdouble *v ) +_mesa_TexCoord4dv( const GLdouble *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_TexCoord4iv( const GLint *v ) +_mesa_TexCoord4iv( const GLint *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_TexCoord4sv( const GLshort *v ) +_mesa_TexCoord4sv( const GLshort *v ) { TEXCOORD4((GLfloat) v[0],(GLfloat) v[1],(GLfloat) v[2],(GLfloat) v[3]); } void GLAPIENTRY -loopback_Vertex2d( GLdouble x, GLdouble y ) +_mesa_Vertex2d( GLdouble x, GLdouble y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex2i( GLint x, GLint y ) +_mesa_Vertex2i( GLint x, GLint y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex2s( GLshort x, GLshort y ) +_mesa_Vertex2s( GLshort x, GLshort y ) { VERTEX2( (GLfloat) x, (GLfloat) y ); } void GLAPIENTRY -loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) +_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex3i( GLint x, GLint y, GLint z ) +_mesa_Vertex3i( GLint x, GLint y, GLint z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex3s( GLshort x, GLshort y, GLshort z ) +_mesa_Vertex3s( GLshort x, GLshort y, GLshort z ) { VERTEX3( (GLfloat) x, (GLfloat) y, (GLfloat) z ); } void GLAPIENTRY -loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) +_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ) +_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) +_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ) { VERTEX4( (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w ); } void GLAPIENTRY -loopback_Vertex2dv( const GLdouble *v ) +_mesa_Vertex2dv( const GLdouble *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex2iv( const GLint *v ) +_mesa_Vertex2iv( const GLint *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex2sv( const GLshort *v ) +_mesa_Vertex2sv( const GLshort *v ) { VERTEX2( (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_Vertex3dv( const GLdouble *v ) +_mesa_Vertex3dv( const GLdouble *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex3iv( const GLint *v ) +_mesa_Vertex3iv( const GLint *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex3sv( const GLshort *v ) +_mesa_Vertex3sv( const GLshort *v ) { VERTEX3( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_Vertex4dv( const GLdouble *v ) +_mesa_Vertex4dv( const GLdouble *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Vertex4iv( const GLint *v ) +_mesa_Vertex4iv( const GLint *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_Vertex4sv( const GLshort *v ) +_mesa_Vertex4sv( const GLshort *v ) { VERTEX4( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord1dARB(GLenum target, GLdouble s) +_mesa_MultiTexCoord1d(GLenum target, GLdouble s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord1iARB(GLenum target, GLint s) +_mesa_MultiTexCoord1i(GLenum target, GLint s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord1iv(GLenum target, const GLint *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord1sARB(GLenum target, GLshort s) +_mesa_MultiTexCoord1s(GLenum target, GLshort s) { MULTI_TEXCOORD1( target, (GLfloat) s ); } void GLAPIENTRY -loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD1( target, (GLfloat) v[0] ); } void GLAPIENTRY -loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t) +_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t) +_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord2iv(GLenum target, const GLint *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t) +_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t) { MULTI_TEXCOORD2( target, (GLfloat) s, (GLfloat) t ); } void GLAPIENTRY -loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD2( target, (GLfloat) v[0], (GLfloat) v[1] ); } void GLAPIENTRY -loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r) +_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r) +_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord3iv(GLenum target, const GLint *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r) +_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r) { MULTI_TEXCOORD3( target, (GLfloat) s, (GLfloat) t, (GLfloat) r ); } void GLAPIENTRY -loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD3( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) +_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v) +_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q) +_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v) +_mesa_MultiTexCoord4iv(GLenum target, const GLint *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) +_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q) { MULTI_TEXCOORD4( target, (GLfloat) s, (GLfloat) t, (GLfloat) r, (GLfloat) q ); } void GLAPIENTRY -loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v) +_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v) { MULTI_TEXCOORD4( target, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3] ); } void GLAPIENTRY -loopback_EvalCoord2dv( const GLdouble *u ) +_mesa_EvalCoord2dv( const GLdouble *u ) { EVALCOORD2( (GLfloat) u[0], (GLfloat) u[1] ); } void GLAPIENTRY -loopback_EvalCoord2fv( const GLfloat *u ) +_mesa_EvalCoord2fv( const GLfloat *u ) { EVALCOORD2( u[0], u[1] ); } void GLAPIENTRY -loopback_EvalCoord2d( GLdouble u, GLdouble v ) +_mesa_EvalCoord2d( GLdouble u, GLdouble v ) { EVALCOORD2( (GLfloat) u, (GLfloat) v ); } void GLAPIENTRY -loopback_EvalCoord1dv( const GLdouble *u ) +_mesa_EvalCoord1dv( const GLdouble *u ) { EVALCOORD1( (GLfloat) *u ); } void GLAPIENTRY -loopback_EvalCoord1fv( const GLfloat *u ) +_mesa_EvalCoord1fv( const GLfloat *u ) { EVALCOORD1( (GLfloat) *u ); } void GLAPIENTRY -loopback_EvalCoord1d( GLdouble u ) +_mesa_EvalCoord1d( GLdouble u ) { EVALCOORD1( (GLfloat) u ); } void GLAPIENTRY -loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) +_mesa_Materialf( GLenum face, GLenum pname, GLfloat param ) { GLfloat fparam[4]; fparam[0] = param; @@ -858,14 +858,14 @@ loopback_Materialf( GLenum face, GLenum pname, GLfloat param ) } void GLAPIENTRY -loopback_Materiali(GLenum face, GLenum pname, GLint param ) +_mesa_Materiali(GLenum face, GLenum pname, GLint param ) { GLfloat p = (GLfloat) param; MATERIALFV(face, pname, &p); } void GLAPIENTRY -loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) +_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params ) { GLfloat fparam[4]; switch (pname) { @@ -895,49 +895,49 @@ loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ) void GLAPIENTRY -loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) +_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectdv(const GLdouble *v1, const GLdouble *v2) +_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_Rectfv(const GLfloat *v1, const GLfloat *v2) +_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2) { RECTF(v1[0], v1[1], v2[0], v2[1]); } void GLAPIENTRY -loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2) +_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectiv(const GLint *v1, const GLint *v2) +_mesa_Rectiv(const GLint *v1, const GLint *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) +_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { RECTF((GLfloat) x1, (GLfloat) y1, (GLfloat) x2, (GLfloat) y2); } void GLAPIENTRY -loopback_Rectsv(const GLshort *v1, const GLshort *v2) +_mesa_Rectsv(const GLshort *v1, const GLshort *v2) { RECTF((GLfloat) v1[0], (GLfloat) v1[1], (GLfloat) v2[0], (GLfloat) v2[1]); } void GLAPIENTRY -loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) +_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue ) { SECONDARYCOLORF( BYTE_TO_FLOAT(red), BYTE_TO_FLOAT(green), @@ -945,13 +945,13 @@ loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ) } void GLAPIENTRY -loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ) +_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue ) { SECONDARYCOLORF( (GLfloat) red, (GLfloat) green, (GLfloat) blue ); } void GLAPIENTRY -loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) +_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue ) { SECONDARYCOLORF( INT_TO_FLOAT(red), INT_TO_FLOAT(green), @@ -959,7 +959,7 @@ loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ) } void GLAPIENTRY -loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) +_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue ) { SECONDARYCOLORF(SHORT_TO_FLOAT(red), SHORT_TO_FLOAT(green), @@ -967,7 +967,7 @@ loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ) } void GLAPIENTRY -loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) +_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue ) { SECONDARYCOLORF(UINT_TO_FLOAT(red), UINT_TO_FLOAT(green), @@ -975,7 +975,7 @@ loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ) } void GLAPIENTRY -loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) +_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue ) { SECONDARYCOLORF(USHORT_TO_FLOAT(red), USHORT_TO_FLOAT(green), @@ -983,7 +983,7 @@ loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ) } void GLAPIENTRY -loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) +_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(red), UBYTE_TO_FLOAT(green), @@ -991,7 +991,7 @@ loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ) } void GLAPIENTRY -loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) +_mesa_SecondaryColor3bv( const GLbyte *v ) { SECONDARYCOLORF(BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), @@ -999,12 +999,12 @@ loopback_SecondaryColor3bvEXT_f( const GLbyte *v ) } void GLAPIENTRY -loopback_SecondaryColor3dvEXT_f( const GLdouble *v ) +_mesa_SecondaryColor3dv( const GLdouble *v ) { SECONDARYCOLORF( (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2] ); } void GLAPIENTRY -loopback_SecondaryColor3ivEXT_f( const GLint *v ) +_mesa_SecondaryColor3iv( const GLint *v ) { SECONDARYCOLORF(INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), @@ -1012,7 +1012,7 @@ loopback_SecondaryColor3ivEXT_f( const GLint *v ) } void GLAPIENTRY -loopback_SecondaryColor3svEXT_f( const GLshort *v ) +_mesa_SecondaryColor3sv( const GLshort *v ) { SECONDARYCOLORF(SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), @@ -1020,7 +1020,7 @@ loopback_SecondaryColor3svEXT_f( const GLshort *v ) } void GLAPIENTRY -loopback_SecondaryColor3uivEXT_f( const GLuint *v ) +_mesa_SecondaryColor3uiv( const GLuint *v ) { SECONDARYCOLORF(UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), @@ -1028,7 +1028,7 @@ loopback_SecondaryColor3uivEXT_f( const GLuint *v ) } void GLAPIENTRY -loopback_SecondaryColor3usvEXT_f( const GLushort *v ) +_mesa_SecondaryColor3usv( const GLushort *v ) { SECONDARYCOLORF(USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), @@ -1036,7 +1036,7 @@ loopback_SecondaryColor3usvEXT_f( const GLushort *v ) } void GLAPIENTRY -loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) +_mesa_SecondaryColor3ubv( const GLubyte *v ) { SECONDARYCOLORF(UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), @@ -1051,111 +1051,111 @@ loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ) */ void GLAPIENTRY -loopback_VertexAttrib1sNV(GLuint index, GLshort x) +_mesa_VertexAttrib1sNV(GLuint index, GLshort x) { ATTRIB1NV(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib1dNV(GLuint index, GLdouble x) +_mesa_VertexAttrib1dNV(GLuint index, GLdouble x) { ATTRIB1NV(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) +_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y) { ATTRIB2NV(index, (GLfloat) x, y); } void GLAPIENTRY -loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) +_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y) { ATTRIB2NV(index, (GLfloat) x, (GLfloat) y); } void GLAPIENTRY -loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) +_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } void GLAPIENTRY -loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) +_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) +_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) +_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4NV(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) +_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4NV(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } void GLAPIENTRY -loopback_VertexAttrib1svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v) { ATTRIB1NV(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v) { ATTRIB1NV(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib2svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v) { ATTRIB2NV(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib3svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v) { ATTRIB3NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib4svNV(GLuint index, const GLshort *v) +_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } void GLAPIENTRY -loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v) +_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v) { ATTRIB4NV(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) +_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) { ATTRIB4NV(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); @@ -1163,15 +1163,15 @@ loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v) void GLAPIENTRY -loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib1svNV(index + i, v + i); + _mesa_VertexAttrib1svNV(index + i, v + i); } void GLAPIENTRY -loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1179,23 +1179,23 @@ loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib1dvNV(index + i, v + i); + _mesa_VertexAttrib1dvNV(index + i, v + i); } void GLAPIENTRY -loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib2svNV(index + i, v + 2 * i); + _mesa_VertexAttrib2svNV(index + i, v + 2 * i); } void GLAPIENTRY -loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1203,23 +1203,23 @@ loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib2dvNV(index + i, v + 2 * i); + _mesa_VertexAttrib2dvNV(index + i, v + 2 * i); } void GLAPIENTRY -loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib3svNV(index + i, v + 3 * i); + _mesa_VertexAttrib3svNV(index + i, v + 3 * i); } void GLAPIENTRY -loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1227,23 +1227,23 @@ loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib3dvNV(index + i, v + 3 * i); + _mesa_VertexAttrib3dvNV(index + i, v + 3 * i); } void GLAPIENTRY -loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) +_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4svNV(index + i, v + 4 * i); + _mesa_VertexAttrib4svNV(index + i, v + 4 * i); } void GLAPIENTRY -loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) +_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) { GLint i; for (i = n - 1; i >= 0; i--) @@ -1251,19 +1251,19 @@ loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v) } void GLAPIENTRY -loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) +_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4dvNV(index + i, v + 4 * i); + _mesa_VertexAttrib4dvNV(index + i, v + 4 * i); } void GLAPIENTRY -loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) +_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) { GLint i; for (i = n - 1; i >= 0; i--) - loopback_VertexAttrib4ubvNV(index + i, v + 4 * i); + _mesa_VertexAttrib4ubvNV(index + i, v + 4 * i); } @@ -1274,176 +1274,176 @@ loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v) */ void GLAPIENTRY -loopback_VertexAttrib1sARB(GLuint index, GLshort x) +_mesa_VertexAttrib1s(GLuint index, GLshort x) { ATTRIB1ARB(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib1dARB(GLuint index, GLdouble x) +_mesa_VertexAttrib1d(GLuint index, GLdouble x) { ATTRIB1ARB(index, (GLfloat) x); } void GLAPIENTRY -loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y) +_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y) { ATTRIB2ARB(index, (GLfloat) x, y); } void GLAPIENTRY -loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y) +_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y) { ATTRIB2ARB(index, (GLfloat) x, (GLfloat) y); } void GLAPIENTRY -loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z) +_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z) { ATTRIB3ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z); } void GLAPIENTRY -loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z) +_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) +_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) +_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w) { ATTRIB4ARB(index, (GLfloat) x, (GLfloat) y, (GLfloat) z, (GLfloat) w); } void GLAPIENTRY -loopback_VertexAttrib1svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib1sv(GLuint index, const GLshort *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v) { ATTRIB1ARB(index, (GLfloat) v[0]); } void GLAPIENTRY -loopback_VertexAttrib2svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib2sv(GLuint index, const GLshort *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v) { ATTRIB2ARB(index, (GLfloat) v[0], (GLfloat) v[1]); } void GLAPIENTRY -loopback_VertexAttrib3svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib3sv(GLuint index, const GLshort *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v) { ATTRIB3ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2]); } void GLAPIENTRY -loopback_VertexAttrib4svARB(GLuint index, const GLshort *v) +_mesa_VertexAttrib4sv(GLuint index, const GLshort *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat)v[3]); } void GLAPIENTRY -loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v) +_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v) +_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ivARB(GLuint index, const GLint * v) +_mesa_VertexAttrib4iv(GLuint index, const GLint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v) +_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v) +_mesa_VertexAttrib4usv(GLuint index, const GLushort * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v) +_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v) { ATTRIB4ARB(index, (GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], (GLfloat) v[3]); } void GLAPIENTRY -loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v) +_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v) { ATTRIB4ARB(index, BYTE_TO_FLOAT(v[0]), BYTE_TO_FLOAT(v[1]), BYTE_TO_FLOAT(v[2]), BYTE_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v) +_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v) { ATTRIB4ARB(index, SHORT_TO_FLOAT(v[0]), SHORT_TO_FLOAT(v[1]), SHORT_TO_FLOAT(v[2]), SHORT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NivARB(GLuint index, const GLint * v) +_mesa_VertexAttrib4Niv(GLuint index, const GLint * v) { ATTRIB4ARB(index, INT_TO_FLOAT(v[0]), INT_TO_FLOAT(v[1]), INT_TO_FLOAT(v[2]), INT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) +_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(x), UBYTE_TO_FLOAT(y), UBYTE_TO_FLOAT(z), UBYTE_TO_FLOAT(w)); } void GLAPIENTRY -loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v) +_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v) { ATTRIB4ARB(index, UBYTE_TO_FLOAT(v[0]), UBYTE_TO_FLOAT(v[1]), UBYTE_TO_FLOAT(v[2]), UBYTE_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v) +_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v) { ATTRIB4ARB(index, USHORT_TO_FLOAT(v[0]), USHORT_TO_FLOAT(v[1]), USHORT_TO_FLOAT(v[2]), USHORT_TO_FLOAT(v[3])); } void GLAPIENTRY -loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) +_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v) { ATTRIB4ARB(index, UINT_TO_FLOAT(v[0]), UINT_TO_FLOAT(v[1]), UINT_TO_FLOAT(v[2]), UINT_TO_FLOAT(v[3])); @@ -1457,37 +1457,37 @@ loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v) */ void GLAPIENTRY -loopback_VertexAttribI1iv(GLuint index, const GLint *v) +_mesa_VertexAttribI1iv(GLuint index, const GLint *v) { ATTRIBI_1I(index, v[0]); } void GLAPIENTRY -loopback_VertexAttribI1uiv(GLuint index, const GLuint *v) +_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v) { ATTRIBI_1UI(index, v[0]); } void GLAPIENTRY -loopback_VertexAttribI4bv(GLuint index, const GLbyte *v) +_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4sv(GLuint index, const GLshort *v) +_mesa_VertexAttribI4sv(GLuint index, const GLshort *v) { ATTRIBI_4I(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v) +_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } void GLAPIENTRY -loopback_VertexAttribI4usv(GLuint index, const GLushort *v) +_mesa_VertexAttribI4usv(GLuint index, const GLushort *v) { ATTRIBI_4UI(index, v[0], v[1], v[2], v[3]); } @@ -1504,226 +1504,226 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest) { if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) { - SET_Color4ub(dest, loopback_Color4ub_f); - SET_Materialf(dest, loopback_Materialf); + SET_Color4ub(dest, _mesa_Color4ub); + SET_Materialf(dest, _mesa_Materialf); } if (ctx->API == API_OPENGL) { - SET_Color3b(dest, loopback_Color3b_f); - SET_Color3d(dest, loopback_Color3d_f); - SET_Color3i(dest, loopback_Color3i_f); - SET_Color3s(dest, loopback_Color3s_f); - SET_Color3ui(dest, loopback_Color3ui_f); - SET_Color3us(dest, loopback_Color3us_f); - SET_Color3ub(dest, loopback_Color3ub_f); - SET_Color4b(dest, loopback_Color4b_f); - SET_Color4d(dest, loopback_Color4d_f); - SET_Color4i(dest, loopback_Color4i_f); - SET_Color4s(dest, loopback_Color4s_f); - SET_Color4ui(dest, loopback_Color4ui_f); - SET_Color4us(dest, loopback_Color4us_f); - SET_Color3bv(dest, loopback_Color3bv_f); - SET_Color3dv(dest, loopback_Color3dv_f); - SET_Color3iv(dest, loopback_Color3iv_f); - SET_Color3sv(dest, loopback_Color3sv_f); - SET_Color3uiv(dest, loopback_Color3uiv_f); - SET_Color3usv(dest, loopback_Color3usv_f); - SET_Color3ubv(dest, loopback_Color3ubv_f); - SET_Color4bv(dest, loopback_Color4bv_f); - SET_Color4dv(dest, loopback_Color4dv_f); - SET_Color4iv(dest, loopback_Color4iv_f); - SET_Color4sv(dest, loopback_Color4sv_f); - SET_Color4uiv(dest, loopback_Color4uiv_f); - SET_Color4usv(dest, loopback_Color4usv_f); - SET_Color4ubv(dest, loopback_Color4ubv_f); - - SET_SecondaryColor3bEXT(dest, loopback_SecondaryColor3bEXT_f); - SET_SecondaryColor3dEXT(dest, loopback_SecondaryColor3dEXT_f); - SET_SecondaryColor3iEXT(dest, loopback_SecondaryColor3iEXT_f); - SET_SecondaryColor3sEXT(dest, loopback_SecondaryColor3sEXT_f); - SET_SecondaryColor3uiEXT(dest, loopback_SecondaryColor3uiEXT_f); - SET_SecondaryColor3usEXT(dest, loopback_SecondaryColor3usEXT_f); - SET_SecondaryColor3ubEXT(dest, loopback_SecondaryColor3ubEXT_f); - SET_SecondaryColor3bvEXT(dest, loopback_SecondaryColor3bvEXT_f); - SET_SecondaryColor3dvEXT(dest, loopback_SecondaryColor3dvEXT_f); - SET_SecondaryColor3ivEXT(dest, loopback_SecondaryColor3ivEXT_f); - SET_SecondaryColor3svEXT(dest, loopback_SecondaryColor3svEXT_f); - SET_SecondaryColor3uivEXT(dest, loopback_SecondaryColor3uivEXT_f); - SET_SecondaryColor3usvEXT(dest, loopback_SecondaryColor3usvEXT_f); - SET_SecondaryColor3ubvEXT(dest, loopback_SecondaryColor3ubvEXT_f); + SET_Color3b(dest, _mesa_Color3b); + SET_Color3d(dest, _mesa_Color3d); + SET_Color3i(dest, _mesa_Color3i); + SET_Color3s(dest, _mesa_Color3s); + SET_Color3ui(dest, _mesa_Color3ui); + SET_Color3us(dest, _mesa_Color3us); + SET_Color3ub(dest, _mesa_Color3ub); + SET_Color4b(dest, _mesa_Color4b); + SET_Color4d(dest, _mesa_Color4d); + SET_Color4i(dest, _mesa_Color4i); + SET_Color4s(dest, _mesa_Color4s); + SET_Color4ui(dest, _mesa_Color4ui); + SET_Color4us(dest, _mesa_Color4us); + SET_Color3bv(dest, _mesa_Color3bv); + SET_Color3dv(dest, _mesa_Color3dv); + SET_Color3iv(dest, _mesa_Color3iv); + SET_Color3sv(dest, _mesa_Color3sv); + SET_Color3uiv(dest, _mesa_Color3uiv); + SET_Color3usv(dest, _mesa_Color3usv); + SET_Color3ubv(dest, _mesa_Color3ubv); + SET_Color4bv(dest, _mesa_Color4bv); + SET_Color4dv(dest, _mesa_Color4dv); + SET_Color4iv(dest, _mesa_Color4iv); + SET_Color4sv(dest, _mesa_Color4sv); + SET_Color4uiv(dest, _mesa_Color4uiv); + SET_Color4usv(dest, _mesa_Color4usv); + SET_Color4ubv(dest, _mesa_Color4ubv); + + SET_SecondaryColor3b(dest, _mesa_SecondaryColor3b); + SET_SecondaryColor3d(dest, _mesa_SecondaryColor3d); + SET_SecondaryColor3i(dest, _mesa_SecondaryColor3i); + SET_SecondaryColor3s(dest, _mesa_SecondaryColor3s); + SET_SecondaryColor3ui(dest, _mesa_SecondaryColor3ui); + SET_SecondaryColor3us(dest, _mesa_SecondaryColor3us); + SET_SecondaryColor3ub(dest, _mesa_SecondaryColor3ub); + SET_SecondaryColor3bv(dest, _mesa_SecondaryColor3bv); + SET_SecondaryColor3dv(dest, _mesa_SecondaryColor3dv); + SET_SecondaryColor3iv(dest, _mesa_SecondaryColor3iv); + SET_SecondaryColor3sv(dest, _mesa_SecondaryColor3sv); + SET_SecondaryColor3uiv(dest, _mesa_SecondaryColor3uiv); + SET_SecondaryColor3usv(dest, _mesa_SecondaryColor3usv); + SET_SecondaryColor3ubv(dest, _mesa_SecondaryColor3ubv); - SET_EdgeFlagv(dest, loopback_EdgeFlagv); - - SET_Indexd(dest, loopback_Indexd); - SET_Indexi(dest, loopback_Indexi); - SET_Indexs(dest, loopback_Indexs); - SET_Indexub(dest, loopback_Indexub); - SET_Indexdv(dest, loopback_Indexdv); - SET_Indexiv(dest, loopback_Indexiv); - SET_Indexsv(dest, loopback_Indexsv); - SET_Indexubv(dest, loopback_Indexubv); - SET_Normal3b(dest, loopback_Normal3b); - SET_Normal3d(dest, loopback_Normal3d); - SET_Normal3i(dest, loopback_Normal3i); - SET_Normal3s(dest, loopback_Normal3s); - SET_Normal3bv(dest, loopback_Normal3bv); - SET_Normal3dv(dest, loopback_Normal3dv); - SET_Normal3iv(dest, loopback_Normal3iv); - SET_Normal3sv(dest, loopback_Normal3sv); - SET_TexCoord1d(dest, loopback_TexCoord1d); - SET_TexCoord1i(dest, loopback_TexCoord1i); - SET_TexCoord1s(dest, loopback_TexCoord1s); - SET_TexCoord2d(dest, loopback_TexCoord2d); - SET_TexCoord2s(dest, loopback_TexCoord2s); - SET_TexCoord2i(dest, loopback_TexCoord2i); - SET_TexCoord3d(dest, loopback_TexCoord3d); - SET_TexCoord3i(dest, loopback_TexCoord3i); - SET_TexCoord3s(dest, loopback_TexCoord3s); - SET_TexCoord4d(dest, loopback_TexCoord4d); - SET_TexCoord4i(dest, loopback_TexCoord4i); - SET_TexCoord4s(dest, loopback_TexCoord4s); - SET_TexCoord1dv(dest, loopback_TexCoord1dv); - SET_TexCoord1iv(dest, loopback_TexCoord1iv); - SET_TexCoord1sv(dest, loopback_TexCoord1sv); - SET_TexCoord2dv(dest, loopback_TexCoord2dv); - SET_TexCoord2iv(dest, loopback_TexCoord2iv); - SET_TexCoord2sv(dest, loopback_TexCoord2sv); - SET_TexCoord3dv(dest, loopback_TexCoord3dv); - SET_TexCoord3iv(dest, loopback_TexCoord3iv); - SET_TexCoord3sv(dest, loopback_TexCoord3sv); - SET_TexCoord4dv(dest, loopback_TexCoord4dv); - SET_TexCoord4iv(dest, loopback_TexCoord4iv); - SET_TexCoord4sv(dest, loopback_TexCoord4sv); - SET_Vertex2d(dest, loopback_Vertex2d); - SET_Vertex2i(dest, loopback_Vertex2i); - SET_Vertex2s(dest, loopback_Vertex2s); - SET_Vertex3d(dest, loopback_Vertex3d); - SET_Vertex3i(dest, loopback_Vertex3i); - SET_Vertex3s(dest, loopback_Vertex3s); - SET_Vertex4d(dest, loopback_Vertex4d); - SET_Vertex4i(dest, loopback_Vertex4i); - SET_Vertex4s(dest, loopback_Vertex4s); - SET_Vertex2dv(dest, loopback_Vertex2dv); - SET_Vertex2iv(dest, loopback_Vertex2iv); - SET_Vertex2sv(dest, loopback_Vertex2sv); - SET_Vertex3dv(dest, loopback_Vertex3dv); - SET_Vertex3iv(dest, loopback_Vertex3iv); - SET_Vertex3sv(dest, loopback_Vertex3sv); - SET_Vertex4dv(dest, loopback_Vertex4dv); - SET_Vertex4iv(dest, loopback_Vertex4iv); - SET_Vertex4sv(dest, loopback_Vertex4sv); - SET_MultiTexCoord1dARB(dest, loopback_MultiTexCoord1dARB); - SET_MultiTexCoord1dvARB(dest, loopback_MultiTexCoord1dvARB); - SET_MultiTexCoord1iARB(dest, loopback_MultiTexCoord1iARB); - SET_MultiTexCoord1ivARB(dest, loopback_MultiTexCoord1ivARB); - SET_MultiTexCoord1sARB(dest, loopback_MultiTexCoord1sARB); - SET_MultiTexCoord1svARB(dest, loopback_MultiTexCoord1svARB); - SET_MultiTexCoord2dARB(dest, loopback_MultiTexCoord2dARB); - SET_MultiTexCoord2dvARB(dest, loopback_MultiTexCoord2dvARB); - SET_MultiTexCoord2iARB(dest, loopback_MultiTexCoord2iARB); - SET_MultiTexCoord2ivARB(dest, loopback_MultiTexCoord2ivARB); - SET_MultiTexCoord2sARB(dest, loopback_MultiTexCoord2sARB); - SET_MultiTexCoord2svARB(dest, loopback_MultiTexCoord2svARB); - SET_MultiTexCoord3dARB(dest, loopback_MultiTexCoord3dARB); - SET_MultiTexCoord3dvARB(dest, loopback_MultiTexCoord3dvARB); - SET_MultiTexCoord3iARB(dest, loopback_MultiTexCoord3iARB); - SET_MultiTexCoord3ivARB(dest, loopback_MultiTexCoord3ivARB); - SET_MultiTexCoord3sARB(dest, loopback_MultiTexCoord3sARB); - SET_MultiTexCoord3svARB(dest, loopback_MultiTexCoord3svARB); - SET_MultiTexCoord4dARB(dest, loopback_MultiTexCoord4dARB); - SET_MultiTexCoord4dvARB(dest, loopback_MultiTexCoord4dvARB); - SET_MultiTexCoord4iARB(dest, loopback_MultiTexCoord4iARB); - SET_MultiTexCoord4ivARB(dest, loopback_MultiTexCoord4ivARB); - SET_MultiTexCoord4sARB(dest, loopback_MultiTexCoord4sARB); - SET_MultiTexCoord4svARB(dest, loopback_MultiTexCoord4svARB); - SET_EvalCoord2dv(dest, loopback_EvalCoord2dv); - SET_EvalCoord2fv(dest, loopback_EvalCoord2fv); - SET_EvalCoord2d(dest, loopback_EvalCoord2d); - SET_EvalCoord1dv(dest, loopback_EvalCoord1dv); - SET_EvalCoord1fv(dest, loopback_EvalCoord1fv); - SET_EvalCoord1d(dest, loopback_EvalCoord1d); - SET_Materiali(dest, loopback_Materiali); - SET_Materialiv(dest, loopback_Materialiv); - SET_Rectd(dest, loopback_Rectd); - SET_Rectdv(dest, loopback_Rectdv); - SET_Rectfv(dest, loopback_Rectfv); - SET_Recti(dest, loopback_Recti); - SET_Rectiv(dest, loopback_Rectiv); - SET_Rects(dest, loopback_Rects); - SET_Rectsv(dest, loopback_Rectsv); - SET_FogCoorddEXT(dest, loopback_FogCoorddEXT); - SET_FogCoorddvEXT(dest, loopback_FogCoorddvEXT); + SET_EdgeFlagv(dest, _mesa_EdgeFlagv); + + SET_Indexd(dest, _mesa_Indexd); + SET_Indexi(dest, _mesa_Indexi); + SET_Indexs(dest, _mesa_Indexs); + SET_Indexub(dest, _mesa_Indexub); + SET_Indexdv(dest, _mesa_Indexdv); + SET_Indexiv(dest, _mesa_Indexiv); + SET_Indexsv(dest, _mesa_Indexsv); + SET_Indexubv(dest, _mesa_Indexubv); + SET_Normal3b(dest, _mesa_Normal3b); + SET_Normal3d(dest, _mesa_Normal3d); + SET_Normal3i(dest, _mesa_Normal3i); + SET_Normal3s(dest, _mesa_Normal3s); + SET_Normal3bv(dest, _mesa_Normal3bv); + SET_Normal3dv(dest, _mesa_Normal3dv); + SET_Normal3iv(dest, _mesa_Normal3iv); + SET_Normal3sv(dest, _mesa_Normal3sv); + SET_TexCoord1d(dest, _mesa_TexCoord1d); + SET_TexCoord1i(dest, _mesa_TexCoord1i); + SET_TexCoord1s(dest, _mesa_TexCoord1s); + SET_TexCoord2d(dest, _mesa_TexCoord2d); + SET_TexCoord2s(dest, _mesa_TexCoord2s); + SET_TexCoord2i(dest, _mesa_TexCoord2i); + SET_TexCoord3d(dest, _mesa_TexCoord3d); + SET_TexCoord3i(dest, _mesa_TexCoord3i); + SET_TexCoord3s(dest, _mesa_TexCoord3s); + SET_TexCoord4d(dest, _mesa_TexCoord4d); + SET_TexCoord4i(dest, _mesa_TexCoord4i); + SET_TexCoord4s(dest, _mesa_TexCoord4s); + SET_TexCoord1dv(dest, _mesa_TexCoord1dv); + SET_TexCoord1iv(dest, _mesa_TexCoord1iv); + SET_TexCoord1sv(dest, _mesa_TexCoord1sv); + SET_TexCoord2dv(dest, _mesa_TexCoord2dv); + SET_TexCoord2iv(dest, _mesa_TexCoord2iv); + SET_TexCoord2sv(dest, _mesa_TexCoord2sv); + SET_TexCoord3dv(dest, _mesa_TexCoord3dv); + SET_TexCoord3iv(dest, _mesa_TexCoord3iv); + SET_TexCoord3sv(dest, _mesa_TexCoord3sv); + SET_TexCoord4dv(dest, _mesa_TexCoord4dv); + SET_TexCoord4iv(dest, _mesa_TexCoord4iv); + SET_TexCoord4sv(dest, _mesa_TexCoord4sv); + SET_Vertex2d(dest, _mesa_Vertex2d); + SET_Vertex2i(dest, _mesa_Vertex2i); + SET_Vertex2s(dest, _mesa_Vertex2s); + SET_Vertex3d(dest, _mesa_Vertex3d); + SET_Vertex3i(dest, _mesa_Vertex3i); + SET_Vertex3s(dest, _mesa_Vertex3s); + SET_Vertex4d(dest, _mesa_Vertex4d); + SET_Vertex4i(dest, _mesa_Vertex4i); + SET_Vertex4s(dest, _mesa_Vertex4s); + SET_Vertex2dv(dest, _mesa_Vertex2dv); + SET_Vertex2iv(dest, _mesa_Vertex2iv); + SET_Vertex2sv(dest, _mesa_Vertex2sv); + SET_Vertex3dv(dest, _mesa_Vertex3dv); + SET_Vertex3iv(dest, _mesa_Vertex3iv); + SET_Vertex3sv(dest, _mesa_Vertex3sv); + SET_Vertex4dv(dest, _mesa_Vertex4dv); + SET_Vertex4iv(dest, _mesa_Vertex4iv); + SET_Vertex4sv(dest, _mesa_Vertex4sv); + SET_MultiTexCoord1d(dest, _mesa_MultiTexCoord1d); + SET_MultiTexCoord1dv(dest, _mesa_MultiTexCoord1dv); + SET_MultiTexCoord1i(dest, _mesa_MultiTexCoord1i); + SET_MultiTexCoord1iv(dest, _mesa_MultiTexCoord1iv); + SET_MultiTexCoord1s(dest, _mesa_MultiTexCoord1s); + SET_MultiTexCoord1sv(dest, _mesa_MultiTexCoord1sv); + SET_MultiTexCoord2d(dest, _mesa_MultiTexCoord2d); + SET_MultiTexCoord2dv(dest, _mesa_MultiTexCoord2dv); + SET_MultiTexCoord2i(dest, _mesa_MultiTexCoord2i); + SET_MultiTexCoord2iv(dest, _mesa_MultiTexCoord2iv); + SET_MultiTexCoord2s(dest, _mesa_MultiTexCoord2s); + SET_MultiTexCoord2sv(dest, _mesa_MultiTexCoord2sv); + SET_MultiTexCoord3d(dest, _mesa_MultiTexCoord3d); + SET_MultiTexCoord3dv(dest, _mesa_MultiTexCoord3dv); + SET_MultiTexCoord3i(dest, _mesa_MultiTexCoord3i); + SET_MultiTexCoord3iv(dest, _mesa_MultiTexCoord3iv); + SET_MultiTexCoord3s(dest, _mesa_MultiTexCoord3s); + SET_MultiTexCoord3sv(dest, _mesa_MultiTexCoord3sv); + SET_MultiTexCoord4d(dest, _mesa_MultiTexCoord4d); + SET_MultiTexCoord4dv(dest, _mesa_MultiTexCoord4dv); + SET_MultiTexCoord4i(dest, _mesa_MultiTexCoord4i); + SET_MultiTexCoord4iv(dest, _mesa_MultiTexCoord4iv); + SET_MultiTexCoord4s(dest, _mesa_MultiTexCoord4s); + SET_MultiTexCoord4sv(dest, _mesa_MultiTexCoord4sv); + SET_EvalCoord2dv(dest, _mesa_EvalCoord2dv); + SET_EvalCoord2fv(dest, _mesa_EvalCoord2fv); + SET_EvalCoord2d(dest, _mesa_EvalCoord2d); + SET_EvalCoord1dv(dest, _mesa_EvalCoord1dv); + SET_EvalCoord1fv(dest, _mesa_EvalCoord1fv); + SET_EvalCoord1d(dest, _mesa_EvalCoord1d); + SET_Materiali(dest, _mesa_Materiali); + SET_Materialiv(dest, _mesa_Materialiv); + SET_Rectd(dest, _mesa_Rectd); + SET_Rectdv(dest, _mesa_Rectdv); + SET_Rectfv(dest, _mesa_Rectfv); + SET_Recti(dest, _mesa_Recti); + SET_Rectiv(dest, _mesa_Rectiv); + SET_Rects(dest, _mesa_Rects); + SET_Rectsv(dest, _mesa_Rectsv); + SET_FogCoordd(dest, _mesa_FogCoordd); + SET_FogCoorddv(dest, _mesa_FogCoorddv); } if (ctx->API == API_OPENGL) { - SET_VertexAttrib1sNV(dest, loopback_VertexAttrib1sNV); - SET_VertexAttrib1dNV(dest, loopback_VertexAttrib1dNV); - SET_VertexAttrib2sNV(dest, loopback_VertexAttrib2sNV); - SET_VertexAttrib2dNV(dest, loopback_VertexAttrib2dNV); - SET_VertexAttrib3sNV(dest, loopback_VertexAttrib3sNV); - SET_VertexAttrib3dNV(dest, loopback_VertexAttrib3dNV); - SET_VertexAttrib4sNV(dest, loopback_VertexAttrib4sNV); - SET_VertexAttrib4dNV(dest, loopback_VertexAttrib4dNV); - SET_VertexAttrib4ubNV(dest, loopback_VertexAttrib4ubNV); - SET_VertexAttrib1svNV(dest, loopback_VertexAttrib1svNV); - SET_VertexAttrib1dvNV(dest, loopback_VertexAttrib1dvNV); - SET_VertexAttrib2svNV(dest, loopback_VertexAttrib2svNV); - SET_VertexAttrib2dvNV(dest, loopback_VertexAttrib2dvNV); - SET_VertexAttrib3svNV(dest, loopback_VertexAttrib3svNV); - SET_VertexAttrib3dvNV(dest, loopback_VertexAttrib3dvNV); - SET_VertexAttrib4svNV(dest, loopback_VertexAttrib4svNV); - SET_VertexAttrib4dvNV(dest, loopback_VertexAttrib4dvNV); - SET_VertexAttrib4ubvNV(dest, loopback_VertexAttrib4ubvNV); - SET_VertexAttribs1svNV(dest, loopback_VertexAttribs1svNV); - SET_VertexAttribs1fvNV(dest, loopback_VertexAttribs1fvNV); - SET_VertexAttribs1dvNV(dest, loopback_VertexAttribs1dvNV); - SET_VertexAttribs2svNV(dest, loopback_VertexAttribs2svNV); - SET_VertexAttribs2fvNV(dest, loopback_VertexAttribs2fvNV); - SET_VertexAttribs2dvNV(dest, loopback_VertexAttribs2dvNV); - SET_VertexAttribs3svNV(dest, loopback_VertexAttribs3svNV); - SET_VertexAttribs3fvNV(dest, loopback_VertexAttribs3fvNV); - SET_VertexAttribs3dvNV(dest, loopback_VertexAttribs3dvNV); - SET_VertexAttribs4svNV(dest, loopback_VertexAttribs4svNV); - SET_VertexAttribs4fvNV(dest, loopback_VertexAttribs4fvNV); - SET_VertexAttribs4dvNV(dest, loopback_VertexAttribs4dvNV); - SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV); + SET_VertexAttrib1sNV(dest, _mesa_VertexAttrib1sNV); + SET_VertexAttrib1dNV(dest, _mesa_VertexAttrib1dNV); + SET_VertexAttrib2sNV(dest, _mesa_VertexAttrib2sNV); + SET_VertexAttrib2dNV(dest, _mesa_VertexAttrib2dNV); + SET_VertexAttrib3sNV(dest, _mesa_VertexAttrib3sNV); + SET_VertexAttrib3dNV(dest, _mesa_VertexAttrib3dNV); + SET_VertexAttrib4sNV(dest, _mesa_VertexAttrib4sNV); + SET_VertexAttrib4dNV(dest, _mesa_VertexAttrib4dNV); + SET_VertexAttrib4ubNV(dest, _mesa_VertexAttrib4ubNV); + SET_VertexAttrib1svNV(dest, _mesa_VertexAttrib1svNV); + SET_VertexAttrib1dvNV(dest, _mesa_VertexAttrib1dvNV); + SET_VertexAttrib2svNV(dest, _mesa_VertexAttrib2svNV); + SET_VertexAttrib2dvNV(dest, _mesa_VertexAttrib2dvNV); + SET_VertexAttrib3svNV(dest, _mesa_VertexAttrib3svNV); + SET_VertexAttrib3dvNV(dest, _mesa_VertexAttrib3dvNV); + SET_VertexAttrib4svNV(dest, _mesa_VertexAttrib4svNV); + SET_VertexAttrib4dvNV(dest, _mesa_VertexAttrib4dvNV); + SET_VertexAttrib4ubvNV(dest, _mesa_VertexAttrib4ubvNV); + SET_VertexAttribs1svNV(dest, _mesa_VertexAttribs1svNV); + SET_VertexAttribs1fvNV(dest, _mesa_VertexAttribs1fvNV); + SET_VertexAttribs1dvNV(dest, _mesa_VertexAttribs1dvNV); + SET_VertexAttribs2svNV(dest, _mesa_VertexAttribs2svNV); + SET_VertexAttribs2fvNV(dest, _mesa_VertexAttribs2fvNV); + SET_VertexAttribs2dvNV(dest, _mesa_VertexAttribs2dvNV); + SET_VertexAttribs3svNV(dest, _mesa_VertexAttribs3svNV); + SET_VertexAttribs3fvNV(dest, _mesa_VertexAttribs3fvNV); + SET_VertexAttribs3dvNV(dest, _mesa_VertexAttribs3dvNV); + SET_VertexAttribs4svNV(dest, _mesa_VertexAttribs4svNV); + SET_VertexAttribs4fvNV(dest, _mesa_VertexAttribs4fvNV); + SET_VertexAttribs4dvNV(dest, _mesa_VertexAttribs4dvNV); + SET_VertexAttribs4ubvNV(dest, _mesa_VertexAttribs4ubvNV); } if (_mesa_is_desktop_gl(ctx)) { - SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB); - SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB); - SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB); - SET_VertexAttrib2dARB(dest, loopback_VertexAttrib2dARB); - SET_VertexAttrib3sARB(dest, loopback_VertexAttrib3sARB); - SET_VertexAttrib3dARB(dest, loopback_VertexAttrib3dARB); - SET_VertexAttrib4sARB(dest, loopback_VertexAttrib4sARB); - SET_VertexAttrib4dARB(dest, loopback_VertexAttrib4dARB); - SET_VertexAttrib1svARB(dest, loopback_VertexAttrib1svARB); - SET_VertexAttrib1dvARB(dest, loopback_VertexAttrib1dvARB); - SET_VertexAttrib2svARB(dest, loopback_VertexAttrib2svARB); - SET_VertexAttrib2dvARB(dest, loopback_VertexAttrib2dvARB); - SET_VertexAttrib3svARB(dest, loopback_VertexAttrib3svARB); - SET_VertexAttrib3dvARB(dest, loopback_VertexAttrib3dvARB); - SET_VertexAttrib4svARB(dest, loopback_VertexAttrib4svARB); - SET_VertexAttrib4dvARB(dest, loopback_VertexAttrib4dvARB); - SET_VertexAttrib4NubARB(dest, loopback_VertexAttrib4NubARB); - SET_VertexAttrib4NubvARB(dest, loopback_VertexAttrib4NubvARB); - SET_VertexAttrib4bvARB(dest, loopback_VertexAttrib4bvARB); - SET_VertexAttrib4ivARB(dest, loopback_VertexAttrib4ivARB); - SET_VertexAttrib4ubvARB(dest, loopback_VertexAttrib4ubvARB); - SET_VertexAttrib4usvARB(dest, loopback_VertexAttrib4usvARB); - SET_VertexAttrib4uivARB(dest, loopback_VertexAttrib4uivARB); - SET_VertexAttrib4NbvARB(dest, loopback_VertexAttrib4NbvARB); - SET_VertexAttrib4NsvARB(dest, loopback_VertexAttrib4NsvARB); - SET_VertexAttrib4NusvARB(dest, loopback_VertexAttrib4NusvARB); - SET_VertexAttrib4NivARB(dest, loopback_VertexAttrib4NivARB); - SET_VertexAttrib4NuivARB(dest, loopback_VertexAttrib4NuivARB); + SET_VertexAttrib1s(dest, _mesa_VertexAttrib1s); + SET_VertexAttrib1d(dest, _mesa_VertexAttrib1d); + SET_VertexAttrib2s(dest, _mesa_VertexAttrib2s); + SET_VertexAttrib2d(dest, _mesa_VertexAttrib2d); + SET_VertexAttrib3s(dest, _mesa_VertexAttrib3s); + SET_VertexAttrib3d(dest, _mesa_VertexAttrib3d); + SET_VertexAttrib4s(dest, _mesa_VertexAttrib4s); + SET_VertexAttrib4d(dest, _mesa_VertexAttrib4d); + SET_VertexAttrib1sv(dest, _mesa_VertexAttrib1sv); + SET_VertexAttrib1dv(dest, _mesa_VertexAttrib1dv); + SET_VertexAttrib2sv(dest, _mesa_VertexAttrib2sv); + SET_VertexAttrib2dv(dest, _mesa_VertexAttrib2dv); + SET_VertexAttrib3sv(dest, _mesa_VertexAttrib3sv); + SET_VertexAttrib3dv(dest, _mesa_VertexAttrib3dv); + SET_VertexAttrib4sv(dest, _mesa_VertexAttrib4sv); + SET_VertexAttrib4dv(dest, _mesa_VertexAttrib4dv); + SET_VertexAttrib4Nub(dest, _mesa_VertexAttrib4Nub); + SET_VertexAttrib4Nubv(dest, _mesa_VertexAttrib4Nubv); + SET_VertexAttrib4bv(dest, _mesa_VertexAttrib4bv); + SET_VertexAttrib4iv(dest, _mesa_VertexAttrib4iv); + SET_VertexAttrib4ubv(dest, _mesa_VertexAttrib4ubv); + SET_VertexAttrib4usv(dest, _mesa_VertexAttrib4usv); + SET_VertexAttrib4uiv(dest, _mesa_VertexAttrib4uiv); + SET_VertexAttrib4Nbv(dest, _mesa_VertexAttrib4Nbv); + SET_VertexAttrib4Nsv(dest, _mesa_VertexAttrib4Nsv); + SET_VertexAttrib4Nusv(dest, _mesa_VertexAttrib4Nusv); + SET_VertexAttrib4Niv(dest, _mesa_VertexAttrib4Niv); + SET_VertexAttrib4Nuiv(dest, _mesa_VertexAttrib4Nuiv); /* GL_EXT_gpu_shader4, GL 3.0 */ - SET_VertexAttribI1ivEXT(dest, loopback_VertexAttribI1iv); - SET_VertexAttribI1uivEXT(dest, loopback_VertexAttribI1uiv); - SET_VertexAttribI4bvEXT(dest, loopback_VertexAttribI4bv); - SET_VertexAttribI4svEXT(dest, loopback_VertexAttribI4sv); - SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv); - SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv); + SET_VertexAttribI1iv(dest, _mesa_VertexAttribI1iv); + SET_VertexAttribI1uiv(dest, _mesa_VertexAttribI1uiv); + SET_VertexAttribI4bv(dest, _mesa_VertexAttribI4bv); + SET_VertexAttribI4sv(dest, _mesa_VertexAttribI4sv); + SET_VertexAttribI4ubv(dest, _mesa_VertexAttribI4ubv); + SET_VertexAttribI4usv(dest, _mesa_VertexAttribI4usv); } } diff --git a/mesalib/src/mesa/main/api_loopback.h b/mesalib/src/mesa/main/api_loopback.h index 879ad8995..c35d57bff 100644 --- a/mesalib/src/mesa/main/api_loopback.h +++ b/mesalib/src/mesa/main/api_loopback.h @@ -45,433 +45,433 @@ extern void _mesa_loopback_init_api_table(const struct gl_context *ctx, struct _glapi_table *dest); void GLAPIENTRY -loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue ); +_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue ); void GLAPIENTRY -loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue ); +_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue ); void GLAPIENTRY -loopback_Color3i_f( GLint red, GLint green, GLint blue ); +_mesa_Color3i( GLint red, GLint green, GLint blue ); void GLAPIENTRY -loopback_Color3s_f( GLshort red, GLshort green, GLshort blue ); +_mesa_Color3s( GLshort red, GLshort green, GLshort blue ); void GLAPIENTRY -loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue ); +_mesa_Color3ui( GLuint red, GLuint green, GLuint blue ); void GLAPIENTRY -loopback_Color3us_f( GLushort red, GLushort green, GLushort blue ); +_mesa_Color3us( GLushort red, GLushort green, GLushort blue ); void GLAPIENTRY -loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue ); +_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue ); void GLAPIENTRY -loopback_Color3bv_f( const GLbyte *v ); +_mesa_Color3bv( const GLbyte *v ); void GLAPIENTRY -loopback_Color3dv_f( const GLdouble *v ); +_mesa_Color3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Color3iv_f( const GLint *v ); +_mesa_Color3iv( const GLint *v ); void GLAPIENTRY -loopback_Color3sv_f( const GLshort *v ); +_mesa_Color3sv( const GLshort *v ); void GLAPIENTRY -loopback_Color3uiv_f( const GLuint *v ); +_mesa_Color3uiv( const GLuint *v ); void GLAPIENTRY -loopback_Color3usv_f( const GLushort *v ); +_mesa_Color3usv( const GLushort *v ); void GLAPIENTRY -loopback_Color3ubv_f( const GLubyte *v ); +_mesa_Color3ubv( const GLubyte *v ); void GLAPIENTRY -loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue, +_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha ); void GLAPIENTRY -loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue, +_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha ); void GLAPIENTRY -loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha ); +_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha ); void GLAPIENTRY -loopback_Color4s_f( GLshort red, GLshort green, GLshort blue, +_mesa_Color4s( GLshort red, GLshort green, GLshort blue, GLshort alpha ); void GLAPIENTRY -loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha ); +_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha ); void GLAPIENTRY -loopback_Color4us_f( GLushort red, GLushort green, GLushort blue, +_mesa_Color4us( GLushort red, GLushort green, GLushort blue, GLushort alpha ); void GLAPIENTRY -loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); +_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha ); void GLAPIENTRY -loopback_Color4iv_f( const GLint *v ); +_mesa_Color4iv( const GLint *v ); void GLAPIENTRY -loopback_Color4bv_f( const GLbyte *v ); +_mesa_Color4bv( const GLbyte *v ); void GLAPIENTRY -loopback_Color4dv_f( const GLdouble *v ); +_mesa_Color4dv( const GLdouble *v ); void GLAPIENTRY -loopback_Color4sv_f( const GLshort *v); +_mesa_Color4sv( const GLshort *v); void GLAPIENTRY -loopback_Color4uiv_f( const GLuint *v); +_mesa_Color4uiv( const GLuint *v); void GLAPIENTRY -loopback_Color4usv_f( const GLushort *v); +_mesa_Color4usv( const GLushort *v); void GLAPIENTRY -loopback_Color4ubv_f( const GLubyte *v); +_mesa_Color4ubv( const GLubyte *v); void GLAPIENTRY -loopback_FogCoorddEXT( GLdouble d ); +_mesa_FogCoordd( GLdouble d ); void GLAPIENTRY -loopback_FogCoorddvEXT( const GLdouble *v ); +_mesa_FogCoorddv( const GLdouble *v ); void GLAPIENTRY -loopback_Indexd( GLdouble c ); +_mesa_Indexd( GLdouble c ); void GLAPIENTRY -loopback_Indexi( GLint c ); +_mesa_Indexi( GLint c ); void GLAPIENTRY -loopback_Indexs( GLshort c ); +_mesa_Indexs( GLshort c ); void GLAPIENTRY -loopback_Indexub( GLubyte c ); +_mesa_Indexub( GLubyte c ); void GLAPIENTRY -loopback_Indexdv( const GLdouble *c ); +_mesa_Indexdv( const GLdouble *c ); void GLAPIENTRY -loopback_Indexiv( const GLint *c ); +_mesa_Indexiv( const GLint *c ); void GLAPIENTRY -loopback_Indexsv( const GLshort *c ); +_mesa_Indexsv( const GLshort *c ); void GLAPIENTRY -loopback_Indexubv( const GLubyte *c ); +_mesa_Indexubv( const GLubyte *c ); void GLAPIENTRY -loopback_EdgeFlagv(const GLboolean *flag); +_mesa_EdgeFlagv(const GLboolean *flag); void GLAPIENTRY -loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); +_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz ); void GLAPIENTRY -loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); +_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz ); void GLAPIENTRY -loopback_Normal3i( GLint nx, GLint ny, GLint nz ); +_mesa_Normal3i( GLint nx, GLint ny, GLint nz ); void GLAPIENTRY -loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz ); +_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz ); void GLAPIENTRY -loopback_Normal3bv( const GLbyte *v ); +_mesa_Normal3bv( const GLbyte *v ); void GLAPIENTRY -loopback_Normal3dv( const GLdouble *v ); +_mesa_Normal3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Normal3iv( const GLint *v ); +_mesa_Normal3iv( const GLint *v ); void GLAPIENTRY -loopback_Normal3sv( const GLshort *v ); +_mesa_Normal3sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord1d( GLdouble s ); +_mesa_TexCoord1d( GLdouble s ); void GLAPIENTRY -loopback_TexCoord1i( GLint s ); +_mesa_TexCoord1i( GLint s ); void GLAPIENTRY -loopback_TexCoord1s( GLshort s ); +_mesa_TexCoord1s( GLshort s ); void GLAPIENTRY -loopback_TexCoord2d( GLdouble s, GLdouble t ); +_mesa_TexCoord2d( GLdouble s, GLdouble t ); void GLAPIENTRY -loopback_TexCoord2s( GLshort s, GLshort t ); +_mesa_TexCoord2s( GLshort s, GLshort t ); void GLAPIENTRY -loopback_TexCoord2i( GLint s, GLint t ); +_mesa_TexCoord2i( GLint s, GLint t ); void GLAPIENTRY -loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); +_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r ); void GLAPIENTRY -loopback_TexCoord3i( GLint s, GLint t, GLint r ); +_mesa_TexCoord3i( GLint s, GLint t, GLint r ); void GLAPIENTRY -loopback_TexCoord3s( GLshort s, GLshort t, GLshort r ); +_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r ); void GLAPIENTRY -loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); +_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q ); void GLAPIENTRY -loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); +_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q ); void GLAPIENTRY -loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); +_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q ); void GLAPIENTRY -loopback_TexCoord1dv( const GLdouble *v ); +_mesa_TexCoord1dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord1iv( const GLint *v ); +_mesa_TexCoord1iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord1sv( const GLshort *v ); +_mesa_TexCoord1sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord2dv( const GLdouble *v ); +_mesa_TexCoord2dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord2iv( const GLint *v ); +_mesa_TexCoord2iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord2sv( const GLshort *v ); +_mesa_TexCoord2sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord3dv( const GLdouble *v ); +_mesa_TexCoord3dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord3iv( const GLint *v ); +_mesa_TexCoord3iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord3sv( const GLshort *v ); +_mesa_TexCoord3sv( const GLshort *v ); void GLAPIENTRY -loopback_TexCoord4dv( const GLdouble *v ); +_mesa_TexCoord4dv( const GLdouble *v ); void GLAPIENTRY -loopback_TexCoord4iv( const GLint *v ); +_mesa_TexCoord4iv( const GLint *v ); void GLAPIENTRY -loopback_TexCoord4sv( const GLshort *v ); +_mesa_TexCoord4sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex2d( GLdouble x, GLdouble y ); +_mesa_Vertex2d( GLdouble x, GLdouble y ); void GLAPIENTRY -loopback_Vertex2i( GLint x, GLint y ); +_mesa_Vertex2i( GLint x, GLint y ); void GLAPIENTRY -loopback_Vertex2s( GLshort x, GLshort y ); +_mesa_Vertex2s( GLshort x, GLshort y ); void GLAPIENTRY -loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); +_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z ); void GLAPIENTRY -loopback_Vertex3i( GLint x, GLint y, GLint z ); +_mesa_Vertex3i( GLint x, GLint y, GLint z ); void GLAPIENTRY -loopback_Vertex3s( GLshort x, GLshort y, GLshort z ); +_mesa_Vertex3s( GLshort x, GLshort y, GLshort z ); void GLAPIENTRY -loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); +_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w ); void GLAPIENTRY -loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w ); +_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w ); void GLAPIENTRY -loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); +_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w ); void GLAPIENTRY -loopback_Vertex2dv( const GLdouble *v ); +_mesa_Vertex2dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex2iv( const GLint *v ); +_mesa_Vertex2iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex2sv( const GLshort *v ); +_mesa_Vertex2sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex3dv( const GLdouble *v ); +_mesa_Vertex3dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex3iv( const GLint *v ); +_mesa_Vertex3iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex3sv( const GLshort *v ); +_mesa_Vertex3sv( const GLshort *v ); void GLAPIENTRY -loopback_Vertex4dv( const GLdouble *v ); +_mesa_Vertex4dv( const GLdouble *v ); void GLAPIENTRY -loopback_Vertex4iv( const GLint *v ); +_mesa_Vertex4iv( const GLint *v ); void GLAPIENTRY -loopback_Vertex4sv( const GLshort *v ); +_mesa_Vertex4sv( const GLshort *v ); void GLAPIENTRY -loopback_MultiTexCoord1dARB(GLenum target, GLdouble s); +_mesa_MultiTexCoord1d(GLenum target, GLdouble s); void GLAPIENTRY -loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord1iARB(GLenum target, GLint s); +_mesa_MultiTexCoord1i(GLenum target, GLint s); void GLAPIENTRY -loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord1iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord1sARB(GLenum target, GLshort s); +_mesa_MultiTexCoord1s(GLenum target, GLshort s); void GLAPIENTRY -loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t); +_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t); void GLAPIENTRY -loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t); +_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t); void GLAPIENTRY -loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord2iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t); +_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t); void GLAPIENTRY -loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r); +_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r); void GLAPIENTRY -loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r); +_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r); void GLAPIENTRY -loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord3iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r); +_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r); void GLAPIENTRY -loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r, +_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); void GLAPIENTRY -loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v); +_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v); void GLAPIENTRY -loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q); +_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q); void GLAPIENTRY -loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v); +_mesa_MultiTexCoord4iv(GLenum target, const GLint *v); void GLAPIENTRY -loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r, +_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); void GLAPIENTRY -loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v); +_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v); void GLAPIENTRY -loopback_EvalCoord2dv( const GLdouble *u ); +_mesa_EvalCoord2dv( const GLdouble *u ); void GLAPIENTRY -loopback_EvalCoord2fv( const GLfloat *u ); +_mesa_EvalCoord2fv( const GLfloat *u ); void GLAPIENTRY -loopback_EvalCoord2d( GLdouble u, GLdouble v ); +_mesa_EvalCoord2d( GLdouble u, GLdouble v ); void GLAPIENTRY -loopback_EvalCoord1dv( const GLdouble *u ); +_mesa_EvalCoord1dv( const GLdouble *u ); void GLAPIENTRY -loopback_EvalCoord1fv( const GLfloat *u ); +_mesa_EvalCoord1fv( const GLfloat *u ); void GLAPIENTRY -loopback_EvalCoord1d( GLdouble u ); +_mesa_EvalCoord1d( GLdouble u ); void GLAPIENTRY -loopback_Materialf( GLenum face, GLenum pname, GLfloat param ); +_mesa_Materialf( GLenum face, GLenum pname, GLfloat param ); void GLAPIENTRY -loopback_Materiali(GLenum face, GLenum pname, GLint param ); +_mesa_Materiali(GLenum face, GLenum pname, GLint param ); void GLAPIENTRY -loopback_Materialiv(GLenum face, GLenum pname, const GLint *params ); +_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params ); void GLAPIENTRY -loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); +_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); void GLAPIENTRY -loopback_Rectdv(const GLdouble *v1, const GLdouble *v2); +_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2); void GLAPIENTRY -loopback_Rectfv(const GLfloat *v1, const GLfloat *v2); +_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2); void GLAPIENTRY -loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2); +_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2); void GLAPIENTRY -loopback_Rectiv(const GLint *v1, const GLint *v2); +_mesa_Rectiv(const GLint *v1, const GLint *v2); void GLAPIENTRY -loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); +_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2); void GLAPIENTRY -loopback_Rectsv(const GLshort *v1, const GLshort *v2); +_mesa_Rectsv(const GLshort *v1, const GLshort *v2); void GLAPIENTRY -loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue ); +_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue ); void GLAPIENTRY -loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue ); +_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue ); void GLAPIENTRY -loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue ); +_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue ); void GLAPIENTRY -loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue ); +_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue ); void GLAPIENTRY -loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue ); +_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue ); void GLAPIENTRY -loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue ); +_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue ); void GLAPIENTRY -loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue ); +_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue ); void GLAPIENTRY -loopback_SecondaryColor3bvEXT_f( const GLbyte *v ); +_mesa_SecondaryColor3bv( const GLbyte *v ); void GLAPIENTRY -loopback_SecondaryColor3dvEXT_f( const GLdouble *v ); +_mesa_SecondaryColor3dv( const GLdouble *v ); void GLAPIENTRY -loopback_SecondaryColor3ivEXT_f( const GLint *v ); +_mesa_SecondaryColor3iv( const GLint *v ); void GLAPIENTRY -loopback_SecondaryColor3svEXT_f( const GLshort *v ); +_mesa_SecondaryColor3sv( const GLshort *v ); void GLAPIENTRY -loopback_SecondaryColor3uivEXT_f( const GLuint *v ); +_mesa_SecondaryColor3uiv( const GLuint *v ); void GLAPIENTRY -loopback_SecondaryColor3usvEXT_f( const GLushort *v ); +_mesa_SecondaryColor3usv( const GLushort *v ); void GLAPIENTRY -loopback_SecondaryColor3ubvEXT_f( const GLubyte *v ); +_mesa_SecondaryColor3ubv( const GLubyte *v ); void GLAPIENTRY -loopback_VertexAttrib1sNV(GLuint index, GLshort x); +_mesa_VertexAttrib1sNV(GLuint index, GLshort x); void GLAPIENTRY -loopback_VertexAttrib1dNV(GLuint index, GLdouble x); +_mesa_VertexAttrib1dNV(GLuint index, GLdouble x); void GLAPIENTRY -loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); +_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y); void GLAPIENTRY -loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); +_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y); void GLAPIENTRY -loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); +_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z); void GLAPIENTRY -loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); +_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, +_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, +_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY -loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, +_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); void GLAPIENTRY -loopback_VertexAttrib1svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib2svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib3svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4svNV(GLuint index, const GLshort *v); +_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v); +_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); +_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); +_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); +_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v); void GLAPIENTRY -loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); +_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); +_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttrib1sARB(GLuint index, GLshort x); +_mesa_VertexAttrib1s(GLuint index, GLshort x); void GLAPIENTRY -loopback_VertexAttrib1dARB(GLuint index, GLdouble x); +_mesa_VertexAttrib1d(GLuint index, GLdouble x); void GLAPIENTRY -loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y); +_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y); void GLAPIENTRY -loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y); +_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y); void GLAPIENTRY -loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z); +_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z); void GLAPIENTRY -loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z); +_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z, +_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z, +_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY -loopback_VertexAttrib1svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib1sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib2svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib2sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib3svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib3sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4svARB(GLuint index, const GLshort *v); +_mesa_VertexAttrib4sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v); +_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v); void GLAPIENTRY -loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v); +_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v); void GLAPIENTRY -loopback_VertexAttrib4ivARB(GLuint index, const GLint * v); +_mesa_VertexAttrib4iv(GLuint index, const GLint * v); void GLAPIENTRY -loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v); +_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v); void GLAPIENTRY -loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v); +_mesa_VertexAttrib4usv(GLuint index, const GLushort * v); void GLAPIENTRY -loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v); +_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v); void GLAPIENTRY -loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v); +_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v); void GLAPIENTRY -loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v); +_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v); void GLAPIENTRY -loopback_VertexAttrib4NivARB(GLuint index, const GLint * v); +_mesa_VertexAttrib4Niv(GLuint index, const GLint * v); void GLAPIENTRY -loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z, +_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); void GLAPIENTRY -loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v); +_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v); void GLAPIENTRY -loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v); +_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v); void GLAPIENTRY -loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v); +_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v); void GLAPIENTRY -loopback_VertexAttribI1iv(GLuint index, const GLint *v); +_mesa_VertexAttribI1iv(GLuint index, const GLint *v); void GLAPIENTRY -loopback_VertexAttribI1uiv(GLuint index, const GLuint *v); +_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v); void GLAPIENTRY -loopback_VertexAttribI4bv(GLuint index, const GLbyte *v); +_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v); void GLAPIENTRY -loopback_VertexAttribI4sv(GLuint index, const GLshort *v); +_mesa_VertexAttribI4sv(GLuint index, const GLshort *v); void GLAPIENTRY -loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v); +_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v); void GLAPIENTRY -loopback_VertexAttribI4usv(GLuint index, const GLushort *v); +_mesa_VertexAttribI4usv(GLuint index, const GLushort *v); #endif /* API_LOOPBACK_H */ diff --git a/mesalib/src/mesa/main/arbprogram.c b/mesalib/src/mesa/main/arbprogram.c index 9be86c2fe..8150b5f4e 100644 --- a/mesalib/src/mesa/main/arbprogram.c +++ b/mesalib/src/mesa/main/arbprogram.c @@ -46,7 +46,7 @@ * and glBindProgramARB. */ void GLAPIENTRY -_mesa_BindProgram(GLenum target, GLuint id) +_mesa_BindProgramARB(GLenum target, GLuint id) { struct gl_program *curProg, *newProg; GET_CURRENT_CONTEXT(ctx); @@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id) * \note Called by both glDeleteProgramsNV and glDeleteProgramsARB. */ void GLAPIENTRY -_mesa_DeletePrograms(GLsizei n, const GLuint *ids) +_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) if (ctx->VertexProgram.Current && ctx->VertexProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; case GL_FRAGMENT_PROGRAM_ARB: if (ctx->FragmentProgram.Current && ctx->FragmentProgram.Current->Base.Id == ids[i]) { /* unbind this currently bound program */ - _mesa_BindProgram(prog->Target, 0); + _mesa_BindProgramARB(prog->Target, 0); } break; default: @@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) * \note Called by both glGenProgramsNV and glGenProgramsARB. */ void GLAPIENTRY -_mesa_GenPrograms(GLsizei n, GLuint *ids) +_mesa_GenProgramsARB(GLsizei n, GLuint *ids) { GLuint first; GLuint i; diff --git a/mesalib/src/mesa/main/arbprogram.h b/mesalib/src/mesa/main/arbprogram.h index e2e535e91..4f40a70c5 100644 --- a/mesalib/src/mesa/main/arbprogram.h +++ b/mesalib/src/mesa/main/arbprogram.h @@ -31,13 +31,13 @@ extern void GLAPIENTRY -_mesa_BindProgram(GLenum target, GLuint id); +_mesa_BindProgramARB(GLenum target, GLuint id); extern void GLAPIENTRY -_mesa_DeletePrograms(GLsizei n, const GLuint *ids); +_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids); extern void GLAPIENTRY -_mesa_GenPrograms(GLsizei n, GLuint *ids); +_mesa_GenProgramsARB(GLsizei n, GLuint *ids); extern GLboolean GLAPIENTRY diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index 926c753dd..a909e0eff 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/src/mesa/main/arrayobj.c @@ -431,7 +431,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id ) * \param ids Array of \c n array object IDs. */ void GLAPIENTRY -_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids) +_mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids) { GET_CURRENT_CONTEXT(ctx); GLsizei i; @@ -541,7 +541,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays) * \c GL_FALSE otherwise. */ GLboolean GLAPIENTRY -_mesa_IsVertexArrayAPPLE( GLuint id ) +_mesa_IsVertexArray( GLuint id ) { struct gl_array_object * obj; GET_CURRENT_CONTEXT(ctx); diff --git a/mesalib/src/mesa/main/arrayobj.h b/mesalib/src/mesa/main/arrayobj.h index dfefec2a7..0d58bb75a 100644 --- a/mesalib/src/mesa/main/arrayobj.h +++ b/mesalib/src/mesa/main/arrayobj.h @@ -110,12 +110,12 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id ); void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id ); -void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids); +void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids); void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays); void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer); -GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id ); +GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id ); #endif /* ARRAYOBJ_H */ diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 0997e5407..acb33885a 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -618,7 +618,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) const GLbitfield genEnabled = enable->TexGen[i]; if (ctx->Texture.Unit[i].Enabled != enabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ActiveTexture(GL_TEXTURE0 + i); _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(enabled & TEXTURE_1D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(enabled & TEXTURE_2D_BIT)); @@ -640,7 +640,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) } if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) { - _mesa_ActiveTextureARB(GL_TEXTURE0 + i); + _mesa_ActiveTexture(GL_TEXTURE0 + i); _mesa_set_enable(ctx, GL_TEXTURE_GEN_S, !!(genEnabled & S_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_GEN_T, !!(genEnabled & T_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_GEN_R, !!(genEnabled & R_BIT)); @@ -648,7 +648,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable) } } - _mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave); + _mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave); } @@ -666,7 +666,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) const struct gl_texture_unit *unit = &texstate->Texture.Unit[u]; GLuint tgt; - _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u); + _mesa_ActiveTexture(GL_TEXTURE0_ARB + u); _mesa_set_enable(ctx, GL_TEXTURE_1D, !!(unit->Enabled & TEXTURE_1D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT)); _mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT)); @@ -808,7 +808,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate) } } - _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit); + _mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit); _mesa_reference_shared_state(ctx, &texstate->SharedRef, NULL); @@ -879,7 +879,7 @@ _mesa_PopAttrib(void) else { GLuint i; for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) { - _mesa_ColorMaskIndexed(i, + _mesa_ColorMaski(i, (GLboolean) (color->ColorMask[i][0] != 0), (GLboolean) (color->ColorMask[i][1] != 0), (GLboolean) (color->ColorMask[i][2] != 0), @@ -910,7 +910,7 @@ _mesa_PopAttrib(void) * to record that error. Per OpenGL ARB decision. */ if (multipleBuffers) - _mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers, + _mesa_DrawBuffers(ctx->Const.MaxDrawBuffers, color->DrawBuffer); else _mesa_DrawBuffer(color->DrawBuffer[0]); @@ -934,18 +934,18 @@ _mesa_PopAttrib(void) /* set blend per buffer */ GLuint buf; for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) { - _mesa_BlendFuncSeparatei(buf, color->Blend[buf].SrcRGB, + _mesa_BlendFuncSeparateiARB(buf, color->Blend[buf].SrcRGB, color->Blend[buf].DstRGB, color->Blend[buf].SrcA, color->Blend[buf].DstA); - _mesa_BlendEquationSeparatei(buf, + _mesa_BlendEquationSeparateiARB(buf, color->Blend[buf].EquationRGB, color->Blend[buf].EquationA); } } else { /* set same blend modes for all buffers */ - _mesa_BlendFuncSeparateEXT(color->Blend[0].SrcRGB, + _mesa_BlendFuncSeparate(color->Blend[0].SrcRGB, color->Blend[0].DstRGB, color->Blend[0].SrcA, color->Blend[0].DstA); @@ -957,7 +957,7 @@ _mesa_PopAttrib(void) _mesa_BlendEquation(color->Blend[0].EquationRGB); } else { - _mesa_BlendEquationSeparateEXT( + _mesa_BlendEquationSeparate( color->Blend[0].EquationRGB, color->Blend[0].EquationA); } @@ -972,8 +972,8 @@ _mesa_PopAttrib(void) _mesa_set_enable(ctx, GL_INDEX_LOGIC_OP, color->IndexLogicOpEnabled); _mesa_set_enable(ctx, GL_DITHER, color->DitherFlag); - _mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor); - _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor); + _mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor); + _mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor); /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */ if (ctx->Extensions.EXT_framebuffer_sRGB) @@ -1100,7 +1100,7 @@ _mesa_PopAttrib(void) /* materials */ memcpy(&ctx->Light.Material, &light->Material, sizeof(struct gl_material)); - _mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor); + _mesa_ClampColor(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor); } break; case GL_LINE_BIT: @@ -1293,7 +1293,7 @@ _mesa_PopAttrib(void) ms->SampleAlphaToOne, GL_SAMPLE_ALPHA_TO_ONE); - _mesa_SampleCoverageARB(ms->SampleCoverageValue, + _mesa_SampleCoverage(ms->SampleCoverageValue, ms->SampleCoverageInvert); } break; @@ -1432,7 +1432,7 @@ restore_array_attrib(struct gl_context *ctx, const bool arb_vao = (src->ArrayObj->Name != 0 && src->ArrayObj->ARBsemantics); - if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name)) + if (arb_vao && !_mesa_IsVertexArray(src->ArrayObj->Name)) return; _mesa_BindVertexArrayAPPLE(src->ArrayObj->Name); @@ -1440,11 +1440,11 @@ restore_array_attrib(struct gl_context *ctx, /* Restore or recreate the buffer objects by the names ... */ if (!arb_vao || src->ArrayBufferObj->Name == 0 - || _mesa_IsBufferARB(src->ArrayBufferObj->Name)) { + || _mesa_IsBuffer(src->ArrayBufferObj->Name)) { /* ... and restore its content */ copy_array_attrib(ctx, dest, src, false); - _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, src->ArrayBufferObj->Name); } else { copy_array_attrib(ctx, dest, src, true); @@ -1452,8 +1452,8 @@ restore_array_attrib(struct gl_context *ctx, if (!arb_vao || src->ArrayObj->ElementArrayBufferObj->Name == 0 - || _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name)) - _mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, + || _mesa_IsBuffer(src->ArrayObj->ElementArrayBufferObj->Name)) + _mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB, src->ArrayObj->ElementArrayBufferObj->Name); } diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c index 5cd3ce244..1930b1c37 100644 --- a/mesalib/src/mesa/main/blend.c +++ b/mesalib/src/mesa/main/blend.c @@ -170,7 +170,7 @@ validate_blend_factors(struct gl_context *ctx, const char *func, void GLAPIENTRY _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) { - _mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor); + _mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor); } static GLboolean @@ -201,7 +201,7 @@ update_uses_dual_src(struct gl_context *ctx, int buf) * \param dfactorA alpha destination factor operator. */ void GLAPIENTRY -_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ) { GLuint buf, numBuffers; @@ -260,9 +260,9 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, * Set blend source/dest factors for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) +_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor) { - _mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor); + _mesa_BlendFuncSeparateiARB(buf, sfactor, dfactor, sfactor, dfactor); } @@ -270,7 +270,7 @@ _mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor) * Set separate blend source/dest factors for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA) { GET_CURRENT_CONTEXT(ctx); @@ -384,7 +384,7 @@ _mesa_BlendEquation( GLenum mode ) * Set blend equation for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendEquationi(GLuint buf, GLenum mode) +_mesa_BlendEquationiARB(GLuint buf, GLenum mode) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -419,7 +419,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode) void GLAPIENTRY -_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ) +_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ) { GLuint buf, numBuffers; GLboolean changed; @@ -477,7 +477,7 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ) * Set separate blend equations for one color buffer/target. */ void GLAPIENTRY -_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA) +_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -730,7 +730,7 @@ _mesa_ColorMask( GLboolean red, GLboolean green, * For GL_EXT_draw_buffers2 and GL3 */ void GLAPIENTRY -_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, +_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ) { GLubyte tmp[4]; @@ -766,7 +766,7 @@ _mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, void GLAPIENTRY -_mesa_ClampColorARB(GLenum target, GLenum clamp) +_mesa_ClampColor(GLenum target, GLenum clamp) { GET_CURRENT_CONTEXT(ctx); diff --git a/mesalib/src/mesa/main/blend.h b/mesalib/src/mesa/main/blend.h index d74f17ef1..a539aa809 100644 --- a/mesalib/src/mesa/main/blend.h +++ b/mesalib/src/mesa/main/blend.h @@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ); extern void GLAPIENTRY -_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA ); extern void GLAPIENTRY -_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor); +_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor); extern void GLAPIENTRY -_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, +_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorA, GLenum dfactorA); @@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode ); extern void GLAPIENTRY -_mesa_BlendEquationi(GLuint buf, GLenum mode); +_mesa_BlendEquationiARB(GLuint buf, GLenum mode); extern void GLAPIENTRY -_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ); +_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA ); extern void GLAPIENTRY -_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA); +_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA); extern void GLAPIENTRY @@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green, +_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); extern void GLAPIENTRY -_mesa_ClampColorARB(GLenum target, GLenum clamp); +_mesa_ClampColor(GLenum target, GLenum clamp); extern void diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 43eb8876e..5521617f1 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -819,7 +819,7 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver) /**********************************************************************/ void GLAPIENTRY -_mesa_BindBufferARB(GLenum target, GLuint buffer) +_mesa_BindBuffer(GLenum target, GLuint buffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -839,7 +839,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer) * \param ids Array of \c n buffer object IDs. */ void GLAPIENTRY -_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) +_mesa_DeleteBuffers(GLsizei n, const GLuint *ids) { GET_CURRENT_CONTEXT(ctx); GLsizei i; @@ -874,23 +874,23 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) } if (ctx->Array.ArrayBufferObj == bufObj) { - _mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 ); + _mesa_BindBuffer( GL_ARRAY_BUFFER_ARB, 0 ); } if (arrayObj->ElementArrayBufferObj == bufObj) { - _mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 ); + _mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 ); } /* unbind ARB_copy_buffer binding points */ if (ctx->CopyReadBuffer == bufObj) { - _mesa_BindBufferARB( GL_COPY_READ_BUFFER, 0 ); + _mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 ); } if (ctx->CopyWriteBuffer == bufObj) { - _mesa_BindBufferARB( GL_COPY_WRITE_BUFFER, 0 ); + _mesa_BindBuffer( GL_COPY_WRITE_BUFFER, 0 ); } /* unbind transform feedback binding points */ if (ctx->TransformFeedback.CurrentBuffer == bufObj) { - _mesa_BindBufferARB( GL_TRANSFORM_FEEDBACK_BUFFER, 0 ); + _mesa_BindBuffer( GL_TRANSFORM_FEEDBACK_BUFFER, 0 ); } for (j = 0; j < MAX_FEEDBACK_BUFFERS; j++) { if (ctx->TransformFeedback.CurrentObject->Buffers[j] == bufObj) { @@ -906,19 +906,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) } if (ctx->UniformBuffer == bufObj) { - _mesa_BindBufferARB( GL_UNIFORM_BUFFER, 0 ); + _mesa_BindBuffer( GL_UNIFORM_BUFFER, 0 ); } /* unbind any pixel pack/unpack pointers bound to this buffer */ if (ctx->Pack.BufferObj == bufObj) { - _mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 ); + _mesa_BindBuffer( GL_PIXEL_PACK_BUFFER_EXT, 0 ); } if (ctx->Unpack.BufferObj == bufObj) { - _mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 ); + _mesa_BindBuffer( GL_PIXEL_UNPACK_BUFFER_EXT, 0 ); } if (ctx->Texture.BufferObject == bufObj) { - _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 ); + _mesa_BindBuffer( GL_TEXTURE_BUFFER, 0 ); } /* The ID is immediately freed for re-use */ @@ -949,7 +949,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) * \param buffer Array of \c n locations to store the IDs. */ void GLAPIENTRY -_mesa_GenBuffersARB(GLsizei n, GLuint *buffer) +_mesa_GenBuffers(GLsizei n, GLuint *buffer) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -994,7 +994,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer) * \c GL_FALSE otherwise. */ GLboolean GLAPIENTRY -_mesa_IsBufferARB(GLuint id) +_mesa_IsBuffer(GLuint id) { struct gl_buffer_object *bufObj; GET_CURRENT_CONTEXT(ctx); @@ -1009,7 +1009,7 @@ _mesa_IsBufferARB(GLuint id) void GLAPIENTRY -_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, +_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage) { GET_CURRENT_CONTEXT(ctx); @@ -1089,7 +1089,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, void GLAPIENTRY -_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, +_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data) { GET_CURRENT_CONTEXT(ctx); @@ -1114,7 +1114,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, void GLAPIENTRY -_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, +_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data) { GET_CURRENT_CONTEXT(ctx); @@ -1134,7 +1134,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, void * GLAPIENTRY -_mesa_MapBufferARB(GLenum target, GLenum access) +_mesa_MapBuffer(GLenum target, GLenum access) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object * bufObj; @@ -1229,7 +1229,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access) GLboolean GLAPIENTRY -_mesa_UnmapBufferARB(GLenum target) +_mesa_UnmapBuffer(GLenum target) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *bufObj; @@ -1292,7 +1292,7 @@ _mesa_UnmapBufferARB(GLenum target) void GLAPIENTRY -_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params) +_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object *bufObj; @@ -1395,7 +1395,7 @@ invalid_pname: void GLAPIENTRY -_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params) +_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params) { GET_CURRENT_CONTEXT(ctx); struct gl_buffer_object * bufObj; diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 4d5446ac0..e98e47670 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -101,29 +101,29 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver); */ void GLAPIENTRY -_mesa_BindBufferARB(GLenum target, GLuint buffer); +_mesa_BindBuffer(GLenum target, GLuint buffer); void GLAPIENTRY -_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer); +_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer); void GLAPIENTRY -_mesa_GenBuffersARB(GLsizei n, GLuint * buffer); +_mesa_GenBuffers(GLsizei n, GLuint * buffer); GLboolean GLAPIENTRY -_mesa_IsBufferARB(GLuint buffer); +_mesa_IsBuffer(GLuint buffer); void GLAPIENTRY -_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); +_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); void GLAPIENTRY -_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); +_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); void GLAPIENTRY -_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); +_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); void * GLAPIENTRY -_mesa_MapBufferARB(GLenum target, GLenum access); +_mesa_MapBuffer(GLenum target, GLenum access); GLboolean GLAPIENTRY -_mesa_UnmapBufferARB(GLenum target); +_mesa_UnmapBuffer(GLenum target); void GLAPIENTRY -_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params); +_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params); void GLAPIENTRY _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params); void GLAPIENTRY -_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params); +_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params); void GLAPIENTRY _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, diff --git a/mesalib/src/mesa/main/buffers.c b/mesalib/src/mesa/main/buffers.c index cc268b67c..fd430aad0 100644 --- a/mesalib/src/mesa/main/buffers.c +++ b/mesalib/src/mesa/main/buffers.c @@ -206,7 +206,7 @@ read_buffer_enum_to_index(GLenum buffer) * Called by glDrawBuffer(). * Specify which renderbuffer(s) to draw into for the first color output. * <buffer> can name zero, one, two or four renderbuffers! - * \sa _mesa_DrawBuffersARB + * \sa _mesa_DrawBuffers * * \param buffer buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc. * @@ -280,7 +280,7 @@ _mesa_DrawBuffer(GLenum buffer) * GL_FRONT_AND_BACK is illegal. */ void GLAPIENTRY -_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers) +_mesa_DrawBuffers(GLsizei n, const GLenum *buffers) { GLint output; GLbitfield usedBufferMask, supportedMask; diff --git a/mesalib/src/mesa/main/buffers.h b/mesalib/src/mesa/main/buffers.h index 8083bc3d3..e9768f944 100644 --- a/mesalib/src/mesa/main/buffers.h +++ b/mesalib/src/mesa/main/buffers.h @@ -41,7 +41,7 @@ extern void GLAPIENTRY _mesa_DrawBuffer( GLenum mode ); extern void GLAPIENTRY -_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers); +_mesa_DrawBuffers(GLsizei n, const GLenum *buffers); extern void _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers, diff --git a/mesalib/src/mesa/main/compiler.h b/mesalib/src/mesa/main/compiler.h index a8cddaf8f..b22b99485 100644 --- a/mesalib/src/mesa/main/compiler.h +++ b/mesalib/src/mesa/main/compiler.h @@ -183,9 +183,7 @@ extern "C" { * Don't define it if using a newer Windows compiler. */ #ifndef __FUNCTION__ -# if defined(__VMS) -# define __FUNCTION__ "VMS$NL:" -# elif !defined(__GNUC__) && !defined(__xlC__) && \ +# if !defined(__GNUC__) && !defined(__xlC__) && \ (!defined(_MSC_VER) || _MSC_VER < 1300) # if (__STDC_VERSION__ >= 199901L) /* C99 */ || \ (defined(__SUNPRO_C) && defined(__C99FEATURES__)) @@ -363,7 +361,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x) defined(__arm__) || \ defined(__sh__) || defined(__m32r__) || \ (defined(__sun) && defined(_IEEE_754)) || \ - (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS))) + (defined(__alpha__) && defined(__IEEE_FLOAT)) #define USE_IEEE #define IEEE_ONE 0x3f800000 #endif diff --git a/mesalib/src/mesa/main/descrip.mms b/mesalib/src/mesa/main/descrip.mms deleted file mode 100644 index 91d7225c3..000000000 --- a/mesalib/src/mesa/main/descrip.mms +++ /dev/null @@ -1,258 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 29 September 2008 - -.first - define gl [---.include.gl] - define math [-.math] - define shader [-.shader] - define glapi [-.glapi] - define main [-.main] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.glapi],[-.shader] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES =accum.c \ - api_arrayelt.c \ - api_exec.c \ - api_loopback.c \ - api_noop.c \ - api_validate.c \ - attrib.c \ - arrayobj.c \ - blend.c \ - bufferobj.c \ - buffers.c \ - clear.c \ - clip.c \ - colortab.c \ - context.c \ - convolve.c \ - debug.c \ - depth.c \ - depthstencil.c \ - dlist.c \ - drawpix.c \ - enable.c \ - enums.c \ - errors.c \ - eval.c \ - execmem.c \ - extensions.c \ - fbobject.c \ - feedback.c \ - ffvertex_prog.c \ - fog.c \ - framebuffer.c \ - get.c \ - getstring.c \ - hash.c \ - hint.c \ - histogram.c \ - image.c \ - imports.c \ - light.c \ - lines.c \ - matrix.c \ - mipmap.c \ - mm.c \ - multisample.c \ - pixel.c \ - pixelstore.c \ - points.c \ - polygon.c \ - rastpos.c \ - rbadaptors.c \ - readpix.c \ - renderbuffer.c \ - scissor.c \ - shaders.c \ - state.c \ - stencil.c \ - texcompress.c \ - texcompress_fxt1.c \ - texcompress_s3tc.c \ - texenv.c \ - texenvprogram.c \ - texformat.c \ - texgen.c \ - teximage.c \ - texobj.c \ - texparam.c \ - texrender.c \ - texstate.c \ - texstore.c \ - varray.c \ - vtxfmt.c \ - queryobj.c \ - rbadaptors.c - -OBJECTS=accum.obj,\ -api_arrayelt.obj,\ -api_exec.obj,\ -api_loopback.obj,\ -api_noop.obj,\ -api_validate.obj,\ -arrayobj.obj,\ -attrib.obj,\ -blend.obj,\ -bufferobj.obj,\ -buffers.obj,\ -clear.obj,\ -clip.obj,\ -colortab.obj,\ -context.obj,\ -convolve.obj,\ -debug.obj,\ -depth.obj,\ -depthstencil.obj,\ -dlist.obj,\ -drawpix.obj,\ -enable.obj,\ -enums.obj,\ -errors.obj,\ -eval.obj,\ -execmem.obj,\ -extensions.obj,\ -fbobject.obj,\ -feedback.obj,\ -ffvertex_prog.obj,\ -fog.obj,\ -framebuffer.obj,\ -get.obj,\ -getstring.obj,\ -hash.obj,\ -hint.obj,\ -histogram.obj,\ -image.obj,\ -imports.obj,\ -light.obj,\ -lines.obj,\ -matrix.obj,\ -mipmap.obj,\ -mm.obj,\ -multisample.obj,\ -pixel.obj,\ -pixelstore.obj,\ -points.obj,\ -polygon.obj,\ -rastpos.obj,\ -readpix.obj,\ -renderbuffer.obj,\ -scissor.obj,\ -shaders.obj,\ -state.obj,\ -stencil.obj,\ -texcompress.obj,\ -texcompress_fxt1.obj,\ -texcompress_s3tc.obj,\ -texenv.obj,\ -texenvprogram.obj,\ -texformat.obj,\ -texgen.obj,\ -teximage.obj,\ -texobj.obj,\ -texparam.obj,\ -texrender.obj,\ -texstate.obj,\ -texstore.obj,\ -varray.obj,\ -vtxfmt.obj,\ -queryobj.obj,\ -rbadaptors.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ $(MAKELIB) $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -accum.obj : accum.c -api_arrayelt.obj : api_arrayelt.c -api_loopback.obj : api_loopback.c -api_noop.obj : api_noop.c -api_validate.obj : api_validate.c -arrayobj.obj : arrayobj.c -attrib.obj : attrib.c -blend.obj : blend.c -bufferobj.obj : bufferobj.c -buffers.obj : buffers.c -clip.obj : clip.c -colortab.obj : colortab.c -context.obj : context.c -convolve.obj : convolve.c -debug.obj : debug.c -depth.obj : depth.c -depthstencil.obj : depthstencil.c -dlist.obj : dlist.c -drawpix.obj : drawpix.c -enable.obj : enable.c -enums.obj : enums.c -errors.obj : errors.c -eval.obj : eval.c -execmem.obj : execmem.c -extensions.obj : extensions.c -fbobject.obj : fbobject.c -feedback.obj : feedback.c -fog.obj : fog.c -framebuffer.obj : framebuffer.c -get.obj : get.c -getstring.obj : getstring.c -hash.obj : hash.c -hint.obj : hint.c -histogram.obj : histogram.c -image.obj : image.c -imports.obj : imports.c vsnprintf.c -light.obj : light.c -lines.obj : lines.c -matrix.obj : matrix.c -mipmap.obj : mipmap.c -mm.obj : mm.c -pixel.obj : pixel.c -points.obj : points.c -polygon.obj : polygon.c -rastpos.obj : rastpos.c -rbadaptors.obj : rbadaptors.c -renderbuffer.obj : renderbuffer.c -state.obj : state.c -stencil.obj : stencil.c -texcompress.obj : texcompress.c -texcompress_fxt1.obj : texcompress_fxt1.c - cc$(CFLAGS)/warn=(disable=SHIFTCOUNT) texcompress_fxt1.c -texcompress_s3tc.obj : texcompress_s3tc.c -texenvprogram.obj : texenvprogram.c -texformat.obj : texformat.c -teximage.obj : teximage.c -texobj.obj : texobj.c -texrender.obj : texrender.c -texstate.obj : texstate.c -texstore.obj : texstore.c -varray.obj : varray.c -vtxfmt.obj : vtxfmt.c -shaders.obj : shaders.c -queryobj.obj : queryobj.c -rbadaptors.obj : rbadaptors.c -clear.obj : clear.c -multisample.obj : multisample.c -scissor.obj : scissor.c -texenv.obj : texenv.c -texgen.obj : texgen.c -texparam.obj : texparam.c -readpix.obj : readpix.c -ffvertex_prog.obj : ffvertex_prog.c -api_exec.obj : api_exec.c -pixelstore.obj : pixelstore.c diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c index 8bbead7c4..6b99f35bb 100644 --- a/mesalib/src/mesa/main/dlist.c +++ b/mesalib/src/mesa/main/dlist.c @@ -1152,7 +1152,7 @@ save_BlendEquationSeparateEXT(GLenum modeRGB, GLenum modeA) n[2].e = modeA; } if (ctx->ExecuteFlag) { - CALL_BlendEquationSeparateEXT(ctx->Exec, (modeRGB, modeA)); + CALL_BlendEquationSeparate(ctx->Exec, (modeRGB, modeA)); } } @@ -1172,7 +1172,7 @@ save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, n[4].e = dfactorA; } if (ctx->ExecuteFlag) { - CALL_BlendFuncSeparateEXT(ctx->Exec, + CALL_BlendFuncSeparate(ctx->Exec, (sfactorRGB, dfactorRGB, sfactorA, dfactorA)); } } @@ -1703,7 +1703,7 @@ save_ColorMaskIndexed(GLuint buf, GLboolean red, GLboolean green, n[5].b = alpha; } if (ctx->ExecuteFlag) { - /*CALL_ColorMaskIndexedEXT(ctx->Exec, (buf, red, green, blue, alpha));*/ + /*CALL_ColorMaski(ctx->Exec, (buf, red, green, blue, alpha));*/ } } @@ -2276,7 +2276,7 @@ save_DisableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - CALL_DisableIndexedEXT(ctx->Exec, (index, cap)); + CALL_Disablei(ctx->Exec, (index, cap)); } } @@ -2351,7 +2351,7 @@ save_EnableIndexed(GLuint index, GLenum cap) n[2].e = cap; } if (ctx->ExecuteFlag) { - CALL_EnableIndexedEXT(ctx->Exec, (index, cap)); + CALL_Enablei(ctx->Exec, (index, cap)); } } @@ -3254,7 +3254,7 @@ save_PointParameterfvEXT(GLenum pname, const GLfloat *params) n[4].f = params[2]; } if (ctx->ExecuteFlag) { - CALL_PointParameterfvEXT(ctx->Exec, (pname, params)); + CALL_PointParameterfv(ctx->Exec, (pname, params)); } } @@ -4538,7 +4538,7 @@ save_ActiveTextureARB(GLenum target) n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_ActiveTextureARB(ctx->Exec, (target)); + CALL_ActiveTexture(ctx->Exec, (target)); } } @@ -4609,7 +4609,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage1DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat, width, border, imageSize, data)); } @@ -4628,7 +4628,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level, n[7].data = copy_data(data, imageSize, "glCompressedTexImage1DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage1DARB(ctx->Exec, + CALL_CompressedTexImage1D(ctx->Exec, (target, level, internalFormat, width, border, imageSize, data)); } @@ -4645,7 +4645,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_2D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage2DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat, width, height, border, imageSize, data)); } @@ -4665,7 +4665,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level, n[8].data = copy_data(data, imageSize, "glCompressedTexImage2DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage2DARB(ctx->Exec, + CALL_CompressedTexImage2D(ctx->Exec, (target, level, internalFormat, width, height, border, imageSize, data)); } @@ -4682,7 +4682,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_3D) { /* don't compile, execute immediately */ - CALL_CompressedTexImage3DARB(ctx->Exec, (target, level, internalFormat, + CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat, width, height, depth, border, imageSize, data)); } @@ -4703,7 +4703,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level, n[9].data = copy_data(data, imageSize, "glCompressedTexImage3DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexImage3DARB(ctx->Exec, + CALL_CompressedTexImage3D(ctx->Exec, (target, level, internalFormat, width, height, depth, border, imageSize, data)); @@ -4732,7 +4732,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, n[7].data = copy_data(data, imageSize, "glCompressedTexSubImage1DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset, + CALL_CompressedTexSubImage1D(ctx->Exec, (target, level, xoffset, width, format, imageSize, data)); } @@ -4762,7 +4762,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, n[9].data = copy_data(data, imageSize, "glCompressedTexSubImage2DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage2DARB(ctx->Exec, + CALL_CompressedTexSubImage2D(ctx->Exec, (target, level, xoffset, yoffset, width, height, format, imageSize, data)); } @@ -4794,7 +4794,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, n[11].data = copy_data(data, imageSize, "glCompressedTexSubImage3DARB"); } if (ctx->ExecuteFlag) { - CALL_CompressedTexSubImage3DARB(ctx->Exec, + CALL_CompressedTexSubImage3D(ctx->Exec, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data)); @@ -4815,7 +4815,7 @@ save_SampleCoverageARB(GLclampf value, GLboolean invert) n[2].b = invert; } if (ctx->ExecuteFlag) { - CALL_SampleCoverageARB(ctx->Exec, (value, invert)); + CALL_SampleCoverage(ctx->Exec, (value, invert)); } } @@ -4835,7 +4835,7 @@ save_BindProgramNV(GLenum target, GLuint id) n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BindProgramNV(ctx->Exec, (target, id)); + CALL_BindProgramARB(ctx->Exec, (target, id)); } } @@ -5120,7 +5120,7 @@ save_BeginQueryARB(GLenum target, GLuint id) n[2].ui = id; } if (ctx->ExecuteFlag) { - CALL_BeginQueryARB(ctx->Exec, (target, id)); + CALL_BeginQuery(ctx->Exec, (target, id)); } } @@ -5135,7 +5135,7 @@ save_EndQueryARB(GLenum target) n[1].e = target; } if (ctx->ExecuteFlag) { - CALL_EndQueryARB(ctx->Exec, (target)); + CALL_EndQuery(ctx->Exec, (target)); } } @@ -5206,7 +5206,7 @@ save_DrawBuffersARB(GLsizei count, const GLenum * buffers) } } if (ctx->ExecuteFlag) { - CALL_DrawBuffersARB(ctx->Exec, (count, buffers)); + CALL_DrawBuffers(ctx->Exec, (count, buffers)); } } @@ -6022,7 +6022,7 @@ exec_BindAttribLocationARB(GLuint program, GLuint index, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_BindAttribLocationARB(ctx->Exec, (program, index, name)); + CALL_BindAttribLocation(ctx->Exec, (program, index, name)); } static GLint GLAPIENTRY @@ -6030,7 +6030,7 @@ exec_GetAttribLocationARB(GLuint program, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetAttribLocationARB(ctx->Exec, (program, name)); + return CALL_GetAttribLocation(ctx->Exec, (program, name)); } static GLint GLAPIENTRY @@ -6038,7 +6038,7 @@ exec_GetUniformLocationARB(GLuint program, const GLchar *name) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - return CALL_GetUniformLocationARB(ctx->Exec, (program, name)); + return CALL_GetUniformLocation(ctx->Exec, (program, name)); } /* XXX more shader functions needed here */ @@ -6065,7 +6065,7 @@ save_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, n[10].e = filter; } if (ctx->ExecuteFlag) { - CALL_BlitFramebufferEXT(ctx->Exec, (srcX0, srcY0, srcX1, srcY1, + CALL_BlitFramebuffer(ctx->Exec, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter)); } @@ -6084,8 +6084,8 @@ save_ProvokingVertexEXT(GLenum mode) n[1].e = mode; } if (ctx->ExecuteFlag) { - /*CALL_ProvokingVertexEXT(ctx->Exec, (mode));*/ - _mesa_ProvokingVertexEXT(mode); + /*CALL_ProvokingVertex(ctx->Exec, (mode));*/ + _mesa_ProvokingVertex(mode); } } @@ -6102,7 +6102,7 @@ save_BeginTransformFeedback(GLenum mode) n[1].e = mode; } if (ctx->ExecuteFlag) { - CALL_BeginTransformFeedbackEXT(ctx->Exec, (mode)); + CALL_BeginTransformFeedback(ctx->Exec, (mode)); } } @@ -6115,7 +6115,7 @@ save_EndTransformFeedback(void) ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); (void) alloc_instruction(ctx, OPCODE_END_TRANSFORM_FEEDBACK, 0); if (ctx->ExecuteFlag) { - CALL_EndTransformFeedbackEXT(ctx->Exec, ()); + CALL_EndTransformFeedback(ctx->Exec, ()); } } @@ -6240,7 +6240,7 @@ save_UseProgramObjectARB(GLhandleARB program) n[1].ui = program; } if (ctx->ExecuteFlag) { - CALL_UseProgramObjectARB(ctx->Exec, (program)); + CALL_UseProgram(ctx->Exec, (program)); } } @@ -6257,7 +6257,7 @@ save_Uniform1fARB(GLint location, GLfloat x) n[2].f = x; } if (ctx->ExecuteFlag) { - CALL_Uniform1fARB(ctx->Exec, (location, x)); + CALL_Uniform1f(ctx->Exec, (location, x)); } } @@ -6275,7 +6275,7 @@ save_Uniform2fARB(GLint location, GLfloat x, GLfloat y) n[3].f = y; } if (ctx->ExecuteFlag) { - CALL_Uniform2fARB(ctx->Exec, (location, x, y)); + CALL_Uniform2f(ctx->Exec, (location, x, y)); } } @@ -6294,7 +6294,7 @@ save_Uniform3fARB(GLint location, GLfloat x, GLfloat y, GLfloat z) n[4].f = z; } if (ctx->ExecuteFlag) { - CALL_Uniform3fARB(ctx->Exec, (location, x, y, z)); + CALL_Uniform3f(ctx->Exec, (location, x, y, z)); } } @@ -6314,7 +6314,7 @@ save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) n[5].f = w; } if (ctx->ExecuteFlag) { - CALL_Uniform4fARB(ctx->Exec, (location, x, y, z, w)); + CALL_Uniform4f(ctx->Exec, (location, x, y, z, w)); } } @@ -6343,7 +6343,7 @@ save_Uniform1fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 1 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform1fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform1fv(ctx->Exec, (location, count, v)); } } @@ -6360,7 +6360,7 @@ save_Uniform2fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 2 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform2fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform2fv(ctx->Exec, (location, count, v)); } } @@ -6377,7 +6377,7 @@ save_Uniform3fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 3 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform3fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform3fv(ctx->Exec, (location, count, v)); } } @@ -6394,7 +6394,7 @@ save_Uniform4fvARB(GLint location, GLsizei count, const GLfloat *v) n[3].data = memdup(v, count * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform4fvARB(ctx->Exec, (location, count, v)); + CALL_Uniform4fv(ctx->Exec, (location, count, v)); } } @@ -6411,7 +6411,7 @@ save_Uniform1iARB(GLint location, GLint x) n[2].i = x; } if (ctx->ExecuteFlag) { - CALL_Uniform1iARB(ctx->Exec, (location, x)); + CALL_Uniform1i(ctx->Exec, (location, x)); } } @@ -6428,7 +6428,7 @@ save_Uniform2iARB(GLint location, GLint x, GLint y) n[3].i = y; } if (ctx->ExecuteFlag) { - CALL_Uniform2iARB(ctx->Exec, (location, x, y)); + CALL_Uniform2i(ctx->Exec, (location, x, y)); } } @@ -6446,7 +6446,7 @@ save_Uniform3iARB(GLint location, GLint x, GLint y, GLint z) n[4].i = z; } if (ctx->ExecuteFlag) { - CALL_Uniform3iARB(ctx->Exec, (location, x, y, z)); + CALL_Uniform3i(ctx->Exec, (location, x, y, z)); } } @@ -6465,7 +6465,7 @@ save_Uniform4iARB(GLint location, GLint x, GLint y, GLint z, GLint w) n[5].i = w; } if (ctx->ExecuteFlag) { - CALL_Uniform4iARB(ctx->Exec, (location, x, y, z, w)); + CALL_Uniform4i(ctx->Exec, (location, x, y, z, w)); } } @@ -6484,7 +6484,7 @@ save_Uniform1ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 1 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform1ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform1iv(ctx->Exec, (location, count, v)); } } @@ -6501,7 +6501,7 @@ save_Uniform2ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 2 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform2ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform2iv(ctx->Exec, (location, count, v)); } } @@ -6518,7 +6518,7 @@ save_Uniform3ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 3 * sizeof(GLint)); } if (ctx->ExecuteFlag) { - CALL_Uniform3ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform3iv(ctx->Exec, (location, count, v)); } } @@ -6535,7 +6535,7 @@ save_Uniform4ivARB(GLint location, GLsizei count, const GLint *v) n[3].data = memdup(v, count * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_Uniform4ivARB(ctx->Exec, (location, count, v)); + CALL_Uniform4iv(ctx->Exec, (location, count, v)); } } @@ -6698,7 +6698,7 @@ save_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 2 * 2 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix2fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix2fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6717,7 +6717,7 @@ save_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 3 * 3 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix3fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix3fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6736,7 +6736,7 @@ save_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose, n[4].data = memdup(m, count * 4 * 4 * sizeof(GLfloat)); } if (ctx->ExecuteFlag) { - CALL_UniformMatrix4fvARB(ctx->Exec, (location, count, transpose, m)); + CALL_UniformMatrix4fv(ctx->Exec, (location, count, transpose, m)); } } @@ -6869,7 +6869,7 @@ save_ClampColorARB(GLenum target, GLenum clamp) n[2].e = clamp; } if (ctx->ExecuteFlag) { - CALL_ClampColorARB(ctx->Exec, (target, clamp)); + CALL_ClampColor(ctx->Exec, (target, clamp)); } } @@ -6959,7 +6959,7 @@ save_TexParameterIiv(GLenum target, GLenum pname, const GLint *params) n[6].i = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexParameterIivEXT(ctx->Exec, (target, pname, params)); + CALL_TexParameterIiv(ctx->Exec, (target, pname, params)); } } @@ -6980,7 +6980,7 @@ save_TexParameterIuiv(GLenum target, GLenum pname, const GLuint *params) n[6].ui = params[3]; } if (ctx->ExecuteFlag) { - CALL_TexParameterIuivEXT(ctx->Exec, (target, pname, params)); + CALL_TexParameterIuiv(ctx->Exec, (target, pname, params)); } } @@ -6990,7 +6990,7 @@ exec_GetTexParameterIiv(GLenum target, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameterIivEXT(ctx->Exec, (target, pname, params)); + CALL_GetTexParameterIiv(ctx->Exec, (target, pname, params)); } /** GL_EXT_texture_integer */ @@ -6999,7 +6999,7 @@ exec_GetTexParameterIuiv(GLenum target, GLenum pname, GLuint *params) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetTexParameterIuivEXT(ctx->Exec, (target, pname, params)); + CALL_GetTexParameterIuiv(ctx->Exec, (target, pname, params)); } @@ -7016,7 +7016,7 @@ save_VertexAttribDivisor(GLuint index, GLuint divisor) n[2].ui = divisor; } if (ctx->ExecuteFlag) { - CALL_VertexAttribDivisorARB(ctx->Exec, (index, divisor)); + CALL_VertexAttribDivisor(ctx->Exec, (index, divisor)); } } @@ -7257,7 +7257,7 @@ save_BeginConditionalRender(GLuint queryId, GLenum mode) n[2].e = mode; } if (ctx->ExecuteFlag) { - CALL_BeginConditionalRenderNV(ctx->Exec, (queryId, mode)); + CALL_BeginConditionalRender(ctx->Exec, (queryId, mode)); } } @@ -7268,7 +7268,7 @@ save_EndConditionalRender(void) ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx); alloc_instruction(ctx, OPCODE_END_CONDITIONAL_RENDER, 0); if (ctx->ExecuteFlag) { - CALL_EndConditionalRenderNV(ctx->Exec, ()); + CALL_EndConditionalRender(ctx->Exec, ()); } } @@ -7412,10 +7412,10 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_BlendEquation(ctx->Exec, (n[1].e)); break; case OPCODE_BLEND_EQUATION_SEPARATE: - CALL_BlendEquationSeparateEXT(ctx->Exec, (n[1].e, n[2].e)); + CALL_BlendEquationSeparate(ctx->Exec, (n[1].e, n[2].e)); break; case OPCODE_BLEND_FUNC_SEPARATE: - CALL_BlendFuncSeparateEXT(ctx->Exec, + CALL_BlendFuncSeparate(ctx->Exec, (n[1].e, n[2].e, n[3].e, n[4].e)); break; @@ -7520,7 +7520,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ColorMask(ctx->Exec, (n[1].b, n[2].b, n[3].b, n[4].b)); break; case OPCODE_COLOR_MASK_INDEXED: - CALL_ColorMaskIndexedEXT(ctx->Exec, (n[1].ui, n[2].b, n[3].b, + CALL_ColorMaski(ctx->Exec, (n[1].ui, n[2].b, n[3].b, n[4].b, n[5].b)); break; case OPCODE_COLOR_MATERIAL: @@ -7666,7 +7666,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_Disable(ctx->Exec, (n[1].e)); break; case OPCODE_DISABLE_INDEXED: - CALL_DisableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); + CALL_Disablei(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_DRAW_BUFFER: CALL_DrawBuffer(ctx->Exec, (n[1].e)); @@ -7684,7 +7684,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_Enable(ctx->Exec, (n[1].e)); break; case OPCODE_ENABLE_INDEXED: - CALL_EnableIndexedEXT(ctx->Exec, (n[1].ui, n[2].e)); + CALL_Enablei(ctx->Exec, (n[1].ui, n[2].e)); break; case OPCODE_EVALMESH1: CALL_EvalMesh1(ctx->Exec, (n[1].e, n[2].i, n[3].i)); @@ -7852,7 +7852,7 @@ execute_list(struct gl_context *ctx, GLuint list) params[0] = n[2].f; params[1] = n[3].f; params[2] = n[4].f; - CALL_PointParameterfvEXT(ctx->Exec, (n[1].e, params)); + CALL_PointParameterfv(ctx->Exec, (n[1].e, params)); } break; case OPCODE_POLYGON_MODE: @@ -7915,7 +7915,7 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ShadeModel(ctx->Exec, (n[1].e)); break; case OPCODE_PROVOKING_VERTEX: - CALL_ProvokingVertexEXT(ctx->Exec, (n[1].e)); + CALL_ProvokingVertex(ctx->Exec, (n[1].e)); break; case OPCODE_STENCIL_FUNC: CALL_StencilFunc(ctx->Exec, (n[1].e, n[2].i, n[3].ui)); @@ -8058,49 +8058,49 @@ execute_list(struct gl_context *ctx, GLuint list) 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)); + CALL_ActiveTexture(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, + CALL_CompressedTexImage1D(ctx->Exec, (n[1].e, n[2].i, n[3].e, n[4].i, n[5].i, n[6].i, n[7].data)); break; case OPCODE_COMPRESSED_TEX_IMAGE_2D: /* GL_ARB_texture_compression */ - CALL_CompressedTexImage2DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, + CALL_CompressedTexImage2D(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)); break; case OPCODE_COMPRESSED_TEX_IMAGE_3D: /* GL_ARB_texture_compression */ - CALL_CompressedTexImage3DARB(ctx->Exec, (n[1].e, n[2].i, n[3].e, + CALL_CompressedTexImage3D(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)); break; case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D: /* GL_ARB_texture_compress */ - CALL_CompressedTexSubImage1DARB(ctx->Exec, + CALL_CompressedTexSubImage1D(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, + CALL_CompressedTexSubImage2D(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, + CALL_CompressedTexSubImage3D(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 */ - CALL_SampleCoverageARB(ctx->Exec, (n[1].f, n[2].b)); + CALL_SampleCoverage(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)); + CALL_WindowPos3f(ctx->Exec, (n[1].f, n[2].f, n[3].f)); break; case OPCODE_BIND_PROGRAM_NV: /* GL_ARB_vertex_program */ - CALL_BindProgramNV(ctx->Exec, (n[1].e, n[2].ui)); + CALL_BindProgramARB(ctx->Exec, (n[1].e, n[2].ui)); break; case OPCODE_PROGRAM_LOCAL_PARAMETER_ARB: CALL_ProgramLocalParameter4fARB(ctx->Exec, @@ -8123,10 +8123,10 @@ execute_list(struct gl_context *ctx, GLuint list) n[6].f)); break; case OPCODE_BEGIN_QUERY_ARB: - CALL_BeginQueryARB(ctx->Exec, (n[1].e, n[2].ui)); + CALL_BeginQuery(ctx->Exec, (n[1].e, n[2].ui)); break; case OPCODE_END_QUERY_ARB: - CALL_EndQueryARB(ctx->Exec, (n[1].e)); + CALL_EndQuery(ctx->Exec, (n[1].e)); break; case OPCODE_QUERY_COUNTER: CALL_QueryCounter(ctx->Exec, (n[1].ui, n[2].e)); @@ -8143,16 +8143,16 @@ execute_list(struct gl_context *ctx, GLuint list) 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)); + CALL_DrawBuffers(ctx->Exec, (n[1].i, buffers)); } break; case OPCODE_BLIT_FRAMEBUFFER: - CALL_BlitFramebufferEXT(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, + CALL_BlitFramebuffer(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_USE_PROGRAM: - CALL_UseProgramObjectARB(ctx->Exec, (n[1].ui)); + CALL_UseProgram(ctx->Exec, (n[1].ui)); break; case OPCODE_USE_SHADER_PROGRAM_EXT: CALL_UseShaderProgramEXT(ctx->Exec, (n[1].ui, n[2].ui)); @@ -8161,54 +8161,54 @@ execute_list(struct gl_context *ctx, GLuint list) CALL_ActiveProgramEXT(ctx->Exec, (n[1].ui)); break; case OPCODE_UNIFORM_1F: - CALL_Uniform1fARB(ctx->Exec, (n[1].i, n[2].f)); + CALL_Uniform1f(ctx->Exec, (n[1].i, n[2].f)); break; case OPCODE_UNIFORM_2F: - CALL_Uniform2fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f)); + CALL_Uniform2f(ctx->Exec, (n[1].i, n[2].f, n[3].f)); break; case OPCODE_UNIFORM_3F: - CALL_Uniform3fARB(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f)); + CALL_Uniform3f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f)); break; case OPCODE_UNIFORM_4F: - CALL_Uniform4fARB(ctx->Exec, + CALL_Uniform4f(ctx->Exec, (n[1].i, n[2].f, n[3].f, n[4].f, n[5].f)); break; case OPCODE_UNIFORM_1FV: - CALL_Uniform1fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform1fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_2FV: - CALL_Uniform2fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform2fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_3FV: - CALL_Uniform3fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform3fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_4FV: - CALL_Uniform4fvARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform4fv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_1I: - CALL_Uniform1iARB(ctx->Exec, (n[1].i, n[2].i)); + CALL_Uniform1i(ctx->Exec, (n[1].i, n[2].i)); break; case OPCODE_UNIFORM_2I: - CALL_Uniform2iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i)); + CALL_Uniform2i(ctx->Exec, (n[1].i, n[2].i, n[3].i)); break; case OPCODE_UNIFORM_3I: - CALL_Uniform3iARB(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i)); + CALL_Uniform3i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i)); break; case OPCODE_UNIFORM_4I: - CALL_Uniform4iARB(ctx->Exec, + CALL_Uniform4i(ctx->Exec, (n[1].i, n[2].i, n[3].i, n[4].i, n[5].i)); break; case OPCODE_UNIFORM_1IV: - CALL_Uniform1ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform1iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_2IV: - CALL_Uniform2ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform2iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_3IV: - CALL_Uniform3ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform3iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_4IV: - CALL_Uniform4ivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data)); + CALL_Uniform4iv(ctx->Exec, (n[1].i, n[2].i, n[3].data)); break; case OPCODE_UNIFORM_1UI: /*CALL_Uniform1uiARB(ctx->Exec, (n[1].i, n[2].i));*/ @@ -8237,15 +8237,15 @@ execute_list(struct gl_context *ctx, GLuint list) /*CALL_Uniform4uivARB(ctx->Exec, (n[1].i, n[2].i, n[3].data));*/ break; case OPCODE_UNIFORM_MATRIX22: - CALL_UniformMatrix2fvARB(ctx->Exec, + CALL_UniformMatrix2fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX33: - CALL_UniformMatrix3fvARB(ctx->Exec, + CALL_UniformMatrix3fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX44: - CALL_UniformMatrix4fvARB(ctx->Exec, + CALL_UniformMatrix4fv(ctx->Exec, (n[1].i, n[2].i, n[3].b, n[4].data)); break; case OPCODE_UNIFORM_MATRIX23: @@ -8274,7 +8274,7 @@ execute_list(struct gl_context *ctx, GLuint list) break; case OPCODE_CLAMP_COLOR: - CALL_ClampColorARB(ctx->Exec, (n[1].e, n[2].e)); + CALL_ClampColor(ctx->Exec, (n[1].e, n[2].e)); break; case OPCODE_TEX_BUMP_PARAMETER_ATI: @@ -8407,7 +8407,7 @@ execute_list(struct gl_context *ctx, GLuint list) params[1] = n[4].i; params[2] = n[5].i; params[3] = n[6].i; - CALL_TexParameterIivEXT(ctx->Exec, (n[1].e, n[2].e, params)); + CALL_TexParameterIiv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_TEXPARAMETER_UI: @@ -8417,13 +8417,13 @@ execute_list(struct gl_context *ctx, GLuint list) params[1] = n[4].ui; params[2] = n[5].ui; params[3] = n[6].ui; - CALL_TexParameterIuivEXT(ctx->Exec, (n[1].e, n[2].e, params)); + CALL_TexParameterIuiv(ctx->Exec, (n[1].e, n[2].e, params)); } break; case OPCODE_VERTEX_ATTRIB_DIVISOR: /* GL_ARB_instanced_arrays */ - CALL_VertexAttribDivisorARB(ctx->Exec, (n[1].ui, n[2].ui)); + CALL_VertexAttribDivisor(ctx->Exec, (n[1].ui, n[2].ui)); break; case OPCODE_TEXTURE_BARRIER_NV: @@ -8432,10 +8432,10 @@ execute_list(struct gl_context *ctx, GLuint list) /* GL_EXT/ARB_transform_feedback */ case OPCODE_BEGIN_TRANSFORM_FEEDBACK: - CALL_BeginTransformFeedbackEXT(ctx->Exec, (n[1].e)); + CALL_BeginTransformFeedback(ctx->Exec, (n[1].e)); break; case OPCODE_END_TRANSFORM_FEEDBACK: - CALL_EndTransformFeedbackEXT(ctx->Exec, ()); + CALL_EndTransformFeedback(ctx->Exec, ()); break; case OPCODE_BIND_TRANSFORM_FEEDBACK: CALL_BindTransformFeedback(ctx->Exec, (n[1].e, n[2].ui)); @@ -8532,10 +8532,10 @@ execute_list(struct gl_context *ctx, GLuint list) /* GL_NV_conditional_render */ case OPCODE_BEGIN_CONDITIONAL_RENDER: - CALL_BeginConditionalRenderNV(ctx->Exec, (n[1].i, n[2].e)); + CALL_BeginConditionalRender(ctx->Exec, (n[1].i, n[2].e)); break; case OPCODE_END_CONDITIONAL_RENDER: - CALL_EndConditionalRenderNV(ctx->Exec, ()); + CALL_EndConditionalRender(ctx->Exec, ()); break; case OPCODE_UNIFORM_BLOCK_BINDING: @@ -9280,7 +9280,7 @@ exec_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid * img) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_GetCompressedTexImageARB(ctx->Exec, (target, level, img)); + CALL_GetCompressedTexImage(ctx->Exec, (target, level, img)); } static void GLAPIENTRY @@ -9508,7 +9508,7 @@ exec_ClientActiveTextureARB(GLenum target) { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_ClientActiveTextureARB(ctx->Exec, (target)); + CALL_ClientActiveTexture(ctx->Exec, (target)); } static void GLAPIENTRY @@ -9517,7 +9517,7 @@ exec_SecondaryColorPointerEXT(GLint size, GLenum type, { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_SecondaryColorPointerEXT(ctx->Exec, (size, type, stride, ptr)); + CALL_SecondaryColorPointer(ctx->Exec, (size, type, stride, ptr)); } static void GLAPIENTRY @@ -9525,7 +9525,7 @@ 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_FogCoordPointer(ctx->Exec, (type, stride, ptr)); } /* GL_EXT_multi_draw_arrays */ @@ -9535,7 +9535,7 @@ exec_MultiDrawArraysEXT(GLenum mode, const GLint *first, { GET_CURRENT_CONTEXT(ctx); FLUSH_VERTICES(ctx, 0); - CALL_MultiDrawArraysEXT(ctx->Exec, (mode, first, count, primcount)); + CALL_MultiDrawArrays(ctx->Exec, (mode, first, count, primcount)); } /* GL_IBM_multimode_draw_arrays */ @@ -9599,7 +9599,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_ClearStencil(table, save_ClearStencil); SET_ClipPlane(table, save_ClipPlane); SET_ColorMask(table, save_ColorMask); - SET_ColorMaskIndexedEXT(table, save_ColorMaskIndexed); + SET_ColorMaski(table, save_ColorMaskIndexed); SET_ColorMaterial(table, save_ColorMaterial); SET_CopyPixels(table, save_CopyPixels); SET_CullFace(table, save_CullFace); @@ -9608,11 +9608,11 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_DepthMask(table, save_DepthMask); SET_DepthRange(table, save_DepthRange); SET_Disable(table, save_Disable); - SET_DisableIndexedEXT(table, save_DisableIndexed); + SET_Disablei(table, save_DisableIndexed); SET_DrawBuffer(table, save_DrawBuffer); SET_DrawPixels(table, save_DrawPixels); SET_Enable(table, save_Enable); - SET_EnableIndexedEXT(table, save_EnableIndexed); + SET_Enablei(table, save_EnableIndexed); SET_EndList(table, _mesa_EndList); SET_EvalMesh1(table, save_EvalMesh1); SET_EvalMesh2(table, save_EvalMesh2); @@ -9878,45 +9878,45 @@ _mesa_create_save_table(const struct gl_context *ctx) #endif /* 54. GL_EXT_point_parameters */ - SET_PointParameterfEXT(table, save_PointParameterfEXT); - SET_PointParameterfvEXT(table, save_PointParameterfvEXT); + SET_PointParameterf(table, save_PointParameterfEXT); + SET_PointParameterfv(table, save_PointParameterfvEXT); /* 97. GL_EXT_compiled_vertex_array */ SET_LockArraysEXT(table, exec_LockArraysEXT); SET_UnlockArraysEXT(table, exec_UnlockArraysEXT); /* 145. GL_EXT_secondary_color */ - SET_SecondaryColorPointerEXT(table, exec_SecondaryColorPointerEXT); + SET_SecondaryColorPointer(table, exec_SecondaryColorPointerEXT); /* 148. GL_EXT_multi_draw_arrays */ - SET_MultiDrawArraysEXT(table, exec_MultiDrawArraysEXT); + SET_MultiDrawArrays(table, exec_MultiDrawArraysEXT); /* 149. GL_EXT_fog_coord */ - SET_FogCoordPointerEXT(table, exec_FogCoordPointerEXT); + SET_FogCoordPointer(table, exec_FogCoordPointerEXT); /* 173. GL_EXT_blend_func_separate */ - SET_BlendFuncSeparateEXT(table, save_BlendFuncSeparateEXT); + SET_BlendFuncSeparate(table, save_BlendFuncSeparateEXT); /* 196. GL_MESA_resize_buffers */ SET_ResizeBuffersMESA(table, _mesa_ResizeBuffersMESA); /* 197. GL_MESA_window_pos */ - SET_WindowPos2dMESA(table, save_WindowPos2dMESA); - SET_WindowPos2dvMESA(table, save_WindowPos2dvMESA); - SET_WindowPos2fMESA(table, save_WindowPos2fMESA); - SET_WindowPos2fvMESA(table, save_WindowPos2fvMESA); - SET_WindowPos2iMESA(table, save_WindowPos2iMESA); - SET_WindowPos2ivMESA(table, save_WindowPos2ivMESA); - SET_WindowPos2sMESA(table, save_WindowPos2sMESA); - SET_WindowPos2svMESA(table, save_WindowPos2svMESA); - SET_WindowPos3dMESA(table, save_WindowPos3dMESA); - SET_WindowPos3dvMESA(table, save_WindowPos3dvMESA); - SET_WindowPos3fMESA(table, save_WindowPos3fMESA); - SET_WindowPos3fvMESA(table, save_WindowPos3fvMESA); - SET_WindowPos3iMESA(table, save_WindowPos3iMESA); - SET_WindowPos3ivMESA(table, save_WindowPos3ivMESA); - SET_WindowPos3sMESA(table, save_WindowPos3sMESA); - SET_WindowPos3svMESA(table, save_WindowPos3svMESA); + SET_WindowPos2d(table, save_WindowPos2dMESA); + SET_WindowPos2dv(table, save_WindowPos2dvMESA); + SET_WindowPos2f(table, save_WindowPos2fMESA); + SET_WindowPos2fv(table, save_WindowPos2fvMESA); + SET_WindowPos2i(table, save_WindowPos2iMESA); + SET_WindowPos2iv(table, save_WindowPos2ivMESA); + SET_WindowPos2s(table, save_WindowPos2sMESA); + SET_WindowPos2sv(table, save_WindowPos2svMESA); + SET_WindowPos3d(table, save_WindowPos3dMESA); + SET_WindowPos3dv(table, save_WindowPos3dvMESA); + SET_WindowPos3f(table, save_WindowPos3fMESA); + SET_WindowPos3fv(table, save_WindowPos3fvMESA); + SET_WindowPos3i(table, save_WindowPos3iMESA); + SET_WindowPos3iv(table, save_WindowPos3ivMESA); + SET_WindowPos3s(table, save_WindowPos3sMESA); + SET_WindowPos3sv(table, save_WindowPos3svMESA); SET_WindowPos4dMESA(table, save_WindowPos4dMESA); SET_WindowPos4dvMESA(table, save_WindowPos4dvMESA); SET_WindowPos4fMESA(table, save_WindowPos4fMESA); @@ -9935,10 +9935,10 @@ _mesa_create_save_table(const struct gl_context *ctx) * AreProgramsResidentNV, IsProgramNV, GenProgramsNV, DeleteProgramsNV, * VertexAttribPointerNV, GetProgram*, GetVertexAttrib* */ - SET_BindProgramNV(table, save_BindProgramNV); - SET_DeleteProgramsNV(table, _mesa_DeletePrograms); - SET_GenProgramsNV(table, _mesa_GenPrograms); - SET_IsProgramNV(table, _mesa_IsProgramARB); + SET_BindProgramARB(table, save_BindProgramNV); + SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB); + SET_GenProgramsARB(table, _mesa_GenProgramsARB); + SET_IsProgramARB(table, _mesa_IsProgramARB); /* 244. GL_ATI_envmap_bumpmap */ SET_TexBumpParameterivATI(table, save_TexBumpParameterivATI); @@ -9949,32 +9949,32 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_SetFragmentShaderConstantATI(table, save_SetFragmentShaderConstantATI); /* 262. GL_NV_point_sprite */ - SET_PointParameteriNV(table, save_PointParameteriNV); - SET_PointParameterivNV(table, save_PointParameterivNV); + SET_PointParameteri(table, save_PointParameteriNV); + SET_PointParameteriv(table, save_PointParameterivNV); /* 268. GL_EXT_stencil_two_side */ SET_ActiveStencilFaceEXT(table, save_ActiveStencilFaceEXT); /* 273. GL_APPLE_vertex_array_object */ SET_BindVertexArrayAPPLE(table, _mesa_BindVertexArrayAPPLE); - SET_DeleteVertexArraysAPPLE(table, _mesa_DeleteVertexArraysAPPLE); + SET_DeleteVertexArrays(table, _mesa_DeleteVertexArrays); SET_GenVertexArraysAPPLE(table, _mesa_GenVertexArraysAPPLE); - SET_IsVertexArrayAPPLE(table, _mesa_IsVertexArrayAPPLE); + SET_IsVertexArray(table, _mesa_IsVertexArray); /* 310. GL_EXT_framebuffer_object */ - SET_GenFramebuffersEXT(table, _mesa_GenFramebuffersEXT); - SET_BindFramebufferEXT(table, _mesa_BindFramebufferEXT); - SET_DeleteFramebuffersEXT(table, _mesa_DeleteFramebuffersEXT); - SET_CheckFramebufferStatusEXT(table, _mesa_CheckFramebufferStatusEXT); - SET_GenRenderbuffersEXT(table, _mesa_GenRenderbuffersEXT); - SET_BindRenderbufferEXT(table, _mesa_BindRenderbufferEXT); - SET_DeleteRenderbuffersEXT(table, _mesa_DeleteRenderbuffersEXT); - SET_RenderbufferStorageEXT(table, _mesa_RenderbufferStorageEXT); - SET_FramebufferTexture1DEXT(table, _mesa_FramebufferTexture1DEXT); - SET_FramebufferTexture2DEXT(table, _mesa_FramebufferTexture2DEXT); - SET_FramebufferTexture3DEXT(table, _mesa_FramebufferTexture3DEXT); - SET_FramebufferRenderbufferEXT(table, _mesa_FramebufferRenderbufferEXT); - SET_GenerateMipmapEXT(table, _mesa_GenerateMipmapEXT); + SET_GenFramebuffers(table, _mesa_GenFramebuffers); + SET_BindFramebuffer(table, _mesa_BindFramebuffer); + SET_DeleteFramebuffers(table, _mesa_DeleteFramebuffers); + SET_CheckFramebufferStatus(table, _mesa_CheckFramebufferStatus); + SET_GenRenderbuffers(table, _mesa_GenRenderbuffers); + SET_BindRenderbuffer(table, _mesa_BindRenderbuffer); + SET_DeleteRenderbuffers(table, _mesa_DeleteRenderbuffers); + SET_RenderbufferStorage(table, _mesa_RenderbufferStorage); + SET_FramebufferTexture1D(table, _mesa_FramebufferTexture1D); + SET_FramebufferTexture2D(table, _mesa_FramebufferTexture2D); + SET_FramebufferTexture3D(table, _mesa_FramebufferTexture3D); + SET_FramebufferRenderbuffer(table, _mesa_FramebufferRenderbuffer); + SET_GenerateMipmap(table, _mesa_GenerateMipmap); /* 317. GL_EXT_framebuffer_multisample */ SET_RenderbufferStorageMultisample(table, _mesa_RenderbufferStorageMultisample); @@ -9987,26 +9987,26 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_DepthBoundsEXT(table, save_DepthBoundsEXT); /* ARB 1. GL_ARB_multitexture */ - SET_ActiveTextureARB(table, save_ActiveTextureARB); - SET_ClientActiveTextureARB(table, exec_ClientActiveTextureARB); + SET_ActiveTexture(table, save_ActiveTextureARB); + SET_ClientActiveTexture(table, exec_ClientActiveTextureARB); /* ARB 3. GL_ARB_transpose_matrix */ - SET_LoadTransposeMatrixdARB(table, save_LoadTransposeMatrixdARB); - SET_LoadTransposeMatrixfARB(table, save_LoadTransposeMatrixfARB); - SET_MultTransposeMatrixdARB(table, save_MultTransposeMatrixdARB); - SET_MultTransposeMatrixfARB(table, save_MultTransposeMatrixfARB); + SET_LoadTransposeMatrixd(table, save_LoadTransposeMatrixdARB); + SET_LoadTransposeMatrixf(table, save_LoadTransposeMatrixfARB); + SET_MultTransposeMatrixd(table, save_MultTransposeMatrixdARB); + SET_MultTransposeMatrixf(table, save_MultTransposeMatrixfARB); /* ARB 5. GL_ARB_multisample */ - SET_SampleCoverageARB(table, save_SampleCoverageARB); + SET_SampleCoverage(table, save_SampleCoverageARB); /* ARB 12. GL_ARB_texture_compression */ - SET_CompressedTexImage3DARB(table, save_CompressedTexImage3DARB); - SET_CompressedTexImage2DARB(table, save_CompressedTexImage2DARB); - SET_CompressedTexImage1DARB(table, save_CompressedTexImage1DARB); - SET_CompressedTexSubImage3DARB(table, save_CompressedTexSubImage3DARB); - SET_CompressedTexSubImage2DARB(table, save_CompressedTexSubImage2DARB); - SET_CompressedTexSubImage1DARB(table, save_CompressedTexSubImage1DARB); - SET_GetCompressedTexImageARB(table, exec_GetCompressedTexImageARB); + SET_CompressedTexImage3D(table, save_CompressedTexImage3DARB); + SET_CompressedTexImage2D(table, save_CompressedTexImage2DARB); + SET_CompressedTexImage1D(table, save_CompressedTexImage1DARB); + SET_CompressedTexSubImage3D(table, save_CompressedTexSubImage3DARB); + SET_CompressedTexSubImage2D(table, save_CompressedTexSubImage2DARB); + SET_CompressedTexSubImage1D(table, save_CompressedTexSubImage1DARB); + SET_GetCompressedTexImage(table, exec_GetCompressedTexImageARB); /* ARB 14. GL_ARB_point_parameters */ /* aliased with EXT_point_parameters functions */ @@ -10017,18 +10017,18 @@ _mesa_create_save_table(const struct gl_context *ctx) /* ARB 26. GL_ARB_vertex_program */ /* ARB 27. GL_ARB_fragment_program */ /* glVertexAttrib* functions alias the NV ones, handled elsewhere */ - SET_VertexAttribPointerARB(table, _mesa_VertexAttribPointerARB); - SET_EnableVertexAttribArrayARB(table, _mesa_EnableVertexAttribArrayARB); - SET_DisableVertexAttribArrayARB(table, _mesa_DisableVertexAttribArrayARB); + SET_VertexAttribPointer(table, _mesa_VertexAttribPointer); + SET_EnableVertexAttribArray(table, _mesa_EnableVertexAttribArray); + SET_DisableVertexAttribArray(table, _mesa_DisableVertexAttribArray); SET_ProgramStringARB(table, save_ProgramStringARB); - SET_BindProgramNV(table, save_BindProgramNV); - SET_DeleteProgramsNV(table, _mesa_DeletePrograms); - SET_GenProgramsNV(table, _mesa_GenPrograms); - SET_IsProgramNV(table, _mesa_IsProgramARB); - SET_GetVertexAttribdvARB(table, _mesa_GetVertexAttribdvARB); - SET_GetVertexAttribfvARB(table, _mesa_GetVertexAttribfvARB); - SET_GetVertexAttribivARB(table, _mesa_GetVertexAttribivARB); - SET_GetVertexAttribPointervNV(table, _mesa_GetVertexAttribPointervARB); + SET_BindProgramARB(table, save_BindProgramNV); + SET_DeleteProgramsARB(table, _mesa_DeleteProgramsARB); + SET_GenProgramsARB(table, _mesa_GenProgramsARB); + SET_IsProgramARB(table, _mesa_IsProgramARB); + SET_GetVertexAttribdv(table, _mesa_GetVertexAttribdv); + SET_GetVertexAttribfv(table, _mesa_GetVertexAttribfv); + SET_GetVertexAttribiv(table, _mesa_GetVertexAttribiv); + SET_GetVertexAttribPointerv(table, _mesa_GetVertexAttribPointerv); SET_ProgramEnvParameter4dARB(table, save_ProgramEnvParameter4dARB); SET_ProgramEnvParameter4dvARB(table, save_ProgramEnvParameter4dvARB); SET_ProgramEnvParameter4fARB(table, save_ProgramEnvParameter4fARB); @@ -10048,49 +10048,49 @@ _mesa_create_save_table(const struct gl_context *ctx) /* ARB 28. GL_ARB_vertex_buffer_object */ /* None of the extension's functions get compiled */ - SET_BindBufferARB(table, _mesa_BindBufferARB); - SET_BufferDataARB(table, _mesa_BufferDataARB); - SET_BufferSubDataARB(table, _mesa_BufferSubDataARB); - SET_DeleteBuffersARB(table, _mesa_DeleteBuffersARB); - SET_GenBuffersARB(table, _mesa_GenBuffersARB); - SET_GetBufferParameterivARB(table, _mesa_GetBufferParameterivARB); - SET_GetBufferPointervARB(table, _mesa_GetBufferPointervARB); - SET_GetBufferSubDataARB(table, _mesa_GetBufferSubDataARB); - SET_IsBufferARB(table, _mesa_IsBufferARB); - SET_MapBufferARB(table, _mesa_MapBufferARB); - SET_UnmapBufferARB(table, _mesa_UnmapBufferARB); + SET_BindBuffer(table, _mesa_BindBuffer); + SET_BufferData(table, _mesa_BufferData); + SET_BufferSubData(table, _mesa_BufferSubData); + SET_DeleteBuffers(table, _mesa_DeleteBuffers); + SET_GenBuffers(table, _mesa_GenBuffers); + SET_GetBufferParameteriv(table, _mesa_GetBufferParameteriv); + SET_GetBufferPointerv(table, _mesa_GetBufferPointerv); + SET_GetBufferSubData(table, _mesa_GetBufferSubData); + SET_IsBuffer(table, _mesa_IsBuffer); + SET_MapBuffer(table, _mesa_MapBuffer); + SET_UnmapBuffer(table, _mesa_UnmapBuffer); _mesa_init_queryobj_dispatch(ctx, table); /* glGetQuery, etc */ - SET_BeginQueryARB(table, save_BeginQueryARB); - SET_EndQueryARB(table, save_EndQueryARB); + SET_BeginQuery(table, save_BeginQueryARB); + SET_EndQuery(table, save_EndQueryARB); SET_QueryCounter(table, save_QueryCounter); - SET_DrawBuffersARB(table, save_DrawBuffersARB); + SET_DrawBuffers(table, save_DrawBuffersARB); - SET_BlitFramebufferEXT(table, save_BlitFramebufferEXT); + SET_BlitFramebuffer(table, save_BlitFramebufferEXT); /* GL_ARB_shader_objects */ _mesa_init_shader_dispatch(ctx, table); /* Plug in glCreate/Delete/Get, etc */ - SET_UseProgramObjectARB(table, save_UseProgramObjectARB); - SET_Uniform1fARB(table, save_Uniform1fARB); - SET_Uniform2fARB(table, save_Uniform2fARB); - SET_Uniform3fARB(table, save_Uniform3fARB); - SET_Uniform4fARB(table, save_Uniform4fARB); - SET_Uniform1fvARB(table, save_Uniform1fvARB); - SET_Uniform2fvARB(table, save_Uniform2fvARB); - SET_Uniform3fvARB(table, save_Uniform3fvARB); - SET_Uniform4fvARB(table, save_Uniform4fvARB); - SET_Uniform1iARB(table, save_Uniform1iARB); - SET_Uniform2iARB(table, save_Uniform2iARB); - SET_Uniform3iARB(table, save_Uniform3iARB); - SET_Uniform4iARB(table, save_Uniform4iARB); - SET_Uniform1ivARB(table, save_Uniform1ivARB); - SET_Uniform2ivARB(table, save_Uniform2ivARB); - SET_Uniform3ivARB(table, save_Uniform3ivARB); - SET_Uniform4ivARB(table, save_Uniform4ivARB); - SET_UniformMatrix2fvARB(table, save_UniformMatrix2fvARB); - SET_UniformMatrix3fvARB(table, save_UniformMatrix3fvARB); - SET_UniformMatrix4fvARB(table, save_UniformMatrix4fvARB); + SET_UseProgram(table, save_UseProgramObjectARB); + SET_Uniform1f(table, save_Uniform1fARB); + SET_Uniform2f(table, save_Uniform2fARB); + SET_Uniform3f(table, save_Uniform3fARB); + SET_Uniform4f(table, save_Uniform4fARB); + SET_Uniform1fv(table, save_Uniform1fvARB); + SET_Uniform2fv(table, save_Uniform2fvARB); + SET_Uniform3fv(table, save_Uniform3fvARB); + SET_Uniform4fv(table, save_Uniform4fvARB); + SET_Uniform1i(table, save_Uniform1iARB); + SET_Uniform2i(table, save_Uniform2iARB); + SET_Uniform3i(table, save_Uniform3iARB); + SET_Uniform4i(table, save_Uniform4iARB); + SET_Uniform1iv(table, save_Uniform1ivARB); + SET_Uniform2iv(table, save_Uniform2ivARB); + SET_Uniform3iv(table, save_Uniform3ivARB); + SET_Uniform4iv(table, save_Uniform4ivARB); + SET_UniformMatrix2fv(table, save_UniformMatrix2fvARB); + SET_UniformMatrix3fv(table, save_UniformMatrix3fvARB); + SET_UniformMatrix4fv(table, save_UniformMatrix4fvARB); SET_UniformMatrix2x3fv(table, save_UniformMatrix2x3fv); SET_UniformMatrix3x2fv(table, save_UniformMatrix3x2fv); SET_UniformMatrix2x4fv(table, save_UniformMatrix2x4fv); @@ -10099,13 +10099,13 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_UniformMatrix4x3fv(table, save_UniformMatrix4x3fv); /* ARB 30/31/32. GL_ARB_shader_objects, GL_ARB_vertex/fragment_shader */ - SET_BindAttribLocationARB(table, exec_BindAttribLocationARB); - SET_GetAttribLocationARB(table, exec_GetAttribLocationARB); - SET_GetUniformLocationARB(table, exec_GetUniformLocationARB); + SET_BindAttribLocation(table, exec_BindAttribLocationARB); + SET_GetAttribLocation(table, exec_GetAttribLocationARB); + SET_GetUniformLocation(table, exec_GetUniformLocationARB); /* XXX additional functions need to be implemented here! */ /* 299. GL_EXT_blend_equation_separate */ - SET_BlendEquationSeparateEXT(table, save_BlendEquationSeparateEXT); + SET_BlendEquationSeparate(table, save_BlendEquationSeparateEXT); /* GL_EXT_gpu_program_parameters */ SET_ProgramEnvParameters4fvEXT(table, save_ProgramEnvParameters4fvEXT); @@ -10116,13 +10116,13 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */ /* ARB 51. GL_ARB_texture_buffer_object */ - SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */ + SET_TexBuffer(table, _mesa_TexBuffer); /* no dlist save */ /* ARB 59. GL_ARB_copy_buffer */ SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */ /* 364. GL_EXT_provoking_vertex */ - SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT); + SET_ProvokingVertex(table, save_ProvokingVertexEXT); /* 371. GL_APPLE_object_purgeable */ SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE); @@ -10132,17 +10132,17 @@ _mesa_create_save_table(const struct gl_context *ctx) /* GL_EXT_texture_integer */ SET_ClearColorIiEXT(table, save_ClearColorIi); SET_ClearColorIuiEXT(table, save_ClearColorIui); - SET_TexParameterIivEXT(table, save_TexParameterIiv); - SET_TexParameterIuivEXT(table, save_TexParameterIuiv); - SET_GetTexParameterIivEXT(table, exec_GetTexParameterIiv); - SET_GetTexParameterIuivEXT(table, exec_GetTexParameterIuiv); + SET_TexParameterIiv(table, save_TexParameterIiv); + SET_TexParameterIuiv(table, save_TexParameterIuiv); + SET_GetTexParameterIiv(table, exec_GetTexParameterIiv); + SET_GetTexParameterIuiv(table, exec_GetTexParameterIuiv); /* 377. GL_EXT_separate_shader_objects */ SET_UseShaderProgramEXT(table, save_UseShaderProgramEXT); SET_ActiveProgramEXT(table, save_ActiveProgramEXT); /* GL_ARB_color_buffer_float */ - SET_ClampColorARB(table, save_ClampColorARB); + SET_ClampColor(table, save_ClampColorARB); /* GL 3.0 */ SET_ClearBufferiv(table, save_ClearBufferiv); @@ -10170,13 +10170,13 @@ _mesa_create_save_table(const struct gl_context *ctx) #endif /* These are not compiled into display lists: */ - SET_BindBufferBaseEXT(table, _mesa_BindBufferBase); + SET_BindBufferBase(table, _mesa_BindBufferBase); SET_BindBufferOffsetEXT(table, _mesa_BindBufferOffsetEXT); - SET_BindBufferRangeEXT(table, _mesa_BindBufferRange); - SET_TransformFeedbackVaryingsEXT(table, _mesa_TransformFeedbackVaryings); + SET_BindBufferRange(table, _mesa_BindBufferRange); + SET_TransformFeedbackVaryings(table, _mesa_TransformFeedbackVaryings); /* These are: */ - SET_BeginTransformFeedbackEXT(table, save_BeginTransformFeedback); - SET_EndTransformFeedbackEXT(table, save_EndTransformFeedback); + SET_BeginTransformFeedback(table, save_BeginTransformFeedback); + SET_EndTransformFeedback(table, save_EndTransformFeedback); SET_BindTransformFeedback(table, save_BindTransformFeedback); SET_PauseTransformFeedback(table, save_PauseTransformFeedback); SET_ResumeTransformFeedback(table, save_ResumeTransformFeedback); @@ -10190,7 +10190,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_EndQueryIndexed(table, save_EndQueryIndexed); /* GL_ARB_instanced_arrays */ - SET_VertexAttribDivisorARB(table, save_VertexAttribDivisor); + SET_VertexAttribDivisor(table, save_VertexAttribDivisor); /* GL_NV_texture_barrier */ SET_TextureBarrierNV(table, save_TextureBarrierNV); @@ -10217,8 +10217,8 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace); /* GL_NV_conditional_render */ - SET_BeginConditionalRenderNV(table, save_BeginConditionalRender); - SET_EndConditionalRenderNV(table, save_EndConditionalRender); + SET_BeginConditionalRender(table, save_BeginConditionalRender); + SET_EndConditionalRender(table, save_EndConditionalRender); /* GL_ARB_sync */ _mesa_init_sync_dispatch(table); @@ -10239,7 +10239,7 @@ _mesa_create_save_table(const struct gl_context *ctx) SET_UniformBlockBinding(table, save_UniformBlockBinding); /* GL_NV_primitive_restart */ - SET_PrimitiveRestartIndexNV(table, _mesa_PrimitiveRestartIndex); + SET_PrimitiveRestartIndex(table, _mesa_PrimitiveRestartIndex); return table; } diff --git a/mesalib/src/mesa/main/drawtex.c b/mesalib/src/mesa/main/drawtex.c index d5cac22bd..7285805c8 100644 --- a/mesalib/src/mesa/main/drawtex.c +++ b/mesalib/src/mesa/main/drawtex.c @@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, void GLAPIENTRY -_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) +_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, x, y, z, width, height); @@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height) void GLAPIENTRY -_mesa_DrawTexfv(const GLfloat *coords) +_mesa_DrawTexfvOES(const GLfloat *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]); @@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords) void GLAPIENTRY -_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) +_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height) void GLAPIENTRY -_mesa_DrawTexiv(const GLint *coords) +_mesa_DrawTexivOES(const GLint *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], @@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords) void GLAPIENTRY -_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) +_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z, @@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height) void GLAPIENTRY -_mesa_DrawTexsv(const GLshort *coords) +_mesa_DrawTexsvOES(const GLshort *coords) { GET_CURRENT_CONTEXT(ctx); draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1], diff --git a/mesalib/src/mesa/main/drawtex.h b/mesalib/src/mesa/main/drawtex.h index 938b65fb2..b916150b7 100644 --- a/mesalib/src/mesa/main/drawtex.h +++ b/mesalib/src/mesa/main/drawtex.h @@ -30,22 +30,22 @@ extern void GLAPIENTRY -_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); +_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); extern void GLAPIENTRY -_mesa_DrawTexfv(const GLfloat *coords); +_mesa_DrawTexfvOES(const GLfloat *coords); extern void GLAPIENTRY -_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height); +_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height); extern void GLAPIENTRY -_mesa_DrawTexiv(const GLint *coords); +_mesa_DrawTexivOES(const GLint *coords); extern void GLAPIENTRY -_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); +_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); extern void GLAPIENTRY -_mesa_DrawTexsv(const GLshort *coords); +_mesa_DrawTexsvOES(const GLshort *coords); extern void GLAPIENTRY _mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index e704f2f2d..c7114b73a 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/src/mesa/main/enable.c @@ -1072,7 +1072,7 @@ invalid_enum_error: void GLAPIENTRY -_mesa_DisableIndexed( GLenum cap, GLuint index ) +_mesa_Disablei( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1081,7 +1081,7 @@ _mesa_DisableIndexed( GLenum cap, GLuint index ) void GLAPIENTRY -_mesa_EnableIndexed( GLenum cap, GLuint index ) +_mesa_Enablei( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1090,7 +1090,7 @@ _mesa_EnableIndexed( GLenum cap, GLuint index ) GLboolean GLAPIENTRY -_mesa_IsEnabledIndexed( GLenum cap, GLuint index ) +_mesa_IsEnabledi( GLenum cap, GLuint index ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); diff --git a/mesalib/src/mesa/main/enable.h b/mesalib/src/mesa/main/enable.h index be7909459..5b2515d59 100644 --- a/mesalib/src/mesa/main/enable.h +++ b/mesalib/src/mesa/main/enable.h @@ -53,13 +53,13 @@ extern void _mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state); extern void GLAPIENTRY -_mesa_DisableIndexed( GLenum cap, GLuint index ); +_mesa_Disablei( GLenum cap, GLuint index ); extern void GLAPIENTRY -_mesa_EnableIndexed( GLenum cap, GLuint index ); +_mesa_Enablei( GLenum cap, GLuint index ); extern GLboolean GLAPIENTRY -_mesa_IsEnabledIndexed( GLenum cap, GLuint index ); +_mesa_IsEnabledi( GLenum cap, GLuint index ); extern void GLAPIENTRY _mesa_EnableClientState( GLenum cap ); diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c index 993147c47..cd527dd78 100644 --- a/mesalib/src/mesa/main/es1_conversion.c +++ b/mesalib/src/mesa/main/es1_conversion.c @@ -30,13 +30,13 @@ #include "main/es1_conversion.h" void GL_APIENTRY -_es_AlphaFuncx(GLenum func, GLclampx ref) +_mesa_AlphaFuncx(GLenum func, GLclampx ref) { _mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f)); } void GL_APIENTRY -_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) +_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) { _mesa_ClearColor((GLclampf) (red / 65536.0f), (GLclampf) (green / 65536.0f), @@ -45,13 +45,13 @@ _es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha) } void GL_APIENTRY -_es_ClearDepthx(GLclampx depth) +_mesa_ClearDepthx(GLclampx depth) { _mesa_ClearDepthf((GLclampf) (depth / 65536.0f)); } void GL_APIENTRY -_es_ClipPlanef(GLenum plane, const GLfloat *equation) +_mesa_ClipPlanef(GLenum plane, const GLfloat *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -64,7 +64,7 @@ _es_ClipPlanef(GLenum plane, const GLfloat *equation) } void GL_APIENTRY -_es_ClipPlanex(GLenum plane, const GLfixed *equation) +_mesa_ClipPlanex(GLenum plane, const GLfixed *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -86,7 +86,7 @@ _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) } void GL_APIENTRY -_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) +_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) { _es_Color4f((GLfloat) (red / 65536.0f), (GLfloat) (green / 65536.0f), @@ -95,17 +95,17 @@ _es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha) } void GL_APIENTRY -_es_DepthRangex(GLclampx zNear, GLclampx zFar) +_mesa_DepthRangex(GLclampx zNear, GLclampx zFar) { _mesa_DepthRangef((GLclampf) (zNear / 65536.0f), (GLclampf) (zFar / 65536.0f)); } void GL_APIENTRY -_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) +_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) { - _mesa_DrawTexf((GLfloat) (x / 65536.0f), + _mesa_DrawTexfOES((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), (GLfloat) (z / 65536.0f), (GLfloat) (w / 65536.0f), @@ -113,7 +113,7 @@ _es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) } void GL_APIENTRY -_es_DrawTexxvOES(const GLfixed *coords) +_mesa_DrawTexxvOES(const GLfixed *coords) { unsigned int i; GLfloat converted_coords[5]; @@ -122,11 +122,11 @@ _es_DrawTexxvOES(const GLfixed *coords) converted_coords[i] = (GLfloat) (coords[i] / 65536.0f); } - _mesa_DrawTexfv(converted_coords); + _mesa_DrawTexfvOES(converted_coords); } void GL_APIENTRY -_es_Fogx(GLenum pname, GLfixed param) +_mesa_Fogx(GLenum pname, GLfixed param) { if (pname != GL_FOG_MODE) { _mesa_Fogf(pname, (GLfloat) (param / 65536.0f)); @@ -137,7 +137,7 @@ _es_Fogx(GLenum pname, GLfixed param) } void GL_APIENTRY -_es_Fogxv(GLenum pname, const GLfixed *params) +_mesa_Fogxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -177,7 +177,7 @@ _es_Fogxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) { _mesa_Frustum((GLdouble) (left), @@ -189,7 +189,7 @@ _es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, } void GL_APIENTRY -_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) { _mesa_Frustum((GLdouble) (left / 65536.0), @@ -201,7 +201,7 @@ _es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, } void GL_APIENTRY -_es_GetClipPlanef(GLenum plane, GLfloat *equation) +_mesa_GetClipPlanef(GLenum plane, GLfloat *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -213,7 +213,7 @@ _es_GetClipPlanef(GLenum plane, GLfloat *equation) } void GL_APIENTRY -_es_GetClipPlanex(GLenum plane, GLfixed *equation) +_mesa_GetClipPlanex(GLenum plane, GLfixed *equation) { unsigned int i; GLdouble converted_equation[4]; @@ -225,7 +225,7 @@ _es_GetClipPlanex(GLenum plane, GLfixed *equation) } void GL_APIENTRY -_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params) +_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -266,7 +266,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) +_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -304,7 +304,7 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) +_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -396,13 +396,13 @@ _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params) } void GL_APIENTRY -_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) +_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params) { _mesa_GetTexGeniv(coord, pname, (GLint *) params); } void GL_APIENTRY -_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) +_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -450,13 +450,13 @@ _es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params) } void GL_APIENTRY -_es_LightModelx(GLenum pname, GLfixed param) +_mesa_LightModelx(GLenum pname, GLfixed param) { _mesa_LightModelf(pname, (GLfloat) param); } void GL_APIENTRY -_es_LightModelxv(GLenum pname, const GLfixed *params) +_mesa_LightModelxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -491,13 +491,13 @@ _es_LightModelxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Lightx(GLenum light, GLenum pname, GLfixed param) +_mesa_Lightx(GLenum light, GLenum pname, GLfixed param) { _mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f)); } void GL_APIENTRY -_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params) +_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -539,13 +539,13 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_LineWidthx(GLfixed width) +_mesa_LineWidthx(GLfixed width) { _mesa_LineWidth((GLfloat) (width / 65536.0f)); } void GL_APIENTRY -_es_LoadMatrixx(const GLfixed *m) +_mesa_LoadMatrixx(const GLfixed *m) { unsigned int i; GLfloat converted_m[16]; @@ -558,7 +558,7 @@ _es_LoadMatrixx(const GLfixed *m) } void GL_APIENTRY -_es_Materialx(GLenum face, GLenum pname, GLfixed param) +_mesa_Materialx(GLenum face, GLenum pname, GLfixed param) { if (face != GL_FRONT_AND_BACK) { _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM, @@ -576,7 +576,7 @@ _es_Materialx(GLenum face, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params) +_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -613,7 +613,7 @@ _es_Materialxv(GLenum face, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_MultMatrixx(const GLfixed *m) +_mesa_MultMatrixx(const GLfixed *m) { unsigned int i; GLfloat converted_m[16]; @@ -626,7 +626,7 @@ _es_MultMatrixx(const GLfixed *m) } void GL_APIENTRY -_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) +_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) { _es_MultiTexCoord4f(texture, (GLfloat) (s / 65536.0f), @@ -636,7 +636,7 @@ _es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q) } void GL_APIENTRY -_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) +_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) { _es_Normal3f((GLfloat) (nx / 65536.0f), (GLfloat) (ny / 65536.0f), @@ -644,7 +644,7 @@ _es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz) } void GL_APIENTRY -_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar) { _mesa_Ortho((GLdouble) (left), @@ -656,7 +656,7 @@ _es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, } void GL_APIENTRY -_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar) { _mesa_Ortho((GLdouble) (left / 65536.0), @@ -668,13 +668,13 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, } void GL_APIENTRY -_es_PointParameterx(GLenum pname, GLfixed param) +_mesa_PointParameterx(GLenum pname, GLfixed param) { _mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f)); } void GL_APIENTRY -_es_PointParameterxv(GLenum pname, const GLfixed *params) +_mesa_PointParameterxv(GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 3; @@ -703,20 +703,20 @@ _es_PointParameterxv(GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_PointSizex(GLfixed size) +_mesa_PointSizex(GLfixed size) { _mesa_PointSize((GLfloat) (size / 65536.0f)); } void GL_APIENTRY -_es_PolygonOffsetx(GLfixed factor, GLfixed units) +_mesa_PolygonOffsetx(GLfixed factor, GLfixed units) { _mesa_PolygonOffset((GLfloat) (factor / 65536.0f), (GLfloat) (units / 65536.0f)); } void GL_APIENTRY -_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) +_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) { _mesa_Rotatef((GLfloat) (angle / 65536.0f), (GLfloat) (x / 65536.0f), @@ -725,14 +725,14 @@ _es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z) } void GL_APIENTRY -_es_SampleCoveragex(GLclampx value, GLboolean invert) +_mesa_SampleCoveragex(GLclampx value, GLboolean invert) { - _mesa_SampleCoverageARB((GLclampf) (value / 65536.0f), + _mesa_SampleCoverage((GLclampf) (value / 65536.0f), invert); } void GL_APIENTRY -_es_Scalex(GLfixed x, GLfixed y, GLfixed z) +_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z) { _mesa_Scalef((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), @@ -740,7 +740,7 @@ _es_Scalex(GLfixed x, GLfixed y, GLfixed z) } void GL_APIENTRY -_es_TexEnvx(GLenum target, GLenum pname, GLfixed param) +_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param) { switch(target) { case GL_POINT_SPRITE: @@ -785,7 +785,7 @@ _es_TexEnvx(GLenum target, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) +_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params) { switch(target) { case GL_POINT_SPRITE: @@ -853,19 +853,19 @@ _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params) } void GL_APIENTRY -_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param) +_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param) { _es_TexGenf(coord, pname, (GLfloat) param); } void GL_APIENTRY -_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) +_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params) { _es_TexGenf(coord, pname, (GLfloat) params[0]); } void GL_APIENTRY -_es_TexParameterx(GLenum target, GLenum pname, GLfixed param) +_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param) { if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) { _mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f)); @@ -875,7 +875,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param) } void GL_APIENTRY -_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) +_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) { unsigned int i; unsigned int n_params = 4; @@ -930,7 +930,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params) } void GL_APIENTRY -_es_Translatex(GLfixed x, GLfixed y, GLfixed z) +_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z) { _mesa_Translatef((GLfloat) (x / 65536.0f), (GLfloat) (y / 65536.0f), diff --git a/mesalib/src/mesa/main/es1_conversion.h b/mesalib/src/mesa/main/es1_conversion.h index eb0734759..868a75bab 100644 --- a/mesalib/src/mesa/main/es1_conversion.h +++ b/mesalib/src/mesa/main/es1_conversion.h @@ -29,140 +29,140 @@ #endif void GL_APIENTRY -_es_AlphaFuncx(GLenum func, GLclampx ref); +_mesa_AlphaFuncx(GLenum func, GLclampx ref); void GL_APIENTRY -_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); +_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); void GL_APIENTRY -_es_ClearDepthx(GLclampx depth); +_mesa_ClearDepthx(GLclampx depth); void GL_APIENTRY -_es_ClipPlanef(GLenum plane, const GLfloat *equation); +_mesa_ClipPlanef(GLenum plane, const GLfloat *equation); void GL_APIENTRY -_es_ClipPlanex(GLenum plane, const GLfixed *equation); +_mesa_ClipPlanex(GLenum plane, const GLfixed *equation); void GL_APIENTRY _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); void GL_APIENTRY -_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); void GL_APIENTRY -_es_DepthRangex(GLclampx zNear, GLclampx zFar); +_mesa_DepthRangex(GLclampx zNear, GLclampx zFar); void GL_APIENTRY -_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h); +_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h); void GL_APIENTRY -_es_DrawTexxvOES(const GLfixed *coords); +_mesa_DrawTexxvOES(const GLfixed *coords); void GL_APIENTRY -_es_Fogx(GLenum pname, GLfixed param); +_mesa_Fogx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_Fogxv(GLenum pname, const GLfixed *params); +_mesa_Fogxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); void GL_APIENTRY -_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); void GL_APIENTRY -_es_GetClipPlanef(GLenum plane, GLfloat *equation); +_mesa_GetClipPlanef(GLenum plane, GLfloat *equation); void GL_APIENTRY -_es_GetClipPlanex(GLenum plane, GLfixed *equation); +_mesa_GetClipPlanex(GLenum plane, GLfixed *equation); void GL_APIENTRY -_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params); +_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params); +_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params); void GL_APIENTRY _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params); void GL_APIENTRY -_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params); +_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params); void GL_APIENTRY -_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params); +_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params); +_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params); void GL_APIENTRY -_es_LightModelx(GLenum pname, GLfixed param); +_mesa_LightModelx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_LightModelxv(GLenum pname, const GLfixed *params); +_mesa_LightModelxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Lightx(GLenum light, GLenum pname, GLfixed param); +_mesa_Lightx(GLenum light, GLenum pname, GLfixed param); void GL_APIENTRY -_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params); +_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_LineWidthx(GLfixed width); +_mesa_LineWidthx(GLfixed width); void GL_APIENTRY -_es_LoadMatrixx(const GLfixed *m); +_mesa_LoadMatrixx(const GLfixed *m); void GL_APIENTRY -_es_Materialx(GLenum face, GLenum pname, GLfixed param); +_mesa_Materialx(GLenum face, GLenum pname, GLfixed param); void GL_APIENTRY -_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params); +_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_MultMatrixx(const GLfixed *m); +_mesa_MultMatrixx(const GLfixed *m); void GL_APIENTRY -_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); +_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); void GL_APIENTRY -_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz); +_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz); void GL_APIENTRY -_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, +_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); void GL_APIENTRY -_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, +_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); void GL_APIENTRY -_es_PointParameterx(GLenum pname, GLfixed param); +_mesa_PointParameterx(GLenum pname, GLfixed param); void GL_APIENTRY -_es_PointParameterxv(GLenum pname, const GLfixed *params); +_mesa_PointParameterxv(GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_PointSizex(GLfixed size); +_mesa_PointSizex(GLfixed size); void GL_APIENTRY -_es_PolygonOffsetx(GLfixed factor, GLfixed units); +_mesa_PolygonOffsetx(GLfixed factor, GLfixed units); void GL_APIENTRY -_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); +_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); void GL_APIENTRY -_es_SampleCoveragex(GLclampx value, GLboolean invert); +_mesa_SampleCoveragex(GLclampx value, GLboolean invert); void GL_APIENTRY -_es_Scalex(GLfixed x, GLfixed y, GLfixed z); +_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z); void GL_APIENTRY -_es_TexEnvx(GLenum target, GLenum pname, GLfixed param); +_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param); void GL_APIENTRY -_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params); +_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params); void GL_APIENTRY _check_TexGeniOES(GLenum coord, GLenum pname, GLint param); @@ -171,18 +171,18 @@ void GL_APIENTRY _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params); void GL_APIENTRY -_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param); +_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param); void GL_APIENTRY -_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params); +_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_TexParameterx(GLenum target, GLenum pname, GLfixed param); +_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param); void GL_APIENTRY -_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params); +_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params); void GL_APIENTRY -_es_Translatex(GLfixed x, GLfixed y, GLfixed z); +_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z); #endif /* ES1_CONVERSION_H */ diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 0618b7fab..ef739c162 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -883,7 +883,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx, GLboolean GLAPIENTRY -_mesa_IsRenderbufferEXT(GLuint renderbuffer) +_mesa_IsRenderbuffer(GLuint renderbuffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -897,7 +897,7 @@ _mesa_IsRenderbufferEXT(GLuint renderbuffer) void GLAPIENTRY -_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer) +_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer) { struct gl_renderbuffer *newRb; GET_CURRENT_CONTEXT(ctx); @@ -969,7 +969,7 @@ detach_renderbuffer(struct gl_context *ctx, void GLAPIENTRY -_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) +_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -986,7 +986,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) if (rb == ctx->CurrentRenderbuffer) { /* bind default */ ASSERT(rb->RefCount >= 2); - _mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0); + _mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, 0); } if (_mesa_is_user_fbo(ctx->DrawBuffer)) { @@ -1014,7 +1014,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers) void GLAPIENTRY -_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers) +_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -1398,9 +1398,9 @@ invalidate_rb(GLuint key, void *data, void *userData) /** - * Helper function used by _mesa_RenderbufferStorageEXT() and + * Helper function used by _mesa_RenderbufferStorage() and * _mesa_RenderbufferStorageMultisample(). - * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT(). + * samples will be NO_SAMPLES if called by _mesa_RenderbufferStorage(). */ static void renderbuffer_storage(GLenum target, GLenum internalFormat, @@ -1526,8 +1526,8 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) /** - * Helper function for _mesa_GetRenderbufferParameterivEXT() and - * _mesa_GetFramebufferAttachmentParameterivEXT() + * Helper function for _mesa_GetRenderbufferParameteriv() and + * _mesa_GetFramebufferAttachmentParameteriv() * We have to be careful to respect the base format. For example, if a * renderbuffer/texture was created with internalFormat=GL_RGB but the * driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE @@ -1545,7 +1545,7 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format) void GLAPIENTRY -_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, +_mesa_RenderbufferStorage(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height) { /* GL_ARB_fbo says calling this function is equivalent to calling @@ -1587,7 +1587,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat, void GLAPIENTRY -_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) +_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params) { struct gl_renderbuffer *rb; GET_CURRENT_CONTEXT(ctx); @@ -1645,7 +1645,7 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params) GLboolean GLAPIENTRY -_mesa_IsFramebufferEXT(GLuint framebuffer) +_mesa_IsFramebuffer(GLuint framebuffer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -1705,7 +1705,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb) void GLAPIENTRY -_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) +_mesa_BindFramebuffer(GLenum target, GLuint framebuffer) { struct gl_framebuffer *newDrawFb, *newReadFb; struct gl_framebuffer *oldDrawFb, *oldReadFb; @@ -1839,7 +1839,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer) void GLAPIENTRY -_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) +_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -1860,12 +1860,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) if (fb == ctx->DrawBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0); } if (fb == ctx->ReadBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0); } } else { @@ -1873,7 +1873,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) { /* bind default */ ASSERT(fb->RefCount >= 2); - _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); + _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, 0); } } @@ -1893,7 +1893,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers) void GLAPIENTRY -_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers) +_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers) { GET_CURRENT_CONTEXT(ctx); GLuint first; @@ -1924,7 +1924,7 @@ _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers) GLenum GLAPIENTRY -_mesa_CheckFramebufferStatusEXT(GLenum target) +_mesa_CheckFramebufferStatus(GLenum target) { struct gl_framebuffer *buffer; GET_CURRENT_CONTEXT(ctx); @@ -2151,7 +2151,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target, void GLAPIENTRY -_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { GET_CURRENT_CONTEXT(ctx); @@ -2184,7 +2184,7 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { GET_CURRENT_CONTEXT(ctx); @@ -2230,7 +2230,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset) { @@ -2248,7 +2248,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) { GET_CURRENT_CONTEXT(ctx); @@ -2259,7 +2259,7 @@ _mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, +_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbufferTarget, GLuint renderbuffer) { @@ -2343,7 +2343,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, void GLAPIENTRY -_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, +_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params) { const struct gl_renderbuffer_attachment *att; @@ -2575,7 +2575,7 @@ invalid_pname_enum: void GLAPIENTRY -_mesa_GenerateMipmapEXT(GLenum target) +_mesa_GenerateMipmap(GLenum target) { struct gl_texture_image *srcImage; struct gl_texture_object *texObj; @@ -2833,7 +2833,7 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb, * when the samples must be resolved to a single color. */ void GLAPIENTRY -_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, +_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h index 44d92d421..9207f59c7 100644 --- a/mesalib/src/mesa/main/fbobject.h +++ b/mesalib/src/mesa/main/fbobject.h @@ -124,19 +124,19 @@ extern GLenum _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat); extern GLboolean GLAPIENTRY -_mesa_IsRenderbufferEXT(GLuint renderbuffer); +_mesa_IsRenderbuffer(GLuint renderbuffer); extern void GLAPIENTRY -_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer); +_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer); extern void GLAPIENTRY -_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers); +_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers); extern void GLAPIENTRY -_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers); +_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers); extern void GLAPIENTRY -_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat, +_mesa_RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); extern void GLAPIENTRY @@ -152,56 +152,56 @@ extern void GLAPIENTRY _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image); extern void GLAPIENTRY -_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, +_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params); extern GLboolean GLAPIENTRY -_mesa_IsFramebufferEXT(GLuint framebuffer); +_mesa_IsFramebuffer(GLuint framebuffer); extern void GLAPIENTRY -_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer); +_mesa_BindFramebuffer(GLenum target, GLuint framebuffer); extern void GLAPIENTRY -_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers); +_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers); extern void GLAPIENTRY -_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers); +_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers); extern GLenum GLAPIENTRY -_mesa_CheckFramebufferStatusEXT(GLenum target); +_mesa_CheckFramebufferStatus(GLenum target); extern void GLAPIENTRY -_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture1D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY -_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); extern void GLAPIENTRY -_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTexture3D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); extern void GLAPIENTRY -_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment, +_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); extern void GLAPIENTRY -_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, +_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); extern void GLAPIENTRY -_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment, +_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint *params); extern void GLAPIENTRY -_mesa_GenerateMipmapEXT(GLenum target); +_mesa_GenerateMipmap(GLenum target); extern void GLAPIENTRY -_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, +_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); diff --git a/mesalib/src/mesa/main/ffvertex_prog.c b/mesalib/src/mesa/main/ffvertex_prog.c index 4cdec2166..efdca015e 100644 --- a/mesalib/src/mesa/main/ffvertex_prog.c +++ b/mesalib/src/mesa/main/ffvertex_prog.c @@ -160,8 +160,6 @@ static void make_state_key( struct gl_context *ctx, struct state_key *key ) key->need_eye_coords = ctx->_NeedEyeCoords; - /* Make sure fp->Base.InputsRead fits in a 12-bit field */ - assert(fp->Base.InputsRead < (1 << 12)); key->fragprog_inputs_read = fp->Base.InputsRead; key->varying_vp_inputs = ctx->varying_vp_inputs; diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index 39709b808..e1ebd1856 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -1614,7 +1614,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v) } void GLAPIENTRY -_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ) +_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ) { union value v; enum value_type type = @@ -1639,7 +1639,7 @@ _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ) } void GLAPIENTRY -_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params ) +_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ) { union value v; enum value_type type = diff --git a/mesalib/src/mesa/main/get.h b/mesalib/src/mesa/main/get.h index 9422efec5..4daa1aec1 100644 --- a/mesalib/src/mesa/main/get.h +++ b/mesalib/src/mesa/main/get.h @@ -54,10 +54,10 @@ extern void GLAPIENTRY _mesa_GetFixedv(GLenum pname, GLfixed *params); extern void GLAPIENTRY -_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params ); +_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params ); extern void GLAPIENTRY -_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params ); +_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params ); extern void GLAPIENTRY _mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params ); diff --git a/mesalib/src/mesa/main/hash.c b/mesalib/src/mesa/main/hash.c index 61c369a80..8c763e20a 100644 --- a/mesalib/src/mesa/main/hash.c +++ b/mesalib/src/mesa/main/hash.c @@ -34,40 +34,75 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - #include "glheader.h" #include "imports.h" #include "glapi/glthread.h" #include "hash.h" - - -#define TABLE_SIZE 1023 /**< Size of lookup table/array */ - -#define HASH_FUNC(K) ((K) % TABLE_SIZE) - +#include "hash_table.h" /** - * An entry in the hash table. + * Magic GLuint object name that gets stored outside of the struct hash_table. + * + * The hash table needs a particular pointer to be the marker for a key that + * was deleted from the table, along with NULL for the "never allocated in the + * table" marker. Legacy GL allows any GLuint to be used as a GL object name, + * and we use a 1:1 mapping from GLuints to key pointers, so we need to be + * able to track a GLuint that happens to match the deleted key outside of + * struct hash_table. We tell the hash table to use "1" as the deleted key + * value, so that we test the deleted-key-in-the-table path as best we can. */ -struct HashEntry { - GLuint Key; /**< the entry's key */ - void *Data; /**< the entry's data */ - struct HashEntry *Next; /**< pointer to next entry */ -}; - +#define DELETED_KEY_VALUE 1 /** * The hash table data structure. */ struct _mesa_HashTable { - struct HashEntry *Table[TABLE_SIZE]; /**< the lookup table */ + struct hash_table *ht; GLuint MaxKey; /**< highest key inserted so far */ _glthread_Mutex Mutex; /**< mutual exclusion lock */ _glthread_Mutex WalkMutex; /**< for _mesa_HashWalk() */ GLboolean InDeleteAll; /**< Debug check */ + /** Value that would be in the table for DELETED_KEY_VALUE. */ + void *deleted_key_data; }; +/** @{ + * Mapping from our use of GLuint as both the key and the hash value to the + * hash_table.h API + * + * There exist many integer hash functions, designed to avoid collisions when + * the integers are spread across key space with some patterns. In GL, the + * pattern (in the case of glGen*()ed object IDs) is that the keys are unique + * contiguous integers starting from 1. Because of that, we just use the key + * as the hash value, to minimize the cost of the hash function. If objects + * are never deleted, we will never see a collision in the table, because the + * table resizes itself when it approaches full, and thus key % table_size == + * key. + * + * The case where we could have collisions for genned objects would be + * something like: glGenBuffers(&a, 100); glDeleteBuffers(&a + 50, 50); + * glGenBuffers(&b, 100), because objects 1-50 and 101-200 are allocated at + * the end of that sequence, instead of 1-150. So far it doesn't appear to be + * a problem. + */ +static bool +uint_key_compare(const void *a, const void *b) +{ + return a == b; +} + +static uint32_t +uint_hash(GLuint id) +{ + return id; +} +static void * +uint_key(GLuint id) +{ + return (void *)(uintptr_t) id; +} +/** @} */ /** * Create a new hash table. @@ -78,6 +113,9 @@ struct _mesa_HashTable * _mesa_NewHashTable(void) { struct _mesa_HashTable *table = CALLOC_STRUCT(_mesa_HashTable); + + table->ht = _mesa_hash_table_create(NULL, uint_key_compare); + _mesa_hash_table_set_deleted_key(table->ht, uint_key(DELETED_KEY_VALUE)); if (table) { _glthread_INIT_MUTEX(table->Mutex); _glthread_INIT_MUTEX(table->WalkMutex); @@ -98,20 +136,14 @@ _mesa_NewHashTable(void) void _mesa_DeleteHashTable(struct _mesa_HashTable *table) { - GLuint pos; assert(table); - for (pos = 0; pos < TABLE_SIZE; pos++) { - struct HashEntry *entry = table->Table[pos]; - while (entry) { - struct HashEntry *next = entry->Next; - if (entry->Data) { - _mesa_problem(NULL, - "In _mesa_DeleteHashTable, found non-freed data"); - } - free(entry); - entry = next; - } + + if (_mesa_hash_table_next_entry(table->ht, NULL) != NULL) { + _mesa_problem(NULL, "In _mesa_DeleteHashTable, found non-freed data"); } + + _mesa_hash_table_destroy(table->ht, NULL); + _glthread_DESTROY_MUTEX(table->Mutex); _glthread_DESTROY_MUTEX(table->WalkMutex); free(table); @@ -126,21 +158,19 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table) static inline void * _mesa_HashLookup_unlocked(struct _mesa_HashTable *table, GLuint key) { - GLuint pos; - const struct HashEntry *entry; + const struct hash_entry *entry; assert(table); assert(key); - pos = HASH_FUNC(key); - entry = table->Table[pos]; - while (entry) { - if (entry->Key == key) { - return entry->Data; - } - entry = entry->Next; - } - return NULL; + if (key == DELETED_KEY_VALUE) + return table->deleted_key_data; + + entry = _mesa_hash_table_search(table->ht, uint_hash(key), uint_key(key)); + if (!entry) + return NULL; + + return entry->data; } @@ -175,9 +205,8 @@ _mesa_HashLookup(struct _mesa_HashTable *table, GLuint key) void _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data) { - /* search for existing entry with this key */ - GLuint pos; - struct HashEntry *entry; + uint32_t hash = uint_hash(key); + struct hash_entry *entry; assert(table); assert(key); @@ -187,32 +216,17 @@ _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data) if (key > table->MaxKey) table->MaxKey = key; - pos = HASH_FUNC(key); - - /* check if replacing an existing entry with same key */ - for (entry = table->Table[pos]; entry; entry = entry->Next) { - if (entry->Key == key) { - /* replace entry's data */ -#if 0 /* not sure this check is always valid */ - if (entry->Data) { - _mesa_problem(NULL, "Memory leak detected in _mesa_HashInsert"); - } -#endif - entry->Data = data; - _glthread_UNLOCK_MUTEX(table->Mutex); - return; + if (key == DELETED_KEY_VALUE) { + table->deleted_key_data = data; + } else { + entry = _mesa_hash_table_search(table->ht, hash, uint_key(key)); + if (entry) { + entry->data = data; + } else { + _mesa_hash_table_insert(table->ht, hash, uint_key(key), data); } } - /* alloc and insert new table entry */ - entry = MALLOC_STRUCT(HashEntry); - if (entry) { - entry->Key = key; - entry->Data = data; - entry->Next = table->Table[pos]; - table->Table[pos] = entry; - } - _glthread_UNLOCK_MUTEX(table->Mutex); } @@ -230,8 +244,7 @@ _mesa_HashInsert(struct _mesa_HashTable *table, GLuint key, void *data) void _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key) { - GLuint pos; - struct HashEntry *entry, *prev; + struct hash_entry *entry; assert(table); assert(key); @@ -244,27 +257,12 @@ _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key) } _glthread_LOCK_MUTEX(table->Mutex); - - pos = HASH_FUNC(key); - prev = NULL; - entry = table->Table[pos]; - while (entry) { - if (entry->Key == key) { - /* found it! */ - if (prev) { - prev->Next = entry->Next; - } - else { - table->Table[pos] = entry->Next; - } - free(entry); - _glthread_UNLOCK_MUTEX(table->Mutex); - return; - } - prev = entry; - entry = entry->Next; + if (key == DELETED_KEY_VALUE) { + table->deleted_key_data = NULL; + } else { + entry = _mesa_hash_table_search(table->ht, uint_hash(key), uint_key(key)); + _mesa_hash_table_remove(table->ht, entry); } - _glthread_UNLOCK_MUTEX(table->Mutex); } @@ -284,19 +282,19 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table, void (*callback)(GLuint key, void *data, void *userData), void *userData) { - GLuint pos; + struct hash_entry *entry; + ASSERT(table); ASSERT(callback); _glthread_LOCK_MUTEX(table->Mutex); table->InDeleteAll = GL_TRUE; - for (pos = 0; pos < TABLE_SIZE; pos++) { - struct HashEntry *entry, *next; - for (entry = table->Table[pos]; entry; entry = next) { - callback(entry->Key, entry->Data, userData); - next = entry->Next; - free(entry); - } - table->Table[pos] = NULL; + hash_table_foreach(table->ht, entry) { + callback((uintptr_t)entry->key, entry->data, userData); + _mesa_hash_table_remove(table->ht, entry); + } + if (table->deleted_key_data) { + callback(DELETED_KEY_VALUE, table->deleted_key_data, userData); + table->deleted_key_data = NULL; } table->InDeleteAll = GL_FALSE; _glthread_UNLOCK_MUTEX(table->Mutex); @@ -322,93 +320,25 @@ _mesa_HashWalk(const struct _mesa_HashTable *table, { /* cast-away const */ struct _mesa_HashTable *table2 = (struct _mesa_HashTable *) table; - GLuint pos; + struct hash_entry *entry; + ASSERT(table); ASSERT(callback); _glthread_LOCK_MUTEX(table2->WalkMutex); - for (pos = 0; pos < TABLE_SIZE; pos++) { - struct HashEntry *entry, *next; - for (entry = table->Table[pos]; entry; entry = next) { - /* save 'next' pointer now in case the callback deletes the entry */ - next = entry->Next; - callback(entry->Key, entry->Data, userData); - } + hash_table_foreach(table->ht, entry) { + callback((uintptr_t)entry->key, entry->data, userData); } + if (table->deleted_key_data) + callback(DELETED_KEY_VALUE, table->deleted_key_data, userData); _glthread_UNLOCK_MUTEX(table2->WalkMutex); } - -/** - * Return the key of the "first" entry in the hash table. - * While holding the lock, walks through all table positions until finding - * the first entry of the first non-empty one. - * - * \param table the hash table - * \return key for the "first" entry in the hash table. - */ -GLuint -_mesa_HashFirstEntry(struct _mesa_HashTable *table) -{ - GLuint pos; - assert(table); - _glthread_LOCK_MUTEX(table->Mutex); - for (pos = 0; pos < TABLE_SIZE; pos++) { - if (table->Table[pos]) { - _glthread_UNLOCK_MUTEX(table->Mutex); - return table->Table[pos]->Key; - } - } - _glthread_UNLOCK_MUTEX(table->Mutex); - return 0; -} - - -/** - * Given a hash table key, return the next key. This is used to walk - * over all entries in the table. Note that the keys returned during - * walking won't be in any particular order. - * \return next hash key or 0 if end of table. - */ -GLuint -_mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key) +static void +debug_print_entry(GLuint key, void *data, void *userData) { - const struct HashEntry *entry; - GLuint pos; - - assert(table); - assert(key); - - /* Find the entry with given key */ - pos = HASH_FUNC(key); - for (entry = table->Table[pos]; entry ; entry = entry->Next) { - if (entry->Key == key) { - break; - } - } - - if (!entry) { - /* the given key was not found, so we can't find the next entry */ - return 0; - } - - if (entry->Next) { - /* return next in linked list */ - return entry->Next->Key; - } - else { - /* look for next non-empty table slot */ - pos++; - while (pos < TABLE_SIZE) { - if (table->Table[pos]) { - return table->Table[pos]->Key; - } - pos++; - } - return 0; - } + _mesa_debug(NULL, "%u %p\n", key, data); } - /** * Dump contents of hash table for debugging. * @@ -417,19 +347,12 @@ _mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key) void _mesa_HashPrint(const struct _mesa_HashTable *table) { - GLuint pos; - assert(table); - for (pos = 0; pos < TABLE_SIZE; pos++) { - const struct HashEntry *entry = table->Table[pos]; - while (entry) { - _mesa_debug(NULL, "%u %p\n", entry->Key, entry->Data); - entry = entry->Next; - } - } + if (table->deleted_key_data) + debug_print_entry(DELETED_KEY_VALUE, table->deleted_key_data, NULL); + _mesa_HashWalk(table, debug_print_entry, NULL); } - /** * Find a block of adjacent unused hash keys. * @@ -446,7 +369,7 @@ _mesa_HashPrint(const struct _mesa_HashTable *table) GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys) { - const GLuint maxKey = ~((GLuint) 0); + const GLuint maxKey = ~((GLuint) 0) - 1; _glthread_LOCK_MUTEX(table->Mutex); if (maxKey - numKeys > table->MaxKey) { /* the quick solution */ @@ -486,82 +409,14 @@ _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys) GLuint _mesa_HashNumEntries(const struct _mesa_HashTable *table) { - GLuint pos, count = 0; + struct hash_entry *entry; + GLuint count = 0; - for (pos = 0; pos < TABLE_SIZE; pos++) { - const struct HashEntry *entry; - for (entry = table->Table[pos]; entry; entry = entry->Next) { - count++; - } - } + if (table->deleted_key_data) + count++; - return count; -} - - - -#if 0 /* debug only */ + hash_table_foreach(table->ht, entry) + count++; -/** - * Test walking over all the entries in a hash table. - */ -static void -test_hash_walking(void) -{ - struct _mesa_HashTable *t = _mesa_NewHashTable(); - const GLuint limit = 50000; - GLuint i; - - /* create some entries */ - for (i = 0; i < limit; i++) { - GLuint dummy; - GLuint k = (rand() % (limit * 10)) + 1; - while (_mesa_HashLookup(t, k)) { - /* id already in use, try another */ - k = (rand() % (limit * 10)) + 1; - } - _mesa_HashInsert(t, k, &dummy); - } - - /* walk over all entries */ - { - GLuint k = _mesa_HashFirstEntry(t); - GLuint count = 0; - while (k) { - GLuint knext = _mesa_HashNextEntry(t, k); - assert(knext != k); - _mesa_HashRemove(t, k); - count++; - k = knext; - } - assert(count == limit); - k = _mesa_HashFirstEntry(t); - assert(k==0); - } - - _mesa_DeleteHashTable(t); -} - - -void -_mesa_test_hash_functions(void) -{ - int a, b, c; - struct _mesa_HashTable *t; - - t = _mesa_NewHashTable(); - _mesa_HashInsert(t, 501, &a); - _mesa_HashInsert(t, 10, &c); - _mesa_HashInsert(t, 0xfffffff8, &b); - /*_mesa_HashPrint(t);*/ - - assert(_mesa_HashLookup(t,501)); - assert(!_mesa_HashLookup(t,1313)); - assert(_mesa_HashFindFreeKeyBlock(t, 100)); - - _mesa_DeleteHashTable(t); - - test_hash_walking(); + return count; } - -#endif diff --git a/mesalib/src/mesa/main/hash.h b/mesalib/src/mesa/main/hash.h index e935f8d39..cdaa7669a 100644 --- a/mesalib/src/mesa/main/hash.h +++ b/mesalib/src/mesa/main/hash.h @@ -55,10 +55,6 @@ _mesa_HashWalk(const struct _mesa_HashTable *table, void (*callback)(GLuint key, void *data, void *userData), void *userData); -extern GLuint _mesa_HashFirstEntry(struct _mesa_HashTable *table); - -extern GLuint _mesa_HashNextEntry(const struct _mesa_HashTable *table, GLuint key); - extern void _mesa_HashPrint(const struct _mesa_HashTable *table); extern GLuint _mesa_HashFindFreeKeyBlock(struct _mesa_HashTable *table, GLuint numKeys); diff --git a/mesalib/src/mesa/main/hash_table.c b/mesalib/src/mesa/main/hash_table.c new file mode 100644 index 000000000..2bd1929aa --- /dev/null +++ b/mesalib/src/mesa/main/hash_table.c @@ -0,0 +1,442 @@ +/* + * Copyright © 2009,2012 Intel Corporation + * Copyright © 1988-2004 Keith Packard and Bart Massey. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Except as contained in this notice, the names of the authors + * or their institutions shall not be used in advertising or + * otherwise to promote the sale, use or other dealings in this + * Software without prior written authorization from the + * authors. + * + * Authors: + * Eric Anholt <eric@anholt.net> + * Keith Packard <keithp@keithp.com> + */ + +/** + * Implements an open-addressing, linear-reprobing hash table. + * + * For more information, see: + * + * http://cgit.freedesktop.org/~anholt/hash_table/tree/README + */ + +#include <stdlib.h> +#include <string.h> + +#include "main/hash_table.h" +#include "ralloc.h" + +#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) + +static const uint32_t deleted_key_value; + +/** + * From Knuth -- a good choice for hash/rehash values is p, p-2 where + * p and p-2 are both prime. These tables are sized to have an extra 10% + * free to avoid exponential performance degradation as the hash table fills + */ +static const struct { + uint32_t max_entries, size, rehash; +} hash_sizes[] = { + { 2, 5, 3 }, + { 4, 7, 5 }, + { 8, 13, 11 }, + { 16, 19, 17 }, + { 32, 43, 41 }, + { 64, 73, 71 }, + { 128, 151, 149 }, + { 256, 283, 281 }, + { 512, 571, 569 }, + { 1024, 1153, 1151 }, + { 2048, 2269, 2267 }, + { 4096, 4519, 4517 }, + { 8192, 9013, 9011 }, + { 16384, 18043, 18041 }, + { 32768, 36109, 36107 }, + { 65536, 72091, 72089 }, + { 131072, 144409, 144407 }, + { 262144, 288361, 288359 }, + { 524288, 576883, 576881 }, + { 1048576, 1153459, 1153457 }, + { 2097152, 2307163, 2307161 }, + { 4194304, 4613893, 4613891 }, + { 8388608, 9227641, 9227639 }, + { 16777216, 18455029, 18455027 }, + { 33554432, 36911011, 36911009 }, + { 67108864, 73819861, 73819859 }, + { 134217728, 147639589, 147639587 }, + { 268435456, 295279081, 295279079 }, + { 536870912, 590559793, 590559791 }, + { 1073741824, 1181116273, 1181116271}, + { 2147483648ul, 2362232233ul, 2362232231ul} +}; + +static int +entry_is_free(const struct hash_entry *entry) +{ + return entry->key == NULL; +} + +static int +entry_is_deleted(const struct hash_table *ht, struct hash_entry *entry) +{ + return entry->key == ht->deleted_key; +} + +static int +entry_is_present(const struct hash_table *ht, struct hash_entry *entry) +{ + return entry->key != NULL && entry->key != ht->deleted_key; +} + +struct hash_table * +_mesa_hash_table_create(void *mem_ctx, + bool key_equals_function(const void *a, + const void *b)) +{ + struct hash_table *ht; + + ht = ralloc(mem_ctx, struct hash_table); + if (ht == NULL) + return NULL; + + ht->mem_ctx = mem_ctx; + ht->size_index = 0; + ht->size = hash_sizes[ht->size_index].size; + ht->rehash = hash_sizes[ht->size_index].rehash; + ht->max_entries = hash_sizes[ht->size_index].max_entries; + ht->key_equals_function = key_equals_function; + ht->table = rzalloc_array(ht, struct hash_entry, ht->size); + ht->entries = 0; + ht->deleted_entries = 0; + ht->deleted_key = &deleted_key_value; + + if (ht->table == NULL) { + ralloc_free(ht); + return NULL; + } + + return ht; +} + +/** + * Frees the given hash table. + * + * If delete_function is passed, it gets called on each entry present before + * freeing. + */ +void +_mesa_hash_table_destroy(struct hash_table *ht, + void (*delete_function)(struct hash_entry *entry)) +{ + if (!ht) + return; + + if (delete_function) { + struct hash_entry *entry; + + hash_table_foreach(ht, entry) { + delete_function(entry); + } + } + ralloc_free(ht); +} + +/** Sets the value of the key pointer used for deleted entries in the table. + * + * The assumption is that usually keys are actual pointers, so we use a + * default value of a pointer to an arbitrary piece of storage in the library. + * But in some cases a consumer wants to store some other sort of value in the + * table, like a uint32_t, in which case that pointer may conflict with one of + * their valid keys. This lets that user select a safe value. + * + * This must be called before any keys are actually deleted from the table. + */ +void +_mesa_hash_table_set_deleted_key(struct hash_table *ht, const void *deleted_key) +{ + ht->deleted_key = deleted_key; +} + +/** + * Finds a hash table entry with the given key and hash of that key. + * + * Returns NULL if no entry is found. Note that the data pointer may be + * modified by the user. + */ +struct hash_entry * +_mesa_hash_table_search(struct hash_table *ht, uint32_t hash, + const void *key) +{ + uint32_t start_hash_address = hash % ht->size; + uint32_t hash_address = start_hash_address; + + do { + uint32_t double_hash; + + struct hash_entry *entry = ht->table + hash_address; + + if (entry_is_free(entry)) { + return NULL; + } else if (entry_is_present(ht, entry) && entry->hash == hash) { + if (ht->key_equals_function(key, entry->key)) { + return entry; + } + } + + double_hash = 1 + hash % ht->rehash; + + hash_address = (hash_address + double_hash) % ht->size; + } while (hash_address != start_hash_address); + + return NULL; +} + +static void +_mesa_hash_table_rehash(struct hash_table *ht, int new_size_index) +{ + struct hash_table old_ht; + struct hash_entry *table, *entry; + + if (new_size_index >= ARRAY_SIZE(hash_sizes)) + return; + + table = rzalloc_array(ht, struct hash_entry, + hash_sizes[new_size_index].size); + if (table == NULL) + return; + + old_ht = *ht; + + ht->table = table; + ht->size_index = new_size_index; + ht->size = hash_sizes[ht->size_index].size; + ht->rehash = hash_sizes[ht->size_index].rehash; + ht->max_entries = hash_sizes[ht->size_index].max_entries; + ht->entries = 0; + ht->deleted_entries = 0; + + hash_table_foreach(&old_ht, entry) { + _mesa_hash_table_insert(ht, entry->hash, + entry->key, entry->data); + } + + ralloc_free(old_ht.table); +} + +/** + * Inserts the key with the given hash into the table. + * + * Note that insertion may rearrange the table on a resize or rehash, + * so previously found hash_entries are no longer valid after this function. + */ +struct hash_entry * +_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash, + const void *key, void *data) +{ + uint32_t start_hash_address, hash_address; + + if (ht->entries >= ht->max_entries) { + _mesa_hash_table_rehash(ht, ht->size_index + 1); + } else if (ht->deleted_entries + ht->entries >= ht->max_entries) { + _mesa_hash_table_rehash(ht, ht->size_index); + } + + start_hash_address = hash % ht->size; + hash_address = start_hash_address; + do { + struct hash_entry *entry = ht->table + hash_address; + uint32_t double_hash; + + if (!entry_is_present(ht, entry)) { + if (entry_is_deleted(ht, entry)) + ht->deleted_entries--; + entry->hash = hash; + entry->key = key; + entry->data = data; + ht->entries++; + return entry; + } + + /* Implement replacement when another insert happens + * with a matching key. This is a relatively common + * feature of hash tables, with the alternative + * generally being "insert the new value as well, and + * return it first when the key is searched for". + * + * Note that the hash table doesn't have a delete + * callback. If freeing of old data pointers is + * required to avoid memory leaks, perform a search + * before inserting. + */ + if (entry->hash == hash && + ht->key_equals_function(key, entry->key)) { + entry->key = key; + entry->data = data; + return entry; + } + + + double_hash = 1 + hash % ht->rehash; + + hash_address = (hash_address + double_hash) % ht->size; + } while (hash_address != start_hash_address); + + /* We could hit here if a required resize failed. An unchecked-malloc + * application could ignore this result. + */ + return NULL; +} + +/** + * This function deletes the given hash table entry. + * + * Note that deletion doesn't otherwise modify the table, so an iteration over + * the table deleting entries is safe. + */ +void +_mesa_hash_table_remove(struct hash_table *ht, + struct hash_entry *entry) +{ + if (!entry) + return; + + entry->key = ht->deleted_key; + ht->entries--; + ht->deleted_entries++; +} + +/** + * This function is an iterator over the hash table. + * + * Pass in NULL for the first entry, as in the start of a for loop. Note that + * an iteration over the table is O(table_size) not O(entries). + */ +struct hash_entry * +_mesa_hash_table_next_entry(struct hash_table *ht, + struct hash_entry *entry) +{ + if (entry == NULL) + entry = ht->table; + else + entry = entry + 1; + + for (; entry != ht->table + ht->size; entry++) { + if (entry_is_present(ht, entry)) { + return entry; + } + } + + return NULL; +} + +/** + * Returns a random entry from the hash table. + * + * This may be useful in implementing random replacement (as opposed + * to just removing everything) in caches based on this hash table + * implementation. @predicate may be used to filter entries, or may + * be set to NULL for no filtering. + */ +struct hash_entry * +_mesa_hash_table_random_entry(struct hash_table *ht, + bool (*predicate)(struct hash_entry *entry)) +{ + struct hash_entry *entry; + uint32_t i = rand() % ht->size; + + if (ht->entries == 0) + return NULL; + + for (entry = ht->table + i; entry != ht->table + ht->size; entry++) { + if (entry_is_present(ht, entry) && + (!predicate || predicate(entry))) { + return entry; + } + } + + for (entry = ht->table; entry != ht->table + i; entry++) { + if (entry_is_present(ht, entry) && + (!predicate || predicate(entry))) { + return entry; + } + } + + return NULL; +} + + +/** + * Quick FNV-1 hash implementation based on: + * http://www.isthe.com/chongo/tech/comp/fnv/ + * + * FNV-1 is not be the best hash out there -- Jenkins's lookup3 is supposed to + * be quite good, and it probably beats FNV. But FNV has the advantage that + * it involves almost no code. For an improvement on both, see Paul + * Hsieh's http://www.azillionmonkeys.com/qed/hash.html + */ +uint32_t +_mesa_hash_data(const void *data, size_t size) +{ + uint32_t hash = 2166136261ul; + const uint8_t *bytes = data; + + while (size-- != 0) { + hash ^= *bytes; + hash = hash * 0x01000193; + bytes++; + } + + return hash; +} + +/** FNV-1 string hash implementation */ +uint32_t +_mesa_hash_string(const char *key) +{ + uint32_t hash = 2166136261ul; + + while (*key != 0) { + hash ^= *key; + hash = hash * 0x01000193; + key++; + } + + return hash; +} + +/** + * String compare function for use as the comparison callback in + * _mesa_hash_table_create(). + */ +bool +_mesa_key_string_equal(const void *a, const void *b) +{ + return strcmp(a, b) == 0; +} + +bool +_mesa_key_pointer_equal(const void *a, const void *b) +{ + return a == b; +} diff --git a/mesalib/src/mesa/main/hash_table.h b/mesalib/src/mesa/main/hash_table.h new file mode 100644 index 000000000..ad1dae478 --- /dev/null +++ b/mesalib/src/mesa/main/hash_table.h @@ -0,0 +1,107 @@ +/* + * Copyright © 2009,2012 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Authors: + * Eric Anholt <eric@anholt.net> + * + */ + +#ifndef _HASH_TABLE_H +#define _HASH_TABLE_H + +#include <inttypes.h> +#include <stdbool.h> + +#include "compiler.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct hash_entry { + uint32_t hash; + const void *key; + void *data; +}; + +struct hash_table { + void *mem_ctx; + struct hash_entry *table; + bool (*key_equals_function)(const void *a, const void *b); + const void *deleted_key; + uint32_t size; + uint32_t rehash; + uint32_t max_entries; + uint32_t size_index; + uint32_t entries; + uint32_t deleted_entries; +}; + +struct hash_table * +_mesa_hash_table_create(void *mem_ctx, + bool (*key_equals_function)(const void *a, + const void *b)); +void _mesa_hash_table_destroy(struct hash_table *ht, + void (*delete_function)(struct hash_entry *entry)); +void _mesa_hash_table_set_deleted_key(struct hash_table *ht, + const void *deleted_key); + +struct hash_entry * +_mesa_hash_table_insert(struct hash_table *ht, uint32_t hash, + const void *key, void *data); +struct hash_entry * +_mesa_hash_table_search(struct hash_table *ht, uint32_t hash, + const void *key); +void _mesa_hash_table_remove(struct hash_table *ht, + struct hash_entry *entry); + +struct hash_entry *_mesa_hash_table_next_entry(struct hash_table *ht, + struct hash_entry *entry); +struct hash_entry * +_mesa_hash_table_random_entry(struct hash_table *ht, + bool (*predicate)(struct hash_entry *entry)); + +uint32_t _mesa_hash_data(const void *data, size_t size); +uint32_t _mesa_hash_string(const char *key); +bool _mesa_key_string_equal(const void *a, const void *b); +bool _mesa_key_pointer_equal(const void *a, const void *b); + +static inline uint32_t _mesa_hash_pointer(const void *pointer) +{ + return _mesa_hash_data(&pointer, sizeof(pointer)); +} + +/** + * This foreach function is safe against deletion (which just replaces + * an entry's data with the deleted marker), but not against insertion + * (which may rehash the table, making entry a dangling pointer). + */ +#define hash_table_foreach(ht, entry) \ + for (entry = _mesa_hash_table_next_entry(ht, NULL); \ + entry != NULL; \ + entry = _mesa_hash_table_next_entry(ht, entry)) + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif /* _HASH_TABLE_H */ diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index ed324b588..76f835e0e 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/src/mesa/main/imports.c @@ -59,11 +59,8 @@ #ifdef _WIN32 #define vsnprintf _vsnprintf -#elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 ) +#elif defined(__IBMC__) || defined(__IBMCPP__) extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg); -#ifdef __VMS -#include "vsnprintf.c" -#endif #endif /**********************************************************************/ diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index 40ba75785..8446ea2a3 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -214,8 +214,6 @@ static inline int IS_INF_OR_NAN( float x ) #define IS_INF_OR_NAN(x) (!isfinite(x)) #elif defined(finite) #define IS_INF_OR_NAN(x) (!finite(x)) -#elif defined(__VMS) -#define IS_INF_OR_NAN(x) (!finite(x)) #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L #define IS_INF_OR_NAN(x) (!isfinite(x)) #else diff --git a/mesalib/src/mesa/main/light.c b/mesalib/src/mesa/main/light.c index 042ed1cb8..b0a10e9ed 100644 --- a/mesalib/src/mesa/main/light.c +++ b/mesalib/src/mesa/main/light.c @@ -66,7 +66,7 @@ _mesa_ShadeModel( GLenum mode ) * triangle or line. */ void GLAPIENTRY -_mesa_ProvokingVertexEXT(GLenum mode) +_mesa_ProvokingVertex(GLenum mode) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); diff --git a/mesalib/src/mesa/main/light.h b/mesalib/src/mesa/main/light.h index 2e6a5003e..e25dbf226 100644 --- a/mesalib/src/mesa/main/light.h +++ b/mesalib/src/mesa/main/light.h @@ -39,7 +39,7 @@ extern void GLAPIENTRY _mesa_ShadeModel( GLenum mode ); extern void GLAPIENTRY -_mesa_ProvokingVertexEXT(GLenum mode); +_mesa_ProvokingVertex(GLenum mode); extern void GLAPIENTRY diff --git a/mesalib/src/mesa/main/matrix.c b/mesalib/src/mesa/main/matrix.c index 3c5968c85..00b8e00b7 100644 --- a/mesalib/src/mesa/main/matrix.c +++ b/mesalib/src/mesa/main/matrix.c @@ -489,7 +489,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z ) void GLAPIENTRY -_mesa_LoadTransposeMatrixfARB( const GLfloat *m ) +_mesa_LoadTransposeMatrixf( const GLfloat *m ) { GLfloat tm[16]; if (!m) return; @@ -499,7 +499,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m ) void GLAPIENTRY -_mesa_LoadTransposeMatrixdARB( const GLdouble *m ) +_mesa_LoadTransposeMatrixd( const GLdouble *m ) { GLfloat tm[16]; if (!m) return; @@ -509,7 +509,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m ) void GLAPIENTRY -_mesa_MultTransposeMatrixfARB( const GLfloat *m ) +_mesa_MultTransposeMatrixf( const GLfloat *m ) { GLfloat tm[16]; if (!m) return; @@ -519,7 +519,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m ) void GLAPIENTRY -_mesa_MultTransposeMatrixdARB( const GLdouble *m ) +_mesa_MultTransposeMatrixd( const GLdouble *m ) { GLfloat tm[16]; if (!m) return; diff --git a/mesalib/src/mesa/main/matrix.h b/mesalib/src/mesa/main/matrix.h index 2878cc134..185a5c04b 100644 --- a/mesalib/src/mesa/main/matrix.h +++ b/mesalib/src/mesa/main/matrix.h @@ -85,16 +85,16 @@ extern void GLAPIENTRY _mesa_Translated( GLdouble x, GLdouble y, GLdouble z ); extern void GLAPIENTRY -_mesa_LoadTransposeMatrixfARB( const GLfloat *m ); +_mesa_LoadTransposeMatrixf( const GLfloat *m ); extern void GLAPIENTRY -_mesa_LoadTransposeMatrixdARB( const GLdouble *m ); +_mesa_LoadTransposeMatrixd( const GLdouble *m ); extern void GLAPIENTRY -_mesa_MultTransposeMatrixfARB( const GLfloat *m ); +_mesa_MultTransposeMatrixf( const GLfloat *m ); extern void GLAPIENTRY -_mesa_MultTransposeMatrixdARB( const GLdouble *m ); +_mesa_MultTransposeMatrixd( const GLdouble *m ); extern void diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index b99e71044..da72da9d1 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1203,7 +1203,8 @@ struct gl_texture_image GLuint WidthLog2; /**< = log2(Width2) */ GLuint HeightLog2; /**< = log2(Height2) */ GLuint DepthLog2; /**< = log2(Depth2) */ - GLuint MaxLog2; /**< = MAX(WidthLog2, HeightLog2) */ + GLuint MaxNumLevels; /**< = maximum possible number of mipmap + levels, computed from the dimensions */ struct gl_texture_object *TexObject; /**< Pointer back to parent object */ GLuint Level; /**< Which mipmap level am I? */ diff --git a/mesalib/src/mesa/main/multisample.c b/mesalib/src/mesa/main/multisample.c index 67fdb8c9d..347e98e4e 100644 --- a/mesalib/src/mesa/main/multisample.c +++ b/mesalib/src/mesa/main/multisample.c @@ -34,7 +34,7 @@ * Called via glSampleCoverageARB */ void GLAPIENTRY -_mesa_SampleCoverageARB(GLclampf value, GLboolean invert) +_mesa_SampleCoverage(GLclampf value, GLboolean invert) { GET_CURRENT_CONTEXT(ctx); diff --git a/mesalib/src/mesa/main/multisample.h b/mesalib/src/mesa/main/multisample.h index e86d4092b..30726c34c 100644 --- a/mesalib/src/mesa/main/multisample.h +++ b/mesalib/src/mesa/main/multisample.h @@ -31,7 +31,7 @@ struct gl_context; extern void GLAPIENTRY -_mesa_SampleCoverageARB(GLclampf value, GLboolean invert); +_mesa_SampleCoverage(GLclampf value, GLboolean invert); extern void diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c index 63d1d8e26..aee8aef12 100644 --- a/mesalib/src/mesa/main/querymatrix.c +++ b/mesalib/src/mesa/main/querymatrix.c @@ -89,7 +89,7 @@ fpclassify(double x) #endif -GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) +GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) { GLfloat matrix[16]; GLint tmp; diff --git a/mesalib/src/mesa/main/querymatrix.h b/mesalib/src/mesa/main/querymatrix.h index 37a22e961..187b5f486 100644 --- a/mesalib/src/mesa/main/querymatrix.h +++ b/mesalib/src/mesa/main/querymatrix.h @@ -34,6 +34,6 @@ */ extern GLbitfield GLAPIENTRY -_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); +_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); #endif diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index a22425ab0..dbf40d051 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target) void GLAPIENTRY -_mesa_GenQueriesARB(GLsizei n, GLuint *ids) +_mesa_GenQueries(GLsizei n, GLuint *ids) { GLuint first; GET_CURRENT_CONTEXT(ctx); @@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids) void GLAPIENTRY -_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) +_mesa_DeleteQueries(GLsizei n, const GLuint *ids) { GLint i; GET_CURRENT_CONTEXT(ctx); @@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids) GLboolean GLAPIENTRY -_mesa_IsQueryARB(GLuint id) +_mesa_IsQuery(GLuint id) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE); @@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index) } void GLAPIENTRY -_mesa_BeginQueryARB(GLenum target, GLuint id) +_mesa_BeginQuery(GLenum target, GLuint id) { _mesa_BeginQueryIndexed(target, 0, id); } void GLAPIENTRY -_mesa_EndQueryARB(GLenum target) +_mesa_EndQuery(GLenum target) { _mesa_EndQueryIndexed(target, 0); } @@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, } void GLAPIENTRY -_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params) +_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params) { _mesa_GetQueryIndexediv(target, 0, pname, params); } void GLAPIENTRY -_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) +_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params) void GLAPIENTRY -_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) +_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params) * New with GL_EXT_timer_query */ void GLAPIENTRY -_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) +_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params) * New with GL_EXT_timer_query */ void GLAPIENTRY -_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params) +_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params) { struct gl_query_object *q = NULL; GET_CURRENT_CONTEXT(ctx); @@ -740,20 +740,20 @@ void _mesa_init_queryobj_dispatch(const struct gl_context *ctx, struct _glapi_table *disp) { - SET_GenQueriesARB(disp, _mesa_GenQueriesARB); - SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB); - SET_IsQueryARB(disp, _mesa_IsQueryARB); - SET_BeginQueryARB(disp, _mesa_BeginQueryARB); - SET_EndQueryARB(disp, _mesa_EndQueryARB); - SET_GetQueryivARB(disp, _mesa_GetQueryivARB); - SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB); + SET_GenQueries(disp, _mesa_GenQueries); + SET_DeleteQueries(disp, _mesa_DeleteQueries); + SET_IsQuery(disp, _mesa_IsQuery); + SET_BeginQuery(disp, _mesa_BeginQuery); + SET_EndQuery(disp, _mesa_EndQuery); + SET_GetQueryiv(disp, _mesa_GetQueryiv); + SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv); if (_mesa_is_desktop_gl(ctx)) { - SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB); + SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv); SET_QueryCounter(disp, _mesa_QueryCounter); - SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT); - SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT); + SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v); + SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v); SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed); SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed); diff --git a/mesalib/src/mesa/main/queryobj.h b/mesalib/src/mesa/main/queryobj.h index f9e916cda..78cbfc294 100644 --- a/mesalib/src/mesa/main/queryobj.h +++ b/mesalib/src/mesa/main/queryobj.h @@ -54,33 +54,33 @@ extern void _mesa_free_queryobj_data(struct gl_context *ctx); void GLAPIENTRY -_mesa_GenQueriesARB(GLsizei n, GLuint *ids); +_mesa_GenQueries(GLsizei n, GLuint *ids); void GLAPIENTRY -_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids); +_mesa_DeleteQueries(GLsizei n, const GLuint *ids); GLboolean GLAPIENTRY -_mesa_IsQueryARB(GLuint id); +_mesa_IsQuery(GLuint id); void GLAPIENTRY _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id); void GLAPIENTRY _mesa_EndQueryIndexed(GLenum target, GLuint index); void GLAPIENTRY -_mesa_BeginQueryARB(GLenum target, GLuint id); +_mesa_BeginQuery(GLenum target, GLuint id); void GLAPIENTRY -_mesa_EndQueryARB(GLenum target); +_mesa_EndQuery(GLenum target); void GLAPIENTRY _mesa_QueryCounter(GLuint id, GLenum target); void GLAPIENTRY _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params); +_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params); +_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params); +_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params); void GLAPIENTRY -_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params); +_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params); void GLAPIENTRY -_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params); +_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params); #endif /* QUERYOBJ_H */ diff --git a/mesalib/src/mesa/main/rastpos.c b/mesalib/src/mesa/main/rastpos.c index 0ea95b594..51747acab 100644 --- a/mesalib/src/mesa/main/rastpos.c +++ b/mesalib/src/mesa/main/rastpos.c @@ -289,49 +289,49 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) void GLAPIENTRY -_mesa_WindowPos2dMESA(GLdouble x, GLdouble y) +_mesa_WindowPos2d(GLdouble x, GLdouble y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2fMESA(GLfloat x, GLfloat y) +_mesa_WindowPos2f(GLfloat x, GLfloat y) { window_pos4f(x, y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2iMESA(GLint x, GLint y) +_mesa_WindowPos2i(GLint x, GLint y) { window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2sMESA(GLshort x, GLshort y) +_mesa_WindowPos2s(GLshort x, GLshort y) { window_pos4f(x, y, 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z) +_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z) +_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z) { window_pos4f(x, y, z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z) +_mesa_WindowPos3i(GLint x, GLint y, GLint z) { window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z) +_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z) { window_pos4f(x, y, z, 1.0F); } @@ -361,49 +361,49 @@ _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w) } void GLAPIENTRY -_mesa_WindowPos2dvMESA(const GLdouble *v) +_mesa_WindowPos2dv(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2fvMESA(const GLfloat *v) +_mesa_WindowPos2fv(const GLfloat *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2ivMESA(const GLint *v) +_mesa_WindowPos2iv(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos2svMESA(const GLshort *v) +_mesa_WindowPos2sv(const GLshort *v) { window_pos4f(v[0], v[1], 0.0F, 1.0F); } void GLAPIENTRY -_mesa_WindowPos3dvMESA(const GLdouble *v) +_mesa_WindowPos3dv(const GLdouble *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } void GLAPIENTRY -_mesa_WindowPos3fvMESA(const GLfloat *v) +_mesa_WindowPos3fv(const GLfloat *v) { window_pos4f(v[0], v[1], v[2], 1.0); } void GLAPIENTRY -_mesa_WindowPos3ivMESA(const GLint *v) +_mesa_WindowPos3iv(const GLint *v) { window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F); } void GLAPIENTRY -_mesa_WindowPos3svMESA(const GLshort *v) +_mesa_WindowPos3sv(const GLshort *v) { window_pos4f(v[0], v[1], v[2], 1.0F); } diff --git a/mesalib/src/mesa/main/rastpos.h b/mesalib/src/mesa/main/rastpos.h index 90351e86b..bbd32abd3 100644 --- a/mesalib/src/mesa/main/rastpos.h +++ b/mesalib/src/mesa/main/rastpos.h @@ -90,21 +90,21 @@ _mesa_RasterPos4iv(const GLint *v); void GLAPIENTRY _mesa_RasterPos4sv(const GLshort *v); void GLAPIENTRY -_mesa_WindowPos2dMESA(GLdouble x, GLdouble y); +_mesa_WindowPos2d(GLdouble x, GLdouble y); void GLAPIENTRY -_mesa_WindowPos2fMESA(GLfloat x, GLfloat y); +_mesa_WindowPos2f(GLfloat x, GLfloat y); void GLAPIENTRY -_mesa_WindowPos2iMESA(GLint x, GLint y); +_mesa_WindowPos2i(GLint x, GLint y); void GLAPIENTRY -_mesa_WindowPos2sMESA(GLshort x, GLshort y); +_mesa_WindowPos2s(GLshort x, GLshort y); void GLAPIENTRY -_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z); +_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z); void GLAPIENTRY -_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z); +_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z); void GLAPIENTRY -_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z); +_mesa_WindowPos3i(GLint x, GLint y, GLint z); void GLAPIENTRY -_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z); +_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z); void GLAPIENTRY _mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w); void GLAPIENTRY @@ -114,21 +114,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w); void GLAPIENTRY _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w); void GLAPIENTRY -_mesa_WindowPos2dvMESA(const GLdouble *v); +_mesa_WindowPos2dv(const GLdouble *v); void GLAPIENTRY -_mesa_WindowPos2fvMESA(const GLfloat *v); +_mesa_WindowPos2fv(const GLfloat *v); void GLAPIENTRY -_mesa_WindowPos2ivMESA(const GLint *v); +_mesa_WindowPos2iv(const GLint *v); void GLAPIENTRY -_mesa_WindowPos2svMESA(const GLshort *v); +_mesa_WindowPos2sv(const GLshort *v); void GLAPIENTRY -_mesa_WindowPos3dvMESA(const GLdouble *v); +_mesa_WindowPos3dv(const GLdouble *v); void GLAPIENTRY -_mesa_WindowPos3fvMESA(const GLfloat *v); +_mesa_WindowPos3fv(const GLfloat *v); void GLAPIENTRY -_mesa_WindowPos3ivMESA(const GLint *v); +_mesa_WindowPos3iv(const GLint *v); void GLAPIENTRY -_mesa_WindowPos3svMESA(const GLshort *v); +_mesa_WindowPos3sv(const GLshort *v); void GLAPIENTRY _mesa_WindowPos4dvMESA(const GLdouble *v); void GLAPIENTRY diff --git a/mesalib/src/mesa/main/readpix.c b/mesalib/src/mesa/main/readpix.c index f6680c91f..d6d105bc4 100644 --- a/mesalib/src/mesa/main/readpix.c +++ b/mesalib/src/mesa/main/readpix.c @@ -743,6 +743,17 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, return; } + if (_mesa_is_user_fbo(ctx->ReadBuffer) && + ctx->ReadBuffer->Visual.samples > 0) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)"); + return; + } + + if (!_mesa_source_buffer_exists(ctx, format)) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)"); + return; + } + /* Check that the destination format and source buffer are both * integer-valued or both non-integer-valued. */ @@ -757,17 +768,6 @@ _mesa_ReadnPixelsARB( GLint x, GLint y, GLsizei width, GLsizei height, } } - if (_mesa_is_user_fbo(ctx->ReadBuffer) && - ctx->ReadBuffer->Visual.samples > 0) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(multisample FBO)"); - return; - } - - if (!_mesa_source_buffer_exists(ctx, format)) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glReadPixels(no readbuffer)"); - return; - } - if (width == 0 || height == 0) return; /* nothing to do */ diff --git a/mesalib/src/mesa/main/shader_query.cpp b/mesalib/src/mesa/main/shader_query.cpp index 02a48ba60..27b1b8f56 100644 --- a/mesalib/src/mesa/main/shader_query.cpp +++ b/mesalib/src/mesa/main/shader_query.cpp @@ -40,7 +40,7 @@ extern "C" { } void GLAPIENTRY -_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, +_mesa_BindAttribLocation(GLhandleARB program, GLuint index, const GLcharARB *name) { GET_CURRENT_CONTEXT(ctx); @@ -77,7 +77,7 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, } void GLAPIENTRY -_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, +_mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name) { @@ -132,7 +132,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index, } GLint GLAPIENTRY -_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name) +_mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name) { GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *const shProg = diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index 9376b0f42..727115015 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -1001,7 +1001,7 @@ _mesa_AttachShader(GLuint program, GLuint shader) void GLAPIENTRY -_mesa_CompileShaderARB(GLhandleARB shaderObj) +_mesa_CompileShader(GLhandleARB shaderObj) { GET_CURRENT_CONTEXT(ctx); if (MESA_VERBOSE & VERBOSE_API) @@ -1215,7 +1215,7 @@ _mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize, void GLAPIENTRY -_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength, +_mesa_GetShaderSource(GLhandleARB shader, GLsizei maxLength, GLsizei *length, GLcharARB *sourceOut) { GET_CURRENT_CONTEXT(ctx); @@ -1248,7 +1248,7 @@ _mesa_IsShader(GLuint name) void GLAPIENTRY -_mesa_LinkProgramARB(GLhandleARB programObj) +_mesa_LinkProgram(GLhandleARB programObj) { GET_CURRENT_CONTEXT(ctx); link_program(ctx, programObj); @@ -1291,8 +1291,8 @@ read_shader(const char *fname) * and pass it to _mesa_shader_source(). */ void GLAPIENTRY -_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, - const GLcharARB ** string, const GLint * length) +_mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count, + const GLcharARB * const * string, const GLint * length) { GET_CURRENT_CONTEXT(ctx); GLint *offsets; @@ -1385,7 +1385,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count, void GLAPIENTRY -_mesa_UseProgramObjectARB(GLhandleARB program) +_mesa_UseProgram(GLhandleARB program) { GET_CURRENT_CONTEXT(ctx); struct gl_shader_program *shProg; @@ -1425,7 +1425,7 @@ _mesa_UseProgramObjectARB(GLhandleARB program) void GLAPIENTRY -_mesa_ValidateProgramARB(GLhandleARB program) +_mesa_ValidateProgram(GLhandleARB program) { GET_CURRENT_CONTEXT(ctx); validate_program(ctx, program); @@ -1706,12 +1706,12 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, } if (ctx->API != API_OPENGLES) { - SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB); - SET_CompileShaderARB(exec, _mesa_CompileShaderARB); - SET_LinkProgramARB(exec, _mesa_LinkProgramARB); - SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB); - SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB); - SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB); + SET_ShaderSource(exec, _mesa_ShaderSource); + SET_CompileShader(exec, _mesa_CompileShader); + SET_LinkProgram(exec, _mesa_LinkProgram); + SET_UseProgram(exec, _mesa_UseProgram); + SET_ValidateProgram(exec, _mesa_ValidateProgram); + SET_GetShaderSource(exec, _mesa_GetShaderSource); /* OpenGL 2.0 */ SET_AttachShader(exec, _mesa_AttachShader); @@ -1729,9 +1729,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, SET_IsShader(exec, _mesa_IsShader); /* GL_ARB_vertex_shader */ - SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB); - SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB); - SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB); + SET_BindAttribLocation(exec, _mesa_BindAttribLocation); + SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib); + SET_GetAttribLocation(exec, _mesa_GetAttribLocation); } if (ctx->API == API_OPENGL) { @@ -1742,10 +1742,10 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx, /* GL_EXT_gpu_shader4 / GL 3.0 */ if (_mesa_is_desktop_gl(ctx)) { - SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation); + SET_BindFragDataLocation(exec, _mesa_BindFragDataLocation); } if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) { - SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation); + SET_GetFragDataLocation(exec, _mesa_GetFragDataLocation); } /* GL_ARB_ES2_compatibility */ diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h index d6382e04a..8ee68d82d 100644 --- a/mesalib/src/mesa/main/shaderapi.h +++ b/mesalib/src/mesa/main/shaderapi.h @@ -64,7 +64,7 @@ extern void GLAPIENTRY _mesa_AttachObjectARB(GLhandleARB, GLhandleARB); extern void GLAPIENTRY -_mesa_CompileShaderARB(GLhandleARB); +_mesa_CompileShader(GLhandleARB); extern GLhandleARB GLAPIENTRY _mesa_CreateProgramObjectARB(void); @@ -100,7 +100,7 @@ extern void GLAPIENTRY _mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *); extern void GLAPIENTRY -_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); extern GLboolean GLAPIENTRY _mesa_IsProgram(GLuint name); @@ -109,20 +109,20 @@ extern GLboolean GLAPIENTRY _mesa_IsShader(GLuint name); extern void GLAPIENTRY -_mesa_LinkProgramARB(GLhandleARB programObj); +_mesa_LinkProgram(GLhandleARB programObj); extern void GLAPIENTRY -_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); +_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* const *, const GLint *); extern void GLAPIENTRY -_mesa_UseProgramObjectARB(GLhandleARB); +_mesa_UseProgram(GLhandleARB); extern void GLAPIENTRY -_mesa_ValidateProgramARB(GLhandleARB); +_mesa_ValidateProgram(GLhandleARB); extern void GLAPIENTRY -_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *); +_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *); extern void GLAPIENTRY _mesa_BindFragDataLocation(GLuint program, GLuint colorNumber, @@ -133,11 +133,11 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); extern void GLAPIENTRY -_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, +_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); extern GLint GLAPIENTRY -_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *); +_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *); diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index 1d178950c..745e982ad 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -308,7 +308,7 @@ _mesa_ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if ((flags & ~GL_SYNC_FLUSH_COMMANDS_BIT) != 0) { - _mesa_error(ctx, GL_INVALID_ENUM, "glClientWaitSync(flags=0x%x)", flags); + _mesa_error(ctx, GL_INVALID_VALUE, "glClientWaitSync(flags=0x%x)", flags); return GL_WAIT_FAILED; } @@ -352,15 +352,12 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if (flags != 0) { - _mesa_error(ctx, GL_INVALID_ENUM, "glWaitSync(flags=0x%x)", flags); + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(flags=0x%x)", flags); return; } - /* From the GL_ARB_sync spec: - * - * If the value of <timeout> is zero, then WaitSync does nothing. - */ - if (timeout == 0) { + if (timeout != GL_TIMEOUT_IGNORED) { + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout); return; } diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c index 554c68b71..2ccdcebd9 100644 --- a/mesalib/src/mesa/main/texgetimage.c +++ b/mesalib/src/mesa/main/texgetimage.c @@ -959,7 +959,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, } void GLAPIENTRY -_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img) +_mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img) { _mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img); } diff --git a/mesalib/src/mesa/main/texgetimage.h b/mesalib/src/mesa/main/texgetimage.h index cd8e76e7a..c9277fc91 100644 --- a/mesalib/src/mesa/main/texgetimage.h +++ b/mesalib/src/mesa/main/texgetimage.h @@ -54,7 +54,7 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels ); extern void GLAPIENTRY -_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img); +_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img); extern void GLAPIENTRY _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize, diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index 0f28009b0..7d5a574e4 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -1027,6 +1027,44 @@ _mesa_get_texture_dimensions(GLenum target) } +/** + * Return the maximum number of mipmap levels for the given target + * and the dimensions. + * The dimensions are expected not to include the border. + */ +GLsizei +_mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height, + GLsizei depth) +{ + GLsizei size; + + switch (target) { + case GL_TEXTURE_1D: + case GL_TEXTURE_1D_ARRAY: + size = width; + break; + case GL_TEXTURE_CUBE_MAP: + case GL_TEXTURE_CUBE_MAP_ARRAY: + ASSERT(width == height); + size = width; + break; + case GL_TEXTURE_2D: + case GL_TEXTURE_2D_ARRAY: + size = MAX2(width, height); + break; + case GL_TEXTURE_3D: + size = MAX3(width, height, depth); + break; + case GL_TEXTURE_RECTANGLE: + case GL_TEXTURE_EXTERNAL_OES: + return 1; + default: + assert(0); + return 1; + } + + return _mesa_logbase2(size) + 1; +} #if 000 /* not used anymore */ @@ -1214,7 +1252,9 @@ _mesa_init_teximage_fields(struct gl_context *ctx, target); } - img->MaxLog2 = MAX2(img->WidthLog2, img->HeightLog2); + img->MaxNumLevels = + _mesa_get_tex_max_num_levels(target, + img->Width2, img->Height2, img->Depth2); img->TexFormat = format; } @@ -3532,7 +3572,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims, void GLAPIENTRY -_mesa_CompressedTexImage1DARB(GLenum target, GLint level, +_mesa_CompressedTexImage1D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3544,7 +3584,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexImage2DARB(GLenum target, GLint level, +_mesa_CompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3556,7 +3596,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexImage3DARB(GLenum target, GLint level, +_mesa_CompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data) @@ -3611,7 +3651,7 @@ compressed_tex_sub_image(GLuint dims, GLenum target, GLint level, void GLAPIENTRY -_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data) { @@ -3621,7 +3661,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, void GLAPIENTRY -_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data) @@ -3632,7 +3672,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, void GLAPIENTRY -_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data) diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h index e1b15d252..65e933371 100644 --- a/mesalib/src/mesa/main/teximage.h +++ b/mesalib/src/mesa/main/teximage.h @@ -138,6 +138,9 @@ _mesa_tex_target_to_face(GLenum target); extern GLint _mesa_get_texture_dimensions(GLenum target); +extern GLsizei +_mesa_get_tex_max_num_levels(GLenum target, GLsizei width, GLsizei height, + GLsizei depth); extern GLboolean _mesa_legal_texture_dimensions(struct gl_context *ctx, GLenum target, @@ -248,41 +251,36 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level, extern void GLAPIENTRY -_mesa_CompressedTexImage1DARB(GLenum target, GLint level, +_mesa_CompressedTexImage1D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexImage2DARB(GLenum target, GLint level, +_mesa_CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexImage3DARB(GLenum target, GLint level, +_mesa_CompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -#ifdef VMS -#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR -#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR -#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR -#endif extern void GLAPIENTRY -_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); extern void GLAPIENTRY -_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, +_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index c083c72e2..d650c75e4 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -445,7 +445,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, { const GLint baseLevel = t->BaseLevel; const struct gl_texture_image *baseImage; - GLint maxLog2 = 0, maxLevels = 0; + GLint maxLevels = 0; /* We'll set these to FALSE if tests fail below */ t->_BaseComplete = GL_TRUE; @@ -501,31 +501,22 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, switch (t->Target) { case GL_TEXTURE_1D: case GL_TEXTURE_1D_ARRAY_EXT: - maxLog2 = baseImage->WidthLog2; maxLevels = ctx->Const.MaxTextureLevels; break; case GL_TEXTURE_2D: case GL_TEXTURE_2D_ARRAY_EXT: - maxLog2 = MAX2(baseImage->WidthLog2, - baseImage->HeightLog2); maxLevels = ctx->Const.MaxTextureLevels; break; case GL_TEXTURE_3D: - maxLog2 = MAX3(baseImage->WidthLog2, - baseImage->HeightLog2, - baseImage->DepthLog2); maxLevels = ctx->Const.Max3DTextureLevels; break; case GL_TEXTURE_CUBE_MAP_ARB: case GL_TEXTURE_CUBE_MAP_ARRAY: - maxLog2 = MAX2(baseImage->WidthLog2, - baseImage->HeightLog2); maxLevels = ctx->Const.MaxCubeTextureLevels; break; case GL_TEXTURE_RECTANGLE_NV: case GL_TEXTURE_BUFFER: case GL_TEXTURE_EXTERNAL_OES: - maxLog2 = 0; /* not applicable */ maxLevels = 1; /* no mipmapping */ break; default: @@ -535,7 +526,8 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx, ASSERT(maxLevels > 0); - t->_MaxLevel = baseLevel + maxLog2; /* 'p' in the GL spec */ + t->_MaxLevel = + baseLevel + baseImage->MaxNumLevels - 1; /* 'p' in the GL spec */ t->_MaxLevel = MIN2(t->_MaxLevel, t->MaxLevel); t->_MaxLevel = MIN2(t->_MaxLevel, maxLevels - 1); /* 'q' in the GL spec */ diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c index 1f765086b..8e9bbf6a1 100644 --- a/mesalib/src/mesa/main/texstate.c +++ b/mesalib/src/mesa/main/texstate.c @@ -286,7 +286,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state, /* GL_ARB_multitexture */ void GLAPIENTRY -_mesa_ActiveTextureARB(GLenum texture) +_mesa_ActiveTexture(GLenum texture) { const GLuint texUnit = texture - GL_TEXTURE0; GLuint k; @@ -325,7 +325,7 @@ _mesa_ActiveTextureARB(GLenum texture) /* GL_ARB_multitexture */ void GLAPIENTRY -_mesa_ClientActiveTextureARB(GLenum texture) +_mesa_ClientActiveTexture(GLenum texture) { GET_CURRENT_CONTEXT(ctx); GLuint texUnit = texture - GL_TEXTURE0; diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h index 7dc6dc6a2..7abf9101e 100644 --- a/mesalib/src/mesa/main/texstate.h +++ b/mesalib/src/mesa/main/texstate.h @@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit ); /*@{*/ extern void GLAPIENTRY -_mesa_ActiveTextureARB( GLenum target ); +_mesa_ActiveTexture( GLenum target ); extern void GLAPIENTRY -_mesa_ClientActiveTextureARB( GLenum target ); +_mesa_ClientActiveTexture( GLenum target ); /*@}*/ diff --git a/mesalib/src/mesa/main/texstorage.c b/mesalib/src/mesa/main/texstorage.c index 9e0b54317..00f19bae5 100644 --- a/mesalib/src/mesa/main/texstorage.c +++ b/mesalib/src/mesa/main/texstorage.c @@ -214,7 +214,6 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target, GLsizei width, GLsizei height, GLsizei depth) { struct gl_texture_object *texObj; - GLuint maxDim; GLboolean legalFormat; /* check internal format - note that only sized formats are allowed */ @@ -294,8 +293,7 @@ tex_storage_error_check(struct gl_context *ctx, GLuint dims, GLenum target, } /* check levels against width/height/depth */ - maxDim = MAX3(width, height, depth); - if (levels > (GLint) _mesa_logbase2(maxDim) + 1) { + if (levels > _mesa_get_tex_max_num_levels(target, width, height, depth)) { _mesa_error(ctx, GL_INVALID_OPERATION, "glTexStorage%uD(too many levels for max texture dimension)", dims); diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c index 52cb065c2..e0dd4e886 100644 --- a/mesalib/src/mesa/main/transformfeedback.c +++ b/mesalib/src/mesa/main/transformfeedback.c @@ -512,7 +512,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer, */ void GLAPIENTRY _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, - const GLchar **varyings, GLenum bufferMode) + const GLchar * const *varyings, + GLenum bufferMode) { struct gl_shader_program *shProg; GLint i; diff --git a/mesalib/src/mesa/main/transformfeedback.h b/mesalib/src/mesa/main/transformfeedback.h index dec11ffa0..01c2af359 100644 --- a/mesalib/src/mesa/main/transformfeedback.h +++ b/mesalib/src/mesa/main/transformfeedback.h @@ -73,7 +73,8 @@ _mesa_BindBufferOffsetEXT(GLenum target, GLuint index, GLuint buffer, extern void GLAPIENTRY _mesa_TransformFeedbackVaryings(GLuint program, GLsizei count, - const GLchar **varyings, GLenum bufferMode); + const GLchar * const *varyings, + GLenum bufferMode); extern void GLAPIENTRY _mesa_GetTransformFeedbackVarying(GLuint program, GLuint index, diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp index bddb8f95e..c71577c6e 100644 --- a/mesalib/src/mesa/main/uniform_query.cpp +++ b/mesalib/src/mesa/main/uniform_query.cpp @@ -38,7 +38,7 @@ extern "C" void GLAPIENTRY -_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index, +_mesa_GetActiveUniform(GLhandleARB program, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *nameOut) { diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index 2b7a564f0..3f156bf10 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -128,14 +128,14 @@ _mesa_uniform_detach_all_driver_storage(struct gl_uniform_storage *uni) } void GLAPIENTRY -_mesa_Uniform1fARB(GLint location, GLfloat v0) +_mesa_Uniform1f(GLint location, GLfloat v0) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT); } void GLAPIENTRY -_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1) +_mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1) { GET_CURRENT_CONTEXT(ctx); GLfloat v[2]; @@ -145,7 +145,7 @@ _mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1) } void GLAPIENTRY -_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) +_mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) { GET_CURRENT_CONTEXT(ctx); GLfloat v[3]; @@ -156,7 +156,7 @@ _mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) } void GLAPIENTRY -_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, +_mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3) { GET_CURRENT_CONTEXT(ctx); @@ -169,14 +169,14 @@ _mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, } void GLAPIENTRY -_mesa_Uniform1iARB(GLint location, GLint v0) +_mesa_Uniform1i(GLint location, GLint v0) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT); } void GLAPIENTRY -_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1) +_mesa_Uniform2i(GLint location, GLint v0, GLint v1) { GET_CURRENT_CONTEXT(ctx); GLint v[2]; @@ -186,7 +186,7 @@ _mesa_Uniform2iARB(GLint location, GLint v0, GLint v1) } void GLAPIENTRY -_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2) +_mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) { GET_CURRENT_CONTEXT(ctx); GLint v[3]; @@ -197,7 +197,7 @@ _mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2) } void GLAPIENTRY -_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) +_mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) { GET_CURRENT_CONTEXT(ctx); GLint v[4]; @@ -209,56 +209,56 @@ _mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) } void GLAPIENTRY -_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT); } void GLAPIENTRY -_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2); } void GLAPIENTRY -_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3); } void GLAPIENTRY -_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value) +_mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4); } void GLAPIENTRY -_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT); } void GLAPIENTRY -_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2); } void GLAPIENTRY -_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3); } void GLAPIENTRY -_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value) +_mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); _mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4); @@ -337,7 +337,7 @@ _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value) void GLAPIENTRY -_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -346,7 +346,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose, } void GLAPIENTRY -_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -355,7 +355,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose, } void GLAPIENTRY -_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose, +_mesa_UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); @@ -431,7 +431,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location, } void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params) +_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params) { _mesa_GetnUniformfvARB(program, location, INT_MAX, params); } @@ -446,7 +446,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location, } void GLAPIENTRY -_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params) +_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params) { _mesa_GetnUniformivARB(program, location, INT_MAX, params); } @@ -495,7 +495,7 @@ _mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params) GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name) +_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name) { struct gl_shader_program *shProg; GLuint index, offset; diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index 076bde3c8..287d7106b 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -39,37 +39,37 @@ struct gl_program; struct _glapi_table; void GLAPIENTRY -_mesa_Uniform1fARB(GLint, GLfloat); +_mesa_Uniform1f(GLint, GLfloat); void GLAPIENTRY -_mesa_Uniform2fARB(GLint, GLfloat, GLfloat); +_mesa_Uniform2f(GLint, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat); +_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat); +_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat); void GLAPIENTRY -_mesa_Uniform1iARB(GLint, GLint); +_mesa_Uniform1i(GLint, GLint); void GLAPIENTRY -_mesa_Uniform2iARB(GLint, GLint, GLint); +_mesa_Uniform2i(GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform3iARB(GLint, GLint, GLint, GLint); +_mesa_Uniform3i(GLint, GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint); +_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint); void GLAPIENTRY -_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *); +_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *); void GLAPIENTRY -_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform1iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform2iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform3iv(GLint, GLsizei, const GLint *); void GLAPIENTRY -_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *); +_mesa_Uniform4iv(GLint, GLsizei, const GLint *); void GLAPIENTRY _mesa_Uniform1ui(GLint location, GLuint v0); void GLAPIENTRY @@ -87,11 +87,11 @@ _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value); void GLAPIENTRY _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value); void GLAPIENTRY -_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY -_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY -_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *); +_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *); void GLAPIENTRY _mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); @@ -113,7 +113,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, void GLAPIENTRY _mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *); void GLAPIENTRY -_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *); +_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *); void GLAPIENTRY _mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *); void GLAPIENTRY @@ -127,7 +127,7 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *); void GLAPIENTRY _mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *); GLint GLAPIENTRY -_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *); +_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *); GLuint GLAPIENTRY _mesa_GetUniformBlockIndex(GLuint program, const GLchar *uniformBlockName); @@ -156,7 +156,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); void GLAPIENTRY -_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *, +_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); void GLAPIENTRY _mesa_GetActiveUniformsiv(GLuint program, @@ -165,7 +165,7 @@ _mesa_GetActiveUniformsiv(GLuint program, GLenum pname, GLint *params); void GLAPIENTRY -_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *); +_mesa_GetUniformiv(GLhandleARB, GLint, GLint *); unsigned _mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg, diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c index 3974787b4..f77014397 100644 --- a/mesalib/src/mesa/main/varray.c +++ b/mesalib/src/mesa/main/varray.c @@ -330,7 +330,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr) +_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT); GET_CURRENT_CONTEXT(ctx); @@ -357,7 +357,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, +_mesa_SecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT | @@ -413,7 +413,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr) void GLAPIENTRY -_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) +_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr) { const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT); GET_CURRENT_CONTEXT(ctx); @@ -437,7 +437,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr) * (position, normal, color, fog, texcoord, etc). */ void GLAPIENTRY -_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, +_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *ptr) { @@ -493,7 +493,7 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type, void GLAPIENTRY -_mesa_EnableVertexAttribArrayARB(GLuint index) +_mesa_EnableVertexAttribArray(GLuint index) { struct gl_array_object *arrayObj; GET_CURRENT_CONTEXT(ctx); @@ -520,7 +520,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index) void GLAPIENTRY -_mesa_DisableVertexAttribArrayARB(GLuint index) +_mesa_DisableVertexAttribArray(GLuint index) { struct gl_array_object *arrayObj; GET_CURRENT_CONTEXT(ctx); @@ -630,7 +630,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function) } void GLAPIENTRY -_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params) +_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -649,7 +649,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params) void GLAPIENTRY -_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params) +_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -671,7 +671,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params) void GLAPIENTRY -_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params) +_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -736,7 +736,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params) void GLAPIENTRY -_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer) +_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END(ctx); @@ -1039,7 +1039,7 @@ _mesa_UnlockArraysEXT( void ) /* GL_EXT_multi_draw_arrays */ void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, +_mesa_MultiDrawArrays( GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount ) { GET_CURRENT_CONTEXT(ctx); @@ -1137,7 +1137,7 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor) } if (index >= ctx->Const.VertexProgram.MaxAttribs) { - _mesa_error(ctx, GL_INVALID_ENUM, "glVertexAttribDivisor(index = %u)", + _mesa_error(ctx, GL_INVALID_VALUE, "glVertexAttribDivisor(index = %u)", index); return; } diff --git a/mesalib/src/mesa/main/varray.h b/mesalib/src/mesa/main/varray.h index b54e2f7df..904fa1bea 100644 --- a/mesalib/src/mesa/main/varray.h +++ b/mesalib/src/mesa/main/varray.h @@ -127,20 +127,20 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr); extern void GLAPIENTRY -_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr); +_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_SecondaryColorPointerEXT(GLint size, GLenum type, +_mesa_SecondaryColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr); +_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr); extern void GLAPIENTRY -_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type, +_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); @@ -150,23 +150,23 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type, extern void GLAPIENTRY -_mesa_EnableVertexAttribArrayARB(GLuint index); +_mesa_EnableVertexAttribArray(GLuint index); extern void GLAPIENTRY -_mesa_DisableVertexAttribArrayARB(GLuint index); +_mesa_DisableVertexAttribArray(GLuint index); extern void GLAPIENTRY -_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params); +_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params); extern void GLAPIENTRY -_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params); +_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params); extern void GLAPIENTRY -_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params); +_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params); extern void GLAPIENTRY @@ -178,7 +178,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params); extern void GLAPIENTRY -_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer); +_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer); extern void GLAPIENTRY @@ -186,7 +186,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer); extern void GLAPIENTRY -_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first, +_mesa_MultiDrawArrays( GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount ); extern void GLAPIENTRY diff --git a/mesalib/src/mesa/main/vsnprintf.c b/mesalib/src/mesa/main/vsnprintf.c deleted file mode 100644 index 3bbc0a9e2..000000000 --- a/mesalib/src/mesa/main/vsnprintf.c +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Revision 12: http://theos.com/~deraadt/snprintf.c - * - * Copyright (c) 1997 Theo de Raadt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __VMS -# include <sys/param.h> -#endif -#include <sys/types.h> -#include <sys/mman.h> -#include <signal.h> -#include <stdio.h> -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#include <setjmp.h> -#include <unistd.h> -#include <string.h> - -#ifndef roundup -#define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) -#endif - -#ifdef __sgi -#define size_t ssize_t -#endif - -static int pgsize; -static char *curobj; -static int caught; -static sigjmp_buf bail; - -#define EXTRABYTES 2 /* XXX: why 2? you don't want to know */ - -static char * -msetup(str, n) - char *str; - size_t n; -{ - char *e; - - if (n == 0) - return NULL; - if (pgsize == 0) - pgsize = getpagesize(); - curobj = malloc(n + EXTRABYTES + pgsize * 2); - if (curobj == NULL) - return NULL; - e = curobj + n + EXTRABYTES; - e = (char *)roundup((unsigned long)e, pgsize); - if (mprotect(e, pgsize, PROT_NONE) == -1) { - free(curobj); - curobj = NULL; - return NULL; - } - e = e - n - EXTRABYTES; - *e = '\0'; - return (e); -} - -static void - mcatch( int a ) -{ - siglongjmp(bail, 1); -} - -static void -mcleanup(str, n, p) - char *str; - size_t n; - char *p; -{ - strncpy(str, p, n-1); - str[n-1] = '\0'; - if (mprotect((caddr_t)(p + n + EXTRABYTES), pgsize, - PROT_READ|PROT_WRITE|PROT_EXEC) == -1) - mprotect((caddr_t)(p + n + EXTRABYTES), pgsize, - PROT_READ|PROT_WRITE); - free(curobj); -} - -int -#if __STDC__ -vsnprintf(char *str, size_t n, char const *fmt, va_list ap) -#else -vsnprintf(str, n, fmt, ap) - char *str; - size_t n; - char *fmt; - char *ap; -#endif -{ - struct sigaction osa, nsa; - char *p; - int ret = n + 1; /* if we bail, indicated we overflowed */ - - memset(&nsa, 0, sizeof nsa); - nsa.sa_handler = mcatch; - sigemptyset(&nsa.sa_mask); - - p = msetup(str, n); - if (p == NULL) { - *str = '\0'; - return 0; - } - if (sigsetjmp(bail, 1) == 0) { - if (sigaction(SIGSEGV, &nsa, &osa) == -1) { - mcleanup(str, n, p); - return (0); - } - ret = vsprintf(p, fmt, ap); - } - mcleanup(str, n, p); - (void) sigaction(SIGSEGV, &osa, NULL); - return (ret); -} - -int -#if __STDC__ -snprintf(char *str, size_t n, char const *fmt, ...) -#else -snprintf(str, n, fmt, va_alist) - char *str; - size_t n; - char *fmt; - va_dcl -#endif -{ - va_list ap; -#if __STDC__ - va_start(ap, fmt); -#else - va_start(ap); -#endif - - return (vsnprintf(str, n, fmt, ap)); - va_end(ap); -} - - - diff --git a/mesalib/src/mesa/math/descrip.mms b/mesalib/src/mesa/math/descrip.mms deleted file mode 100644 index 3aaa6eb8b..000000000 --- a/mesalib/src/mesa/math/descrip.mms +++ /dev/null @@ -1,47 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 3 October 2007 - -.first - define gl [---.include.gl] - define math [-.math] - define glapi [-.glapi] - define main [-.main] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES = m_debug_clip.c m_debug_norm.c m_debug_xform.c m_eval.c m_matrix.c\ - m_translate.c m_vector.c m_xform.c - -OBJECTS = m_debug_clip.obj,m_debug_norm.obj,m_debug_xform.obj,m_eval.obj,\ - m_matrix.obj,m_translate.obj,m_vector.obj,m_xform.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -m_debug_clip.obj : m_debug_clip.c -m_debug_norm.obj : m_debug_norm.c -m_debug_xform.obj : m_debug_xform.c -m_eval.obj : m_eval.c -m_matrix.obj : m_matrix.c -m_translate.obj : m_translate.c -m_vector.obj : m_vector.c -m_xform.obj : m_xform.c diff --git a/mesalib/src/mesa/program/.gitignore b/mesalib/src/mesa/program/.gitignore index 4c20872e1..bc48ef673 100644 --- a/mesalib/src/mesa/program/.gitignore +++ b/mesalib/src/mesa/program/.gitignore @@ -1,3 +1,4 @@ +/Makefile program_parse.output lex.yy.c program_parse.tab.c diff --git a/mesalib/src/mesa/program/Android.mk b/mesalib/src/mesa/program/Android.mk new file mode 100644 index 000000000..5eb043955 --- /dev/null +++ b/mesalib/src/mesa/program/Android.mk @@ -0,0 +1,84 @@ +# Copyright 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +LOCAL_PATH := $(call my-dir) + +define local-l-to-c + @mkdir -p $(dir $@) + @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<" + $(hide) $(LEX) -o$@ $< +endef + +define mesa_local-y-to-c-and-h + @mkdir -p $(dir $@) + @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<" + $(hide) $(YACC) -o $@ -p "_mesa_program_" $< +endef + +# ---------------------------------------------------------------------- +# libmesa_program.a +# ---------------------------------------------------------------------- + +# Import the following variables: +# PROGRAM_FILES +include $(MESA_TOP)/src/mesa/sources.mak + +include $(CLEAR_VARS) + +LOCAL_MODULE := libmesa_program +LOCAL_MODULE_CLASS := STATIC_LIBRARIES + +intermediates := $(call local-intermediates-dir) + +MESA_ENABLED_APIS := ES1 ES2 + +# TODO(chadv): In sources.mak, move these vars to a different list so we can +# remove this kludge. +generated_sources_basenames := \ + lex.yy.c \ + program_parse.tab.c \ + program_parse.tab.h + +LOCAL_SRC_FILES := \ + $(filter-out $(generated_sources_basenames),$(subst program/,,$(PROGRAM_FILES))) + +LOCAL_GENERATED_SOURCES := \ + $(addprefix $(intermediates)/program/,$(generated_sources_basenames)) + +$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program_parse.y + $(mesa_local-y-to-c-and-h) + +$(intermediates)/program/program_parse.tab.h: $(LOCAL_PATH)/program_parse.y + $(mesa_local-y-to-c-and-h) + +$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l + $(local-l-to-c) + +LOCAL_CFLAGS := \ + $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS)) + +LOCAL_C_INCLUDES := \ + $(intermediates) \ + $(MESA_TOP)/src/mapi \ + $(MESA_TOP)/src/mesa \ + $(MESA_TOP)/src/glsl + +include $(MESA_COMMON_MK) +include $(BUILD_STATIC_LIBRARY) diff --git a/mesalib/src/mesa/program/Makefile.am b/mesalib/src/mesa/program/Makefile.am new file mode 100644 index 000000000..ea412f56f --- /dev/null +++ b/mesalib/src/mesa/program/Makefile.am @@ -0,0 +1,57 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +# IN THE SOFTWARE. + +include ../sources.mak + +AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) +AM_CFLAGS = $(VISIBILITY_CFLAGS) +AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) +libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS) +libdricore_program_la_CXXFLAGS = $(NOVISIBILITY_CXXFLAGS) + +SRCDIR = $(top_srcdir)/src/mesa/ +BUILDDIR = $(top_builddir)/src/mesa/ + +if NEED_LIBDRICORE +DRICORE_LIB = libdricore_program.la +endif + +noinst_LTLIBRARIES = $(DRICORE_LIB) +if HAVE_GALLIUM +noinst_LTLIBRARIES += libprogram.la +else +check_LTLIBRARIES = libprogram.la +endif + +libprogram_la_SOURCES = $(PROGRAM_FILES) +libdricore_program_la_SOURCES = $(PROGRAM_FILES) + +lex.yy.c: program_lexer.l + $(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $< + +program_parse.tab.c program_parse.tab.h: program_parse.y + $(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program_parse.tab.c $< + +BUILT_SOURCES = \ + program_parse.tab.c \ + program_parse.tab.h \ + lex.yy.c +CLEANFILES = $(BUILT_SOURCES) diff --git a/mesalib/src/mesa/program/descrip.mms b/mesalib/src/mesa/program/descrip.mms deleted file mode 100644 index 59730020d..000000000 --- a/mesalib/src/mesa/program/descrip.mms +++ /dev/null @@ -1,93 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 29 September 2008 -.first - define gl [---.include.gl] - define math [-.math] - define swrast [-.swrast] - define array_cache [-.array_cache] - define glapi [-.glapi] - define main [-.main] - define shader [-.shader] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi],[.slang] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1,"__extension__=")/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES = \ - atifragshader.c \ - arbprogparse.c \ - arbprogram.c \ - nvfragparse.c \ - nvprogram.c \ - nvvertparse.c \ - program.c \ - programopt.c \ - prog_debug.c \ - prog_execute.c \ - prog_instruction.c \ - prog_parameter.c \ - prog_print.c \ - prog_cache.c \ - prog_statevars.c \ - shader_api.c prog_uniform.c - -OBJECTS = \ - atifragshader.obj,\ - arbprogparse.obj,\ - arbprogram.obj,\ - nvfragparse.obj,\ - nvprogram.obj,\ - nvvertparse.obj,\ - program.obj,\ - programopt.obj,\ - prog_debug.obj,\ - prog_execute.obj,\ - prog_instruction.obj,\ - prog_parameter.obj,\ - prog_print.obj,\ - prog_statevars.obj,\ - shader_api.obj,prog_uniform.obj,prog_cache.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -all : - $(MMS)$(MMSQUALIFIERS) $(LIBDIR)$(GL_LIB) - set def [.slang] - $(MMS)$(MMSQUALIFIERS) - set def [-] - -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -atifragshader.obj : atifragshader.c -arbprogparse.obj : arbprogparse.c -arbprogram.obj : arbprogram.c -nvfragparse.obj : nvfragparse.c -nvprogram.obj : nvprogram.c -nvvertparse.obj : nvvertparse.c -program.obj : program.c -programopt. obj : programopt.c -prog_debug.obj : prog_debug.c -prog_execute.obj : prog_execute.c -prog_instruction.obj : prog_instruction.c -prog_parameter.obj : prog_parameter.c -prog_print.obj : prog_print.c -prog_statevars.obj : prog_statevars.c -shader_api.obj : shader_api.c -prog_uniform.obj : prog_uniform.c -prog_cache.obj : prog_cache.c diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c index 9ee2f2014..fe2359bc2 100644 --- a/mesalib/src/mesa/program/prog_execute.c +++ b/mesalib/src/mesa/program/prog_execute.c @@ -65,9 +65,6 @@ fi.i = 0xFF800000; \ x = fi.f; \ } while (0) -#elif defined(VMS) -#define SET_POS_INFINITY(x) x = __MAXFLOAT -#define SET_NEG_INFINITY(x) x = -__MAXFLOAT #else #define SET_POS_INFINITY(x) x = (GLfloat) HUGE_VAL #define SET_NEG_INFINITY(x) x = (GLfloat) -HUGE_VAL @@ -1027,15 +1024,7 @@ _mesa_execute_program(struct gl_context * ctx, fetch_vector1(&inst->SrcReg[0], machine, t); abs_t0 = FABSF(t[0]); if (abs_t0 != 0.0F) { - /* Since we really can't handle infinite values on VMS - * like other OSes we'll use __MAXFLOAT to represent - * infinity. This may need some tweaking. - */ -#ifdef VMS - if (abs_t0 == __MAXFLOAT) -#else if (IS_INF_OR_NAN(abs_t0)) -#endif { SET_POS_INFINITY(q[0]); q[1] = 1.0F; diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak index cfb24f318..54e58c21b 100644 --- a/mesalib/src/mesa/sources.mak +++ b/mesalib/src/mesa/sources.mak @@ -40,6 +40,7 @@ MAIN_FILES = \ $(SRCDIR)main/fbobject.c \ $(SRCDIR)main/feedback.c \ $(SRCDIR)main/ffvertex_prog.c \ + $(SRCDIR)main/ff_fragment_shader.cpp \ $(SRCDIR)main/fog.c \ $(SRCDIR)main/formats.c \ $(SRCDIR)main/format_pack.c \ @@ -49,6 +50,7 @@ MAIN_FILES = \ $(SRCDIR)main/getstring.c \ $(SRCDIR)main/glformats.c \ $(SRCDIR)main/hash.c \ + $(SRCDIR)main/hash_table.c \ $(SRCDIR)main/hint.c \ $(SRCDIR)main/histogram.c \ $(SRCDIR)main/image.c \ @@ -76,6 +78,7 @@ MAIN_FILES = \ $(SRCDIR)main/scissor.c \ $(SRCDIR)main/shaderapi.c \ $(SRCDIR)main/shaderobj.c \ + $(SRCDIR)main/shader_query.cpp \ $(SRCDIR)main/shared.c \ $(SRCDIR)main/state.c \ $(SRCDIR)main/stencil.c \ @@ -99,6 +102,7 @@ MAIN_FILES = \ $(SRCDIR)main/texturebarrier.c \ $(SRCDIR)main/transformfeedback.c \ $(SRCDIR)main/uniforms.c \ + $(SRCDIR)main/uniform_query.cpp \ $(SRCDIR)main/varray.c \ $(SRCDIR)main/version.c \ $(SRCDIR)main/viewport.c \ @@ -106,11 +110,6 @@ MAIN_FILES = \ $(BUILDDIR)main/enums.c \ $(MAIN_ES_FILES) -MAIN_CXX_FILES = \ - $(SRCDIR)main/ff_fragment_shader.cpp \ - $(SRCDIR)main/shader_query.cpp \ - $(SRCDIR)main/uniform_query.cpp - MATH_FILES = \ $(SRCDIR)math/m_debug_clip.c \ $(SRCDIR)math/m_debug_norm.c \ @@ -240,6 +239,7 @@ STATETRACKER_FILES = \ $(SRCDIR)state_tracker/st_extensions.c \ $(SRCDIR)state_tracker/st_format.c \ $(SRCDIR)state_tracker/st_gen_mipmap.c \ + $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp \ $(SRCDIR)state_tracker/st_manager.c \ $(SRCDIR)state_tracker/st_mesa_to_tgsi.c \ $(SRCDIR)state_tracker/st_program.c \ @@ -248,6 +248,7 @@ STATETRACKER_FILES = \ PROGRAM_FILES = \ $(SRCDIR)program/arbprogparse.c \ $(SRCDIR)program/hash_table.c \ + $(SRCDIR)program/ir_to_mesa.cpp \ $(SRCDIR)program/program.c \ $(SRCDIR)program/program_parse_extra.c \ $(SRCDIR)program/prog_cache.c \ @@ -262,16 +263,12 @@ PROGRAM_FILES = \ $(SRCDIR)program/prog_statevars.c \ $(SRCDIR)program/programopt.c \ $(SRCDIR)program/register_allocate.c \ + $(SRCDIR)program/sampler.cpp \ + $(SRCDIR)program/string_to_uint_map.cpp \ $(SRCDIR)program/symbol_table.c \ $(BUILDDIR)program/lex.yy.c \ $(BUILDDIR)program/program_parse.tab.c - -SHADER_CXX_FILES = \ - $(SRCDIR)program/ir_to_mesa.cpp \ - $(SRCDIR)program/sampler.cpp \ - $(SRCDIR)program/string_to_uint_map.cpp - ASM_C_FILES = \ $(SRCDIR)x86/common_x86.c \ $(SRCDIR)x86/x86_xform.c \ @@ -320,53 +317,25 @@ MESA_FILES = \ $(MATH_XFORM_FILES) \ $(VBO_FILES) \ $(TNL_FILES) \ - $(PROGRAM_FILES) \ $(SWRAST_FILES) \ $(SWRAST_SETUP_FILES) \ $(COMMON_DRIVER_FILES)\ $(ASM_C_FILES) -MESA_CXX_FILES = \ - $(MAIN_CXX_FILES) \ - $(SHADER_CXX_FILES) - # Sources for building Gallium drivers MESA_GALLIUM_FILES = \ $(MAIN_FILES) \ $(MATH_FILES) \ $(VBO_FILES) \ $(STATETRACKER_FILES) \ - $(PROGRAM_FILES) \ $(SRCDIR)x86/common_x86.c -MESA_GALLIUM_CXX_FILES = \ - $(MESA_CXX_FILES) \ - $(SRCDIR)state_tracker/st_glsl_to_tgsi.cpp - # All the core C sources, for dependency checking ALL_FILES = \ $(MESA_FILES) \ - $(MESA_GALLIUM_CXX_FILES) \ $(MESA_ASM_FILES) \ $(STATETRACKER_FILES) - -### Object files - -MESA_OBJECTS = \ - $(MESA_FILES:.c=.o) \ - $(MESA_CXX_FILES:.cpp=.o) \ - $(MESA_ASM_FILES:.S=.o) - -MESA_GALLIUM_OBJECTS = \ - $(MESA_GALLIUM_FILES:.c=.o) \ - $(MESA_GALLIUM_CXX_FILES:.cpp=.o) \ - $(MESA_ASM_FILES:.S=.o) - - -COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_FILES:.c=.o) - - ### Include directories INCLUDE_DIRS = \ diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index b2711c342..f06814f9c 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -253,37 +253,6 @@ default_bindings(struct st_context *st, enum pipe_format format) } -/** Return number of image dimensions (1, 2 or 3) for a texture target. */ -static GLuint -get_texture_dims(GLenum target) -{ - switch (target) { - case GL_TEXTURE_1D: - case GL_TEXTURE_1D_ARRAY_EXT: - case GL_TEXTURE_BUFFER: - return 1; - case GL_TEXTURE_2D: - case GL_TEXTURE_CUBE_MAP_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB: - case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB: - case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB: - case GL_TEXTURE_RECTANGLE_NV: - case GL_TEXTURE_2D_ARRAY_EXT: - case GL_TEXTURE_EXTERNAL_OES: - return 2; - case GL_TEXTURE_3D: - case GL_TEXTURE_CUBE_MAP_ARRAY: - return 3; - default: - assert(0 && "invalid texture target in get_texture_dims()"); - return 1; - } -} - - /** * Given the size of a mipmap image, try to compute the size of the level=0 * mipmap image. @@ -298,32 +267,57 @@ guess_base_level_size(GLenum target, GLuint width, GLuint height, GLuint depth, GLuint level, GLuint *width0, GLuint *height0, GLuint *depth0) { - const GLuint dims = get_texture_dims(target); - assert(width >= 1); assert(height >= 1); assert(depth >= 1); if (level > 0) { - /* Depending on the image's size, we can't always make a guess here */ - if ((dims >= 1 && width == 1) || - (dims >= 2 && height == 1) || - (dims >= 3 && depth == 1)) { - /* we can't determine the image size at level=0 */ - return GL_FALSE; - } + /* Guess the size of the base level. + * Depending on the image's size, we can't always make a guess here. + */ + switch (target) { + case GL_TEXTURE_1D: + case GL_TEXTURE_1D_ARRAY: + width <<= level; + break; + + case GL_TEXTURE_2D: + case GL_TEXTURE_2D_ARRAY: + /* We can't make a good guess here, because the base level dimensions + * can be non-square. + */ + if (width == 1 || height == 1) { + return GL_FALSE; + } + width <<= level; + height <<= level; + break; + + case GL_TEXTURE_CUBE_MAP: + case GL_TEXTURE_CUBE_MAP_ARRAY: + width <<= level; + height <<= level; + break; + + case GL_TEXTURE_3D: + /* We can't make a good guess here, because the base level dimensions + * can be non-cube. + */ + if (width == 1 || height == 1 || depth == 1) { + return GL_FALSE; + } + width <<= level; + height <<= level; + depth <<= level; + break; + + case GL_TEXTURE_RECTANGLE: + break; - /* grow the image size until we hit level = 0 */ - while (level > 0) { - if (width > 1) - width <<= 1; - if (height > 1) - height <<= 1; - if (depth > 1) - depth <<= 1; - level--; + default: + assert(0); } - } + } *width0 = width; *height0 = height; @@ -390,10 +384,8 @@ guess_and_alloc_texture(struct st_context *st, } else { /* alloc space for a full mipmap */ - GLuint l2width = util_logbase2(width); - GLuint l2height = util_logbase2(height); - GLuint l2depth = util_logbase2(depth); - lastLevel = MAX2(MAX2(l2width, l2height), l2depth); + lastLevel = _mesa_get_tex_max_num_levels(stObj->base.Target, + width, height, depth) - 1; } /* Save the level=0 dimensions */ diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c index 889200686..c09261312 100644 --- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c +++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c @@ -121,30 +121,16 @@ compute_num_levels(struct gl_context *ctx, struct gl_texture_object *texObj, GLenum target) { - if (target == GL_TEXTURE_RECTANGLE_ARB) { - return 1; - } - else { - const struct gl_texture_image *baseImage = - _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel); - GLuint size, numLevels; + const struct gl_texture_image *baseImage; + GLuint numLevels; - size = MAX2(baseImage->Width2, baseImage->Height2); - size = MAX2(size, baseImage->Depth2); + baseImage = _mesa_get_tex_image(ctx, texObj, target, texObj->BaseLevel); - numLevels = texObj->BaseLevel; - - while (size > 0) { - numLevels++; - size >>= 1; - } + numLevels = texObj->BaseLevel + baseImage->MaxNumLevels; + numLevels = MIN2(numLevels, texObj->MaxLevel + 1); + assert(numLevels >= 1); - numLevels = MIN2(numLevels, texObj->MaxLevel + 1); - - assert(numLevels >= 1); - - return numLevels; - } + return numLevels; } diff --git a/mesalib/src/mesa/swrast/descrip.mms b/mesalib/src/mesa/swrast/descrip.mms deleted file mode 100644 index 0b23deb3c..000000000 --- a/mesalib/src/mesa/swrast/descrip.mms +++ /dev/null @@ -1,82 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 3 October 2007 - -.first - define gl [---.include.gl] - define math [-.math] - define swrast [-.swrast] - define array_cache [-.array_cache] - define glapi [-.glapi] - define main [-.main] - define shader [-.shader] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES = s_aaline.c s_aatriangle.c s_accum.c s_alpha.c \ - s_bitmap.c s_blend.c s_blit.c s_buffers.c s_context.c \ - s_copypix.c s_depth.c s_fragprog.c \ - s_drawpix.c s_feedback.c s_fog.c s_imaging.c s_lines.c s_logic.c \ - s_masking.c s_points.c s_readpix.c \ - s_span.c s_stencil.c s_texstore.c s_texcombine.c s_texfilter.c \ - s_triangle.c s_zoom.c s_atifragshader.c - -OBJECTS = s_aaline.obj,s_aatriangle.obj,s_accum.obj,s_alpha.obj,\ - s_bitmap.obj,s_blend.obj,s_blit.obj,s_fragprog.obj,\ - s_buffers.obj,s_context.obj,s_atifragshader.obj,\ - s_copypix.obj,s_depth.obj,s_drawpix.obj,s_feedback.obj,s_fog.obj,\ - s_imaging.obj,s_lines.obj,s_logic.obj,s_masking.obj,\ - s_points.obj,s_readpix.obj,s_span.obj,s_stencil.obj,\ - s_texstore.obj,s_texcombine.obj,s_texfilter.obj,s_triangle.obj,\ - s_zoom.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -s_atifragshader.obj : s_atifragshader.c -s_aaline.obj : s_aaline.c -s_aatriangle.obj : s_aatriangle.c -s_accum.obj : s_accum.c -s_alpha.obj : s_alpha.c -s_bitmap.obj : s_bitmap.c -s_blend.obj : s_blend.c -s_blit.obj : s_blit.c -s_buffers.obj : s_buffers.c -s_context.obj : s_context.c -s_copypix.obj : s_copypix.c -s_depth.obj : s_depth.c -s_drawpix.obj : s_drawpix.c -s_feedback.obj : s_feedback.c -s_fog.obj : s_fog.c -s_imaging.obj : s_imaging.c -s_lines.obj : s_lines.c -s_logic.obj : s_logic.c -s_masking.obj : s_masking.c -s_points.obj : s_points.c -s_readpix.obj : s_readpix.c -s_span.obj : s_span.c -s_stencil.obj : s_stencil.c -s_texstore.obj : s_texstore.c -s_texcombine.obj : s_texcombine.c -s_texfilter.obj : s_texfilter.c -s_triangle.obj : s_triangle.c -s_zoom.obj : s_zoom.c -s_fragprog.obj : s_fragprog.c diff --git a/mesalib/src/mesa/swrast_setup/descrip.mms b/mesalib/src/mesa/swrast_setup/descrip.mms deleted file mode 100644 index 32ffd8073..000000000 --- a/mesalib/src/mesa/swrast_setup/descrip.mms +++ /dev/null @@ -1,42 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 3 October 2007 - -.first - define gl [---.include.gl] - define math [-.math] - define tnl [-.tnl] - define vbo [-.vbo] - define swrast [-.swrast] - define array_cache [-.array_cache] - define glapi [-.glapi] - define main [-.main] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES = ss_context.c ss_triangle.c - -OBJECTS = ss_context.obj,ss_triangle.obj -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -ss_context.obj : ss_context.c -ss_triangle.obj : ss_triangle.c diff --git a/mesalib/src/mesa/tnl/descrip.mms b/mesalib/src/mesa/tnl/descrip.mms deleted file mode 100644 index 25dd1aecb..000000000 --- a/mesalib/src/mesa/tnl/descrip.mms +++ /dev/null @@ -1,68 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 39 September 2008 - -.first - define gl [---.include.gl] - define math [-.math] - define vbo [-.vbo] - define shader [-.shader] - define swrast [-.swrast] - define array_cache [-.array_cache] - define main [-.main] - define glapi [-.glapi] - define tnl [-.tnl] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES = t_context.c t_draw.c \ - t_pipeline.c t_vb_fog.c \ - t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \ - t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \ - t_vertex.c t_rasterpos.c\ - t_vertex_generic.c t_vp_build.c - -OBJECTS = t_context.obj,t_draw.obj,\ - t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\ - t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\ - t_vb_texmat.obj,t_vb_vertex.obj,t_rasterpos.obj,\ - t_vertex.obj,t_vertex_generic.obj,\ - t_vp_build.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -t_context.obj : t_context.c -t_draw.obj : t_draw.c -t_pipeline.obj : t_pipeline.c -t_vb_fog.obj : t_vb_fog.c -t_vb_light.obj : t_vb_light.c -t_vb_normals.obj : t_vb_normals.c -t_vb_points.obj : t_vb_points.c -t_vb_program.obj : t_vb_program.c -t_vb_render.obj : t_vb_render.c -t_vb_texgen.obj : t_vb_texgen.c -t_vb_texmat.obj : t_vb_texmat.c -t_vb_vertex.obj : t_vb_vertex.c -t_vertex.obj : t_vertex.c -t_vertex_generic.obj : t_vertex_generic.c -t_vp_build.obj : t_vp_build.c -t_rasterpos.obj : t_rasterpos.c diff --git a/mesalib/src/mesa/vbo/descrip.mms b/mesalib/src/mesa/vbo/descrip.mms deleted file mode 100644 index c2a16a04f..000000000 --- a/mesalib/src/mesa/vbo/descrip.mms +++ /dev/null @@ -1,62 +0,0 @@ -# Makefile for core library for VMS -# contributed by Jouk Jansen joukj@hrem.nano.tudelft.nl -# Last revision : 3 October 2007 - -.first - define gl [---.include.gl] - define math [-.math] - define vbo [-.vbo] - define tnl [-.tnl] - define shader [-.shader] - define swrast [-.swrast] - define swrast_setup [-.swrast_setup] - define main [-.main] - define glapi [-.glapi] - -.include [---]mms-config. - -##### MACROS ##### - -VPATH = RCS - -INCDIR = [---.include],[-.main],[-.glapi],[-.shader],[-.shader.slang] -LIBDIR = [---.lib] -CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)/float=ieee/ieee=denorm - -SOURCES =vbo_context.c,vbo_exec.c,vbo_exec_api.c,vbo_exec_array.c,\ - vbo_exec_draw.c,vbo_exec_eval.c,vbo_rebase.c,vbo_save.c,\ - vbo_save_api.c,vbo_save_draw.c,vbo_save_loopback.c,\ - vbo_split.c,vbo_split_copy.c,vbo_split_inplace.c - -OBJECTS =vbo_context.obj,vbo_exec.obj,vbo_exec_api.obj,vbo_exec_array.obj,\ - vbo_exec_draw.obj,vbo_exec_eval.obj,vbo_rebase.obj,vbo_save.obj,\ - vbo_save_api.obj,vbo_save_draw.obj,vbo_save_loopback.obj,\ - vbo_split.obj,vbo_split_copy.obj,vbo_split_inplace.obj - -##### RULES ##### - -VERSION=Mesa V3.4 - -##### TARGETS ##### -# Make the library -$(LIBDIR)$(GL_LIB) : $(OBJECTS) - @ library $(LIBDIR)$(GL_LIB) $(OBJECTS) - -clean : - purge - delete *.obj;* - -vbo_context.obj : vbo_context.c -vbo_exec.obj : vbo_exec.c -vbo_exec_api.obj : vbo_exec_api.c -vbo_exec_array.obj : vbo_exec_array.c -vbo_exec_draw.obj : vbo_exec_draw.c -vbo_exec_eval.obj : vbo_exec_eval.c -vbo_rebase.obj : vbo_rebase.c -vbo_save.obj : vbo_save.c -vbo_save_api.obj : vbo_save_api.c -vbo_save_draw.obj : vbo_save_draw.c -vbo_save_loopback.obj : vbo_save_loopback.c -vbo_split.obj : vbo_split.c -vbo_split_copy.obj : vbo_split_copy.c -vbo_split_inplace.obj : vbo_split_inplace.c diff --git a/pixman/pixman/pixman-arm-simd.c b/pixman/pixman/pixman-arm-simd.c index 3d19bfac1..94f9a0caf 100644 --- a/pixman/pixman/pixman-arm-simd.c +++ b/pixman/pixman/pixman-arm-simd.c @@ -56,7 +56,7 @@ pixman_composite_add_8_8_asm_armv6 (int32_t width, /* ensure both src and dst are properly aligned before doing 32 bit reads * we'll stay in this loop if src and dst have differing alignments */ - while (w && (((unsigned long)dst & 3) || ((unsigned long)src & 3))) + while (w && (((uintptr_t)dst & 3) || ((uintptr_t)src & 3))) { s = *src; d = *dst; diff --git a/pixman/pixman/pixman-fast-path.c b/pixman/pixman/pixman-fast-path.c index d95cb4dee..342975888 100644 --- a/pixman/pixman/pixman-fast-path.c +++ b/pixman/pixman/pixman-fast-path.c @@ -35,7 +35,7 @@ static force_inline uint32_t fetch_24 (uint8_t *a) { - if (((unsigned long)a) & 1) + if (((uintptr_t)a) & 1) { #ifdef WORDS_BIGENDIAN return (*a << 16) | (*(uint16_t *)(a + 1)); @@ -57,7 +57,7 @@ static force_inline void store_24 (uint8_t *a, uint32_t v) { - if (((unsigned long)a) & 1) + if (((uintptr_t)a) & 1) { #ifdef WORDS_BIGENDIAN *a = (uint8_t) (v >> 16); diff --git a/pixman/pixman/pixman-matrix.c b/pixman/pixman/pixman-matrix.c index a029ab757..d2ab609dc 100644 --- a/pixman/pixman/pixman-matrix.c +++ b/pixman/pixman/pixman-matrix.c @@ -336,14 +336,14 @@ PIXMAN_EXPORT pixman_bool_t pixman_transform_invert (struct pixman_transform * dst, const struct pixman_transform *src) { - struct pixman_f_transform m, r; + struct pixman_f_transform m; pixman_f_transform_from_pixman_transform (&m, src); - if (!pixman_f_transform_invert (&r, &m)) + if (!pixman_f_transform_invert (&m, &m)) return FALSE; - if (!pixman_transform_from_pixman_f_transform (dst, &r)) + if (!pixman_transform_from_pixman_f_transform (dst, &m)) return FALSE; return TRUE; @@ -469,10 +469,11 @@ PIXMAN_EXPORT pixman_bool_t pixman_f_transform_invert (struct pixman_f_transform * dst, const struct pixman_f_transform *src) { - double det; - int i, j; static const int a[3] = { 2, 2, 1 }; static const int b[3] = { 1, 0, 0 }; + pixman_f_transform_t d; + double det; + int i, j; det = 0; for (i = 0; i < 3; i++) @@ -507,10 +508,12 @@ pixman_f_transform_invert (struct pixman_f_transform * dst, if (((i + j) & 1) != 0) p = -p; - dst->m[j][i] = det * p; + d.m[j][i] = det * p; } } + *dst = d; + return TRUE; } diff --git a/pixman/pixman/pixman-mips-dspr2-asm.S b/pixman/pixman/pixman-mips-dspr2-asm.S index b5cae1690..ba22e6254 100644 --- a/pixman/pixman/pixman-mips-dspr2-asm.S +++ b/pixman/pixman/pixman-mips-dspr2-asm.S @@ -310,6 +310,139 @@ LEAF_MIPS_DSPR2(pixman_composite_src_x888_8888_asm_mips) END(pixman_composite_src_x888_8888_asm_mips) +LEAF_MIPS_DSPR2(pixman_composite_src_n_8_8888_asm_mips) +/* + * a0 - dst (a8r8g8b8) + * a1 - src (32bit constant) + * a2 - mask (a8) + * a3 - w + */ + + + SAVE_REGS_ON_STACK 0, v0 + li v0, 0x00ff00ff + + beqz a3, 3f + nop + addiu t1, a3, -1 + beqz t1, 2f + nop + +1: + /* a1 = source (32bit constant) */ + lbu t0, 0(a2) /* t2 = mask (a8) */ + lbu t1, 1(a2) /* t3 = mask (a8) */ + addiu a2, a2, 2 + + MIPS_2xUN8x4_MUL_2xUN8 a1, a1, t0, t1, t2, t3, v0, t4, t5, t6, t7, t8, t9 + + sw t2, 0(a0) + sw t3, 4(a0) + addiu a3, a3, -2 + addiu t2, a3, -1 + bgtz t2, 1b + addiu a0, a0, 8 + + beqz a3, 3f + nop + +2: + lbu t0, 0(a2) + addiu a2, a2, 1 + + MIPS_UN8x4_MUL_UN8 a1, t0, t1, v0, t3, t4, t5 + + sw t1, 0(a0) + addiu a3, a3, -1 + addiu a0, a0, 4 + +3: + RESTORE_REGS_FROM_STACK 0, v0 + j ra + nop + +END(pixman_composite_src_n_8_8888_asm_mips) + +LEAF_MIPS_DSPR2(pixman_composite_src_n_8_8_asm_mips) +/* + * a0 - dst (a8) + * a1 - src (32bit constant) + * a2 - mask (a8) + * a3 - w + */ + + li t9, 0x00ff00ff + beqz a3, 3f + nop + srl t7, a3, 2 /* t7 = how many multiples of 4 dst pixels */ + beqz t7, 1f /* branch if less than 4 src pixels */ + nop + + srl t8, a1, 24 + replv.ph t8, t8 + +0: + beqz t7, 1f + addiu t7, t7, -1 + lbu t0, 0(a2) + lbu t1, 1(a2) + lbu t2, 2(a2) + lbu t3, 3(a2) + + addiu a2, a2, 4 + + precr_sra.ph.w t1, t0, 0 + precr_sra.ph.w t3, t2, 0 + precr.qb.ph t0, t3, t1 + + muleu_s.ph.qbl t2, t0, t8 + muleu_s.ph.qbr t3, t0, t8 + shra_r.ph t4, t2, 8 + shra_r.ph t5, t3, 8 + and t4, t4, t9 + and t5, t5, t9 + addq.ph t2, t2, t4 + addq.ph t3, t3, t5 + shra_r.ph t2, t2, 8 + shra_r.ph t3, t3, 8 + precr.qb.ph t2, t2, t3 + + sb t2, 0(a0) + srl t2, t2, 8 + sb t2, 1(a0) + srl t2, t2, 8 + sb t2, 2(a0) + srl t2, t2, 8 + sb t2, 3(a0) + addiu a3, a3, -4 + b 0b + addiu a0, a0, 4 + +1: + beqz a3, 3f + nop + srl t8, a1, 24 +2: + lbu t0, 0(a2) + addiu a2, a2, 1 + + mul t2, t0, t8 + shra_r.ph t3, t2, 8 + andi t3, t3, 0x00ff + addq.ph t2, t2, t3 + shra_r.ph t2, t2, 8 + + sb t2, 0(a0) + addiu a3, a3, -1 + bnez a3, 2b + addiu a0, a0, 1 + +3: + j ra + nop + +END(pixman_composite_src_n_8_8_asm_mips) + LEAF_MIPS_DSPR2(pixman_composite_over_n_8888_8888_ca_asm_mips) /* * a0 - dst (a8r8g8b8) @@ -1209,6 +1342,140 @@ LEAF_MIPS_DSPR2(pixman_composite_over_8888_8888_asm_mips) END(pixman_composite_over_8888_8888_asm_mips) +LEAF_MIPS_DSPR2(pixman_composite_over_n_0565_asm_mips) +/* + * a0 - dst (r5g6b5) + * a1 - src (32bit constant) + * a2 - w + */ + + beqz a2, 5f + nop + + not t0, a1 + srl t0, t0, 24 + bgtz t0, 1f + nop + CONVERT_1x8888_TO_1x0565 a1, t1, t2, t3 +0: + sh t1, 0(a0) + addiu a2, a2, -1 + bgtz a2, 0b + addiu a0, a0, 2 + j ra + nop + +1: + SAVE_REGS_ON_STACK 0, s0, s1, s2 + li t4, 0x00ff00ff + li t5, 0xf800f800 + li t6, 0x07e007e0 + li t7, 0x001F001F + addiu t1, a2, -1 + beqz t1, 3f + nop +2: + lhu t1, 0(a0) /* t1 = destination (r5g6b5) */ + lhu t2, 2(a0) /* t2 = destination (r5g6b5) */ + + CONVERT_2x0565_TO_2x8888 t1, t2, t3, t8, t6, t7, t9, s0, s1, s2 + MIPS_2xUN8x4_MUL_2xUN8 t3, t8, t0, t0, t1, t2, t4, t9, s0, s1, s2, t3, t8 + addu_s.qb t1, t1, a1 + addu_s.qb t2, t2, a1 + CONVERT_2x8888_TO_2x0565 t1, t2, t3, t8, t5, t6, t7, s0, s1 + + sh t3, 0(a0) + sh t8, 2(a0) + + addiu a2, a2, -2 + addiu t1, a2, -1 + bgtz t1, 2b + addiu a0, a0, 4 +3: + beqz a2, 4f + nop + + lhu t1, 0(a0) /* t1 = destination (r5g6b5) */ + + CONVERT_1x0565_TO_1x8888 t1, t2, s0, s1 + MIPS_UN8x4_MUL_UN8 t2, t0, t1, t4, s0, s1, s2 + addu_s.qb t1, t1, a1 + CONVERT_1x8888_TO_1x0565 t1, t2, s0, s1 + + sh t2, 0(a0) + +4: + RESTORE_REGS_FROM_STACK 0, s0, s1, s2 +5: + j ra + nop + +END(pixman_composite_over_n_0565_asm_mips) + +LEAF_MIPS_DSPR2(pixman_composite_over_n_8888_asm_mips) +/* + * a0 - dst (a8r8g8b8) + * a1 - src (32bit constant) + * a2 - w + */ + + beqz a2, 5f + nop + + not t0, a1 + srl t0, t0, 24 + bgtz t0, 1f + nop +0: + sw a1, 0(a0) + addiu a2, a2, -1 + bgtz a2, 0b + addiu a0, a0, 4 + j ra + nop + +1: + SAVE_REGS_ON_STACK 0, s0, s1, s2 + li t4, 0x00ff00ff + addiu t1, a2, -1 + beqz t1, 3f + nop +2: + lw t2, 0(a0) /* t2 = destination (a8r8g8b8) */ + lw t3, 4(a0) /* t3 = destination (a8r8g8b8) */ + + MIPS_2xUN8x4_MUL_2xUN8 t2, t3, t0, t0, t7, t8, t4, t9, s0, s1, s2, t2, t3 + + addu_s.qb t7, t7, a1 + addu_s.qb t8, t8, a1 + + sw t7, 0(a0) + sw t8, 4(a0) + + addiu a2, a2, -2 + addiu t1, a2, -1 + bgtz t1, 2b + addiu a0, a0, 8 +3: + beqz a2, 4f + nop + + lw t1, 0(a0) /* t1 = destination (a8r8g8b8) */ + + MIPS_UN8x4_MUL_UN8 t1, t0, t3, t4, t5, t6, t7 + + addu_s.qb t3, t3, a1 + + sw t3, 0(a0) + +4: + RESTORE_REGS_FROM_STACK 0, s0, s1, s2 +5: + j ra + nop + +END(pixman_composite_over_n_8888_asm_mips) + LEAF_MIPS_DSPR2(pixman_composite_add_8_8_8_asm_mips) /* * a0 - dst (a8) @@ -1833,6 +2100,163 @@ LEAF_MIPS_DSPR2(pixman_composite_add_8888_8888_asm_mips) END(pixman_composite_add_8888_8888_asm_mips) +LEAF_MIPS_DSPR2(pixman_scaled_nearest_scanline_8888_8_0565_OVER_asm_mips) +/* + * a0 - dst (r5g6b5) + * a1 - src (a8r8g8b8) + * a2 - mask (a8) + * a3 - w + * 16(sp) - vx + * 20(sp) - unit_x + */ + beqz a3, 4f + nop + + SAVE_REGS_ON_STACK 20, v0, v1, s0, s1, s2, s3, s4, s5 + lw v0, 36(sp) /* v0 = vx */ + lw v1, 40(sp) /* v1 = unit_x */ + li t6, 0x00ff00ff + li t7, 0xf800f800 + li t8, 0x07e007e0 + li t9, 0x001F001F + + addiu t1, a3, -1 + beqz t1, 2f + nop +1: + sra t0, v0, 16 /* t0 = vx >> 16 */ + sll t0, t0, 2 /* t0 = t0 * 4 (a8r8g8b8) */ + addu t0, a1, t0 + lw t0, 0(t0) /* t0 = source (a8r8g8b8) */ + addu v0, v0, v1 /* v0 = vx + unit_x */ + sra t1, v0, 16 /* t1 = vx >> 16 */ + sll t1, t1, 2 /* t1 = t1 * 4 (a8r8g8b8) */ + addu t1, a1, t1 + lw t1, 0(t1) /* t1 = source (a8r8g8b8) */ + addu v0, v0, v1 /* v0 = vx + unit_x */ + lbu t2, 0(a2) /* t2 = mask (a8) */ + lbu t3, 1(a2) /* t3 = mask (a8) */ + lhu t4, 0(a0) /* t4 = destination (r5g6b5) */ + lhu t5, 2(a0) /* t5 = destination (r5g6b5) */ + addiu a2, a2, 2 + + CONVERT_2x0565_TO_2x8888 t4, t5, s0, s1, t8, t9, s2, s3, s4, s5 + OVER_2x8888_2x8_2x8888 t0, t1, \ + t2, t3, \ + s0, s1, \ + t4, t5, \ + t6, s2, s3, s4, s5, t2, t3 + CONVERT_2x8888_TO_2x0565 t4, t5, s0, s1, t7, t8, t9, s2, s3 + + sh s0, 0(a0) + sh s1, 2(a0) + addiu a3, a3, -2 + addiu t1, a3, -1 + bgtz t1, 1b + addiu a0, a0, 4 +2: + beqz a3, 3f + nop + sra t0, v0, 16 /* t0 = vx >> 16 */ + sll t0, t0, 2 /* t0 = t0 * 4 (a8r8g8b8) */ + addu t0, a1, t0 + lw t0, 0(t0) /* t0 = source (a8r8g8b8) */ + lbu t1, 0(a2) /* t1 = mask (a8) */ + lhu t2, 0(a0) /* t2 = destination (r5g6b5) */ + + CONVERT_1x0565_TO_1x8888 t2, t3, t4, t5 + OVER_8888_8_8888 t0, t1, t3, t2, t6, t4, t5, t7, t8 + CONVERT_1x8888_TO_1x0565 t2, t3, t4, t5 + + sh t3, 0(a0) +3: + RESTORE_REGS_FROM_STACK 20, v0, v1, s0, s1, s2, s3, s4, s5 +4: + j ra + nop + +END(pixman_scaled_nearest_scanline_8888_8_0565_OVER_asm_mips) + +LEAF_MIPS_DSPR2(pixman_scaled_nearest_scanline_0565_8_0565_OVER_asm_mips) +/* + * a0 - dst (r5g6b5) + * a1 - src (r5g6b5) + * a2 - mask (a8) + * a3 - w + * 16(sp) - vx + * 20(sp) - unit_x + */ + + beqz a3, 4f + nop + SAVE_REGS_ON_STACK 20, v0, v1, s0, s1, s2, s3, s4, s5 + lw v0, 36(sp) /* v0 = vx */ + lw v1, 40(sp) /* v1 = unit_x */ + li t4, 0xf800f800 + li t5, 0x07e007e0 + li t6, 0x001F001F + li t7, 0x00ff00ff + + addiu t1, a3, -1 + beqz t1, 2f + nop +1: + sra t0, v0, 16 /* t0 = vx >> 16 */ + sll t0, t0, 1 /* t0 = t0 * 2 (r5g6b5) */ + addu t0, a1, t0 + lhu t0, 0(t0) /* t0 = source (r5g6b5) */ + addu v0, v0, v1 /* v0 = vx + unit_x */ + sra t1, v0, 16 /* t1 = vx >> 16 */ + sll t1, t1, 1 /* t1 = t1 * 2 (r5g6b5) */ + addu t1, a1, t1 + lhu t1, 0(t1) /* t1 = source (r5g6b5) */ + addu v0, v0, v1 /* v0 = vx + unit_x */ + lbu t2, 0(a2) /* t2 = mask (a8) */ + lbu t3, 1(a2) /* t3 = mask (a8) */ + lhu t8, 0(a0) /* t8 = destination (r5g6b5) */ + lhu t9, 2(a0) /* t9 = destination (r5g6b5) */ + addiu a2, a2, 2 + + CONVERT_2x0565_TO_2x8888 t0, t1, s0, s1, t5, t6, s2, s3, s4, s5 + CONVERT_2x0565_TO_2x8888 t8, t9, s2, s3, t5, t6, s4, s5, t0, t1 + OVER_2x8888_2x8_2x8888 s0, s1, \ + t2, t3, \ + s2, s3, \ + t0, t1, \ + t7, t8, t9, s4, s5, s0, s1 + CONVERT_2x8888_TO_2x0565 t0, t1, s0, s1, t4, t5, t6, s2, s3 + + sh s0, 0(a0) + sh s1, 2(a0) + addiu a3, a3, -2 + addiu t1, a3, -1 + bgtz t1, 1b + addiu a0, a0, 4 +2: + beqz a3, 3f + nop + sra t0, v0, 16 /* t0 = vx >> 16 */ + sll t0, t0, 1 /* t0 = t0 * 2 (r5g6b5) */ + addu t0, a1, t0 + + lhu t0, 0(t0) /* t0 = source (r5g6b5) */ + lbu t1, 0(a2) /* t1 = mask (a8) */ + lhu t2, 0(a0) /* t2 = destination (r5g6b5) */ + + CONVERT_1x0565_TO_1x8888 t0, t3, t4, t5 + CONVERT_1x0565_TO_1x8888 t2, t4, t5, t6 + OVER_8888_8_8888 t3, t1, t4, t0, t7, t2, t5, t6, t8 + CONVERT_1x8888_TO_1x0565 t0, t3, t4, t5 + + sh t3, 0(a0) +3: + RESTORE_REGS_FROM_STACK 20, v0, v1, s0, s1, s2, s3, s4, s5 +4: + j ra + nop + +END(pixman_scaled_nearest_scanline_0565_8_0565_OVER_asm_mips) + LEAF_MIPS_DSPR2(pixman_scaled_bilinear_scanline_8888_8888_SRC_asm_mips) /* * a0 - *dst diff --git a/pixman/pixman/pixman-mips-dspr2.c b/pixman/pixman/pixman-mips-dspr2.c index 9da636d5a..11f1254f9 100644 --- a/pixman/pixman/pixman-mips-dspr2.c +++ b/pixman/pixman/pixman-mips-dspr2.c @@ -55,6 +55,10 @@ PIXMAN_MIPS_BIND_FAST_PATH_SRC_DST (0, add_8_8, PIXMAN_MIPS_BIND_FAST_PATH_SRC_DST (0, add_8888_8888, uint32_t, 1, uint32_t, 1) +PIXMAN_MIPS_BIND_FAST_PATH_N_MASK_DST (0, src_n_8_8888, + uint8_t, 1, uint32_t, 1) +PIXMAN_MIPS_BIND_FAST_PATH_N_MASK_DST (0, src_n_8_8, + uint8_t, 1, uint8_t, 1) PIXMAN_MIPS_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, over_n_8888_8888_ca, uint32_t, 1, uint32_t, 1) PIXMAN_MIPS_BIND_FAST_PATH_N_MASK_DST (SKIP_ZERO_SRC, over_n_8888_0565_ca, @@ -77,6 +81,11 @@ PIXMAN_MIPS_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, over_0565_n_0565, PIXMAN_MIPS_BIND_FAST_PATH_SRC_N_DST (SKIP_ZERO_MASK, add_8888_n_8888, uint32_t, 1, uint32_t, 1) +PIXMAN_MIPS_BIND_FAST_PATH_N_DST (SKIP_ZERO_SRC, over_n_0565, + uint16_t, 1) +PIXMAN_MIPS_BIND_FAST_PATH_N_DST (SKIP_ZERO_SRC, over_n_8888, + uint32_t, 1) + PIXMAN_MIPS_BIND_FAST_PATH_SRC_MASK_DST (add_8_8_8, uint8_t, 1, uint8_t, 1, uint8_t, 1) PIXMAN_MIPS_BIND_FAST_PATH_SRC_MASK_DST (add_8888_8_8888, uint32_t, 1, @@ -107,6 +116,11 @@ PIXMAN_MIPS_BIND_SCALED_BILINEAR_SRC_DST (SKIP_ZERO_SRC, 8888_8888, OVER, PIXMAN_MIPS_BIND_SCALED_BILINEAR_SRC_DST (SKIP_ZERO_SRC, 8888_8888, ADD, uint32_t, uint32_t) +PIXMAN_MIPS_BIND_SCALED_NEAREST_SRC_A8_DST (SKIP_ZERO_SRC, 8888_8_0565, + OVER, uint32_t, uint16_t) +PIXMAN_MIPS_BIND_SCALED_NEAREST_SRC_A8_DST (SKIP_ZERO_SRC, 0565_8_0565, + OVER, uint16_t, uint16_t) + PIXMAN_MIPS_BIND_SCALED_BILINEAR_SRC_A8_DST (0, 8888_8_8888, SRC, uint32_t, uint32_t) PIXMAN_MIPS_BIND_SCALED_BILINEAR_SRC_A8_DST (0, 8888_8_0565, SRC, @@ -256,6 +270,11 @@ static const pixman_fast_path_t mips_dspr2_fast_paths[] = PIXMAN_STD_FAST_PATH (SRC, x8r8g8b8, null, a8r8g8b8, mips_composite_src_x888_8888), PIXMAN_STD_FAST_PATH (SRC, x8b8g8r8, null, a8b8g8r8, mips_composite_src_x888_8888), PIXMAN_STD_FAST_PATH (SRC, r8g8b8, null, r8g8b8, mips_composite_src_0888_0888), + PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8r8g8b8, mips_composite_src_n_8_8888), + PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8r8g8b8, mips_composite_src_n_8_8888), + PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8b8g8r8, mips_composite_src_n_8_8888), + PIXMAN_STD_FAST_PATH (SRC, solid, a8, x8b8g8r8, mips_composite_src_n_8_8888), + PIXMAN_STD_FAST_PATH (SRC, solid, a8, a8, mips_composite_src_n_8_8), PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, a8r8g8b8, mips_composite_over_n_8888_8888_ca), PIXMAN_STD_FAST_PATH_CA (OVER, solid, a8r8g8b8, x8r8g8b8, mips_composite_over_n_8888_8888_ca), @@ -269,7 +288,9 @@ static const pixman_fast_path_t mips_dspr2_fast_paths[] = PIXMAN_STD_FAST_PATH (OVER, solid, a8, x8b8g8r8, mips_composite_over_n_8_8888), PIXMAN_STD_FAST_PATH (OVER, solid, a8, r5g6b5, mips_composite_over_n_8_0565), PIXMAN_STD_FAST_PATH (OVER, solid, a8, b5g6r5, mips_composite_over_n_8_0565), - + PIXMAN_STD_FAST_PATH (OVER, solid, null, r5g6b5, mips_composite_over_n_0565), + PIXMAN_STD_FAST_PATH (OVER, solid, null, a8r8g8b8, mips_composite_over_n_8888), + PIXMAN_STD_FAST_PATH (OVER, solid, null, x8r8g8b8, mips_composite_over_n_8888), PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, a8r8g8b8, mips_composite_over_8888_n_8888), PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, x8r8g8b8, mips_composite_over_8888_n_8888), PIXMAN_STD_FAST_PATH (OVER, a8r8g8b8, solid, r5g6b5, mips_composite_over_8888_n_0565), @@ -304,6 +325,12 @@ static const pixman_fast_path_t mips_dspr2_fast_paths[] = PIXMAN_STD_FAST_PATH (ADD, a8r8g8b8, null, a8r8g8b8, mips_composite_add_8888_8888), PIXMAN_STD_FAST_PATH (ADD, a8b8g8r8, null, a8b8g8r8, mips_composite_add_8888_8888), + PIXMAN_MIPS_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, a8r8g8b8, r5g6b5, mips_8888_8_0565), + PIXMAN_MIPS_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, a8b8g8r8, b5g6r5, mips_8888_8_0565), + + PIXMAN_MIPS_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, r5g6b5, r5g6b5, mips_0565_8_0565), + PIXMAN_MIPS_SIMPLE_NEAREST_A8_MASK_FAST_PATH (OVER, b5g6r5, b5g6r5, mips_0565_8_0565), + SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, a8r8g8b8, mips_8888_8888), SIMPLE_BILINEAR_FAST_PATH (SRC, a8r8g8b8, x8r8g8b8, mips_8888_8888), SIMPLE_BILINEAR_FAST_PATH (SRC, x8r8g8b8, x8r8g8b8, mips_8888_8888), diff --git a/pixman/pixman/pixman-mips-dspr2.h b/pixman/pixman/pixman-mips-dspr2.h index bddcfd827..4ac9ff95d 100644 --- a/pixman/pixman/pixman-mips-dspr2.h +++ b/pixman/pixman/pixman-mips-dspr2.h @@ -85,6 +85,42 @@ mips_composite_##name (pixman_implementation_t *imp, \ } \ } +/****************************************************************/ + +#define PIXMAN_MIPS_BIND_FAST_PATH_N_DST(flags, name, \ + dst_type, dst_cnt) \ +void \ +pixman_composite_##name##_asm_mips (dst_type *dst, \ + uint32_t src, \ + int32_t w); \ + \ +static void \ +mips_composite_##name (pixman_implementation_t *imp, \ + pixman_composite_info_t *info) \ +{ \ + PIXMAN_COMPOSITE_ARGS (info); \ + dst_type *dst_line, *dst; \ + int32_t dst_stride; \ + uint32_t src; \ + \ + src = _pixman_image_get_solid ( \ + imp, src_image, dest_image->bits.format); \ + \ + if ((flags & SKIP_ZERO_SRC) && src == 0) \ + return; \ + \ + PIXMAN_IMAGE_GET_LINE (dest_image, dest_x, dest_y, dst_type, \ + dst_stride, dst_line, dst_cnt); \ + \ + while (height--) \ + { \ + dst = dst_line; \ + dst_line += dst_stride; \ + \ + pixman_composite_##name##_asm_mips (dst, src, width); \ + } \ +} + /*******************************************************************/ #define PIXMAN_MIPS_BIND_FAST_PATH_N_MASK_DST(flags, name, \ @@ -210,6 +246,52 @@ mips_composite_##name (pixman_implementation_t *imp, \ } \ } +/*****************************************************************************/ + +#define PIXMAN_MIPS_BIND_SCALED_NEAREST_SRC_A8_DST(flags, name, op, \ + src_type, dst_type) \ +void \ +pixman_scaled_nearest_scanline_##name##_##op##_asm_mips ( \ + dst_type * dst, \ + const src_type * src, \ + const uint8_t * mask, \ + int32_t w, \ + pixman_fixed_t vx, \ + pixman_fixed_t unit_x); \ + \ +static force_inline void \ +scaled_nearest_scanline_mips_##name##_##op (const uint8_t * mask, \ + dst_type * pd, \ + const src_type * ps, \ + int32_t w, \ + pixman_fixed_t vx, \ + pixman_fixed_t unit_x, \ + pixman_fixed_t max_vx, \ + pixman_bool_t zero_src) \ +{ \ + if ((flags & SKIP_ZERO_SRC) && zero_src) \ + return; \ + pixman_scaled_nearest_scanline_##name##_##op##_asm_mips (pd, ps, \ + mask, w, \ + vx, unit_x); \ +} \ + \ +FAST_NEAREST_MAINLOOP_COMMON (mips_##name##_cover_##op, \ + scaled_nearest_scanline_mips_##name##_##op, \ + src_type, uint8_t, dst_type, COVER, TRUE, FALSE)\ +FAST_NEAREST_MAINLOOP_COMMON (mips_##name##_none_##op, \ + scaled_nearest_scanline_mips_##name##_##op, \ + src_type, uint8_t, dst_type, NONE, TRUE, FALSE) \ +FAST_NEAREST_MAINLOOP_COMMON (mips_##name##_pad_##op, \ + scaled_nearest_scanline_mips_##name##_##op, \ + src_type, uint8_t, dst_type, PAD, TRUE, FALSE) + +/* Provide entries for the fast path table */ +#define PIXMAN_MIPS_SIMPLE_NEAREST_A8_MASK_FAST_PATH(op,s,d,func) \ + SIMPLE_NEAREST_A8_MASK_FAST_PATH_COVER (op,s,d,func), \ + SIMPLE_NEAREST_A8_MASK_FAST_PATH_NONE (op,s,d,func), \ + SIMPLE_NEAREST_A8_MASK_FAST_PATH_PAD (op,s,d,func) + /****************************************************************************/ #define PIXMAN_MIPS_BIND_SCALED_BILINEAR_SRC_DST(flags, name, op, \ diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c index 1e6dbe8aa..aef468ac0 100644 --- a/pixman/pixman/pixman-mmx.c +++ b/pixman/pixman/pixman-mmx.c @@ -62,7 +62,7 @@ _mm_empty (void) #endif #ifdef USE_X86_MMX -# if (defined(__SUNPRO_C) || defined(_MSC_VER)) +# if (defined(__SUNPRO_C) || defined(_MSC_VER) || defined(_WIN64)) # include <xmmintrin.h> # else /* We have to compile with -msse to use xmmintrin.h, but that causes SSE @@ -1402,7 +1402,7 @@ mmx_composite_over_n_8888 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { store8888 (dst, over (vsrc, vsrca, load8888 (dst))); @@ -1468,7 +1468,7 @@ mmx_composite_over_n_0565 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint64_t d = *dst; __m64 vdest = expand565 (to_m64 (d), 0); @@ -1546,7 +1546,7 @@ mmx_composite_over_n_8888_8888_ca (pixman_implementation_t *imp, uint32_t *p = (uint32_t *)mask_line; uint32_t *q = (uint32_t *)dst_line; - while (twidth && (unsigned long)q & 7) + while (twidth && (uintptr_t)q & 7) { uint32_t m = *(uint32_t *)p; @@ -1637,7 +1637,7 @@ mmx_composite_over_8888_n_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { __m64 s = load8888 (src); __m64 d = load8888 (dst); @@ -1707,7 +1707,7 @@ mmx_composite_over_x888_n_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint32_t ssrc = *src | 0xff000000; __m64 s = load8888 (&ssrc); @@ -1881,7 +1881,7 @@ mmx_composite_over_8888_0565 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { __m64 vsrc = load8888 (src); uint64_t d = *dst; @@ -1984,7 +1984,7 @@ mmx_composite_over_n_8_8888 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint64_t m = *mask; @@ -2127,21 +2127,21 @@ mmx_fill (pixman_implementation_t *imp, byte_line += stride; w = byte_width; - if (w >= 1 && ((unsigned long)d & 1)) + if (w >= 1 && ((uintptr_t)d & 1)) { *(uint8_t *)d = (xor & 0xff); w--; d++; } - if (w >= 2 && ((unsigned long)d & 3)) + if (w >= 2 && ((uintptr_t)d & 3)) { *(uint16_t *)d = xor; w -= 2; d += 2; } - while (w >= 4 && ((unsigned long)d & 7)) + while (w >= 4 && ((uintptr_t)d & 7)) { *(uint32_t *)d = xor; @@ -2227,7 +2227,7 @@ mmx_composite_src_x888_0565 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { s = *src++; *dst = CONVERT_8888_TO_0565 (s); @@ -2305,7 +2305,7 @@ mmx_composite_src_n_8_8888 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint64_t m = *mask; @@ -2419,7 +2419,7 @@ mmx_composite_over_n_8_0565 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint64_t m = *mask; @@ -2536,7 +2536,7 @@ mmx_composite_over_pixbuf_0565 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { __m64 vsrc = load8888 (src); uint64_t d = *dst; @@ -2651,7 +2651,7 @@ mmx_composite_over_pixbuf_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { __m64 s = load8888 (src); __m64 d = load8888 (dst); @@ -2739,7 +2739,7 @@ mmx_composite_over_n_8888_0565_ca (pixman_implementation_t *imp, uint32_t *p = (uint32_t *)mask_line; uint16_t *q = (uint16_t *)dst_line; - while (twidth && ((unsigned long)q & 7)) + while (twidth && ((uintptr_t)q & 7)) { uint32_t m = *(uint32_t *)p; @@ -2840,7 +2840,7 @@ mmx_composite_in_n_8_8 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { uint16_t tmp; uint8_t a; @@ -2911,7 +2911,7 @@ mmx_composite_in_8_8 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 3) + while (w && (uintptr_t)dst & 3) { uint8_t s, d; uint16_t tmp; @@ -2990,7 +2990,7 @@ mmx_composite_add_n_8_8 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && (unsigned long)dst & 3) + while (w && (uintptr_t)dst & 3) { uint16_t tmp; uint16_t a; @@ -3067,7 +3067,7 @@ mmx_composite_add_8_8 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { s = *src; d = *dst; @@ -3130,7 +3130,7 @@ mmx_composite_add_0565_0565 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { s = *src++; if (s) @@ -3212,7 +3212,7 @@ mmx_composite_add_8888_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { store (dst, _mm_adds_pu8 (load ((const uint32_t *)src), load ((const uint32_t *)dst))); @@ -3296,7 +3296,7 @@ mmx_blt (pixman_implementation_t *imp, dst_bytes += dst_stride; w = byte_width; - if (w >= 1 && ((unsigned long)d & 1)) + if (w >= 1 && ((uintptr_t)d & 1)) { *(uint8_t *)d = *(uint8_t *)s; w -= 1; @@ -3304,7 +3304,7 @@ mmx_blt (pixman_implementation_t *imp, d += 1; } - if (w >= 2 && ((unsigned long)d & 3)) + if (w >= 2 && ((uintptr_t)d & 3)) { *(uint16_t *)d = *(uint16_t *)s; w -= 2; @@ -3312,7 +3312,7 @@ mmx_blt (pixman_implementation_t *imp, d += 2; } - while (w >= 4 && ((unsigned long)d & 7)) + while (w >= 4 && ((uintptr_t)d & 7)) { *(uint32_t *)d = ldl_u ((uint32_t *)s); @@ -3495,7 +3495,7 @@ mmx_composite_over_reverse_n_8888 (pixman_implementation_t *imp, CHECKPOINT (); - while (w && (unsigned long)dst & 7) + while (w && (uintptr_t)dst & 7) { __m64 vdest = load8888 (dst); @@ -3778,7 +3778,7 @@ mmx_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && ((unsigned long)dst) & 7) + while (w && ((uintptr_t)dst) & 7) { *dst++ = (*src++) | 0xff000000; w--; @@ -3820,7 +3820,7 @@ mmx_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && ((unsigned long)dst) & 0x0f) + while (w && ((uintptr_t)dst) & 0x0f) { uint16_t s = *src++; @@ -3864,7 +3864,7 @@ mmx_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && (((unsigned long)dst) & 15)) + while (w && (((uintptr_t)dst) & 15)) { *dst++ = *(src++) << 24; w--; diff --git a/pixman/pixman/pixman-ppc.c b/pixman/pixman/pixman-ppc.c index f1bea1eac..a6e7bb0cf 100644 --- a/pixman/pixman/pixman-ppc.c +++ b/pixman/pixman/pixman-ppc.c @@ -37,10 +37,10 @@ static pixman_bool_t pixman_have_vmx (void) { + int error, have_vmx; size_t length = sizeof(have_vmx); - int error, have_mmx; - sysctlbyname ("hw.optional.altivec", &have_vmx, &length, NULL, 0); + error = sysctlbyname ("hw.optional.altivec", &have_vmx, &length, NULL, 0); if (error) return FALSE; @@ -56,9 +56,9 @@ pixman_have_vmx (void) static pixman_bool_t pixman_have_vmx (void) { + int error, have_vmx; int mib[2] = { CTL_MACHDEP, CPU_ALTIVEC }; size_t length = sizeof(have_vmx); - int error, have_vmx; error = sysctl (mib, 2, &have_vmx, &length, NULL, 0); diff --git a/pixman/pixman/pixman-sse2.c b/pixman/pixman/pixman-sse2.c index efed3105a..7e980c907 100644 --- a/pixman/pixman/pixman-sse2.c +++ b/pixman/pixman/pixman-sse2.c @@ -576,7 +576,7 @@ core_combine_over_u_sse2_mask (uint32_t * pd, uint32_t s, d; /* Align dst on a 16-byte boundary */ - while (w && ((unsigned long)pd & 15)) + while (w && ((uintptr_t)pd & 15)) { d = *pd; s = combine1 (ps, pm); @@ -661,7 +661,7 @@ core_combine_over_u_sse2_no_mask (uint32_t * pd, uint32_t s, d; /* Align dst on a 16-byte boundary */ - while (w && ((unsigned long)pd & 15)) + while (w && ((uintptr_t)pd & 15)) { d = *pd; s = *ps; @@ -753,7 +753,7 @@ sse2_combine_over_reverse_u (pixman_implementation_t *imp, /* Align dst on a 16-byte boundary */ while (w && - ((unsigned long)pd & 15)) + ((uintptr_t)pd & 15)) { d = *pd; s = combine1 (ps, pm); @@ -840,7 +840,7 @@ sse2_combine_in_u (pixman_implementation_t *imp, __m128i xmm_src_lo, xmm_src_hi; __m128i xmm_dst_lo, xmm_dst_hi; - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { s = combine1 (ps, pm); d = *pd; @@ -901,7 +901,7 @@ sse2_combine_in_reverse_u (pixman_implementation_t *imp, __m128i xmm_src_lo, xmm_src_hi; __m128i xmm_dst_lo, xmm_dst_hi; - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { s = combine1 (ps, pm); d = *pd; @@ -957,7 +957,7 @@ sse2_combine_out_reverse_u (pixman_implementation_t *imp, const uint32_t * pm, int w) { - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { uint32_t s = combine1 (ps, pm); uint32_t d = *pd; @@ -1026,7 +1026,7 @@ sse2_combine_out_u (pixman_implementation_t *imp, const uint32_t * pm, int w) { - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { uint32_t s = combine1 (ps, pm); uint32_t d = *pd; @@ -1113,7 +1113,7 @@ sse2_combine_atop_u (pixman_implementation_t *imp, __m128i xmm_alpha_src_lo, xmm_alpha_src_hi; __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { s = combine1 (ps, pm); d = *pd; @@ -1197,7 +1197,7 @@ sse2_combine_atop_reverse_u (pixman_implementation_t *imp, __m128i xmm_alpha_src_lo, xmm_alpha_src_hi; __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { s = combine1 (ps, pm); d = *pd; @@ -1285,7 +1285,7 @@ sse2_combine_xor_u (pixman_implementation_t *imp, __m128i xmm_alpha_src_lo, xmm_alpha_src_hi; __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; - while (w && ((unsigned long) pd & 15)) + while (w && ((uintptr_t)pd & 15)) { s = combine1 (ps, pm); d = *pd; @@ -1357,7 +1357,7 @@ sse2_combine_add_u (pixman_implementation_t *imp, const uint32_t* ps = src; const uint32_t* pm = mask; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = combine1 (ps, pm); d = *pd; @@ -1430,7 +1430,7 @@ sse2_combine_saturate_u (pixman_implementation_t *imp, uint32_t pack_cmp; __m128i xmm_src, xmm_dst; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = combine1 (ps, pm); d = *pd; @@ -1518,7 +1518,7 @@ sse2_combine_src_ca (pixman_implementation_t *imp, __m128i xmm_mask_lo, xmm_mask_hi; __m128i xmm_dst_lo, xmm_dst_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1586,7 +1586,7 @@ sse2_combine_over_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1662,7 +1662,7 @@ sse2_combine_over_reverse_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1727,7 +1727,7 @@ sse2_combine_in_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1802,7 +1802,7 @@ sse2_combine_in_reverse_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1875,7 +1875,7 @@ sse2_combine_out_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -1951,7 +1951,7 @@ sse2_combine_out_reverse_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -2048,7 +2048,7 @@ sse2_combine_atop_ca (pixman_implementation_t *imp, __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -2141,7 +2141,7 @@ sse2_combine_atop_reverse_ca (pixman_implementation_t *imp, __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -2237,7 +2237,7 @@ sse2_combine_xor_ca (pixman_implementation_t *imp, __m128i xmm_alpha_dst_lo, xmm_alpha_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -2313,7 +2313,7 @@ sse2_combine_add_ca (pixman_implementation_t *imp, __m128i xmm_dst_lo, xmm_dst_hi; __m128i xmm_mask_lo, xmm_mask_hi; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { s = *ps++; m = *pm++; @@ -2414,7 +2414,7 @@ sse2_composite_over_n_8888 (pixman_implementation_t *imp, dst_line += dst_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { d = *dst; *dst++ = pack_1x128_32 (over_1x128 (xmm_src, @@ -2483,7 +2483,7 @@ sse2_composite_over_n_0565 (pixman_implementation_t *imp, dst_line += dst_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { d = *dst; @@ -2568,7 +2568,7 @@ sse2_composite_add_n_8888_8888_ca (pixman_implementation_t *imp, dst_line += dst_stride; mask_line += mask_stride; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { m = *pm++; @@ -2682,7 +2682,7 @@ sse2_composite_over_n_8888_8888_ca (pixman_implementation_t *imp, dst_line += dst_stride; mask_line += mask_stride; - while (w && (unsigned long)pd & 15) + while (w && (uintptr_t)pd & 15) { m = *pm++; @@ -2786,7 +2786,7 @@ sse2_composite_over_8888_n_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint32_t s = *src++; @@ -2878,7 +2878,7 @@ sse2_composite_src_x888_0565 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { s = *src++; *dst = CONVERT_8888_TO_0565 (s); @@ -2932,7 +2932,7 @@ sse2_composite_src_x888_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { *dst++ = *src++ | 0xff000000; w--; @@ -2999,7 +2999,7 @@ sse2_composite_over_x888_n_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint32_t s = (*src++) | 0xff000000; uint32_t d = *dst; @@ -3125,7 +3125,7 @@ sse2_composite_over_8888_0565 (pixman_implementation_t *imp, /* Align dst on a 16-byte boundary */ while (w && - ((unsigned long)dst & 15)) + ((uintptr_t)dst & 15)) { s = *src++; d = *dst; @@ -3231,7 +3231,7 @@ sse2_composite_over_n_8_8888 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint8_t m = *mask++; @@ -3372,21 +3372,21 @@ sse2_fill (pixman_implementation_t *imp, byte_line += stride; w = byte_width; - if (w >= 1 && ((unsigned long)d & 1)) + if (w >= 1 && ((uintptr_t)d & 1)) { *(uint8_t *)d = xor; w -= 1; d += 1; } - while (w >= 2 && ((unsigned long)d & 3)) + while (w >= 2 && ((uintptr_t)d & 3)) { *(uint16_t *)d = xor; w -= 2; d += 2; } - while (w >= 4 && ((unsigned long)d & 15)) + while (w >= 4 && ((uintptr_t)d & 15)) { *(uint32_t *)d = xor; @@ -3505,7 +3505,7 @@ sse2_composite_src_n_8_8888 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint8_t m = *mask++; @@ -3621,7 +3621,7 @@ sse2_composite_over_n_8_0565 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { m = *mask++; @@ -3745,7 +3745,7 @@ sse2_composite_over_pixbuf_0565 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { s = *src++; d = *dst; @@ -3854,7 +3854,7 @@ sse2_composite_over_pixbuf_8888 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { s = *src++; d = *dst; @@ -3957,7 +3957,7 @@ sse2_composite_over_n_8888_0565_ca (pixman_implementation_t *imp, mask_line += mask_stride; dst_line += dst_stride; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { m = *(uint32_t *) mask; @@ -4083,7 +4083,7 @@ sse2_composite_in_n_8_8 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { m = (uint32_t) *mask++; d = (uint32_t) *dst; @@ -4176,7 +4176,7 @@ sse2_composite_in_n_8 (pixman_implementation_t *imp, dst_line += dst_stride; w = width; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { d = (uint32_t) *dst; @@ -4245,7 +4245,7 @@ sse2_composite_in_8_8 (pixman_implementation_t *imp, src_line += src_stride; w = width; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { s = (uint32_t) *src++; d = (uint32_t) *dst; @@ -4322,7 +4322,7 @@ sse2_composite_add_n_8_8 (pixman_implementation_t *imp, mask_line += mask_stride; w = width; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { m = (uint32_t) *mask++; d = (uint32_t) *dst; @@ -4414,7 +4414,7 @@ sse2_composite_add_n_8 (pixman_implementation_t *imp, dst_line += dst_stride; w = width; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { *dst = (uint8_t)_mm_cvtsi128_si32 ( _mm_adds_epu8 ( @@ -4474,7 +4474,7 @@ sse2_composite_add_8_8 (pixman_implementation_t *imp, w = width; /* Small head */ - while (w && (unsigned long)dst & 3) + while (w && (uintptr_t)dst & 3) { t = (*dst) + (*src++); *dst++ = t | (0 - (t >> 8)); @@ -4582,7 +4582,7 @@ sse2_blt (pixman_implementation_t *imp, dst_bytes += dst_stride; w = byte_width; - while (w >= 2 && ((unsigned long)d & 3)) + while (w >= 2 && ((uintptr_t)d & 3)) { *(uint16_t *)d = *(uint16_t *)s; w -= 2; @@ -4590,7 +4590,7 @@ sse2_blt (pixman_implementation_t *imp, d += 2; } - while (w >= 4 && ((unsigned long)d & 15)) + while (w >= 4 && ((uintptr_t)d & 15)) { *(uint32_t *)d = *(uint32_t *)s; @@ -4697,7 +4697,7 @@ sse2_composite_over_x888_8_8888 (pixman_implementation_t *imp, w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { s = 0xff000000 | *src++; m = (uint32_t) *mask++; @@ -4821,7 +4821,7 @@ sse2_composite_over_8888_8_8888 (pixman_implementation_t *imp, w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint32_t sa; @@ -4960,7 +4960,7 @@ sse2_composite_over_reverse_n_8888 (pixman_implementation_t *imp, dst_line += dst_stride; w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { __m128i vd; @@ -5045,7 +5045,7 @@ sse2_composite_over_8888_8888_8888 (pixman_implementation_t *imp, w = width; - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint32_t sa; @@ -5173,7 +5173,7 @@ scaled_nearest_scanline_sse2_8888_8888_OVER (uint32_t* pd, return; /* Align dst on a 16-byte boundary */ - while (w && ((unsigned long)pd & 15)) + while (w && ((uintptr_t)pd & 15)) { d = *pd; s = combine1 (ps + pixman_fixed_to_int (vx), pm); @@ -5291,7 +5291,7 @@ scaled_nearest_scanline_sse2_8888_n_8888_OVER (const uint32_t * mask, xmm_mask = create_mask_16_128 (*mask >> 24); - while (w && (unsigned long)dst & 15) + while (w && (uintptr_t)dst & 15) { uint32_t s = *(src + pixman_fixed_to_int (vx)); vx += unit_x; @@ -5538,7 +5538,7 @@ scaled_bilinear_scanline_sse2_8888_8888_OVER (uint32_t * dst, BILINEAR_DECLARE_VARIABLES; uint32_t pix1, pix2, pix3, pix4; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { BILINEAR_INTERPOLATE_ONE_PIXEL (pix1); @@ -5639,7 +5639,7 @@ scaled_bilinear_scanline_sse2_8888_8_8888_OVER (uint32_t * dst, uint32_t pix1, pix2, pix3, pix4; uint32_t m; - while (w && ((unsigned long)dst & 15)) + while (w && ((uintptr_t)dst & 15)) { uint32_t sa; @@ -5930,7 +5930,7 @@ sse2_fetch_x8r8g8b8 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && ((unsigned long)dst) & 0x0f) + while (w && ((uintptr_t)dst) & 0x0f) { *dst++ = (*src++) | 0xff000000; w--; @@ -5966,7 +5966,7 @@ sse2_fetch_r5g6b5 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && ((unsigned long)dst) & 0x0f) + while (w && ((uintptr_t)dst) & 0x0f) { uint16_t s = *src++; @@ -6012,7 +6012,7 @@ sse2_fetch_a8 (pixman_iter_t *iter, const uint32_t *mask) iter->bits += iter->stride; - while (w && (((unsigned long)dst) & 15)) + while (w && (((uintptr_t)dst) & 15)) { *dst++ = *(src++) << 24; w--; diff --git a/pixman/pixman/pixman.c b/pixman/pixman/pixman.c index e3b6516b5..e0ccd87d8 100644 --- a/pixman/pixman/pixman.c +++ b/pixman/pixman/pixman.c @@ -587,7 +587,7 @@ pixman_image_composite32 (pixman_op_t op, src_format = src->common.extended_format_code; src_flags = src->common.flags; - if (mask) + if (mask && !(mask->common.flags & FAST_PATH_IS_OPAQUE)) { mask_format = mask->common.extended_format_code; mask_flags = mask->common.flags; diff --git a/pixman/pixman/pixman.h b/pixman/pixman/pixman.h index c8723cf41..33ebf3f64 100644 --- a/pixman/pixman/pixman.h +++ b/pixman/pixman/pixman.h @@ -226,6 +226,9 @@ pixman_bool_t pixman_transform_is_inverse (const struct pixman_transform * /* * Floating point matrices */ +typedef struct pixman_f_transform pixman_f_transform_t; +typedef struct pixman_f_vector pixman_f_vector_t; + struct pixman_f_vector { double v[3]; diff --git a/pixman/test/glyph-test.c b/pixman/test/glyph-test.c index 9dd5b41e4..501cc2e6f 100644 --- a/pixman/test/glyph-test.c +++ b/pixman/test/glyph-test.c @@ -215,8 +215,8 @@ create_image (int max_size, const pixman_format_code_t *formats, uint32_t flags) return image; } -#define KEY1(p) ((void *)(((unsigned long)p) ^ (0xa7e23dfaUL))) -#define KEY2(p) ((void *)(((unsigned long)p) ^ (0xabcd9876UL))) +#define KEY1(p) ((void *)(((uintptr_t)p) ^ (0xa7e23dfaUL))) +#define KEY2(p) ((void *)(((uintptr_t)p) ^ (0xabcd9876UL))) #define MAX_GLYPHS 32 diff --git a/pixman/test/utils.c b/pixman/test/utils.c index 716bb7594..c887a6db9 100644 --- a/pixman/test/utils.c +++ b/pixman/test/utils.c @@ -377,7 +377,7 @@ fence_malloc (int64_t len) return NULL; } - initial_page = (uint8_t *)(((unsigned long)addr + page_mask) & ~page_mask); + initial_page = (uint8_t *)(((uintptr_t)addr + page_mask) & ~page_mask); leading_protected = initial_page + page_size; payload = leading_protected + N_LEADING_PROTECTED * page_size; trailing_protected = payload + n_payload_bytes; @@ -694,6 +694,8 @@ get_random_seed (void) return lcg_rand_u32 (); } +#ifdef HAVE_SIGACTION +#ifdef HAVE_ALARM static const char *global_msg; static void @@ -702,6 +704,8 @@ on_alarm (int signo) printf ("%s\n", global_msg); exit (1); } +#endif +#endif void fail_after (int seconds, const char *msg) diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c index ddab53dec..62a3a469f 100644 --- a/xorg-server/Xi/xipassivegrab.c +++ b/xorg-server/Xi/xipassivegrab.c @@ -50,7 +50,7 @@ int SProcXIPassiveGrabDevice(ClientPtr client) { int i; - xXIModifierInfo *mods; + uint32_t *mods; REQUEST(xXIPassiveGrabDeviceReq); @@ -63,12 +63,10 @@ SProcXIPassiveGrabDevice(ClientPtr client) swaps(&stuff->mask_len); swaps(&stuff->num_modifiers); - mods = (xXIModifierInfo *) &stuff[1]; + mods = (uint32_t *) &stuff[1]; for (i = 0; i < stuff->num_modifiers; i++, mods++) { - swapl(&mods->base_mods); - swapl(&mods->latched_mods); - swapl(&mods->locked_mods); + swapl(mods); } return ProcXIPassiveGrabDevice(client); diff --git a/xorg-server/Xi/xiquerypointer.c b/xorg-server/Xi/xiquerypointer.c index 7e6852dd0..e9bdd428d 100644 --- a/xorg-server/Xi/xiquerypointer.c +++ b/xorg-server/Xi/xiquerypointer.c @@ -50,6 +50,7 @@ #include "panoramiXsrv.h" #endif +#include "inpututils.h" #include "xiquerypointer.h" /*********************************************************************** @@ -127,8 +128,8 @@ ProcXIQueryPointer(ClientPtr client) .sequenceNumber = client->sequence, .length = 6, .root = (GetCurrentRootWindow(pDev))->drawable.id, - .root_x = FP1616(pSprite->hot.x, 0), - .root_y = FP1616(pSprite->hot.y, 0), + .root_x = double_to_fp1616(pSprite->hot.x), + .root_y = double_to_fp1616(pSprite->hot.y), .child = None }; @@ -166,8 +167,8 @@ ProcXIQueryPointer(ClientPtr client) if (pSprite->hot.pScreen == pWin->drawable.pScreen) { rep.same_screen = xTrue; - rep.win_x = FP1616(pSprite->hot.x - pWin->drawable.x, 0); - rep.win_y = FP1616(pSprite->hot.y - pWin->drawable.y, 0); + rep.win_x = double_to_fp1616(pSprite->hot.x - pWin->drawable.x); + rep.win_y = double_to_fp1616(pSprite->hot.y - pWin->drawable.y); for (t = pSprite->win; t; t = t->parent) if (t->parent == pWin) { rep.child = t->drawable.id; @@ -182,11 +183,11 @@ ProcXIQueryPointer(ClientPtr client) #ifdef PANORAMIX if (!noPanoramiXExtension) { - rep.root_x += FP1616(screenInfo.screens[0]->x, 0); - rep.root_y += FP1616(screenInfo.screens[0]->y, 0); + rep.root_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.root_y += double_to_fp1616(screenInfo.screens[0]->y); if (stuff->win == rep.root) { - rep.win_x += FP1616(screenInfo.screens[0]->x, 0); - rep.win_y += FP1616(screenInfo.screens[0]->y, 0); + rep.win_x += double_to_fp1616(screenInfo.screens[0]->x); + rep.win_y += double_to_fp1616(screenInfo.screens[0]->y); } } #endif diff --git a/xorg-server/dix/enterleave.c b/xorg-server/dix/enterleave.c index 431566ffe..54f4b8554 100644 --- a/xorg-server/dix/enterleave.c +++ b/xorg-server/dix/enterleave.c @@ -39,6 +39,7 @@ #include "enterleave.h" #include "eventconvert.h" #include "xkbsrv.h" +#include "inpututils.h" /** * @file @@ -799,8 +800,8 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, xi2event->deviceid = dev->id; xi2event->sourceid = dev->id; /* a device doesn't change focus by itself */ xi2event->mode = mode; - xi2event->root_x = FP1616(mouse->spriteInfo->sprite->hot.x, 0); - xi2event->root_y = FP1616(mouse->spriteInfo->sprite->hot.y, 0); + xi2event->root_x = double_to_fp1616(mouse->spriteInfo->sprite->hot.x); + xi2event->root_y = double_to_fp1616(mouse->spriteInfo->sprite->hot.y); for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++) if (BitIsOn(mouse->button->down, i)) diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c index 41a3174a6..2e422d7a1 100644 --- a/xorg-server/dix/eventconvert.c +++ b/xorg-server/dix/eventconvert.c @@ -673,8 +673,8 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi) xde->valuators_len = vallen; xde->deviceid = ev->deviceid; xde->sourceid = ev->sourceid; - xde->root_x = FP1616(ev->root_x, ev->root_x_frac); - xde->root_y = FP1616(ev->root_y, ev->root_y_frac); + xde->root_x = double_to_fp1616(ev->root_x + ev->root_x_frac); + xde->root_y = double_to_fp1616(ev->root_y + ev->root_y_frac); if (ev->type == ET_TouchUpdate) xde->flags |= (ev->flags & TOUCH_PENDING_END) ? XITouchPendingEnd : 0; diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c index e790bfc20..3282ef818 100644 --- a/xorg-server/dix/events.c +++ b/xorg-server/dix/events.c @@ -2444,8 +2444,8 @@ FixUpEventFromWindow(SpritePtr pSprite, } if (pSprite->hot.pScreen == pWin->drawable.pScreen) { - event->event_x = event->root_x - FP1616(pWin->drawable.x, 0); - event->event_y = event->root_y - FP1616(pWin->drawable.y, 0); + event->event_x = event->root_x - double_to_fp1616(pWin->drawable.x); + event->event_y = event->root_y - double_to_fp1616(pWin->drawable.y); event->child = child; } else { @@ -4573,8 +4573,8 @@ DeviceEnterLeaveEvent(DeviceIntPtr mouse, event->deviceid = mouse->id; event->sourceid = sourceid; event->mode = mode; - event->root_x = FP1616(mouse->spriteInfo->sprite->hot.x, 0); - event->root_y = FP1616(mouse->spriteInfo->sprite->hot.y, 0); + event->root_x = double_to_fp1616(mouse->spriteInfo->sprite->hot.x); + event->root_y = double_to_fp1616(mouse->spriteInfo->sprite->hot.y); for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++) if (BitIsOn(mouse->button->down, i)) diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index 8b4379d1c..2a686e877 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -164,17 +164,6 @@ key_autorepeats(DeviceIntPtr pDev, int key_code) } static void -init_event(DeviceIntPtr dev, DeviceEvent *event, Time ms) -{ - memset(event, 0, sizeof(DeviceEvent)); - event->header = ET_Internal; - event->length = sizeof(DeviceEvent); - event->time = ms; - event->deviceid = dev->id; - event->sourceid = dev->id; -} - -static void init_touch_ownership(DeviceIntPtr dev, TouchOwnershipEvent *event, Time ms) { memset(event, 0, sizeof(TouchOwnershipEvent)); @@ -1915,7 +1904,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, event = &events->device_event; num_events++; - init_event(dev, event, ms); + init_device_event(event, dev, ms); /* if submitted for master device, get the sourceid from there */ if (flags & TOUCH_CLIENT_ID) { event->sourceid = touchpoint.dix_ti->sourceid; diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c index 68c296b0f..bcb039f3f 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c @@ -38,6 +38,14 @@ #include <sys/stat.h> +#ifndef K_OFF +#define K_OFF 0x4 +#endif + +#ifndef KDSKBMUTE +#define KDSKBMUTE 0x4B51 +#endif + static Bool KeepTty = FALSE; static int activeVT = -1; @@ -213,19 +221,23 @@ xf86OpenConsole(void) tcgetattr(xf86Info.consoleFd, &tty_attr); SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode)); -#ifdef K_OFF - /* disable kernel special keys and buffering */ - SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF)); + /* disable kernel special keys and buffering, new style */ + SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMUTE, 1)); if (ret < 0) -#endif { - SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW)); + /* disable kernel special keys and buffering, old style */ + SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_OFF)); if (ret < 0) - FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n", - strerror(errno)); - - /* need to keep the buffer clean, else the kernel gets angry */ - xf86SetConsoleHandler(drain_console, NULL); + { + /* fine, just disable special keys */ + SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW)); + if (ret < 0) + FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n", + strerror(errno)); + + /* ... and drain events, else the kernel gets angry */ + xf86SetConsoleHandler(drain_console, NULL); + } } nTty = tty_attr; @@ -271,6 +283,7 @@ xf86CloseConsole(void) xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n", strerror(errno)); + SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMUTE, 0)); SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode)); tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr); diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp index f76c5fcef..b0106c6da 100644 --- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp +++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp @@ -26,6 +26,8 @@ <string>x11a</string> <key>CSResourcesFileMapped</key> <true/> + <key>NSSupportsAutomaticGraphicsSwitching</key> + <true/> #ifdef XQUARTZ_SPARKLE <key>SUEnableAutomaticChecks</key> <true/> diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h index 4c56d534a..01172f0ee 100644 --- a/xorg-server/include/eventconvert.h +++ b/xorg-server/include/eventconvert.h @@ -29,8 +29,6 @@ #include "events.h" #include "eventstr.h" -#define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16)) - _X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count); _X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count); _X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi); diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index d58478543..2b926a980 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -835,23 +835,6 @@ extern void XkbFakeDeviceButton(DeviceIntPtr /* dev */ , #define _XkbListGeometry 4 #define _XkbListNumComponents 5 -typedef struct _XkbSrvListInfo { - int szPool; - int nPool; - char *pool; - - int maxRtrn; - int nTotal; - - char *pattern[_XkbListNumComponents]; - int nFound[_XkbListNumComponents]; -} XkbSrvListInfoRec, *XkbSrvListInfoPtr; - -extern _X_EXPORT Status XkbDDXList(DeviceIntPtr /* dev */ , - XkbSrvListInfoPtr /* listing */ , - ClientPtr /* client */ - ); - extern _X_EXPORT unsigned int XkbDDXLoadKeymapByNames(DeviceIntPtr /* keybd */ , XkbComponentNamesPtr /* names */ , diff --git a/xorg-server/test/xi2/protocol-eventconvert.c b/xorg-server/test/xi2/protocol-eventconvert.c index 1188e8b25..bb3177cc1 100644 --- a/xorg-server/test/xi2/protocol-eventconvert.c +++ b/xorg-server/test/xi2/protocol-eventconvert.c @@ -338,8 +338,8 @@ test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent * out, BOOL swap) assert(out->event_x == 0); /* set in FixUpEventFromWindow */ assert(out->event_y == 0); /* set in FixUpEventFromWindow */ - assert(out->root_x == FP1616(in->root_x, in->root_x_frac)); - assert(out->root_y == FP1616(in->root_y, in->root_y_frac)); + assert(out->root_x == double_to_fp1616(in->root_x + in->root_x_frac)); + assert(out->root_y == double_to_fp1616(in->root_y + in->root_y_frac)); buttons = 0; for (i = 0; i < bits_to_bytes(sizeof(in->buttons)); i++) { diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index 7c223ddc5..bd175b40f 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -1300,6 +1300,10 @@ CreatePointerBarrierClient(ScreenPtr screen, ClientPtr client, ret->screen = screen; ret->num_devices = stuff->num_devices; + if (ret->num_devices > 0) + ret->device_ids = (int*)&ret[1]; + else + ret->device_ids = NULL; in_devices = (CARD16 *) &stuff[1]; for (i = 0; i < stuff->num_devices; i++) { diff --git a/xorg-server/xkb/Makefile.am b/xorg-server/xkb/Makefile.am index fb3ccbf6f..e386ce5a2 100644 --- a/xorg-server/xkb/Makefile.am +++ b/xorg-server/xkb/Makefile.am @@ -6,8 +6,7 @@ DDX_SRCS = \ ddxBeep.c \ ddxCtrls.c \ ddxLEDs.c \ - ddxLoad.c \ - ddxList.c + ddxLoad.c DIX_SRCS = \ xkb.c \ diff --git a/xorg-server/xkb/ddxList.c b/xorg-server/xkb/ddxList.c deleted file mode 100644 index 729c5aecf..000000000 --- a/xorg-server/xkb/ddxList.c +++ /dev/null @@ -1,302 +0,0 @@ -/************************************************************ -Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. - -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright -notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution -of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability -of this software for any purpose. It is provided "as is" -without any express or implied warranty. - -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY -AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE -OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH -THE USE OR PERFORMANCE OF THIS SOFTWARE. - -********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include <stdio.h> -#include <ctype.h> -#include <X11/X.h> -#include <X11/Xos.h> -#include <X11/Xproto.h> -#include <X11/keysym.h> -#include <X11/extensions/XKM.h> -#include "inputstr.h" -#include "scrnintstr.h" -#include "windowstr.h" -#define XKBSRV_NEED_FILE_FUNCS -#include <xkbsrv.h> -#include <X11/extensions/XI.h> - -#ifdef WIN32 -/* from ddxLoad.c */ -#define W32_tmparg " '%s'" -#define W32_tmpfile ,tmpname -#define W32_tmplen strlen(tmpname)+3 -#else -#define W32_tmparg -#define W32_tmpfile -#define W32_tmplen 0 -#endif - -/***====================================================================***/ - -static const char *componentDirs[_XkbListNumComponents] = { - "keycodes", "types", "compat", "symbols", "geometry" -}; - -/***====================================================================***/ - -static Status -_AddListComponent(XkbSrvListInfoPtr list, - int what, unsigned flags, char *str, ClientPtr client) -{ - int slen, wlen; - unsigned char *wire8; - unsigned short *wire16; - char *tmp; - - if (list->nTotal >= list->maxRtrn) { - list->nTotal++; - return Success; - } - tmp = strchr(str, ')'); - if ((tmp == NULL) && ((tmp = strchr(str, '(')) == NULL)) { - slen = strlen(str); - while ((slen > 0) && isspace(str[slen - 1])) { - slen--; - } - } - else { - slen = (tmp - str + 1); - } - wlen = (((slen + 1) / 2) * 2) + 4; /* four bytes for flags and length, pad to */ - /* 2-byte boundary */ - if ((list->szPool - list->nPool) < wlen) { - if (wlen > 1024) - list->szPool += XkbPaddedSize(wlen * 2); - else - list->szPool += 1024; - list->pool = realloc(list->pool, list->szPool * sizeof(char)); - if (!list->pool) - return BadAlloc; - } - wire16 = (unsigned short *) &list->pool[list->nPool]; - wire8 = (unsigned char *) &wire16[2]; - wire16[0] = flags; - wire16[1] = slen; - memcpy(wire8, str, slen); - if (client->swapped) { - swaps(&wire16[0]); - swaps(&wire16[1]); - } - list->nPool += wlen; - list->nFound[what]++; - list->nTotal++; - return Success; -} - -/***====================================================================***/ -static Status -XkbDDXListComponent(DeviceIntPtr dev, - int what, XkbSrvListInfoPtr list, ClientPtr client) -{ - char *file, *map, *tmp, *buf = NULL; - FILE *in; - Status status; - Bool haveDir; - -#ifdef WIN32 - char tmpname[PATH_MAX]; -#else - int rval; -#endif - - if ((list->pattern[what] == NULL) || (list->pattern[what][0] == '\0')) - return Success; - file = list->pattern[what]; - map = strrchr(file, '('); - if (map != NULL) { - map++; - tmp = strrchr(map, ')'); - if ((tmp == NULL) || (tmp[1] != '\0')) { - /* illegal pattern. No error, but no match */ - return Success; - } - } - - in = NULL; - haveDir = TRUE; -#ifdef WIN32 - strcpy(tmpname, Win32TempDir()); - strcat(tmpname, "\\xkb_XXXXXX"); - (void) mktemp(tmpname); -#endif - if (XkbBaseDirectory != NULL) { - if ((list->pattern[what][0] == '*') && (list->pattern[what][1] == '\0')) { - if (asprintf(&buf, "%s/%s.dir", XkbBaseDirectory, - componentDirs[what]) == -1) - buf = NULL; - else - in = fopen(buf, "r"); - } - if (!in) { - haveDir = FALSE; - free(buf); - if (asprintf - (&buf, - "'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg, - XkbBinDirectory, XkbBaseDirectory, componentDirs[what], - (long) ((xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)), - file W32_tmpfile) == -1) - buf = NULL; - } - } - else { - if ((list->pattern[what][0] == '*') && (list->pattern[what][1] == '\0')) { - if (asprintf(&buf, "%s.dir", componentDirs[what]) == -1) - buf = NULL; - else - in = fopen(buf, "r"); - } - if (!in) { - haveDir = FALSE; - free(buf); - if (asprintf - (&buf, - "xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg, - componentDirs[what], - (long) ((xkbDebugFlags < 2) ? 1 : - ((xkbDebugFlags > 10) ? 10 : xkbDebugFlags)), - file W32_tmpfile) == -1) - buf = NULL; - } - } - status = Success; - if (!haveDir) { -#ifndef WIN32 - in = Popen(buf, "r"); -#else - if (xkbDebugFlags) - DebugF("[xkb] xkbList executes: %s\n", buf); - if (System(buf) < 0) - ErrorF("[xkb] Could not invoke keymap compiler\n"); - else - in = fopen(tmpname, "r"); -#endif - } - if (!in) { - free(buf); -#ifdef WIN32 - unlink(tmpname); -#endif - return BadImplementation; - } - list->nFound[what] = 0; - free(buf); - buf = malloc(PATH_MAX * sizeof(char)); - if (!buf) { - fclose(in); -#ifdef WIN32 - unlink(tmpname); -#endif - return BadAlloc; - } - while ((status == Success) && ((tmp = fgets(buf, PATH_MAX, in)) != NULL)) { - unsigned flags; - register unsigned int i; - - if (*tmp == '#') /* comment, skip it */ - continue; - if (!strncmp(tmp, "Warning:", 8) || !strncmp(tmp, " ", 8)) - /* skip warnings too */ - continue; - flags = 0; - /* each line in the listing is supposed to start with two */ - /* groups of eight characters, which specify the general */ - /* flags and the flags that are specific to the component */ - /* if they're missing, fail with BadImplementation */ - for (i = 0; (i < 8) && (status == Success); i++) { /* read the general flags */ - if (isalpha(*tmp)) - flags |= (1L << i); - else if (*tmp != '-') - status = BadImplementation; - tmp++; - } - if (status != Success) - break; - if (!isspace(*tmp)) { - status = BadImplementation; - break; - } - else - tmp++; - for (i = 0; (i < 8) && (status == Success); i++) { /* read the component flags */ - if (isalpha(*tmp)) - flags |= (1L << (i + 8)); - else if (*tmp != '-') - status = BadImplementation; - tmp++; - } - if (status != Success) - break; - if (isspace(*tmp)) { - while (isspace(*tmp)) { - tmp++; - } - } - else { - status = BadImplementation; - break; - } - status = _AddListComponent(list, what, flags, tmp, client); - } -#ifndef WIN32 - if (haveDir) - fclose(in); - else if ((rval = Pclose(in)) != 0) { - if (xkbDebugFlags) - ErrorF("[xkb] xkbcomp returned exit code %d\n", rval); - } -#else - fclose(in); - unlink(tmpname); -#endif - free(buf); - return status; -} - -/***====================================================================***/ - -/* ARGSUSED */ -Status -XkbDDXList(DeviceIntPtr dev, XkbSrvListInfoPtr list, ClientPtr client) -{ - Status status; - - status = XkbDDXListComponent(dev, _XkbListKeycodes, list, client); - if (status == Success) - status = XkbDDXListComponent(dev, _XkbListTypes, list, client); - if (status == Success) - status = XkbDDXListComponent(dev, _XkbListCompat, list, client); - if (status == Success) - status = XkbDDXListComponent(dev, _XkbListSymbols, list, client); - if (status == Success) - status = XkbDDXListComponent(dev, _XkbListGeometry, list, client); - return status; -} diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index efb178c7c..c67896f06 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -5620,9 +5620,9 @@ ProcXkbListComponents(ClientPtr client) DeviceIntPtr dev; xkbListComponentsReply rep; unsigned len; - int status; unsigned char *str; - XkbSrvListInfoRec list; + uint8_t size; + int i; REQUEST(xkbListComponentsReq); REQUEST_AT_LEAST_SIZE(xkbListComponentsReq); @@ -5632,40 +5632,33 @@ ProcXkbListComponents(ClientPtr client) CHK_KBD_DEVICE(dev, stuff->deviceSpec, client, DixGetAttrAccess); - status = Success; + /* The request is followed by six Pascal strings (i.e. size in characters + * followed by a string pattern) describing what the client wants us to + * list. We don't care, but might as well check they haven't got the + * length wrong. */ str = (unsigned char *) &stuff[1]; - memset(&list, 0, sizeof(XkbSrvListInfoRec)); - list.maxRtrn = stuff->maxNames; - list.pattern[_XkbListKeycodes] = GetComponentSpec(&str, FALSE, &status); - list.pattern[_XkbListTypes] = GetComponentSpec(&str, FALSE, &status); - list.pattern[_XkbListCompat] = GetComponentSpec(&str, FALSE, &status); - list.pattern[_XkbListSymbols] = GetComponentSpec(&str, FALSE, &status); - list.pattern[_XkbListGeometry] = GetComponentSpec(&str, FALSE, &status); - if (status != Success) - return status; - len = str - ((unsigned char *) stuff); + for (i = 0; i < 6; i++) { + size = *((uint8_t *)str); + len = (str + size + 1) - ((unsigned char *) stuff); + if ((XkbPaddedSize(len) / 4) > stuff->length) + return BadLength; + str += (size + 1); + } if ((XkbPaddedSize(len) / 4) != stuff->length) return BadLength; - if ((status = XkbDDXList(dev, &list, client)) != Success) { - free(list.pool); - list.pool = NULL; - return status; - } rep = (xkbListComponentsReply) { .type = X_Reply, .deviceID = dev->id, .sequenceNumber = client->sequence, - .length = XkbPaddedSize(list.nPool) / 4, + .length = 0, .nKeymaps = 0, - .nKeycodes = list.nFound[_XkbListKeycodes], - .nTypes = list.nFound[_XkbListTypes], - .nCompatMaps = list.nFound[_XkbListCompat], - .nSymbols = list.nFound[_XkbListSymbols], - .nGeometries = list.nFound[_XkbListGeometry], + .nKeycodes = 0, + .nTypes = 0, + .nCompatMaps = 0, + .nSymbols = 0, + .nGeometries = 0, .extra = 0 }; - if (list.nTotal > list.maxRtrn) - rep.extra = (list.nTotal - list.maxRtrn); if (client->swapped) { swaps(&rep.sequenceNumber); swapl(&rep.length); @@ -5678,11 +5671,6 @@ ProcXkbListComponents(ClientPtr client) swaps(&rep.extra); } WriteToClient(client, SIZEOF(xkbListComponentsReply), &rep); - if (list.nPool && list.pool) { - WriteToClient(client, XkbPaddedSize(list.nPool), list.pool); - free(list.pool); - list.pool = NULL; - } return Success; } diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index 712ddabf6..313f4884d 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1372,6 +1372,12 @@ <iso639Id>srp</iso639Id> </languageList> </configItem> </variant> + <variant> + <configItem> + <name>workman</name> + <_description>English (US, Workman)</_description> + </configItem> + </variant> </variantList> </layout> <layout> diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 2d54e28cc..06cd3ce33 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1189,6 +1189,74 @@ xkb_symbols "htcdream" { include "level3(alt_switch)" }; +// Workman Keyboard Layout symbols for xkb on X.Org Server 7.x +// 09-06-2010 OJ Bucao. +partial default alphanumeric_keys +xkb_symbols "workman" { + + include "us(basic)" + + name[Group1]= "English (US, Workman)"; + + // Alphanumeric section + key <TLDE> { [ grave, asciitilde, dead_tilde, asciitilde ] }; + key <AE01> { [ 1, exclam, exclamdown, onesuperior ] }; + key <AE02> { [ 2, at, masculine, twosuperior ] }; + key <AE03> { [ 3, numbersign, ordfeminine, threesuperior ] }; + key <AE04> { [ 4, dollar, cent, sterling ] }; + key <AE05> { [ 5, percent, EuroSign, yen ] }; + key <AE06> { [ 6, asciicircum, hstroke, Hstroke ] }; + key <AE07> { [ 7, ampersand, eth, ETH ] }; + key <AE08> { [ 8, asterisk, thorn, THORN ] }; + key <AE09> { [ 9, parenleft, leftsinglequotemark, leftdoublequotemark ] }; + key <AE10> { [ 0, parenright, rightsinglequotemark, rightdoublequotemark ] }; + key <AE11> { [ minus, underscore, endash, emdash ] }; + key <AE12> { [ equal, plus, multiply, division ] }; + + key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] }; + key <AD02> { [ d, D, aring, Aring ] }; + key <AD03> { [ r, R, atilde, Atilde ] }; + key <AD04> { [ w, W, oslash, Ooblique ] }; + key <AD05> { [ b, B, dead_ogonek, asciitilde ] }; + key <AD06> { [ j, J, dstroke, Dstroke ] }; + key <AD07> { [ f, F, lstroke, Lstroke ] }; + key <AD08> { [ u, U, uacute, Uacute ] }; + key <AD09> { [ p, P, udiaeresis, Udiaeresis ] }; + key <AD10> { [ semicolon, colon, odiaeresis, Odiaeresis ] }; + key <AD11> { [ bracketleft, braceleft, guillemotleft, 0x1002039 ] }; + key <AD12> { [ bracketright, braceright, guillemotright, 0x100203a ] }; + key <BKSL> { [ backslash, bar, asciitilde, asciitilde ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AC02> { [ s, S, dead_grave, asciitilde ] }; + key <AC03> { [ h, H, ssharp, asciitilde ] }; + key <AC04> { [ t, T, dead_acute, dead_doubleacute ] }; + key <AC05> { [ g, G, dead_diaeresis, asciitilde ] }; + key <AC06> { [ y, Y, dead_caron, asciitilde ] }; + key <AC07> { [ n, N, ntilde, Ntilde ] }; + key <AC08> { [ e, E, eacute, Eacute ] }; + key <AC09> { [ o, O, iacute, Iacute ] }; + key <AC10> { [ i, I, oacute, Oacute ] }; + key <AC11> { [ apostrophe, quotedbl, otilde, Otilde ] }; + + key <AB01> { [ z, Z, ae, AE ] }; + key <AB02> { [ x, X, dead_circumflex, asciitilde ] }; + key <AB03> { [ m, M, ccedilla, Ccedilla ] }; + key <AB04> { [ c, C, oe, OE ] }; + key <AB05> { [ v, V, dead_breve, asciitilde ] }; + key <AB06> { [ k, K, dead_abovering, asciitilde ] }; + key <AB07> { [ l, L, dead_macron, asciitilde ] }; + key <AB08> { [ comma, less, dead_cedilla, asciitilde ] }; + key <AB09> { [ period, greater, dead_abovedot, asciitilde ] }; + key <AB10> { [ slash, question, questiondown, asciitilde ] }; + + key <CAPS> { [ BackSpace, Escape, BackSpace, BackSpace ] }; + key <LSGT> { [ minus, underscore, endash, emdash ] }; + key <SPCE> { [ space, space, space, nobreakspace ] }; + + include "level3(ralt_switch)" +}; + // EXTRAS: // Czech, Slovak and German charecters added as third level symbols to US keyboard layout. @@ -1383,3 +1451,4 @@ xkb_symbols "crd" { // End alphanumeric section }; + |