aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libXft/src/xftdpy.c4
-rw-r--r--libXft/src/xftdraw.c71
-rw-r--r--libXft/src/xftint.h1
-rw-r--r--mesalib/configure.ac12
-rw-r--r--mesalib/docs/GL3.txt2
-rw-r--r--mesalib/docs/index.html6
-rw-r--r--mesalib/docs/relnotes.html1
-rw-r--r--mesalib/docs/relnotes/10.3.2.html115
-rw-r--r--mesalib/docs/relnotes/10.4.html1
-rw-r--r--mesalib/scons/llvm.py16
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_blitter.c77
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_math.h2
-rw-r--r--mesalib/src/glsl/ast_array_index.cpp6
-rw-r--r--mesalib/src/glsl/ast_to_hir.cpp107
-rw-r--r--mesalib/src/glsl/glsl_parser_extras.h4
-rw-r--r--mesalib/src/glsl/ir_uniform.h11
-rw-r--r--mesalib/src/glsl/linker.cpp18
-rw-r--r--mesalib/src/glsl/lower_offset_array.cpp10
-rw-r--r--mesalib/src/glsl/main.cpp2
-rw-r--r--mesalib/src/glsl/opt_array_splitting.cpp2
-rw-r--r--mesalib/src/glsl/standalone_scaffolding.cpp27
-rw-r--r--mesalib/src/glsl/standalone_scaffolding.h3
-rw-r--r--mesalib/src/mapi/glapi/gen/ARB_clip_control.xml25
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile.am1
-rwxr-xr-xmesalib/src/mapi/glapi/gen/gl_API.xml4
-rwxr-xr-xmesalib/src/mapi/glapi/gen/gl_gentable.py4
-rw-r--r--mesalib/src/mesa/drivers/common/meta.c9
-rw-r--r--mesalib/src/mesa/drivers/common/meta.h3
-rw-r--r--mesalib/src/mesa/main/attrib.c1
-rwxr-xr-xmesalib/src/mesa/main/bufferobj.c4
-rw-r--r--mesalib/src/mesa/main/context.c12
-rw-r--r--mesalib/src/mesa/main/dd.h3
-rw-r--r--mesalib/src/mesa/main/dlist.c26
-rw-r--r--mesalib/src/mesa/main/extensions.c1
-rw-r--r--mesalib/src/mesa/main/ff_fragment_shader.cpp14
-rw-r--r--mesalib/src/mesa/main/get.c1
-rw-r--r--mesalib/src/mesa/main/get_hash_params.py2
-rw-r--r--mesalib/src/mesa/main/mtypes.h7
-rw-r--r--mesalib/src/mesa/main/polygon.c2
-rw-r--r--mesalib/src/mesa/main/shaderapi.c2
-rw-r--r--mesalib/src/mesa/main/shaderapi.h9
-rw-r--r--mesalib/src/mesa/main/shaderimage.c2
-rw-r--r--mesalib/src/mesa/main/shaderobj.c28
-rw-r--r--mesalib/src/mesa/main/shaderobj.h6
-rw-r--r--mesalib/src/mesa/main/state.c25
-rw-r--r--mesalib/src/mesa/main/uniform_query.cpp74
-rw-r--r--mesalib/src/mesa/main/uniforms.c22
-rw-r--r--mesalib/src/mesa/main/uniforms.h2
-rw-r--r--mesalib/src/mesa/main/version.c2
-rw-r--r--mesalib/src/mesa/main/viewport.c122
-rw-r--r--mesalib/src/mesa/main/viewport.h6
-rw-r--r--mesalib/src/mesa/math/m_matrix.c17
-rw-r--r--mesalib/src/mesa/math/m_matrix.h4
-rw-r--r--mesalib/src/mesa/program/ir_to_mesa.cpp2
-rw-r--r--mesalib/src/mesa/state_tracker/st_atom_rasterizer.c25
-rw-r--r--mesalib/src/mesa/state_tracker/st_atom_viewport.c23
-rw-r--r--mesalib/src/mesa/state_tracker/st_cb_program.c2
-rw-r--r--mesalib/src/mesa/state_tracker/st_debug.c1
-rw-r--r--mesalib/src/mesa/state_tracker/st_debug.h1
-rw-r--r--mesalib/src/mesa/state_tracker/st_extensions.c9
-rw-r--r--mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp47
-rw-r--r--mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h5
-rw-r--r--mesalib/src/util/macros.h14
-rw-r--r--mesalib/src/util/register_allocate.c2
-rw-r--r--pixman/pixman/pixman-mmx.c6
-rw-r--r--xorg-server/Xext/panoramiXprocs.c2
-rw-r--r--xorg-server/configure.ac2
-rw-r--r--xorg-server/fb/fbpict.c2
-rw-r--r--xorg-server/glx/dispatch.h599
-rw-r--r--xorg-server/glx/glapitable.h583
-rw-r--r--xorg-server/glx/glfunctions.h1
-rw-r--r--xorg-server/glx/glprocs.h1754
-rw-r--r--xorg-server/glx/glxdri2.c4
-rw-r--r--xorg-server/glx/remap_helper.h849
-rw-r--r--xorg-server/hw/kdrive/ephyr/ephyr.c12
-rwxr-xr-xxorg-server/hw/kdrive/ephyr/ephyrinit.c6
-rw-r--r--xorg-server/hw/kdrive/ephyr/man/Xephyr.man3
-rwxr-xr-xxorg-server/hw/xwin/InitOutput.c6
-rwxr-xr-xxorg-server/hw/xwin/Makefile.am21
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/makefile5
-rw-r--r--xorg-server/hw/xwin/man/XWin.man4
-rw-r--r--xorg-server/hw/xwin/win.h182
-rw-r--r--xorg-server/hw/xwin/winclip.c42
-rw-r--r--xorg-server/hw/xwin/wincreatewnd.c22
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winengine.c27
-rw-r--r--xorg-server/hw/xwin/winfillsp.c842
-rw-r--r--xorg-server/hw/xwin/winfont.c74
-rw-r--r--xorg-server/hw/xwin/wingc.c151
-rw-r--r--xorg-server/hw/xwin/wingetsp.c154
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winmisc.c63
-rw-r--r--xorg-server/hw/xwin/winnativegdi.c491
-rw-r--r--xorg-server/hw/xwin/winpfbdd.c616
-rw-r--r--xorg-server/hw/xwin/winpixmap.c178
-rw-r--r--xorg-server/hw/xwin/winpolyline.c53
-rw-r--r--xorg-server/hw/xwin/winrop.c142
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winscrinit.c139
-rw-r--r--xorg-server/hw/xwin/winsetsp.c174
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/winwindow.c194
-rw-r--r--xorg-server/hw/xwin/winwndproc.c12
-rwxr-xr-xxorg-server/mi/mi.h4
-rw-r--r--xorg-server/mi/mibitblt.c13
-rw-r--r--xorg-server/mi/mifillrct.c2
-rw-r--r--xorg-server/os/utils.c1
-rw-r--r--xorg-server/render/mipict.c34
-rw-r--r--xorg-server/render/mirect.c2
-rw-r--r--xorg-server/render/picture.c1
-rw-r--r--xorg-server/render/picturestr.h3
-rw-r--r--xorg-server/xfixes/region.c14
-rw-r--r--xorg-server/xkeyboard-config/rules/base.xml.in12
-rw-r--r--xorg-server/xkeyboard-config/symbols/keypad49
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch1
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk2
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/it1
-rw-r--r--xorg-server/xkeyboard-config/symbols/macintosh_vndr/us4
-rw-r--r--xorg-server/xkeyboard-config/symbols/ru71
115 files changed, 2792 insertions, 5906 deletions
diff --git a/libXft/src/xftdpy.c b/libXft/src/xftdpy.c
index c5b756e25..62b1ccfaf 100644
--- a/libXft/src/xftdpy.c
+++ b/libXft/src/xftdpy.c
@@ -106,6 +106,10 @@ _XftDisplayInfoGet (Display *dpy, FcBool createIfNecessary)
if (major < 0 || (major == 0 && minor <= 2))
info->use_free_glyphs = FcFalse;
+ info->hasSolid = FcFalse;
+ if (major > 0 || (major == 0 && minor >= 10))
+ info->hasSolid = FcTrue;
+
pf.type = PictTypeDirect;
pf.depth = 32;
pf.direct.redMask = 0xff;
diff --git a/libXft/src/xftdraw.c b/libXft/src/xftdraw.c
index 186bcb876..dfa97fbfc 100644
--- a/libXft/src/xftdraw.c
+++ b/libXft/src/xftdraw.c
@@ -333,39 +333,52 @@ XftDrawSrcPicture (XftDraw *draw, _Xconst XftColor *color)
* Pick one to replace at random
*/
i = (unsigned int) rand () % XFT_NUM_SOLID_COLOR;
- /*
- * Recreate if it was for the wrong screen
- */
- if (info->colors[i].screen != draw->screen && info->colors[i].pict)
- {
- XRenderFreePicture (dpy, info->colors[i].pict);
- info->colors[i].pict = 0;
- }
- /*
- * Create picture if necessary
- */
- if (!info->colors[i].pict)
- {
- Pixmap pix;
- XRenderPictureAttributes pa;
- pix = XCreatePixmap (dpy, RootWindow (dpy, draw->screen), 1, 1,
- info->solidFormat->depth);
- pa.repeat = True;
- info->colors[i].pict = XRenderCreatePicture (draw->dpy,
- pix,
- info->solidFormat,
- CPRepeat, &pa);
- XFreePixmap (dpy, pix);
+ if (info->hasSolid) {
+ /*
+ * Free any existing entry
+ */
+ if (info->colors[i].pict)
+ XRenderFreePicture (dpy, info->colors[i].pict);
+ /*
+ * Create picture
+ */
+ info->colors[i].pict = XRenderCreateSolidFill (draw->dpy, &color->color);
+ } else {
+ if (info->colors[i].screen != draw->screen && info->colors[i].pict)
+ {
+ XRenderFreePicture (dpy, info->colors[i].pict);
+ info->colors[i].pict = 0;
+ }
+ /*
+ * Create picture if necessary
+ */
+ if (!info->colors[i].pict)
+ {
+ Pixmap pix;
+ XRenderPictureAttributes pa;
+
+ pix = XCreatePixmap (dpy, RootWindow (dpy, draw->screen), 1, 1,
+ info->solidFormat->depth);
+ pa.repeat = True;
+ info->colors[i].pict = XRenderCreatePicture (draw->dpy,
+ pix,
+ info->solidFormat,
+ CPRepeat, &pa);
+ XFreePixmap (dpy, pix);
+ }
+ /*
+ * Set to the new color
+ */
+ info->colors[i].color = color->color;
+ info->colors[i].screen = draw->screen;
+ XRenderFillRectangle (dpy, PictOpSrc,
+ info->colors[i].pict,
+ &color->color, 0, 0, 1, 1);
}
- /*
- * Set to the new color
- */
info->colors[i].color = color->color;
info->colors[i].screen = draw->screen;
- XRenderFillRectangle (dpy, PictOpSrc,
- info->colors[i].pict,
- &color->color, 0, 0, 1, 1);
+
return info->colors[i].pict;
}
diff --git a/libXft/src/xftint.h b/libXft/src/xftint.h
index 165897767..c06ac3cba 100644
--- a/libXft/src/xftint.h
+++ b/libXft/src/xftint.h
@@ -245,6 +245,7 @@ typedef struct _XftDisplayInfo {
XExtCodes *codes;
FcPattern *defaults;
FcBool hasRender;
+ FcBool hasSolid;
XftFont *fonts;
XRenderPictFormat *solidFormat;
unsigned long glyph_memory;
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 0ed932544..03f1bca86 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1465,6 +1465,7 @@ AC_ARG_WITH([clang-libdir],
[CLANG_LIBDIR=''])
PKG_CHECK_EXISTS([libclc], [have_libclc=yes], [have_libclc=no])
+AC_CHECK_LIB([elf], [elf_memory], [have_libelf=yes;ELF_LIB=-lelf])
if test "x$enable_opencl" = xyes; then
if test -z "$with_gallium_drivers"; then
@@ -1495,6 +1496,10 @@ if test "x$enable_opencl" = xyes; then
else
OPENCL_LIBNAME="OpenCL"
fi
+
+ if test "x$have_libelf" != xyes; then
+ AC_MSG_ERROR([Clover requires libelf])
+ fi
fi
AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
@@ -1714,7 +1719,7 @@ if test "x$enable_gallium_llvm" = xyes; then
fi
LLVM_REQUIRED_VERSION_MAJOR="3"
- LLVM_REQUIRED_VERSION_MINOR="1"
+ LLVM_REQUIRED_VERSION_MINOR="3"
if test "$LLVM_VERSION_INT" -lt "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer is required])
fi
@@ -1870,8 +1875,9 @@ radeon_llvm_check() {
fi
LLVM_COMPONENTS="${LLVM_COMPONENTS} r600 bitreader ipo"
NEED_RADEON_LLVM=yes
- AC_CHECK_LIB([elf], [elf_memory], [ELF_LIB=-lelf],
- [AC_MSG_ERROR([$1 requires libelf when using LLVM])])
+ if test "x$have_libelf" != xyes; then
+ AC_MSG_ERROR([$1 requires libelf when using llvm])
+ fi
}
dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 07d1d2c49..6a988d5e7 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -187,7 +187,7 @@ GL 4.4, GLSL 4.40:
GL 4.5, GLSL 4.50:
GL_ARB_ES3_1_compatibility not started
- GL_ARB_clip_control not started
+ GL_ARB_clip_control DONE (llvmpipe, softpipe, r300, r600, radeonsi)
GL_ARB_conditional_render_inverted DONE (i965, nvc0, llvmpipe, softpipe)
GL_ARB_cull_distance not started
GL_ARB_derivative_control DONE (i965, nv50, nvc0, r600)
diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html
index 244a7a3b2..0a491a2c9 100644
--- a/mesalib/docs/index.html
+++ b/mesalib/docs/index.html
@@ -16,6 +16,12 @@
<h1>News</h1>
+<h2>October 24, 2014</h2>
+<p>
+<a href="relnotes/10.3.2.html">Mesa 10.3.2</a> is released.
+This is a bug-fix release.
+</p>
+
<h2>October 12, 2014</h2>
<p>
<a href="relnotes/10.2.9.html">Mesa 10.2.9</a>
diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html
index d546e8589..1c97edd64 100644
--- a/mesalib/docs/relnotes.html
+++ b/mesalib/docs/relnotes.html
@@ -21,6 +21,7 @@ The release notes summarize what's new or changed in each Mesa release.
</p>
<ul>
+<li><a href="relnotes/10.3.2.html">10.3.2 release notes</a>
<li><a href="relnotes/10.3.1.html">10.3.1 release notes</a>
<li><a href="relnotes/10.2.9.html">10.2.9 release notes</a>
<li><a href="relnotes/10.3.html">10.3 release notes</a>
diff --git a/mesalib/docs/relnotes/10.3.2.html b/mesalib/docs/relnotes/10.3.2.html
new file mode 100644
index 000000000..4c08f6561
--- /dev/null
+++ b/mesalib/docs/relnotes/10.3.2.html
@@ -0,0 +1,115 @@
+<!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 10.3.2 Release Notes / October 24, 2014</h1>
+
+<p>
+Mesa 10.3.2 is a bug fix release which fixes bugs found since the 10.3 release.
+</p>
+<p>
+Mesa 10.3.2 implements the OpenGL 3.3 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.3. OpenGL
+3.3 is <strong>only</strong> available if requested at context creation
+because compatibility contexts are not supported.
+</p>
+
+<h2>SHA256 checksums</h2>
+<pre>
+e65f8e691f06f111c1aeb3a376b13c9cc88cb162bee2709e0e7e6b0e6628ca75 MesaLib-10.3.2.tar.gz
+e9849bcb9aa9acd98a753d6d46d2e7d7238d3367036e11357a60efd16de8bea3 MesaLib-10.3.2.tar.bz2
+427dc0d670d38e713ebff2675665ec2fe4ff7d04ce227bd54de946999fc1d234 MesaLib-10.3.2.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=54372">Bug 54372</a> - GLX_INTEL_swap_event crashes driver when swapping window buffers</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=81680">Bug 81680</a> - [r600g] Firefox crashes with hardware acceleration turned on</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84140">Bug 84140</a> - mplayer crashes playing some files using vdpau output</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84662">Bug 84662</a> - Long pauses with Unreal demo Elemental on R9270X since : Always flush the HDP cache before submitting a CS to the GPU</li>
+
+<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85267">Bug 85267</a> - vlc crashes with vdpau (Radeon 3850HD) [r600]</li>
+
+</ul>
+
+<h2>Changes</h2>
+
+<p>Brian Paul (3):</p>
+<ul>
+ <li>mesa: fix spurious wglGetProcAddress / GL_INVALID_OPERATION error</li>
+ <li>st/wgl: add WINAPI qualifiers on wgl function typedefs</li>
+ <li>glsl: fix several use-after-free bugs</li>
+</ul>
+
+<p>Daniel Manjarres (1):</p>
+<ul>
+ <li>glx: Fix glxUseXFont for glxWindow and glxPixmaps</li>
+</ul>
+
+<p>Dave Airlie (1):</p>
+<ul>
+ <li>mesa: fix GetTexImage for 1D array depth textures</li>
+</ul>
+
+<p>Emil Velikov (2):</p>
+<ul>
+ <li>docs: Add sha256 sums for the 10.3.1 release</li>
+ <li>Update VERSION to 10.3.2</li>
+</ul>
+
+<p>Ilia Mirkin (4):</p>
+<ul>
+ <li>gm107/ir: add dnz emission for fmul</li>
+ <li>gk110/ir: add dnz flag emission for fmul/fmad</li>
+ <li>nouveau: 3d textures are unsupported, limit 3d levels to 1</li>
+ <li>st/gbm: fix order of arguments passed to is_format_supported</li>
+</ul>
+
+<p>Kenneth Graunke (3):</p>
+<ul>
+ <li>i965: Add a BRW_MOCS_PTE #define.</li>
+ <li>i965: Use BDW_MOCS_PTE for renderbuffers.</li>
+ <li>i965: Fix register write checks.</li>
+</ul>
+
+<p>Marek Olšák (2):</p>
+<ul>
+ <li>st/mesa: use pipe_sampler_view_release for releasing sampler views</li>
+ <li>glsl_to_tgsi: fix the value of gl_FrontFacing with native integers</li>
+</ul>
+
+<p>Michel Dänzer (4):</p>
+<ul>
+ <li>radeonsi: Clear sampler view flags when binding a buffer</li>
+ <li>r600g,radeonsi: Always use GTT again for PIPE_USAGE_STREAM buffers</li>
+ <li>winsys/radeon: Use separate caching buffer manager for each set of flags</li>
+ <li>r600g: Drop references to destroyed blend state</li>
+</ul>
+
+</div>
+</body>
+</html>
diff --git a/mesalib/docs/relnotes/10.4.html b/mesalib/docs/relnotes/10.4.html
index 64cbfaefa..67c3087ee 100644
--- a/mesalib/docs/relnotes/10.4.html
+++ b/mesalib/docs/relnotes/10.4.html
@@ -46,6 +46,7 @@ Note: some of the new features are only available with certain drivers.
<ul>
<li>GL_ARB_sample_shading on r600</li>
<li>GL_ARB_texture_view on nv50, nvc0</li>
+<li>GL_ARB_clip_control on llvmpipe, softpipe, r300, r600, radeonsi</li>
</ul>
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py
index 288a0806f..1e312f94d 100644
--- a/mesalib/scons/llvm.py
+++ b/mesalib/scons/llvm.py
@@ -37,7 +37,7 @@ import SCons.Errors
import SCons.Util
-required_llvm_version = '3.1'
+required_llvm_version = '3.3'
def generate(env):
@@ -98,7 +98,7 @@ def generate(env):
'HAVE_STDINT_H',
])
env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
- if llvm_version >= distutils.version.LooseVersion('3.2'):
+ if True:
# 3.2
env.Prepend(LIBS = [
'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser',
@@ -110,18 +110,6 @@ def generate(env):
'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore',
'LLVMSupport', 'LLVMRuntimeDyld', 'LLVMObject'
])
- else:
- # 3.1
- env.Prepend(LIBS = [
- 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser',
- 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG',
- 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter',
- 'LLVMX86Utils', 'LLVMX86Info', 'LLVMMCJIT', 'LLVMJIT',
- 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts',
- 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa',
- 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore',
- 'LLVMSupport'
- ])
env.Append(LIBS = [
'imagehlp',
'psapi',
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c
index f3fe949c2..e59fa0481 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blitter.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c
@@ -134,6 +134,7 @@ struct blitter_context_priv
boolean has_stream_out;
boolean has_stencil_export;
boolean has_texture_multisample;
+ boolean cached_all_shaders;
/* The Draw module overrides these functions.
* Always create the blitter before Draw. */
@@ -356,10 +357,11 @@ static void bind_fs_empty(struct blitter_context_priv *ctx)
struct pipe_context *pipe = ctx->base.pipe;
if (!ctx->fs_empty) {
+ assert(!ctx->cached_all_shaders);
ctx->fs_empty = util_make_empty_fragment_shader(pipe);
}
- pipe->bind_fs_state(pipe, ctx->fs_empty);
+ ctx->bind_fs_state(pipe, ctx->fs_empty);
}
static void bind_fs_write_one_cbuf(struct blitter_context_priv *ctx)
@@ -367,12 +369,13 @@ static void bind_fs_write_one_cbuf(struct blitter_context_priv *ctx)
struct pipe_context *pipe = ctx->base.pipe;
if (!ctx->fs_write_one_cbuf) {
+ assert(!ctx->cached_all_shaders);
ctx->fs_write_one_cbuf =
util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC,
TGSI_INTERPOLATE_CONSTANT, FALSE);
}
- pipe->bind_fs_state(pipe, ctx->fs_write_one_cbuf);
+ ctx->bind_fs_state(pipe, ctx->fs_write_one_cbuf);
}
static void bind_fs_write_all_cbufs(struct blitter_context_priv *ctx)
@@ -380,12 +383,13 @@ static void bind_fs_write_all_cbufs(struct blitter_context_priv *ctx)
struct pipe_context *pipe = ctx->base.pipe;
if (!ctx->fs_write_all_cbufs) {
+ assert(!ctx->cached_all_shaders);
ctx->fs_write_all_cbufs =
util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC,
TGSI_INTERPOLATE_CONSTANT, TRUE);
}
- pipe->bind_fs_state(pipe, ctx->fs_write_all_cbufs);
+ ctx->bind_fs_state(pipe, ctx->fs_write_all_cbufs);
}
void util_blitter_destroy(struct blitter_context *blitter)
@@ -850,6 +854,7 @@ static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx,
shader = &ctx->fs_resolve[target][index][filter];
if (!*shader) {
+ assert(!ctx->cached_all_shaders);
if (filter == PIPE_TEX_FILTER_LINEAR) {
*shader = util_make_fs_msaa_resolve_bilinear(pipe, tgsi_tex,
src_nr_samples,
@@ -870,6 +875,7 @@ static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
+ assert(!ctx->cached_all_shaders);
*shader = util_make_fs_blit_msaa_color(pipe, tgsi_tex);
}
}
@@ -880,6 +886,7 @@ static void *blitter_get_fs_texfetch_col(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
+ assert(!ctx->cached_all_shaders);
*shader = util_make_fragment_tex_shader(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR);
}
@@ -902,11 +909,10 @@ void *blitter_get_fs_texfetch_depth(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target,
- nr_samples);
-
- *shader =
- util_make_fs_blit_msaa_depth(pipe, tgsi_tex);
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, nr_samples);
+ *shader = util_make_fs_blit_msaa_depth(pipe, tgsi_tex);
}
return *shader;
@@ -915,8 +921,9 @@ void *blitter_get_fs_texfetch_depth(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
-
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader =
util_make_fragment_tex_shader_writedepth(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR);
@@ -940,11 +947,10 @@ void *blitter_get_fs_texfetch_depthstencil(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target,
- nr_samples);
-
- *shader =
- util_make_fs_blit_msaa_depthstencil(pipe, tgsi_tex);
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, nr_samples);
+ *shader = util_make_fs_blit_msaa_depthstencil(pipe, tgsi_tex);
}
return *shader;
@@ -953,8 +959,9 @@ void *blitter_get_fs_texfetch_depthstencil(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
-
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader =
util_make_fragment_tex_shader_writedepthstencil(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR);
@@ -978,11 +985,10 @@ void *blitter_get_fs_texfetch_stencil(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target,
- nr_samples);
-
- *shader =
- util_make_fs_blit_msaa_stencil(pipe, tgsi_tex);
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, nr_samples);
+ *shader = util_make_fs_blit_msaa_stencil(pipe, tgsi_tex);
}
return *shader;
@@ -991,8 +997,9 @@ void *blitter_get_fs_texfetch_stencil(struct blitter_context_priv *ctx,
/* Create the fragment shader on-demand. */
if (!*shader) {
- unsigned tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
-
+ unsigned tgsi_tex;
+ assert(!ctx->cached_all_shaders);
+ tgsi_tex = util_pipe_tex_to_tgsi_tex(target, 0);
*shader =
util_make_fragment_tex_shader_writestencil(pipe, tgsi_tex,
TGSI_INTERPOLATE_LINEAR);
@@ -1002,10 +1009,18 @@ void *blitter_get_fs_texfetch_stencil(struct blitter_context_priv *ctx,
}
}
+
+/**
+ * Generate and save all fragment shaders that we will ever need for
+ * blitting. Drivers which use the 'draw' fallbacks will typically use
+ * this to make sure we generate/use shaders that don't go through the
+ * draw module's wrapper functions.
+ */
void util_blitter_cache_all_shaders(struct blitter_context *blitter)
{
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
- struct pipe_screen *screen = blitter->pipe->screen;
+ struct pipe_context *pipe = blitter->pipe;
+ struct pipe_screen *screen = pipe->screen;
unsigned samples, j, f, target, max_samples;
boolean has_arraytex, has_cubearraytex;
@@ -1065,6 +1080,18 @@ void util_blitter_cache_all_shaders(struct blitter_context *blitter)
}
}
}
+
+ ctx->fs_empty = util_make_empty_fragment_shader(pipe);
+
+ ctx->fs_write_one_cbuf =
+ util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC,
+ TGSI_INTERPOLATE_CONSTANT, FALSE);
+
+ ctx->fs_write_all_cbufs =
+ util_make_fragment_passthrough_shader(pipe, TGSI_SEMANTIC_GENERIC,
+ TGSI_INTERPOLATE_CONSTANT, TRUE);
+
+ ctx->cached_all_shaders = TRUE;
}
static void blitter_set_common_draw_rect_state(struct blitter_context_priv *ctx,
diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h
index f95c11166..0113fb1a0 100644
--- a/mesalib/src/gallium/auxiliary/util/u_math.h
+++ b/mesalib/src/gallium/auxiliary/util/u_math.h
@@ -799,7 +799,7 @@ util_bswap64(uint64_t n)
#if defined(HAVE___BUILTIN_BSWAP64)
return __builtin_bswap64(n);
#else
- return ((uint64_t)util_bswap32(n) << 32) |
+ return ((uint64_t)util_bswap32((uint32_t)n) << 32) |
util_bswap32((n >> 32));
#endif
}
diff --git a/mesalib/src/glsl/ast_array_index.cpp b/mesalib/src/glsl/ast_array_index.cpp
index 49a8574f2..ff0c7576d 100644
--- a/mesalib/src/glsl/ast_array_index.cpp
+++ b/mesalib/src/glsl/ast_array_index.cpp
@@ -49,12 +49,12 @@ ast_array_specifier::print(void) const
* loc and state to report the error.
*/
static void
-update_max_array_access(ir_rvalue *ir, unsigned idx, YYLTYPE *loc,
+update_max_array_access(ir_rvalue *ir, int idx, YYLTYPE *loc,
struct _mesa_glsl_parse_state *state)
{
if (ir_dereference_variable *deref_var = ir->as_dereference_variable()) {
ir_variable *var = deref_var->var;
- if (idx > var->data.max_array_access) {
+ if (idx > (int)var->data.max_array_access) {
var->data.max_array_access = idx;
/* Check whether this access will, as a side effect, implicitly cause
@@ -94,7 +94,7 @@ update_max_array_access(ir_rvalue *ir, unsigned idx, YYLTYPE *loc,
assert(max_ifc_array_access != NULL);
- if (idx > max_ifc_array_access[field_index]) {
+ if (idx > (int)max_ifc_array_access[field_index]) {
max_ifc_array_access[field_index] = idx;
/* Check whether this access will, as a side effect, implicitly
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index 068af295a..fe1e1291e 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -3767,7 +3767,7 @@ ast_declarator_list::hir(exec_list *instructions,
earlier->data.how_declared == ir_var_declared_in_block) {
_mesa_glsl_error(&loc, state,
"`%s' has already been redeclared using "
- "gl_PerVertex", var->name);
+ "gl_PerVertex", earlier->name);
}
earlier->data.how_declared = ir_var_declared_normally;
}
@@ -4373,7 +4373,7 @@ ast_jump_statement::hir(exec_list *instructions,
* loop.
*/
if (state->loop_nesting_ast != NULL &&
- mode == ast_continue) {
+ mode == ast_continue && !state->switch_state.is_switch_innermost) {
if (state->loop_nesting_ast->rest_expression) {
state->loop_nesting_ast->rest_expression->hir(instructions,
state);
@@ -4385,19 +4385,27 @@ ast_jump_statement::hir(exec_list *instructions,
}
if (state->switch_state.is_switch_innermost &&
+ mode == ast_continue) {
+ /* Set 'continue_inside' to true. */
+ ir_rvalue *const true_val = new (ctx) ir_constant(true);
+ ir_dereference_variable *deref_continue_inside_var =
+ new(ctx) ir_dereference_variable(state->switch_state.continue_inside);
+ instructions->push_tail(new(ctx) ir_assignment(deref_continue_inside_var,
+ true_val));
+
+ /* Break out from the switch, continue for the loop will
+ * be called right after switch. */
+ ir_loop_jump *const jump =
+ new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
+ instructions->push_tail(jump);
+
+ } else if (state->switch_state.is_switch_innermost &&
mode == ast_break) {
- /* Force break out of switch by setting is_break switch state.
- */
- ir_variable *const is_break_var = state->switch_state.is_break_var;
- ir_dereference_variable *const deref_is_break_var =
- new(ctx) ir_dereference_variable(is_break_var);
- ir_constant *const true_val = new(ctx) ir_constant(true);
- ir_assignment *const set_break_var =
- new(ctx) ir_assignment(deref_is_break_var, true_val);
-
- instructions->push_tail(set_break_var);
- }
- else {
+ /* Force break out of switch by inserting a break. */
+ ir_loop_jump *const jump =
+ new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
+ instructions->push_tail(jump);
+ } else {
ir_loop_jump *const jump =
new(ctx) ir_loop_jump((mode == ast_break)
? ir_loop_jump::jump_break
@@ -4509,19 +4517,19 @@ ast_switch_statement::hir(exec_list *instructions,
instructions->push_tail(new(ctx) ir_assignment(deref_is_fallthru_var,
is_fallthru_val));
- /* Initalize is_break state to false.
+ /* Initialize continue_inside state to false.
*/
- ir_rvalue *const is_break_val = new (ctx) ir_constant(false);
- state->switch_state.is_break_var =
+ state->switch_state.continue_inside =
new(ctx) ir_variable(glsl_type::bool_type,
- "switch_is_break_tmp",
+ "continue_inside_tmp",
ir_var_temporary);
- instructions->push_tail(state->switch_state.is_break_var);
+ instructions->push_tail(state->switch_state.continue_inside);
- ir_dereference_variable *deref_is_break_var =
- new(ctx) ir_dereference_variable(state->switch_state.is_break_var);
- instructions->push_tail(new(ctx) ir_assignment(deref_is_break_var,
- is_break_val));
+ ir_rvalue *const false_val = new (ctx) ir_constant(false);
+ ir_dereference_variable *deref_continue_inside_var =
+ new(ctx) ir_dereference_variable(state->switch_state.continue_inside);
+ instructions->push_tail(new(ctx) ir_assignment(deref_continue_inside_var,
+ false_val));
state->switch_state.run_default =
new(ctx) ir_variable(glsl_type::bool_type,
@@ -4529,13 +4537,42 @@ ast_switch_statement::hir(exec_list *instructions,
ir_var_temporary);
instructions->push_tail(state->switch_state.run_default);
+ /* Loop around the switch is used for flow control. */
+ ir_loop * loop = new(ctx) ir_loop();
+ instructions->push_tail(loop);
+
/* Cache test expression.
*/
- test_to_hir(instructions, state);
+ test_to_hir(&loop->body_instructions, state);
/* Emit code for body of switch stmt.
*/
- body->hir(instructions, state);
+ body->hir(&loop->body_instructions, state);
+
+ /* Insert a break at the end to exit loop. */
+ ir_loop_jump *jump = new(ctx) ir_loop_jump(ir_loop_jump::jump_break);
+ loop->body_instructions.push_tail(jump);
+
+ /* If we are inside loop, check if continue got called inside switch. */
+ if (state->loop_nesting_ast != NULL) {
+ ir_dereference_variable *deref_continue_inside =
+ new(ctx) ir_dereference_variable(state->switch_state.continue_inside);
+ ir_if *irif = new(ctx) ir_if(deref_continue_inside);
+ ir_loop_jump *jump = new(ctx) ir_loop_jump(ir_loop_jump::jump_continue);
+
+ if (state->loop_nesting_ast != NULL) {
+ if (state->loop_nesting_ast->rest_expression) {
+ state->loop_nesting_ast->rest_expression->hir(&irif->then_instructions,
+ state);
+ }
+ if (state->loop_nesting_ast->mode ==
+ ast_iteration_statement::ast_do_while) {
+ state->loop_nesting_ast->condition_to_hir(&irif->then_instructions, state);
+ }
+ }
+ irif->then_instructions.push_tail(jump);
+ instructions->push_tail(irif);
+ }
hash_table_dtor(state->switch_state.labels_ht);
@@ -4659,18 +4696,6 @@ ast_case_statement::hir(exec_list *instructions,
{
labels->hir(instructions, state);
- /* Conditionally set fallthru state based on break state. */
- ir_constant *const false_val = new(state) ir_constant(false);
- ir_dereference_variable *const deref_is_fallthru_var =
- new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
- ir_dereference_variable *const deref_is_break_var =
- new(state) ir_dereference_variable(state->switch_state.is_break_var);
- ir_assignment *const reset_fallthru_on_break =
- new(state) ir_assignment(deref_is_fallthru_var,
- false_val,
- deref_is_break_var);
- instructions->push_tail(reset_fallthru_on_break);
-
/* Guard case statements depending on fallthru state. */
ir_dereference_variable *const deref_fallthru_guard =
new(state) ir_dereference_variable(state->switch_state.is_fallthru_var);
@@ -5681,17 +5706,21 @@ ast_interface_block::hir(exec_list *instructions,
var->data.stream = this->layout.stream;
+ /* Examine var name here since var may get deleted in the next call */
+ bool var_is_gl_id = is_gl_identifier(var->name);
+
if (redeclaring_per_vertex) {
ir_variable *earlier =
get_variable_being_redeclared(var, loc, state,
true /* allow_all_redeclarations */);
- if (!is_gl_identifier(var->name) || earlier == NULL) {
+ if (!var_is_gl_id || earlier == NULL) {
_mesa_glsl_error(&loc, state,
"redeclaration of gl_PerVertex can only "
"include built-in variables");
} else if (earlier->data.how_declared == ir_var_declared_normally) {
_mesa_glsl_error(&loc, state,
- "`%s' has already been redeclared", var->name);
+ "`%s' has already been redeclared",
+ earlier->name);
} else {
earlier->data.how_declared = ir_var_declared_in_block;
earlier->reinit_interface_type(block_type);
diff --git a/mesalib/src/glsl/glsl_parser_extras.h b/mesalib/src/glsl/glsl_parser_extras.h
index d0299a760..36955d9af 100644
--- a/mesalib/src/glsl/glsl_parser_extras.h
+++ b/mesalib/src/glsl/glsl_parser_extras.h
@@ -40,9 +40,11 @@ struct glsl_switch_state {
/** Temporary variables needed for switch statement. */
ir_variable *test_var;
ir_variable *is_fallthru_var;
- ir_variable *is_break_var;
class ast_switch_statement *switch_nesting_ast;
+ /** Used to detect if 'continue' was called inside a switch. */
+ ir_variable *continue_inside;
+
/** Used to set condition if 'default' label should be chosen. */
ir_variable *run_default;
diff --git a/mesalib/src/glsl/ir_uniform.h b/mesalib/src/glsl/ir_uniform.h
index 2f7352825..b9ecf7cdd 100644
--- a/mesalib/src/glsl/ir_uniform.h
+++ b/mesalib/src/glsl/ir_uniform.h
@@ -45,17 +45,6 @@ extern "C" {
enum PACKED gl_uniform_driver_format {
uniform_native = 0, /**< Store data in the native format. */
uniform_int_float, /**< Store integer data as floats. */
- uniform_bool_float, /**< Store boolean data as floats. */
-
- /**
- * Store boolean data as integer using 1 for \c true.
- */
- uniform_bool_int_0_1,
-
- /**
- * Store boolean data as integer using ~0 for \c true.
- */
- uniform_bool_int_0_not0
};
struct gl_uniform_driver_storage {
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 47a722d9d..2d31801d3 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -1679,7 +1679,7 @@ link_intrastage_shaders(void *mem_ctx,
populate_symbol_table(linked);
- /* The a pointer to the main function in the final linked shader (i.e., the
+ /* The pointer to the main function in the final linked shader (i.e., the
* copy of the original shader that contained the main function).
*/
ir_function_signature *const main_sig =
@@ -1882,7 +1882,7 @@ find_available_slots(unsigned used_mask, unsigned needed_count)
/**
- * Assign locations for either VS inputs for FS outputs
+ * Assign locations for either VS inputs or FS outputs
*
* \param prog Shader program whose variables need locations assigned
* \param target_index Selector for the program target to receive location
@@ -2484,20 +2484,6 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
prog->Validated = false;
prog->_Used = false;
- ralloc_free(prog->InfoLog);
- prog->InfoLog = ralloc_strdup(NULL, "");
-
- ralloc_free(prog->UniformBlocks);
- prog->UniformBlocks = NULL;
- prog->NumUniformBlocks = 0;
- for (int i = 0; i < MESA_SHADER_STAGES; i++) {
- ralloc_free(prog->UniformBlockStageIndex[i]);
- prog->UniformBlockStageIndex[i] = NULL;
- }
-
- ralloc_free(prog->AtomicBuffers);
- prog->AtomicBuffers = NULL;
- prog->NumAtomicBuffers = 0;
prog->ARB_fragment_coord_conventions_enable = false;
/* Separate the shaders into groups based on their type.
diff --git a/mesalib/src/glsl/lower_offset_array.cpp b/mesalib/src/glsl/lower_offset_array.cpp
index 5b48526db..c30f80143 100644
--- a/mesalib/src/glsl/lower_offset_array.cpp
+++ b/mesalib/src/glsl/lower_offset_array.cpp
@@ -22,7 +22,7 @@
*/
/**
- * \file brw_lower_offset_array.cpp
+ * \file lower_offset_array.cpp
*
* IR lower pass to decompose ir_texture ir_tg4 with an array of offsets
* into four ir_tg4s with a single ivec2 offset, select the .w component of each,
@@ -39,9 +39,9 @@
using namespace ir_builder;
-class brw_lower_offset_array_visitor : public ir_rvalue_visitor {
+class lower_offset_array_visitor : public ir_rvalue_visitor {
public:
- brw_lower_offset_array_visitor()
+ lower_offset_array_visitor()
{
progress = false;
}
@@ -52,7 +52,7 @@ public:
};
void
-brw_lower_offset_array_visitor::handle_rvalue(ir_rvalue **rv)
+lower_offset_array_visitor::handle_rvalue(ir_rvalue **rv)
{
if (*rv == NULL || (*rv)->ir_type != ir_type_texture)
return;
@@ -83,7 +83,7 @@ brw_lower_offset_array_visitor::handle_rvalue(ir_rvalue **rv)
bool
lower_offset_arrays(exec_list *instructions)
{
- brw_lower_offset_array_visitor v;
+ lower_offset_array_visitor v;
visit_list_elements(&v, instructions);
diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp
index afc458b44..79e943831 100644
--- a/mesalib/src/glsl/main.cpp
+++ b/mesalib/src/glsl/main.cpp
@@ -414,6 +414,8 @@ main(int argc, char **argv)
}
if ((status == EXIT_SUCCESS) && do_link) {
+ _mesa_clear_shader_program_data(whole_program);
+
link_shaders(ctx, whole_program);
status = (whole_program->LinkStatus) ? EXIT_SUCCESS : EXIT_FAILURE;
diff --git a/mesalib/src/glsl/opt_array_splitting.cpp b/mesalib/src/glsl/opt_array_splitting.cpp
index ebb076b22..9e73f3c44 100644
--- a/mesalib/src/glsl/opt_array_splitting.cpp
+++ b/mesalib/src/glsl/opt_array_splitting.cpp
@@ -295,7 +295,7 @@ ir_array_splitting_visitor::split_deref(ir_dereference **deref)
ir_constant *constant = deref_array->array_index->as_constant();
assert(constant);
- if (constant->value.i[0] < (int)entry->size) {
+ if (constant->value.i[0] >= 0 && constant->value.i[0] < (int)entry->size) {
*deref = new(entry->mem_ctx)
ir_dereference_variable(entry->components[constant->value.i[0]]);
} else {
diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp
index 2b76dd17b..67b0d0c82 100644
--- a/mesalib/src/glsl/standalone_scaffolding.cpp
+++ b/mesalib/src/glsl/standalone_scaffolding.cpp
@@ -83,6 +83,33 @@ _mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type)
return shader;
}
+void
+_mesa_clear_shader_program_data(struct gl_shader_program *shProg)
+{
+ unsigned i;
+
+ shProg->NumUserUniformStorage = 0;
+ shProg->UniformStorage = NULL;
+ shProg->NumUniformRemapTable = 0;
+ shProg->UniformRemapTable = NULL;
+ shProg->UniformHash = NULL;
+
+ ralloc_free(shProg->InfoLog);
+ shProg->InfoLog = ralloc_strdup(shProg, "");
+
+ ralloc_free(shProg->UniformBlocks);
+ shProg->UniformBlocks = NULL;
+ shProg->NumUniformBlocks = 0;
+ for (i = 0; i < MESA_SHADER_STAGES; i++) {
+ ralloc_free(shProg->UniformBlockStageIndex[i]);
+ shProg->UniformBlockStageIndex[i] = NULL;
+ }
+
+ ralloc_free(shProg->AtomicBuffers);
+ shProg->AtomicBuffers = NULL;
+ shProg->NumAtomicBuffers = 0;
+}
+
void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
{
memset(ctx, 0, sizeof(*ctx));
diff --git a/mesalib/src/glsl/standalone_scaffolding.h b/mesalib/src/glsl/standalone_scaffolding.h
index df783afdb..895dd2782 100644
--- a/mesalib/src/glsl/standalone_scaffolding.h
+++ b/mesalib/src/glsl/standalone_scaffolding.h
@@ -45,6 +45,9 @@ extern "C" struct gl_shader *
_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
extern "C" void
+_mesa_clear_shader_program_data(struct gl_shader_program *);
+
+extern "C" void
_mesa_shader_debug(struct gl_context *ctx, GLenum type, GLuint *id,
const char *msg, int len);
diff --git a/mesalib/src/mapi/glapi/gen/ARB_clip_control.xml b/mesalib/src/mapi/glapi/gen/ARB_clip_control.xml
new file mode 100644
index 000000000..ab1a3883e
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_clip_control.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_ARB_clip_control" number="160">
+
+ <enum name="LOWER_LEFT" value = "0x8CA1"/>
+ <enum name="UPPER_LEFT" value = "0x8CA2"/>
+
+ <enum name="NEGATIVE_ONE_TO_ONE" value = "0x935E"/>
+ <enum name="ZERO_TO_ONE" value = "0x935F"/>
+
+ <enum name="CLIP_ORIGIN" value = "0x935C"/>
+ <enum name="CLIP_DEPTH_MODE" value = "0x935D"/>
+
+ <function name="ClipControl" offset="assign">
+ <param name="origin" type="GLenum"/>
+ <param name="depth" type="GLenum"/>
+ <!-- <glx rop="1340"/> -->
+ </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 2fbc59806..72e5095ee 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -113,6 +113,7 @@ API_XML = \
ARB_blend_func_extended.xml \
ARB_clear_buffer_object.xml \
ARB_clear_texture.xml \
+ ARB_clip_control.xml \
ARB_color_buffer_float.xml \
ARB_compressed_texture_pixel_storage.xml \
ARB_compute_shader.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 16a2a0893..43e5d3555 100755
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8364,7 +8364,9 @@
<xi:include href="ARB_multi_bind.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<!-- ARB extensions 148 - 160 -->
+<!-- ARB extensions 148 - 159 -->
+
+<xi:include href="ARB_clip_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<category name="GL_ARB_conditional_render_inverted" number="161">
<enum name="QUERY_WAIT_INVERTED" value="0x8E17"/>
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 28079de77..efac46eaa 100755
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -100,7 +100,7 @@ static void
__glapi_gentable_set_remaining_noop(struct _glapi_table *disp) {
GLuint entries = _glapi_get_dispatch_table_size();
void **dispatch = (void **) disp;
- int i;
+ unsigned i;
/* ISO C is annoying sometimes */
union {_glapi_proc p; void *v;} p;
@@ -147,7 +147,7 @@ class PrintCode(gl_XML.gl_print_base):
def __init__(self):
gl_XML.gl_print_base.__init__(self)
- self.name = "gl_gen_table.py (from Mesa)"
+ self.name = "gl_gentable.py (from Mesa)"
self.license = license.bsd_license_template % ( \
"""Copyright (C) 1999-2001 Brian Paul All Rights Reserved.
(C) Copyright IBM Corporation 2004, 2005
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index 7a8e627ba..87532c1df 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -680,6 +680,12 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_Ortho(0.0, ctx->DrawBuffer->Width,
0.0, ctx->DrawBuffer->Height,
-1.0, 1.0);
+
+ if (ctx->Extensions.ARB_clip_control) {
+ save->ClipOrigin = ctx->Transform.ClipOrigin;
+ save->ClipDepthMode = ctx->Transform.ClipDepthMode;
+ _mesa_ClipControl(GL_LOWER_LEFT, GL_NEGATIVE_ONE_TO_ONE);
+ }
}
if (state & MESA_META_CLIP) {
@@ -1081,6 +1087,9 @@ _mesa_meta_end(struct gl_context *ctx)
_mesa_LoadMatrixf(save->ProjectionMatrix);
_mesa_MatrixMode(save->MatrixMode);
+
+ if (ctx->Extensions.ARB_clip_control)
+ _mesa_ClipControl(save->ClipOrigin, save->ClipDepthMode);
}
if (state & MESA_META_CLIP) {
diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h
index 2c9517b14..6ecf3c005 100644
--- a/mesalib/src/mesa/drivers/common/meta.h
+++ b/mesalib/src/mesa/drivers/common/meta.h
@@ -136,6 +136,9 @@ struct save_state
GLfloat ModelviewMatrix[16];
GLfloat ProjectionMatrix[16];
GLfloat TextureMatrix[16];
+ /** GL_ARB_clip_control */
+ GLenum ClipOrigin; /**< GL_LOWER_LEFT or GL_UPPER_LEFT */
+ GLenum ClipDepthMode; /**< GL_NEGATIVE_ONE_TO_ONE or GL_ZERO_TO_ONE */
/** MESA_META_CLIP */
GLbitfield ClipPlanesEnabled;
diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c
index d90e6627f..5345339f6 100644
--- a/mesalib/src/mesa/main/attrib.c
+++ b/mesalib/src/mesa/main/attrib.c
@@ -1345,6 +1345,7 @@ _mesa_PopAttrib(void)
if (xform->DepthClamp != ctx->Transform.DepthClamp)
_mesa_set_enable(ctx, GL_DEPTH_CLAMP,
ctx->Transform.DepthClamp);
+ _mesa_ClipControl(xform->ClipOrigin, xform->ClipDepthMode);
}
break;
case GL_TEXTURE_BIT:
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index c88744afb..011e7be3f 100755
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -2710,7 +2710,7 @@ bind_buffer_range_uniform_buffer(struct gl_context *ctx,
if (offset & (ctx->Const.UniformBufferOffsetAlignment - 1)) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "glBindBufferRange(offset misalgned %d/%d)", (int) offset,
+ "glBindBufferRange(offset misaligned %d/%d)", (int) offset,
ctx->Const.UniformBufferOffsetAlignment);
return;
}
@@ -2797,7 +2797,7 @@ bind_atomic_buffer(struct gl_context *ctx,
if (offset & (ATOMIC_COUNTER_SIZE - 1)) {
_mesa_error(ctx, GL_INVALID_VALUE,
- "%s(offset misalgned %d/%d)", name, (int) offset,
+ "%s(offset misaligned %d/%d)", name, (int) offset,
ATOMIC_COUNTER_SIZE);
return;
}
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 5a8f7184a..25b9bfc4c 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -133,6 +133,7 @@
#include "program/prog_print.h"
#include "math/m_matrix.h"
#include "main/dispatch.h" /* for _gloffset_COUNT */
+#include "uniforms.h"
#ifdef USE_SPARC_ASM
#include "sparc/sparc.h"
@@ -1949,6 +1950,17 @@ _mesa_valid_to_render(struct gl_context *ctx, const char *where)
}
}
+ /* If a program is active and SSO not in use, check if validation of
+ * samplers succeeded for the active program. */
+ if (ctx->_Shader->ActiveProgram && ctx->_Shader != ctx->Pipeline.Current) {
+ char errMsg[100];
+ if (!_mesa_sampler_uniforms_are_valid(ctx->_Shader->ActiveProgram,
+ errMsg, 100)) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "%s", errMsg);
+ return GL_FALSE;
+ }
+ }
+
if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT,
"%s(incomplete framebuffer)", where);
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index c07e83ad9..2f40915d9 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -758,8 +758,7 @@ struct dd_function_table {
struct gl_shader *(*NewShader)(struct gl_context *ctx,
GLuint name, GLenum type);
void (*DeleteShader)(struct gl_context *ctx, struct gl_shader *shader);
- struct gl_shader_program *(*NewShaderProgram)(struct gl_context *ctx,
- GLuint name);
+ struct gl_shader_program *(*NewShaderProgram)(GLuint name);
void (*DeleteShaderProgram)(struct gl_context *ctx,
struct gl_shader_program *shProg);
void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg);
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 5c7160d05..4b7b0604b 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -398,6 +398,9 @@ typedef enum
OPCODE_PROGRAM_UNIFORM_MATRIX34F,
OPCODE_PROGRAM_UNIFORM_MATRIX43F,
+ /* GL_ARB_clip_control */
+ OPCODE_CLIP_CONTROL,
+
/* GL_ARB_color_buffer_float */
OPCODE_CLAMP_COLOR,
@@ -7208,6 +7211,22 @@ save_ProgramUniformMatrix4fv(GLuint program, GLint location, GLsizei count,
}
static void GLAPIENTRY
+save_ClipControl(GLenum origin, GLenum depth)
+{
+ GET_CURRENT_CONTEXT(ctx);
+ Node *n;
+ ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
+ n = alloc_instruction(ctx, OPCODE_CLIP_CONTROL, 2);
+ if (n) {
+ n[1].e = origin;
+ n[2].e = depth;
+ }
+ if (ctx->ExecuteFlag) {
+ CALL_ClipControl(ctx->Exec, (origin, depth));
+ }
+}
+
+static void GLAPIENTRY
save_ClampColorARB(GLenum target, GLenum clamp)
{
GET_CURRENT_CONTEXT(ctx);
@@ -8617,6 +8636,10 @@ execute_list(struct gl_context *ctx, GLuint list)
get_pointer(&n[5])));
break;
+ case OPCODE_CLIP_CONTROL:
+ CALL_ClipControl(ctx->Exec, (n[1].e, n[2].e));
+ break;
+
case OPCODE_CLAMP_COLOR:
CALL_ClampColor(ctx->Exec, (n[1].e, n[2].e));
break;
@@ -9551,6 +9574,9 @@ _mesa_initialize_save_table(const struct gl_context *ctx)
SET_TexParameterIiv(table, save_TexParameterIiv);
SET_TexParameterIuiv(table, save_TexParameterIuiv);
+ /* GL_ARB_clip_control */
+ SET_ClipControl(table, save_ClipControl);
+
/* GL_ARB_color_buffer_float */
SET_ClampColor(table, save_ClampColorARB);
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index f0e2f89e4..15d66a744 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -91,6 +91,7 @@ static const struct extension extension_table[] = {
{ "GL_ARB_buffer_storage", o(ARB_buffer_storage), GL, 2013 },
{ "GL_ARB_clear_buffer_object", o(dummy_true), GL, 2012 },
{ "GL_ARB_clear_texture", o(ARB_clear_texture), GL, 2013 },
+ { "GL_ARB_clip_control", o(ARB_clip_control), GL, 2014 },
{ "GL_ARB_color_buffer_float", o(ARB_color_buffer_float), GL, 2004 },
{ "GL_ARB_compressed_texture_pixel_storage", o(dummy_true), GL, 2011 },
{ "GL_ARB_compute_shader", o(ARB_compute_shader), GL, 2012 },
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index 9bb706cc5..5591d57df 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -665,7 +665,7 @@ static GLboolean args_match( const struct state_key *key, GLuint unit )
}
static ir_rvalue *
-smear(texenv_fragment_program *p, ir_rvalue *val)
+smear(ir_rvalue *val)
{
if (!val->type->is_scalar())
return val;
@@ -722,7 +722,7 @@ emit_combine(texenv_fragment_program *p,
tmp1 = mul(src[1], new(p->mem_ctx) ir_constant(2.0f));
tmp1 = add(tmp1, new(p->mem_ctx) ir_constant(-1.0f));
- return dot(swizzle_xyz(smear(p, tmp0)), swizzle_xyz(smear(p, tmp1)));
+ return dot(swizzle_xyz(smear(tmp0)), swizzle_xyz(smear(tmp1)));
}
case MODE_MODULATE_ADD_ATI:
return add(mul(src[0], src[2]), src[1]);
@@ -804,7 +804,7 @@ emit_texenv(texenv_fragment_program *p, GLuint unit)
key->unit[unit].NumArgsRGB,
key->unit[unit].ModeRGB,
key->unit[unit].OptRGB);
- val = smear(p, val);
+ val = smear(val);
if (rgb_saturate)
val = saturate(val);
@@ -816,7 +816,7 @@ emit_texenv(texenv_fragment_program *p, GLuint unit)
key->unit[unit].NumArgsRGB,
key->unit[unit].ModeRGB,
key->unit[unit].OptRGB);
- val = smear(p, val);
+ val = smear(val);
if (rgb_saturate)
val = saturate(val);
p->emit(assign(temp_var, val));
@@ -829,7 +829,7 @@ emit_texenv(texenv_fragment_program *p, GLuint unit)
key->unit[unit].NumArgsRGB,
key->unit[unit].ModeRGB,
key->unit[unit].OptRGB);
- val = swizzle_xyz(smear(p, val));
+ val = swizzle_xyz(smear(val));
if (rgb_saturate)
val = saturate(val);
p->emit(assign(temp_var, val, WRITEMASK_XYZ));
@@ -838,7 +838,7 @@ emit_texenv(texenv_fragment_program *p, GLuint unit)
key->unit[unit].NumArgsA,
key->unit[unit].ModeA,
key->unit[unit].OptA);
- val = swizzle_w(smear(p, val));
+ val = swizzle_w(smear(val));
if (alpha_saturate)
val = saturate(val);
p->emit(assign(temp_var, val, WRITEMASK_W));
@@ -1212,7 +1212,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
p.top_instructions = p.shader->ir;
p.instructions = p.shader->ir;
p.state = key;
- p.shader_program = ctx->Driver.NewShaderProgram(ctx, 0);
+ p.shader_program = ctx->Driver.NewShaderProgram(0);
/* Tell the linker to ignore the fact that we're building a
* separate shader, in case we're in a GLES2 context that would
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 0e2d8f687..6091efc7f 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -391,6 +391,7 @@ EXTRA_EXT(ARB_gpu_shader5);
EXTRA_EXT2(ARB_transform_feedback3, ARB_gpu_shader5);
EXTRA_EXT(INTEL_performance_query);
EXTRA_EXT(ARB_explicit_uniform_location);
+EXTRA_EXT(ARB_clip_control);
static const int
extra_ARB_color_buffer_float_or_glcore[] = {
diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py
index da3568469..aa9f282d8 100644
--- a/mesalib/src/mesa/main/get_hash_params.py
+++ b/mesalib/src/mesa/main/get_hash_params.py
@@ -414,6 +414,8 @@ descriptor=[
[ "AUX_BUFFERS", "BUFFER_INT(Visual.numAuxBuffers), NO_EXTRA" ],
[ "BLUE_BIAS", "CONTEXT_FLOAT(Pixel.BlueBias), NO_EXTRA" ],
[ "BLUE_SCALE", "CONTEXT_FLOAT(Pixel.BlueScale), NO_EXTRA" ],
+ [ "CLIP_DEPTH_MODE", "CONTEXT_ENUM(Transform.ClipDepthMode), extra_ARB_clip_control" ],
+ [ "CLIP_ORIGIN", "CONTEXT_ENUM(Transform.ClipOrigin), extra_ARB_clip_control" ],
[ "CLIENT_ATTRIB_STACK_DEPTH", "CONTEXT_INT(ClientAttribStackDepth), NO_EXTRA" ],
[ "COLOR_MATERIAL_FACE", "CONTEXT_ENUM(Light.ColorMaterialFace), NO_EXTRA" ],
[ "COLOR_MATERIAL_PARAMETER", "CONTEXT_ENUM(Light.ColorMaterialMode), NO_EXTRA" ],
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 9f44edac6..e1f1f1dde 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1430,6 +1430,9 @@ struct gl_transform_attrib
GLboolean RescaleNormals; /**< GL_EXT_rescale_normal */
GLboolean RasterPositionUnclipped; /**< GL_IBM_rasterpos_clip */
GLboolean DepthClamp; /**< GL_ARB_depth_clamp */
+ /** GL_ARB_clip_control */
+ GLenum ClipOrigin; /**< GL_LOWER_LEFT or GL_UPPER_LEFT */
+ GLenum ClipDepthMode; /**< GL_NEGATIVE_ONE_TO_ONE or GL_ZERO_TO_ONE */
};
@@ -2775,7 +2778,7 @@ struct gl_shader_program
* Transform feedback varyings last specified by
* glTransformFeedbackVaryings().
*
- * For the current set of transform feeedback varyings used for transform
+ * For the current set of transform feedback varyings used for transform
* feedback output, see LinkedTransformFeedback.
*/
struct {
@@ -2884,6 +2887,7 @@ struct gl_shader_program
GLboolean LinkStatus; /**< GL_LINK_STATUS */
GLboolean Validated;
GLboolean _Used; /**< Ever used for drawing? */
+ GLboolean SamplersValidated; /**< Samplers validated against texture units? */
GLchar *InfoLog;
unsigned Version; /**< GLSL version used for linking */
@@ -3697,6 +3701,7 @@ struct gl_extensions
GLboolean ARB_blend_func_extended;
GLboolean ARB_buffer_storage;
GLboolean ARB_clear_texture;
+ GLboolean ARB_clip_control;
GLboolean ARB_color_buffer_float;
GLboolean ARB_compute_shader;
GLboolean ARB_conditional_render_inverted;
diff --git a/mesalib/src/mesa/main/polygon.c b/mesalib/src/mesa/main/polygon.c
index 611cef653..76d601977 100644
--- a/mesalib/src/mesa/main/polygon.c
+++ b/mesalib/src/mesa/main/polygon.c
@@ -104,8 +104,6 @@ _mesa_FrontFace( GLenum mode )
FLUSH_VERTICES(ctx, _NEW_POLYGON);
ctx->Polygon.FrontFace = mode;
- ctx->Polygon._FrontBit = (GLboolean) (mode == GL_CW);
-
if (ctx->Driver.FrontFace)
ctx->Driver.FrontFace( ctx, mode );
}
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index 3e6f61067..2be9092c1 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -316,7 +316,7 @@ create_shader_program(struct gl_context *ctx)
name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
- shProg = ctx->Driver.NewShaderProgram(ctx, name);
+ shProg = ctx->Driver.NewShaderProgram(name);
_mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg);
diff --git a/mesalib/src/mesa/main/shaderapi.h b/mesalib/src/mesa/main/shaderapi.h
index 17b05b313..047d2562d 100644
--- a/mesalib/src/mesa/main/shaderapi.h
+++ b/mesalib/src/mesa/main/shaderapi.h
@@ -205,15 +205,6 @@ _mesa_use_shader_program(struct gl_context *ctx, GLenum type,
struct gl_shader_program *shProg,
struct gl_pipeline_object *shTarget);
-extern void GLAPIENTRY
-_mesa_UseShaderProgramEXT(GLenum type, GLuint program);
-
-extern void GLAPIENTRY
-_mesa_ActiveProgramEXT(GLuint program);
-
-extern GLuint GLAPIENTRY
-_mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string);
-
extern void
_mesa_copy_linked_program_data(gl_shader_stage type,
const struct gl_shader_program *src,
diff --git a/mesalib/src/mesa/main/shaderimage.c b/mesalib/src/mesa/main/shaderimage.c
index 9e62f4294..dcbcca623 100644
--- a/mesalib/src/mesa/main/shaderimage.c
+++ b/mesalib/src/mesa/main/shaderimage.c
@@ -384,7 +384,7 @@ validate_image_unit(struct gl_context *ctx, struct gl_image_unit *u)
void
_mesa_validate_image_units(struct gl_context *ctx)
{
- int i;
+ unsigned i;
for (i = 0; i < ctx->Const.MaxImageUnits; ++i) {
struct gl_image_unit *u = &ctx->ImageUnits[i];
diff --git a/mesalib/src/mesa/main/shaderobj.c b/mesalib/src/mesa/main/shaderobj.c
index 693e9a259..81bd7829d 100644
--- a/mesalib/src/mesa/main/shaderobj.c
+++ b/mesalib/src/mesa/main/shaderobj.c
@@ -235,8 +235,8 @@ _mesa_reference_shader_program(struct gl_context *ctx,
}
}
-void
-_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog)
+static void
+init_shader_program(struct gl_shader_program *prog)
{
prog->Type = GL_SHADER_PROGRAM_MESA;
prog->RefCount = 1;
@@ -261,13 +261,13 @@ _mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog
* Called via ctx->Driver.NewShaderProgram()
*/
static struct gl_shader_program *
-_mesa_new_shader_program(struct gl_context *ctx, GLuint name)
+_mesa_new_shader_program(GLuint name)
{
struct gl_shader_program *shProg;
shProg = rzalloc(NULL, struct gl_shader_program);
if (shProg) {
shProg->Name = name;
- _mesa_init_shader_program(ctx, shProg);
+ init_shader_program(shProg);
}
return shProg;
}
@@ -277,11 +277,11 @@ _mesa_new_shader_program(struct gl_context *ctx, GLuint name)
* Clear (free) the shader program state that gets produced by linking.
*/
void
-_mesa_clear_shader_program_data(struct gl_context *ctx,
- struct gl_shader_program *shProg)
+_mesa_clear_shader_program_data(struct gl_shader_program *shProg)
{
+ unsigned i;
+
if (shProg->UniformStorage) {
- unsigned i;
for (i = 0; i < shProg->NumUserUniformStorage; ++i)
_mesa_uniform_detach_all_driver_storage(&shProg->UniformStorage[i]);
ralloc_free(shProg->UniformStorage);
@@ -303,6 +303,18 @@ _mesa_clear_shader_program_data(struct gl_context *ctx,
assert(shProg->InfoLog != NULL);
ralloc_free(shProg->InfoLog);
shProg->InfoLog = ralloc_strdup(shProg, "");
+
+ ralloc_free(shProg->UniformBlocks);
+ shProg->UniformBlocks = NULL;
+ shProg->NumUniformBlocks = 0;
+ for (i = 0; i < MESA_SHADER_STAGES; i++) {
+ ralloc_free(shProg->UniformBlockStageIndex[i]);
+ shProg->UniformBlockStageIndex[i] = NULL;
+ }
+
+ ralloc_free(shProg->AtomicBuffers);
+ shProg->AtomicBuffers = NULL;
+ shProg->NumAtomicBuffers = 0;
}
@@ -319,7 +331,7 @@ _mesa_free_shader_program_data(struct gl_context *ctx,
assert(shProg->Type == GL_SHADER_PROGRAM_MESA);
- _mesa_clear_shader_program_data(ctx, shProg);
+ _mesa_clear_shader_program_data(shProg);
if (shProg->AttributeBindings) {
string_to_uint_map_dtor(shProg->AttributeBindings);
diff --git a/mesalib/src/mesa/main/shaderobj.h b/mesalib/src/mesa/main/shaderobj.h
index d72919c1f..05ddfeb50 100644
--- a/mesalib/src/mesa/main/shaderobj.h
+++ b/mesalib/src/mesa/main/shaderobj.h
@@ -71,9 +71,6 @@ _mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);
extern struct gl_shader *
_mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
-extern void
-_mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog);
-
extern struct gl_shader_program *
_mesa_lookup_shader_program(struct gl_context *ctx, GLuint name);
@@ -82,8 +79,7 @@ _mesa_lookup_shader_program_err(struct gl_context *ctx, GLuint name,
const char *caller);
extern void
-_mesa_clear_shader_program_data(struct gl_context *ctx,
- struct gl_shader_program *shProg);
+_mesa_clear_shader_program_data(struct gl_shader_program *shProg);
extern void
_mesa_free_shader_program_data(struct gl_context *ctx,
diff --git a/mesalib/src/mesa/main/state.c b/mesalib/src/mesa/main/state.c
index 80287c470..45bce78fd 100644
--- a/mesalib/src/mesa/main/state.c
+++ b/mesalib/src/mesa/main/state.c
@@ -51,6 +51,7 @@
#include "texobj.h"
#include "texstate.h"
#include "varray.h"
+#include "viewport.h"
#include "blend.h"
@@ -281,16 +282,29 @@ update_viewport_matrix(struct gl_context *ctx)
* NOTE: RasterPos uses this.
*/
for (i = 0; i < ctx->Const.MaxViewports; i++) {
+ double scale[3], translate[3];
+
+ _mesa_get_viewport_xform(ctx, i, scale, translate);
_math_matrix_viewport(&ctx->ViewportArray[i]._WindowMap,
- ctx->ViewportArray[i].X, ctx->ViewportArray[i].Y,
- ctx->ViewportArray[i].Width, ctx->ViewportArray[i].Height,
- ctx->ViewportArray[i].Near, ctx->ViewportArray[i].Far,
- depthMax);
+ scale, translate, depthMax);
}
}
/**
+ * Update the ctx->Polygon._FrontBit flag.
+ */
+static void
+update_frontbit(struct gl_context *ctx)
+{
+ if (ctx->Transform.ClipOrigin == GL_LOWER_LEFT)
+ ctx->Polygon._FrontBit = (ctx->Polygon.FrontFace == GL_CW);
+ else
+ ctx->Polygon._FrontBit = (ctx->Polygon.FrontFace == GL_CCW);
+}
+
+
+/**
* Update derived multisample state.
*/
static void
@@ -372,6 +386,9 @@ _mesa_update_state_locked( struct gl_context *ctx )
if (new_state & (_NEW_PROGRAM|_NEW_TEXTURE|_NEW_TEXTURE_MATRIX))
_mesa_update_texture( ctx, new_state );
+ if (new_state & _NEW_POLYGON)
+ update_frontbit( ctx );
+
if (new_state & _NEW_BUFFERS)
_mesa_update_framebuffer(ctx);
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 1592c9bfd..fcb14c4e2 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -533,8 +533,7 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
dst += array_index * store->element_stride;
switch (store->format) {
- case uniform_native:
- case uniform_bool_int_0_1: {
+ case uniform_native: {
unsigned j;
unsigned v;
@@ -550,8 +549,7 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
break;
}
- case uniform_int_float:
- case uniform_bool_float: {
+ case uniform_int_float: {
const int *isrc = (const int *) src;
unsigned j;
unsigned v;
@@ -572,27 +570,6 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni,
break;
}
- case uniform_bool_int_0_not0: {
- const int *isrc = (const int *) src;
- unsigned j;
- unsigned v;
- unsigned c;
-
- for (j = 0; j < count; j++) {
- for (v = 0; v < vectors; v++) {
- for (c = 0; c < components; c++) {
- ((int *) dst)[c] = *isrc == 0 ? 0 : ~0;
- isrc++;
- }
-
- dst += store->vector_stride;
- }
-
- dst += extra_stride;
- }
- break;
- }
-
default:
assert(!"Should not get here.");
break;
@@ -996,8 +973,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg,
* array offset in *offset, or GL_INVALID_INDEX (-1).
*/
extern "C" unsigned
-_mesa_get_uniform_location(struct gl_context *ctx,
- struct gl_shader_program *shProg,
+_mesa_get_uniform_location(struct gl_shader_program *shProg,
const GLchar *name,
unsigned *out_offset)
{
@@ -1064,42 +1040,16 @@ extern "C" bool
_mesa_sampler_uniforms_are_valid(const struct gl_shader_program *shProg,
char *errMsg, size_t errMsgLength)
{
- const glsl_type *unit_types[MAX_COMBINED_TEXTURE_IMAGE_UNITS];
-
- memset(unit_types, 0, sizeof(unit_types));
-
- for (unsigned i = 0; i < shProg->NumUserUniformStorage; i++) {
- const struct gl_uniform_storage *const storage =
- &shProg->UniformStorage[i];
- const glsl_type *const t = (storage->type->is_array())
- ? storage->type->fields.array : storage->type;
-
- if (!t->is_sampler())
- continue;
-
- const unsigned count = MAX2(1, storage->type->array_size());
- for (unsigned j = 0; j < count; j++) {
- const unsigned unit = storage->storage[j].i;
-
- /* The types of the samplers associated with a particular texture
- * unit must be an exact match. Page 74 (page 89 of the PDF) of the
- * OpenGL 3.3 core spec says:
- *
- * "It is not allowed to have variables of different sampler
- * types pointing to the same texture image unit within a program
- * object."
- */
- if (unit_types[unit] == NULL) {
- unit_types[unit] = t;
- } else if (unit_types[unit] != t) {
- _mesa_snprintf(errMsg, errMsgLength,
- "Texture unit %d is accessed both as %s and %s",
- unit, unit_types[unit]->name, t->name);
- return false;
- }
- }
+ /* Shader does not have samplers. */
+ if (shProg->NumUserUniformStorage == 0)
+ return true;
+
+ if (!shProg->SamplersValidated) {
+ _mesa_snprintf(errMsg, errMsgLength,
+ "active samplers with a different type "
+ "refer to the same texture image unit");
+ return false;
}
-
return true;
}
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index 0d0cbf57e..c30710772 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -75,12 +75,26 @@ _mesa_update_shader_textures_used(struct gl_shader_program *shProg,
memcpy(prog->SamplerUnits, shader->SamplerUnits, sizeof(prog->SamplerUnits));
memset(prog->TexturesUsed, 0, sizeof(prog->TexturesUsed));
+ shProg->SamplersValidated = GL_TRUE;
+
for (s = 0; s < MAX_SAMPLERS; s++) {
if (prog->SamplersUsed & (1 << s)) {
GLuint unit = shader->SamplerUnits[s];
GLuint tgt = shader->SamplerTargets[s];
assert(unit < Elements(prog->TexturesUsed));
assert(tgt < NUM_TEXTURE_TARGETS);
+
+ /* The types of the samplers associated with a particular texture
+ * unit must be an exact match. Page 74 (page 89 of the PDF) of the
+ * OpenGL 3.3 core spec says:
+ *
+ * "It is not allowed to have variables of different sampler
+ * types pointing to the same texture image unit within a program
+ * object."
+ */
+ if (prog->TexturesUsed[unit] & ~(1 << tgt))
+ shProg->SamplersValidated = GL_FALSE;
+
prog->TexturesUsed[unit] |= (1 << tgt);
}
}
@@ -917,7 +931,7 @@ _mesa_GetUniformLocation(GLuint programObj, const GLcharARB *name)
return -1;
}
- index = _mesa_get_uniform_location(ctx, shProg, name, &offset);
+ index = _mesa_get_uniform_location(shProg, name, &offset);
if (index == GL_INVALID_INDEX)
return -1;
@@ -990,7 +1004,7 @@ _mesa_GetUniformIndices(GLuint program,
for (i = 0; i < uniformCount; i++) {
unsigned offset;
- uniformIndices[i] = _mesa_get_uniform_location(ctx, shProg,
+ uniformIndices[i] = _mesa_get_uniform_location(shProg,
uniformNames[i], &offset);
}
}
@@ -1096,7 +1110,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program,
for (i = 0; i < block->NumUniforms; i++) {
unsigned offset;
const int idx =
- _mesa_get_uniform_location(ctx, shProg,
+ _mesa_get_uniform_location(shProg,
block->Uniforms[i].IndexName,
&offset);
if (idx != -1)
@@ -1113,7 +1127,7 @@ _mesa_GetActiveUniformBlockiv(GLuint program,
for (i = 0; i < block->NumUniforms; i++) {
unsigned offset;
const int idx =
- _mesa_get_uniform_location(ctx, shProg,
+ _mesa_get_uniform_location(shProg,
block->Uniforms[i].IndexName,
&offset);
diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h
index e7a370e84..6575a52f4 100644
--- a/mesalib/src/mesa/main/uniforms.h
+++ b/mesalib/src/mesa/main/uniforms.h
@@ -259,7 +259,7 @@ _mesa_parse_program_resource_name(const GLchar *name,
const GLchar **out_base_name_end);
unsigned
-_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,
+_mesa_get_uniform_location(struct gl_shader_program *shProg,
const GLchar *name, unsigned *offset);
void
diff --git a/mesalib/src/mesa/main/version.c b/mesalib/src/mesa/main/version.c
index e3a63811a..a813c88ad 100644
--- a/mesalib/src/mesa/main/version.c
+++ b/mesalib/src/mesa/main/version.c
@@ -381,7 +381,6 @@ compute_version_es2(const struct gl_extensions *extensions)
extensions->ARB_shader_texture_lod &&
extensions->ARB_texture_float &&
extensions->ARB_texture_rg &&
- extensions->ARB_texture_compression_rgtc &&
extensions->EXT_draw_buffers2 &&
/* extensions->ARB_framebuffer_object && */
extensions->EXT_framebuffer_sRGB &&
@@ -389,7 +388,6 @@ compute_version_es2(const struct gl_extensions *extensions)
extensions->EXT_texture_array &&
extensions->EXT_texture_shared_exponent &&
extensions->EXT_transform_feedback &&
- extensions->NV_conditional_render &&
extensions->ARB_draw_instanced &&
extensions->ARB_uniform_buffer_object &&
extensions->EXT_texture_snorm &&
diff --git a/mesalib/src/mesa/main/viewport.c b/mesalib/src/mesa/main/viewport.c
index 222ae307b..d6a9e290a 100644
--- a/mesalib/src/mesa/main/viewport.c
+++ b/mesalib/src/mesa/main/viewport.c
@@ -30,6 +30,7 @@
#include "context.h"
+#include "enums.h"
#include "macros.h"
#include "mtypes.h"
#include "viewport.h"
@@ -39,6 +40,8 @@ set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
GLfloat x, GLfloat y,
GLfloat width, GLfloat height)
{
+ double scale[3], translate[3];
+
/* clamp width and height to the implementation dependent range */
width = MIN2(width, (GLfloat) ctx->Const.MaxViewportWidth);
height = MIN2(height, (GLfloat) ctx->Const.MaxViewportHeight);
@@ -75,14 +78,9 @@ set_viewport_no_notify(struct gl_context *ctx, unsigned idx,
* the WindowMap matrix being up to date in the driver's Viewport
* and DepthRange functions.
*/
+ _mesa_get_viewport_xform(ctx, idx, scale, translate);
_math_matrix_viewport(&ctx->ViewportArray[idx]._WindowMap,
- ctx->ViewportArray[idx].X,
- ctx->ViewportArray[idx].Y,
- ctx->ViewportArray[idx].Width,
- ctx->ViewportArray[idx].Height,
- ctx->ViewportArray[idx].Near,
- ctx->ViewportArray[idx].Far,
- ctx->DrawBuffer->_DepthMaxF);
+ scale, translate, ctx->DrawBuffer->_DepthMaxF);
#endif
}
@@ -248,6 +246,8 @@ static void
set_depth_range_no_notify(struct gl_context *ctx, unsigned idx,
GLclampd nearval, GLclampd farval)
{
+ double scale[3], translate[3];
+
if (ctx->ViewportArray[idx].Near == nearval &&
ctx->ViewportArray[idx].Far == farval)
return;
@@ -261,14 +261,9 @@ set_depth_range_no_notify(struct gl_context *ctx, unsigned idx,
* the WindowMap matrix being up to date in the driver's Viewport
* and DepthRange functions.
*/
+ _mesa_get_viewport_xform(ctx, idx, scale, translate);
_math_matrix_viewport(&ctx->ViewportArray[idx]._WindowMap,
- ctx->ViewportArray[idx].X,
- ctx->ViewportArray[idx].Y,
- ctx->ViewportArray[idx].Width,
- ctx->ViewportArray[idx].Height,
- ctx->ViewportArray[idx].Near,
- ctx->ViewportArray[idx].Far,
- ctx->DrawBuffer->_DepthMaxF);
+ scale, translate, ctx->DrawBuffer->_DepthMaxF);
#endif
}
@@ -396,10 +391,15 @@ void _mesa_init_viewport(struct gl_context *ctx)
GLfloat depthMax = 65535.0F; /* sorf of arbitrary */
unsigned i;
+ ctx->Transform.ClipOrigin = GL_LOWER_LEFT;
+ ctx->Transform.ClipDepthMode = GL_NEGATIVE_ONE_TO_ONE;
+
/* Note: ctx->Const.MaxViewports may not have been set by the driver yet,
* so just initialize all of them.
*/
for (i = 0; i < MAX_VIEWPORTS; i++) {
+ double scale[3], translate[3];
+
/* Viewport group */
ctx->ViewportArray[i].X = 0;
ctx->ViewportArray[i].Y = 0;
@@ -409,8 +409,9 @@ void _mesa_init_viewport(struct gl_context *ctx)
ctx->ViewportArray[i].Far = 1.0;
_math_matrix_ctr(&ctx->ViewportArray[i]._WindowMap);
- _math_matrix_viewport(&ctx->ViewportArray[i]._WindowMap, 0, 0, 0, 0,
- 0.0F, 1.0F, depthMax);
+ _mesa_get_viewport_xform(ctx, i, scale, translate);
+ _math_matrix_viewport(&ctx->ViewportArray[i]._WindowMap,
+ scale, translate, depthMax);
}
}
@@ -427,3 +428,92 @@ void _mesa_free_viewport_data(struct gl_context *ctx)
_math_matrix_dtr(&ctx->ViewportArray[i]._WindowMap);
}
+extern void GLAPIENTRY
+_mesa_ClipControl(GLenum origin, GLenum depth)
+{
+ GET_CURRENT_CONTEXT(ctx);
+
+ if (MESA_VERBOSE&VERBOSE_API)
+ _mesa_debug(ctx, "glClipControl(%s, %s)\n",
+ _mesa_lookup_enum_by_nr(origin),
+ _mesa_lookup_enum_by_nr(depth));
+
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+ if (!ctx->Extensions.ARB_clip_control) {
+ _mesa_error(ctx, GL_INVALID_OPERATION, "glClipControl");
+ return;
+ }
+
+ if (origin != GL_LOWER_LEFT && origin != GL_UPPER_LEFT) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glClipControl");
+ return;
+ }
+
+ if (depth != GL_NEGATIVE_ONE_TO_ONE && depth != GL_ZERO_TO_ONE) {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glClipControl");
+ return;
+ }
+
+ if (ctx->Transform.ClipOrigin == origin &&
+ ctx->Transform.ClipDepthMode == depth)
+ return;
+
+ FLUSH_VERTICES(ctx, 0);
+
+ if (ctx->Transform.ClipOrigin != origin) {
+ ctx->Transform.ClipOrigin = origin;
+
+ /* Affects the winding order of the front face. */
+ ctx->NewState |= _NEW_POLYGON;
+ /* Affects the y component of the viewport transform. */
+ ctx->NewState |= _NEW_VIEWPORT;
+
+ if (ctx->Driver.FrontFace)
+ ctx->Driver.FrontFace(ctx, ctx->Polygon.FrontFace);
+ }
+
+ if (ctx->Transform.ClipDepthMode != depth) {
+ ctx->Transform.ClipDepthMode = depth;
+
+ /* Affects the z part of the viewpoint transform. */
+ ctx->NewState |= _NEW_VIEWPORT;
+
+ if (ctx->Driver.DepthRange)
+ ctx->Driver.DepthRange(ctx);
+ }
+}
+
+/**
+ * Computes the scaling and the translation part of the
+ * viewport transform matrix of the \param i-th viewport
+ * and writes that into \param scale and \param translate.
+ */
+void
+_mesa_get_viewport_xform(struct gl_context *ctx, unsigned i,
+ double scale[3], double translate[3])
+{
+ double x = ctx->ViewportArray[i].X;
+ double y = ctx->ViewportArray[i].Y;
+ double half_width = 0.5*ctx->ViewportArray[i].Width;
+ double half_height = 0.5*ctx->ViewportArray[i].Height;
+ double n = ctx->ViewportArray[i].Near;
+ double f = ctx->ViewportArray[i].Far;
+
+ scale[0] = half_width;
+ translate[0] = half_width + x;
+ if (ctx->Transform.ClipOrigin == GL_UPPER_LEFT) {
+ scale[1] = -half_height;
+ translate[1] = half_height - y;
+ } else {
+ scale[1] = half_height;
+ translate[1] = half_height + y;
+ }
+ if (ctx->Transform.ClipDepthMode == GL_NEGATIVE_ONE_TO_ONE) {
+ scale[2] = 0.5*(f - n);
+ translate[2] = 0.5*(n + f);
+ } else {
+ scale[2] = f - n;
+ translate[2] = n;
+ }
+}
diff --git a/mesalib/src/mesa/main/viewport.h b/mesalib/src/mesa/main/viewport.h
index f2311c02b..426e194bd 100644
--- a/mesalib/src/mesa/main/viewport.h
+++ b/mesalib/src/mesa/main/viewport.h
@@ -71,5 +71,11 @@ _mesa_init_viewport(struct gl_context *ctx);
extern void
_mesa_free_viewport_data(struct gl_context *ctx);
+extern void GLAPIENTRY
+_mesa_ClipControl(GLenum origin, GLenum depth);
+
+extern void
+_mesa_get_viewport_xform(struct gl_context *ctx, unsigned i,
+ double scale[3], double translate[3]);
#endif
diff --git a/mesalib/src/mesa/math/m_matrix.c b/mesalib/src/mesa/math/m_matrix.c
index e512e456f..9c9310d93 100644
--- a/mesalib/src/mesa/math/m_matrix.c
+++ b/mesalib/src/mesa/math/m_matrix.c
@@ -1110,16 +1110,15 @@ _math_matrix_translate( GLmatrix *mat, GLfloat x, GLfloat y, GLfloat z )
* Transforms Normalized Device Coords to window/Z values.
*/
void
-_math_matrix_viewport(GLmatrix *m, GLfloat x, GLfloat y,
- GLfloat width, GLfloat height,
- GLdouble zNear, GLdouble zFar, GLdouble depthMax)
+_math_matrix_viewport(GLmatrix *m, const double scale[3],
+ const double translate[3], double depthMax)
{
- m->m[MAT_SX] = width / 2.0F;
- m->m[MAT_TX] = m->m[MAT_SX] + x;
- m->m[MAT_SY] = height / 2.0F;
- m->m[MAT_TY] = m->m[MAT_SY] + y;
- m->m[MAT_SZ] = (GLfloat) (depthMax * ((zFar - zNear) / 2.0));
- m->m[MAT_TZ] = (GLfloat) (depthMax * ((zFar - zNear) / 2.0 + zNear));
+ m->m[MAT_SX] = scale[0];
+ m->m[MAT_TX] = translate[0];
+ m->m[MAT_SY] = scale[1];
+ m->m[MAT_TY] = translate[1];
+ m->m[MAT_SZ] = depthMax*scale[2];
+ m->m[MAT_TZ] = depthMax*translate[2];
m->flags = MAT_FLAG_GENERAL_SCALE | MAT_FLAG_TRANSLATION;
m->type = MATRIX_3D_NO_ROT;
}
diff --git a/mesalib/src/mesa/math/m_matrix.h b/mesalib/src/mesa/math/m_matrix.h
index dddce7019..778d716dc 100644
--- a/mesalib/src/mesa/math/m_matrix.h
+++ b/mesalib/src/mesa/math/m_matrix.h
@@ -122,8 +122,8 @@ _math_matrix_frustum( GLmatrix *mat,
GLfloat nearval, GLfloat farval );
extern void
-_math_matrix_viewport(GLmatrix *m, GLfloat x, GLfloat y, GLfloat width, GLfloat height,
- GLdouble zNear, GLdouble zFar, GLdouble depthMax);
+_math_matrix_viewport( GLmatrix *m, const double scale[3],
+ const double translate[3], double depthMax );
extern void
_math_matrix_set_identity( GLmatrix *dest );
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index b3e04d7b6..5cd905822 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -3020,7 +3020,7 @@ _mesa_glsl_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
{
unsigned int i;
- _mesa_clear_shader_program_data(ctx, prog);
+ _mesa_clear_shader_program_data(prog);
prog->LinkStatus = GL_TRUE;
diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
index a2285383e..50209788b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c
@@ -33,6 +33,7 @@
#include "main/macros.h"
#include "st_context.h"
#include "st_atom.h"
+#include "st_debug.h"
#include "st_program.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
@@ -71,6 +72,11 @@ static void update_raster_state( struct st_context *st )
{
raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);
+ /* _NEW_VIEWPORT */
+ if (ctx->Transform.ClipOrigin == GL_UPPER_LEFT) {
+ raster->front_ccw ^= 1;
+ }
+
/*
* Gallium's surfaces are Y=0=TOP orientation. OpenGL is the
* opposite. Window system surfaces are Y=0=TOP. Mesa's FBOs
@@ -119,8 +125,14 @@ static void update_raster_state( struct st_context *st )
/* _NEW_POLYGON
*/
{
- raster->fill_front = translate_fill( ctx->Polygon.FrontMode );
- raster->fill_back = translate_fill( ctx->Polygon.BackMode );
+ if (ST_DEBUG & DEBUG_WIREFRAME) {
+ raster->fill_front = PIPE_POLYGON_MODE_LINE;
+ raster->fill_back = PIPE_POLYGON_MODE_LINE;
+ }
+ else {
+ raster->fill_front = translate_fill( ctx->Polygon.FrontMode );
+ raster->fill_back = translate_fill( ctx->Polygon.BackMode );
+ }
/* Simplify when culling is active:
*/
@@ -234,6 +246,12 @@ static void update_raster_state( struct st_context *st )
raster->half_pixel_center = 1;
if (st_fb_orientation(ctx->DrawBuffer) == Y_0_TOP)
raster->bottom_edge_rule = 1;
+ /* _NEW_VIEWPORT */
+ if (ctx->Transform.ClipOrigin == GL_UPPER_LEFT)
+ raster->bottom_edge_rule ^= 1;
+
+ /* _NEW_VIEWPORT */
+ raster->clip_halfz = (ctx->Transform.ClipDepthMode == GL_ZERO_TO_ONE);
/* ST_NEW_RASTERIZER */
raster->rasterizer_discard = ctx->RasterDiscard;
@@ -265,7 +283,8 @@ const struct st_tracked_state st_update_rasterizer = {
_NEW_PROGRAM |
_NEW_SCISSOR |
_NEW_FRAG_CLAMP |
- _NEW_TRANSFORM), /* mesa state dependencies*/
+ _NEW_TRANSFORM |
+ _NEW_VIEWPORT), /* mesa state dependencies*/
(ST_NEW_VERTEX_PROGRAM |
ST_NEW_RASTERIZER), /* state tracker dependencies */
},
diff --git a/mesalib/src/mesa/state_tracker/st_atom_viewport.c b/mesalib/src/mesa/state_tracker/st_atom_viewport.c
index 7584f9b3d..5b992084b 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_viewport.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_viewport.c
@@ -27,6 +27,7 @@
#include "main/context.h"
+#include "main/viewport.h"
#include "st_context.h"
#include "st_atom.h"
#include "pipe/p_context.h"
@@ -63,21 +64,17 @@ update_viewport( struct st_context *st )
*/
for (i = 0; i < ctx->Const.MaxViewports; i++)
{
- GLfloat x = ctx->ViewportArray[i].X;
- GLfloat y = ctx->ViewportArray[i].Y;
- GLfloat z = ctx->ViewportArray[i].Near;
- GLfloat half_width = ctx->ViewportArray[i].Width * 0.5f;
- GLfloat half_height = ctx->ViewportArray[i].Height * 0.5f;
- GLfloat half_depth = (GLfloat)(ctx->ViewportArray[i].Far - ctx->ViewportArray[i].Near) * 0.5f;
-
- st->state.viewport[i].scale[0] = half_width;
- st->state.viewport[i].scale[1] = half_height * yScale;
- st->state.viewport[i].scale[2] = half_depth;
+ double scale[3], translate[3];
+ _mesa_get_viewport_xform(ctx, i, scale, translate);
+
+ st->state.viewport[i].scale[0] = scale[0];
+ st->state.viewport[i].scale[1] = scale[1] * yScale;
+ st->state.viewport[i].scale[2] = scale[2];
st->state.viewport[i].scale[3] = 1.0;
- st->state.viewport[i].translate[0] = half_width + x;
- st->state.viewport[i].translate[1] = (half_height + y) * yScale + yBias;
- st->state.viewport[i].translate[2] = half_depth + z;
+ st->state.viewport[i].translate[0] = translate[0];
+ st->state.viewport[i].translate[1] = translate[1] * yScale + yBias;
+ st->state.viewport[i].translate[2] = translate[2];
st->state.viewport[i].translate[3] = 0.0;
}
diff --git a/mesalib/src/mesa/state_tracker/st_cb_program.c b/mesalib/src/mesa/state_tracker/st_cb_program.c
index 82e1fd14a..faff9c4bd 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_program.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_program.c
@@ -242,7 +242,5 @@ st_init_program_functions(struct dd_function_table *functions)
functions->IsProgramNative = st_is_program_native;
functions->ProgramStringNotify = st_program_string_notify;
- functions->NewShader = st_new_shader;
- functions->NewShaderProgram = st_new_shader_program;
functions->LinkShader = st_link_shader;
}
diff --git a/mesalib/src/mesa/state_tracker/st_debug.c b/mesalib/src/mesa/state_tracker/st_debug.c
index 8c15e18d3..de3e3a9cd 100644
--- a/mesalib/src/mesa/state_tracker/st_debug.c
+++ b/mesalib/src/mesa/state_tracker/st_debug.c
@@ -55,6 +55,7 @@ static const struct debug_named_value st_debug_flags[] = {
{ "query", DEBUG_QUERY, NULL },
{ "draw", DEBUG_DRAW, NULL },
{ "buffer", DEBUG_BUFFER, NULL },
+ { "wf", DEBUG_WIREFRAME, NULL },
DEBUG_NAMED_VALUE_END
};
diff --git a/mesalib/src/mesa/state_tracker/st_debug.h b/mesalib/src/mesa/state_tracker/st_debug.h
index c1c482524..49b916fb3 100644
--- a/mesalib/src/mesa/state_tracker/st_debug.h
+++ b/mesalib/src/mesa/state_tracker/st_debug.h
@@ -46,6 +46,7 @@ st_print_current(void);
#define DEBUG_SCREEN 0x80
#define DEBUG_DRAW 0x100
#define DEBUG_BUFFER 0x200
+#define DEBUG_WIREFRAME 0x400
#ifdef DEBUG
extern int ST_DEBUG;
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 5dd827800..aff3ddebe 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -192,6 +192,10 @@ void st_init_limits(struct pipe_screen *screen,
pc->MaxParameters = pc->MaxNativeParameters =
screen->get_shader_param(screen, sh,
PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE) / sizeof(float[4]);
+ pc->MaxInputComponents =
+ screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INPUTS) * 4;
+ pc->MaxOutputComponents =
+ screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_OUTPUTS) * 4;
pc->MaxUniformComponents = 4 * MIN2(pc->MaxNativeParameters, MAX_UNIFORMS);
@@ -261,10 +265,6 @@ void st_init_limits(struct pipe_screen *screen,
c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT,
PIPE_SHADER_CAP_MAX_INPUTS);
c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
- c->Program[MESA_SHADER_FRAGMENT].MaxInputComponents = c->MaxVarying * 4;
- c->Program[MESA_SHADER_VERTEX].MaxOutputComponents = c->MaxVarying * 4;
- c->Program[MESA_SHADER_GEOMETRY].MaxInputComponents = c->MaxVarying * 4;
- c->Program[MESA_SHADER_GEOMETRY].MaxOutputComponents = c->MaxVarying * 4;
c->MaxGeometryOutputVertices = screen->get_param(screen, PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES);
c->MaxGeometryTotalOutputComponents = screen->get_param(screen, PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS);
@@ -463,6 +463,7 @@ void st_init_extensions(struct pipe_screen *screen,
{ o(ARB_derivative_control), PIPE_CAP_TGSI_FS_FINE_DERIVATIVE },
{ o(ARB_conditional_render_inverted), PIPE_CAP_CONDITIONAL_RENDER_INVERTED },
{ o(ARB_texture_view), PIPE_CAP_SAMPLER_VIEW_TARGET },
+ { o(ARB_clip_control), PIPE_CAP_CLIP_HALFZ },
};
/* Required: render target and sampler support */
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index a0da9f635..a4e2c8da5 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -4781,15 +4781,19 @@ emit_wpos(struct st_context *st,
* saturating the value to [0,1] does the job.
*/
static void
-emit_face_var(struct st_translate *t)
+emit_face_var(struct gl_context *ctx, struct st_translate *t)
{
struct ureg_program *ureg = t->ureg;
struct ureg_dst face_temp = ureg_DECL_temporary(ureg);
struct ureg_src face_input = t->inputs[t->inputMapping[VARYING_SLOT_FACE]];
- /* MOV_SAT face_temp, input[face] */
- face_temp = ureg_saturate(face_temp);
- ureg_MOV(ureg, face_temp, face_input);
+ if (ctx->Const.NativeIntegers) {
+ ureg_FSGE(ureg, face_temp, face_input, ureg_imm1f(ureg, 0));
+ }
+ else {
+ /* MOV_SAT face_temp, input[face] */
+ ureg_MOV(ureg, ureg_saturate(face_temp), face_input);
+ }
/* Use face_temp as face input from here on: */
t->inputs[t->inputMapping[VARYING_SLOT_FACE]] = ureg_src(face_temp);
@@ -4909,7 +4913,7 @@ st_translate_program(
}
if (proginfo->InputsRead & VARYING_BIT_FACE)
- emit_face_var(t);
+ emit_face_var(ctx, t);
/*
* Declare output attributes.
@@ -5210,6 +5214,7 @@ get_mesa_program(struct gl_context *ctx,
v->have_sqrt = pscreen->get_shader_param(pscreen, ptarget,
PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED);
+ _mesa_copy_linked_program_data(shader->Stage, shader_program, prog);
_mesa_generate_parameters_list_for_uniforms(shader_program, shader,
prog->Parameters);
@@ -5315,10 +5320,6 @@ get_mesa_program(struct gl_context *ctx,
case GL_GEOMETRY_SHADER:
stgp = (struct st_geometry_program *)prog;
stgp->glsl_to_tgsi = v;
- stgp->Base.InputType = shader_program->Geom.InputType;
- stgp->Base.OutputType = shader_program->Geom.OutputType;
- stgp->Base.VerticesOut = shader_program->Geom.VerticesOut;
- stgp->Base.Invocations = shader_program->Geom.Invocations;
break;
default:
assert(!"should not be reached");
@@ -5330,34 +5331,6 @@ get_mesa_program(struct gl_context *ctx,
extern "C" {
-struct gl_shader *
-st_new_shader(struct gl_context *ctx, GLuint name, GLuint type)
-{
- struct gl_shader *shader;
- assert(type == GL_FRAGMENT_SHADER || type == GL_VERTEX_SHADER ||
- type == GL_GEOMETRY_SHADER_ARB);
- shader = rzalloc(NULL, struct gl_shader);
- if (shader) {
- shader->Type = type;
- shader->Stage = _mesa_shader_enum_to_shader_stage(type);
- shader->Name = name;
- _mesa_init_shader(ctx, shader);
- }
- return shader;
-}
-
-struct gl_shader_program *
-st_new_shader_program(struct gl_context *ctx, GLuint name)
-{
- struct gl_shader_program *shProg;
- shProg = rzalloc(NULL, struct gl_shader_program);
- if (shProg) {
- shProg->Name = name;
- _mesa_init_shader_program(ctx, shProg);
- }
- return shProg;
-}
-
/**
* Link a shader.
* Called via ctx->Driver.LinkShader()
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h
index 18f666f5b..5ed640747 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h
@@ -61,11 +61,6 @@ void get_bitmap_visitor(struct st_fragment_program *fp,
struct glsl_to_tgsi_visitor *original,
int samplerIndex);
-struct gl_shader *st_new_shader(struct gl_context *ctx, GLuint name, GLuint type);
-
-struct gl_shader_program *
-st_new_shader_program(struct gl_context *ctx, GLuint name);
-
GLboolean st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog);
void
diff --git a/mesalib/src/util/macros.h b/mesalib/src/util/macros.h
index 40ebf02da..ff37a7d63 100644
--- a/mesalib/src/util/macros.h
+++ b/mesalib/src/util/macros.h
@@ -75,6 +75,20 @@ do { \
#define unreachable(str)
#endif
+/**
+ * Assume macro. Useful for expressing our assumptions to the compiler,
+ * typically for purposes of silencing warnings.
+ */
+#ifdef HAVE___BUILTIN_UNREACHABLE
+#define assume(expr) ((expr) ? ((void) 0) \
+ : (assert(!"assumption failed"), \
+ __builtin_unreachable()))
+#elif _MSC_VER >= 1200
+#define assume(expr) __assume(expr)
+#else
+#define assume(expr) assert(expr)
+#endif
+
#ifdef HAVE_FUNC_ATTRIBUTE_FLATTEN
#define FLATTEN __attribute__((__flatten__))
#else
diff --git a/mesalib/src/util/register_allocate.c b/mesalib/src/util/register_allocate.c
index afab9ddd3..6cf7ce721 100644
--- a/mesalib/src/util/register_allocate.c
+++ b/mesalib/src/util/register_allocate.c
@@ -335,7 +335,7 @@ ra_set_finalize(struct ra_regs *regs, unsigned int **q_values)
for (i = 0; i < regs->regs[rc].num_conflicts; i++) {
unsigned int rb = regs->regs[rc].conflict_list[i];
- if (BITSET_TEST(regs->classes[b]->regs, rb))
+ if (reg_belongs_to_class(rb, regs->classes[b]))
conflicts++;
}
max_conflicts = MAX2(max_conflicts, conflicts);
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c
index 03b28675e..69f73873f 100644
--- a/pixman/pixman/pixman-mmx.c
+++ b/pixman/pixman/pixman-mmx.c
@@ -3580,6 +3580,8 @@ scaled_nearest_scanline_mmx_8888_8888_OVER (uint32_t* pd,
w--;
}
+
+ _mm_empty ();
}
FAST_NEAREST_MAINLOOP (mmx_8888_8888_cover_OVER,
@@ -3608,7 +3610,11 @@ scaled_nearest_scanline_mmx_8888_n_8888_OVER (const uint32_t * mask,
__m64 mm_mask;
if (zero_src || (*mask >> 24) == 0)
+ {
+ /* A workaround for https://gcc.gnu.org/PR47759 */
+ _mm_empty ();
return;
+ }
mm_mask = expand_alpha (load8888 (mask));
diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c
index 1714d4b6f..09ad359bb 100644
--- a/xorg-server/Xext/panoramiXprocs.c
+++ b/xorg-server/Xext/panoramiXprocs.c
@@ -1906,7 +1906,7 @@ PanoramiXGetImage(ClientPtr client)
}
rc = dixLookupResourceByClass((void **) &draw, stuff->drawable,
- XRC_DRAWABLE, client, DixWriteAccess);
+ XRC_DRAWABLE, client, DixReadAccess);
if (rc != Success)
return (rc == BadValue) ? BadDrawable : rc;
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index c6971889c..ac68f17b6 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -2208,8 +2208,6 @@ AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && test "x$AIGLX" = xyes])
-AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])
-AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c
index 21baf8950..f9c991774 100644
--- a/xorg-server/fb/fbpict.c
+++ b/xorg-server/fb/fbpict.c
@@ -326,7 +326,7 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
* only set the clip region for pictures with drawables
*/
if (has_clip) {
- if (pict->clientClipType != CT_NONE)
+ if (pict->clientClip)
pixman_image_set_has_client_clip(image, TRUE);
if (*xoff || *yoff)
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index a7267732b..027b39567 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
} while(0)
/* total number of offsets below */
-#define _gloffset_COUNT 1155
+#define _gloffset_COUNT 1156
#define _gloffset_NewList 0
#define _gloffset_EndList 1
@@ -473,7 +473,7 @@
#define _gloffset_MultiTexCoord4iv 405
#define _gloffset_MultiTexCoord4s 406
#define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 747
+#define driDispatchRemapTable_size 748
SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define CompressedTexImage1D_remap_index 0
@@ -932,297 +932,298 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define BindSamplers_remap_index 453
#define BindTextures_remap_index 454
#define BindVertexBuffers_remap_index 455
-#define InvalidateBufferData_remap_index 456
-#define InvalidateBufferSubData_remap_index 457
-#define InvalidateFramebuffer_remap_index 458
-#define InvalidateSubFramebuffer_remap_index 459
-#define InvalidateTexImage_remap_index 460
-#define InvalidateTexSubImage_remap_index 461
-#define PolygonOffsetEXT_remap_index 462
-#define DrawTexfOES_remap_index 463
-#define DrawTexfvOES_remap_index 464
-#define DrawTexiOES_remap_index 465
-#define DrawTexivOES_remap_index 466
-#define DrawTexsOES_remap_index 467
-#define DrawTexsvOES_remap_index 468
-#define DrawTexxOES_remap_index 469
-#define DrawTexxvOES_remap_index 470
-#define PointSizePointerOES_remap_index 471
-#define QueryMatrixxOES_remap_index 472
-#define SampleMaskSGIS_remap_index 473
-#define SamplePatternSGIS_remap_index 474
-#define ColorPointerEXT_remap_index 475
-#define EdgeFlagPointerEXT_remap_index 476
-#define IndexPointerEXT_remap_index 477
-#define NormalPointerEXT_remap_index 478
-#define TexCoordPointerEXT_remap_index 479
-#define VertexPointerEXT_remap_index 480
-#define DiscardFramebufferEXT_remap_index 481
-#define ActiveShaderProgram_remap_index 482
-#define BindProgramPipeline_remap_index 483
-#define CreateShaderProgramv_remap_index 484
-#define DeleteProgramPipelines_remap_index 485
-#define GenProgramPipelines_remap_index 486
-#define GetProgramPipelineInfoLog_remap_index 487
-#define GetProgramPipelineiv_remap_index 488
-#define IsProgramPipeline_remap_index 489
-#define LockArraysEXT_remap_index 490
-#define ProgramUniform1f_remap_index 491
-#define ProgramUniform1fv_remap_index 492
-#define ProgramUniform1i_remap_index 493
-#define ProgramUniform1iv_remap_index 494
-#define ProgramUniform1ui_remap_index 495
-#define ProgramUniform1uiv_remap_index 496
-#define ProgramUniform2f_remap_index 497
-#define ProgramUniform2fv_remap_index 498
-#define ProgramUniform2i_remap_index 499
-#define ProgramUniform2iv_remap_index 500
-#define ProgramUniform2ui_remap_index 501
-#define ProgramUniform2uiv_remap_index 502
-#define ProgramUniform3f_remap_index 503
-#define ProgramUniform3fv_remap_index 504
-#define ProgramUniform3i_remap_index 505
-#define ProgramUniform3iv_remap_index 506
-#define ProgramUniform3ui_remap_index 507
-#define ProgramUniform3uiv_remap_index 508
-#define ProgramUniform4f_remap_index 509
-#define ProgramUniform4fv_remap_index 510
-#define ProgramUniform4i_remap_index 511
-#define ProgramUniform4iv_remap_index 512
-#define ProgramUniform4ui_remap_index 513
-#define ProgramUniform4uiv_remap_index 514
-#define ProgramUniformMatrix2fv_remap_index 515
-#define ProgramUniformMatrix2x3fv_remap_index 516
-#define ProgramUniformMatrix2x4fv_remap_index 517
-#define ProgramUniformMatrix3fv_remap_index 518
-#define ProgramUniformMatrix3x2fv_remap_index 519
-#define ProgramUniformMatrix3x4fv_remap_index 520
-#define ProgramUniformMatrix4fv_remap_index 521
-#define ProgramUniformMatrix4x2fv_remap_index 522
-#define ProgramUniformMatrix4x3fv_remap_index 523
-#define UnlockArraysEXT_remap_index 524
-#define UseProgramStages_remap_index 525
-#define ValidateProgramPipeline_remap_index 526
-#define DebugMessageCallback_remap_index 527
-#define DebugMessageControl_remap_index 528
-#define DebugMessageInsert_remap_index 529
-#define GetDebugMessageLog_remap_index 530
-#define GetObjectLabel_remap_index 531
-#define GetObjectPtrLabel_remap_index 532
-#define ObjectLabel_remap_index 533
-#define ObjectPtrLabel_remap_index 534
-#define PopDebugGroup_remap_index 535
-#define PushDebugGroup_remap_index 536
-#define SecondaryColor3fEXT_remap_index 537
-#define SecondaryColor3fvEXT_remap_index 538
-#define MultiDrawElementsEXT_remap_index 539
-#define FogCoordfEXT_remap_index 540
-#define FogCoordfvEXT_remap_index 541
-#define ResizeBuffersMESA_remap_index 542
-#define WindowPos4dMESA_remap_index 543
-#define WindowPos4dvMESA_remap_index 544
-#define WindowPos4fMESA_remap_index 545
-#define WindowPos4fvMESA_remap_index 546
-#define WindowPos4iMESA_remap_index 547
-#define WindowPos4ivMESA_remap_index 548
-#define WindowPos4sMESA_remap_index 549
-#define WindowPos4svMESA_remap_index 550
-#define MultiModeDrawArraysIBM_remap_index 551
-#define MultiModeDrawElementsIBM_remap_index 552
-#define AreProgramsResidentNV_remap_index 553
-#define ExecuteProgramNV_remap_index 554
-#define GetProgramParameterdvNV_remap_index 555
-#define GetProgramParameterfvNV_remap_index 556
-#define GetProgramStringNV_remap_index 557
-#define GetProgramivNV_remap_index 558
-#define GetTrackMatrixivNV_remap_index 559
-#define GetVertexAttribdvNV_remap_index 560
-#define GetVertexAttribfvNV_remap_index 561
-#define GetVertexAttribivNV_remap_index 562
-#define LoadProgramNV_remap_index 563
-#define ProgramParameters4dvNV_remap_index 564
-#define ProgramParameters4fvNV_remap_index 565
-#define RequestResidentProgramsNV_remap_index 566
-#define TrackMatrixNV_remap_index 567
-#define VertexAttrib1dNV_remap_index 568
-#define VertexAttrib1dvNV_remap_index 569
-#define VertexAttrib1fNV_remap_index 570
-#define VertexAttrib1fvNV_remap_index 571
-#define VertexAttrib1sNV_remap_index 572
-#define VertexAttrib1svNV_remap_index 573
-#define VertexAttrib2dNV_remap_index 574
-#define VertexAttrib2dvNV_remap_index 575
-#define VertexAttrib2fNV_remap_index 576
-#define VertexAttrib2fvNV_remap_index 577
-#define VertexAttrib2sNV_remap_index 578
-#define VertexAttrib2svNV_remap_index 579
-#define VertexAttrib3dNV_remap_index 580
-#define VertexAttrib3dvNV_remap_index 581
-#define VertexAttrib3fNV_remap_index 582
-#define VertexAttrib3fvNV_remap_index 583
-#define VertexAttrib3sNV_remap_index 584
-#define VertexAttrib3svNV_remap_index 585
-#define VertexAttrib4dNV_remap_index 586
-#define VertexAttrib4dvNV_remap_index 587
-#define VertexAttrib4fNV_remap_index 588
-#define VertexAttrib4fvNV_remap_index 589
-#define VertexAttrib4sNV_remap_index 590
-#define VertexAttrib4svNV_remap_index 591
-#define VertexAttrib4ubNV_remap_index 592
-#define VertexAttrib4ubvNV_remap_index 593
-#define VertexAttribPointerNV_remap_index 594
-#define VertexAttribs1dvNV_remap_index 595
-#define VertexAttribs1fvNV_remap_index 596
-#define VertexAttribs1svNV_remap_index 597
-#define VertexAttribs2dvNV_remap_index 598
-#define VertexAttribs2fvNV_remap_index 599
-#define VertexAttribs2svNV_remap_index 600
-#define VertexAttribs3dvNV_remap_index 601
-#define VertexAttribs3fvNV_remap_index 602
-#define VertexAttribs3svNV_remap_index 603
-#define VertexAttribs4dvNV_remap_index 604
-#define VertexAttribs4fvNV_remap_index 605
-#define VertexAttribs4svNV_remap_index 606
-#define VertexAttribs4ubvNV_remap_index 607
-#define GetTexBumpParameterfvATI_remap_index 608
-#define GetTexBumpParameterivATI_remap_index 609
-#define TexBumpParameterfvATI_remap_index 610
-#define TexBumpParameterivATI_remap_index 611
-#define AlphaFragmentOp1ATI_remap_index 612
-#define AlphaFragmentOp2ATI_remap_index 613
-#define AlphaFragmentOp3ATI_remap_index 614
-#define BeginFragmentShaderATI_remap_index 615
-#define BindFragmentShaderATI_remap_index 616
-#define ColorFragmentOp1ATI_remap_index 617
-#define ColorFragmentOp2ATI_remap_index 618
-#define ColorFragmentOp3ATI_remap_index 619
-#define DeleteFragmentShaderATI_remap_index 620
-#define EndFragmentShaderATI_remap_index 621
-#define GenFragmentShadersATI_remap_index 622
-#define PassTexCoordATI_remap_index 623
-#define SampleMapATI_remap_index 624
-#define SetFragmentShaderConstantATI_remap_index 625
-#define ActiveStencilFaceEXT_remap_index 626
-#define BindVertexArrayAPPLE_remap_index 627
-#define GenVertexArraysAPPLE_remap_index 628
-#define GetProgramNamedParameterdvNV_remap_index 629
-#define GetProgramNamedParameterfvNV_remap_index 630
-#define ProgramNamedParameter4dNV_remap_index 631
-#define ProgramNamedParameter4dvNV_remap_index 632
-#define ProgramNamedParameter4fNV_remap_index 633
-#define ProgramNamedParameter4fvNV_remap_index 634
-#define PrimitiveRestartNV_remap_index 635
-#define GetTexGenxvOES_remap_index 636
-#define TexGenxOES_remap_index 637
-#define TexGenxvOES_remap_index 638
-#define DepthBoundsEXT_remap_index 639
-#define BindFramebufferEXT_remap_index 640
-#define BindRenderbufferEXT_remap_index 641
-#define BufferParameteriAPPLE_remap_index 642
-#define FlushMappedBufferRangeAPPLE_remap_index 643
-#define VertexAttribI1iEXT_remap_index 644
-#define VertexAttribI1uiEXT_remap_index 645
-#define VertexAttribI2iEXT_remap_index 646
-#define VertexAttribI2ivEXT_remap_index 647
-#define VertexAttribI2uiEXT_remap_index 648
-#define VertexAttribI2uivEXT_remap_index 649
-#define VertexAttribI3iEXT_remap_index 650
-#define VertexAttribI3ivEXT_remap_index 651
-#define VertexAttribI3uiEXT_remap_index 652
-#define VertexAttribI3uivEXT_remap_index 653
-#define VertexAttribI4iEXT_remap_index 654
-#define VertexAttribI4ivEXT_remap_index 655
-#define VertexAttribI4uiEXT_remap_index 656
-#define VertexAttribI4uivEXT_remap_index 657
-#define ClearColorIiEXT_remap_index 658
-#define ClearColorIuiEXT_remap_index 659
-#define BindBufferOffsetEXT_remap_index 660
-#define BeginPerfMonitorAMD_remap_index 661
-#define DeletePerfMonitorsAMD_remap_index 662
-#define EndPerfMonitorAMD_remap_index 663
-#define GenPerfMonitorsAMD_remap_index 664
-#define GetPerfMonitorCounterDataAMD_remap_index 665
-#define GetPerfMonitorCounterInfoAMD_remap_index 666
-#define GetPerfMonitorCounterStringAMD_remap_index 667
-#define GetPerfMonitorCountersAMD_remap_index 668
-#define GetPerfMonitorGroupStringAMD_remap_index 669
-#define GetPerfMonitorGroupsAMD_remap_index 670
-#define SelectPerfMonitorCountersAMD_remap_index 671
-#define GetObjectParameterivAPPLE_remap_index 672
-#define ObjectPurgeableAPPLE_remap_index 673
-#define ObjectUnpurgeableAPPLE_remap_index 674
-#define ActiveProgramEXT_remap_index 675
-#define CreateShaderProgramEXT_remap_index 676
-#define UseShaderProgramEXT_remap_index 677
-#define TextureBarrierNV_remap_index 678
-#define VDPAUFiniNV_remap_index 679
-#define VDPAUGetSurfaceivNV_remap_index 680
-#define VDPAUInitNV_remap_index 681
-#define VDPAUIsSurfaceNV_remap_index 682
-#define VDPAUMapSurfacesNV_remap_index 683
-#define VDPAURegisterOutputSurfaceNV_remap_index 684
-#define VDPAURegisterVideoSurfaceNV_remap_index 685
-#define VDPAUSurfaceAccessNV_remap_index 686
-#define VDPAUUnmapSurfacesNV_remap_index 687
-#define VDPAUUnregisterSurfaceNV_remap_index 688
-#define BeginPerfQueryINTEL_remap_index 689
-#define CreatePerfQueryINTEL_remap_index 690
-#define DeletePerfQueryINTEL_remap_index 691
-#define EndPerfQueryINTEL_remap_index 692
-#define GetFirstPerfQueryIdINTEL_remap_index 693
-#define GetNextPerfQueryIdINTEL_remap_index 694
-#define GetPerfCounterInfoINTEL_remap_index 695
-#define GetPerfQueryDataINTEL_remap_index 696
-#define GetPerfQueryIdByNameINTEL_remap_index 697
-#define GetPerfQueryInfoINTEL_remap_index 698
-#define StencilFuncSeparateATI_remap_index 699
-#define ProgramEnvParameters4fvEXT_remap_index 700
-#define ProgramLocalParameters4fvEXT_remap_index 701
-#define EGLImageTargetRenderbufferStorageOES_remap_index 702
-#define EGLImageTargetTexture2DOES_remap_index 703
-#define AlphaFuncx_remap_index 704
-#define ClearColorx_remap_index 705
-#define ClearDepthx_remap_index 706
-#define Color4x_remap_index 707
-#define DepthRangex_remap_index 708
-#define Fogx_remap_index 709
-#define Fogxv_remap_index 710
-#define Frustumf_remap_index 711
-#define Frustumx_remap_index 712
-#define LightModelx_remap_index 713
-#define LightModelxv_remap_index 714
-#define Lightx_remap_index 715
-#define Lightxv_remap_index 716
-#define LineWidthx_remap_index 717
-#define LoadMatrixx_remap_index 718
-#define Materialx_remap_index 719
-#define Materialxv_remap_index 720
-#define MultMatrixx_remap_index 721
-#define MultiTexCoord4x_remap_index 722
-#define Normal3x_remap_index 723
-#define Orthof_remap_index 724
-#define Orthox_remap_index 725
-#define PointSizex_remap_index 726
-#define PolygonOffsetx_remap_index 727
-#define Rotatex_remap_index 728
-#define SampleCoveragex_remap_index 729
-#define Scalex_remap_index 730
-#define TexEnvx_remap_index 731
-#define TexEnvxv_remap_index 732
-#define TexParameterx_remap_index 733
-#define Translatex_remap_index 734
-#define ClipPlanef_remap_index 735
-#define ClipPlanex_remap_index 736
-#define GetClipPlanef_remap_index 737
-#define GetClipPlanex_remap_index 738
-#define GetFixedv_remap_index 739
-#define GetLightxv_remap_index 740
-#define GetMaterialxv_remap_index 741
-#define GetTexEnvxv_remap_index 742
-#define GetTexParameterxv_remap_index 743
-#define PointParameterx_remap_index 744
-#define PointParameterxv_remap_index 745
-#define TexParameterxv_remap_index 746
+#define ClipControl_remap_index 456
+#define InvalidateBufferData_remap_index 457
+#define InvalidateBufferSubData_remap_index 458
+#define InvalidateFramebuffer_remap_index 459
+#define InvalidateSubFramebuffer_remap_index 460
+#define InvalidateTexImage_remap_index 461
+#define InvalidateTexSubImage_remap_index 462
+#define PolygonOffsetEXT_remap_index 463
+#define DrawTexfOES_remap_index 464
+#define DrawTexfvOES_remap_index 465
+#define DrawTexiOES_remap_index 466
+#define DrawTexivOES_remap_index 467
+#define DrawTexsOES_remap_index 468
+#define DrawTexsvOES_remap_index 469
+#define DrawTexxOES_remap_index 470
+#define DrawTexxvOES_remap_index 471
+#define PointSizePointerOES_remap_index 472
+#define QueryMatrixxOES_remap_index 473
+#define SampleMaskSGIS_remap_index 474
+#define SamplePatternSGIS_remap_index 475
+#define ColorPointerEXT_remap_index 476
+#define EdgeFlagPointerEXT_remap_index 477
+#define IndexPointerEXT_remap_index 478
+#define NormalPointerEXT_remap_index 479
+#define TexCoordPointerEXT_remap_index 480
+#define VertexPointerEXT_remap_index 481
+#define DiscardFramebufferEXT_remap_index 482
+#define ActiveShaderProgram_remap_index 483
+#define BindProgramPipeline_remap_index 484
+#define CreateShaderProgramv_remap_index 485
+#define DeleteProgramPipelines_remap_index 486
+#define GenProgramPipelines_remap_index 487
+#define GetProgramPipelineInfoLog_remap_index 488
+#define GetProgramPipelineiv_remap_index 489
+#define IsProgramPipeline_remap_index 490
+#define LockArraysEXT_remap_index 491
+#define ProgramUniform1f_remap_index 492
+#define ProgramUniform1fv_remap_index 493
+#define ProgramUniform1i_remap_index 494
+#define ProgramUniform1iv_remap_index 495
+#define ProgramUniform1ui_remap_index 496
+#define ProgramUniform1uiv_remap_index 497
+#define ProgramUniform2f_remap_index 498
+#define ProgramUniform2fv_remap_index 499
+#define ProgramUniform2i_remap_index 500
+#define ProgramUniform2iv_remap_index 501
+#define ProgramUniform2ui_remap_index 502
+#define ProgramUniform2uiv_remap_index 503
+#define ProgramUniform3f_remap_index 504
+#define ProgramUniform3fv_remap_index 505
+#define ProgramUniform3i_remap_index 506
+#define ProgramUniform3iv_remap_index 507
+#define ProgramUniform3ui_remap_index 508
+#define ProgramUniform3uiv_remap_index 509
+#define ProgramUniform4f_remap_index 510
+#define ProgramUniform4fv_remap_index 511
+#define ProgramUniform4i_remap_index 512
+#define ProgramUniform4iv_remap_index 513
+#define ProgramUniform4ui_remap_index 514
+#define ProgramUniform4uiv_remap_index 515
+#define ProgramUniformMatrix2fv_remap_index 516
+#define ProgramUniformMatrix2x3fv_remap_index 517
+#define ProgramUniformMatrix2x4fv_remap_index 518
+#define ProgramUniformMatrix3fv_remap_index 519
+#define ProgramUniformMatrix3x2fv_remap_index 520
+#define ProgramUniformMatrix3x4fv_remap_index 521
+#define ProgramUniformMatrix4fv_remap_index 522
+#define ProgramUniformMatrix4x2fv_remap_index 523
+#define ProgramUniformMatrix4x3fv_remap_index 524
+#define UnlockArraysEXT_remap_index 525
+#define UseProgramStages_remap_index 526
+#define ValidateProgramPipeline_remap_index 527
+#define DebugMessageCallback_remap_index 528
+#define DebugMessageControl_remap_index 529
+#define DebugMessageInsert_remap_index 530
+#define GetDebugMessageLog_remap_index 531
+#define GetObjectLabel_remap_index 532
+#define GetObjectPtrLabel_remap_index 533
+#define ObjectLabel_remap_index 534
+#define ObjectPtrLabel_remap_index 535
+#define PopDebugGroup_remap_index 536
+#define PushDebugGroup_remap_index 537
+#define SecondaryColor3fEXT_remap_index 538
+#define SecondaryColor3fvEXT_remap_index 539
+#define MultiDrawElementsEXT_remap_index 540
+#define FogCoordfEXT_remap_index 541
+#define FogCoordfvEXT_remap_index 542
+#define ResizeBuffersMESA_remap_index 543
+#define WindowPos4dMESA_remap_index 544
+#define WindowPos4dvMESA_remap_index 545
+#define WindowPos4fMESA_remap_index 546
+#define WindowPos4fvMESA_remap_index 547
+#define WindowPos4iMESA_remap_index 548
+#define WindowPos4ivMESA_remap_index 549
+#define WindowPos4sMESA_remap_index 550
+#define WindowPos4svMESA_remap_index 551
+#define MultiModeDrawArraysIBM_remap_index 552
+#define MultiModeDrawElementsIBM_remap_index 553
+#define AreProgramsResidentNV_remap_index 554
+#define ExecuteProgramNV_remap_index 555
+#define GetProgramParameterdvNV_remap_index 556
+#define GetProgramParameterfvNV_remap_index 557
+#define GetProgramStringNV_remap_index 558
+#define GetProgramivNV_remap_index 559
+#define GetTrackMatrixivNV_remap_index 560
+#define GetVertexAttribdvNV_remap_index 561
+#define GetVertexAttribfvNV_remap_index 562
+#define GetVertexAttribivNV_remap_index 563
+#define LoadProgramNV_remap_index 564
+#define ProgramParameters4dvNV_remap_index 565
+#define ProgramParameters4fvNV_remap_index 566
+#define RequestResidentProgramsNV_remap_index 567
+#define TrackMatrixNV_remap_index 568
+#define VertexAttrib1dNV_remap_index 569
+#define VertexAttrib1dvNV_remap_index 570
+#define VertexAttrib1fNV_remap_index 571
+#define VertexAttrib1fvNV_remap_index 572
+#define VertexAttrib1sNV_remap_index 573
+#define VertexAttrib1svNV_remap_index 574
+#define VertexAttrib2dNV_remap_index 575
+#define VertexAttrib2dvNV_remap_index 576
+#define VertexAttrib2fNV_remap_index 577
+#define VertexAttrib2fvNV_remap_index 578
+#define VertexAttrib2sNV_remap_index 579
+#define VertexAttrib2svNV_remap_index 580
+#define VertexAttrib3dNV_remap_index 581
+#define VertexAttrib3dvNV_remap_index 582
+#define VertexAttrib3fNV_remap_index 583
+#define VertexAttrib3fvNV_remap_index 584
+#define VertexAttrib3sNV_remap_index 585
+#define VertexAttrib3svNV_remap_index 586
+#define VertexAttrib4dNV_remap_index 587
+#define VertexAttrib4dvNV_remap_index 588
+#define VertexAttrib4fNV_remap_index 589
+#define VertexAttrib4fvNV_remap_index 590
+#define VertexAttrib4sNV_remap_index 591
+#define VertexAttrib4svNV_remap_index 592
+#define VertexAttrib4ubNV_remap_index 593
+#define VertexAttrib4ubvNV_remap_index 594
+#define VertexAttribPointerNV_remap_index 595
+#define VertexAttribs1dvNV_remap_index 596
+#define VertexAttribs1fvNV_remap_index 597
+#define VertexAttribs1svNV_remap_index 598
+#define VertexAttribs2dvNV_remap_index 599
+#define VertexAttribs2fvNV_remap_index 600
+#define VertexAttribs2svNV_remap_index 601
+#define VertexAttribs3dvNV_remap_index 602
+#define VertexAttribs3fvNV_remap_index 603
+#define VertexAttribs3svNV_remap_index 604
+#define VertexAttribs4dvNV_remap_index 605
+#define VertexAttribs4fvNV_remap_index 606
+#define VertexAttribs4svNV_remap_index 607
+#define VertexAttribs4ubvNV_remap_index 608
+#define GetTexBumpParameterfvATI_remap_index 609
+#define GetTexBumpParameterivATI_remap_index 610
+#define TexBumpParameterfvATI_remap_index 611
+#define TexBumpParameterivATI_remap_index 612
+#define AlphaFragmentOp1ATI_remap_index 613
+#define AlphaFragmentOp2ATI_remap_index 614
+#define AlphaFragmentOp3ATI_remap_index 615
+#define BeginFragmentShaderATI_remap_index 616
+#define BindFragmentShaderATI_remap_index 617
+#define ColorFragmentOp1ATI_remap_index 618
+#define ColorFragmentOp2ATI_remap_index 619
+#define ColorFragmentOp3ATI_remap_index 620
+#define DeleteFragmentShaderATI_remap_index 621
+#define EndFragmentShaderATI_remap_index 622
+#define GenFragmentShadersATI_remap_index 623
+#define PassTexCoordATI_remap_index 624
+#define SampleMapATI_remap_index 625
+#define SetFragmentShaderConstantATI_remap_index 626
+#define ActiveStencilFaceEXT_remap_index 627
+#define BindVertexArrayAPPLE_remap_index 628
+#define GenVertexArraysAPPLE_remap_index 629
+#define GetProgramNamedParameterdvNV_remap_index 630
+#define GetProgramNamedParameterfvNV_remap_index 631
+#define ProgramNamedParameter4dNV_remap_index 632
+#define ProgramNamedParameter4dvNV_remap_index 633
+#define ProgramNamedParameter4fNV_remap_index 634
+#define ProgramNamedParameter4fvNV_remap_index 635
+#define PrimitiveRestartNV_remap_index 636
+#define GetTexGenxvOES_remap_index 637
+#define TexGenxOES_remap_index 638
+#define TexGenxvOES_remap_index 639
+#define DepthBoundsEXT_remap_index 640
+#define BindFramebufferEXT_remap_index 641
+#define BindRenderbufferEXT_remap_index 642
+#define BufferParameteriAPPLE_remap_index 643
+#define FlushMappedBufferRangeAPPLE_remap_index 644
+#define VertexAttribI1iEXT_remap_index 645
+#define VertexAttribI1uiEXT_remap_index 646
+#define VertexAttribI2iEXT_remap_index 647
+#define VertexAttribI2ivEXT_remap_index 648
+#define VertexAttribI2uiEXT_remap_index 649
+#define VertexAttribI2uivEXT_remap_index 650
+#define VertexAttribI3iEXT_remap_index 651
+#define VertexAttribI3ivEXT_remap_index 652
+#define VertexAttribI3uiEXT_remap_index 653
+#define VertexAttribI3uivEXT_remap_index 654
+#define VertexAttribI4iEXT_remap_index 655
+#define VertexAttribI4ivEXT_remap_index 656
+#define VertexAttribI4uiEXT_remap_index 657
+#define VertexAttribI4uivEXT_remap_index 658
+#define ClearColorIiEXT_remap_index 659
+#define ClearColorIuiEXT_remap_index 660
+#define BindBufferOffsetEXT_remap_index 661
+#define BeginPerfMonitorAMD_remap_index 662
+#define DeletePerfMonitorsAMD_remap_index 663
+#define EndPerfMonitorAMD_remap_index 664
+#define GenPerfMonitorsAMD_remap_index 665
+#define GetPerfMonitorCounterDataAMD_remap_index 666
+#define GetPerfMonitorCounterInfoAMD_remap_index 667
+#define GetPerfMonitorCounterStringAMD_remap_index 668
+#define GetPerfMonitorCountersAMD_remap_index 669
+#define GetPerfMonitorGroupStringAMD_remap_index 670
+#define GetPerfMonitorGroupsAMD_remap_index 671
+#define SelectPerfMonitorCountersAMD_remap_index 672
+#define GetObjectParameterivAPPLE_remap_index 673
+#define ObjectPurgeableAPPLE_remap_index 674
+#define ObjectUnpurgeableAPPLE_remap_index 675
+#define ActiveProgramEXT_remap_index 676
+#define CreateShaderProgramEXT_remap_index 677
+#define UseShaderProgramEXT_remap_index 678
+#define TextureBarrierNV_remap_index 679
+#define VDPAUFiniNV_remap_index 680
+#define VDPAUGetSurfaceivNV_remap_index 681
+#define VDPAUInitNV_remap_index 682
+#define VDPAUIsSurfaceNV_remap_index 683
+#define VDPAUMapSurfacesNV_remap_index 684
+#define VDPAURegisterOutputSurfaceNV_remap_index 685
+#define VDPAURegisterVideoSurfaceNV_remap_index 686
+#define VDPAUSurfaceAccessNV_remap_index 687
+#define VDPAUUnmapSurfacesNV_remap_index 688
+#define VDPAUUnregisterSurfaceNV_remap_index 689
+#define BeginPerfQueryINTEL_remap_index 690
+#define CreatePerfQueryINTEL_remap_index 691
+#define DeletePerfQueryINTEL_remap_index 692
+#define EndPerfQueryINTEL_remap_index 693
+#define GetFirstPerfQueryIdINTEL_remap_index 694
+#define GetNextPerfQueryIdINTEL_remap_index 695
+#define GetPerfCounterInfoINTEL_remap_index 696
+#define GetPerfQueryDataINTEL_remap_index 697
+#define GetPerfQueryIdByNameINTEL_remap_index 698
+#define GetPerfQueryInfoINTEL_remap_index 699
+#define StencilFuncSeparateATI_remap_index 700
+#define ProgramEnvParameters4fvEXT_remap_index 701
+#define ProgramLocalParameters4fvEXT_remap_index 702
+#define EGLImageTargetRenderbufferStorageOES_remap_index 703
+#define EGLImageTargetTexture2DOES_remap_index 704
+#define AlphaFuncx_remap_index 705
+#define ClearColorx_remap_index 706
+#define ClearDepthx_remap_index 707
+#define Color4x_remap_index 708
+#define DepthRangex_remap_index 709
+#define Fogx_remap_index 710
+#define Fogxv_remap_index 711
+#define Frustumf_remap_index 712
+#define Frustumx_remap_index 713
+#define LightModelx_remap_index 714
+#define LightModelxv_remap_index 715
+#define Lightx_remap_index 716
+#define Lightxv_remap_index 717
+#define LineWidthx_remap_index 718
+#define LoadMatrixx_remap_index 719
+#define Materialx_remap_index 720
+#define Materialxv_remap_index 721
+#define MultMatrixx_remap_index 722
+#define MultiTexCoord4x_remap_index 723
+#define Normal3x_remap_index 724
+#define Orthof_remap_index 725
+#define Orthox_remap_index 726
+#define PointSizex_remap_index 727
+#define PolygonOffsetx_remap_index 728
+#define Rotatex_remap_index 729
+#define SampleCoveragex_remap_index 730
+#define Scalex_remap_index 731
+#define TexEnvx_remap_index 732
+#define TexEnvxv_remap_index 733
+#define TexParameterx_remap_index 734
+#define Translatex_remap_index 735
+#define ClipPlanef_remap_index 736
+#define ClipPlanex_remap_index 737
+#define GetClipPlanef_remap_index 738
+#define GetClipPlanex_remap_index 739
+#define GetFixedv_remap_index 740
+#define GetLightxv_remap_index 741
+#define GetMaterialxv_remap_index 742
+#define GetTexEnvxv_remap_index 743
+#define GetTexParameterxv_remap_index 744
+#define PointParameterx_remap_index 745
+#define PointParameterxv_remap_index 746
+#define TexParameterxv_remap_index 747
#define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
#define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1680,6 +1681,7 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
#define _gloffset_BindSamplers driDispatchRemapTable[BindSamplers_remap_index]
#define _gloffset_BindTextures driDispatchRemapTable[BindTextures_remap_index]
#define _gloffset_BindVertexBuffers driDispatchRemapTable[BindVertexBuffers_remap_index]
+#define _gloffset_ClipControl driDispatchRemapTable[ClipControl_remap_index]
#define _gloffset_InvalidateBufferData driDispatchRemapTable[InvalidateBufferData_remap_index]
#define _gloffset_InvalidateBufferSubData driDispatchRemapTable[InvalidateBufferSubData_remap_index]
#define _gloffset_InvalidateFramebuffer driDispatchRemapTable[InvalidateFramebuffer_remap_index]
@@ -11476,6 +11478,17 @@ static INLINE void SET_BindVertexBuffers(struct _glapi_table *disp, void (GLAPIE
SET_by_offset(disp, _gloffset_BindVertexBuffers, fn);
}
+typedef void (GLAPIENTRYP _glptr_ClipControl)(GLenum, GLenum);
+#define CALL_ClipControl(disp, parameters) \
+ (* GET_ClipControl(disp)) parameters
+static INLINE _glptr_ClipControl GET_ClipControl(struct _glapi_table *disp) {
+ return (_glptr_ClipControl) (GET_by_offset(disp, _gloffset_ClipControl));
+}
+
+static INLINE void SET_ClipControl(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
+ SET_by_offset(disp, _gloffset_ClipControl, fn);
+}
+
typedef void (GLAPIENTRYP _glptr_InvalidateBufferData)(GLuint);
#define CALL_InvalidateBufferData(disp, parameters) \
(* GET_InvalidateBufferData(disp)) parameters
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 8256ad94b..d42b9cefc 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -905,297 +905,298 @@ struct _glapi_table
void (GLAPIENTRYP BindSamplers)(GLuint first, GLsizei count, const GLuint * samplers); /* 861 */
void (GLAPIENTRYP BindTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 862 */
void (GLAPIENTRYP BindVertexBuffers)(GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizei * strides); /* 863 */
- void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 864 */
- void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 865 */
- void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 866 */
- void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 867 */
- void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 868 */
- void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 869 */
- void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 870 */
- void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 871 */
- void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 872 */
- void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 873 */
- void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 874 */
- void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 875 */
- void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 876 */
- void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 877 */
- void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 878 */
- void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 879 */
- GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 880 */
- void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 881 */
- void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 882 */
- void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 883 */
- void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 884 */
- void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 885 */
- void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 886 */
- void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 887 */
- void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 888 */
- void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 889 */
- void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 890 */
- void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 891 */
- GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 892 */
- void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 893 */
- void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 894 */
- void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 895 */
- void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 896 */
- GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 897 */
- void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 898 */
- void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 899 */
- void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 900 */
- void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 901 */
- void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 902 */
- void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 903 */
- void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 904 */
- void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 905 */
- void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 906 */
- void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 907 */
- void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 908 */
- void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 909 */
- void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 910 */
- void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 911 */
- void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 912 */
- void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 913 */
- void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 914 */
- void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 915 */
- void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 916 */
- void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 917 */
- void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 918 */
- void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 919 */
- void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 920 */
- void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 921 */
- void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 922 */
- void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 923 */
- void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 924 */
- void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 925 */
- void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 926 */
- void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 927 */
- void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 928 */
- void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 929 */
- void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 930 */
- void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 931 */
- void (GLAPIENTRYP UnlockArraysEXT)(void); /* 932 */
- void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 933 */
- void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 934 */
- void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 935 */
- void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 936 */
- void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 937 */
- GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 938 */
- void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 939 */
- void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 940 */
- void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 941 */
- void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 942 */
- void (GLAPIENTRYP PopDebugGroup)(void); /* 943 */
- void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 944 */
- void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 945 */
- void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 946 */
- void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 947 */
- void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 948 */
- void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 949 */
- void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 950 */
- void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 951 */
- void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 952 */
- void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 953 */
- void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 954 */
- void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 955 */
- void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 956 */
- void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 957 */
- void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 958 */
- void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 959 */
- void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 960 */
- GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 961 */
- void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 962 */
- void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 963 */
- void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 964 */
- void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 965 */
- void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 966 */
- void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 967 */
- void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 968 */
- void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 969 */
- void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 970 */
- void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 971 */
- void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 972 */
- void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 973 */
- void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 974 */
- void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 975 */
- void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 976 */
- void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 977 */
- void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 978 */
- void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 979 */
- void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 980 */
- void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 981 */
- void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 982 */
- void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 983 */
- void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 984 */
- void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 985 */
- void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 986 */
- void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 987 */
- void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 988 */
- void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 989 */
- void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 990 */
- void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 991 */
- void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 992 */
- void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 993 */
- void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 994 */
- void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 995 */
- void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 996 */
- void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 997 */
- void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 998 */
- void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 999 */
- void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1000 */
- void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1001 */
- void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1002 */
- void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1003 */
- void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1004 */
- void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1005 */
- void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1006 */
- void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1007 */
- void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1008 */
- void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1009 */
- void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1010 */
- void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1011 */
- void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1012 */
- void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1013 */
- void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1014 */
- void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1015 */
- void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1016 */
- void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1017 */
- void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1018 */
- void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1019 */
- void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1020 */
- void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1021 */
- void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1022 */
- void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1023 */
- void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1024 */
- void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1025 */
- void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1026 */
- void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1027 */
- void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1028 */
- void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1029 */
- GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1030 */
- void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1031 */
- void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1032 */
- void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1033 */
- void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1034 */
- void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1035 */
- void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1036 */
- void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1037 */
- void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1038 */
- void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1039 */
- void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1040 */
- void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1041 */
- void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1042 */
- void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1043 */
- void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1044 */
- void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1045 */
- void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1046 */
- void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1047 */
- void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1048 */
- void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1049 */
- void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1050 */
- void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1051 */
- void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1052 */
- void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1053 */
- void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1054 */
- void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1055 */
- void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1056 */
- void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1057 */
- void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1058 */
- void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1059 */
- void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1060 */
- void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1061 */
- void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1062 */
- void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1063 */
- void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1064 */
- void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1065 */
- void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1066 */
- void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1067 */
- void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1068 */
- void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1069 */
- void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1070 */
- void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1071 */
- void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1072 */
- void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1073 */
- void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1074 */
- void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1075 */
- void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1076 */
- void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1077 */
- void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1078 */
- void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1079 */
- void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1080 */
- GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1081 */
- GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1082 */
- void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1083 */
- GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1084 */
- void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1085 */
- void (GLAPIENTRYP TextureBarrierNV)(void); /* 1086 */
- void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1087 */
- void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1088 */
- void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1089 */
- GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1090 */
- void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1091 */
- GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1092 */
- GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1093 */
- void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1094 */
- void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1095 */
- void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1096 */
- void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1097 */
- void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1098 */
- void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1099 */
- void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1100 */
- void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1101 */
- void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1102 */
- void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1103 */
- void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1104 */
- void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1105 */
- void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1106 */
- void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1107 */
- void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1108 */
- void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1109 */
- void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1110 */
- void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1111 */
- void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1112 */
- void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1113 */
- void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1114 */
- void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1115 */
- void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1116 */
- void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1117 */
- void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1118 */
- void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1119 */
- void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1120 */
- void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1121 */
- void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1122 */
- void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1123 */
- void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1124 */
- void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1125 */
- void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1126 */
- void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1127 */
- void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1128 */
- void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1129 */
- void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1130 */
- void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1131 */
- void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1132 */
- void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1133 */
- void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1134 */
- void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1135 */
- void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1136 */
- void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1137 */
- void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1138 */
- void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1139 */
- void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1140 */
- void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1141 */
- void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1142 */
- void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1143 */
- void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1144 */
- void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1145 */
- void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1146 */
- void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1147 */
- void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1148 */
- void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1149 */
- void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1150 */
- void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1151 */
- void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1152 */
- void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1153 */
- void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1154 */
+ void (GLAPIENTRYP ClipControl)(GLenum origin, GLenum depth); /* 864 */
+ void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 865 */
+ void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 866 */
+ void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 867 */
+ void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 868 */
+ void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 869 */
+ void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 870 */
+ void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 871 */
+ void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 872 */
+ void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 873 */
+ void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 874 */
+ void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 875 */
+ void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 876 */
+ void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 877 */
+ void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 878 */
+ void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 879 */
+ void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 880 */
+ GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 881 */
+ void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 882 */
+ void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 883 */
+ void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 884 */
+ void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 885 */
+ void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 886 */
+ void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 887 */
+ void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 888 */
+ void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 889 */
+ void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 890 */
+ void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 891 */
+ void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 892 */
+ GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 893 */
+ void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 894 */
+ void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 895 */
+ void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 896 */
+ void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 897 */
+ GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 898 */
+ void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 899 */
+ void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 900 */
+ void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 901 */
+ void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 902 */
+ void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 903 */
+ void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 904 */
+ void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 905 */
+ void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 906 */
+ void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 907 */
+ void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 908 */
+ void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 909 */
+ void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 910 */
+ void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 911 */
+ void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 912 */
+ void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 913 */
+ void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 914 */
+ void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 915 */
+ void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 916 */
+ void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 917 */
+ void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 918 */
+ void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 919 */
+ void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 920 */
+ void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 921 */
+ void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 922 */
+ void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 923 */
+ void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 924 */
+ void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 925 */
+ void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 926 */
+ void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 927 */
+ void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 928 */
+ void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 929 */
+ void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 930 */
+ void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 931 */
+ void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 932 */
+ void (GLAPIENTRYP UnlockArraysEXT)(void); /* 933 */
+ void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 934 */
+ void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 935 */
+ void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 936 */
+ void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 937 */
+ void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 938 */
+ GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 939 */
+ void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 940 */
+ void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 941 */
+ void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 942 */
+ void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 943 */
+ void (GLAPIENTRYP PopDebugGroup)(void); /* 944 */
+ void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 945 */
+ void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 946 */
+ void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 947 */
+ void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 948 */
+ void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 949 */
+ void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 950 */
+ void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 951 */
+ void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 952 */
+ void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 953 */
+ void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 954 */
+ void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 955 */
+ void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 956 */
+ void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 957 */
+ void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 958 */
+ void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 959 */
+ void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 960 */
+ void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 961 */
+ GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 962 */
+ void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 963 */
+ void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 964 */
+ void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 965 */
+ void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 966 */
+ void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 967 */
+ void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 968 */
+ void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 969 */
+ void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 970 */
+ void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 971 */
+ void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 972 */
+ void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 973 */
+ void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 974 */
+ void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 975 */
+ void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 976 */
+ void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 977 */
+ void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 978 */
+ void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 979 */
+ void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 980 */
+ void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 981 */
+ void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 982 */
+ void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 983 */
+ void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 984 */
+ void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 985 */
+ void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 986 */
+ void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 987 */
+ void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 988 */
+ void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 989 */
+ void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 990 */
+ void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 991 */
+ void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 992 */
+ void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 993 */
+ void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 994 */
+ void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 995 */
+ void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 996 */
+ void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 997 */
+ void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 998 */
+ void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 999 */
+ void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 1000 */
+ void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 1001 */
+ void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 1002 */
+ void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 1003 */
+ void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1004 */
+ void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1005 */
+ void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1006 */
+ void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1007 */
+ void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1008 */
+ void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1009 */
+ void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1010 */
+ void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1011 */
+ void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1012 */
+ void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1013 */
+ void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1014 */
+ void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1015 */
+ void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1016 */
+ void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1017 */
+ void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1018 */
+ void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1019 */
+ void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1020 */
+ void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1021 */
+ void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1022 */
+ void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1023 */
+ void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1024 */
+ void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1025 */
+ void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1026 */
+ void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1027 */
+ void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1028 */
+ void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1029 */
+ void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1030 */
+ GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1031 */
+ void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1032 */
+ void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1033 */
+ void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1034 */
+ void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1035 */
+ void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1036 */
+ void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1037 */
+ void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1038 */
+ void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1039 */
+ void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1040 */
+ void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1041 */
+ void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1042 */
+ void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1043 */
+ void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1044 */
+ void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1045 */
+ void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1046 */
+ void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1047 */
+ void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1048 */
+ void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1049 */
+ void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1050 */
+ void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1051 */
+ void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1052 */
+ void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1053 */
+ void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1054 */
+ void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1055 */
+ void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1056 */
+ void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1057 */
+ void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1058 */
+ void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1059 */
+ void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1060 */
+ void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1061 */
+ void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1062 */
+ void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1063 */
+ void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1064 */
+ void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1065 */
+ void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1066 */
+ void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1067 */
+ void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1068 */
+ void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1069 */
+ void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1070 */
+ void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1071 */
+ void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1072 */
+ void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1073 */
+ void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1074 */
+ void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1075 */
+ void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1076 */
+ void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1077 */
+ void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1078 */
+ void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1079 */
+ void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1080 */
+ void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1081 */
+ GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1082 */
+ GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1083 */
+ void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1084 */
+ GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1085 */
+ void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1086 */
+ void (GLAPIENTRYP TextureBarrierNV)(void); /* 1087 */
+ void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1088 */
+ void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1089 */
+ void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1090 */
+ GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1091 */
+ void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1092 */
+ GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1093 */
+ GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1094 */
+ void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1095 */
+ void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1096 */
+ void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1097 */
+ void (GLAPIENTRYP BeginPerfQueryINTEL)(GLuint queryHandle); /* 1098 */
+ void (GLAPIENTRYP CreatePerfQueryINTEL)(GLuint queryId, GLuint * queryHandle); /* 1099 */
+ void (GLAPIENTRYP DeletePerfQueryINTEL)(GLuint queryHandle); /* 1100 */
+ void (GLAPIENTRYP EndPerfQueryINTEL)(GLuint queryHandle); /* 1101 */
+ void (GLAPIENTRYP GetFirstPerfQueryIdINTEL)(GLuint * queryId); /* 1102 */
+ void (GLAPIENTRYP GetNextPerfQueryIdINTEL)(GLuint queryId, GLuint * nextQueryId); /* 1103 */
+ void (GLAPIENTRYP GetPerfCounterInfoINTEL)(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue); /* 1104 */
+ void (GLAPIENTRYP GetPerfQueryDataINTEL)(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten); /* 1105 */
+ void (GLAPIENTRYP GetPerfQueryIdByNameINTEL)(GLchar * queryName, GLuint * queryId); /* 1106 */
+ void (GLAPIENTRYP GetPerfQueryInfoINTEL)(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask); /* 1107 */
+ void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1108 */
+ void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1109 */
+ void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1110 */
+ void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1111 */
+ void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1112 */
+ void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1113 */
+ void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1114 */
+ void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1115 */
+ void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1116 */
+ void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1117 */
+ void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1118 */
+ void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1119 */
+ void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1120 */
+ void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1121 */
+ void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1122 */
+ void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1123 */
+ void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1124 */
+ void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1125 */
+ void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1126 */
+ void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1127 */
+ void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1128 */
+ void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1129 */
+ void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1130 */
+ void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1131 */
+ void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1132 */
+ void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1133 */
+ void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1134 */
+ void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1135 */
+ void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1136 */
+ void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1137 */
+ void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1138 */
+ void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1139 */
+ void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1140 */
+ void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1141 */
+ void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1142 */
+ void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1143 */
+ void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1144 */
+ void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1145 */
+ void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1146 */
+ void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1147 */
+ void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1148 */
+ void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1149 */
+ void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1150 */
+ void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1151 */
+ void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1152 */
+ void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1153 */
+ void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1154 */
+ void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1155 */
#endif /* !defined HAVE_SHARED_GLAPI */
};
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index a600402a6..d060031a4 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -898,6 +898,7 @@
#define glBindSamplers(a1, a2, a3) CALL_BindSamplers(GET_DISPATCH(), (a1, a2, a3))
#define glBindTextures(a1, a2, a3) CALL_BindTextures(GET_DISPATCH(), (a1, a2, a3))
#define glBindVertexBuffers(a1, a2, a3, a4, a5) CALL_BindVertexBuffers(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glClipControl(a1, a2) CALL_ClipControl(GET_DISPATCH(), (a1, a2))
#define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
#define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
#define glInvalidateFramebuffer(a1, a2, a3) CALL_InvalidateFramebuffer(GET_DISPATCH(), (a1, a2, a3))
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index f3380a28a..756f9a60d 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -916,6 +916,7 @@ static const char gl_string_table[] =
"glBindSamplers\0"
"glBindTextures\0"
"glBindVertexBuffers\0"
+ "glClipControl\0"
"glInvalidateBufferData\0"
"glInvalidateBufferSubData\0"
"glInvalidateFramebuffer\0"
@@ -1739,7 +1740,6 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_732 mgl_dispatch_stub_732
#define gl_dispatch_stub_733 mgl_dispatch_stub_733
#define gl_dispatch_stub_828 mgl_dispatch_stub_828
-#define gl_dispatch_stub_871 mgl_dispatch_stub_871
#define gl_dispatch_stub_872 mgl_dispatch_stub_872
#define gl_dispatch_stub_873 mgl_dispatch_stub_873
#define gl_dispatch_stub_874 mgl_dispatch_stub_874
@@ -1747,10 +1747,10 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_876 mgl_dispatch_stub_876
#define gl_dispatch_stub_877 mgl_dispatch_stub_877
#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_880 mgl_dispatch_stub_880
+#define gl_dispatch_stub_879 mgl_dispatch_stub_879
#define gl_dispatch_stub_881 mgl_dispatch_stub_881
#define gl_dispatch_stub_882 mgl_dispatch_stub_882
-#define gl_dispatch_stub_889 mgl_dispatch_stub_889
+#define gl_dispatch_stub_883 mgl_dispatch_stub_883
#define gl_dispatch_stub_890 mgl_dispatch_stub_890
#define gl_dispatch_stub_891 mgl_dispatch_stub_891
#define gl_dispatch_stub_892 mgl_dispatch_stub_892
@@ -1759,7 +1759,7 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_895 mgl_dispatch_stub_895
#define gl_dispatch_stub_896 mgl_dispatch_stub_896
#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_899 mgl_dispatch_stub_899
+#define gl_dispatch_stub_898 mgl_dispatch_stub_898
#define gl_dispatch_stub_900 mgl_dispatch_stub_900
#define gl_dispatch_stub_901 mgl_dispatch_stub_901
#define gl_dispatch_stub_902 mgl_dispatch_stub_902
@@ -1792,20 +1792,20 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_929 mgl_dispatch_stub_929
#define gl_dispatch_stub_930 mgl_dispatch_stub_930
#define gl_dispatch_stub_931 mgl_dispatch_stub_931
-#define gl_dispatch_stub_933 mgl_dispatch_stub_933
+#define gl_dispatch_stub_932 mgl_dispatch_stub_932
#define gl_dispatch_stub_934 mgl_dispatch_stub_934
-#define gl_dispatch_stub_959 mgl_dispatch_stub_959
+#define gl_dispatch_stub_935 mgl_dispatch_stub_935
#define gl_dispatch_stub_960 mgl_dispatch_stub_960
-#define gl_dispatch_stub_1034 mgl_dispatch_stub_1034
+#define gl_dispatch_stub_961 mgl_dispatch_stub_961
#define gl_dispatch_stub_1035 mgl_dispatch_stub_1035
#define gl_dispatch_stub_1036 mgl_dispatch_stub_1036
-#define gl_dispatch_stub_1044 mgl_dispatch_stub_1044
+#define gl_dispatch_stub_1037 mgl_dispatch_stub_1037
#define gl_dispatch_stub_1045 mgl_dispatch_stub_1045
#define gl_dispatch_stub_1046 mgl_dispatch_stub_1046
#define gl_dispatch_stub_1047 mgl_dispatch_stub_1047
-#define gl_dispatch_stub_1050 mgl_dispatch_stub_1050
+#define gl_dispatch_stub_1048 mgl_dispatch_stub_1048
#define gl_dispatch_stub_1051 mgl_dispatch_stub_1051
-#define gl_dispatch_stub_1097 mgl_dispatch_stub_1097
+#define gl_dispatch_stub_1052 mgl_dispatch_stub_1052
#define gl_dispatch_stub_1098 mgl_dispatch_stub_1098
#define gl_dispatch_stub_1099 mgl_dispatch_stub_1099
#define gl_dispatch_stub_1100 mgl_dispatch_stub_1100
@@ -1818,6 +1818,7 @@ static const char gl_string_table[] =
#define gl_dispatch_stub_1107 mgl_dispatch_stub_1107
#define gl_dispatch_stub_1108 mgl_dispatch_stub_1108
#define gl_dispatch_stub_1109 mgl_dispatch_stub_1109
+#define gl_dispatch_stub_1110 mgl_dispatch_stub_1110
#endif /* USE_MGL_NAMESPACE */
@@ -1839,51 +1840,50 @@ void GLAPIENTRY gl_dispatch_stub_731(GLuint id, GLenum pname, GLint64 * params);
void GLAPIENTRY gl_dispatch_stub_732(GLuint id, GLenum pname, GLuint64 * params);
void GLAPIENTRY gl_dispatch_stub_733(GLuint id, GLenum target);
void GLAPIENTRY gl_dispatch_stub_828(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_871(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void GLAPIENTRY gl_dispatch_stub_872(const GLfloat * coords);
-void GLAPIENTRY gl_dispatch_stub_873(GLint x, GLint y, GLint z, GLint width, GLint height);
-void GLAPIENTRY gl_dispatch_stub_874(const GLint * coords);
-void GLAPIENTRY gl_dispatch_stub_875(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void GLAPIENTRY gl_dispatch_stub_876(const GLshort * coords);
-void GLAPIENTRY gl_dispatch_stub_877(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void GLAPIENTRY gl_dispatch_stub_878(const GLfixed * coords);
-GLbitfield GLAPIENTRY gl_dispatch_stub_880(GLfixed * mantissa, GLint * exponent);
-void GLAPIENTRY gl_dispatch_stub_881(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_882(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_889(GLenum target, GLsizei numAttachments, const GLenum * attachments);
-void GLAPIENTRY gl_dispatch_stub_890(GLuint pipeline, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_891(GLuint pipeline);
-GLuint GLAPIENTRY gl_dispatch_stub_892(GLenum type, GLsizei count, const GLchar * const * strings);
-void GLAPIENTRY gl_dispatch_stub_893(GLsizei n, const GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_894(GLsizei n, GLuint * pipelines);
-void GLAPIENTRY gl_dispatch_stub_895(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
-void GLAPIENTRY gl_dispatch_stub_896(GLuint pipeline, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_897(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_899(GLuint program, GLint location, GLfloat x);
-void GLAPIENTRY gl_dispatch_stub_900(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_901(GLuint program, GLint location, GLint x);
-void GLAPIENTRY gl_dispatch_stub_902(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_903(GLuint program, GLint location, GLuint x);
-void GLAPIENTRY gl_dispatch_stub_904(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_905(GLuint program, GLint location, GLfloat x, GLfloat y);
-void GLAPIENTRY gl_dispatch_stub_906(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_907(GLuint program, GLint location, GLint x, GLint y);
-void GLAPIENTRY gl_dispatch_stub_908(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_909(GLuint program, GLint location, GLuint x, GLuint y);
-void GLAPIENTRY gl_dispatch_stub_910(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_911(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
-void GLAPIENTRY gl_dispatch_stub_912(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_913(GLuint program, GLint location, GLint x, GLint y, GLint z);
-void GLAPIENTRY gl_dispatch_stub_914(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_915(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
-void GLAPIENTRY gl_dispatch_stub_916(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_917(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-void GLAPIENTRY gl_dispatch_stub_918(GLuint program, GLint location, GLsizei count, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_919(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
-void GLAPIENTRY gl_dispatch_stub_920(GLuint program, GLint location, GLsizei count, const GLint * value);
-void GLAPIENTRY gl_dispatch_stub_921(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
-void GLAPIENTRY gl_dispatch_stub_922(GLuint program, GLint location, GLsizei count, const GLuint * value);
-void GLAPIENTRY gl_dispatch_stub_923(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_872(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_873(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_874(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_875(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_876(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_877(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_878(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_879(const GLfixed * coords);
+GLbitfield GLAPIENTRY gl_dispatch_stub_881(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_882(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_883(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_890(GLenum target, GLsizei numAttachments, const GLenum * attachments);
+void GLAPIENTRY gl_dispatch_stub_891(GLuint pipeline, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_892(GLuint pipeline);
+GLuint GLAPIENTRY gl_dispatch_stub_893(GLenum type, GLsizei count, const GLchar * const * strings);
+void GLAPIENTRY gl_dispatch_stub_894(GLsizei n, const GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_895(GLsizei n, GLuint * pipelines);
+void GLAPIENTRY gl_dispatch_stub_896(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog);
+void GLAPIENTRY gl_dispatch_stub_897(GLuint pipeline, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_898(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_900(GLuint program, GLint location, GLfloat x);
+void GLAPIENTRY gl_dispatch_stub_901(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_902(GLuint program, GLint location, GLint x);
+void GLAPIENTRY gl_dispatch_stub_903(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_904(GLuint program, GLint location, GLuint x);
+void GLAPIENTRY gl_dispatch_stub_905(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_906(GLuint program, GLint location, GLfloat x, GLfloat y);
+void GLAPIENTRY gl_dispatch_stub_907(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_908(GLuint program, GLint location, GLint x, GLint y);
+void GLAPIENTRY gl_dispatch_stub_909(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_910(GLuint program, GLint location, GLuint x, GLuint y);
+void GLAPIENTRY gl_dispatch_stub_911(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_912(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z);
+void GLAPIENTRY gl_dispatch_stub_913(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_914(GLuint program, GLint location, GLint x, GLint y, GLint z);
+void GLAPIENTRY gl_dispatch_stub_915(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_916(GLuint program, GLint location, GLuint x, GLuint y, GLuint z);
+void GLAPIENTRY gl_dispatch_stub_917(GLuint program, GLint location, GLsizei count, const GLuint * value);
+void GLAPIENTRY gl_dispatch_stub_918(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
+void GLAPIENTRY gl_dispatch_stub_919(GLuint program, GLint location, GLsizei count, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_920(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w);
+void GLAPIENTRY gl_dispatch_stub_921(GLuint program, GLint location, GLsizei count, const GLint * value);
+void GLAPIENTRY gl_dispatch_stub_922(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w);
+void GLAPIENTRY gl_dispatch_stub_923(GLuint program, GLint location, GLsizei count, const GLuint * value);
void GLAPIENTRY gl_dispatch_stub_924(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
void GLAPIENTRY gl_dispatch_stub_925(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
void GLAPIENTRY gl_dispatch_stub_926(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
@@ -1892,32 +1892,33 @@ void GLAPIENTRY gl_dispatch_stub_928(GLuint program, GLint location, GLsizei cou
void GLAPIENTRY gl_dispatch_stub_929(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
void GLAPIENTRY gl_dispatch_stub_930(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
void GLAPIENTRY gl_dispatch_stub_931(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
-void GLAPIENTRY gl_dispatch_stub_933(GLuint pipeline, GLbitfield stages, GLuint program);
-void GLAPIENTRY gl_dispatch_stub_934(GLuint pipeline);
-void GLAPIENTRY gl_dispatch_stub_959(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_960(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1034(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_1035(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_1036(GLsizei n, GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_1044(GLenum coord, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1045(GLenum coord, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1046(GLenum coord, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1047(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_1050(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1051(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_1097(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1098(GLuint queryId, GLuint * queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1099(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_932(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value);
+void GLAPIENTRY gl_dispatch_stub_934(GLuint pipeline, GLbitfield stages, GLuint program);
+void GLAPIENTRY gl_dispatch_stub_935(GLuint pipeline);
+void GLAPIENTRY gl_dispatch_stub_960(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_961(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1035(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_1036(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_1037(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_1045(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1046(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1047(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1048(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_1051(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1052(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1098(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1099(GLuint queryId, GLuint * queryHandle);
void GLAPIENTRY gl_dispatch_stub_1100(GLuint queryHandle);
-void GLAPIENTRY gl_dispatch_stub_1101(GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1102(GLuint queryId, GLuint * nextQueryId);
-void GLAPIENTRY gl_dispatch_stub_1103(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
-void GLAPIENTRY gl_dispatch_stub_1104(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
-void GLAPIENTRY gl_dispatch_stub_1105(GLchar * queryName, GLuint * queryId);
-void GLAPIENTRY gl_dispatch_stub_1106(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
-void GLAPIENTRY gl_dispatch_stub_1107(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_1108(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1101(GLuint queryHandle);
+void GLAPIENTRY gl_dispatch_stub_1102(GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1103(GLuint queryId, GLuint * nextQueryId);
+void GLAPIENTRY gl_dispatch_stub_1104(GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar * counterName, GLuint counterDescLength, GLchar * counterDesc, GLuint * counterOffset, GLuint * counterDataSize, GLuint * counterTypeEnum, GLuint * counterDataTypeEnum, GLuint64 * rawCounterMaxValue);
+void GLAPIENTRY gl_dispatch_stub_1105(GLuint queryHandle, GLuint flags, GLsizei dataSize, GLvoid * data, GLuint * bytesWritten);
+void GLAPIENTRY gl_dispatch_stub_1106(GLchar * queryName, GLuint * queryId);
+void GLAPIENTRY gl_dispatch_stub_1107(GLuint queryId, GLuint queryNameLength, GLchar * queryName, GLuint * dataSize, GLuint * noCounters, GLuint * noInstances, GLuint * capsMask);
+void GLAPIENTRY gl_dispatch_stub_1108(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
void GLAPIENTRY gl_dispatch_stub_1109(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1110(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
#endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
static const glprocs_table_t static_functions[] = {
@@ -2785,808 +2786,809 @@ static const glprocs_table_t static_functions[] = {
NAME_FUNC_OFFSET(14476, glBindSamplers, glBindSamplers, NULL, 861),
NAME_FUNC_OFFSET(14491, glBindTextures, glBindTextures, NULL, 862),
NAME_FUNC_OFFSET(14506, glBindVertexBuffers, glBindVertexBuffers, NULL, 863),
- NAME_FUNC_OFFSET(14526, glInvalidateBufferData, glInvalidateBufferData, NULL, 864),
- NAME_FUNC_OFFSET(14549, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 865),
- NAME_FUNC_OFFSET(14575, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 866),
- NAME_FUNC_OFFSET(14599, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 867),
- NAME_FUNC_OFFSET(14626, glInvalidateTexImage, glInvalidateTexImage, NULL, 868),
- NAME_FUNC_OFFSET(14647, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 869),
- NAME_FUNC_OFFSET(14671, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 870),
- NAME_FUNC_OFFSET(14690, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
+ NAME_FUNC_OFFSET(14526, glClipControl, glClipControl, NULL, 864),
+ NAME_FUNC_OFFSET(14540, glInvalidateBufferData, glInvalidateBufferData, NULL, 865),
+ NAME_FUNC_OFFSET(14563, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 866),
+ NAME_FUNC_OFFSET(14589, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 867),
+ NAME_FUNC_OFFSET(14613, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 868),
+ NAME_FUNC_OFFSET(14640, glInvalidateTexImage, glInvalidateTexImage, NULL, 869),
+ NAME_FUNC_OFFSET(14661, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 870),
+ NAME_FUNC_OFFSET(14685, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 871),
NAME_FUNC_OFFSET(14704, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
- NAME_FUNC_OFFSET(14719, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+ NAME_FUNC_OFFSET(14718, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
NAME_FUNC_OFFSET(14733, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
- NAME_FUNC_OFFSET(14748, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
+ NAME_FUNC_OFFSET(14747, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
NAME_FUNC_OFFSET(14762, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
- NAME_FUNC_OFFSET(14777, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+ NAME_FUNC_OFFSET(14776, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
NAME_FUNC_OFFSET(14791, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
- NAME_FUNC_OFFSET(14806, glPointSizePointerOES, glPointSizePointerOES, NULL, 879),
- NAME_FUNC_OFFSET(14828, gl_dispatch_stub_880, gl_dispatch_stub_880, NULL, 880),
- NAME_FUNC_OFFSET(14846, gl_dispatch_stub_881, gl_dispatch_stub_881, NULL, 881),
- NAME_FUNC_OFFSET(14863, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
- NAME_FUNC_OFFSET(14883, glColorPointerEXT, glColorPointerEXT, NULL, 883),
- NAME_FUNC_OFFSET(14901, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 884),
- NAME_FUNC_OFFSET(14922, glIndexPointerEXT, glIndexPointerEXT, NULL, 885),
- NAME_FUNC_OFFSET(14940, glNormalPointerEXT, glNormalPointerEXT, NULL, 886),
- NAME_FUNC_OFFSET(14959, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 887),
- NAME_FUNC_OFFSET(14980, glVertexPointerEXT, glVertexPointerEXT, NULL, 888),
- NAME_FUNC_OFFSET(14999, gl_dispatch_stub_889, gl_dispatch_stub_889, NULL, 889),
- NAME_FUNC_OFFSET(15023, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
- NAME_FUNC_OFFSET(15045, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
- NAME_FUNC_OFFSET(15067, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
- NAME_FUNC_OFFSET(15090, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
- NAME_FUNC_OFFSET(15115, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
- NAME_FUNC_OFFSET(15137, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(15165, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
- NAME_FUNC_OFFSET(15188, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
- NAME_FUNC_OFFSET(15208, glLockArraysEXT, glLockArraysEXT, NULL, 898),
- NAME_FUNC_OFFSET(15224, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL, 899),
- NAME_FUNC_OFFSET(15243, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
- NAME_FUNC_OFFSET(15263, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
- NAME_FUNC_OFFSET(15282, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
- NAME_FUNC_OFFSET(15302, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
- NAME_FUNC_OFFSET(15322, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
- NAME_FUNC_OFFSET(15343, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
- NAME_FUNC_OFFSET(15362, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
- NAME_FUNC_OFFSET(15382, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
- NAME_FUNC_OFFSET(15401, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
- NAME_FUNC_OFFSET(15421, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
- NAME_FUNC_OFFSET(15441, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
- NAME_FUNC_OFFSET(15462, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
- NAME_FUNC_OFFSET(15481, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
- NAME_FUNC_OFFSET(15501, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
- NAME_FUNC_OFFSET(15520, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
- NAME_FUNC_OFFSET(15540, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
- NAME_FUNC_OFFSET(15560, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
- NAME_FUNC_OFFSET(15581, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
- NAME_FUNC_OFFSET(15600, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
- NAME_FUNC_OFFSET(15620, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
- NAME_FUNC_OFFSET(15639, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
- NAME_FUNC_OFFSET(15659, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
- NAME_FUNC_OFFSET(15679, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
- NAME_FUNC_OFFSET(15700, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
- NAME_FUNC_OFFSET(15726, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
- NAME_FUNC_OFFSET(15754, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
- NAME_FUNC_OFFSET(15782, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
- NAME_FUNC_OFFSET(15808, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
- NAME_FUNC_OFFSET(15836, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
- NAME_FUNC_OFFSET(15864, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
- NAME_FUNC_OFFSET(15890, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
- NAME_FUNC_OFFSET(15918, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
- NAME_FUNC_OFFSET(15946, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 932),
- NAME_FUNC_OFFSET(15964, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
- NAME_FUNC_OFFSET(15983, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
- NAME_FUNC_OFFSET(16009, glDebugMessageCallback, glDebugMessageCallback, NULL, 935),
- NAME_FUNC_OFFSET(16032, glDebugMessageControl, glDebugMessageControl, NULL, 936),
- NAME_FUNC_OFFSET(16054, glDebugMessageInsert, glDebugMessageInsert, NULL, 937),
- NAME_FUNC_OFFSET(16075, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 938),
- NAME_FUNC_OFFSET(16096, glGetObjectLabel, glGetObjectLabel, NULL, 939),
- NAME_FUNC_OFFSET(16113, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 940),
- NAME_FUNC_OFFSET(16133, glObjectLabel, glObjectLabel, NULL, 941),
- NAME_FUNC_OFFSET(16147, glObjectPtrLabel, glObjectPtrLabel, NULL, 942),
- NAME_FUNC_OFFSET(16164, glPopDebugGroup, glPopDebugGroup, NULL, 943),
- NAME_FUNC_OFFSET(16180, glPushDebugGroup, glPushDebugGroup, NULL, 944),
- NAME_FUNC_OFFSET(16197, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 945),
- NAME_FUNC_OFFSET(16219, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 946),
- NAME_FUNC_OFFSET(16242, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 947),
- NAME_FUNC_OFFSET(16265, glFogCoordfEXT, glFogCoordfEXT, NULL, 948),
- NAME_FUNC_OFFSET(16280, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 949),
- NAME_FUNC_OFFSET(16296, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 950),
- NAME_FUNC_OFFSET(16316, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 951),
- NAME_FUNC_OFFSET(16334, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 952),
- NAME_FUNC_OFFSET(16353, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 953),
- NAME_FUNC_OFFSET(16371, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 954),
- NAME_FUNC_OFFSET(16390, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 955),
- NAME_FUNC_OFFSET(16408, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 956),
- NAME_FUNC_OFFSET(16427, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 957),
- NAME_FUNC_OFFSET(16445, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 958),
- NAME_FUNC_OFFSET(16464, gl_dispatch_stub_959, gl_dispatch_stub_959, NULL, 959),
- NAME_FUNC_OFFSET(16489, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
- NAME_FUNC_OFFSET(16516, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 961),
- NAME_FUNC_OFFSET(16540, glExecuteProgramNV, glExecuteProgramNV, NULL, 962),
- NAME_FUNC_OFFSET(16559, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 963),
- NAME_FUNC_OFFSET(16585, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 964),
- NAME_FUNC_OFFSET(16611, glGetProgramStringNV, glGetProgramStringNV, NULL, 965),
- NAME_FUNC_OFFSET(16632, glGetProgramivNV, glGetProgramivNV, NULL, 966),
- NAME_FUNC_OFFSET(16649, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 967),
- NAME_FUNC_OFFSET(16670, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 968),
- NAME_FUNC_OFFSET(16692, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 969),
- NAME_FUNC_OFFSET(16714, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 970),
- NAME_FUNC_OFFSET(16736, glLoadProgramNV, glLoadProgramNV, NULL, 971),
- NAME_FUNC_OFFSET(16752, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 972),
- NAME_FUNC_OFFSET(16777, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 973),
- NAME_FUNC_OFFSET(16802, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 974),
- NAME_FUNC_OFFSET(16830, glTrackMatrixNV, glTrackMatrixNV, NULL, 975),
- NAME_FUNC_OFFSET(16846, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 976),
- NAME_FUNC_OFFSET(16865, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 977),
- NAME_FUNC_OFFSET(16885, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 978),
- NAME_FUNC_OFFSET(16904, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 979),
- NAME_FUNC_OFFSET(16924, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 980),
- NAME_FUNC_OFFSET(16943, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 981),
- NAME_FUNC_OFFSET(16963, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 982),
- NAME_FUNC_OFFSET(16982, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 983),
- NAME_FUNC_OFFSET(17002, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 984),
- NAME_FUNC_OFFSET(17021, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 985),
- NAME_FUNC_OFFSET(17041, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 986),
- NAME_FUNC_OFFSET(17060, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 987),
- NAME_FUNC_OFFSET(17080, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 988),
- NAME_FUNC_OFFSET(17099, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 989),
- NAME_FUNC_OFFSET(17119, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 990),
- NAME_FUNC_OFFSET(17138, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 991),
- NAME_FUNC_OFFSET(17158, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 992),
- NAME_FUNC_OFFSET(17177, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 993),
- NAME_FUNC_OFFSET(17197, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 994),
- NAME_FUNC_OFFSET(17216, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 995),
- NAME_FUNC_OFFSET(17236, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 996),
- NAME_FUNC_OFFSET(17255, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 997),
- NAME_FUNC_OFFSET(17275, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 998),
- NAME_FUNC_OFFSET(17294, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 999),
- NAME_FUNC_OFFSET(17314, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1000),
- NAME_FUNC_OFFSET(17334, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1001),
- NAME_FUNC_OFFSET(17355, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1002),
- NAME_FUNC_OFFSET(17379, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1003),
- NAME_FUNC_OFFSET(17400, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1004),
- NAME_FUNC_OFFSET(17421, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1005),
- NAME_FUNC_OFFSET(17442, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1006),
- NAME_FUNC_OFFSET(17463, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1007),
- NAME_FUNC_OFFSET(17484, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1008),
- NAME_FUNC_OFFSET(17505, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1009),
- NAME_FUNC_OFFSET(17526, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1010),
- NAME_FUNC_OFFSET(17547, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1011),
- NAME_FUNC_OFFSET(17568, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1012),
- NAME_FUNC_OFFSET(17589, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1013),
- NAME_FUNC_OFFSET(17610, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1014),
- NAME_FUNC_OFFSET(17631, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1015),
- NAME_FUNC_OFFSET(17653, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1016),
- NAME_FUNC_OFFSET(17680, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1017),
- NAME_FUNC_OFFSET(17707, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1018),
- NAME_FUNC_OFFSET(17731, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1019),
- NAME_FUNC_OFFSET(17755, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1020),
- NAME_FUNC_OFFSET(17777, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1021),
- NAME_FUNC_OFFSET(17799, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1022),
- NAME_FUNC_OFFSET(17821, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1023),
- NAME_FUNC_OFFSET(17846, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1024),
- NAME_FUNC_OFFSET(17870, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1025),
- NAME_FUNC_OFFSET(17892, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1026),
- NAME_FUNC_OFFSET(17914, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1027),
- NAME_FUNC_OFFSET(17936, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1028),
- NAME_FUNC_OFFSET(17962, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1029),
- NAME_FUNC_OFFSET(17985, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1030),
- NAME_FUNC_OFFSET(18009, glPassTexCoordATI, glPassTexCoordATI, NULL, 1031),
- NAME_FUNC_OFFSET(18027, glSampleMapATI, glSampleMapATI, NULL, 1032),
- NAME_FUNC_OFFSET(18042, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1033),
- NAME_FUNC_OFFSET(18073, gl_dispatch_stub_1034, gl_dispatch_stub_1034, NULL, 1034),
- NAME_FUNC_OFFSET(18096, gl_dispatch_stub_1035, gl_dispatch_stub_1035, NULL, 1035),
- NAME_FUNC_OFFSET(18119, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
- NAME_FUNC_OFFSET(18142, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1037),
- NAME_FUNC_OFFSET(18173, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1038),
- NAME_FUNC_OFFSET(18204, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1039),
- NAME_FUNC_OFFSET(18232, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1040),
- NAME_FUNC_OFFSET(18261, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1041),
- NAME_FUNC_OFFSET(18289, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1042),
- NAME_FUNC_OFFSET(18318, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1043),
- NAME_FUNC_OFFSET(18339, gl_dispatch_stub_1044, gl_dispatch_stub_1044, NULL, 1044),
- NAME_FUNC_OFFSET(18356, gl_dispatch_stub_1045, gl_dispatch_stub_1045, NULL, 1045),
- NAME_FUNC_OFFSET(18369, gl_dispatch_stub_1046, gl_dispatch_stub_1046, NULL, 1046),
+ NAME_FUNC_OFFSET(14805, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
+ NAME_FUNC_OFFSET(14820, glPointSizePointerOES, glPointSizePointerOES, NULL, 880),
+ NAME_FUNC_OFFSET(14842, gl_dispatch_stub_881, gl_dispatch_stub_881, NULL, 881),
+ NAME_FUNC_OFFSET(14860, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
+ NAME_FUNC_OFFSET(14877, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+ NAME_FUNC_OFFSET(14897, glColorPointerEXT, glColorPointerEXT, NULL, 884),
+ NAME_FUNC_OFFSET(14915, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 885),
+ NAME_FUNC_OFFSET(14936, glIndexPointerEXT, glIndexPointerEXT, NULL, 886),
+ NAME_FUNC_OFFSET(14954, glNormalPointerEXT, glNormalPointerEXT, NULL, 887),
+ NAME_FUNC_OFFSET(14973, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 888),
+ NAME_FUNC_OFFSET(14994, glVertexPointerEXT, glVertexPointerEXT, NULL, 889),
+ NAME_FUNC_OFFSET(15013, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
+ NAME_FUNC_OFFSET(15037, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
+ NAME_FUNC_OFFSET(15059, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
+ NAME_FUNC_OFFSET(15081, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
+ NAME_FUNC_OFFSET(15104, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
+ NAME_FUNC_OFFSET(15129, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+ NAME_FUNC_OFFSET(15151, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
+ NAME_FUNC_OFFSET(15179, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
+ NAME_FUNC_OFFSET(15202, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
+ NAME_FUNC_OFFSET(15222, glLockArraysEXT, glLockArraysEXT, NULL, 899),
+ NAME_FUNC_OFFSET(15238, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
+ NAME_FUNC_OFFSET(15257, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+ NAME_FUNC_OFFSET(15277, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+ NAME_FUNC_OFFSET(15296, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+ NAME_FUNC_OFFSET(15316, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+ NAME_FUNC_OFFSET(15336, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+ NAME_FUNC_OFFSET(15357, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
+ NAME_FUNC_OFFSET(15376, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
+ NAME_FUNC_OFFSET(15396, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
+ NAME_FUNC_OFFSET(15415, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
+ NAME_FUNC_OFFSET(15435, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
+ NAME_FUNC_OFFSET(15455, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
+ NAME_FUNC_OFFSET(15476, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
+ NAME_FUNC_OFFSET(15495, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
+ NAME_FUNC_OFFSET(15515, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
+ NAME_FUNC_OFFSET(15534, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
+ NAME_FUNC_OFFSET(15554, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
+ NAME_FUNC_OFFSET(15574, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
+ NAME_FUNC_OFFSET(15595, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
+ NAME_FUNC_OFFSET(15614, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
+ NAME_FUNC_OFFSET(15634, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
+ NAME_FUNC_OFFSET(15653, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
+ NAME_FUNC_OFFSET(15673, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
+ NAME_FUNC_OFFSET(15693, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
+ NAME_FUNC_OFFSET(15714, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
+ NAME_FUNC_OFFSET(15740, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
+ NAME_FUNC_OFFSET(15768, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
+ NAME_FUNC_OFFSET(15796, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
+ NAME_FUNC_OFFSET(15822, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
+ NAME_FUNC_OFFSET(15850, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
+ NAME_FUNC_OFFSET(15878, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
+ NAME_FUNC_OFFSET(15904, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
+ NAME_FUNC_OFFSET(15932, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
+ NAME_FUNC_OFFSET(15960, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 933),
+ NAME_FUNC_OFFSET(15978, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
+ NAME_FUNC_OFFSET(15997, gl_dispatch_stub_935, gl_dispatch_stub_935, NULL, 935),
+ NAME_FUNC_OFFSET(16023, glDebugMessageCallback, glDebugMessageCallback, NULL, 936),
+ NAME_FUNC_OFFSET(16046, glDebugMessageControl, glDebugMessageControl, NULL, 937),
+ NAME_FUNC_OFFSET(16068, glDebugMessageInsert, glDebugMessageInsert, NULL, 938),
+ NAME_FUNC_OFFSET(16089, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 939),
+ NAME_FUNC_OFFSET(16110, glGetObjectLabel, glGetObjectLabel, NULL, 940),
+ NAME_FUNC_OFFSET(16127, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 941),
+ NAME_FUNC_OFFSET(16147, glObjectLabel, glObjectLabel, NULL, 942),
+ NAME_FUNC_OFFSET(16161, glObjectPtrLabel, glObjectPtrLabel, NULL, 943),
+ NAME_FUNC_OFFSET(16178, glPopDebugGroup, glPopDebugGroup, NULL, 944),
+ NAME_FUNC_OFFSET(16194, glPushDebugGroup, glPushDebugGroup, NULL, 945),
+ NAME_FUNC_OFFSET(16211, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 946),
+ NAME_FUNC_OFFSET(16233, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 947),
+ NAME_FUNC_OFFSET(16256, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 948),
+ NAME_FUNC_OFFSET(16279, glFogCoordfEXT, glFogCoordfEXT, NULL, 949),
+ NAME_FUNC_OFFSET(16294, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 950),
+ NAME_FUNC_OFFSET(16310, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 951),
+ NAME_FUNC_OFFSET(16330, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 952),
+ NAME_FUNC_OFFSET(16348, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 953),
+ NAME_FUNC_OFFSET(16367, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 954),
+ NAME_FUNC_OFFSET(16385, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 955),
+ NAME_FUNC_OFFSET(16404, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 956),
+ NAME_FUNC_OFFSET(16422, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 957),
+ NAME_FUNC_OFFSET(16441, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 958),
+ NAME_FUNC_OFFSET(16459, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 959),
+ NAME_FUNC_OFFSET(16478, gl_dispatch_stub_960, gl_dispatch_stub_960, NULL, 960),
+ NAME_FUNC_OFFSET(16503, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+ NAME_FUNC_OFFSET(16530, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 962),
+ NAME_FUNC_OFFSET(16554, glExecuteProgramNV, glExecuteProgramNV, NULL, 963),
+ NAME_FUNC_OFFSET(16573, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 964),
+ NAME_FUNC_OFFSET(16599, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 965),
+ NAME_FUNC_OFFSET(16625, glGetProgramStringNV, glGetProgramStringNV, NULL, 966),
+ NAME_FUNC_OFFSET(16646, glGetProgramivNV, glGetProgramivNV, NULL, 967),
+ NAME_FUNC_OFFSET(16663, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 968),
+ NAME_FUNC_OFFSET(16684, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 969),
+ NAME_FUNC_OFFSET(16706, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 970),
+ NAME_FUNC_OFFSET(16728, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 971),
+ NAME_FUNC_OFFSET(16750, glLoadProgramNV, glLoadProgramNV, NULL, 972),
+ NAME_FUNC_OFFSET(16766, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 973),
+ NAME_FUNC_OFFSET(16791, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 974),
+ NAME_FUNC_OFFSET(16816, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 975),
+ NAME_FUNC_OFFSET(16844, glTrackMatrixNV, glTrackMatrixNV, NULL, 976),
+ NAME_FUNC_OFFSET(16860, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 977),
+ NAME_FUNC_OFFSET(16879, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 978),
+ NAME_FUNC_OFFSET(16899, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 979),
+ NAME_FUNC_OFFSET(16918, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 980),
+ NAME_FUNC_OFFSET(16938, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 981),
+ NAME_FUNC_OFFSET(16957, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 982),
+ NAME_FUNC_OFFSET(16977, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 983),
+ NAME_FUNC_OFFSET(16996, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 984),
+ NAME_FUNC_OFFSET(17016, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 985),
+ NAME_FUNC_OFFSET(17035, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 986),
+ NAME_FUNC_OFFSET(17055, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 987),
+ NAME_FUNC_OFFSET(17074, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 988),
+ NAME_FUNC_OFFSET(17094, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 989),
+ NAME_FUNC_OFFSET(17113, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 990),
+ NAME_FUNC_OFFSET(17133, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 991),
+ NAME_FUNC_OFFSET(17152, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 992),
+ NAME_FUNC_OFFSET(17172, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 993),
+ NAME_FUNC_OFFSET(17191, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 994),
+ NAME_FUNC_OFFSET(17211, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 995),
+ NAME_FUNC_OFFSET(17230, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 996),
+ NAME_FUNC_OFFSET(17250, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 997),
+ NAME_FUNC_OFFSET(17269, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 998),
+ NAME_FUNC_OFFSET(17289, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 999),
+ NAME_FUNC_OFFSET(17308, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 1000),
+ NAME_FUNC_OFFSET(17328, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 1001),
+ NAME_FUNC_OFFSET(17348, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 1002),
+ NAME_FUNC_OFFSET(17369, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 1003),
+ NAME_FUNC_OFFSET(17393, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 1004),
+ NAME_FUNC_OFFSET(17414, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 1005),
+ NAME_FUNC_OFFSET(17435, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1006),
+ NAME_FUNC_OFFSET(17456, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1007),
+ NAME_FUNC_OFFSET(17477, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1008),
+ NAME_FUNC_OFFSET(17498, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1009),
+ NAME_FUNC_OFFSET(17519, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1010),
+ NAME_FUNC_OFFSET(17540, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1011),
+ NAME_FUNC_OFFSET(17561, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1012),
+ NAME_FUNC_OFFSET(17582, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1013),
+ NAME_FUNC_OFFSET(17603, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1014),
+ NAME_FUNC_OFFSET(17624, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1015),
+ NAME_FUNC_OFFSET(17645, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1016),
+ NAME_FUNC_OFFSET(17667, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1017),
+ NAME_FUNC_OFFSET(17694, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1018),
+ NAME_FUNC_OFFSET(17721, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1019),
+ NAME_FUNC_OFFSET(17745, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1020),
+ NAME_FUNC_OFFSET(17769, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1021),
+ NAME_FUNC_OFFSET(17791, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1022),
+ NAME_FUNC_OFFSET(17813, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1023),
+ NAME_FUNC_OFFSET(17835, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1024),
+ NAME_FUNC_OFFSET(17860, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1025),
+ NAME_FUNC_OFFSET(17884, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1026),
+ NAME_FUNC_OFFSET(17906, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1027),
+ NAME_FUNC_OFFSET(17928, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1028),
+ NAME_FUNC_OFFSET(17950, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1029),
+ NAME_FUNC_OFFSET(17976, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1030),
+ NAME_FUNC_OFFSET(17999, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1031),
+ NAME_FUNC_OFFSET(18023, glPassTexCoordATI, glPassTexCoordATI, NULL, 1032),
+ NAME_FUNC_OFFSET(18041, glSampleMapATI, glSampleMapATI, NULL, 1033),
+ NAME_FUNC_OFFSET(18056, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1034),
+ NAME_FUNC_OFFSET(18087, gl_dispatch_stub_1035, gl_dispatch_stub_1035, NULL, 1035),
+ NAME_FUNC_OFFSET(18110, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
+ NAME_FUNC_OFFSET(18133, gl_dispatch_stub_1037, gl_dispatch_stub_1037, NULL, 1037),
+ NAME_FUNC_OFFSET(18156, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1038),
+ NAME_FUNC_OFFSET(18187, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1039),
+ NAME_FUNC_OFFSET(18218, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1040),
+ NAME_FUNC_OFFSET(18246, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1041),
+ NAME_FUNC_OFFSET(18275, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1042),
+ NAME_FUNC_OFFSET(18303, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1043),
+ NAME_FUNC_OFFSET(18332, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1044),
+ NAME_FUNC_OFFSET(18353, gl_dispatch_stub_1045, gl_dispatch_stub_1045, NULL, 1045),
+ NAME_FUNC_OFFSET(18370, gl_dispatch_stub_1046, gl_dispatch_stub_1046, NULL, 1046),
NAME_FUNC_OFFSET(18383, gl_dispatch_stub_1047, gl_dispatch_stub_1047, NULL, 1047),
- NAME_FUNC_OFFSET(18400, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1048),
- NAME_FUNC_OFFSET(18421, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1049),
- NAME_FUNC_OFFSET(18443, gl_dispatch_stub_1050, gl_dispatch_stub_1050, NULL, 1050),
- NAME_FUNC_OFFSET(18467, gl_dispatch_stub_1051, gl_dispatch_stub_1051, NULL, 1051),
- NAME_FUNC_OFFSET(18497, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1052),
- NAME_FUNC_OFFSET(18518, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1053),
- NAME_FUNC_OFFSET(18540, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1054),
- NAME_FUNC_OFFSET(18561, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1055),
- NAME_FUNC_OFFSET(18583, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1056),
- NAME_FUNC_OFFSET(18605, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1057),
- NAME_FUNC_OFFSET(18628, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1058),
- NAME_FUNC_OFFSET(18649, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1059),
- NAME_FUNC_OFFSET(18671, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1060),
- NAME_FUNC_OFFSET(18693, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1061),
- NAME_FUNC_OFFSET(18716, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1062),
- NAME_FUNC_OFFSET(18737, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1063),
- NAME_FUNC_OFFSET(18759, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1064),
- NAME_FUNC_OFFSET(18781, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1065),
- NAME_FUNC_OFFSET(18804, glClearColorIiEXT, glClearColorIiEXT, NULL, 1066),
- NAME_FUNC_OFFSET(18822, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1067),
- NAME_FUNC_OFFSET(18841, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1068),
- NAME_FUNC_OFFSET(18863, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1069),
- NAME_FUNC_OFFSET(18885, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1070),
- NAME_FUNC_OFFSET(18909, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1071),
- NAME_FUNC_OFFSET(18929, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1072),
- NAME_FUNC_OFFSET(18950, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1073),
- NAME_FUNC_OFFSET(18981, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1074),
- NAME_FUNC_OFFSET(19012, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1075),
- NAME_FUNC_OFFSET(19045, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1076),
- NAME_FUNC_OFFSET(19073, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1077),
- NAME_FUNC_OFFSET(19104, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1078),
- NAME_FUNC_OFFSET(19130, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1079),
- NAME_FUNC_OFFSET(19161, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1080),
- NAME_FUNC_OFFSET(19189, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1081),
- NAME_FUNC_OFFSET(19212, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1082),
- NAME_FUNC_OFFSET(19237, glActiveProgramEXT, glActiveProgramEXT, NULL, 1083),
- NAME_FUNC_OFFSET(19256, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1084),
- NAME_FUNC_OFFSET(19281, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1085),
- NAME_FUNC_OFFSET(19303, glTextureBarrierNV, glTextureBarrierNV, NULL, 1086),
- NAME_FUNC_OFFSET(19322, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1087),
- NAME_FUNC_OFFSET(19336, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1088),
- NAME_FUNC_OFFSET(19358, glVDPAUInitNV, glVDPAUInitNV, NULL, 1089),
- NAME_FUNC_OFFSET(19372, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1090),
- NAME_FUNC_OFFSET(19391, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1091),
- NAME_FUNC_OFFSET(19412, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1092),
- NAME_FUNC_OFFSET(19443, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1093),
- NAME_FUNC_OFFSET(19473, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1094),
- NAME_FUNC_OFFSET(19496, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1095),
- NAME_FUNC_OFFSET(19519, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1096),
- NAME_FUNC_OFFSET(19546, gl_dispatch_stub_1097, gl_dispatch_stub_1097, NULL, 1097),
- NAME_FUNC_OFFSET(19568, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
- NAME_FUNC_OFFSET(19591, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
- NAME_FUNC_OFFSET(19614, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
- NAME_FUNC_OFFSET(19634, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
- NAME_FUNC_OFFSET(19661, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
- NAME_FUNC_OFFSET(19687, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
- NAME_FUNC_OFFSET(19713, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
- NAME_FUNC_OFFSET(19737, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
- NAME_FUNC_OFFSET(19765, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
- NAME_FUNC_OFFSET(19789, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
- NAME_FUNC_OFFSET(19814, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
- NAME_FUNC_OFFSET(19843, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
- NAME_FUNC_OFFSET(19874, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1110),
- NAME_FUNC_OFFSET(19913, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1111),
- NAME_FUNC_OFFSET(19942, glAlphaFuncx, glAlphaFuncx, NULL, 1112),
- NAME_FUNC_OFFSET(19955, glClearColorx, glClearColorx, NULL, 1113),
- NAME_FUNC_OFFSET(19969, glClearDepthx, glClearDepthx, NULL, 1114),
- NAME_FUNC_OFFSET(19983, glColor4x, glColor4x, NULL, 1115),
- NAME_FUNC_OFFSET(19993, glDepthRangex, glDepthRangex, NULL, 1116),
- NAME_FUNC_OFFSET(20007, glFogx, glFogx, NULL, 1117),
- NAME_FUNC_OFFSET(20014, glFogxv, glFogxv, NULL, 1118),
- NAME_FUNC_OFFSET(20022, glFrustumf, glFrustumf, NULL, 1119),
- NAME_FUNC_OFFSET(20033, glFrustumx, glFrustumx, NULL, 1120),
- NAME_FUNC_OFFSET(20044, glLightModelx, glLightModelx, NULL, 1121),
- NAME_FUNC_OFFSET(20058, glLightModelxv, glLightModelxv, NULL, 1122),
- NAME_FUNC_OFFSET(20073, glLightx, glLightx, NULL, 1123),
- NAME_FUNC_OFFSET(20082, glLightxv, glLightxv, NULL, 1124),
- NAME_FUNC_OFFSET(20092, glLineWidthx, glLineWidthx, NULL, 1125),
- NAME_FUNC_OFFSET(20105, glLoadMatrixx, glLoadMatrixx, NULL, 1126),
- NAME_FUNC_OFFSET(20119, glMaterialx, glMaterialx, NULL, 1127),
- NAME_FUNC_OFFSET(20131, glMaterialxv, glMaterialxv, NULL, 1128),
- NAME_FUNC_OFFSET(20144, glMultMatrixx, glMultMatrixx, NULL, 1129),
- NAME_FUNC_OFFSET(20158, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1130),
- NAME_FUNC_OFFSET(20176, glNormal3x, glNormal3x, NULL, 1131),
- NAME_FUNC_OFFSET(20187, glOrthof, glOrthof, NULL, 1132),
- NAME_FUNC_OFFSET(20196, glOrthox, glOrthox, NULL, 1133),
- NAME_FUNC_OFFSET(20205, glPointSizex, glPointSizex, NULL, 1134),
- NAME_FUNC_OFFSET(20218, glPolygonOffsetx, glPolygonOffsetx, NULL, 1135),
- NAME_FUNC_OFFSET(20235, glRotatex, glRotatex, NULL, 1136),
- NAME_FUNC_OFFSET(20245, glSampleCoveragex, glSampleCoveragex, NULL, 1137),
- NAME_FUNC_OFFSET(20263, glScalex, glScalex, NULL, 1138),
- NAME_FUNC_OFFSET(20272, glTexEnvx, glTexEnvx, NULL, 1139),
- NAME_FUNC_OFFSET(20282, glTexEnvxv, glTexEnvxv, NULL, 1140),
- NAME_FUNC_OFFSET(20293, glTexParameterx, glTexParameterx, NULL, 1141),
- NAME_FUNC_OFFSET(20309, glTranslatex, glTranslatex, NULL, 1142),
- NAME_FUNC_OFFSET(20322, glClipPlanef, glClipPlanef, NULL, 1143),
- NAME_FUNC_OFFSET(20335, glClipPlanex, glClipPlanex, NULL, 1144),
- NAME_FUNC_OFFSET(20348, glGetClipPlanef, glGetClipPlanef, NULL, 1145),
- NAME_FUNC_OFFSET(20364, glGetClipPlanex, glGetClipPlanex, NULL, 1146),
- NAME_FUNC_OFFSET(20380, glGetFixedv, glGetFixedv, NULL, 1147),
- NAME_FUNC_OFFSET(20392, glGetLightxv, glGetLightxv, NULL, 1148),
- NAME_FUNC_OFFSET(20405, glGetMaterialxv, glGetMaterialxv, NULL, 1149),
- NAME_FUNC_OFFSET(20421, glGetTexEnvxv, glGetTexEnvxv, NULL, 1150),
- NAME_FUNC_OFFSET(20435, glGetTexParameterxv, glGetTexParameterxv, NULL, 1151),
- NAME_FUNC_OFFSET(20455, glPointParameterx, glPointParameterx, NULL, 1152),
- NAME_FUNC_OFFSET(20473, glPointParameterxv, glPointParameterxv, NULL, 1153),
- NAME_FUNC_OFFSET(20492, glTexParameterxv, glTexParameterxv, NULL, 1154),
- NAME_FUNC_OFFSET(20509, glTexGenf, glTexGenf, NULL, 190),
- NAME_FUNC_OFFSET(20522, glTexGenfv, glTexGenfv, NULL, 191),
- NAME_FUNC_OFFSET(20536, glTexGeni, glTexGeni, NULL, 192),
- NAME_FUNC_OFFSET(20549, glTexGeniv, glTexGeniv, NULL, 193),
- NAME_FUNC_OFFSET(20563, glReadBuffer, glReadBuffer, NULL, 254),
- NAME_FUNC_OFFSET(20578, glGetTexGenfv, glGetTexGenfv, NULL, 279),
- NAME_FUNC_OFFSET(20595, glGetTexGeniv, glGetTexGeniv, NULL, 280),
- NAME_FUNC_OFFSET(20612, glArrayElement, glArrayElement, NULL, 306),
- NAME_FUNC_OFFSET(20630, glBindTexture, glBindTexture, NULL, 307),
- NAME_FUNC_OFFSET(20647, glDrawArrays, glDrawArrays, NULL, 310),
- NAME_FUNC_OFFSET(20663, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
- NAME_FUNC_OFFSET(20688, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
- NAME_FUNC_OFFSET(20708, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
- NAME_FUNC_OFFSET(20728, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
- NAME_FUNC_OFFSET(20751, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
- NAME_FUNC_OFFSET(20774, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
- NAME_FUNC_OFFSET(20794, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
- NAME_FUNC_OFFSET(20811, glGetPointerv, glGetPointerv, NULL, 329),
- NAME_FUNC_OFFSET(20828, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
- NAME_FUNC_OFFSET(20843, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
- NAME_FUNC_OFFSET(20867, glTexSubImage1D, glTexSubImage1D, NULL, 332),
- NAME_FUNC_OFFSET(20886, glTexSubImage2D, glTexSubImage2D, NULL, 333),
- NAME_FUNC_OFFSET(20905, glBlendColor, glBlendColor, NULL, 336),
- NAME_FUNC_OFFSET(20921, glBlendEquation, glBlendEquation, NULL, 337),
- NAME_FUNC_OFFSET(20940, glBlendEquation, glBlendEquation, NULL, 337),
- NAME_FUNC_OFFSET(20959, glDrawRangeElements, glDrawRangeElements, NULL, 338),
- NAME_FUNC_OFFSET(20982, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(20998, glColorTable, glColorTable, NULL, 339),
- NAME_FUNC_OFFSET(21014, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
- NAME_FUNC_OFFSET(21041, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
- NAME_FUNC_OFFSET(21068, glCopyColorTable, glCopyColorTable, NULL, 342),
- NAME_FUNC_OFFSET(21088, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(21107, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
- NAME_FUNC_OFFSET(21126, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(21156, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
- NAME_FUNC_OFFSET(21186, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(21216, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
- NAME_FUNC_OFFSET(21246, glColorSubTable, glColorSubTable, NULL, 346),
- NAME_FUNC_OFFSET(21265, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
- NAME_FUNC_OFFSET(21288, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
- NAME_FUNC_OFFSET(21313, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
- NAME_FUNC_OFFSET(21338, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
- NAME_FUNC_OFFSET(21365, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
- NAME_FUNC_OFFSET(21393, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
- NAME_FUNC_OFFSET(21420, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
- NAME_FUNC_OFFSET(21448, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
- NAME_FUNC_OFFSET(21477, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
- NAME_FUNC_OFFSET(21506, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
- NAME_FUNC_OFFSET(21532, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
- NAME_FUNC_OFFSET(21563, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
- NAME_FUNC_OFFSET(21594, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
- NAME_FUNC_OFFSET(21618, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
- NAME_FUNC_OFFSET(21641, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
- NAME_FUNC_OFFSET(21659, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
- NAME_FUNC_OFFSET(21688, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
- NAME_FUNC_OFFSET(21717, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
- NAME_FUNC_OFFSET(21732, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
- NAME_FUNC_OFFSET(21758, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
- NAME_FUNC_OFFSET(21784, glHistogram, glHistogram, NULL, 367),
- NAME_FUNC_OFFSET(21799, glMinmax, glMinmax, NULL, 368),
- NAME_FUNC_OFFSET(21811, glResetHistogram, glResetHistogram, NULL, 369),
- NAME_FUNC_OFFSET(21831, glResetMinmax, glResetMinmax, NULL, 370),
- NAME_FUNC_OFFSET(21848, glTexImage3D, glTexImage3D, NULL, 371),
- NAME_FUNC_OFFSET(21864, glTexImage3D, glTexImage3D, NULL, 371),
- NAME_FUNC_OFFSET(21880, glTexSubImage3D, glTexSubImage3D, NULL, 372),
- NAME_FUNC_OFFSET(21899, glTexSubImage3D, glTexSubImage3D, NULL, 372),
- NAME_FUNC_OFFSET(21918, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
- NAME_FUNC_OFFSET(21941, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
- NAME_FUNC_OFFSET(21964, glActiveTexture, glActiveTexture, NULL, 374),
- NAME_FUNC_OFFSET(21983, glClientActiveTexture, glClientActiveTexture, NULL, 375),
- NAME_FUNC_OFFSET(22008, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
- NAME_FUNC_OFFSET(22029, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
- NAME_FUNC_OFFSET(22051, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
- NAME_FUNC_OFFSET(22069, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
- NAME_FUNC_OFFSET(22088, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
- NAME_FUNC_OFFSET(22109, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
- NAME_FUNC_OFFSET(22131, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
- NAME_FUNC_OFFSET(22152, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
- NAME_FUNC_OFFSET(22174, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
- NAME_FUNC_OFFSET(22195, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
- NAME_FUNC_OFFSET(22217, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
- NAME_FUNC_OFFSET(22235, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
- NAME_FUNC_OFFSET(22254, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
- NAME_FUNC_OFFSET(22275, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
- NAME_FUNC_OFFSET(22297, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
- NAME_FUNC_OFFSET(22318, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
- NAME_FUNC_OFFSET(22340, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
- NAME_FUNC_OFFSET(22361, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
- NAME_FUNC_OFFSET(22383, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
- NAME_FUNC_OFFSET(22401, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
- NAME_FUNC_OFFSET(22420, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
- NAME_FUNC_OFFSET(22441, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
- NAME_FUNC_OFFSET(22463, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
- NAME_FUNC_OFFSET(22484, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
- NAME_FUNC_OFFSET(22506, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
- NAME_FUNC_OFFSET(22527, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
- NAME_FUNC_OFFSET(22549, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
- NAME_FUNC_OFFSET(22567, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
- NAME_FUNC_OFFSET(22586, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
- NAME_FUNC_OFFSET(22607, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
- NAME_FUNC_OFFSET(22629, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
- NAME_FUNC_OFFSET(22650, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
- NAME_FUNC_OFFSET(22672, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
- NAME_FUNC_OFFSET(22698, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
- NAME_FUNC_OFFSET(22724, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
- NAME_FUNC_OFFSET(22750, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
- NAME_FUNC_OFFSET(22776, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
- NAME_FUNC_OFFSET(22805, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
- NAME_FUNC_OFFSET(22834, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
- NAME_FUNC_OFFSET(22863, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
- NAME_FUNC_OFFSET(22892, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
- NAME_FUNC_OFFSET(22919, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
- NAME_FUNC_OFFSET(22945, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
- NAME_FUNC_OFFSET(22971, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
- NAME_FUNC_OFFSET(22997, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
- NAME_FUNC_OFFSET(23023, glSampleCoverage, glSampleCoverage, NULL, 419),
- NAME_FUNC_OFFSET(23043, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23066, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23090, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
- NAME_FUNC_OFFSET(23113, glFogCoordPointer, glFogCoordPointer, NULL, 421),
- NAME_FUNC_OFFSET(23134, glFogCoordd, glFogCoordd, NULL, 422),
- NAME_FUNC_OFFSET(23149, glFogCoorddv, glFogCoorddv, NULL, 423),
- NAME_FUNC_OFFSET(23165, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
- NAME_FUNC_OFFSET(23186, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23207, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23228, glPointParameterf, glPointParameterf, NULL, 425),
- NAME_FUNC_OFFSET(23250, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23272, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23294, glPointParameterfv, glPointParameterfv, NULL, 426),
- NAME_FUNC_OFFSET(23317, glPointParameteri, glPointParameteri, NULL, 427),
- NAME_FUNC_OFFSET(23337, glPointParameteriv, glPointParameteriv, NULL, 428),
- NAME_FUNC_OFFSET(23358, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
- NAME_FUNC_OFFSET(23380, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
- NAME_FUNC_OFFSET(23403, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
- NAME_FUNC_OFFSET(23425, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
- NAME_FUNC_OFFSET(23448, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
- NAME_FUNC_OFFSET(23470, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
- NAME_FUNC_OFFSET(23493, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
- NAME_FUNC_OFFSET(23515, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
- NAME_FUNC_OFFSET(23538, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
- NAME_FUNC_OFFSET(23561, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
- NAME_FUNC_OFFSET(23585, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
- NAME_FUNC_OFFSET(23608, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
- NAME_FUNC_OFFSET(23632, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
- NAME_FUNC_OFFSET(23655, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
- NAME_FUNC_OFFSET(23679, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
- NAME_FUNC_OFFSET(23706, glWindowPos2d, glWindowPos2d, NULL, 444),
- NAME_FUNC_OFFSET(23723, glWindowPos2d, glWindowPos2d, NULL, 444),
- NAME_FUNC_OFFSET(23741, glWindowPos2dv, glWindowPos2dv, NULL, 445),
- NAME_FUNC_OFFSET(23759, glWindowPos2dv, glWindowPos2dv, NULL, 445),
- NAME_FUNC_OFFSET(23778, glWindowPos2f, glWindowPos2f, NULL, 446),
- NAME_FUNC_OFFSET(23795, glWindowPos2f, glWindowPos2f, NULL, 446),
- NAME_FUNC_OFFSET(23813, glWindowPos2fv, glWindowPos2fv, NULL, 447),
- NAME_FUNC_OFFSET(23831, glWindowPos2fv, glWindowPos2fv, NULL, 447),
- NAME_FUNC_OFFSET(23850, glWindowPos2i, glWindowPos2i, NULL, 448),
- NAME_FUNC_OFFSET(23867, glWindowPos2i, glWindowPos2i, NULL, 448),
- NAME_FUNC_OFFSET(23885, glWindowPos2iv, glWindowPos2iv, NULL, 449),
- NAME_FUNC_OFFSET(23903, glWindowPos2iv, glWindowPos2iv, NULL, 449),
- NAME_FUNC_OFFSET(23922, glWindowPos2s, glWindowPos2s, NULL, 450),
- NAME_FUNC_OFFSET(23939, glWindowPos2s, glWindowPos2s, NULL, 450),
- NAME_FUNC_OFFSET(23957, glWindowPos2sv, glWindowPos2sv, NULL, 451),
- NAME_FUNC_OFFSET(23975, glWindowPos2sv, glWindowPos2sv, NULL, 451),
- NAME_FUNC_OFFSET(23994, glWindowPos3d, glWindowPos3d, NULL, 452),
- NAME_FUNC_OFFSET(24011, glWindowPos3d, glWindowPos3d, NULL, 452),
- NAME_FUNC_OFFSET(24029, glWindowPos3dv, glWindowPos3dv, NULL, 453),
- NAME_FUNC_OFFSET(24047, glWindowPos3dv, glWindowPos3dv, NULL, 453),
- NAME_FUNC_OFFSET(24066, glWindowPos3f, glWindowPos3f, NULL, 454),
- NAME_FUNC_OFFSET(24083, glWindowPos3f, glWindowPos3f, NULL, 454),
- NAME_FUNC_OFFSET(24101, glWindowPos3fv, glWindowPos3fv, NULL, 455),
- NAME_FUNC_OFFSET(24119, glWindowPos3fv, glWindowPos3fv, NULL, 455),
- NAME_FUNC_OFFSET(24138, glWindowPos3i, glWindowPos3i, NULL, 456),
- NAME_FUNC_OFFSET(24155, glWindowPos3i, glWindowPos3i, NULL, 456),
- NAME_FUNC_OFFSET(24173, glWindowPos3iv, glWindowPos3iv, NULL, 457),
- NAME_FUNC_OFFSET(24191, glWindowPos3iv, glWindowPos3iv, NULL, 457),
- NAME_FUNC_OFFSET(24210, glWindowPos3s, glWindowPos3s, NULL, 458),
- NAME_FUNC_OFFSET(24227, glWindowPos3s, glWindowPos3s, NULL, 458),
- NAME_FUNC_OFFSET(24245, glWindowPos3sv, glWindowPos3sv, NULL, 459),
- NAME_FUNC_OFFSET(24263, glWindowPos3sv, glWindowPos3sv, NULL, 459),
- NAME_FUNC_OFFSET(24282, glBeginQuery, glBeginQuery, NULL, 460),
- NAME_FUNC_OFFSET(24298, glBindBuffer, glBindBuffer, NULL, 461),
- NAME_FUNC_OFFSET(24314, glBufferData, glBufferData, NULL, 462),
- NAME_FUNC_OFFSET(24330, glBufferSubData, glBufferSubData, NULL, 463),
- NAME_FUNC_OFFSET(24349, glDeleteBuffers, glDeleteBuffers, NULL, 464),
- NAME_FUNC_OFFSET(24368, glDeleteQueries, glDeleteQueries, NULL, 465),
- NAME_FUNC_OFFSET(24387, glEndQuery, glEndQuery, NULL, 466),
- NAME_FUNC_OFFSET(24401, glGenBuffers, glGenBuffers, NULL, 467),
- NAME_FUNC_OFFSET(24417, glGenQueries, glGenQueries, NULL, 468),
- NAME_FUNC_OFFSET(24433, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
- NAME_FUNC_OFFSET(24459, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
- NAME_FUNC_OFFSET(24482, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
- NAME_FUNC_OFFSET(24505, glGetBufferSubData, glGetBufferSubData, NULL, 471),
- NAME_FUNC_OFFSET(24527, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
- NAME_FUNC_OFFSET(24549, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
- NAME_FUNC_OFFSET(24572, glGetQueryiv, glGetQueryiv, NULL, 474),
- NAME_FUNC_OFFSET(24588, glIsBuffer, glIsBuffer, NULL, 475),
- NAME_FUNC_OFFSET(24602, glIsQuery, glIsQuery, NULL, 476),
- NAME_FUNC_OFFSET(24615, glMapBuffer, glMapBuffer, NULL, 477),
- NAME_FUNC_OFFSET(24630, glMapBuffer, glMapBuffer, NULL, 477),
- NAME_FUNC_OFFSET(24645, glUnmapBuffer, glUnmapBuffer, NULL, 478),
- NAME_FUNC_OFFSET(24662, glUnmapBuffer, glUnmapBuffer, NULL, 478),
- NAME_FUNC_OFFSET(24679, glBindAttribLocation, glBindAttribLocation, NULL, 480),
- NAME_FUNC_OFFSET(24703, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24730, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24757, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
- NAME_FUNC_OFFSET(24784, glCompileShader, glCompileShader, NULL, 482),
- NAME_FUNC_OFFSET(24803, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
- NAME_FUNC_OFFSET(24833, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24850, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24867, glDrawBuffers, glDrawBuffers, NULL, 489),
- NAME_FUNC_OFFSET(24883, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
- NAME_FUNC_OFFSET(24912, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
- NAME_FUNC_OFFSET(24933, glGetActiveUniform, glGetActiveUniform, NULL, 492),
- NAME_FUNC_OFFSET(24955, glGetAttribLocation, glGetAttribLocation, NULL, 494),
- NAME_FUNC_OFFSET(24978, glGetShaderSource, glGetShaderSource, NULL, 498),
- NAME_FUNC_OFFSET(24999, glGetUniformLocation, glGetUniformLocation, NULL, 500),
- NAME_FUNC_OFFSET(25023, glGetUniformfv, glGetUniformfv, NULL, 501),
- NAME_FUNC_OFFSET(25041, glGetUniformiv, glGetUniformiv, NULL, 502),
- NAME_FUNC_OFFSET(25059, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
- NAME_FUNC_OFFSET(25088, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
- NAME_FUNC_OFFSET(25116, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
- NAME_FUNC_OFFSET(25139, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
- NAME_FUNC_OFFSET(25162, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
- NAME_FUNC_OFFSET(25185, glLinkProgram, glLinkProgram, NULL, 509),
- NAME_FUNC_OFFSET(25202, glShaderSource, glShaderSource, NULL, 510),
- NAME_FUNC_OFFSET(25220, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
- NAME_FUNC_OFFSET(25243, glUniform1f, glUniform1f, NULL, 514),
- NAME_FUNC_OFFSET(25258, glUniform1fv, glUniform1fv, NULL, 515),
- NAME_FUNC_OFFSET(25274, glUniform1i, glUniform1i, NULL, 516),
- NAME_FUNC_OFFSET(25289, glUniform1iv, glUniform1iv, NULL, 517),
- NAME_FUNC_OFFSET(25305, glUniform2f, glUniform2f, NULL, 518),
- NAME_FUNC_OFFSET(25320, glUniform2fv, glUniform2fv, NULL, 519),
- NAME_FUNC_OFFSET(25336, glUniform2i, glUniform2i, NULL, 520),
- NAME_FUNC_OFFSET(25351, glUniform2iv, glUniform2iv, NULL, 521),
- NAME_FUNC_OFFSET(25367, glUniform3f, glUniform3f, NULL, 522),
- NAME_FUNC_OFFSET(25382, glUniform3fv, glUniform3fv, NULL, 523),
- NAME_FUNC_OFFSET(25398, glUniform3i, glUniform3i, NULL, 524),
- NAME_FUNC_OFFSET(25413, glUniform3iv, glUniform3iv, NULL, 525),
- NAME_FUNC_OFFSET(25429, glUniform4f, glUniform4f, NULL, 526),
- NAME_FUNC_OFFSET(25444, glUniform4fv, glUniform4fv, NULL, 527),
- NAME_FUNC_OFFSET(25460, glUniform4i, glUniform4i, NULL, 528),
- NAME_FUNC_OFFSET(25475, glUniform4iv, glUniform4iv, NULL, 529),
- NAME_FUNC_OFFSET(25491, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
- NAME_FUNC_OFFSET(25513, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
- NAME_FUNC_OFFSET(25535, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
- NAME_FUNC_OFFSET(25557, glUseProgram, glUseProgram, NULL, 533),
- NAME_FUNC_OFFSET(25579, glValidateProgram, glValidateProgram, NULL, 534),
- NAME_FUNC_OFFSET(25600, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
- NAME_FUNC_OFFSET(25620, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
- NAME_FUNC_OFFSET(25641, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
- NAME_FUNC_OFFSET(25661, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
- NAME_FUNC_OFFSET(25682, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
- NAME_FUNC_OFFSET(25702, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
- NAME_FUNC_OFFSET(25723, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
- NAME_FUNC_OFFSET(25743, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
- NAME_FUNC_OFFSET(25764, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
- NAME_FUNC_OFFSET(25784, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
- NAME_FUNC_OFFSET(25805, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
- NAME_FUNC_OFFSET(25825, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
- NAME_FUNC_OFFSET(25846, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
- NAME_FUNC_OFFSET(25868, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
- NAME_FUNC_OFFSET(25890, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
- NAME_FUNC_OFFSET(25912, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
- NAME_FUNC_OFFSET(25934, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
- NAME_FUNC_OFFSET(25957, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
- NAME_FUNC_OFFSET(25980, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
- NAME_FUNC_OFFSET(26003, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
- NAME_FUNC_OFFSET(26024, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
- NAME_FUNC_OFFSET(26044, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
- NAME_FUNC_OFFSET(26065, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
- NAME_FUNC_OFFSET(26086, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
- NAME_FUNC_OFFSET(26106, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
- NAME_FUNC_OFFSET(26127, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
- NAME_FUNC_OFFSET(26149, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
- NAME_FUNC_OFFSET(26171, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
- NAME_FUNC_OFFSET(26193, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
- NAME_FUNC_OFFSET(26218, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
- NAME_FUNC_OFFSET(26245, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
- NAME_FUNC_OFFSET(26273, glBindBufferBase, glBindBufferBase, NULL, 572),
- NAME_FUNC_OFFSET(26293, glBindBufferRange, glBindBufferRange, NULL, 573),
- NAME_FUNC_OFFSET(26314, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
- NAME_FUNC_OFFSET(26340, glClampColor, glClampColor, NULL, 575),
- NAME_FUNC_OFFSET(26356, glColorMaski, glColorMaski, NULL, 580),
- NAME_FUNC_OFFSET(26378, glDisablei, glDisablei, NULL, 581),
- NAME_FUNC_OFFSET(26398, glEnablei, glEnablei, NULL, 582),
- NAME_FUNC_OFFSET(26417, glEndConditionalRender, glEndConditionalRender, NULL, 583),
- NAME_FUNC_OFFSET(26442, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
- NAME_FUNC_OFFSET(26468, glGetBooleani_v, glGetBooleani_v, NULL, 585),
- NAME_FUNC_OFFSET(26492, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
- NAME_FUNC_OFFSET(26517, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
- NAME_FUNC_OFFSET(26541, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
- NAME_FUNC_OFFSET(26565, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
- NAME_FUNC_OFFSET(26590, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
- NAME_FUNC_OFFSET(26623, glGetUniformuiv, glGetUniformuiv, NULL, 592),
- NAME_FUNC_OFFSET(26642, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
- NAME_FUNC_OFFSET(26666, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
- NAME_FUNC_OFFSET(26691, glIsEnabledi, glIsEnabledi, NULL, 595),
- NAME_FUNC_OFFSET(26713, glTexParameterIiv, glTexParameterIiv, NULL, 596),
- NAME_FUNC_OFFSET(26734, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
- NAME_FUNC_OFFSET(26756, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
- NAME_FUNC_OFFSET(26787, glUniform1ui, glUniform1ui, NULL, 599),
- NAME_FUNC_OFFSET(26803, glUniform1uiv, glUniform1uiv, NULL, 600),
- NAME_FUNC_OFFSET(26820, glUniform2ui, glUniform2ui, NULL, 601),
- NAME_FUNC_OFFSET(26836, glUniform2uiv, glUniform2uiv, NULL, 602),
- NAME_FUNC_OFFSET(26853, glUniform3ui, glUniform3ui, NULL, 603),
- NAME_FUNC_OFFSET(26869, glUniform3uiv, glUniform3uiv, NULL, 604),
- NAME_FUNC_OFFSET(26886, glUniform4ui, glUniform4ui, NULL, 605),
- NAME_FUNC_OFFSET(26902, glUniform4uiv, glUniform4uiv, NULL, 606),
- NAME_FUNC_OFFSET(26919, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
- NAME_FUNC_OFFSET(26941, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
- NAME_FUNC_OFFSET(26964, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
- NAME_FUNC_OFFSET(26986, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
- NAME_FUNC_OFFSET(27008, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
- NAME_FUNC_OFFSET(27031, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
- NAME_FUNC_OFFSET(27054, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
- NAME_FUNC_OFFSET(27080, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
- NAME_FUNC_OFFSET(27106, glTexBuffer, glTexBuffer, NULL, 615),
- NAME_FUNC_OFFSET(27121, glFramebufferTexture, glFramebufferTexture, NULL, 616),
- NAME_FUNC_OFFSET(27145, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
- NAME_FUNC_OFFSET(27170, glMinSampleShading, glMinSampleShading, NULL, 620),
- NAME_FUNC_OFFSET(27192, glBindProgramARB, glBindProgramARB, NULL, 621),
- NAME_FUNC_OFFSET(27208, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
- NAME_FUNC_OFFSET(27227, glGenProgramsARB, glGenProgramsARB, NULL, 623),
- NAME_FUNC_OFFSET(27243, glIsProgramARB, glIsProgramARB, NULL, 630),
- NAME_FUNC_OFFSET(27257, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
- NAME_FUNC_OFFSET(27280, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
- NAME_FUNC_OFFSET(27304, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
- NAME_FUNC_OFFSET(27327, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
- NAME_FUNC_OFFSET(27351, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
- NAME_FUNC_OFFSET(27368, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
- NAME_FUNC_OFFSET(27386, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
- NAME_FUNC_OFFSET(27403, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
- NAME_FUNC_OFFSET(27421, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
- NAME_FUNC_OFFSET(27438, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
- NAME_FUNC_OFFSET(27456, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
- NAME_FUNC_OFFSET(27473, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
- NAME_FUNC_OFFSET(27491, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
- NAME_FUNC_OFFSET(27516, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
- NAME_FUNC_OFFSET(27538, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
- NAME_FUNC_OFFSET(27565, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
- NAME_FUNC_OFFSET(27589, glBindFramebuffer, glBindFramebuffer, NULL, 660),
- NAME_FUNC_OFFSET(27610, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
- NAME_FUNC_OFFSET(27632, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
- NAME_FUNC_OFFSET(27653, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
- NAME_FUNC_OFFSET(27681, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
- NAME_FUNC_OFFSET(27709, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
- NAME_FUNC_OFFSET(27733, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
- NAME_FUNC_OFFSET(27757, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
- NAME_FUNC_OFFSET(27782, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
- NAME_FUNC_OFFSET(27807, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
- NAME_FUNC_OFFSET(27836, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
- NAME_FUNC_OFFSET(27865, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
- NAME_FUNC_OFFSET(27891, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
- NAME_FUNC_OFFSET(27917, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
- NAME_FUNC_OFFSET(27943, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
- NAME_FUNC_OFFSET(27969, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
- NAME_FUNC_OFFSET(27995, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
- NAME_FUNC_OFFSET(28024, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
- NAME_FUNC_OFFSET(28053, glGenFramebuffers, glGenFramebuffers, NULL, 671),
- NAME_FUNC_OFFSET(28074, glGenFramebuffers, glGenFramebuffers, NULL, 671),
- NAME_FUNC_OFFSET(28095, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
- NAME_FUNC_OFFSET(28117, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
- NAME_FUNC_OFFSET(28139, glGenerateMipmap, glGenerateMipmap, NULL, 673),
- NAME_FUNC_OFFSET(28159, glGenerateMipmap, glGenerateMipmap, NULL, 673),
- NAME_FUNC_OFFSET(28179, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
- NAME_FUNC_OFFSET(28220, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
- NAME_FUNC_OFFSET(28261, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
- NAME_FUNC_OFFSET(28293, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
- NAME_FUNC_OFFSET(28325, glIsFramebuffer, glIsFramebuffer, NULL, 676),
- NAME_FUNC_OFFSET(28344, glIsFramebuffer, glIsFramebuffer, NULL, 676),
- NAME_FUNC_OFFSET(28363, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
- NAME_FUNC_OFFSET(28383, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
- NAME_FUNC_OFFSET(28403, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
- NAME_FUNC_OFFSET(28428, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
- NAME_FUNC_OFFSET(28453, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
- NAME_FUNC_OFFSET(28489, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
- NAME_FUNC_OFFSET(28517, glMapBufferRange, glMapBufferRange, NULL, 682),
- NAME_FUNC_OFFSET(28537, glBindVertexArray, glBindVertexArray, NULL, 683),
- NAME_FUNC_OFFSET(28558, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
- NAME_FUNC_OFFSET(28584, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
- NAME_FUNC_OFFSET(28608, glGenVertexArrays, glGenVertexArrays, NULL, 685),
- NAME_FUNC_OFFSET(28629, glIsVertexArray, glIsVertexArray, NULL, 686),
- NAME_FUNC_OFFSET(28650, glIsVertexArray, glIsVertexArray, NULL, 686),
- NAME_FUNC_OFFSET(28669, glProvokingVertex, glProvokingVertex, NULL, 706),
- NAME_FUNC_OFFSET(28690, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
- NAME_FUNC_OFFSET(28724, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
- NAME_FUNC_OFFSET(28749, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
- NAME_FUNC_OFFSET(28775, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
- NAME_FUNC_OFFSET(28792, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
- NAME_FUNC_OFFSET(28822, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
- NAME_FUNC_OFFSET(28843, glBlendFunciARB, glBlendFunciARB, NULL, 714),
- NAME_FUNC_OFFSET(28865, glBlendFunciARB, glBlendFunciARB, NULL, 714),
- NAME_FUNC_OFFSET(28878, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
- NAME_FUNC_OFFSET(28902, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
- NAME_FUNC_OFFSET(28927, glClearDepthf, glClearDepthf, NULL, 785),
- NAME_FUNC_OFFSET(28944, glDepthRangef, glDepthRangef, NULL, 786),
- NAME_FUNC_OFFSET(28961, glGetProgramBinary, glGetProgramBinary, NULL, 790),
- NAME_FUNC_OFFSET(28983, glProgramBinary, glProgramBinary, NULL, 791),
- NAME_FUNC_OFFSET(29002, glProgramParameteri, glProgramParameteri, NULL, 792),
- NAME_FUNC_OFFSET(29025, glProgramParameteri, glProgramParameteri, NULL, 792),
- NAME_FUNC_OFFSET(29048, gl_dispatch_stub_881, gl_dispatch_stub_881, NULL, 881),
- NAME_FUNC_OFFSET(29064, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
- NAME_FUNC_OFFSET(29083, gl_dispatch_stub_890, gl_dispatch_stub_890, NULL, 890),
- NAME_FUNC_OFFSET(29108, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
- NAME_FUNC_OFFSET(29133, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
- NAME_FUNC_OFFSET(29159, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
- NAME_FUNC_OFFSET(29187, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
- NAME_FUNC_OFFSET(29212, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
- NAME_FUNC_OFFSET(29243, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
- NAME_FUNC_OFFSET(29269, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
- NAME_FUNC_OFFSET(29292, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL, 899),
- NAME_FUNC_OFFSET(29314, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
- NAME_FUNC_OFFSET(29337, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
- NAME_FUNC_OFFSET(29359, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
- NAME_FUNC_OFFSET(29382, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
- NAME_FUNC_OFFSET(29405, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
- NAME_FUNC_OFFSET(29429, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
- NAME_FUNC_OFFSET(29451, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
- NAME_FUNC_OFFSET(29474, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
- NAME_FUNC_OFFSET(29496, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
- NAME_FUNC_OFFSET(29519, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
- NAME_FUNC_OFFSET(29542, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
- NAME_FUNC_OFFSET(29566, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
- NAME_FUNC_OFFSET(29588, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
- NAME_FUNC_OFFSET(29611, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
- NAME_FUNC_OFFSET(29633, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
- NAME_FUNC_OFFSET(29656, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
- NAME_FUNC_OFFSET(29679, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
- NAME_FUNC_OFFSET(29703, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
- NAME_FUNC_OFFSET(29725, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
- NAME_FUNC_OFFSET(29748, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
- NAME_FUNC_OFFSET(29770, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
- NAME_FUNC_OFFSET(29793, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
- NAME_FUNC_OFFSET(29816, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
- NAME_FUNC_OFFSET(29840, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
- NAME_FUNC_OFFSET(29869, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
- NAME_FUNC_OFFSET(29900, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
- NAME_FUNC_OFFSET(29931, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
- NAME_FUNC_OFFSET(29960, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
- NAME_FUNC_OFFSET(29991, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
- NAME_FUNC_OFFSET(30022, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
- NAME_FUNC_OFFSET(30051, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
- NAME_FUNC_OFFSET(30082, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
- NAME_FUNC_OFFSET(30113, gl_dispatch_stub_933, gl_dispatch_stub_933, NULL, 933),
- NAME_FUNC_OFFSET(30135, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
- NAME_FUNC_OFFSET(30164, glDebugMessageCallback, glDebugMessageCallback, NULL, 935),
- NAME_FUNC_OFFSET(30190, glDebugMessageControl, glDebugMessageControl, NULL, 936),
- NAME_FUNC_OFFSET(30215, glDebugMessageInsert, glDebugMessageInsert, NULL, 937),
- NAME_FUNC_OFFSET(30239, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 938),
- NAME_FUNC_OFFSET(30263, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 945),
- NAME_FUNC_OFFSET(30282, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 946),
- NAME_FUNC_OFFSET(30302, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 947),
- NAME_FUNC_OFFSET(30322, glFogCoordfEXT, glFogCoordfEXT, NULL, 948),
- NAME_FUNC_OFFSET(30334, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 949),
- NAME_FUNC_OFFSET(30347, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1052),
- NAME_FUNC_OFFSET(30365, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1053),
- NAME_FUNC_OFFSET(30384, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1054),
- NAME_FUNC_OFFSET(30402, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1055),
- NAME_FUNC_OFFSET(30421, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1056),
- NAME_FUNC_OFFSET(30440, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1057),
- NAME_FUNC_OFFSET(30460, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1058),
- NAME_FUNC_OFFSET(30478, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1059),
- NAME_FUNC_OFFSET(30497, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1060),
- NAME_FUNC_OFFSET(30516, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1061),
- NAME_FUNC_OFFSET(30536, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1062),
- NAME_FUNC_OFFSET(30554, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1063),
- NAME_FUNC_OFFSET(30573, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1064),
- NAME_FUNC_OFFSET(30592, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1065),
- NAME_FUNC_OFFSET(30612, glTextureBarrierNV, glTextureBarrierNV, NULL, 1086),
- NAME_FUNC_OFFSET(30629, glAlphaFuncx, glAlphaFuncx, NULL, 1112),
- NAME_FUNC_OFFSET(30645, glClearColorx, glClearColorx, NULL, 1113),
- NAME_FUNC_OFFSET(30662, glClearDepthx, glClearDepthx, NULL, 1114),
- NAME_FUNC_OFFSET(30679, glColor4x, glColor4x, NULL, 1115),
- NAME_FUNC_OFFSET(30692, glDepthRangex, glDepthRangex, NULL, 1116),
- NAME_FUNC_OFFSET(30709, glFogx, glFogx, NULL, 1117),
- NAME_FUNC_OFFSET(30719, glFogxv, glFogxv, NULL, 1118),
- NAME_FUNC_OFFSET(30730, glFrustumf, glFrustumf, NULL, 1119),
- NAME_FUNC_OFFSET(30744, glFrustumx, glFrustumx, NULL, 1120),
- NAME_FUNC_OFFSET(30758, glLightModelx, glLightModelx, NULL, 1121),
- NAME_FUNC_OFFSET(30775, glLightModelxv, glLightModelxv, NULL, 1122),
- NAME_FUNC_OFFSET(30793, glLightx, glLightx, NULL, 1123),
- NAME_FUNC_OFFSET(30805, glLightxv, glLightxv, NULL, 1124),
- NAME_FUNC_OFFSET(30818, glLineWidthx, glLineWidthx, NULL, 1125),
- NAME_FUNC_OFFSET(30834, glLoadMatrixx, glLoadMatrixx, NULL, 1126),
- NAME_FUNC_OFFSET(30851, glMaterialx, glMaterialx, NULL, 1127),
- NAME_FUNC_OFFSET(30866, glMaterialxv, glMaterialxv, NULL, 1128),
- NAME_FUNC_OFFSET(30882, glMultMatrixx, glMultMatrixx, NULL, 1129),
- NAME_FUNC_OFFSET(30899, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1130),
- NAME_FUNC_OFFSET(30920, glNormal3x, glNormal3x, NULL, 1131),
- NAME_FUNC_OFFSET(30934, glOrthof, glOrthof, NULL, 1132),
- NAME_FUNC_OFFSET(30946, glOrthox, glOrthox, NULL, 1133),
- NAME_FUNC_OFFSET(30958, glPointSizex, glPointSizex, NULL, 1134),
- NAME_FUNC_OFFSET(30974, glPolygonOffsetx, glPolygonOffsetx, NULL, 1135),
- NAME_FUNC_OFFSET(30994, glRotatex, glRotatex, NULL, 1136),
- NAME_FUNC_OFFSET(31007, glSampleCoveragex, glSampleCoveragex, NULL, 1137),
- NAME_FUNC_OFFSET(31028, glScalex, glScalex, NULL, 1138),
- NAME_FUNC_OFFSET(31040, glTexEnvx, glTexEnvx, NULL, 1139),
- NAME_FUNC_OFFSET(31053, glTexEnvxv, glTexEnvxv, NULL, 1140),
- NAME_FUNC_OFFSET(31067, glTexParameterx, glTexParameterx, NULL, 1141),
- NAME_FUNC_OFFSET(31086, glTranslatex, glTranslatex, NULL, 1142),
- NAME_FUNC_OFFSET(31102, glClipPlanef, glClipPlanef, NULL, 1143),
- NAME_FUNC_OFFSET(31118, glClipPlanex, glClipPlanex, NULL, 1144),
- NAME_FUNC_OFFSET(31134, glGetClipPlanef, glGetClipPlanef, NULL, 1145),
- NAME_FUNC_OFFSET(31153, glGetClipPlanex, glGetClipPlanex, NULL, 1146),
- NAME_FUNC_OFFSET(31172, glGetFixedv, glGetFixedv, NULL, 1147),
- NAME_FUNC_OFFSET(31187, glGetLightxv, glGetLightxv, NULL, 1148),
- NAME_FUNC_OFFSET(31203, glGetMaterialxv, glGetMaterialxv, NULL, 1149),
- NAME_FUNC_OFFSET(31222, glGetTexEnvxv, glGetTexEnvxv, NULL, 1150),
- NAME_FUNC_OFFSET(31239, glGetTexParameterxv, glGetTexParameterxv, NULL, 1151),
- NAME_FUNC_OFFSET(31262, glPointParameterx, glPointParameterx, NULL, 1152),
- NAME_FUNC_OFFSET(31283, glPointParameterxv, glPointParameterxv, NULL, 1153),
- NAME_FUNC_OFFSET(31305, glTexParameterxv, glTexParameterxv, NULL, 1154),
+ NAME_FUNC_OFFSET(18397, gl_dispatch_stub_1048, gl_dispatch_stub_1048, NULL, 1048),
+ NAME_FUNC_OFFSET(18414, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1049),
+ NAME_FUNC_OFFSET(18435, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1050),
+ NAME_FUNC_OFFSET(18457, gl_dispatch_stub_1051, gl_dispatch_stub_1051, NULL, 1051),
+ NAME_FUNC_OFFSET(18481, gl_dispatch_stub_1052, gl_dispatch_stub_1052, NULL, 1052),
+ NAME_FUNC_OFFSET(18511, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1053),
+ NAME_FUNC_OFFSET(18532, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1054),
+ NAME_FUNC_OFFSET(18554, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1055),
+ NAME_FUNC_OFFSET(18575, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1056),
+ NAME_FUNC_OFFSET(18597, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1057),
+ NAME_FUNC_OFFSET(18619, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1058),
+ NAME_FUNC_OFFSET(18642, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1059),
+ NAME_FUNC_OFFSET(18663, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1060),
+ NAME_FUNC_OFFSET(18685, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1061),
+ NAME_FUNC_OFFSET(18707, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1062),
+ NAME_FUNC_OFFSET(18730, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1063),
+ NAME_FUNC_OFFSET(18751, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1064),
+ NAME_FUNC_OFFSET(18773, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1065),
+ NAME_FUNC_OFFSET(18795, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1066),
+ NAME_FUNC_OFFSET(18818, glClearColorIiEXT, glClearColorIiEXT, NULL, 1067),
+ NAME_FUNC_OFFSET(18836, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1068),
+ NAME_FUNC_OFFSET(18855, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1069),
+ NAME_FUNC_OFFSET(18877, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1070),
+ NAME_FUNC_OFFSET(18899, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1071),
+ NAME_FUNC_OFFSET(18923, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1072),
+ NAME_FUNC_OFFSET(18943, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1073),
+ NAME_FUNC_OFFSET(18964, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1074),
+ NAME_FUNC_OFFSET(18995, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1075),
+ NAME_FUNC_OFFSET(19026, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1076),
+ NAME_FUNC_OFFSET(19059, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1077),
+ NAME_FUNC_OFFSET(19087, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1078),
+ NAME_FUNC_OFFSET(19118, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1079),
+ NAME_FUNC_OFFSET(19144, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1080),
+ NAME_FUNC_OFFSET(19175, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1081),
+ NAME_FUNC_OFFSET(19203, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1082),
+ NAME_FUNC_OFFSET(19226, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1083),
+ NAME_FUNC_OFFSET(19251, glActiveProgramEXT, glActiveProgramEXT, NULL, 1084),
+ NAME_FUNC_OFFSET(19270, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1085),
+ NAME_FUNC_OFFSET(19295, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1086),
+ NAME_FUNC_OFFSET(19317, glTextureBarrierNV, glTextureBarrierNV, NULL, 1087),
+ NAME_FUNC_OFFSET(19336, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1088),
+ NAME_FUNC_OFFSET(19350, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1089),
+ NAME_FUNC_OFFSET(19372, glVDPAUInitNV, glVDPAUInitNV, NULL, 1090),
+ NAME_FUNC_OFFSET(19386, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1091),
+ NAME_FUNC_OFFSET(19405, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1092),
+ NAME_FUNC_OFFSET(19426, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1093),
+ NAME_FUNC_OFFSET(19457, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1094),
+ NAME_FUNC_OFFSET(19487, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1095),
+ NAME_FUNC_OFFSET(19510, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1096),
+ NAME_FUNC_OFFSET(19533, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1097),
+ NAME_FUNC_OFFSET(19560, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
+ NAME_FUNC_OFFSET(19582, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
+ NAME_FUNC_OFFSET(19605, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
+ NAME_FUNC_OFFSET(19628, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
+ NAME_FUNC_OFFSET(19648, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
+ NAME_FUNC_OFFSET(19675, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
+ NAME_FUNC_OFFSET(19701, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
+ NAME_FUNC_OFFSET(19727, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
+ NAME_FUNC_OFFSET(19751, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
+ NAME_FUNC_OFFSET(19779, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
+ NAME_FUNC_OFFSET(19803, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
+ NAME_FUNC_OFFSET(19828, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
+ NAME_FUNC_OFFSET(19857, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
+ NAME_FUNC_OFFSET(19888, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1111),
+ NAME_FUNC_OFFSET(19927, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1112),
+ NAME_FUNC_OFFSET(19956, glAlphaFuncx, glAlphaFuncx, NULL, 1113),
+ NAME_FUNC_OFFSET(19969, glClearColorx, glClearColorx, NULL, 1114),
+ NAME_FUNC_OFFSET(19983, glClearDepthx, glClearDepthx, NULL, 1115),
+ NAME_FUNC_OFFSET(19997, glColor4x, glColor4x, NULL, 1116),
+ NAME_FUNC_OFFSET(20007, glDepthRangex, glDepthRangex, NULL, 1117),
+ NAME_FUNC_OFFSET(20021, glFogx, glFogx, NULL, 1118),
+ NAME_FUNC_OFFSET(20028, glFogxv, glFogxv, NULL, 1119),
+ NAME_FUNC_OFFSET(20036, glFrustumf, glFrustumf, NULL, 1120),
+ NAME_FUNC_OFFSET(20047, glFrustumx, glFrustumx, NULL, 1121),
+ NAME_FUNC_OFFSET(20058, glLightModelx, glLightModelx, NULL, 1122),
+ NAME_FUNC_OFFSET(20072, glLightModelxv, glLightModelxv, NULL, 1123),
+ NAME_FUNC_OFFSET(20087, glLightx, glLightx, NULL, 1124),
+ NAME_FUNC_OFFSET(20096, glLightxv, glLightxv, NULL, 1125),
+ NAME_FUNC_OFFSET(20106, glLineWidthx, glLineWidthx, NULL, 1126),
+ NAME_FUNC_OFFSET(20119, glLoadMatrixx, glLoadMatrixx, NULL, 1127),
+ NAME_FUNC_OFFSET(20133, glMaterialx, glMaterialx, NULL, 1128),
+ NAME_FUNC_OFFSET(20145, glMaterialxv, glMaterialxv, NULL, 1129),
+ NAME_FUNC_OFFSET(20158, glMultMatrixx, glMultMatrixx, NULL, 1130),
+ NAME_FUNC_OFFSET(20172, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1131),
+ NAME_FUNC_OFFSET(20190, glNormal3x, glNormal3x, NULL, 1132),
+ NAME_FUNC_OFFSET(20201, glOrthof, glOrthof, NULL, 1133),
+ NAME_FUNC_OFFSET(20210, glOrthox, glOrthox, NULL, 1134),
+ NAME_FUNC_OFFSET(20219, glPointSizex, glPointSizex, NULL, 1135),
+ NAME_FUNC_OFFSET(20232, glPolygonOffsetx, glPolygonOffsetx, NULL, 1136),
+ NAME_FUNC_OFFSET(20249, glRotatex, glRotatex, NULL, 1137),
+ NAME_FUNC_OFFSET(20259, glSampleCoveragex, glSampleCoveragex, NULL, 1138),
+ NAME_FUNC_OFFSET(20277, glScalex, glScalex, NULL, 1139),
+ NAME_FUNC_OFFSET(20286, glTexEnvx, glTexEnvx, NULL, 1140),
+ NAME_FUNC_OFFSET(20296, glTexEnvxv, glTexEnvxv, NULL, 1141),
+ NAME_FUNC_OFFSET(20307, glTexParameterx, glTexParameterx, NULL, 1142),
+ NAME_FUNC_OFFSET(20323, glTranslatex, glTranslatex, NULL, 1143),
+ NAME_FUNC_OFFSET(20336, glClipPlanef, glClipPlanef, NULL, 1144),
+ NAME_FUNC_OFFSET(20349, glClipPlanex, glClipPlanex, NULL, 1145),
+ NAME_FUNC_OFFSET(20362, glGetClipPlanef, glGetClipPlanef, NULL, 1146),
+ NAME_FUNC_OFFSET(20378, glGetClipPlanex, glGetClipPlanex, NULL, 1147),
+ NAME_FUNC_OFFSET(20394, glGetFixedv, glGetFixedv, NULL, 1148),
+ NAME_FUNC_OFFSET(20406, glGetLightxv, glGetLightxv, NULL, 1149),
+ NAME_FUNC_OFFSET(20419, glGetMaterialxv, glGetMaterialxv, NULL, 1150),
+ NAME_FUNC_OFFSET(20435, glGetTexEnvxv, glGetTexEnvxv, NULL, 1151),
+ NAME_FUNC_OFFSET(20449, glGetTexParameterxv, glGetTexParameterxv, NULL, 1152),
+ NAME_FUNC_OFFSET(20469, glPointParameterx, glPointParameterx, NULL, 1153),
+ NAME_FUNC_OFFSET(20487, glPointParameterxv, glPointParameterxv, NULL, 1154),
+ NAME_FUNC_OFFSET(20506, glTexParameterxv, glTexParameterxv, NULL, 1155),
+ NAME_FUNC_OFFSET(20523, glTexGenf, glTexGenf, NULL, 190),
+ NAME_FUNC_OFFSET(20536, glTexGenfv, glTexGenfv, NULL, 191),
+ NAME_FUNC_OFFSET(20550, glTexGeni, glTexGeni, NULL, 192),
+ NAME_FUNC_OFFSET(20563, glTexGeniv, glTexGeniv, NULL, 193),
+ NAME_FUNC_OFFSET(20577, glReadBuffer, glReadBuffer, NULL, 254),
+ NAME_FUNC_OFFSET(20592, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+ NAME_FUNC_OFFSET(20609, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+ NAME_FUNC_OFFSET(20626, glArrayElement, glArrayElement, NULL, 306),
+ NAME_FUNC_OFFSET(20644, glBindTexture, glBindTexture, NULL, 307),
+ NAME_FUNC_OFFSET(20661, glDrawArrays, glDrawArrays, NULL, 310),
+ NAME_FUNC_OFFSET(20677, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+ NAME_FUNC_OFFSET(20702, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+ NAME_FUNC_OFFSET(20722, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+ NAME_FUNC_OFFSET(20742, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+ NAME_FUNC_OFFSET(20765, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+ NAME_FUNC_OFFSET(20788, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+ NAME_FUNC_OFFSET(20808, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+ NAME_FUNC_OFFSET(20825, glGetPointerv, glGetPointerv, NULL, 329),
+ NAME_FUNC_OFFSET(20842, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+ NAME_FUNC_OFFSET(20857, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+ NAME_FUNC_OFFSET(20881, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+ NAME_FUNC_OFFSET(20900, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+ NAME_FUNC_OFFSET(20919, glBlendColor, glBlendColor, NULL, 336),
+ NAME_FUNC_OFFSET(20935, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(20954, glBlendEquation, glBlendEquation, NULL, 337),
+ NAME_FUNC_OFFSET(20973, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+ NAME_FUNC_OFFSET(20996, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(21012, glColorTable, glColorTable, NULL, 339),
+ NAME_FUNC_OFFSET(21028, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+ NAME_FUNC_OFFSET(21055, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+ NAME_FUNC_OFFSET(21082, glCopyColorTable, glCopyColorTable, NULL, 342),
+ NAME_FUNC_OFFSET(21102, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(21121, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+ NAME_FUNC_OFFSET(21140, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(21170, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+ NAME_FUNC_OFFSET(21200, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(21230, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+ NAME_FUNC_OFFSET(21260, glColorSubTable, glColorSubTable, NULL, 346),
+ NAME_FUNC_OFFSET(21279, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+ NAME_FUNC_OFFSET(21302, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+ NAME_FUNC_OFFSET(21327, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+ NAME_FUNC_OFFSET(21352, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+ NAME_FUNC_OFFSET(21379, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+ NAME_FUNC_OFFSET(21407, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+ NAME_FUNC_OFFSET(21434, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+ NAME_FUNC_OFFSET(21462, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+ NAME_FUNC_OFFSET(21491, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+ NAME_FUNC_OFFSET(21520, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+ NAME_FUNC_OFFSET(21546, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+ NAME_FUNC_OFFSET(21577, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+ NAME_FUNC_OFFSET(21608, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+ NAME_FUNC_OFFSET(21632, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+ NAME_FUNC_OFFSET(21655, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+ NAME_FUNC_OFFSET(21673, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+ NAME_FUNC_OFFSET(21702, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+ NAME_FUNC_OFFSET(21731, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+ NAME_FUNC_OFFSET(21746, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+ NAME_FUNC_OFFSET(21772, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+ NAME_FUNC_OFFSET(21798, glHistogram, glHistogram, NULL, 367),
+ NAME_FUNC_OFFSET(21813, glMinmax, glMinmax, NULL, 368),
+ NAME_FUNC_OFFSET(21825, glResetHistogram, glResetHistogram, NULL, 369),
+ NAME_FUNC_OFFSET(21845, glResetMinmax, glResetMinmax, NULL, 370),
+ NAME_FUNC_OFFSET(21862, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(21878, glTexImage3D, glTexImage3D, NULL, 371),
+ NAME_FUNC_OFFSET(21894, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(21913, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+ NAME_FUNC_OFFSET(21932, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(21955, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+ NAME_FUNC_OFFSET(21978, glActiveTexture, glActiveTexture, NULL, 374),
+ NAME_FUNC_OFFSET(21997, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+ NAME_FUNC_OFFSET(22022, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+ NAME_FUNC_OFFSET(22043, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+ NAME_FUNC_OFFSET(22065, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+ NAME_FUNC_OFFSET(22083, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+ NAME_FUNC_OFFSET(22102, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+ NAME_FUNC_OFFSET(22123, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+ NAME_FUNC_OFFSET(22145, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+ NAME_FUNC_OFFSET(22166, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+ NAME_FUNC_OFFSET(22188, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+ NAME_FUNC_OFFSET(22209, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+ NAME_FUNC_OFFSET(22231, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+ NAME_FUNC_OFFSET(22249, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+ NAME_FUNC_OFFSET(22268, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+ NAME_FUNC_OFFSET(22289, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+ NAME_FUNC_OFFSET(22311, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+ NAME_FUNC_OFFSET(22332, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+ NAME_FUNC_OFFSET(22354, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+ NAME_FUNC_OFFSET(22375, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+ NAME_FUNC_OFFSET(22397, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+ NAME_FUNC_OFFSET(22415, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+ NAME_FUNC_OFFSET(22434, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+ NAME_FUNC_OFFSET(22455, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+ NAME_FUNC_OFFSET(22477, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+ NAME_FUNC_OFFSET(22498, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+ NAME_FUNC_OFFSET(22520, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+ NAME_FUNC_OFFSET(22541, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+ NAME_FUNC_OFFSET(22563, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+ NAME_FUNC_OFFSET(22581, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+ NAME_FUNC_OFFSET(22600, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+ NAME_FUNC_OFFSET(22621, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+ NAME_FUNC_OFFSET(22643, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+ NAME_FUNC_OFFSET(22664, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+ NAME_FUNC_OFFSET(22686, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+ NAME_FUNC_OFFSET(22712, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+ NAME_FUNC_OFFSET(22738, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+ NAME_FUNC_OFFSET(22764, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+ NAME_FUNC_OFFSET(22790, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+ NAME_FUNC_OFFSET(22819, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+ NAME_FUNC_OFFSET(22848, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+ NAME_FUNC_OFFSET(22877, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+ NAME_FUNC_OFFSET(22906, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+ NAME_FUNC_OFFSET(22933, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+ NAME_FUNC_OFFSET(22959, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+ NAME_FUNC_OFFSET(22985, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+ NAME_FUNC_OFFSET(23011, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+ NAME_FUNC_OFFSET(23037, glSampleCoverage, glSampleCoverage, NULL, 419),
+ NAME_FUNC_OFFSET(23057, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(23080, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(23104, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+ NAME_FUNC_OFFSET(23127, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+ NAME_FUNC_OFFSET(23148, glFogCoordd, glFogCoordd, NULL, 422),
+ NAME_FUNC_OFFSET(23163, glFogCoorddv, glFogCoorddv, NULL, 423),
+ NAME_FUNC_OFFSET(23179, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+ NAME_FUNC_OFFSET(23200, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(23221, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(23242, glPointParameterf, glPointParameterf, NULL, 425),
+ NAME_FUNC_OFFSET(23264, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(23286, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(23308, glPointParameterfv, glPointParameterfv, NULL, 426),
+ NAME_FUNC_OFFSET(23331, glPointParameteri, glPointParameteri, NULL, 427),
+ NAME_FUNC_OFFSET(23351, glPointParameteriv, glPointParameteriv, NULL, 428),
+ NAME_FUNC_OFFSET(23372, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+ NAME_FUNC_OFFSET(23394, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+ NAME_FUNC_OFFSET(23417, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+ NAME_FUNC_OFFSET(23439, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+ NAME_FUNC_OFFSET(23462, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+ NAME_FUNC_OFFSET(23484, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+ NAME_FUNC_OFFSET(23507, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+ NAME_FUNC_OFFSET(23529, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+ NAME_FUNC_OFFSET(23552, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+ NAME_FUNC_OFFSET(23575, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+ NAME_FUNC_OFFSET(23599, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+ NAME_FUNC_OFFSET(23622, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+ NAME_FUNC_OFFSET(23646, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+ NAME_FUNC_OFFSET(23669, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+ NAME_FUNC_OFFSET(23693, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+ NAME_FUNC_OFFSET(23720, glWindowPos2d, glWindowPos2d, NULL, 444),
+ NAME_FUNC_OFFSET(23737, glWindowPos2d, glWindowPos2d, NULL, 444),
+ NAME_FUNC_OFFSET(23755, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+ NAME_FUNC_OFFSET(23773, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+ NAME_FUNC_OFFSET(23792, glWindowPos2f, glWindowPos2f, NULL, 446),
+ NAME_FUNC_OFFSET(23809, glWindowPos2f, glWindowPos2f, NULL, 446),
+ NAME_FUNC_OFFSET(23827, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+ NAME_FUNC_OFFSET(23845, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+ NAME_FUNC_OFFSET(23864, glWindowPos2i, glWindowPos2i, NULL, 448),
+ NAME_FUNC_OFFSET(23881, glWindowPos2i, glWindowPos2i, NULL, 448),
+ NAME_FUNC_OFFSET(23899, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+ NAME_FUNC_OFFSET(23917, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+ NAME_FUNC_OFFSET(23936, glWindowPos2s, glWindowPos2s, NULL, 450),
+ NAME_FUNC_OFFSET(23953, glWindowPos2s, glWindowPos2s, NULL, 450),
+ NAME_FUNC_OFFSET(23971, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+ NAME_FUNC_OFFSET(23989, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+ NAME_FUNC_OFFSET(24008, glWindowPos3d, glWindowPos3d, NULL, 452),
+ NAME_FUNC_OFFSET(24025, glWindowPos3d, glWindowPos3d, NULL, 452),
+ NAME_FUNC_OFFSET(24043, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+ NAME_FUNC_OFFSET(24061, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+ NAME_FUNC_OFFSET(24080, glWindowPos3f, glWindowPos3f, NULL, 454),
+ NAME_FUNC_OFFSET(24097, glWindowPos3f, glWindowPos3f, NULL, 454),
+ NAME_FUNC_OFFSET(24115, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+ NAME_FUNC_OFFSET(24133, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+ NAME_FUNC_OFFSET(24152, glWindowPos3i, glWindowPos3i, NULL, 456),
+ NAME_FUNC_OFFSET(24169, glWindowPos3i, glWindowPos3i, NULL, 456),
+ NAME_FUNC_OFFSET(24187, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+ NAME_FUNC_OFFSET(24205, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+ NAME_FUNC_OFFSET(24224, glWindowPos3s, glWindowPos3s, NULL, 458),
+ NAME_FUNC_OFFSET(24241, glWindowPos3s, glWindowPos3s, NULL, 458),
+ NAME_FUNC_OFFSET(24259, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+ NAME_FUNC_OFFSET(24277, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+ NAME_FUNC_OFFSET(24296, glBeginQuery, glBeginQuery, NULL, 460),
+ NAME_FUNC_OFFSET(24312, glBindBuffer, glBindBuffer, NULL, 461),
+ NAME_FUNC_OFFSET(24328, glBufferData, glBufferData, NULL, 462),
+ NAME_FUNC_OFFSET(24344, glBufferSubData, glBufferSubData, NULL, 463),
+ NAME_FUNC_OFFSET(24363, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+ NAME_FUNC_OFFSET(24382, glDeleteQueries, glDeleteQueries, NULL, 465),
+ NAME_FUNC_OFFSET(24401, glEndQuery, glEndQuery, NULL, 466),
+ NAME_FUNC_OFFSET(24415, glGenBuffers, glGenBuffers, NULL, 467),
+ NAME_FUNC_OFFSET(24431, glGenQueries, glGenQueries, NULL, 468),
+ NAME_FUNC_OFFSET(24447, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+ NAME_FUNC_OFFSET(24473, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+ NAME_FUNC_OFFSET(24496, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+ NAME_FUNC_OFFSET(24519, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+ NAME_FUNC_OFFSET(24541, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+ NAME_FUNC_OFFSET(24563, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+ NAME_FUNC_OFFSET(24586, glGetQueryiv, glGetQueryiv, NULL, 474),
+ NAME_FUNC_OFFSET(24602, glIsBuffer, glIsBuffer, NULL, 475),
+ NAME_FUNC_OFFSET(24616, glIsQuery, glIsQuery, NULL, 476),
+ NAME_FUNC_OFFSET(24629, glMapBuffer, glMapBuffer, NULL, 477),
+ NAME_FUNC_OFFSET(24644, glMapBuffer, glMapBuffer, NULL, 477),
+ NAME_FUNC_OFFSET(24659, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+ NAME_FUNC_OFFSET(24676, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+ NAME_FUNC_OFFSET(24693, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+ NAME_FUNC_OFFSET(24717, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(24744, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(24771, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+ NAME_FUNC_OFFSET(24798, glCompileShader, glCompileShader, NULL, 482),
+ NAME_FUNC_OFFSET(24817, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+ NAME_FUNC_OFFSET(24847, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(24864, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(24881, glDrawBuffers, glDrawBuffers, NULL, 489),
+ NAME_FUNC_OFFSET(24897, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+ NAME_FUNC_OFFSET(24926, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+ NAME_FUNC_OFFSET(24947, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+ NAME_FUNC_OFFSET(24969, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+ NAME_FUNC_OFFSET(24992, glGetShaderSource, glGetShaderSource, NULL, 498),
+ NAME_FUNC_OFFSET(25013, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+ NAME_FUNC_OFFSET(25037, glGetUniformfv, glGetUniformfv, NULL, 501),
+ NAME_FUNC_OFFSET(25055, glGetUniformiv, glGetUniformiv, NULL, 502),
+ NAME_FUNC_OFFSET(25073, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+ NAME_FUNC_OFFSET(25102, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+ NAME_FUNC_OFFSET(25130, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+ NAME_FUNC_OFFSET(25153, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+ NAME_FUNC_OFFSET(25176, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+ NAME_FUNC_OFFSET(25199, glLinkProgram, glLinkProgram, NULL, 509),
+ NAME_FUNC_OFFSET(25216, glShaderSource, glShaderSource, NULL, 510),
+ NAME_FUNC_OFFSET(25234, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+ NAME_FUNC_OFFSET(25257, glUniform1f, glUniform1f, NULL, 514),
+ NAME_FUNC_OFFSET(25272, glUniform1fv, glUniform1fv, NULL, 515),
+ NAME_FUNC_OFFSET(25288, glUniform1i, glUniform1i, NULL, 516),
+ NAME_FUNC_OFFSET(25303, glUniform1iv, glUniform1iv, NULL, 517),
+ NAME_FUNC_OFFSET(25319, glUniform2f, glUniform2f, NULL, 518),
+ NAME_FUNC_OFFSET(25334, glUniform2fv, glUniform2fv, NULL, 519),
+ NAME_FUNC_OFFSET(25350, glUniform2i, glUniform2i, NULL, 520),
+ NAME_FUNC_OFFSET(25365, glUniform2iv, glUniform2iv, NULL, 521),
+ NAME_FUNC_OFFSET(25381, glUniform3f, glUniform3f, NULL, 522),
+ NAME_FUNC_OFFSET(25396, glUniform3fv, glUniform3fv, NULL, 523),
+ NAME_FUNC_OFFSET(25412, glUniform3i, glUniform3i, NULL, 524),
+ NAME_FUNC_OFFSET(25427, glUniform3iv, glUniform3iv, NULL, 525),
+ NAME_FUNC_OFFSET(25443, glUniform4f, glUniform4f, NULL, 526),
+ NAME_FUNC_OFFSET(25458, glUniform4fv, glUniform4fv, NULL, 527),
+ NAME_FUNC_OFFSET(25474, glUniform4i, glUniform4i, NULL, 528),
+ NAME_FUNC_OFFSET(25489, glUniform4iv, glUniform4iv, NULL, 529),
+ NAME_FUNC_OFFSET(25505, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+ NAME_FUNC_OFFSET(25527, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+ NAME_FUNC_OFFSET(25549, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+ NAME_FUNC_OFFSET(25571, glUseProgram, glUseProgram, NULL, 533),
+ NAME_FUNC_OFFSET(25593, glValidateProgram, glValidateProgram, NULL, 534),
+ NAME_FUNC_OFFSET(25614, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+ NAME_FUNC_OFFSET(25634, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+ NAME_FUNC_OFFSET(25655, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+ NAME_FUNC_OFFSET(25675, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+ NAME_FUNC_OFFSET(25696, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+ NAME_FUNC_OFFSET(25716, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+ NAME_FUNC_OFFSET(25737, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+ NAME_FUNC_OFFSET(25757, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+ NAME_FUNC_OFFSET(25778, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+ NAME_FUNC_OFFSET(25798, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+ NAME_FUNC_OFFSET(25819, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+ NAME_FUNC_OFFSET(25839, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+ NAME_FUNC_OFFSET(25860, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+ NAME_FUNC_OFFSET(25882, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+ NAME_FUNC_OFFSET(25904, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+ NAME_FUNC_OFFSET(25926, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+ NAME_FUNC_OFFSET(25948, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+ NAME_FUNC_OFFSET(25971, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+ NAME_FUNC_OFFSET(25994, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+ NAME_FUNC_OFFSET(26017, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+ NAME_FUNC_OFFSET(26038, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+ NAME_FUNC_OFFSET(26058, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+ NAME_FUNC_OFFSET(26079, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+ NAME_FUNC_OFFSET(26100, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+ NAME_FUNC_OFFSET(26120, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+ NAME_FUNC_OFFSET(26141, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+ NAME_FUNC_OFFSET(26163, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+ NAME_FUNC_OFFSET(26185, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+ NAME_FUNC_OFFSET(26207, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+ NAME_FUNC_OFFSET(26232, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+ NAME_FUNC_OFFSET(26259, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+ NAME_FUNC_OFFSET(26287, glBindBufferBase, glBindBufferBase, NULL, 572),
+ NAME_FUNC_OFFSET(26307, glBindBufferRange, glBindBufferRange, NULL, 573),
+ NAME_FUNC_OFFSET(26328, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+ NAME_FUNC_OFFSET(26354, glClampColor, glClampColor, NULL, 575),
+ NAME_FUNC_OFFSET(26370, glColorMaski, glColorMaski, NULL, 580),
+ NAME_FUNC_OFFSET(26392, glDisablei, glDisablei, NULL, 581),
+ NAME_FUNC_OFFSET(26412, glEnablei, glEnablei, NULL, 582),
+ NAME_FUNC_OFFSET(26431, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+ NAME_FUNC_OFFSET(26456, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+ NAME_FUNC_OFFSET(26482, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+ NAME_FUNC_OFFSET(26506, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+ NAME_FUNC_OFFSET(26531, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+ NAME_FUNC_OFFSET(26555, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+ NAME_FUNC_OFFSET(26579, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+ NAME_FUNC_OFFSET(26604, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+ NAME_FUNC_OFFSET(26637, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+ NAME_FUNC_OFFSET(26656, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+ NAME_FUNC_OFFSET(26680, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+ NAME_FUNC_OFFSET(26705, glIsEnabledi, glIsEnabledi, NULL, 595),
+ NAME_FUNC_OFFSET(26727, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+ NAME_FUNC_OFFSET(26748, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+ NAME_FUNC_OFFSET(26770, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+ NAME_FUNC_OFFSET(26801, glUniform1ui, glUniform1ui, NULL, 599),
+ NAME_FUNC_OFFSET(26817, glUniform1uiv, glUniform1uiv, NULL, 600),
+ NAME_FUNC_OFFSET(26834, glUniform2ui, glUniform2ui, NULL, 601),
+ NAME_FUNC_OFFSET(26850, glUniform2uiv, glUniform2uiv, NULL, 602),
+ NAME_FUNC_OFFSET(26867, glUniform3ui, glUniform3ui, NULL, 603),
+ NAME_FUNC_OFFSET(26883, glUniform3uiv, glUniform3uiv, NULL, 604),
+ NAME_FUNC_OFFSET(26900, glUniform4ui, glUniform4ui, NULL, 605),
+ NAME_FUNC_OFFSET(26916, glUniform4uiv, glUniform4uiv, NULL, 606),
+ NAME_FUNC_OFFSET(26933, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+ NAME_FUNC_OFFSET(26955, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+ NAME_FUNC_OFFSET(26978, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+ NAME_FUNC_OFFSET(27000, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+ NAME_FUNC_OFFSET(27022, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+ NAME_FUNC_OFFSET(27045, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+ NAME_FUNC_OFFSET(27068, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+ NAME_FUNC_OFFSET(27094, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+ NAME_FUNC_OFFSET(27120, glTexBuffer, glTexBuffer, NULL, 615),
+ NAME_FUNC_OFFSET(27135, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+ NAME_FUNC_OFFSET(27159, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+ NAME_FUNC_OFFSET(27184, glMinSampleShading, glMinSampleShading, NULL, 620),
+ NAME_FUNC_OFFSET(27206, glBindProgramARB, glBindProgramARB, NULL, 621),
+ NAME_FUNC_OFFSET(27222, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
+ NAME_FUNC_OFFSET(27241, glGenProgramsARB, glGenProgramsARB, NULL, 623),
+ NAME_FUNC_OFFSET(27257, glIsProgramARB, glIsProgramARB, NULL, 630),
+ NAME_FUNC_OFFSET(27271, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
+ NAME_FUNC_OFFSET(27294, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
+ NAME_FUNC_OFFSET(27318, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
+ NAME_FUNC_OFFSET(27341, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
+ NAME_FUNC_OFFSET(27365, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
+ NAME_FUNC_OFFSET(27382, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
+ NAME_FUNC_OFFSET(27400, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
+ NAME_FUNC_OFFSET(27417, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
+ NAME_FUNC_OFFSET(27435, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
+ NAME_FUNC_OFFSET(27452, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
+ NAME_FUNC_OFFSET(27470, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
+ NAME_FUNC_OFFSET(27487, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
+ NAME_FUNC_OFFSET(27505, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+ NAME_FUNC_OFFSET(27530, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+ NAME_FUNC_OFFSET(27552, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+ NAME_FUNC_OFFSET(27579, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+ NAME_FUNC_OFFSET(27603, glBindFramebuffer, glBindFramebuffer, NULL, 660),
+ NAME_FUNC_OFFSET(27624, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
+ NAME_FUNC_OFFSET(27646, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
+ NAME_FUNC_OFFSET(27667, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+ NAME_FUNC_OFFSET(27695, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+ NAME_FUNC_OFFSET(27723, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+ NAME_FUNC_OFFSET(27747, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+ NAME_FUNC_OFFSET(27771, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+ NAME_FUNC_OFFSET(27796, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+ NAME_FUNC_OFFSET(27821, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+ NAME_FUNC_OFFSET(27850, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+ NAME_FUNC_OFFSET(27879, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
+ NAME_FUNC_OFFSET(27905, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+ NAME_FUNC_OFFSET(27931, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+ NAME_FUNC_OFFSET(27957, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+ NAME_FUNC_OFFSET(27983, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+ NAME_FUNC_OFFSET(28009, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+ NAME_FUNC_OFFSET(28038, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+ NAME_FUNC_OFFSET(28067, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+ NAME_FUNC_OFFSET(28088, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+ NAME_FUNC_OFFSET(28109, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+ NAME_FUNC_OFFSET(28131, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+ NAME_FUNC_OFFSET(28153, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+ NAME_FUNC_OFFSET(28173, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+ NAME_FUNC_OFFSET(28193, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+ NAME_FUNC_OFFSET(28234, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+ NAME_FUNC_OFFSET(28275, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+ NAME_FUNC_OFFSET(28307, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+ NAME_FUNC_OFFSET(28339, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+ NAME_FUNC_OFFSET(28358, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+ NAME_FUNC_OFFSET(28377, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+ NAME_FUNC_OFFSET(28397, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+ NAME_FUNC_OFFSET(28417, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+ NAME_FUNC_OFFSET(28442, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+ NAME_FUNC_OFFSET(28467, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
+ NAME_FUNC_OFFSET(28503, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
+ NAME_FUNC_OFFSET(28531, glMapBufferRange, glMapBufferRange, NULL, 682),
+ NAME_FUNC_OFFSET(28551, glBindVertexArray, glBindVertexArray, NULL, 683),
+ NAME_FUNC_OFFSET(28572, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+ NAME_FUNC_OFFSET(28598, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+ NAME_FUNC_OFFSET(28622, glGenVertexArrays, glGenVertexArrays, NULL, 685),
+ NAME_FUNC_OFFSET(28643, glIsVertexArray, glIsVertexArray, NULL, 686),
+ NAME_FUNC_OFFSET(28664, glIsVertexArray, glIsVertexArray, NULL, 686),
+ NAME_FUNC_OFFSET(28683, glProvokingVertex, glProvokingVertex, NULL, 706),
+ NAME_FUNC_OFFSET(28704, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+ NAME_FUNC_OFFSET(28738, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+ NAME_FUNC_OFFSET(28763, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+ NAME_FUNC_OFFSET(28789, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+ NAME_FUNC_OFFSET(28806, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+ NAME_FUNC_OFFSET(28836, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+ NAME_FUNC_OFFSET(28857, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+ NAME_FUNC_OFFSET(28879, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+ NAME_FUNC_OFFSET(28892, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
+ NAME_FUNC_OFFSET(28916, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
+ NAME_FUNC_OFFSET(28941, glClearDepthf, glClearDepthf, NULL, 785),
+ NAME_FUNC_OFFSET(28958, glDepthRangef, glDepthRangef, NULL, 786),
+ NAME_FUNC_OFFSET(28975, glGetProgramBinary, glGetProgramBinary, NULL, 790),
+ NAME_FUNC_OFFSET(28997, glProgramBinary, glProgramBinary, NULL, 791),
+ NAME_FUNC_OFFSET(29016, glProgramParameteri, glProgramParameteri, NULL, 792),
+ NAME_FUNC_OFFSET(29039, glProgramParameteri, glProgramParameteri, NULL, 792),
+ NAME_FUNC_OFFSET(29062, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
+ NAME_FUNC_OFFSET(29078, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+ NAME_FUNC_OFFSET(29097, gl_dispatch_stub_891, gl_dispatch_stub_891, NULL, 891),
+ NAME_FUNC_OFFSET(29122, gl_dispatch_stub_892, gl_dispatch_stub_892, NULL, 892),
+ NAME_FUNC_OFFSET(29147, gl_dispatch_stub_893, gl_dispatch_stub_893, NULL, 893),
+ NAME_FUNC_OFFSET(29173, gl_dispatch_stub_894, gl_dispatch_stub_894, NULL, 894),
+ NAME_FUNC_OFFSET(29201, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+ NAME_FUNC_OFFSET(29226, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
+ NAME_FUNC_OFFSET(29257, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
+ NAME_FUNC_OFFSET(29283, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
+ NAME_FUNC_OFFSET(29306, gl_dispatch_stub_900, gl_dispatch_stub_900, NULL, 900),
+ NAME_FUNC_OFFSET(29328, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+ NAME_FUNC_OFFSET(29351, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+ NAME_FUNC_OFFSET(29373, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+ NAME_FUNC_OFFSET(29396, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+ NAME_FUNC_OFFSET(29419, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
+ NAME_FUNC_OFFSET(29443, gl_dispatch_stub_906, gl_dispatch_stub_906, NULL, 906),
+ NAME_FUNC_OFFSET(29465, gl_dispatch_stub_907, gl_dispatch_stub_907, NULL, 907),
+ NAME_FUNC_OFFSET(29488, gl_dispatch_stub_908, gl_dispatch_stub_908, NULL, 908),
+ NAME_FUNC_OFFSET(29510, gl_dispatch_stub_909, gl_dispatch_stub_909, NULL, 909),
+ NAME_FUNC_OFFSET(29533, gl_dispatch_stub_910, gl_dispatch_stub_910, NULL, 910),
+ NAME_FUNC_OFFSET(29556, gl_dispatch_stub_911, gl_dispatch_stub_911, NULL, 911),
+ NAME_FUNC_OFFSET(29580, gl_dispatch_stub_912, gl_dispatch_stub_912, NULL, 912),
+ NAME_FUNC_OFFSET(29602, gl_dispatch_stub_913, gl_dispatch_stub_913, NULL, 913),
+ NAME_FUNC_OFFSET(29625, gl_dispatch_stub_914, gl_dispatch_stub_914, NULL, 914),
+ NAME_FUNC_OFFSET(29647, gl_dispatch_stub_915, gl_dispatch_stub_915, NULL, 915),
+ NAME_FUNC_OFFSET(29670, gl_dispatch_stub_916, gl_dispatch_stub_916, NULL, 916),
+ NAME_FUNC_OFFSET(29693, gl_dispatch_stub_917, gl_dispatch_stub_917, NULL, 917),
+ NAME_FUNC_OFFSET(29717, gl_dispatch_stub_918, gl_dispatch_stub_918, NULL, 918),
+ NAME_FUNC_OFFSET(29739, gl_dispatch_stub_919, gl_dispatch_stub_919, NULL, 919),
+ NAME_FUNC_OFFSET(29762, gl_dispatch_stub_920, gl_dispatch_stub_920, NULL, 920),
+ NAME_FUNC_OFFSET(29784, gl_dispatch_stub_921, gl_dispatch_stub_921, NULL, 921),
+ NAME_FUNC_OFFSET(29807, gl_dispatch_stub_922, gl_dispatch_stub_922, NULL, 922),
+ NAME_FUNC_OFFSET(29830, gl_dispatch_stub_923, gl_dispatch_stub_923, NULL, 923),
+ NAME_FUNC_OFFSET(29854, gl_dispatch_stub_924, gl_dispatch_stub_924, NULL, 924),
+ NAME_FUNC_OFFSET(29883, gl_dispatch_stub_925, gl_dispatch_stub_925, NULL, 925),
+ NAME_FUNC_OFFSET(29914, gl_dispatch_stub_926, gl_dispatch_stub_926, NULL, 926),
+ NAME_FUNC_OFFSET(29945, gl_dispatch_stub_927, gl_dispatch_stub_927, NULL, 927),
+ NAME_FUNC_OFFSET(29974, gl_dispatch_stub_928, gl_dispatch_stub_928, NULL, 928),
+ NAME_FUNC_OFFSET(30005, gl_dispatch_stub_929, gl_dispatch_stub_929, NULL, 929),
+ NAME_FUNC_OFFSET(30036, gl_dispatch_stub_930, gl_dispatch_stub_930, NULL, 930),
+ NAME_FUNC_OFFSET(30065, gl_dispatch_stub_931, gl_dispatch_stub_931, NULL, 931),
+ NAME_FUNC_OFFSET(30096, gl_dispatch_stub_932, gl_dispatch_stub_932, NULL, 932),
+ NAME_FUNC_OFFSET(30127, gl_dispatch_stub_934, gl_dispatch_stub_934, NULL, 934),
+ NAME_FUNC_OFFSET(30149, gl_dispatch_stub_935, gl_dispatch_stub_935, NULL, 935),
+ NAME_FUNC_OFFSET(30178, glDebugMessageCallback, glDebugMessageCallback, NULL, 936),
+ NAME_FUNC_OFFSET(30204, glDebugMessageControl, glDebugMessageControl, NULL, 937),
+ NAME_FUNC_OFFSET(30229, glDebugMessageInsert, glDebugMessageInsert, NULL, 938),
+ NAME_FUNC_OFFSET(30253, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 939),
+ NAME_FUNC_OFFSET(30277, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 946),
+ NAME_FUNC_OFFSET(30296, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 947),
+ NAME_FUNC_OFFSET(30316, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 948),
+ NAME_FUNC_OFFSET(30336, glFogCoordfEXT, glFogCoordfEXT, NULL, 949),
+ NAME_FUNC_OFFSET(30348, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 950),
+ NAME_FUNC_OFFSET(30361, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1053),
+ NAME_FUNC_OFFSET(30379, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1054),
+ NAME_FUNC_OFFSET(30398, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1055),
+ NAME_FUNC_OFFSET(30416, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1056),
+ NAME_FUNC_OFFSET(30435, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1057),
+ NAME_FUNC_OFFSET(30454, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1058),
+ NAME_FUNC_OFFSET(30474, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1059),
+ NAME_FUNC_OFFSET(30492, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1060),
+ NAME_FUNC_OFFSET(30511, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1061),
+ NAME_FUNC_OFFSET(30530, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1062),
+ NAME_FUNC_OFFSET(30550, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1063),
+ NAME_FUNC_OFFSET(30568, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1064),
+ NAME_FUNC_OFFSET(30587, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1065),
+ NAME_FUNC_OFFSET(30606, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1066),
+ NAME_FUNC_OFFSET(30626, glTextureBarrierNV, glTextureBarrierNV, NULL, 1087),
+ NAME_FUNC_OFFSET(30643, glAlphaFuncx, glAlphaFuncx, NULL, 1113),
+ NAME_FUNC_OFFSET(30659, glClearColorx, glClearColorx, NULL, 1114),
+ NAME_FUNC_OFFSET(30676, glClearDepthx, glClearDepthx, NULL, 1115),
+ NAME_FUNC_OFFSET(30693, glColor4x, glColor4x, NULL, 1116),
+ NAME_FUNC_OFFSET(30706, glDepthRangex, glDepthRangex, NULL, 1117),
+ NAME_FUNC_OFFSET(30723, glFogx, glFogx, NULL, 1118),
+ NAME_FUNC_OFFSET(30733, glFogxv, glFogxv, NULL, 1119),
+ NAME_FUNC_OFFSET(30744, glFrustumf, glFrustumf, NULL, 1120),
+ NAME_FUNC_OFFSET(30758, glFrustumx, glFrustumx, NULL, 1121),
+ NAME_FUNC_OFFSET(30772, glLightModelx, glLightModelx, NULL, 1122),
+ NAME_FUNC_OFFSET(30789, glLightModelxv, glLightModelxv, NULL, 1123),
+ NAME_FUNC_OFFSET(30807, glLightx, glLightx, NULL, 1124),
+ NAME_FUNC_OFFSET(30819, glLightxv, glLightxv, NULL, 1125),
+ NAME_FUNC_OFFSET(30832, glLineWidthx, glLineWidthx, NULL, 1126),
+ NAME_FUNC_OFFSET(30848, glLoadMatrixx, glLoadMatrixx, NULL, 1127),
+ NAME_FUNC_OFFSET(30865, glMaterialx, glMaterialx, NULL, 1128),
+ NAME_FUNC_OFFSET(30880, glMaterialxv, glMaterialxv, NULL, 1129),
+ NAME_FUNC_OFFSET(30896, glMultMatrixx, glMultMatrixx, NULL, 1130),
+ NAME_FUNC_OFFSET(30913, glMultiTexCoord4x, glMultiTexCoord4x, NULL, 1131),
+ NAME_FUNC_OFFSET(30934, glNormal3x, glNormal3x, NULL, 1132),
+ NAME_FUNC_OFFSET(30948, glOrthof, glOrthof, NULL, 1133),
+ NAME_FUNC_OFFSET(30960, glOrthox, glOrthox, NULL, 1134),
+ NAME_FUNC_OFFSET(30972, glPointSizex, glPointSizex, NULL, 1135),
+ NAME_FUNC_OFFSET(30988, glPolygonOffsetx, glPolygonOffsetx, NULL, 1136),
+ NAME_FUNC_OFFSET(31008, glRotatex, glRotatex, NULL, 1137),
+ NAME_FUNC_OFFSET(31021, glSampleCoveragex, glSampleCoveragex, NULL, 1138),
+ NAME_FUNC_OFFSET(31042, glScalex, glScalex, NULL, 1139),
+ NAME_FUNC_OFFSET(31054, glTexEnvx, glTexEnvx, NULL, 1140),
+ NAME_FUNC_OFFSET(31067, glTexEnvxv, glTexEnvxv, NULL, 1141),
+ NAME_FUNC_OFFSET(31081, glTexParameterx, glTexParameterx, NULL, 1142),
+ NAME_FUNC_OFFSET(31100, glTranslatex, glTranslatex, NULL, 1143),
+ NAME_FUNC_OFFSET(31116, glClipPlanef, glClipPlanef, NULL, 1144),
+ NAME_FUNC_OFFSET(31132, glClipPlanex, glClipPlanex, NULL, 1145),
+ NAME_FUNC_OFFSET(31148, glGetClipPlanef, glGetClipPlanef, NULL, 1146),
+ NAME_FUNC_OFFSET(31167, glGetClipPlanex, glGetClipPlanex, NULL, 1147),
+ NAME_FUNC_OFFSET(31186, glGetFixedv, glGetFixedv, NULL, 1148),
+ NAME_FUNC_OFFSET(31201, glGetLightxv, glGetLightxv, NULL, 1149),
+ NAME_FUNC_OFFSET(31217, glGetMaterialxv, glGetMaterialxv, NULL, 1150),
+ NAME_FUNC_OFFSET(31236, glGetTexEnvxv, glGetTexEnvxv, NULL, 1151),
+ NAME_FUNC_OFFSET(31253, glGetTexParameterxv, glGetTexParameterxv, NULL, 1152),
+ NAME_FUNC_OFFSET(31276, glPointParameterx, glPointParameterx, NULL, 1153),
+ NAME_FUNC_OFFSET(31297, glPointParameterxv, glPointParameterxv, NULL, 1154),
+ NAME_FUNC_OFFSET(31319, glTexParameterxv, glTexParameterxv, NULL, 1155),
NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
};
diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c
index c756bf570..5a8966f74 100644
--- a/xorg-server/glx/glxdri2.c
+++ b/xorg-server/glx/glxdri2.c
@@ -475,7 +475,7 @@ create_driver_context(__GLXDRIcontext * context,
context->driContext = NULL;
if (screen->dri2->base.version >= 3) {
- uint32_t ctx_attribs[3 * 2];
+ uint32_t ctx_attribs[4 * 2];
unsigned num_ctx_attribs = 0;
unsigned dri_err = 0;
unsigned major_ver;
@@ -510,6 +510,8 @@ create_driver_context(__GLXDRIcontext * context,
__DRI_CTX_ATTRIB_RESET_STRATEGY;
ctx_attribs[num_ctx_attribs++] = reset;
}
+
+ assert(num_ctx_attribs <= ARRAY_SIZE(ctx_attribs));
}
context->driContext =
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index 52ff12fcd..fdbb66d87 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -4932,1167 +4932,1171 @@ static const char _mesa_function_pool[] =
"ip\0"
"glGenSamplers\0"
"\0"
- /* _mesa_function_pool[35820]: DrawTexfOES (will be remapped) */
+ /* _mesa_function_pool[35820]: ClipControl (will be remapped) */
+ "ii\0"
+ "glClipControl\0"
+ "\0"
+ /* _mesa_function_pool[35838]: DrawTexfOES (will be remapped) */
"fffff\0"
"glDrawTexfOES\0"
"\0"
- /* _mesa_function_pool[35841]: AttachObjectARB (will be remapped) */
+ /* _mesa_function_pool[35859]: AttachObjectARB (will be remapped) */
"ii\0"
"glAttachObjectARB\0"
"\0"
- /* _mesa_function_pool[35863]: GetFragmentLightivSGIX (dynamic) */
+ /* _mesa_function_pool[35881]: GetFragmentLightivSGIX (dynamic) */
"iip\0"
"glGetFragmentLightivSGIX\0"
"\0"
- /* _mesa_function_pool[35893]: Accum (offset 213) */
+ /* _mesa_function_pool[35911]: Accum (offset 213) */
"if\0"
"glAccum\0"
"\0"
- /* _mesa_function_pool[35905]: GetTexImage (offset 281) */
+ /* _mesa_function_pool[35923]: GetTexImage (offset 281) */
"iiiip\0"
"glGetTexImage\0"
"\0"
- /* _mesa_function_pool[35926]: Color4x (will be remapped) */
+ /* _mesa_function_pool[35944]: Color4x (will be remapped) */
"iiii\0"
"glColor4xOES\0"
"glColor4x\0"
"\0"
- /* _mesa_function_pool[35955]: ConvolutionParameteriv (offset 353) */
+ /* _mesa_function_pool[35973]: ConvolutionParameteriv (offset 353) */
"iip\0"
"glConvolutionParameteriv\0"
"glConvolutionParameterivEXT\0"
"\0"
- /* _mesa_function_pool[36013]: Color4s (offset 33) */
+ /* _mesa_function_pool[36031]: Color4s (offset 33) */
"iiii\0"
"glColor4s\0"
"\0"
- /* _mesa_function_pool[36029]: CullParameterdvEXT (dynamic) */
+ /* _mesa_function_pool[36047]: CullParameterdvEXT (dynamic) */
"ip\0"
"glCullParameterdvEXT\0"
"\0"
- /* _mesa_function_pool[36054]: GetUniformuiv (will be remapped) */
+ /* _mesa_function_pool[36072]: GetUniformuiv (will be remapped) */
"iip\0"
"glGetUniformuivEXT\0"
"glGetUniformuiv\0"
"\0"
- /* _mesa_function_pool[36094]: Color4i (offset 31) */
+ /* _mesa_function_pool[36112]: Color4i (offset 31) */
"iiii\0"
"glColor4i\0"
"\0"
- /* _mesa_function_pool[36110]: Color4f (offset 29) */
+ /* _mesa_function_pool[36128]: Color4f (offset 29) */
"ffff\0"
"glColor4f\0"
"\0"
- /* _mesa_function_pool[36126]: Color4d (offset 27) */
+ /* _mesa_function_pool[36144]: Color4d (offset 27) */
"dddd\0"
"glColor4d\0"
"\0"
- /* _mesa_function_pool[36142]: Color4b (offset 25) */
+ /* _mesa_function_pool[36160]: Color4b (offset 25) */
"iiii\0"
"glColor4b\0"
"\0"
- /* _mesa_function_pool[36158]: LoadProgramNV (will be remapped) */
+ /* _mesa_function_pool[36176]: LoadProgramNV (will be remapped) */
"iiip\0"
"glLoadProgramNV\0"
"\0"
- /* _mesa_function_pool[36180]: GetAttachedObjectsARB (will be remapped) */
+ /* _mesa_function_pool[36198]: GetAttachedObjectsARB (will be remapped) */
"iipp\0"
"glGetAttachedObjectsARB\0"
"\0"
- /* _mesa_function_pool[36210]: EvalCoord1fv (offset 231) */
+ /* _mesa_function_pool[36228]: EvalCoord1fv (offset 231) */
"p\0"
"glEvalCoord1fv\0"
"\0"
- /* _mesa_function_pool[36228]: VertexAttribLFormat (will be remapped) */
+ /* _mesa_function_pool[36246]: VertexAttribLFormat (will be remapped) */
"iiii\0"
"glVertexAttribLFormat\0"
"\0"
- /* _mesa_function_pool[36256]: StencilFuncSeparate (will be remapped) */
+ /* _mesa_function_pool[36274]: StencilFuncSeparate (will be remapped) */
"iiii\0"
"glStencilFuncSeparate\0"
"\0"
- /* _mesa_function_pool[36284]: ShaderSource (will be remapped) */
+ /* _mesa_function_pool[36302]: ShaderSource (will be remapped) */
"iipp\0"
"glShaderSource\0"
"glShaderSourceARB\0"
"\0"
- /* _mesa_function_pool[36323]: Normal3fv (offset 57) */
+ /* _mesa_function_pool[36341]: Normal3fv (offset 57) */
"p\0"
"glNormal3fv\0"
"\0"
- /* _mesa_function_pool[36338]: ImageTransformParameterfvHP (dynamic) */
+ /* _mesa_function_pool[36356]: ImageTransformParameterfvHP (dynamic) */
"iip\0"
"glImageTransformParameterfvHP\0"
"\0"
- /* _mesa_function_pool[36373]: NormalP3ui (will be remapped) */
+ /* _mesa_function_pool[36391]: NormalP3ui (will be remapped) */
"ii\0"
"glNormalP3ui\0"
"\0"
- /* _mesa_function_pool[36390]: MultiTexCoord3fvARB (offset 395) */
+ /* _mesa_function_pool[36408]: MultiTexCoord3fvARB (offset 395) */
"ip\0"
"glMultiTexCoord3fv\0"
"glMultiTexCoord3fvARB\0"
"\0"
- /* _mesa_function_pool[36435]: GetProgramParameterfvNV (will be remapped) */
+ /* _mesa_function_pool[36453]: GetProgramParameterfvNV (will be remapped) */
"iiip\0"
"glGetProgramParameterfvNV\0"
"\0"
- /* _mesa_function_pool[36467]: BufferData (will be remapped) */
+ /* _mesa_function_pool[36485]: BufferData (will be remapped) */
"iipi\0"
"glBufferData\0"
"glBufferDataARB\0"
"\0"
- /* _mesa_function_pool[36502]: TexSubImage2D (offset 333) */
+ /* _mesa_function_pool[36520]: TexSubImage2D (offset 333) */
"iiiiiiiip\0"
"glTexSubImage2D\0"
"glTexSubImage2DEXT\0"
"\0"
- /* _mesa_function_pool[36548]: FragmentLightivSGIX (dynamic) */
+ /* _mesa_function_pool[36566]: FragmentLightivSGIX (dynamic) */
"iip\0"
"glFragmentLightivSGIX\0"
"\0"
- /* _mesa_function_pool[36575]: GetTexParameterPointervAPPLE (dynamic) */
+ /* _mesa_function_pool[36593]: GetTexParameterPointervAPPLE (dynamic) */
"iip\0"
"glGetTexParameterPointervAPPLE\0"
"\0"
- /* _mesa_function_pool[36611]: TexGenfv (offset 191) */
+ /* _mesa_function_pool[36629]: TexGenfv (offset 191) */
"iip\0"
"glTexGenfv\0"
"glTexGenfvOES\0"
"\0"
- /* _mesa_function_pool[36641]: GetVertexAttribiv (will be remapped) */
+ /* _mesa_function_pool[36659]: GetVertexAttribiv (will be remapped) */
"iip\0"
"glGetVertexAttribiv\0"
"glGetVertexAttribivARB\0"
"\0"
- /* _mesa_function_pool[36689]: TexCoordP2uiv (will be remapped) */
+ /* _mesa_function_pool[36707]: TexCoordP2uiv (will be remapped) */
"ip\0"
"glTexCoordP2uiv\0"
"\0"
- /* _mesa_function_pool[36709]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[36727]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
"ppp\0"
"glReplacementCodeuiColor3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[36753]: Uniform3fv (will be remapped) */
+ /* _mesa_function_pool[36771]: Uniform3fv (will be remapped) */
"iip\0"
"glUniform3fv\0"
"glUniform3fvARB\0"
"\0"
- /* _mesa_function_pool[36787]: BlendEquation (offset 337) */
+ /* _mesa_function_pool[36805]: BlendEquation (offset 337) */
"i\0"
"glBlendEquation\0"
"glBlendEquationEXT\0"
"glBlendEquationOES\0"
"\0"
- /* _mesa_function_pool[36844]: VertexAttrib3dNV (will be remapped) */
+ /* _mesa_function_pool[36862]: VertexAttrib3dNV (will be remapped) */
"iddd\0"
"glVertexAttrib3dNV\0"
"\0"
- /* _mesa_function_pool[36869]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[36887]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
"ppppp\0"
"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[36933]: IndexFuncEXT (dynamic) */
+ /* _mesa_function_pool[36951]: IndexFuncEXT (dynamic) */
"if\0"
"glIndexFuncEXT\0"
"\0"
- /* _mesa_function_pool[36952]: UseShaderProgramEXT (will be remapped) */
+ /* _mesa_function_pool[36970]: UseShaderProgramEXT (will be remapped) */
"ii\0"
"glUseShaderProgramEXT\0"
"\0"
- /* _mesa_function_pool[36978]: PushName (offset 201) */
+ /* _mesa_function_pool[36996]: PushName (offset 201) */
"i\0"
"glPushName\0"
"\0"
- /* _mesa_function_pool[36992]: GenFencesNV (dynamic) */
+ /* _mesa_function_pool[37010]: GenFencesNV (dynamic) */
"ip\0"
"glGenFencesNV\0"
"\0"
- /* _mesa_function_pool[37010]: CullParameterfvEXT (dynamic) */
+ /* _mesa_function_pool[37028]: CullParameterfvEXT (dynamic) */
"ip\0"
"glCullParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[37035]: DeleteRenderbuffers (will be remapped) */
+ /* _mesa_function_pool[37053]: DeleteRenderbuffers (will be remapped) */
"ip\0"
"glDeleteRenderbuffers\0"
"glDeleteRenderbuffersEXT\0"
"glDeleteRenderbuffersOES\0"
"\0"
- /* _mesa_function_pool[37111]: VertexAttrib1dv (will be remapped) */
+ /* _mesa_function_pool[37129]: VertexAttrib1dv (will be remapped) */
"ip\0"
"glVertexAttrib1dv\0"
"glVertexAttrib1dvARB\0"
"\0"
- /* _mesa_function_pool[37154]: ImageTransformParameteriHP (dynamic) */
+ /* _mesa_function_pool[37172]: ImageTransformParameteriHP (dynamic) */
"iii\0"
"glImageTransformParameteriHP\0"
"\0"
- /* _mesa_function_pool[37188]: IsShader (will be remapped) */
+ /* _mesa_function_pool[37206]: IsShader (will be remapped) */
"i\0"
"glIsShader\0"
"\0"
- /* _mesa_function_pool[37202]: Rotated (offset 299) */
+ /* _mesa_function_pool[37220]: Rotated (offset 299) */
"dddd\0"
"glRotated\0"
"\0"
- /* _mesa_function_pool[37218]: Color4iv (offset 32) */
+ /* _mesa_function_pool[37236]: Color4iv (offset 32) */
"p\0"
"glColor4iv\0"
"\0"
- /* _mesa_function_pool[37232]: PointParameterxv (will be remapped) */
+ /* _mesa_function_pool[37250]: PointParameterxv (will be remapped) */
"ip\0"
"glPointParameterxvOES\0"
"glPointParameterxv\0"
"\0"
- /* _mesa_function_pool[37277]: Rotatex (will be remapped) */
+ /* _mesa_function_pool[37295]: Rotatex (will be remapped) */
"iiii\0"
"glRotatexOES\0"
"glRotatex\0"
"\0"
- /* _mesa_function_pool[37306]: FramebufferTextureLayer (will be remapped) */
+ /* _mesa_function_pool[37324]: FramebufferTextureLayer (will be remapped) */
"iiiii\0"
"glFramebufferTextureLayer\0"
"glFramebufferTextureLayerARB\0"
"glFramebufferTextureLayerEXT\0"
"\0"
- /* _mesa_function_pool[37397]: TexEnvfv (offset 185) */
+ /* _mesa_function_pool[37415]: TexEnvfv (offset 185) */
"iip\0"
"glTexEnvfv\0"
"\0"
- /* _mesa_function_pool[37413]: ProgramUniformMatrix3fv (will be remapped) */
+ /* _mesa_function_pool[37431]: ProgramUniformMatrix3fv (will be remapped) */
"iiiip\0"
"glProgramUniformMatrix3fv\0"
"glProgramUniformMatrix3fvEXT\0"
"\0"
- /* _mesa_function_pool[37475]: LoadMatrixf (offset 291) */
+ /* _mesa_function_pool[37493]: LoadMatrixf (offset 291) */
"p\0"
"glLoadMatrixf\0"
"\0"
- /* _mesa_function_pool[37492]: GetProgramLocalParameterfvARB (will be remapped) */
+ /* _mesa_function_pool[37510]: GetProgramLocalParameterfvARB (will be remapped) */
"iip\0"
"glGetProgramLocalParameterfvARB\0"
"\0"
- /* _mesa_function_pool[37529]: LoadMatrixx (will be remapped) */
+ /* _mesa_function_pool[37547]: LoadMatrixx (will be remapped) */
"p\0"
"glLoadMatrixxOES\0"
"glLoadMatrixx\0"
"\0"
- /* _mesa_function_pool[37563]: DrawRangeElementsBaseVertex (will be remapped) */
+ /* _mesa_function_pool[37581]: DrawRangeElementsBaseVertex (will be remapped) */
"iiiiipi\0"
"glDrawRangeElementsBaseVertex\0"
"\0"
- /* _mesa_function_pool[37602]: MatrixIndexuivARB (dynamic) */
+ /* _mesa_function_pool[37620]: MatrixIndexuivARB (dynamic) */
"ip\0"
"glMatrixIndexuivARB\0"
"\0"
- /* _mesa_function_pool[37626]: Tangent3sEXT (dynamic) */
+ /* _mesa_function_pool[37644]: Tangent3sEXT (dynamic) */
"iii\0"
"glTangent3sEXT\0"
"\0"
- /* _mesa_function_pool[37646]: SecondaryColor3bv (will be remapped) */
+ /* _mesa_function_pool[37664]: SecondaryColor3bv (will be remapped) */
"p\0"
"glSecondaryColor3bv\0"
"glSecondaryColor3bvEXT\0"
"\0"
- /* _mesa_function_pool[37692]: GlobalAlphaFactorusSUN (dynamic) */
+ /* _mesa_function_pool[37710]: GlobalAlphaFactorusSUN (dynamic) */
"i\0"
"glGlobalAlphaFactorusSUN\0"
"\0"
- /* _mesa_function_pool[37720]: GetCombinerOutputParameterivNV (dynamic) */
+ /* _mesa_function_pool[37738]: GetCombinerOutputParameterivNV (dynamic) */
"iiip\0"
"glGetCombinerOutputParameterivNV\0"
"\0"
- /* _mesa_function_pool[37759]: DrawTexxvOES (will be remapped) */
+ /* _mesa_function_pool[37777]: DrawTexxvOES (will be remapped) */
"p\0"
"glDrawTexxvOES\0"
"\0"
- /* _mesa_function_pool[37777]: TexParameterfv (offset 179) */
+ /* _mesa_function_pool[37795]: TexParameterfv (offset 179) */
"iip\0"
"glTexParameterfv\0"
"\0"
- /* _mesa_function_pool[37799]: Color4ubv (offset 36) */
+ /* _mesa_function_pool[37817]: Color4ubv (offset 36) */
"p\0"
"glColor4ubv\0"
"\0"
- /* _mesa_function_pool[37814]: TexCoord2fv (offset 105) */
+ /* _mesa_function_pool[37832]: TexCoord2fv (offset 105) */
"p\0"
"glTexCoord2fv\0"
"\0"
- /* _mesa_function_pool[37831]: FogCoorddv (will be remapped) */
+ /* _mesa_function_pool[37849]: FogCoorddv (will be remapped) */
"p\0"
"glFogCoorddv\0"
"glFogCoorddvEXT\0"
"\0"
- /* _mesa_function_pool[37863]: VDPAUUnregisterSurfaceNV (will be remapped) */
+ /* _mesa_function_pool[37881]: VDPAUUnregisterSurfaceNV (will be remapped) */
"i\0"
"glVDPAUUnregisterSurfaceNV\0"
"\0"
- /* _mesa_function_pool[37893]: ColorP3ui (will be remapped) */
+ /* _mesa_function_pool[37911]: ColorP3ui (will be remapped) */
"ii\0"
"glColorP3ui\0"
"\0"
- /* _mesa_function_pool[37909]: ClearBufferuiv (will be remapped) */
+ /* _mesa_function_pool[37927]: ClearBufferuiv (will be remapped) */
"iip\0"
"glClearBufferuiv\0"
"\0"
- /* _mesa_function_pool[37931]: GetShaderPrecisionFormat (will be remapped) */
+ /* _mesa_function_pool[37949]: GetShaderPrecisionFormat (will be remapped) */
"iipp\0"
"glGetShaderPrecisionFormat\0"
"\0"
- /* _mesa_function_pool[37964]: ProgramNamedParameter4dvNV (will be remapped) */
+ /* _mesa_function_pool[37982]: ProgramNamedParameter4dvNV (will be remapped) */
"iipp\0"
"glProgramNamedParameter4dvNV\0"
"\0"
- /* _mesa_function_pool[37999]: Flush (offset 217) */
+ /* _mesa_function_pool[38017]: Flush (offset 217) */
"\0"
"glFlush\0"
"\0"
- /* _mesa_function_pool[38009]: VertexAttribI4iEXT (will be remapped) */
+ /* _mesa_function_pool[38027]: VertexAttribI4iEXT (will be remapped) */
"iiiii\0"
"glVertexAttribI4iEXT\0"
"glVertexAttribI4i\0"
"\0"
- /* _mesa_function_pool[38055]: FogCoordd (will be remapped) */
+ /* _mesa_function_pool[38073]: FogCoordd (will be remapped) */
"d\0"
"glFogCoordd\0"
"glFogCoorddEXT\0"
"\0"
- /* _mesa_function_pool[38085]: Uniform3iv (will be remapped) */
+ /* _mesa_function_pool[38103]: Uniform3iv (will be remapped) */
"iip\0"
"glUniform3iv\0"
"glUniform3ivARB\0"
"\0"
- /* _mesa_function_pool[38119]: TexStorage2DMultisample (will be remapped) */
+ /* _mesa_function_pool[38137]: TexStorage2DMultisample (will be remapped) */
"iiiiii\0"
"glTexStorage2DMultisample\0"
"\0"
- /* _mesa_function_pool[38153]: UnlockArraysEXT (will be remapped) */
+ /* _mesa_function_pool[38171]: UnlockArraysEXT (will be remapped) */
"\0"
"glUnlockArraysEXT\0"
"\0"
- /* _mesa_function_pool[38173]: VertexAttrib1svNV (will be remapped) */
+ /* _mesa_function_pool[38191]: VertexAttrib1svNV (will be remapped) */
"ip\0"
"glVertexAttrib1svNV\0"
"\0"
- /* _mesa_function_pool[38197]: VertexAttrib4iv (will be remapped) */
+ /* _mesa_function_pool[38215]: VertexAttrib4iv (will be remapped) */
"ip\0"
"glVertexAttrib4iv\0"
"glVertexAttrib4ivARB\0"
"\0"
- /* _mesa_function_pool[38240]: CopyTexSubImage3D (offset 373) */
+ /* _mesa_function_pool[38258]: CopyTexSubImage3D (offset 373) */
"iiiiiiiii\0"
"glCopyTexSubImage3D\0"
"glCopyTexSubImage3DEXT\0"
"glCopyTexSubImage3DOES\0"
"\0"
- /* _mesa_function_pool[38317]: GetInteger64v (will be remapped) */
+ /* _mesa_function_pool[38335]: GetInteger64v (will be remapped) */
"ip\0"
"glGetInteger64v\0"
"\0"
- /* _mesa_function_pool[38337]: DetachObjectARB (will be remapped) */
+ /* _mesa_function_pool[38355]: DetachObjectARB (will be remapped) */
"ii\0"
"glDetachObjectARB\0"
"\0"
- /* _mesa_function_pool[38359]: Indexiv (offset 49) */
+ /* _mesa_function_pool[38377]: Indexiv (offset 49) */
"p\0"
"glIndexiv\0"
"\0"
- /* _mesa_function_pool[38372]: TexEnvi (offset 186) */
+ /* _mesa_function_pool[38390]: TexEnvi (offset 186) */
"iii\0"
"glTexEnvi\0"
"\0"
- /* _mesa_function_pool[38387]: TexEnvf (offset 184) */
+ /* _mesa_function_pool[38405]: TexEnvf (offset 184) */
"iif\0"
"glTexEnvf\0"
"\0"
- /* _mesa_function_pool[38402]: TexEnvx (will be remapped) */
+ /* _mesa_function_pool[38420]: TexEnvx (will be remapped) */
"iii\0"
"glTexEnvxOES\0"
"glTexEnvx\0"
"\0"
- /* _mesa_function_pool[38430]: StopInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[38448]: StopInstrumentsSGIX (dynamic) */
"i\0"
"glStopInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[38455]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+ /* _mesa_function_pool[38473]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
"fffffffffffffff\0"
"glTexCoord4fColor4fNormal3fVertex4fSUN\0"
"\0"
- /* _mesa_function_pool[38511]: InvalidateBufferSubData (will be remapped) */
+ /* _mesa_function_pool[38529]: InvalidateBufferSubData (will be remapped) */
"iii\0"
"glInvalidateBufferSubData\0"
"\0"
- /* _mesa_function_pool[38542]: UniformMatrix4x2fv (will be remapped) */
+ /* _mesa_function_pool[38560]: UniformMatrix4x2fv (will be remapped) */
"iiip\0"
"glUniformMatrix4x2fv\0"
"\0"
- /* _mesa_function_pool[38569]: ClearTexImage (will be remapped) */
+ /* _mesa_function_pool[38587]: ClearTexImage (will be remapped) */
"iiiip\0"
"glClearTexImage\0"
"\0"
- /* _mesa_function_pool[38592]: PolygonOffset (offset 319) */
+ /* _mesa_function_pool[38610]: PolygonOffset (offset 319) */
"ff\0"
"glPolygonOffset\0"
"\0"
- /* _mesa_function_pool[38612]: BeginPerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[38630]: BeginPerfQueryINTEL (will be remapped) */
"i\0"
"glBeginPerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[38637]: SamplerParameterfv (will be remapped) */
+ /* _mesa_function_pool[38655]: SamplerParameterfv (will be remapped) */
"iip\0"
"glSamplerParameterfv\0"
"\0"
- /* _mesa_function_pool[38663]: Normal3fVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[38681]: Normal3fVertex3fSUN (dynamic) */
"ffffff\0"
"glNormal3fVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[38693]: ProgramEnvParameter4fARB (will be remapped) */
+ /* _mesa_function_pool[38711]: ProgramEnvParameter4fARB (will be remapped) */
"iiffff\0"
"glProgramEnvParameter4fARB\0"
"glProgramParameter4fNV\0"
"\0"
- /* _mesa_function_pool[38751]: ClearDepth (offset 208) */
+ /* _mesa_function_pool[38769]: ClearDepth (offset 208) */
"d\0"
"glClearDepth\0"
"\0"
- /* _mesa_function_pool[38767]: VertexAttrib3dvNV (will be remapped) */
+ /* _mesa_function_pool[38785]: VertexAttrib3dvNV (will be remapped) */
"ip\0"
"glVertexAttrib3dvNV\0"
"\0"
- /* _mesa_function_pool[38791]: Color4fv (offset 30) */
+ /* _mesa_function_pool[38809]: Color4fv (offset 30) */
"p\0"
"glColor4fv\0"
"\0"
- /* _mesa_function_pool[38805]: GetnMinmaxARB (will be remapped) */
+ /* _mesa_function_pool[38823]: GetnMinmaxARB (will be remapped) */
"iiiiip\0"
"glGetnMinmaxARB\0"
"\0"
- /* _mesa_function_pool[38829]: ColorPointer (offset 308) */
+ /* _mesa_function_pool[38847]: ColorPointer (offset 308) */
"iiip\0"
"glColorPointer\0"
"\0"
- /* _mesa_function_pool[38850]: GetPointerv (offset 329) */
+ /* _mesa_function_pool[38868]: GetPointerv (offset 329) */
"ip\0"
"glGetPointerv\0"
"glGetPointervEXT\0"
"\0"
- /* _mesa_function_pool[38885]: Lightiv (offset 162) */
+ /* _mesa_function_pool[38903]: Lightiv (offset 162) */
"iip\0"
"glLightiv\0"
"\0"
- /* _mesa_function_pool[38900]: GetTexParameteriv (offset 283) */
+ /* _mesa_function_pool[38918]: GetTexParameteriv (offset 283) */
"iip\0"
"glGetTexParameteriv\0"
"\0"
- /* _mesa_function_pool[38925]: TransformFeedbackVaryings (will be remapped) */
+ /* _mesa_function_pool[38943]: TransformFeedbackVaryings (will be remapped) */
"iipi\0"
"glTransformFeedbackVaryings\0"
"glTransformFeedbackVaryingsEXT\0"
"\0"
- /* _mesa_function_pool[38990]: VertexAttrib3sv (will be remapped) */
+ /* _mesa_function_pool[39008]: VertexAttrib3sv (will be remapped) */
"ip\0"
"glVertexAttrib3sv\0"
"glVertexAttrib3svARB\0"
"\0"
- /* _mesa_function_pool[39033]: IsVertexArray (will be remapped) */
+ /* _mesa_function_pool[39051]: IsVertexArray (will be remapped) */
"i\0"
"glIsVertexArray\0"
"glIsVertexArrayAPPLE\0"
"glIsVertexArrayOES\0"
"\0"
- /* _mesa_function_pool[39092]: PushClientAttrib (offset 335) */
+ /* _mesa_function_pool[39110]: PushClientAttrib (offset 335) */
"i\0"
"glPushClientAttrib\0"
"\0"
- /* _mesa_function_pool[39114]: ProgramUniform4ui (will be remapped) */
+ /* _mesa_function_pool[39132]: ProgramUniform4ui (will be remapped) */
"iiiiii\0"
"glProgramUniform4ui\0"
"glProgramUniform4uiEXT\0"
"\0"
- /* _mesa_function_pool[39165]: Uniform1f (will be remapped) */
+ /* _mesa_function_pool[39183]: Uniform1f (will be remapped) */
"if\0"
"glUniform1f\0"
"glUniform1fARB\0"
"\0"
- /* _mesa_function_pool[39196]: FragmentMaterialfSGIX (dynamic) */
+ /* _mesa_function_pool[39214]: FragmentMaterialfSGIX (dynamic) */
"iif\0"
"glFragmentMaterialfSGIX\0"
"\0"
- /* _mesa_function_pool[39225]: Uniform1i (will be remapped) */
+ /* _mesa_function_pool[39243]: Uniform1i (will be remapped) */
"ii\0"
"glUniform1i\0"
"glUniform1iARB\0"
"\0"
- /* _mesa_function_pool[39256]: GetPolygonStipple (offset 274) */
+ /* _mesa_function_pool[39274]: GetPolygonStipple (offset 274) */
"p\0"
"glGetPolygonStipple\0"
"\0"
- /* _mesa_function_pool[39279]: PixelTexGenSGIX (dynamic) */
+ /* _mesa_function_pool[39297]: PixelTexGenSGIX (dynamic) */
"i\0"
"glPixelTexGenSGIX\0"
"\0"
- /* _mesa_function_pool[39300]: ReplacementCodeusvSUN (dynamic) */
+ /* _mesa_function_pool[39318]: ReplacementCodeusvSUN (dynamic) */
"p\0"
"glReplacementCodeusvSUN\0"
"\0"
- /* _mesa_function_pool[39327]: UseProgram (will be remapped) */
+ /* _mesa_function_pool[39345]: UseProgram (will be remapped) */
"i\0"
"glUseProgram\0"
"glUseProgramObjectARB\0"
"\0"
- /* _mesa_function_pool[39365]: StartInstrumentsSGIX (dynamic) */
+ /* _mesa_function_pool[39383]: StartInstrumentsSGIX (dynamic) */
"\0"
"glStartInstrumentsSGIX\0"
"\0"
- /* _mesa_function_pool[39390]: FlushMappedBufferRangeAPPLE (will be remapped) */
+ /* _mesa_function_pool[39408]: FlushMappedBufferRangeAPPLE (will be remapped) */
"iii\0"
"glFlushMappedBufferRangeAPPLE\0"
"\0"
- /* _mesa_function_pool[39425]: GetFragDataLocation (will be remapped) */
+ /* _mesa_function_pool[39443]: GetFragDataLocation (will be remapped) */
"ip\0"
"glGetFragDataLocationEXT\0"
"glGetFragDataLocation\0"
"\0"
- /* _mesa_function_pool[39476]: PixelMapuiv (offset 252) */
+ /* _mesa_function_pool[39494]: PixelMapuiv (offset 252) */
"iip\0"
"glPixelMapuiv\0"
"\0"
- /* _mesa_function_pool[39495]: VertexWeightfvEXT (dynamic) */
+ /* _mesa_function_pool[39513]: VertexWeightfvEXT (dynamic) */
"p\0"
"glVertexWeightfvEXT\0"
"\0"
- /* _mesa_function_pool[39518]: GetFenceivNV (dynamic) */
+ /* _mesa_function_pool[39536]: GetFenceivNV (dynamic) */
"iip\0"
"glGetFenceivNV\0"
"\0"
- /* _mesa_function_pool[39538]: CurrentPaletteMatrixARB (dynamic) */
+ /* _mesa_function_pool[39556]: CurrentPaletteMatrixARB (dynamic) */
"i\0"
"glCurrentPaletteMatrixARB\0"
"glCurrentPaletteMatrixOES\0"
"\0"
- /* _mesa_function_pool[39593]: GetInteger64i_v (will be remapped) */
+ /* _mesa_function_pool[39611]: GetInteger64i_v (will be remapped) */
"iip\0"
"glGetInteger64i_v\0"
"\0"
- /* _mesa_function_pool[39616]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+ /* _mesa_function_pool[39634]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
"ffiiiifff\0"
"glTexCoord2fColor4ubVertex3fSUN\0"
"\0"
- /* _mesa_function_pool[39659]: TagSampleBufferSGIX (dynamic) */
+ /* _mesa_function_pool[39677]: TagSampleBufferSGIX (dynamic) */
"\0"
"glTagSampleBufferSGIX\0"
"\0"
- /* _mesa_function_pool[39683]: Color3s (offset 17) */
+ /* _mesa_function_pool[39701]: Color3s (offset 17) */
"iii\0"
"glColor3s\0"
"\0"
- /* _mesa_function_pool[39698]: TexCoordPointer (offset 320) */
+ /* _mesa_function_pool[39716]: TexCoordPointer (offset 320) */
"iiip\0"
"glTexCoordPointer\0"
"\0"
- /* _mesa_function_pool[39722]: Color3i (offset 15) */
+ /* _mesa_function_pool[39740]: Color3i (offset 15) */
"iii\0"
"glColor3i\0"
"\0"
- /* _mesa_function_pool[39737]: EvalCoord2d (offset 232) */
+ /* _mesa_function_pool[39755]: EvalCoord2d (offset 232) */
"dd\0"
"glEvalCoord2d\0"
"\0"
- /* _mesa_function_pool[39755]: EvalCoord2f (offset 234) */
+ /* _mesa_function_pool[39773]: EvalCoord2f (offset 234) */
"ff\0"
"glEvalCoord2f\0"
"\0"
- /* _mesa_function_pool[39773]: Color3b (offset 9) */
+ /* _mesa_function_pool[39791]: Color3b (offset 9) */
"iii\0"
"glColor3b\0"
"\0"
- /* _mesa_function_pool[39788]: ExecuteProgramNV (will be remapped) */
+ /* _mesa_function_pool[39806]: ExecuteProgramNV (will be remapped) */
"iip\0"
"glExecuteProgramNV\0"
"\0"
- /* _mesa_function_pool[39812]: Color3f (offset 13) */
+ /* _mesa_function_pool[39830]: Color3f (offset 13) */
"fff\0"
"glColor3f\0"
"\0"
- /* _mesa_function_pool[39827]: Color3d (offset 11) */
+ /* _mesa_function_pool[39845]: Color3d (offset 11) */
"ddd\0"
"glColor3d\0"
"\0"
- /* _mesa_function_pool[39842]: GetVertexAttribdv (will be remapped) */
+ /* _mesa_function_pool[39860]: GetVertexAttribdv (will be remapped) */
"iip\0"
"glGetVertexAttribdv\0"
"glGetVertexAttribdvARB\0"
"\0"
- /* _mesa_function_pool[39890]: GetBufferPointerv (will be remapped) */
+ /* _mesa_function_pool[39908]: GetBufferPointerv (will be remapped) */
"iip\0"
"glGetBufferPointerv\0"
"glGetBufferPointervARB\0"
"glGetBufferPointervOES\0"
"\0"
- /* _mesa_function_pool[39961]: GenFramebuffers (will be remapped) */
+ /* _mesa_function_pool[39979]: GenFramebuffers (will be remapped) */
"ip\0"
"glGenFramebuffers\0"
"glGenFramebuffersEXT\0"
"glGenFramebuffersOES\0"
"\0"
- /* _mesa_function_pool[40025]: GenBuffers (will be remapped) */
+ /* _mesa_function_pool[40043]: GenBuffers (will be remapped) */
"ip\0"
"glGenBuffers\0"
"glGenBuffersARB\0"
"\0"
- /* _mesa_function_pool[40058]: ClearDepthx (will be remapped) */
+ /* _mesa_function_pool[40076]: ClearDepthx (will be remapped) */
"i\0"
"glClearDepthxOES\0"
"glClearDepthx\0"
"\0"
- /* _mesa_function_pool[40092]: BlendEquationSeparate (will be remapped) */
+ /* _mesa_function_pool[40110]: BlendEquationSeparate (will be remapped) */
"ii\0"
"glBlendEquationSeparate\0"
"glBlendEquationSeparateEXT\0"
"glBlendEquationSeparateATI\0"
"glBlendEquationSeparateOES\0"
"\0"
- /* _mesa_function_pool[40201]: PixelTransformParameteriEXT (dynamic) */
+ /* _mesa_function_pool[40219]: PixelTransformParameteriEXT (dynamic) */
"iii\0"
"glPixelTransformParameteriEXT\0"
"\0"
- /* _mesa_function_pool[40236]: MultiTexCoordP4ui (will be remapped) */
+ /* _mesa_function_pool[40254]: MultiTexCoordP4ui (will be remapped) */
"iii\0"
"glMultiTexCoordP4ui\0"
"\0"
- /* _mesa_function_pool[40261]: VertexAttribIPointer (will be remapped) */
+ /* _mesa_function_pool[40279]: VertexAttribIPointer (will be remapped) */
"iiiip\0"
"glVertexAttribIPointerEXT\0"
"glVertexAttribIPointer\0"
"\0"
- /* _mesa_function_pool[40317]: EnableVertexAttribArray (will be remapped) */
+ /* _mesa_function_pool[40335]: EnableVertexAttribArray (will be remapped) */
"i\0"
"glEnableVertexAttribArray\0"
"glEnableVertexAttribArrayARB\0"
"\0"
- /* _mesa_function_pool[40375]: FrameZoomSGIX (dynamic) */
+ /* _mesa_function_pool[40393]: FrameZoomSGIX (dynamic) */
"i\0"
"glFrameZoomSGIX\0"
"\0"
- /* _mesa_function_pool[40394]: RasterPos4sv (offset 85) */
+ /* _mesa_function_pool[40412]: RasterPos4sv (offset 85) */
"p\0"
"glRasterPos4sv\0"
"\0"
- /* _mesa_function_pool[40412]: SelectBuffer (offset 195) */
+ /* _mesa_function_pool[40430]: SelectBuffer (offset 195) */
"ip\0"
"glSelectBuffer\0"
"\0"
- /* _mesa_function_pool[40431]: GetSynciv (will be remapped) */
+ /* _mesa_function_pool[40449]: GetSynciv (will be remapped) */
"iiipp\0"
"glGetSynciv\0"
"\0"
- /* _mesa_function_pool[40450]: TextureView (will be remapped) */
+ /* _mesa_function_pool[40468]: TextureView (will be remapped) */
"iiiiiiii\0"
"glTextureView\0"
"\0"
- /* _mesa_function_pool[40474]: TexEnviv (offset 187) */
+ /* _mesa_function_pool[40492]: TexEnviv (offset 187) */
"iip\0"
"glTexEnviv\0"
"\0"
- /* _mesa_function_pool[40490]: TexSubImage3D (offset 372) */
+ /* _mesa_function_pool[40508]: TexSubImage3D (offset 372) */
"iiiiiiiiiip\0"
"glTexSubImage3D\0"
"glTexSubImage3DEXT\0"
"glTexSubImage3DOES\0"
"\0"
- /* _mesa_function_pool[40557]: Bitmap (offset 8) */
+ /* _mesa_function_pool[40575]: Bitmap (offset 8) */
"iiffffp\0"
"glBitmap\0"
"\0"
- /* _mesa_function_pool[40575]: VertexAttribDivisor (will be remapped) */
+ /* _mesa_function_pool[40593]: VertexAttribDivisor (will be remapped) */
"ii\0"
"glVertexAttribDivisorARB\0"
"glVertexAttribDivisor\0"
"\0"
- /* _mesa_function_pool[40626]: DrawTransformFeedbackStream (will be remapped) */
+ /* _mesa_function_pool[40644]: DrawTransformFeedbackStream (will be remapped) */
"iii\0"
"glDrawTransformFeedbackStream\0"
"\0"
- /* _mesa_function_pool[40661]: GetIntegerv (offset 263) */
+ /* _mesa_function_pool[40679]: GetIntegerv (offset 263) */
"ip\0"
"glGetIntegerv\0"
"\0"
- /* _mesa_function_pool[40679]: EndPerfQueryINTEL (will be remapped) */
+ /* _mesa_function_pool[40697]: EndPerfQueryINTEL (will be remapped) */
"i\0"
"glEndPerfQueryINTEL\0"
"\0"
- /* _mesa_function_pool[40702]: FragmentLightfvSGIX (dynamic) */
+ /* _mesa_function_pool[40720]: FragmentLightfvSGIX (dynamic) */
"iip\0"
"glFragmentLightfvSGIX\0"
"\0"
- /* _mesa_function_pool[40729]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+ /* _mesa_function_pool[40747]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
"ppp\0"
"glTexCoord2fColor3fVertex3fvSUN\0"
"\0"
- /* _mesa_function_pool[40766]: GetActiveUniform (will be remapped) */
+ /* _mesa_function_pool[40784]: GetActiveUniform (will be remapped) */
"iiipppp\0"
"glGetActiveUniform\0"
"glGetActiveUniformARB\0"
"\0"
- /* _mesa_function_pool[40816]: AlphaFuncx (will be remapped) */
+ /* _mesa_function_pool[40834]: AlphaFuncx (will be remapped) */
"ii\0"
"glAlphaFuncxOES\0"
"glAlphaFuncx\0"
"\0"
- /* _mesa_function_pool[40849]: VertexAttribI2ivEXT (will be remapped) */
+ /* _mesa_function_pool[40867]: VertexAttribI2ivEXT (will be remapped) */
"ip\0"
"glVertexAttribI2ivEXT\0"
"glVertexAttribI2iv\0"
"\0"
- /* _mesa_function_pool[40894]: VertexBlendARB (dynamic) */
+ /* _mesa_function_pool[40912]: VertexBlendARB (dynamic) */
"i\0"
"glVertexBlendARB\0"
"\0"
- /* _mesa_function_pool[40914]: Map1d (offset 220) */
+ /* _mesa_function_pool[40932]: Map1d (offset 220) */
"iddiip\0"
"glMap1d\0"
"\0"
- /* _mesa_function_pool[40930]: Map1f (offset 221) */
+ /* _mesa_function_pool[40948]: Map1f (offset 221) */
"iffiip\0"
"glMap1f\0"
"\0"
- /* _mesa_function_pool[40946]: AreTexturesResident (offset 322) */
+ /* _mesa_function_pool[40964]: AreTexturesResident (offset 322) */
"ipp\0"
"glAreTexturesResident\0"
"glAreTexturesResidentEXT\0"
"\0"
- /* _mesa_function_pool[40998]: ProgramNamedParameter4fNV (will be remapped) */
+ /* _mesa_function_pool[41016]: ProgramNamedParameter4fNV (will be remapped) */
"iipffff\0"
"glProgramNamedParameter4fNV\0"
"\0"
- /* _mesa_function_pool[41035]: PixelTransferi (offset 248) */
+ /* _mesa_function_pool[41053]: PixelTransferi (offset 248) */
"ii\0"
"glPixelTransferi\0"
"\0"
- /* _mesa_function_pool[41056]: VertexAttrib3fvNV (will be remapped) */
+ /* _mesa_function_pool[41074]: VertexAttrib3fvNV (will be remapped) */
"ip\0"
"glVertexAttrib3fvNV\0"
"\0"
- /* _mesa_function_pool[41080]: GetFinalCombinerInputParameterivNV (dynamic) */
+ /* _mesa_function_pool[41098]: GetFinalCombinerInputParameterivNV (dynamic) */
"iip\0"
"glGetFinalCombinerInputParameterivNV\0"
"\0"
- /* _mesa_function_pool[41122]: SecondaryColorP3ui (will be remapped) */
+ /* _mesa_function_pool[41140]: SecondaryColorP3ui (will be remapped) */
"ii\0"
"glSecondaryColorP3ui\0"
"\0"
- /* _mesa_function_pool[41147]: BindTextures (will be remapped) */
+ /* _mesa_function_pool[41165]: BindTextures (will be remapped) */
"iip\0"
"glBindTextures\0"
"\0"
- /* _mesa_function_pool[41167]: GetMapParameterivNV (dynamic) */
+ /* _mesa_function_pool[41185]: GetMapParameterivNV (dynamic) */
"iip\0"
"glGetMapParameterivNV\0"
"\0"
- /* _mesa_function_pool[41194]: VertexAttrib4fvNV (will be remapped) */
+ /* _mesa_function_pool[41212]: VertexAttrib4fvNV (will be remapped) */
"ip\0"
"glVertexAttrib4fvNV\0"
"\0"
- /* _mesa_function_pool[41218]: Rectiv (offset 91) */
+ /* _mesa_function_pool[41236]: Rectiv (offset 91) */
"pp\0"
"glRectiv\0"
"\0"
- /* _mesa_function_pool[41231]: MultiTexCoord1iv (offset 381) */
+ /* _mesa_function_pool[41249]: MultiTexCoord1iv (offset 381) */
"ip\0"
"glMultiTexCoord1iv\0"
"glMultiTexCoord1ivARB\0"
"\0"
- /* _mesa_function_pool[41276]: PassTexCoordATI (will be remapped) */
+ /* _mesa_function_pool[41294]: PassTexCoordATI (will be remapped) */
"iii\0"
"glPassTexCoordATI\0"
"\0"
- /* _mesa_function_pool[41299]: Tangent3dEXT (dynamic) */
+ /* _mesa_function_pool[41317]: Tangent3dEXT (dynamic) */
"ddd\0"
"glTangent3dEXT\0"
"\0"
- /* _mesa_function_pool[41319]: Vertex2fv (offset 129) */
+ /* _mesa_function_pool[41337]: Vertex2fv (offset 129) */
"p\0"
"glVertex2fv\0"
"\0"
- /* _mesa_function_pool[41334]: BindRenderbufferEXT (will be remapped) */
+ /* _mesa_function_pool[41352]: BindRenderbufferEXT (will be remapped) */
"ii\0"
"glBindRenderbufferEXT\0"
"\0"
- /* _mesa_function_pool[41360]: Vertex3sv (offset 141) */
+ /* _mesa_function_pool[41378]: Vertex3sv (offset 141) */
"p\0"
"glVertex3sv\0"
"\0"
- /* _mesa_function_pool[41375]: EvalMesh1 (offset 236) */
+ /* _mesa_function_pool[41393]: EvalMesh1 (offset 236) */
"iii\0"
"glEvalMesh1\0"
"\0"
- /* _mesa_function_pool[41392]: DiscardFramebufferEXT (will be remapped) */
+ /* _mesa_function_pool[41410]: DiscardFramebufferEXT (will be remapped) */
"iip\0"
"glDiscardFramebufferEXT\0"
"\0"
- /* _mesa_function_pool[41421]: Uniform2f (will be remapped) */
+ /* _mesa_function_pool[41439]: Uniform2f (will be remapped) */
"iff\0"
"glUniform2f\0"
"glUniform2fARB\0"
"\0"
- /* _mesa_function_pool[41453]: ColorPointerEXT (will be remapped) */
+ /* _mesa_function_pool[41471]: ColorPointerEXT (will be remapped) */
"iiiip\0"
"glColorPointerEXT\0"
"\0"
- /* _mesa_function_pool[41478]: LineWidth (offset 168) */
+ /* _mesa_function_pool[41496]: LineWidth (offset 168) */
"f\0"
"glLineWidth\0"
"\0"
- /* _mesa_function_pool[41493]: Uniform2i (will be remapped) */
+ /* _mesa_function_pool[41511]: Uniform2i (will be remapped) */
"iii\0"
"glUniform2i\0"
"glUniform2iARB\0"
"\0"
- /* _mesa_function_pool[41525]: MultiDrawElementsBaseVertex (will be remapped) */
+ /* _mesa_function_pool[41543]: MultiDrawElementsBaseVertex (will be remapped) */
"ipipip\0"
"glMultiDrawElementsBaseVertex\0"
"\0"
- /* _mesa_function_pool[41563]: Lightxv (will be remapped) */
+ /* _mesa_function_pool[41581]: Lightxv (will be remapped) */
"iip\0"
"glLightxvOES\0"
"glLightxv\0"
"\0"
- /* _mesa_function_pool[41591]: DepthRangeIndexed (will be remapped) */
+ /* _mesa_function_pool[41609]: DepthRangeIndexed (will be remapped) */
"idd\0"
"glDepthRangeIndexed\0"
"\0"
- /* _mesa_function_pool[41616]: GetConvolutionParameterfv (offset 357) */
+ /* _mesa_function_pool[41634]: GetConvolutionParameterfv (offset 357) */
"iip\0"
"glGetConvolutionParameterfv\0"
"glGetConvolutionParameterfvEXT\0"
"\0"
- /* _mesa_function_pool[41680]: GetTexBumpParameterfvATI (will be remapped) */
+ /* _mesa_function_pool[41698]: GetTexBumpParameterfvATI (will be remapped) */
"ip\0"
"glGetTexBumpParameterfvATI\0"
"\0"
- /* _mesa_function_pool[41711]: ProgramNamedParameter4dNV (will be remapped) */
+ /* _mesa_function_pool[41729]: ProgramNamedParameter4dNV (will be remapped) */
"iipdddd\0"
"glProgramNamedParameter4dNV\0"
"\0"
- /* _mesa_function_pool[41748]: GetMaterialfv (offset 269) */
+ /* _mesa_function_pool[41766]: GetMaterialfv (offset 269) */
"iip\0"
"glGetMaterialfv\0"
"\0"
- /* _mesa_function_pool[41769]: TexImage3DMultisample (will be remapped) */
+ /* _mesa_function_pool[41787]: TexImage3DMultisample (will be remapped) */
"iiiiiii\0"
"glTexImage3DMultisample\0"
"\0"
- /* _mesa_function_pool[41802]: VertexAttrib1fvNV (will be remapped) */
+ /* _mesa_function_pool[41820]: VertexAttrib1fvNV (will be remapped) */
"ip\0"
"glVertexAttrib1fvNV\0"
"\0"
- /* _mesa_function_pool[41826]: GetUniformBlockIndex (will be remapped) */
+ /* _mesa_function_pool[41844]: GetUniformBlockIndex (will be remapped) */
"ip\0"
"glGetUniformBlockIndex\0"
"\0"
- /* _mesa_function_pool[41853]: DetachShader (will be remapped) */
+ /* _mesa_function_pool[41871]: DetachShader (will be remapped) */
"ii\0"
"glDetachShader\0"
"\0"
- /* _mesa_function_pool[41872]: CopyTexSubImage2D (offset 326) */
+ /* _mesa_function_pool[41890]: CopyTexSubImage2D (offset 326) */
"iiiiiiii\0"
"glCopyTexSubImage2D\0"
"glCopyTexSubImage2DEXT\0"
"\0"
- /* _mesa_function_pool[41925]: SampleCoverage (will be remapped) */
+ /* _mesa_function_pool[41943]: SampleCoverage (will be remapped) */
"fi\0"
"glSampleCoverage\0"
"glSampleCoverageARB\0"
"\0"
- /* _mesa_function_pool[41966]: GetObjectParameterivARB (will be remapped) */
+ /* _mesa_function_pool[41984]: GetObjectParameterivARB (will be remapped) */
"iip\0"
"glGetObjectParameterivARB\0"
"\0"
- /* _mesa_function_pool[41997]: Color3iv (offset 16) */
+ /* _mesa_function_pool[42015]: Color3iv (offset 16) */
"p\0"
"glColor3iv\0"
"\0"
- /* _mesa_function_pool[42011]: DrawElements (offset 311) */
+ /* _mesa_function_pool[42029]: DrawElements (offset 311) */
"iiip\0"
"glDrawElements\0"
"\0"
- /* _mesa_function_pool[42032]: ScissorArrayv (will be remapped) */
+ /* _mesa_function_pool[42050]: ScissorArrayv (will be remapped) */
"iip\0"
"glScissorArrayv\0"
"\0"
- /* _mesa_function_pool[42053]: GetInternalformativ (will be remapped) */
+ /* _mesa_function_pool[42071]: GetInternalformativ (will be remapped) */
"iiiip\0"
"glGetInternalformativ\0"
"\0"
- /* _mesa_function_pool[42082]: EvalPoint2 (offset 239) */
+ /* _mesa_function_pool[42100]: EvalPoint2 (offset 239) */
"ii\0"
"glEvalPoint2\0"
"\0"
- /* _mesa_function_pool[42099]: EvalPoint1 (offset 237) */
+ /* _mesa_function_pool[42117]: EvalPoint1 (offset 237) */
"i\0"
"glEvalPoint1\0"
"\0"
- /* _mesa_function_pool[42115]: PopMatrix (offset 297) */
+ /* _mesa_function_pool[42133]: PopMatrix (offset 297) */
"\0"
"glPopMatrix\0"
"\0"
- /* _mesa_function_pool[42129]: FinishFenceNV (dynamic) */
+ /* _mesa_function_pool[42147]: FinishFenceNV (dynamic) */
"i\0"
"glFinishFenceNV\0"
"\0"
- /* _mesa_function_pool[42148]: Tangent3bvEXT (dynamic) */
+ /* _mesa_function_pool[42166]: Tangent3bvEXT (dynamic) */
"p\0"
"glTangent3bvEXT\0"
"\0"
- /* _mesa_function_pool[42167]: GetTexGeniv (offset 280) */
+ /* _mesa_function_pool[42185]: GetTexGeniv (offset 280) */
"iip\0"
"glGetTexGeniv\0"
"glGetTexGenivOES\0"
"\0"
- /* _mesa_function_pool[42203]: GetFirstPerfQueryIdINTEL (will be remapped) */
+ /* _mesa_function_pool[42221]: GetFirstPerfQueryIdINTEL (will be remapped) */
"p\0"
"glGetFirstPerfQueryIdINTEL\0"
"\0"
- /* _mesa_function_pool[42233]: ActiveProgramEXT (will be remapped) */
+ /* _mesa_function_pool[42251]: ActiveProgramEXT (will be remapped) */
"i\0"
"glActiveProgramEXT\0"
"\0"
- /* _mesa_function_pool[42255]: PixelTransformParameterivEXT (dynamic) */
+ /* _mesa_function_pool[42273]: PixelTransformParameterivEXT (dynamic) */
"iip\0"
"glPixelTransformParameterivEXT\0"
"\0"
- /* _mesa_function_pool[42291]: TexCoord4fVertex4fvSUN (dynamic) */
+ /* _mesa_function_pool[42309]: TexCoord4fVertex4fvSUN (dynamic) */
"pp\0"
"glTexCoord4fVertex4fvSUN\0"
"\0"
- /* _mesa_function_pool[42320]: UnmapBuffer (will be remapped) */
+ /* _mesa_function_pool[42338]: UnmapBuffer (will be remapped) */
"i\0"
"glUnmapBuffer\0"
"glUnmapBufferARB\0"
"glUnmapBufferOES\0"
"\0"
- /* _mesa_function_pool[42371]: EvalCoord1d (offset 228) */
+ /* _mesa_function_pool[42389]: EvalCoord1d (offset 228) */
"d\0"
"glEvalCoord1d\0"
"\0"
- /* _mesa_function_pool[42388]: EvalCoord1f (offset 230) */
+ /* _mesa_function_pool[42406]: EvalCoord1f (offset 230) */
"f\0"
"glEvalCoord1f\0"
"\0"
- /* _mesa_function_pool[42405]: IndexMaterialEXT (dynamic) */
+ /* _mesa_function_pool[42423]: IndexMaterialEXT (dynamic) */
"ii\0"
"glIndexMaterialEXT\0"
"\0"
- /* _mesa_function_pool[42428]: Materialf (offset 169) */
+ /* _mesa_function_pool[42446]: Materialf (offset 169) */
"iif\0"
"glMaterialf\0"
"\0"
- /* _mesa_function_pool[42445]: VertexAttribs2dvNV (will be remapped) */
+ /* _mesa_function_pool[42463]: VertexAttribs2dvNV (will be remapped) */
"iip\0"
"glVertexAttribs2dvNV\0"
"\0"
- /* _mesa_function_pool[42471]: ProgramUniform1uiv (will be remapped) */
+ /* _mesa_function_pool[42489]: ProgramUniform1uiv (will be remapped) */
"iiip\0"
"glProgramUniform1uiv\0"
"glProgramUniform1uivEXT\0"
"\0"
- /* _mesa_function_pool[42522]: EvalCoord1dv (offset 229) */
+ /* _mesa_function_pool[42540]: EvalCoord1dv (offset 229) */
"p\0"
"glEvalCoord1dv\0"
"\0"
- /* _mesa_function_pool[42540]: Materialx (will be remapped) */
+ /* _mesa_function_pool[42558]: Materialx (will be remapped) */
"iii\0"
"glMaterialxOES\0"
"glMaterialx\0"
"\0"
- /* _mesa_function_pool[42572]: GetLightiv (offset 265) */
+ /* _mesa_function_pool[42590]: GetLightiv (offset 265) */
"iip\0"
"glGetLightiv\0"
"\0"
- /* _mesa_function_pool[42590]: BindBuffer (will be remapped) */
+ /* _mesa_function_pool[42608]: BindBuffer (will be remapped) */
"ii\0"
"glBindBuffer\0"
"glBindBufferARB\0"
"\0"
- /* _mesa_function_pool[42623]: ProgramUniform1i (will be remapped) */
+ /* _mesa_function_pool[42641]: ProgramUniform1i (will be remapped) */
"iii\0"
"glProgramUniform1i\0"
"glProgramUniform1iEXT\0"
"\0"
- /* _mesa_function_pool[42669]: ProgramUniform1f (will be remapped) */
+ /* _mesa_function_pool[42687]: ProgramUniform1f (will be remapped) */
"iif\0"
"glProgramUniform1f\0"
"glProgramUniform1fEXT\0"
"\0"
- /* _mesa_function_pool[42715]: WindowPos3iv (will be remapped) */
+ /* _mesa_function_pool[42733]: WindowPos3iv (will be remapped) */
"p\0"
"glWindowPos3iv\0"
"glWindowPos3ivARB\0"
"glWindowPos3ivMESA\0"
"\0"
- /* _mesa_function_pool[42770]: CopyConvolutionFilter2D (offset 355) */
+ /* _mesa_function_pool[42788]: CopyConvolutionFilter2D (offset 355) */
"iiiiii\0"
"glCopyConvolutionFilter2D\0"
"glCopyConvolutionFilter2DEXT\0"
"\0"
- /* _mesa_function_pool[42833]: CopyBufferSubData (will be remapped) */
+ /* _mesa_function_pool[42851]: CopyBufferSubData (will be remapped) */
"iiiii\0"
"glCopyBufferSubData\0"
"\0"
- /* _mesa_function_pool[42860]: WeightfvARB (dynamic) */
+ /* _mesa_function_pool[42878]: WeightfvARB (dynamic) */
"ip\0"
"glWeightfvARB\0"
"\0"
- /* _mesa_function_pool[42878]: UniformMatrix3x4fv (will be remapped) */
+ /* _mesa_function_pool[42896]: UniformMatrix3x4fv (will be remapped) */
"iiip\0"
"glUniformMatrix3x4fv\0"
"\0"
- /* _mesa_function_pool[42905]: Recti (offset 90) */
+ /* _mesa_function_pool[42923]: Recti (offset 90) */
"iiii\0"
"glRecti\0"
"\0"
- /* _mesa_function_pool[42919]: VertexAttribI3ivEXT (will be remapped) */
+ /* _mesa_function_pool[42937]: VertexAttribI3ivEXT (will be remapped) */
"ip\0"
"glVertexAttribI3ivEXT\0"
"glVertexAttribI3iv\0"
"\0"
- /* _mesa_function_pool[42964]: DeleteSamplers (will be remapped) */
+ /* _mesa_function_pool[42982]: DeleteSamplers (will be remapped) */
"ip\0"
"glDeleteSamplers\0"
"\0"
- /* _mesa_function_pool[42985]: SamplerParameteri (will be remapped) */
+ /* _mesa_function_pool[43003]: SamplerParameteri (will be remapped) */
"iii\0"
"glSamplerParameteri\0"
"\0"
- /* _mesa_function_pool[43010]: Rectf (offset 88) */
+ /* _mesa_function_pool[43028]: Rectf (offset 88) */
"ffff\0"
"glRectf\0"
"\0"
- /* _mesa_function_pool[43024]: Rectd (offset 86) */
+ /* _mesa_function_pool[43042]: Rectd (offset 86) */
"dddd\0"
"glRectd\0"
"\0"
- /* _mesa_function_pool[43038]: SamplerParameterf (will be remapped) */
+ /* _mesa_function_pool[43056]: SamplerParameterf (will be remapped) */
"iif\0"
"glSamplerParameterf\0"
"\0"
- /* _mesa_function_pool[43063]: Rects (offset 92) */
+ /* _mesa_function_pool[43081]: Rects (offset 92) */
"iiii\0"
"glRects\0"
"\0"
- /* _mesa_function_pool[43077]: CombinerParameterfNV (dynamic) */
+ /* _mesa_function_pool[43095]: CombinerParameterfNV (dynamic) */
"if\0"
"glCombinerParameterfNV\0"
"\0"
- /* _mesa_function_pool[43104]: GetVertexAttribIiv (will be remapped) */
+ /* _mesa_function_pool[43122]: GetVertexAttribIiv (will be remapped) */
"iip\0"
"glGetVertexAttribIivEXT\0"
"glGetVertexAttribIiv\0"
"\0"
- /* _mesa_function_pool[43154]: ClientWaitSync (will be remapped) */
+ /* _mesa_function_pool[43172]: ClientWaitSync (will be remapped) */
"iii\0"
"glClientWaitSync\0"
"\0"
- /* _mesa_function_pool[43176]: TexCoord4s (offset 124) */
+ /* _mesa_function_pool[43194]: TexCoord4s (offset 124) */
"iiii\0"
"glTexCoord4s\0"
"\0"
- /* _mesa_function_pool[43195]: TexEnvxv (will be remapped) */
+ /* _mesa_function_pool[43213]: TexEnvxv (will be remapped) */
"iip\0"
"glTexEnvxvOES\0"
"glTexEnvxv\0"
"\0"
- /* _mesa_function_pool[43225]: TexCoord4i (offset 122) */
+ /* _mesa_function_pool[43243]: TexCoord4i (offset 122) */
"iiii\0"
"glTexCoord4i\0"
"\0"
- /* _mesa_function_pool[43244]: ObjectPurgeableAPPLE (will be remapped) */
+ /* _mesa_function_pool[43262]: ObjectPurgeableAPPLE (will be remapped) */
"iii\0"
"glObjectPurgeableAPPLE\0"
"\0"
- /* _mesa_function_pool[43272]: TexCoord4d (offset 118) */
+ /* _mesa_function_pool[43290]: TexCoord4d (offset 118) */
"dddd\0"
"glTexCoord4d\0"
"\0"
- /* _mesa_function_pool[43291]: TexCoord4f (offset 120) */
+ /* _mesa_function_pool[43309]: TexCoord4f (offset 120) */
"ffff\0"
"glTexCoord4f\0"
"\0"
- /* _mesa_function_pool[43310]: GetBooleanv (offset 258) */
+ /* _mesa_function_pool[43328]: GetBooleanv (offset 258) */
"ip\0"
"glGetBooleanv\0"
"\0"
- /* _mesa_function_pool[43328]: IsAsyncMarkerSGIX (dynamic) */
+ /* _mesa_function_pool[43346]: IsAsyncMarkerSGIX (dynamic) */
"i\0"
"glIsAsyncMarkerSGIX\0"
"\0"
- /* _mesa_function_pool[43351]: LockArraysEXT (will be remapped) */
+ /* _mesa_function_pool[43369]: LockArraysEXT (will be remapped) */
"ii\0"
"glLockArraysEXT\0"
"\0"
- /* _mesa_function_pool[43371]: GetActiveUniformBlockiv (will be remapped) */
+ /* _mesa_function_pool[43389]: GetActiveUniformBlockiv (will be remapped) */
"iiip\0"
"glGetActiveUniformBlockiv\0"
"\0"
- /* _mesa_function_pool[43403]: GetPerfMonitorCountersAMD (will be remapped) */
+ /* _mesa_function_pool[43421]: GetPerfMonitorCountersAMD (will be remapped) */
"ippip\0"
"glGetPerfMonitorCountersAMD\0"
"\0"
- /* _mesa_function_pool[43438]: ObjectPtrLabel (will be remapped) */
+ /* _mesa_function_pool[43456]: ObjectPtrLabel (will be remapped) */
"pip\0"
"glObjectPtrLabel\0"
"\0"
- /* _mesa_function_pool[43460]: Rectfv (offset 89) */
+ /* _mesa_function_pool[43478]: Rectfv (offset 89) */
"pp\0"
"glRectfv\0"
"\0"
- /* _mesa_function_pool[43473]: BindImageTexture (will be remapped) */
+ /* _mesa_function_pool[43491]: BindImageTexture (will be remapped) */
"iiiiiii\0"
"glBindImageTexture\0"
"\0"
- /* _mesa_function_pool[43501]: ClearDepthf (will be remapped) */
+ /* _mesa_function_pool[43519]: ClearDepthf (will be remapped) */
"f\0"
"glClearDepthf\0"
"glClearDepthfOES\0"
"\0"
- /* _mesa_function_pool[43535]: VertexP4uiv (will be remapped) */
+ /* _mesa_function_pool[43553]: VertexP4uiv (will be remapped) */
"ip\0"
"glVertexP4uiv\0"
"\0"
- /* _mesa_function_pool[43553]: MinSampleShading (will be remapped) */
+ /* _mesa_function_pool[43571]: MinSampleShading (will be remapped) */
"f\0"
"glMinSampleShadingARB\0"
"glMinSampleShading\0"
"\0"
- /* _mesa_function_pool[43597]: GetRenderbufferParameteriv (will be remapped) */
+ /* _mesa_function_pool[43615]: GetRenderbufferParameteriv (will be remapped) */
"iip\0"
"glGetRenderbufferParameteriv\0"
"glGetRenderbufferParameterivEXT\0"
"glGetRenderbufferParameterivOES\0"
"\0"
- /* _mesa_function_pool[43695]: EdgeFlagPointerListIBM (dynamic) */
+ /* _mesa_function_pool[43713]: EdgeFlagPointerListIBM (dynamic) */
"ipi\0"
"glEdgeFlagPointerListIBM\0"
"\0"
- /* _mesa_function_pool[43725]: WindowPos2sv (will be remapped) */
+ /* _mesa_function_pool[43743]: WindowPos2sv (will be remapped) */
"p\0"
"glWindowPos2sv\0"
"glWindowPos2svARB\0"
"glWindowPos2svMESA\0"
"\0"
- /* _mesa_function_pool[43780]: VertexArrayRangeNV (dynamic) */
+ /* _mesa_function_pool[43798]: VertexArrayRangeNV (dynamic) */
"ip\0"
"glVertexArrayRangeNV\0"
"\0"
- /* _mesa_function_pool[43805]: GetPerfMonitorCounterStringAMD (will be remapped) */
+ /* _mesa_function_pool[43823]: GetPerfMonitorCounterStringAMD (will be remapped) */
"iiipp\0"
"glGetPerfMonitorCounterStringAMD\0"
"\0"
- /* _mesa_function_pool[43845]: EndFragmentShaderATI (will be remapped) */
+ /* _mesa_function_pool[43863]: EndFragmentShaderATI (will be remapped) */
"\0"
"glEndFragmentShaderATI\0"
"\0"
- /* _mesa_function_pool[43870]: Uniform4iv (will be remapped) */
+ /* _mesa_function_pool[43888]: Uniform4iv (will be remapped) */
"iip\0"
"glUniform4iv\0"
"glUniform4ivARB\0"
@@ -6112,18 +6116,18 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 17095, LoadTransposeMatrixf_remap_index },
{ 31933, MultTransposeMatrixd_remap_index },
{ 12625, MultTransposeMatrixf_remap_index },
- { 41925, SampleCoverage_remap_index },
+ { 41943, SampleCoverage_remap_index },
{ 3187, BlendFuncSeparate_remap_index },
{ 20729, FogCoordPointer_remap_index },
- { 38055, FogCoordd_remap_index },
- { 37831, FogCoorddv_remap_index },
+ { 38073, FogCoordd_remap_index },
+ { 37849, FogCoorddv_remap_index },
{ 30975, MultiDrawArrays_remap_index },
{ 29347, PointParameterf_remap_index },
{ 4549, PointParameterfv_remap_index },
{ 29305, PointParameteri_remap_index },
{ 8174, PointParameteriv_remap_index },
{ 4971, SecondaryColor3b_remap_index },
- { 37646, SecondaryColor3bv_remap_index },
+ { 37664, SecondaryColor3bv_remap_index },
{ 32134, SecondaryColor3d_remap_index },
{ 11451, SecondaryColor3dv_remap_index },
{ 5067, SecondaryColor3i_remap_index },
@@ -6144,26 +6148,26 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 11129, WindowPos2i_remap_index },
{ 6083, WindowPos2iv_remap_index },
{ 11182, WindowPos2s_remap_index },
- { 43725, WindowPos2sv_remap_index },
+ { 43743, WindowPos2sv_remap_index },
{ 14961, WindowPos3d_remap_index },
{ 14445, WindowPos3dv_remap_index },
{ 15048, WindowPos3f_remap_index },
{ 8033, WindowPos3fv_remap_index },
{ 15157, WindowPos3i_remap_index },
- { 42715, WindowPos3iv_remap_index },
+ { 42733, WindowPos3iv_remap_index },
{ 15273, WindowPos3s_remap_index },
{ 23560, WindowPos3sv_remap_index },
{ 5965, BeginQuery_remap_index },
- { 42590, BindBuffer_remap_index },
- { 36467, BufferData_remap_index },
+ { 42608, BindBuffer_remap_index },
+ { 36485, BufferData_remap_index },
{ 9671, BufferSubData_remap_index },
{ 29618, DeleteBuffers_remap_index },
{ 21176, DeleteQueries_remap_index },
{ 18761, EndQuery_remap_index },
- { 40025, GenBuffers_remap_index },
+ { 40043, GenBuffers_remap_index },
{ 1815, GenQueries_remap_index },
{ 27124, GetBufferParameteriv_remap_index },
- { 39890, GetBufferPointerv_remap_index },
+ { 39908, GetBufferPointerv_remap_index },
{ 29657, GetBufferSubData_remap_index },
{ 7712, GetQueryObjectiv_remap_index },
{ 7381, GetQueryObjectuiv_remap_index },
@@ -6171,21 +6175,21 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 17628, IsBuffer_remap_index },
{ 27371, IsQuery_remap_index },
{ 11755, MapBuffer_remap_index },
- { 42320, UnmapBuffer_remap_index },
+ { 42338, UnmapBuffer_remap_index },
{ 315, AttachShader_remap_index },
{ 34920, BindAttribLocation_remap_index },
- { 40092, BlendEquationSeparate_remap_index },
+ { 40110, BlendEquationSeparate_remap_index },
{ 30674, CompileShader_remap_index },
{ 13934, CreateProgram_remap_index },
{ 29533, CreateShader_remap_index },
{ 19587, DeleteProgram_remap_index },
{ 30656, DeleteShader_remap_index },
- { 41853, DetachShader_remap_index },
+ { 41871, DetachShader_remap_index },
{ 32886, DisableVertexAttribArray_remap_index },
{ 21964, DrawBuffers_remap_index },
- { 40317, EnableVertexAttribArray_remap_index },
+ { 40335, EnableVertexAttribArray_remap_index },
{ 35573, GetActiveAttrib_remap_index },
- { 40766, GetActiveUniform_remap_index },
+ { 40784, GetActiveUniform_remap_index },
{ 16734, GetAttachedShaders_remap_index },
{ 26090, GetAttribLocation_remap_index },
{ 10763, GetProgramInfoLog_remap_index },
@@ -6197,39 +6201,39 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 12778, GetUniformfv_remap_index },
{ 2074, GetUniformiv_remap_index },
{ 33604, GetVertexAttribPointerv_remap_index },
- { 39842, GetVertexAttribdv_remap_index },
+ { 39860, GetVertexAttribdv_remap_index },
{ 34213, GetVertexAttribfv_remap_index },
- { 36641, GetVertexAttribiv_remap_index },
+ { 36659, GetVertexAttribiv_remap_index },
{ 4125, IsProgram_remap_index },
- { 37188, IsShader_remap_index },
+ { 37206, IsShader_remap_index },
{ 27860, LinkProgram_remap_index },
- { 36284, ShaderSource_remap_index },
- { 36256, StencilFuncSeparate_remap_index },
+ { 36302, ShaderSource_remap_index },
+ { 36274, StencilFuncSeparate_remap_index },
{ 34535, StencilMaskSeparate_remap_index },
{ 35753, StencilOpSeparate_remap_index },
- { 39165, Uniform1f_remap_index },
+ { 39183, Uniform1f_remap_index },
{ 7888, Uniform1fv_remap_index },
- { 39225, Uniform1i_remap_index },
+ { 39243, Uniform1i_remap_index },
{ 17809, Uniform1iv_remap_index },
- { 41421, Uniform2f_remap_index },
+ { 41439, Uniform2f_remap_index },
{ 21900, Uniform2fv_remap_index },
- { 41493, Uniform2i_remap_index },
+ { 41511, Uniform2i_remap_index },
{ 19829, Uniform2iv_remap_index },
{ 889, Uniform3f_remap_index },
- { 36753, Uniform3fv_remap_index },
+ { 36771, Uniform3fv_remap_index },
{ 802, Uniform3i_remap_index },
- { 38085, Uniform3iv_remap_index },
+ { 38103, Uniform3iv_remap_index },
{ 4419, Uniform4f_remap_index },
{ 8585, Uniform4fv_remap_index },
{ 4356, Uniform4i_remap_index },
- { 43870, Uniform4iv_remap_index },
+ { 43888, Uniform4iv_remap_index },
{ 9777, UniformMatrix2fv_remap_index },
{ 22546, UniformMatrix3fv_remap_index },
{ 10246, UniformMatrix4fv_remap_index },
- { 39327, UseProgram_remap_index },
+ { 39345, UseProgram_remap_index },
{ 23991, ValidateProgram_remap_index },
{ 17897, VertexAttrib1d_remap_index },
- { 37111, VertexAttrib1dv_remap_index },
+ { 37129, VertexAttrib1dv_remap_index },
{ 18020, VertexAttrib1s_remap_index },
{ 34061, VertexAttrib1sv_remap_index },
{ 7846, VertexAttrib2d_remap_index },
@@ -6239,7 +6243,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 11678, VertexAttrib3d_remap_index },
{ 21824, VertexAttrib3dv_remap_index },
{ 11553, VertexAttrib3s_remap_index },
- { 38990, VertexAttrib3sv_remap_index },
+ { 39008, VertexAttrib3sv_remap_index },
{ 11801, VertexAttrib4Nbv_remap_index },
{ 27756, VertexAttrib4Niv_remap_index },
{ 20165, VertexAttrib4Nsv_remap_index },
@@ -6250,7 +6254,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 9104, VertexAttrib4bv_remap_index },
{ 28019, VertexAttrib4d_remap_index },
{ 28396, VertexAttrib4dv_remap_index },
- { 38197, VertexAttrib4iv_remap_index },
+ { 38215, VertexAttrib4iv_remap_index },
{ 28087, VertexAttrib4s_remap_index },
{ 18861, VertexAttrib4sv_remap_index },
{ 10006, VertexAttrib4ubv_remap_index },
@@ -6260,8 +6264,8 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 29145, UniformMatrix2x3fv_remap_index },
{ 922, UniformMatrix2x4fv_remap_index },
{ 10293, UniformMatrix3x2fv_remap_index },
- { 42878, UniformMatrix3x4fv_remap_index },
- { 38542, UniformMatrix4x2fv_remap_index },
+ { 42896, UniformMatrix3x4fv_remap_index },
+ { 38560, UniformMatrix4x2fv_remap_index },
{ 11596, UniformMatrix4x3fv_remap_index },
{ 16401, BeginConditionalRender_remap_index },
{ 24075, BeginTransformFeedback_remap_index },
@@ -6272,26 +6276,26 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 16761, ClearBufferfi_remap_index },
{ 16610, ClearBufferfv_remap_index },
{ 20588, ClearBufferiv_remap_index },
- { 37909, ClearBufferuiv_remap_index },
+ { 37927, ClearBufferuiv_remap_index },
{ 13135, ColorMaski_remap_index },
{ 5794, Disablei_remap_index },
{ 15015, Enablei_remap_index },
{ 22860, EndConditionalRender_remap_index },
{ 19406, EndTransformFeedback_remap_index },
{ 11989, GetBooleani_v_remap_index },
- { 39425, GetFragDataLocation_remap_index },
+ { 39443, GetFragDataLocation_remap_index },
{ 20609, GetIntegeri_v_remap_index },
{ 28379, GetStringi_remap_index },
{ 30142, GetTexParameterIiv_remap_index },
{ 13331, GetTexParameterIuiv_remap_index },
{ 30356, GetTransformFeedbackVarying_remap_index },
- { 36054, GetUniformuiv_remap_index },
- { 43104, GetVertexAttribIiv_remap_index },
+ { 36072, GetUniformuiv_remap_index },
+ { 43122, GetVertexAttribIiv_remap_index },
{ 20420, GetVertexAttribIuiv_remap_index },
{ 33519, IsEnabledi_remap_index },
{ 19645, TexParameterIiv_remap_index },
{ 16216, TexParameterIuiv_remap_index },
- { 38925, TransformFeedbackVaryings_remap_index },
+ { 38943, TransformFeedbackVaryings_remap_index },
{ 5462, Uniform1ui_remap_index },
{ 25530, Uniform1uiv_remap_index },
{ 24904, Uniform2ui_remap_index },
@@ -6306,27 +6310,27 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 10157, VertexAttribI4sv_remap_index },
{ 8385, VertexAttribI4ubv_remap_index },
{ 6888, VertexAttribI4usv_remap_index },
- { 40261, VertexAttribIPointer_remap_index },
+ { 40279, VertexAttribIPointer_remap_index },
{ 8332, PrimitiveRestartIndex_remap_index },
{ 33733, TexBuffer_remap_index },
{ 111, FramebufferTexture_remap_index },
{ 23825, GetBufferParameteri64v_remap_index },
- { 39593, GetInteger64i_v_remap_index },
- { 40575, VertexAttribDivisor_remap_index },
- { 43553, MinSampleShading_remap_index },
+ { 39611, GetInteger64i_v_remap_index },
+ { 40593, VertexAttribDivisor_remap_index },
+ { 43571, MinSampleShading_remap_index },
{ 7117, BindProgramARB_remap_index },
{ 30841, DeleteProgramsARB_remap_index },
{ 15102, GenProgramsARB_remap_index },
{ 14110, GetProgramEnvParameterdvARB_remap_index },
{ 29583, GetProgramEnvParameterfvARB_remap_index },
{ 31020, GetProgramLocalParameterdvARB_remap_index },
- { 37492, GetProgramLocalParameterfvARB_remap_index },
+ { 37510, GetProgramLocalParameterfvARB_remap_index },
{ 22475, GetProgramStringARB_remap_index },
{ 8218, GetProgramivARB_remap_index },
{ 31342, IsProgramARB_remap_index },
{ 17215, ProgramEnvParameter4dARB_remap_index },
{ 2660, ProgramEnvParameter4dvARB_remap_index },
- { 38693, ProgramEnvParameter4fARB_remap_index },
+ { 38711, ProgramEnvParameter4fARB_remap_index },
{ 24580, ProgramEnvParameter4fvARB_remap_index },
{ 22910, ProgramLocalParameter4dARB_remap_index },
{ 3995, ProgramLocalParameter4dvARB_remap_index },
@@ -6341,16 +6345,16 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 26382, VertexAttrib3fvARB_remap_index },
{ 25264, VertexAttrib4fARB_remap_index },
{ 14402, VertexAttrib4fvARB_remap_index },
- { 35841, AttachObjectARB_remap_index },
+ { 35859, AttachObjectARB_remap_index },
{ 22519, CreateProgramObjectARB_remap_index },
{ 16659, CreateShaderObjectARB_remap_index },
{ 15487, DeleteObjectARB_remap_index },
- { 38337, DetachObjectARB_remap_index },
- { 36180, GetAttachedObjectsARB_remap_index },
+ { 38355, DetachObjectARB_remap_index },
+ { 36198, GetAttachedObjectsARB_remap_index },
{ 24785, GetHandleARB_remap_index },
{ 20537, GetInfoLogARB_remap_index },
{ 21342, GetObjectParameterfvARB_remap_index },
- { 41966, GetObjectParameterivARB_remap_index },
+ { 41984, GetObjectParameterivARB_remap_index },
{ 5574, DrawArraysInstancedARB_remap_index },
{ 7296, DrawElementsInstancedARB_remap_index },
{ 13891, BindFramebuffer_remap_index },
@@ -6358,17 +6362,17 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 33919, BlitFramebuffer_remap_index },
{ 6287, CheckFramebufferStatus_remap_index },
{ 20021, DeleteFramebuffers_remap_index },
- { 37035, DeleteRenderbuffers_remap_index },
+ { 37053, DeleteRenderbuffers_remap_index },
{ 31252, FramebufferRenderbuffer_remap_index },
{ 33970, FramebufferTexture1D_remap_index },
{ 23200, FramebufferTexture2D_remap_index },
{ 27010, FramebufferTexture3D_remap_index },
- { 37306, FramebufferTextureLayer_remap_index },
- { 39961, GenFramebuffers_remap_index },
+ { 37324, FramebufferTextureLayer_remap_index },
+ { 39979, GenFramebuffers_remap_index },
{ 33398, GenRenderbuffers_remap_index },
{ 7540, GenerateMipmap_remap_index },
{ 5270, GetFramebufferAttachmentParameteriv_remap_index },
- { 43597, GetRenderbufferParameteriv_remap_index },
+ { 43615, GetRenderbufferParameteriv_remap_index },
{ 6451, IsFramebuffer_remap_index },
{ 25612, IsRenderbuffer_remap_index },
{ 629, RenderbufferStorage_remap_index },
@@ -6379,31 +6383,31 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 13270, BindVertexArray_remap_index },
{ 1133, DeleteVertexArrays_remap_index },
{ 17536, GenVertexArrays_remap_index },
- { 39033, IsVertexArray_remap_index },
+ { 39051, IsVertexArray_remap_index },
{ 13050, GetActiveUniformBlockName_remap_index },
- { 43371, GetActiveUniformBlockiv_remap_index },
+ { 43389, GetActiveUniformBlockiv_remap_index },
{ 3106, GetActiveUniformName_remap_index },
{ 14038, GetActiveUniformsiv_remap_index },
- { 41826, GetUniformBlockIndex_remap_index },
+ { 41844, GetUniformBlockIndex_remap_index },
{ 10417, GetUniformIndices_remap_index },
{ 34759, UniformBlockBinding_remap_index },
- { 42833, CopyBufferSubData_remap_index },
- { 43154, ClientWaitSync_remap_index },
+ { 42851, CopyBufferSubData_remap_index },
+ { 43172, ClientWaitSync_remap_index },
{ 11280, DeleteSync_remap_index },
{ 34786, FenceSync_remap_index },
- { 38317, GetInteger64v_remap_index },
- { 40431, GetSynciv_remap_index },
+ { 38335, GetInteger64v_remap_index },
+ { 40449, GetSynciv_remap_index },
{ 15508, IsSync_remap_index },
{ 33588, WaitSync_remap_index },
{ 13085, DrawElementsBaseVertex_remap_index },
{ 16849, DrawElementsInstancedBaseVertex_remap_index },
- { 37563, DrawRangeElementsBaseVertex_remap_index },
- { 41525, MultiDrawElementsBaseVertex_remap_index },
+ { 37581, DrawRangeElementsBaseVertex_remap_index },
+ { 41543, MultiDrawElementsBaseVertex_remap_index },
{ 24325, ProvokingVertex_remap_index },
{ 5519, GetMultisamplefv_remap_index },
{ 35255, SampleMaski_remap_index },
{ 1944, TexImage2DMultisample_remap_index },
- { 41769, TexImage3DMultisample_remap_index },
+ { 41787, TexImage3DMultisample_remap_index },
{ 22988, BlendEquationSeparateiARB_remap_index },
{ 27503, BlendEquationiARB_remap_index },
{ 3732, BlendFuncSeparateiARB_remap_index },
@@ -6411,7 +6415,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 1686, BindFragDataLocationIndexed_remap_index },
{ 28968, GetFragDataIndex_remap_index },
{ 2827, BindSampler_remap_index },
- { 42964, DeleteSamplers_remap_index },
+ { 42982, DeleteSamplers_remap_index },
{ 35802, GenSamplers_remap_index },
{ 2527, GetSamplerParameterIiv_remap_index },
{ 5763, GetSamplerParameterIuiv_remap_index },
@@ -6420,14 +6424,14 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 26235, IsSampler_remap_index },
{ 8645, SamplerParameterIiv_remap_index },
{ 12339, SamplerParameterIuiv_remap_index },
- { 43038, SamplerParameterf_remap_index },
- { 38637, SamplerParameterfv_remap_index },
- { 42985, SamplerParameteri_remap_index },
+ { 43056, SamplerParameterf_remap_index },
+ { 38655, SamplerParameterfv_remap_index },
+ { 43003, SamplerParameteri_remap_index },
{ 28243, SamplerParameteriv_remap_index },
{ 23369, GetQueryObjecti64v_remap_index },
{ 4047, GetQueryObjectui64v_remap_index },
{ 12925, QueryCounter_remap_index },
- { 37893, ColorP3ui_remap_index },
+ { 37911, ColorP3ui_remap_index },
{ 6606, ColorP3uiv_remap_index },
{ 17656, ColorP4ui_remap_index },
{ 25977, ColorP4uiv_remap_index },
@@ -6437,16 +6441,16 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 8958, MultiTexCoordP2uiv_remap_index },
{ 26065, MultiTexCoordP3ui_remap_index },
{ 391, MultiTexCoordP3uiv_remap_index },
- { 40236, MultiTexCoordP4ui_remap_index },
+ { 40254, MultiTexCoordP4ui_remap_index },
{ 34261, MultiTexCoordP4uiv_remap_index },
- { 36373, NormalP3ui_remap_index },
+ { 36391, NormalP3ui_remap_index },
{ 25672, NormalP3uiv_remap_index },
- { 41122, SecondaryColorP3ui_remap_index },
+ { 41140, SecondaryColorP3ui_remap_index },
{ 5711, SecondaryColorP3uiv_remap_index },
{ 162, TexCoordP1ui_remap_index },
{ 609, TexCoordP1uiv_remap_index },
{ 26341, TexCoordP2ui_remap_index },
- { 36689, TexCoordP2uiv_remap_index },
+ { 36707, TexCoordP2uiv_remap_index },
{ 14760, TexCoordP3ui_remap_index },
{ 17699, TexCoordP3uiv_remap_index },
{ 34042, TexCoordP4ui_remap_index },
@@ -6464,7 +6468,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 22502, VertexP3ui_remap_index },
{ 5998, VertexP3uiv_remap_index },
{ 3061, VertexP4ui_remap_index },
- { 43535, VertexP4uiv_remap_index },
+ { 43553, VertexP4uiv_remap_index },
{ 777, DrawArraysIndirect_remap_index },
{ 23532, DrawElementsIndirect_remap_index },
{ 10789, BindTransformFeedback_remap_index },
@@ -6475,22 +6479,22 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 30629, PauseTransformFeedback_remap_index },
{ 35083, ResumeTransformFeedback_remap_index },
{ 22418, BeginQueryIndexed_remap_index },
- { 40626, DrawTransformFeedbackStream_remap_index },
+ { 40644, DrawTransformFeedbackStream_remap_index },
{ 19010, EndQueryIndexed_remap_index },
{ 21690, GetQueryIndexediv_remap_index },
- { 43501, ClearDepthf_remap_index },
+ { 43519, ClearDepthf_remap_index },
{ 23891, DepthRangef_remap_index },
- { 37931, GetShaderPrecisionFormat_remap_index },
+ { 37949, GetShaderPrecisionFormat_remap_index },
{ 3161, ReleaseShaderCompiler_remap_index },
{ 25135, ShaderBinary_remap_index },
{ 19483, GetProgramBinary_remap_index },
{ 11846, ProgramBinary_remap_index },
{ 12081, ProgramParameteri_remap_index },
{ 26731, DepthRangeArrayv_remap_index },
- { 41591, DepthRangeIndexed_remap_index },
+ { 41609, DepthRangeIndexed_remap_index },
{ 33012, GetDoublei_v_remap_index },
{ 35273, GetFloati_v_remap_index },
- { 42032, ScissorArrayv_remap_index },
+ { 42050, ScissorArrayv_remap_index },
{ 24938, ScissorIndexed_remap_index },
{ 28295, ScissorIndexedv_remap_index },
{ 18451, ViewportArrayv_remap_index },
@@ -6504,7 +6508,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 18336, GetnMapdvARB_remap_index },
{ 12230, GetnMapfvARB_remap_index },
{ 34168, GetnMapivARB_remap_index },
- { 38805, GetnMinmaxARB_remap_index },
+ { 38823, GetnMinmaxARB_remap_index },
{ 3585, GetnPixelMapfvARB_remap_index },
{ 5737, GetnPixelMapuivARB_remap_index },
{ 11527, GetnPixelMapusvARB_remap_index },
@@ -6521,9 +6525,9 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 2605, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
{ 35026, DrawTransformFeedbackInstanced_remap_index },
{ 13383, DrawTransformFeedbackStreamInstanced_remap_index },
- { 42053, GetInternalformativ_remap_index },
+ { 42071, GetInternalformativ_remap_index },
{ 19606, GetActiveAtomicCounterBufferiv_remap_index },
- { 43473, BindImageTexture_remap_index },
+ { 43491, BindImageTexture_remap_index },
{ 21255, MemoryBarrier_remap_index },
{ 33898, TexStorage1D_remap_index },
{ 23142, TexStorage2D_remap_index },
@@ -6536,53 +6540,54 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 31100, DispatchCompute_remap_index },
{ 6371, DispatchComputeIndirect_remap_index },
{ 35717, CopyImageSubData_remap_index },
- { 40450, TextureView_remap_index },
+ { 40468, TextureView_remap_index },
{ 21584, BindVertexBuffer_remap_index },
{ 29460, VertexAttribBinding_remap_index },
{ 29925, VertexAttribFormat_remap_index },
{ 32624, VertexAttribIFormat_remap_index },
- { 36228, VertexAttribLFormat_remap_index },
+ { 36246, VertexAttribLFormat_remap_index },
{ 34695, VertexBindingDivisor_remap_index },
{ 3299, MultiDrawArraysIndirect_remap_index },
{ 18061, MultiDrawElementsIndirect_remap_index },
{ 17996, TexBufferRange_remap_index },
- { 38119, TexStorage2DMultisample_remap_index },
+ { 38137, TexStorage2DMultisample_remap_index },
{ 28188, TexStorage3DMultisample_remap_index },
{ 3331, BufferStorage_remap_index },
- { 38569, ClearTexImage_remap_index },
+ { 38587, ClearTexImage_remap_index },
{ 13018, ClearTexSubImage_remap_index },
{ 4194, BindBuffersBase_remap_index },
{ 14375, BindBuffersRange_remap_index },
{ 10636, BindImageTextures_remap_index },
{ 2773, BindSamplers_remap_index },
- { 41147, BindTextures_remap_index },
+ { 41165, BindTextures_remap_index },
{ 24970, BindVertexBuffers_remap_index },
+ { 35820, ClipControl_remap_index },
{ 6400, InvalidateBufferData_remap_index },
- { 38511, InvalidateBufferSubData_remap_index },
+ { 38529, InvalidateBufferSubData_remap_index },
{ 21215, InvalidateFramebuffer_remap_index },
{ 15776, InvalidateSubFramebuffer_remap_index },
{ 11887, InvalidateTexImage_remap_index },
{ 25335, InvalidateTexSubImage_remap_index },
{ 12677, PolygonOffsetEXT_remap_index },
- { 35820, DrawTexfOES_remap_index },
+ { 35838, DrawTexfOES_remap_index },
{ 24803, DrawTexfvOES_remap_index },
{ 986, DrawTexiOES_remap_index },
{ 29834, DrawTexivOES_remap_index },
{ 12034, DrawTexsOES_remap_index },
{ 21409, DrawTexsvOES_remap_index },
{ 25994, DrawTexxOES_remap_index },
- { 37759, DrawTexxvOES_remap_index },
+ { 37777, DrawTexxvOES_remap_index },
{ 24216, PointSizePointerOES_remap_index },
{ 949, QueryMatrixxOES_remap_index },
{ 19074, SampleMaskSGIS_remap_index },
{ 32738, SamplePatternSGIS_remap_index },
- { 41453, ColorPointerEXT_remap_index },
+ { 41471, ColorPointerEXT_remap_index },
{ 27397, EdgeFlagPointerEXT_remap_index },
{ 12754, IndexPointerEXT_remap_index },
{ 12944, NormalPointerEXT_remap_index },
{ 26796, TexCoordPointerEXT_remap_index },
{ 24033, VertexPointerEXT_remap_index },
- { 41392, DiscardFramebufferEXT_remap_index },
+ { 41410, DiscardFramebufferEXT_remap_index },
{ 10585, ActiveShaderProgram_remap_index },
{ 15989, BindProgramPipeline_remap_index },
{ 27449, CreateShaderProgramv_remap_index },
@@ -6591,13 +6596,13 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 7922, GetProgramPipelineInfoLog_remap_index },
{ 30001, GetProgramPipelineiv_remap_index },
{ 25089, IsProgramPipeline_remap_index },
- { 43351, LockArraysEXT_remap_index },
- { 42669, ProgramUniform1f_remap_index },
+ { 43369, LockArraysEXT_remap_index },
+ { 42687, ProgramUniform1f_remap_index },
{ 9373, ProgramUniform1fv_remap_index },
- { 42623, ProgramUniform1i_remap_index },
+ { 42641, ProgramUniform1i_remap_index },
{ 14615, ProgramUniform1iv_remap_index },
{ 33188, ProgramUniform1ui_remap_index },
- { 42471, ProgramUniform1uiv_remap_index },
+ { 42489, ProgramUniform1uiv_remap_index },
{ 2251, ProgramUniform2f_remap_index },
{ 17410, ProgramUniform2fv_remap_index },
{ 2334, ProgramUniform2i_remap_index },
@@ -6614,18 +6619,18 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 32225, ProgramUniform4fv_remap_index },
{ 27943, ProgramUniform4i_remap_index },
{ 1848, ProgramUniform4iv_remap_index },
- { 39114, ProgramUniform4ui_remap_index },
+ { 39132, ProgramUniform4ui_remap_index },
{ 31985, ProgramUniform4uiv_remap_index },
{ 19146, ProgramUniformMatrix2fv_remap_index },
{ 21518, ProgramUniformMatrix2x3fv_remap_index },
{ 7646, ProgramUniformMatrix2x4fv_remap_index },
- { 37413, ProgramUniformMatrix3fv_remap_index },
+ { 37431, ProgramUniformMatrix3fv_remap_index },
{ 32946, ProgramUniformMatrix3x2fv_remap_index },
{ 26425, ProgramUniformMatrix3x4fv_remap_index },
{ 31169, ProgramUniformMatrix4fv_remap_index },
{ 2185, ProgramUniformMatrix4x2fv_remap_index },
{ 7210, ProgramUniformMatrix4x3fv_remap_index },
- { 38153, UnlockArraysEXT_remap_index },
+ { 38171, UnlockArraysEXT_remap_index },
{ 31123, UseProgramStages_remap_index },
{ 1628, ValidateProgramPipeline_remap_index },
{ 16065, DebugMessageCallback_remap_index },
@@ -6635,7 +6640,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 6561, GetObjectLabel_remap_index },
{ 12055, GetObjectPtrLabel_remap_index },
{ 30609, ObjectLabel_remap_index },
- { 43438, ObjectPtrLabel_remap_index },
+ { 43456, ObjectPtrLabel_remap_index },
{ 17879, PopDebugGroup_remap_index },
{ 32362, PushDebugGroup_remap_index },
{ 8286, SecondaryColor3fEXT_remap_index },
@@ -6655,16 +6660,16 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 28786, MultiModeDrawArraysIBM_remap_index },
{ 19794, MultiModeDrawElementsIBM_remap_index },
{ 32857, AreProgramsResidentNV_remap_index },
- { 39788, ExecuteProgramNV_remap_index },
+ { 39806, ExecuteProgramNV_remap_index },
{ 29551, GetProgramParameterdvNV_remap_index },
- { 36435, GetProgramParameterfvNV_remap_index },
+ { 36453, GetProgramParameterfvNV_remap_index },
{ 19243, GetProgramStringNV_remap_index },
{ 15700, GetProgramivNV_remap_index },
{ 18381, GetTrackMatrixivNV_remap_index },
{ 18823, GetVertexAttribdvNV_remap_index },
{ 16986, GetVertexAttribfvNV_remap_index },
{ 15882, GetVertexAttribivNV_remap_index },
- { 36158, LoadProgramNV_remap_index },
+ { 36176, LoadProgramNV_remap_index },
{ 19894, ProgramParameters4dvNV_remap_index },
{ 20506, ProgramParameters4fvNV_remap_index },
{ 6182, RequestResidentProgramsNV_remap_index },
@@ -6672,25 +6677,25 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 14145, VertexAttrib1dNV_remap_index },
{ 28131, VertexAttrib1dvNV_remap_index },
{ 28457, VertexAttrib1fNV_remap_index },
- { 41802, VertexAttrib1fvNV_remap_index },
+ { 41820, VertexAttrib1fvNV_remap_index },
{ 21074, VertexAttrib1sNV_remap_index },
- { 38173, VertexAttrib1svNV_remap_index },
+ { 38191, VertexAttrib1svNV_remap_index },
{ 18357, VertexAttrib2dNV_remap_index },
{ 34388, VertexAttrib2dvNV_remap_index },
{ 27178, VertexAttrib2fNV_remap_index },
{ 25873, VertexAttrib2fvNV_remap_index },
{ 12850, VertexAttrib2sNV_remap_index },
{ 5687, VertexAttrib2svNV_remap_index },
- { 36844, VertexAttrib3dNV_remap_index },
- { 38767, VertexAttrib3dvNV_remap_index },
+ { 36862, VertexAttrib3dNV_remap_index },
+ { 38785, VertexAttrib3dvNV_remap_index },
{ 4946, VertexAttrib3fNV_remap_index },
- { 41056, VertexAttrib3fvNV_remap_index },
+ { 41074, VertexAttrib3fvNV_remap_index },
{ 7154, VertexAttrib3sNV_remap_index },
{ 18408, VertexAttrib3svNV_remap_index },
{ 8488, VertexAttrib4dNV_remap_index },
{ 3408, VertexAttrib4dvNV_remap_index },
{ 8559, VertexAttrib4fNV_remap_index },
- { 41194, VertexAttrib4fvNV_remap_index },
+ { 41212, VertexAttrib4fvNV_remap_index },
{ 17494, VertexAttrib4sNV_remap_index },
{ 10901, VertexAttrib4svNV_remap_index },
{ 1601, VertexAttrib4ubNV_remap_index },
@@ -6699,7 +6704,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 27345, VertexAttribs1dvNV_remap_index },
{ 30900, VertexAttribs1fvNV_remap_index },
{ 6156, VertexAttribs1svNV_remap_index },
- { 42445, VertexAttribs2dvNV_remap_index },
+ { 42463, VertexAttribs2dvNV_remap_index },
{ 4305, VertexAttribs2fvNV_remap_index },
{ 27423, VertexAttribs2svNV_remap_index },
{ 1789, VertexAttribs3dvNV_remap_index },
@@ -6709,7 +6714,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 24367, VertexAttribs4fvNV_remap_index },
{ 20703, VertexAttribs4svNV_remap_index },
{ 32180, VertexAttribs4ubvNV_remap_index },
- { 41680, GetTexBumpParameterfvATI_remap_index },
+ { 41698, GetTexBumpParameterfvATI_remap_index },
{ 10443, GetTexBumpParameterivATI_remap_index },
{ 35545, TexBumpParameterfvATI_remap_index },
{ 8531, TexBumpParameterivATI_remap_index },
@@ -6722,9 +6727,9 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 12816, ColorFragmentOp2ATI_remap_index },
{ 23954, ColorFragmentOp3ATI_remap_index },
{ 16801, DeleteFragmentShaderATI_remap_index },
- { 43845, EndFragmentShaderATI_remap_index },
+ { 43863, EndFragmentShaderATI_remap_index },
{ 22961, GenFragmentShadersATI_remap_index },
- { 41276, PassTexCoordATI_remap_index },
+ { 41294, PassTexCoordATI_remap_index },
{ 35525, SampleMapATI_remap_index },
{ 34849, SetFragmentShaderConstantATI_remap_index },
{ 8462, ActiveStencilFaceEXT_remap_index },
@@ -6732,9 +6737,9 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 16331, GenVertexArraysAPPLE_remap_index },
{ 35111, GetProgramNamedParameterdvNV_remap_index },
{ 22711, GetProgramNamedParameterfvNV_remap_index },
- { 41711, ProgramNamedParameter4dNV_remap_index },
- { 37964, ProgramNamedParameter4dvNV_remap_index },
- { 40998, ProgramNamedParameter4fNV_remap_index },
+ { 41729, ProgramNamedParameter4dNV_remap_index },
+ { 37982, ProgramNamedParameter4dvNV_remap_index },
+ { 41016, ProgramNamedParameter4fNV_remap_index },
{ 25435, ProgramNamedParameter4fvNV_remap_index },
{ 24274, PrimitiveRestartNV_remap_index },
{ 24763, GetTexGenxvOES_remap_index },
@@ -6742,20 +6747,20 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 32424, TexGenxvOES_remap_index },
{ 8012, DepthBoundsEXT_remap_index },
{ 5926, BindFramebufferEXT_remap_index },
- { 41334, BindRenderbufferEXT_remap_index },
+ { 41352, BindRenderbufferEXT_remap_index },
{ 4390, BufferParameteriAPPLE_remap_index },
- { 39390, FlushMappedBufferRangeAPPLE_remap_index },
+ { 39408, FlushMappedBufferRangeAPPLE_remap_index },
{ 27713, VertexAttribI1iEXT_remap_index },
{ 11235, VertexAttribI1uiEXT_remap_index },
{ 20227, VertexAttribI2iEXT_remap_index },
- { 40849, VertexAttribI2ivEXT_remap_index },
+ { 40867, VertexAttribI2ivEXT_remap_index },
{ 25566, VertexAttribI2uiEXT_remap_index },
{ 35208, VertexAttribI2uivEXT_remap_index },
{ 19324, VertexAttribI3iEXT_remap_index },
- { 42919, VertexAttribI3ivEXT_remap_index },
+ { 42937, VertexAttribI3ivEXT_remap_index },
{ 22643, VertexAttribI3uiEXT_remap_index },
{ 20978, VertexAttribI3uivEXT_remap_index },
- { 38009, VertexAttribI4iEXT_remap_index },
+ { 38027, VertexAttribI4iEXT_remap_index },
{ 6677, VertexAttribI4ivEXT_remap_index },
{ 2557, VertexAttribI4uiEXT_remap_index },
{ 27570, VertexAttribI4uivEXT_remap_index },
@@ -6768,17 +6773,17 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 26910, GenPerfMonitorsAMD_remap_index },
{ 12542, GetPerfMonitorCounterDataAMD_remap_index },
{ 34722, GetPerfMonitorCounterInfoAMD_remap_index },
- { 43805, GetPerfMonitorCounterStringAMD_remap_index },
- { 43403, GetPerfMonitorCountersAMD_remap_index },
+ { 43823, GetPerfMonitorCounterStringAMD_remap_index },
+ { 43421, GetPerfMonitorCountersAMD_remap_index },
{ 14216, GetPerfMonitorGroupStringAMD_remap_index },
{ 29704, GetPerfMonitorGroupsAMD_remap_index },
{ 13853, SelectPerfMonitorCountersAMD_remap_index },
{ 14313, GetObjectParameterivAPPLE_remap_index },
- { 43244, ObjectPurgeableAPPLE_remap_index },
+ { 43262, ObjectPurgeableAPPLE_remap_index },
{ 1897, ObjectUnpurgeableAPPLE_remap_index },
- { 42233, ActiveProgramEXT_remap_index },
+ { 42251, ActiveProgramEXT_remap_index },
{ 27316, CreateShaderProgramEXT_remap_index },
- { 36952, UseShaderProgramEXT_remap_index },
+ { 36970, UseShaderProgramEXT_remap_index },
{ 30475, TextureBarrierNV_remap_index },
{ 2142, VDPAUFiniNV_remap_index },
{ 835, VDPAUGetSurfaceivNV_remap_index },
@@ -6789,12 +6794,12 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 12411, VDPAURegisterVideoSurfaceNV_remap_index },
{ 10974, VDPAUSurfaceAccessNV_remap_index },
{ 4740, VDPAUUnmapSurfacesNV_remap_index },
- { 37863, VDPAUUnregisterSurfaceNV_remap_index },
- { 38612, BeginPerfQueryINTEL_remap_index },
+ { 37881, VDPAUUnregisterSurfaceNV_remap_index },
+ { 38630, BeginPerfQueryINTEL_remap_index },
{ 33692, CreatePerfQueryINTEL_remap_index },
{ 16262, DeletePerfQueryINTEL_remap_index },
- { 40679, EndPerfQueryINTEL_remap_index },
- { 42203, GetFirstPerfQueryIdINTEL_remap_index },
+ { 40697, EndPerfQueryINTEL_remap_index },
+ { 42221, GetFirstPerfQueryIdINTEL_remap_index },
{ 30428, GetNextPerfQueryIdINTEL_remap_index },
{ 32036, GetPerfCounterInfoINTEL_remap_index },
{ 746, GetPerfQueryDataINTEL_remap_index },
@@ -6805,10 +6810,10 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 30743, ProgramLocalParameters4fvEXT_remap_index },
{ 3846, EGLImageTargetRenderbufferStorageOES_remap_index },
{ 3610, EGLImageTargetTexture2DOES_remap_index },
- { 40816, AlphaFuncx_remap_index },
+ { 40834, AlphaFuncx_remap_index },
{ 19369, ClearColorx_remap_index },
- { 40058, ClearDepthx_remap_index },
- { 35926, Color4x_remap_index },
+ { 40076, ClearDepthx_remap_index },
+ { 35944, Color4x_remap_index },
{ 23745, DepthRangex_remap_index },
{ 2381, Fogx_remap_index },
{ 14779, Fogxv_remap_index },
@@ -6817,10 +6822,10 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 19289, LightModelx_remap_index },
{ 32274, LightModelxv_remap_index },
{ 28991, Lightx_remap_index },
- { 41563, Lightxv_remap_index },
+ { 41581, Lightxv_remap_index },
{ 3540, LineWidthx_remap_index },
- { 37529, LoadMatrixx_remap_index },
- { 42540, Materialx_remap_index },
+ { 37547, LoadMatrixx_remap_index },
+ { 42558, Materialx_remap_index },
{ 25385, Materialxv_remap_index },
{ 29194, MultMatrixx_remap_index },
{ 31439, MultiTexCoord4x_remap_index },
@@ -6829,11 +6834,11 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 15580, Orthox_remap_index },
{ 27617, PointSizex_remap_index },
{ 70, PolygonOffsetx_remap_index },
- { 37277, Rotatex_remap_index },
+ { 37295, Rotatex_remap_index },
{ 19945, SampleCoveragex_remap_index },
{ 12700, Scalex_remap_index },
- { 38402, TexEnvx_remap_index },
- { 43195, TexEnvxv_remap_index },
+ { 38420, TexEnvx_remap_index },
+ { 43213, TexEnvxv_remap_index },
{ 1976, TexParameterx_remap_index },
{ 31765, Translatex_remap_index },
{ 33155, ClipPlanef_remap_index },
@@ -6846,7 +6851,7 @@ static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
{ 21373, GetTexEnvxv_remap_index },
{ 16686, GetTexParameterxv_remap_index },
{ 29228, PointParameterx_remap_index },
- { 37232, PointParameterxv_remap_index },
+ { 37250, PointParameterxv_remap_index },
{ 19032, TexParameterxv_remap_index },
{ -1, -1 }
};
@@ -6856,7 +6861,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
/* from GL_EXT_blend_color */
{ 34336, _gloffset_BlendColor },
/* from GL_EXT_blend_minmax */
- { 36787, _gloffset_BlendEquation },
+ { 36805, _gloffset_BlendEquation },
/* from GL_EXT_color_subtable */
{ 5396, _gloffset_ColorSubTable },
{ 21274, _gloffset_CopyColorSubTable },
@@ -6871,15 +6876,15 @@ static const struct gl_function_remap MESA_alt_functions[] = {
{ 28544, _gloffset_GetSeparableFilter },
{ 30086, _gloffset_ConvolutionParameteri },
{ 30208, _gloffset_ConvolutionParameterf },
- { 35955, _gloffset_ConvolutionParameteriv },
- { 41616, _gloffset_GetConvolutionParameterfv },
- { 42770, _gloffset_CopyConvolutionFilter2D },
+ { 35973, _gloffset_ConvolutionParameteriv },
+ { 41634, _gloffset_GetConvolutionParameterfv },
+ { 42788, _gloffset_CopyConvolutionFilter2D },
/* from GL_EXT_copy_texture */
{ 27232, _gloffset_CopyTexImage2D },
{ 29852, _gloffset_CopyTexImage1D },
{ 32311, _gloffset_CopyTexSubImage1D },
- { 38240, _gloffset_CopyTexSubImage3D },
- { 41872, _gloffset_CopyTexSubImage2D },
+ { 38258, _gloffset_CopyTexSubImage3D },
+ { 41890, _gloffset_CopyTexSubImage2D },
/* from GL_EXT_draw_range_elements */
{ 24712, _gloffset_DrawRangeElements },
/* from GL_EXT_histogram */
@@ -6900,36 +6905,36 @@ static const struct gl_function_remap MESA_alt_functions[] = {
{ 30264, _gloffset_GetColorTableParameteriv },
/* from GL_EXT_subtexture */
{ 2413, _gloffset_TexSubImage1D },
- { 36502, _gloffset_TexSubImage2D },
+ { 36520, _gloffset_TexSubImage2D },
/* from GL_EXT_texture3D */
{ 22241, _gloffset_TexImage3D },
- { 40490, _gloffset_TexSubImage3D },
+ { 40508, _gloffset_TexSubImage3D },
/* from GL_EXT_texture_object */
{ 4218, _gloffset_GenTextures },
{ 8877, _gloffset_BindTexture },
{ 17329, _gloffset_IsTexture },
{ 22593, _gloffset_PrioritizeTextures },
{ 26755, _gloffset_DeleteTextures },
- { 40946, _gloffset_AreTexturesResident },
+ { 40964, _gloffset_AreTexturesResident },
/* from GL_EXT_vertex_array */
{ 18642, _gloffset_ArrayElement },
{ 29271, _gloffset_DrawArrays },
- { 38850, _gloffset_GetPointerv },
+ { 38868, _gloffset_GetPointerv },
/* from GL_NV_read_buffer */
{ 30055, _gloffset_ReadBuffer },
/* from GL_OES_blend_subtract */
- { 36787, _gloffset_BlendEquation },
+ { 36805, _gloffset_BlendEquation },
/* from GL_OES_texture_3D */
{ 22241, _gloffset_TexImage3D },
- { 38240, _gloffset_CopyTexSubImage3D },
- { 40490, _gloffset_TexSubImage3D },
+ { 38258, _gloffset_CopyTexSubImage3D },
+ { 40508, _gloffset_TexSubImage3D },
/* from GL_OES_texture_cube_map */
{ 16915, _gloffset_TexGeni },
{ 16943, _gloffset_TexGenf },
{ 20305, _gloffset_GetTexGenfv },
{ 34287, _gloffset_TexGeniv },
- { 36611, _gloffset_TexGenfv },
- { 42167, _gloffset_GetTexGeniv },
+ { 36629, _gloffset_TexGenfv },
+ { 42185, _gloffset_GetTexGeniv },
/* from GL_SGI_color_table */
{ 2717, _gloffset_ColorTableParameteriv },
{ 13558, _gloffset_ColorTable },
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 66f1de211..3c0b5568c 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -68,6 +68,7 @@ typedef struct _EphyrInputPrivate {
Bool EphyrWantGrayScale = 0;
Bool EphyrWantResize = 0;
+Bool EphyrWantNoHostGrab = 0;
Bool
host_has_extension(xcb_extension_t *extension)
@@ -652,7 +653,11 @@ ephyrInitScreen(ScreenPtr pScreen)
EPHYR_LOG("pScreen->myNum:%d\n", pScreen->myNum);
hostx_set_screen_number(screen, pScreen->myNum);
- hostx_set_win_title(screen, "(ctrl+shift grabs mouse and keyboard)");
+ if (EphyrWantNoHostGrab) {
+ hostx_set_win_title(screen, "xephyr");
+ } else {
+ hostx_set_win_title(screen, "(ctrl+shift grabs mouse and keyboard)");
+ }
pScreen->CreateColormap = ephyrCreateColormap;
#ifdef XV
@@ -1103,12 +1108,13 @@ ephyrProcessKeyRelease(xcb_generic_event_t *xev)
if (!keysyms)
keysyms = xcb_key_symbols_alloc(conn);
- if (((xcb_key_symbols_get_keysym(keysyms, key->detail, 0) == XK_Shift_L
+ if (!EphyrWantNoHostGrab &&
+ (((xcb_key_symbols_get_keysym(keysyms, key->detail, 0) == XK_Shift_L
|| xcb_key_symbols_get_keysym(keysyms, key->detail, 0) == XK_Shift_R)
&& (key->state & XCB_MOD_MASK_CONTROL)) ||
((xcb_key_symbols_get_keysym(keysyms, key->detail, 0) == XK_Control_L
|| xcb_key_symbols_get_keysym(keysyms, key->detail, 0) == XK_Control_R)
- && (key->state & XCB_MOD_MASK_SHIFT))) {
+ && (key->state & XCB_MOD_MASK_SHIFT)))) {
KdScreenInfo *screen = screen_from_window(key->event);
EphyrScrPriv *scrpriv = screen->driver;
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index c7358b52e..8311a5fce 100755
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -33,6 +33,7 @@
extern Window EphyrPreExistingHostWin;
extern Bool EphyrWantGrayScale;
extern Bool EphyrWantResize;
+extern Bool EphyrWantNoHostGrab;
extern Bool kdHasPointer;
extern Bool kdHasKbd;
extern Bool ephyr_glamor, ephyr_glamor_gles2;
@@ -154,6 +155,7 @@ ddxUseMsg(void)
ErrorF("-name [name] define the name in the WM_CLASS property\n");
ErrorF
("-title [title] set the window title in the WM_NAME property\n");
+ ErrorF("-no-host-grab Disable grabbing the keyboard and mouse.\n");
ErrorF("\n");
}
#endif
@@ -363,6 +365,10 @@ ddxProcessArgument(int argc, char **argv, int i)
return 2;
}
/* end Xnest compat */
+ else if (!strcmp(argv[i], "-no-host-grab")) {
+ EphyrWantNoHostGrab = 1;
+ return 2;
+ }
return KdProcessArgument(argc, argv, i);
}
diff --git a/xorg-server/hw/kdrive/ephyr/man/Xephyr.man b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
index f14f6c864..c04379035 100644
--- a/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
+++ b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
@@ -63,6 +63,9 @@ improvement is negligible.
.B -resizeable
Allow the Xephyr window to be resized, even if not embedded into a parent
window. By default, the Xephyr window has a fixed size.
+.TP 8
+.B -no-host-grab
+Disable grabbing the keyboard and mouse.
.SH "SIGNALS"
Send a SIGUSR1 to the server (e.g. pkill -USR1 Xephyr) to
toggle the debugging mode.
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c
index 9622db5a2..9e9491df8 100755
--- a/xorg-server/hw/xwin/InitOutput.c
+++ b/xorg-server/hw/xwin/InitOutput.c
@@ -756,12 +756,6 @@ winUseMsg(void)
"\t\t1 - Shadow GDI\n"
"\t\t2 - Shadow DirectDraw\n"
"\t\t4 - Shadow DirectDraw4 Non-Locking\n"
-#ifdef XWIN_PRIMARYFB
- "\t\t8 - Primary DirectDraw - obsolete\n"
-#endif
-#ifdef XWIN_NATIVEGDI
- "\t\t16 - Native GDI - experimental\n"
-#endif
);
ErrorF("-fullscreen\n" "\tRun the server in fullscreen mode.\n");
diff --git a/xorg-server/hw/xwin/Makefile.am b/xorg-server/hw/xwin/Makefile.am
index 2c7fde313..0ea8ba769 100755
--- a/xorg-server/hw/xwin/Makefile.am
+++ b/xorg-server/hw/xwin/Makefile.am
@@ -37,27 +37,6 @@ DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM
MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la
endif
-if XWIN_NATIVEGDI
-SRCS_NATIVEGDI = \
- winclip.c \
- winfillsp.c \
- winfont.c \
- wingc.c \
- wingetsp.c \
- winnativegdi.c \
- winpixmap.c \
- winpolyline.c \
- winrop.c \
- winsetsp.c
-DEFS_NATIVEGDI = -DXWIN_NATIVEGDI
-endif
-
-if XWIN_PRIMARYFB
-SRCS_PRIMARYFB = \
- winpfbdd.c
-DEFS_PRIMARYFB = -DXWIN_PRIMARYFB
-endif
-
if XWIN_RANDR
SRCS_RANDR = \
winrandr.c
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile
index cc8aeb544..530e02c85 100644..100755
--- a/xorg-server/hw/xwin/makefile
+++ b/xorg-server/hw/xwin/makefile
@@ -114,20 +114,23 @@ SRCS = InitInput.c \
winwindow.c \
winwndproc.c \
ddraw.h \
- winclipboard.h \
winconfig.h \
win.h \
+ winglobals.h \
winkeybd.h \
winkeynames.h \
winlayouts.h \
winmessages.h \
+ winmonitors.h \
winmsg.h \
winms.h \
winmultiwindowclass.h \
+ winmultiwindowicons.h \
winprefs.h \
winresource.h \
winwindow.h \
windisplay.c \
+ windisplay.h \
XWin.rc \
$(SRCS_CLIPBOARD) \
$(SRCS_MULTIWINDOW) \
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man
index c71f6a154..a043ac281 100644
--- a/xorg-server/hw/xwin/man/XWin.man
+++ b/xorg-server/hw/xwin/man/XWin.man
@@ -261,10 +261,6 @@ Shadow GDI
Shadow DirectDraw
.IP 4 4
Shadow DirectDraw Non-Locking
-.IP 8 4
-Primary DirectDraw (unsupported, obsolete)
-.IP 16 4
-Native GDI (unsupported, experimental and barely functional)
.RE
.SH FULLSCREEN OPTIONS
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index d070ea485..6563a6509 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -98,12 +98,6 @@
#define WIN_SERVER_SHADOW_GDI 0x1L /* 1 */
#define WIN_SERVER_SHADOW_DD 0x2L /* 2 */
#define WIN_SERVER_SHADOW_DDNL 0x4L /* 4 */
-#ifdef XWIN_PRIMARYFB
-#define WIN_SERVER_PRIMARY_DD 0x8L /* 8 */
-#endif
-#ifdef XWIN_NATIVEGDI
-#define WIN_SERVER_NATIVE_GDI 0x10L /* 16 */
-#endif
#define AltMapIndex Mod1MapIndex
#define NumLockMapIndex Mod2MapIndex
@@ -265,12 +259,6 @@ typedef Bool (*winFinishCreateWindowsWindowProcPtr) (WindowPtr pWin);
typedef Bool (*winCreateScreenResourcesProc) (ScreenPtr);
-#ifdef XWIN_NATIVEGDI
-/* Typedefs for native GDI wrappers */
-typedef Bool (*RealizeFontPtr) (ScreenPtr pScreen, FontPtr pFont);
-typedef Bool (*UnrealizeFontPtr) (ScreenPtr pScreen, FontPtr pFont);
-#endif
-
/*
* GC (graphics context) privates
*/
@@ -547,12 +535,6 @@ typedef struct _winPrivScreenRec {
SetShapeProcPtr SetShape;
winCursorRec cursor;
-
-#ifdef XWIN_NATIVEGDI
- RealizeFontPtr RealizeFont;
- UnrealizeFontPtr UnrealizeFont;
-#endif
-
} winPrivScreenRec;
#ifdef XWIN_MULTIWINDOWEXTWM
@@ -740,15 +722,6 @@ void
winBlockHandler(ScreenPtr pScreen,
void *pTimeout, void *pReadMask);
-#ifdef XWIN_NATIVEGDI
-/*
- * winclip.c
- */
-
-RegionPtr
- winPixmapToRegionNativeGDI(PixmapPtr pPix);
-#endif
-
#ifdef XWIN_CLIPBOARD
/*
* winclipboardinit.c
@@ -827,52 +800,6 @@ void
winMessageBoxF(const char *pszError, UINT uType, ...)
_X_ATTRIBUTE_PRINTF(1, 3);
-#ifdef XWIN_NATIVEGDI
-/*
- * winfillsp.c
- */
-
-void
-
-winFillSpansNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC,
- int nSpans,
- DDXPointPtr pPoints, int *pWidths, int fSorted);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * winfont.c
- */
-
-Bool
- winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont);
-
-Bool
- winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * wingc.c
- */
-
-Bool
- winCreateGCNativeGDI(GCPtr pGC);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * wingetsp.c
- */
-
-void
-
-winGetSpansNativeGDI(DrawablePtr pDrawable,
- int wMax,
- DDXPointPtr pPoints, int *pWidths, int nSpans, char *pDst);
-#endif
-
/*
* winglobals.c
*/
@@ -924,23 +851,12 @@ void
* winmisc.c
*/
-#ifdef XWIN_NATIVEGDI
-void
-
-winQueryBestSizeNativeGDI(int class, unsigned short *pWidth,
- unsigned short *pHeight, ScreenPtr pScreen);
-#endif
-
CARD8
winCountBits(DWORD dw);
Bool
winUpdateFBPointer(ScreenPtr pScreen, void *pbits);
-#ifdef XWIN_NATIVEGDI
-BOOL winPaintBackground(HWND hwnd, COLORREF colorref);
-#endif
-
/*
* winmouse.c
*/
@@ -962,60 +878,6 @@ winMouseButtonsHandle(ScreenPtr pScreen,
void
winEnqueueMotion(int x, int y);
-#ifdef XWIN_NATIVEGDI
-/*
- * winnativegdi.c
- */
-
-HBITMAP
-winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
- BYTE ** ppbBits, BITMAPINFO ** ppbmi);
-
-Bool
- winSetEngineFunctionsNativeGDI(ScreenPtr pScreen);
-#endif
-
-#ifdef XWIN_PRIMARYFB
-/*
- * winpfbddd.c
- */
-
-Bool
- winSetEngineFunctionsPrimaryDD(ScreenPtr pScreen);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * winpixmap.c
- */
-
-PixmapPtr
-
-winCreatePixmapNativeGDI(ScreenPtr pScreen, int width, int height, int depth,
- unsigned usage_hint);
-
-Bool
- winDestroyPixmapNativeGDI(PixmapPtr pPixmap);
-
-Bool
-
-winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
- int iWidth, int iHeight,
- int iDepth,
- int iBitsPerPixel,
- int devKind, void *pPixData);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * winpolyline.c
- */
-
-void
-
-winPolyLineNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC, int mode, int npt, DDXPointPtr ppt);
-#endif
/*
* winscrinit.c
*/
@@ -1026,26 +888,6 @@ Bool
Bool
winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv);
-#if defined(XWIN_NATIVEGDI)
-Bool
-
-winFinishScreenInitNativeGDI(int i,
- ScreenPtr pScreen, int argc, char **argv);
-#endif
-
-#ifdef XWIN_NATIVEGDI
-/*
- * winsetsp.c
- */
-
-void
-
-winSetSpansNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC,
- char *pSrc,
- DDXPointPtr pPoints, int *pWidth, int nSpans, int fSorted);
-#endif
-
/*
* winshaddd.c
*/
@@ -1080,30 +922,6 @@ winWakeupHandler(ScreenPtr pScreen,
* winwindow.c
*/
-#ifdef XWIN_NATIVEGDI
-Bool
- winCreateWindowNativeGDI(WindowPtr pWin);
-
-Bool
- winDestroyWindowNativeGDI(WindowPtr pWin);
-
-Bool
- winPositionWindowNativeGDI(WindowPtr pWin, int x, int y);
-
-void
-
-winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-
-Bool
- winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask);
-
-Bool
- winUnmapWindowNativeGDI(WindowPtr pWindow);
-
-Bool
- winMapWindowNativeGDI(WindowPtr pWindow);
-#endif
-
Bool
winCreateWindowRootless(WindowPtr pWindow);
diff --git a/xorg-server/hw/xwin/winclip.c b/xorg-server/hw/xwin/winclip.c
deleted file mode 100644
index 6862603ba..000000000
--- a/xorg-server/hw/xwin/winclip.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 HAROLD L HUNT II 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 name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors: Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/* Look at mfb/mfbclip.c for sample implementation */
-RegionPtr
-winPixmapToRegionNativeGDI(PixmapPtr pPix)
-{
- winDebug("winPixmapToRegion()\n");
- return NULL;
-}
diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c
index 597f6bc4e..ffffd7127 100644
--- a/xorg-server/hw/xwin/wincreatewnd.c
+++ b/xorg-server/hw/xwin/wincreatewnd.c
@@ -111,20 +111,8 @@ winCreateBoundingWindowFullScreen(ScreenPtr pScreen)
GetModuleHandle(NULL), /* Instance handle */
pScreenPriv); /* ScreenPrivates */
- /* Branch on the server engine */
- switch (pScreenInfo->dwEngine) {
-#ifdef XWIN_NATIVEGDI
- case WIN_SERVER_SHADOW_GDI:
- /* Show the window */
- ShowWindow(*phwnd, SW_SHOWMAXIMIZED);
- break;
-#endif
-
- default:
- /* Hide the window */
- ShowWindow(*phwnd, SW_SHOWNORMAL);
- break;
- }
+ /* Hide the window */
+ ShowWindow(*phwnd, SW_SHOWNORMAL);
/* Send first paint message */
UpdateWindow(*phwnd);
@@ -466,12 +454,6 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen)
}
}
-#ifdef XWIN_NATIVEGDI
- /* Paint window background blue */
- if (pScreenInfo->dwEngine == WIN_SERVER_NATIVE_GDI)
- winPaintBackground(*phwnd, RGB(0x00, 0x00, 0xFF));
-#endif
-
winDebug("winCreateBoundingWindowWindowed - Returning\n");
return TRUE;
diff --git a/xorg-server/hw/xwin/winengine.c b/xorg-server/hw/xwin/winengine.c
index e597e2c49..dc6ec7e9d 100644..100755
--- a/xorg-server/hw/xwin/winengine.c
+++ b/xorg-server/hw/xwin/winengine.c
@@ -59,10 +59,6 @@ winDetectSupportedEngines(void)
/* Initialize the engine support flags */
g_dwEnginesSupported = WIN_SERVER_SHADOW_GDI;
-#ifdef XWIN_NATIVEGDI
- g_dwEnginesSupported |= WIN_SERVER_NATIVE_GDI;
-#endif
-
/* Get operating system version information */
ZeroMemory(&osvi, sizeof(osvi));
osvi.dwOSVersionInfoSize = sizeof(osvi);
@@ -94,15 +90,6 @@ winDetectSupportedEngines(void)
winDebug (
"winDetectSupportedEngines - DirectDraw installed, allowing ShadowDD\n");
g_dwEnginesSupported |= WIN_SERVER_SHADOW_DD;
-
-#ifdef XWIN_PRIMARYFB
- /* Allow PrimaryDD engine if NT */
- if (osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
- g_dwEnginesSupported |= WIN_SERVER_PRIMARY_DD;
- winDebug (
- "winDetectSupportedEngines - Windows NT, allowing PrimaryDD\n");
- }
-#endif
}
/* Try to query for DirectDraw4 interface */
@@ -111,8 +98,8 @@ winDetectSupportedEngines(void)
(LPVOID *) &lpdd4);
if (SUCCEEDED(ddrval)) {
/* We have DirectDraw4 */
- winDebug (
- "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n");
+ winDebug (
+ "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n");
g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL;
}
@@ -206,16 +193,6 @@ winSetEngine(ScreenPtr pScreen)
case WIN_SERVER_SHADOW_DDNL:
winSetEngineFunctionsShadowDDNL(pScreen);
break;
-#ifdef XWIN_PRIMARYFB
- case WIN_SERVER_PRIMARY_DD:
- winSetEngineFunctionsPrimaryDD(pScreen);
- break;
-#endif
-#ifdef XWIN_NATIVEGDI
- case WIN_SERVER_NATIVE_GDI:
- winSetEngineFunctionsNativeGDI(pScreen);
- break;
-#endif
default:
FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine);
}
diff --git a/xorg-server/hw/xwin/winfillsp.c b/xorg-server/hw/xwin/winfillsp.c
deleted file mode 100644
index bd0a15e8a..000000000
--- a/xorg-server/hw/xwin/winfillsp.c
+++ /dev/null
@@ -1,842 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Harold L Hunt II
- * Alan Hourihane <alanh@fairlite.demon.co.uk>
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-extern void ROP16(HDC hdc, int rop);
-
-#define TRANSLATE_COLOR(color) \
-{ \
- if (pDrawable->depth == 15) \
- color = ((color & 0x1F) << 19) | ((color & 0x03E0) << 6) | \
- ((color & 0xF800) >> 8); \
- else if (pDrawable->depth == 16) \
- color = ((color & 0x1F) << 19) | ((color & 0x07E0) << 5) | \
- ((color & 0xF800) >> 8); \
- else if (pDrawable->depth == 24 || pDrawable->depth == 32) \
- color = ((color & 0xFF) << 16) | (color & 0xFF00) | \
- ((color & 0xFF0000) >> 16); \
-}
-
-/* See Porting Layer Definition - p. 54 */
-void
-winFillSpansNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC,
- int iSpans,
- DDXPointPtr pPoints, int *piWidths, int fSorted)
-{
- winGCPriv(pGC);
- HBITMAP hbmpOrig = NULL, hbmpOrigStipple = NULL;
- HBITMAP hPenOrig = NULL;
- HBITMAP hBitmap = NULL;
- PixmapPtr pPixmap = NULL;
- winPrivPixmapPtr pPixmapPriv = NULL;
- PixmapPtr pStipple = NULL;
- winPrivPixmapPtr pStipplePriv = NULL;
- PixmapPtr pTile = NULL;
- winPrivPixmapPtr pTilePriv = NULL;
- HDC hdcStipple = NULL, hdcTile = NULL;
- HPEN hPen = NULL;
- int iX;
- int fg, bg;
- RegionPtr pClip = pGC->pCompositeClip;
- BoxPtr pextent, pbox;
- int nbox;
- int extentX1, extentX2, extentY1, extentY2;
- int fullX1, fullX2, fullY1;
- HRGN hrgn = NULL, combined = NULL;
-
- nbox = RegionNumRects(pClip);
- pbox = RegionRects(pClip);
-
- if (!nbox)
- return;
-
- combined = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
- nbox--;
- pbox++;
-
- while (nbox--) {
- hrgn = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
- CombineRgn(combined, combined, hrgn, RGN_OR);
- DeleteObject(hrgn);
- hrgn = NULL;
- pbox++;
- }
-
- pextent = RegionExtents(pClip);
- extentX1 = pextent->x1;
- extentY1 = pextent->y1;
- extentX2 = pextent->x2;
- extentY2 = pextent->y2;
-
- /* Branch on the type of drawable we have */
- switch (pDrawable->type) {
- case DRAWABLE_PIXMAP:
-
- SelectClipRgn(pGCPriv->hdcMem, combined);
- DeleteObject(combined);
- combined = NULL;
-
- /* Get a pixmap pointer from the drawable pointer, and fetch privates */
- pPixmap = (PixmapPtr) pDrawable;
- pPixmapPriv = winGetPixmapPriv(pPixmap);
-
- /* Select the drawable pixmap into memory hdc */
- hbmpOrig = SelectObject(pGCPriv->hdcMem, pPixmapPriv->hBitmap);
- if (hbmpOrig == NULL)
- FatalError("winFillSpans - DRAWABLE_PIXMAP - "
- "SelectObject () failed on\n\tpPixmapPriv->hBitmap: "
- "%p\n", pPixmapPriv->hBitmap);
-
- /* Branch on the fill type */
- switch (pGC->fillStyle) {
- case FillSolid:
-
- ROP16(pGCPriv->hdcMem, pGC->alu);
-
- if (pDrawable->depth == 1) {
- if (pGC->fgPixel == 0)
- hPenOrig = SelectObject(pGCPriv->hdcMem,
- GetStockObject(BLACK_PEN));
- else
- hPenOrig = SelectObject(pGCPriv->hdcMem,
- GetStockObject(WHITE_PEN));
- }
- else {
- fg = pGC->fgPixel;
- TRANSLATE_COLOR(fg);
- hPen = CreatePen(PS_SOLID, 0, fg);
- hPenOrig = SelectObject(pGCPriv->hdcMem, hPen);
- }
-
- while (iSpans--) {
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- MoveToEx(pGCPriv->hdcMem, fullX1, fullY1, NULL);
- LineTo(pGCPriv->hdcMem, fullX2, fullY1);
- }
-
- SetROP2(pGCPriv->hdcMem, R2_COPYPEN);
-
- /* Give back the Pen */
- SelectObject(pGCPriv->hdcMem, hPenOrig);
-
- if (pDrawable->depth != 1)
- DeleteObject(hPen);
- break;
-
- case FillOpaqueStippled:
-
- pStipple = pGC->stipple;
- pStipplePriv = winGetPixmapPriv(pStipple);
-
- /* Create a device-dependent bitmap for the stipple */
- hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
- (BITMAPINFOHEADER *) pStipplePriv->pbmih,
- CBM_INIT,
- pStipplePriv->pbBits,
- (BITMAPINFO *) pStipplePriv->pbmih,
- DIB_RGB_COLORS);
-
- /* Create a memory DC to hold the stipple */
- hdcStipple = CreateCompatibleDC(pGCPriv->hdcMem);
-
- /* Select the stipple bitmap into the stipple DC */
- hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
- if (hbmpOrigStipple == NULL)
- FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
- "SelectObject () failed on hbmpOrigStipple\n");
-
- /* Make a temporary copy of the foreground and background colors */
- bg = pGC->bgPixel;
- fg = pGC->fgPixel;
-
- /* Translate the depth-dependent colors to Win32 COLORREFs */
- TRANSLATE_COLOR(fg);
- TRANSLATE_COLOR(bg);
- SetTextColor(pGCPriv->hdcMem, fg);
- SetBkColor(pGCPriv->hdcMem, bg);
-
- while (iSpans--) {
- int width = pStipple->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pStipple->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pStipple->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pStipple->drawable.width) -
- pStipple->drawable.width)) %
- pStipple->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pStipple->drawable.width)
- width = pStipple->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdcMem,
- iX, fullY1,
- width, 1,
- hdcStipple,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pStipple->drawable.height) -
- pStipple->drawable.height)) %
- pStipple->drawable.height, g_copyROP[pGC->alu]);
- }
- }
-
- /* Clear the stipple HDC */
- SelectObject(hdcStipple, hbmpOrigStipple);
- DeleteDC(hdcStipple);
-
- /* Delete the device dependent stipple bitmap */
- DeleteObject(hBitmap);
-
- break;
- case FillStippled:
-
- pStipple = pGC->stipple;
- pStipplePriv = winGetPixmapPriv(pStipple);
-
- /* Create a device-dependent bitmap for the stipple */
- hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
- (BITMAPINFOHEADER *) pStipplePriv->pbmih,
- CBM_INIT,
- pStipplePriv->pbBits,
- (BITMAPINFO *) pStipplePriv->pbmih,
- DIB_RGB_COLORS);
-
- /* Create a memory DC to hold the stipple */
- hdcStipple = CreateCompatibleDC(pGCPriv->hdcMem);
-
- /* Select the stipple bitmap into the stipple DC */
- hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
- if (hbmpOrigStipple == NULL)
- FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
- "SelectObject () failed on hbmpOrigStipple\n");
-
- /* Make a temporary copy of the foreground and background colors */
- bg = pGC->bgPixel;
- fg = pGC->fgPixel;
-
- /* Translate the depth-dependent colors to Win32 COLORREFs */
- TRANSLATE_COLOR(fg);
- TRANSLATE_COLOR(bg);
-
- /* this is fudgy, we should only invert on the last one
- * We need to get the black/white pixels right in the
- * colormap. But yeah ! it's working..
- */
- if (pGC->bgPixel != -1 && pGC->fgPixel != -1) {
- SetTextColor(pGCPriv->hdcMem, fg);
- SetBkColor(pGCPriv->hdcMem, bg);
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
- }
- else if (pGC->bgPixel == -1) {
- SetTextColor(pGCPriv->hdcMem, fg);
- SetBkMode(pGCPriv->hdcMem, TRANSPARENT);
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
- }
- else if (pGC->fgPixel == -1) {
- SetTextColor(pGCPriv->hdcMem, bg);
- SetBkMode(pGCPriv->hdcMem, TRANSPARENT);
-#if 0
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
-#endif
- }
-
- while (iSpans--) {
- int width = pStipple->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pStipple->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pStipple->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pStipple->drawable.width) -
- pStipple->drawable.width)) %
- pStipple->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pStipple->drawable.width)
- width = pStipple->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdcMem,
- iX, fullY1,
- width, 1,
- hdcStipple,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pStipple->drawable.height) -
- pStipple->drawable.height)) %
- pStipple->drawable.height, g_copyROP[pGC->alu]);
- }
- }
-
- /* Clear the stipple HDC */
- SelectObject(hdcStipple, hbmpOrigStipple);
- DeleteDC(hdcStipple);
-
- /* Delete the device dependent stipple bitmap */
- DeleteObject(hBitmap);
-
- /* Restore the background mode */
- SetBkMode(pGCPriv->hdcMem, OPAQUE);
- break;
-
- case FillTiled:
-
- /* Get a pixmap pointer from the tile pointer, and fetch privates */
- pTile = (PixmapPtr) pGC->tile.pixmap;
- pTilePriv = winGetPixmapPriv(pTile);
-
- /* Create a memory DC to hold the tile */
- hdcTile = CreateCompatibleDC(pGCPriv->hdcMem);
-
- /* Select the tile into a DC */
- hbmpOrig = SelectObject(hdcTile, pTilePriv->hBitmap);
- if (hbmpOrig == NULL)
- FatalError("winFillSpans - DRAWABLE_PIXMAP - FillTiled - "
- "SelectObject () failed on pTilePriv->hBitmap\n");
-
- while (iSpans--) {
- int width = pTile->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pTile->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pTile->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pTile->drawable.width) -
- pTile->drawable.width)) % pTile->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pTile->drawable.width)
- width = pTile->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdcMem,
- iX, fullY1,
- width, 1,
- hdcTile,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pTile->drawable.height) -
- pTile->drawable.height)) % pTile->drawable.height,
- g_copyROP[pGC->alu]);
- }
- }
-
- /* Push the tile pixmap out of the memory HDC */
- SelectObject(hdcTile, hbmpOrig);
-
- /* Delete the tile */
- DeleteDC(hdcTile);
- break;
-
- default:
- ErrorF("winFillSpans - DRAWABLE_PIXMAP - Unknown fillStyle\n");
- break;
- }
-
- /* Reset clip region */
- SelectClipRgn(pGCPriv->hdcMem, NULL);
-
- /* Push the drawable pixmap out of the GC HDC */
- SelectObject(pGCPriv->hdcMem, hbmpOrig);
- break;
-
- case DRAWABLE_WINDOW:
-
- SelectClipRgn(pGCPriv->hdc, combined);
- DeleteObject(combined);
- combined = NULL;
-
- /* Branch on fill style */
- switch (pGC->fillStyle) {
- case FillSolid:
-
- ROP16(pGCPriv->hdc, pGC->alu);
-
- if (pDrawable->depth == 1) {
- if (pGC->fgPixel == 0)
- hPenOrig = SelectObject(pGCPriv->hdc,
- GetStockObject(BLACK_PEN));
- else
- hPenOrig = SelectObject(pGCPriv->hdc,
- GetStockObject(WHITE_PEN));
- }
- else {
- fg = pGC->fgPixel;
- TRANSLATE_COLOR(fg);
- hPen = CreatePen(PS_SOLID, 0, fg);
- hPenOrig = SelectObject(pGCPriv->hdc, hPen);
- }
-
- while (iSpans--) {
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- MoveToEx(pGCPriv->hdc, fullX1, fullY1, NULL);
- LineTo(pGCPriv->hdc, fullX2, fullY1);
- }
-
- SetROP2(pGCPriv->hdc, R2_COPYPEN);
-
- /* Give back the Brush */
- SelectObject(pGCPriv->hdc, hPenOrig);
-
- if (pDrawable->depth != 1)
- DeleteObject(hPen);
- break;
-
- case FillOpaqueStippled:
-
- pStipple = pGC->stipple;
- pStipplePriv = winGetPixmapPriv(pStipple);
-
- /* Create a device-dependent bitmap for the stipple */
- hBitmap = CreateDIBitmap(pGCPriv->hdc,
- (BITMAPINFOHEADER *) pStipplePriv->pbmih,
- CBM_INIT,
- pStipplePriv->pbBits,
- (BITMAPINFO *) pStipplePriv->pbmih,
- DIB_RGB_COLORS);
-
- /* Create a memory DC to hold the stipple */
- hdcStipple = CreateCompatibleDC(pGCPriv->hdc);
-
- /* Select the stipple bitmap into the stipple DC */
- hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
- if (hbmpOrigStipple == NULL)
- FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
- "SelectObject () failed on hbmpOrigStipple\n");
-
- /* Make a temporary copy of the foreground and background colors */
- bg = pGC->bgPixel;
- fg = pGC->fgPixel;
-
- /* Translate the depth-dependent colors to Win32 COLORREFs */
- TRANSLATE_COLOR(fg);
- TRANSLATE_COLOR(bg);
- SetTextColor(pGCPriv->hdc, fg);
- SetBkColor(pGCPriv->hdc, bg);
-
- while (iSpans--) {
- int width = pStipple->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pStipple->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pStipple->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pStipple->drawable.width) -
- pStipple->drawable.width)) %
- pStipple->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pStipple->drawable.width)
- width = pStipple->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdc,
- iX, fullY1,
- width, 1,
- hdcStipple,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pStipple->drawable.height) -
- pStipple->drawable.height)) %
- pStipple->drawable.height, g_copyROP[pGC->alu]);
- }
- }
-
- /* Clear the stipple HDC */
- SelectObject(hdcStipple, hbmpOrigStipple);
- DeleteDC(hdcStipple);
-
- /* Delete the device dependent stipple bitmap */
- DeleteObject(hBitmap);
-
- break;
-
- case FillStippled:
- pStipple = pGC->stipple;
- pStipplePriv = winGetPixmapPriv(pStipple);
-
- /* Create a device-dependent bitmap for the stipple */
- hBitmap = CreateDIBitmap(pGCPriv->hdcMem,
- (BITMAPINFOHEADER *) pStipplePriv->pbmih,
- CBM_INIT,
- pStipplePriv->pbBits,
- (BITMAPINFO *) pStipplePriv->pbmih,
- DIB_RGB_COLORS);
-
- /* Create a memory DC to hold the stipple */
- hdcStipple = CreateCompatibleDC(pGCPriv->hdc);
-
- /* Select the stipple bitmap into the stipple DC */
- hbmpOrigStipple = SelectObject(hdcStipple, hBitmap);
- if (hbmpOrigStipple == NULL)
- FatalError("winFillSpans () - DRAWABLE_PIXMAP - FillStippled - "
- "SelectObject () failed on hbmpOrigStipple\n");
-
- /* Make a temporary copy of the foreground and background colors */
- bg = pGC->bgPixel;
- fg = pGC->fgPixel;
-
- /* Translate the depth-dependent colors to Win32 COLORREFs */
- TRANSLATE_COLOR(fg);
- TRANSLATE_COLOR(bg);
-
- /* this is fudgy, we should only invert on the last one
- * We need to get the black/white pixels right in the
- * colormap. But yeah ! it's working..
- */
- if (pGC->bgPixel != -1 && pGC->fgPixel != -1) {
- SetTextColor(pGCPriv->hdc, fg);
- SetBkColor(pGCPriv->hdc, bg);
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
- }
- else if (pGC->bgPixel == -1) {
- SetTextColor(pGCPriv->hdc, fg);
- SetBkMode(pGCPriv->hdc, TRANSPARENT);
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
- }
- else if (pGC->fgPixel == -1) {
- SetTextColor(pGCPriv->hdc, bg);
- SetBkMode(pGCPriv->hdc, TRANSPARENT);
-#if 0
- BitBlt(hdcStipple,
- 0, 0,
- pStipple->drawable.width, pStipple->drawable.height,
- hdcStipple, 0, 0, 0x330008);
-#endif
- }
-
- while (iSpans--) {
- int width = pStipple->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pStipple->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pStipple->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pStipple->drawable.width) -
- pStipple->drawable.width)) %
- pStipple->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pStipple->drawable.width)
- width = pStipple->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdc,
- iX, fullY1,
- width, 1,
- hdcStipple,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pStipple->drawable.height) -
- pStipple->drawable.height)) %
- pStipple->drawable.height, g_copyROP[pGC->alu]);
- }
- }
-
- /* Clear the stipple HDC */
- SelectObject(hdcStipple, hbmpOrigStipple);
- DeleteDC(hdcStipple);
-
- /* Delete the device dependent stipple bitmap */
- DeleteObject(hBitmap);
-
- /* Restore the background mode */
- SetBkMode(pGCPriv->hdc, OPAQUE);
- break;
-
- case FillTiled:
-
- /* Get a pixmap pointer from the tile pointer, and fetch privates */
- pTile = (PixmapPtr) pGC->tile.pixmap;
- pTilePriv = winGetPixmapPriv(pTile);
-
- /* Select the tile into a DC */
- hbmpOrig = SelectObject(pGCPriv->hdcMem, pTilePriv->hBitmap);
- if (hbmpOrig == NULL)
- FatalError("winFillSpans - DRAWABLE_WINDOW - FillTiled - "
- "SelectObject () failed on pTilePriv->hBitmap\n");
-
- while (iSpans--) {
- int width = pTile->drawable.width;
-
- fullX1 = pPoints->x;
- fullY1 = pPoints->y;
- fullX2 = fullX1 + (int) *piWidths;
- pPoints++;
- piWidths++;
-
- if (fullY1 < extentY1 || extentY2 <= fullY1)
- continue;
-
- if (fullX1 < extentX1)
- fullX1 = extentX1;
- if (fullX2 > extentX2)
- fullX2 = extentX2;
-
- if (fullX1 >= fullX2)
- continue;
-
- for (iX = fullX1; iX < fullX2; iX += width) {
- int xoffset;
-
- if ((iX + pTile->drawable.width) > fullX2)
- width = fullX2 - iX;
- else
- width = pTile->drawable.width;
-
- if (iX == fullX1)
- xoffset =
- (fullX1 -
- (pDrawable->x +
- (pGC->patOrg.x % pTile->drawable.width) -
- pTile->drawable.width)) % pTile->drawable.width;
- else
- xoffset = 0;
-
- if (xoffset + width > pTile->drawable.width)
- width = pTile->drawable.width - xoffset;
-
- BitBlt(pGCPriv->hdc,
- iX, fullY1,
- width, 1,
- pGCPriv->hdcMem,
- xoffset,
- (fullY1 -
- (pDrawable->y +
- (pGC->patOrg.y % pTile->drawable.height) -
- pTile->drawable.height)) % pTile->drawable.height,
- g_copyROP[pGC->alu]);
- }
- }
-
- /* Push the tile pixmap out of the memory HDC */
- SelectObject(pGCPriv->hdcMem, hbmpOrig);
- break;
-
- default:
- ErrorF("winFillSpans - DRAWABLE_WINDOW - Unknown fillStyle\n");
- break;
- }
-
- /* Reset clip region */
- SelectClipRgn(pGCPriv->hdc, NULL);
- break;
-
- default:
- ErrorF("winFillSpans - Unknown drawable type\n");
- break;
- }
-}
diff --git a/xorg-server/hw/xwin/winfont.c b/xorg-server/hw/xwin/winfont.c
deleted file mode 100644
index e7356486d..000000000
--- a/xorg-server/hw/xwin/winfont.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 HAROLD L HUNT II 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 name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors: Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-#ifdef XWIN_NATIVEGDI
-/* See Porting Layer Definition - p. 32 */
-/* See mfb/mfbfont.c - mfbRealizeFont() - which is empty :) */
-Bool
-winRealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont)
-{
- BOOL fResult = TRUE;
-
- winScreenPriv(pScreen);
-
- winDebug("winRealizeFont (%p, %p)\n", pScreen, pFont);
-
- WIN_UNWRAP(RealizeFont);
- if (pScreen->RealizeFont)
- fResult = (*pScreen->RealizeFont) (pScreen, pFont);
- WIN_WRAP(RealizeFont, winRealizeFontNativeGDI);
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 32 */
-/* See mfb/mfbfont.c - mfbUnrealizeFont() - which is empty :) */
-Bool
-winUnrealizeFontNativeGDI(ScreenPtr pScreen, FontPtr pFont)
-{
- BOOL fResult = TRUE;
-
- winScreenPriv(pScreen);
-
- winDebug("winUnrealizeFont (%p, %p)\n", pScreen, pFont);
-
- WIN_UNWRAP(UnrealizeFont);
- if (pScreen->UnrealizeFont)
- fResult = (*pScreen->UnrealizeFont) (pScreen, pFont);
- WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI);
-
- return fResult;
-}
-#endif
diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
deleted file mode 100644
index aba398d0a..000000000
--- a/xorg-server/hw/xwin/wingc.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 HAROLD L HUNT II 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 name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors: Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/*
- * Local prototypes
- */
-
-static void
-
-winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
-
-static void
- winDestroyGCNativeGDI(GCPtr pGC);
-
-const GCFuncs winGCFuncs = {
- winValidateGCNativeGDI,
- miChangeGC,
- miCopyGC,
- winDestroyGCNativeGDI,
- miChangeClip,
- miDestroyClip,
- miCopyClip,
-};
-
-/* Drawing Primitives */
-const GCOps winGCOps = {
- winFillSpansNativeGDI,
- winSetSpansNativeGDI,
- miPutImage,
- miCopyArea,
- miCopyPlane,
- miPolyPoint,
- winPolyLineNativeGDI,
- miPolySegment,
- miPolyRectangle,
- miPolyArc,
- miFillPolygon,
- miPolyFillRect,
- miPolyFillArc,
- miPolyText8,
- miPolyText16,
- miImageText8,
- miImageText16,
- miImageGlyphBlt,
- miPolyGlyphBlt,
- miPushPixels,
-};
-
-/* See Porting Layer Definition - p. 45 */
-/* See mfb/mfbgc.c - mfbCreateGC() */
-/* See Strategies for Porting - pp. 15, 16 */
-Bool
-winCreateGCNativeGDI(GCPtr pGC)
-{
- winPrivGCPtr pGCPriv = NULL;
- winPrivScreenPtr pScreenPriv = NULL;
-
- winDebug ("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
-
- pGC->ops = (GCOps *) &winGCOps;
- pGC->funcs = (GCFuncs *) &winGCFuncs;
-
- /* We want all coordinates passed to spans functions to be screen relative */
- pGC->miTranslate = TRUE;
-
- /* Allocate privates for this GC */
- pGCPriv = winGetGCPriv(pGC);
- if (pGCPriv == NULL) {
- ErrorF("winCreateGCNativeGDI () - Privates pointer was NULL\n");
- return FALSE;
- }
-
- /* Create a new screen DC for the display window */
- pScreenPriv = winGetScreenPriv(pGC->pScreen);
- pGCPriv->hdc = GetDC(pScreenPriv->hwndScreen);
-
- /* Allocate a memory DC for the GC */
- pGCPriv->hdcMem = CreateCompatibleDC(pGCPriv->hdc);
-
- return TRUE;
-}
-
-static void
-winValidateGCNativeGDI(GCPtr pGC,
- unsigned long ulChanges, DrawablePtr pDrawable)
-{
- if ((ulChanges &
- (GCClipXOrigin | GCClipYOrigin | GCClipMask | GCSubwindowMode))
- || (pDrawable->serialNumber !=
- (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
- miComputeCompositeClip(pGC, pDrawable);
- }
-}
-
-/* See Porting Layer Definition - p. 46 */
-static void
-winDestroyGCNativeGDI(GCPtr pGC)
-{
- winGCPriv(pGC);
- winScreenPriv(pGC->pScreen);
-
- if (pGC->freeCompClip)
- RegionDestroy(pGC->pCompositeClip);
-
- /* Free the memory DC */
- if (pGCPriv->hdcMem != NULL) {
- DeleteDC(pGCPriv->hdcMem);
- pGCPriv->hdcMem = NULL;
- }
-
- /* Release the screen DC for the display window */
- if (pGCPriv->hdc != NULL) {
- ReleaseDC(pScreenPriv->hwndScreen, pGCPriv->hdc);
- pGCPriv->hdc = NULL;
- }
-
- /* Invalidate the GC privates pointer */
- winSetGCPriv(pGC, NULL);
-}
diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c
deleted file mode 100644
index 1076b5cc5..000000000
--- a/xorg-server/hw/xwin/wingetsp.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Harold L Hunt II
- * Alan Hourihane <alanh@fairlite.demon.co.uk>
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/* See Porting Layer Definition - p. 55 */
-void
-winGetSpansNativeGDI(DrawablePtr pDrawable,
- int nMax,
- DDXPointPtr pPoints,
- int *piWidths, int iSpans, char *pDsts)
-{
- PixmapPtr pPixmap = NULL;
- winPrivPixmapPtr pPixmapPriv = NULL;
- int iSpan;
- DDXPointPtr pPoint = NULL;
- int *piWidth = NULL;
- char *pDst = pDsts;
- HBITMAP hbmpWindow, hbmpOrig, hbmpOrig1;
- BYTE *pbWindow = NULL;
- HDC hdcMem, hdcMem1;
- ScreenPtr pScreen = pDrawable->pScreen;
-
- winScreenPriv(pScreen);
-
- /* Branch on the drawable type */
- switch (pDrawable->type) {
- case DRAWABLE_PIXMAP:
- winDebug ("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable);
-
- pPixmap = (PixmapPtr) pDrawable;
- pPixmapPriv = winGetPixmapPriv(pPixmap);
-
- /* Open a memory HDC */
- hdcMem1 = CreateCompatibleDC(NULL);
- hdcMem = CreateCompatibleDC(NULL);
-
- /* Select the drawable pixmap into a DC */
- hbmpOrig1 = SelectObject(hdcMem1, pPixmapPriv->hBitmap);
-
- if (hbmpOrig1 == NULL)
- FatalError("winGetSpans - DRAWABLE_PIXMAP - SelectObject () "
- "failed on pPixmapPriv->hBitmap\n");
-
- /* Loop through spans */
- for (iSpan = 0; iSpan < iSpans; ++iSpan) {
- pPoint = pPoints + iSpan;
- piWidth = piWidths + iSpan;
-
- hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
- pDrawable->depth,
- &pbWindow, NULL);
-
- hbmpOrig = SelectObject(hdcMem, hbmpWindow);
-
- /* Transfer the window bits to the window bitmap */
- BitBlt(hdcMem,
- 0, 0, *piWidth, 1, hdcMem1, pPoint->x, pPoint->y, SRCCOPY);
-
- memcpy(pDst,
- (char *) pbWindow,
- PixmapBytePad(*piWidth, pDrawable->depth));
-
- /* Pop the window bitmap out of the HDC and delete the bitmap */
- SelectObject(hdcMem, hbmpOrig);
- DeleteObject(hbmpWindow);
-
- /* Calculate offset of next bit destination */
- pDst += PixmapBytePad(*piWidth, pDrawable->depth);
- }
-
- /* Pop the pixmap's bitmap out of the HDC */
- SelectObject(hdcMem1, hbmpOrig1);
-
- /* Delete the HDCs */
- DeleteDC(hdcMem1);
- DeleteDC(hdcMem);
- break;
-
- case DRAWABLE_WINDOW:
-
- /* Open a memory HDC */
- hdcMem = CreateCompatibleDC(NULL);
-
- /* Loop through spans */
- for (iSpan = 0; iSpan < iSpans; ++iSpan) {
- pPoint = pPoints + iSpan;
- piWidth = piWidths + iSpan;
-
- hbmpWindow = winCreateDIBNativeGDI(*piWidth, 1,
- pDrawable->depth,
- &pbWindow, NULL);
-
- hbmpOrig = SelectObject(hdcMem, hbmpWindow);
-
- /* Transfer the window bits to the window bitmap */
- BitBlt(hdcMem,
- 0, 0,
- *piWidth, 1,
- pScreenPriv->hdcScreen, pPoint->x, pPoint->y, SRCCOPY);
-
- memcpy(pDst,
- (char *) pbWindow,
- PixmapBytePad(*piWidth, pDrawable->depth));
-
- /* Pop the window bitmap out of the HDC */
- SelectObject(hdcMem, hbmpOrig);
-
- DeleteObject(hbmpWindow);
-
- /* Calculate offset of next bit destination */
- pDst += PixmapBytePad(*piWidth, pDrawable->depth);
- }
-
- /* Delete the window bitmap */
- DeleteDC(hdcMem);
- break;
-
- default:
- FatalError("winGetSpans - Unknown drawable type\n");
- break;
- }
-}
diff --git a/xorg-server/hw/xwin/winmisc.c b/xorg-server/hw/xwin/winmisc.c
index f810ed073..bea6290c6 100644..100755
--- a/xorg-server/hw/xwin/winmisc.c
+++ b/xorg-server/hw/xwin/winmisc.c
@@ -33,21 +33,6 @@
#endif
#include "win.h"
-#ifdef XWIN_NATIVEGDI
-/* See Porting Layer Definition - p. 33 */
-/*
- * Called by clients, returns the best size for a cursor, tile, or
- * stipple, specified by class (sometimes called kind)
- */
-
-void
-winQueryBestSizeNativeGDI(int class, unsigned short *pWidth,
- unsigned short *pHeight, ScreenPtr pScreen)
-{
- winDebug ("winQueryBestSizeNativeGDI\n");
-}
-#endif
-
/*
* Count the number of one bits in a color mask.
*/
@@ -93,51 +78,3 @@ winUpdateFBPointer(ScreenPtr pScreen, void *pbits)
return TRUE;
}
-
-#ifdef XWIN_NATIVEGDI
-/*
- * Paint the window background with the specified color
- */
-
-BOOL
-winPaintBackground(HWND hwnd, COLORREF colorref)
-{
- HDC hdc;
- HBRUSH hbrush;
- RECT rect;
-
- /* Create an hdc */
- hdc = GetDC(hwnd);
- if (hdc == NULL) {
- printf("gdiWindowProc - GetDC failed\n");
- exit(1);
- }
-
- /* Create and select blue brush */
- hbrush = CreateSolidBrush(colorref);
- if (hbrush == NULL) {
- printf("gdiWindowProc - CreateSolidBrush failed\n");
- exit(1);
- }
-
- /* Get window extents */
- if (GetClientRect(hwnd, &rect) == FALSE) {
- printf("gdiWindowProc - GetClientRect failed\n");
- exit(1);
- }
-
- /* Fill window with blue brush */
- if (FillRect(hdc, &rect, hbrush) == 0) {
- printf("gdiWindowProc - FillRect failed\n");
- exit(1);
- }
-
- /* Delete blue brush */
- DeleteObject(hbrush);
-
- /* Release the hdc */
- ReleaseDC(hwnd, hdc);
-
- return TRUE;
-}
-#endif
diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
deleted file mode 100644
index 60d714dc7..000000000
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/*
- * Local function prototypes
- */
-
-static Bool
- winAllocateFBNativeGDI(ScreenPtr pScreen);
-
-static void
- winShadowUpdateNativeGDI(ScreenPtr pScreen, shadowBufPtr pBuf);
-
-static Bool
- winCloseScreenNativeGDI(ScreenPtr pScreen);
-
-static Bool
- winInitVisualsNativeGDI(ScreenPtr pScreen);
-
-static Bool
- winAdjustVideoModeNativeGDI(ScreenPtr pScreen);
-
-#if 0
-static Bool
- winBltExposedRegionsNativeGDI(ScreenPtr pScreen);
-#endif
-
-static Bool
- winActivateAppNativeGDI(ScreenPtr pScreen);
-
-static Bool
- winRedrawScreenNativeGDI(ScreenPtr pScreen);
-
-static Bool
- winRealizeInstalledPaletteNativeGDI(ScreenPtr pScreen);
-
-static Bool
- winInstallColormapNativeGDI(ColormapPtr pColormap);
-
-static Bool
- winStoreColorsNativeGDI(ColormapPtr pmap, int ndef, xColorItem * pdefs);
-
-static Bool
- winCreateColormapNativeGDI(ColormapPtr pColormap);
-
-static Bool
- winDestroyColormapNativeGDI(ColormapPtr pColormap);
-
-static Bool
-winAllocateFBNativeGDI(ScreenPtr pScreen)
-{
- FatalError("winAllocateFBNativeGDI\n");
-
- return TRUE;
-}
-
-static void
-winFreeFBNativeGDI(ScreenPtr pScreen)
-{
- FatalError("winFreeFBNativeGDI\n");
-}
-
-static Bool
-winInitScreenNativeGDI(ScreenPtr pScreen)
-{
- FatalError("winInitScreenNativeGDI\n");
-}
-
-/*
- * We wrap whatever CloseScreen procedure was specified by fb;
- * a pointer to said procedure is stored in our privates.
- */
-
-static Bool
-winCloseScreenNativeGDI(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
- winDebug ("winCloseScreenNativeGDI - Freeing screen resources\n");
-
- /* Flag that the screen is closed */
- pScreenPriv->fClosed = TRUE;
- pScreenPriv->fActive = FALSE;
-
- /*
- * NOTE: mi doesn't use a CloseScreen procedure, so we do not
- * need to call a wrapped procedure here.
- */
-
- /* Delete the window property */
- RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
-
- winDebug ("winCloseScreenNativeGDI - Destroying window\n");
-
- /* Delete tray icon, if we have one */
- if (!pScreenInfo->fNoTrayIcon && !pref.fNoTrayIcon)
- winDeleteNotifyIcon(pScreenPriv);
-
- /* Free the exit confirmation dialog box, if it exists */
- if (g_hDlgExit != NULL) {
- DestroyWindow(g_hDlgExit);
- g_hDlgExit = NULL;
- }
-
- /* Kill our window */
- if (pScreenPriv->hwndScreen) {
- DestroyWindow(pScreenPriv->hwndScreen);
- pScreenPriv->hwndScreen = NULL;
- }
-
- /* Invalidate our screeninfo's pointer to the screen */
- pScreenInfo->pScreen = NULL;
-
- /* Free the screen privates for this screen */
- free(pScreenPriv);
-
- winDebug ("winCloseScreenNativeGDI - Returning\n");
-
- return TRUE;
-}
-
-static void
-winShadowUpdateNativeGDI(ScreenPtr pScreen, shadowBufPtr pBuf)
-{
- FatalError("winShadowUpdateNativeGDI\n");
- return;
-}
-
-static Bool
-winInitVisualsNativeGDI(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
- /* Set the bitsPerRGB and bit masks */
- switch (pScreenInfo->dwDepth) {
- case 24:
- pScreenPriv->dwBitsPerRGB = 8;
- pScreenPriv->dwRedMask = 0x00FF0000;
- pScreenPriv->dwGreenMask = 0x0000FF00;
- pScreenPriv->dwBlueMask = 0x000000FF;
- break;
-
- case 16:
- pScreenPriv->dwBitsPerRGB = 6;
- pScreenPriv->dwRedMask = 0xF800;
- pScreenPriv->dwGreenMask = 0x07E0;
- pScreenPriv->dwBlueMask = 0x001F;
- break;
-
- case 15:
- pScreenPriv->dwBitsPerRGB = 5;
- pScreenPriv->dwRedMask = 0x7C00;
- pScreenPriv->dwGreenMask = 0x03E0;
- pScreenPriv->dwBlueMask = 0x001F;
- break;
-
- case 8:
- pScreenPriv->dwBitsPerRGB = 8;
- pScreenPriv->dwRedMask = 0;
- pScreenPriv->dwGreenMask = 0;
- pScreenPriv->dwBlueMask = 0;
- break;
-
- default:
- ErrorF("winInitVisualsNativeGDI - Unknown screen depth\n");
- return FALSE;
- break;
- }
-
- /* Tell the user how many bits per RGB we are using */
- winDebug ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
- (int) pScreenPriv->dwBitsPerRGB);
-
- /* Create a single visual according to the Windows screen depth */
- switch (pScreenInfo->dwDepth) {
- case 24:
- case 16:
- case 15:
- if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
- TrueColorMask,
- pScreenPriv->dwBitsPerRGB,
- TrueColor,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask)) {
- ErrorF("winInitVisuals - miSetVisualTypesAndMasks failed\n");
- return FALSE;
- }
- break;
-
- case 8:
- winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
- if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
- StaticColorMask,
- pScreenPriv->dwBitsPerRGB,
- StaticColor,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask)) {
- ErrorF("winInitVisuals - miSetVisualTypesAndMasks failed\n");
- return FALSE;
- }
- break;
-
- default:
- ErrorF("winInitVisualsNativeGDI - Unknown screen depth\n");
- return FALSE;
- }
-
- winDebug ("winInitVisualsNativeGDI - Returning\n");
-
- return TRUE;
-}
-
-/* Adjust the video mode */
-static Bool
-winAdjustVideoModeNativeGDI(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
- HDC hdc = NULL;
- DWORD dwBPP;
-
- hdc = GetDC(NULL);
-
- /* We're in serious trouble if we can't get a DC */
- if (hdc == NULL) {
- ErrorF("winAdjustVideoModeNativeGDI - GetDC () failed\n");
- return FALSE;
- }
-
- /* Query GDI for current display depth */
- dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
- pScreenInfo->dwDepth = GetDeviceCaps(hdc, PLANES);
-
- switch (pScreenInfo->dwDepth) {
- case 24:
- case 16:
- case 15:
- case 8:
- break;
- default:
- if (dwBPP == 32)
- pScreenInfo->dwDepth = 24;
- else
- pScreenInfo->dwDepth = dwBPP;
- break;
- }
-
- /* GDI cannot change the screen depth, so we'll use GDI's depth */
- pScreenInfo->dwBPP = dwBPP;
-
- /* Release our DC */
- ReleaseDC(NULL, hdc);
-
- return TRUE;
-}
-
-static Bool
-winActivateAppNativeGDI(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
-
- /*
- * Are we active?
- * Are we fullscreen?
- */
- if (pScreenPriv != NULL
- && pScreenPriv->fActive
- && pScreenPriv->pScreenInfo && pScreenPriv->pScreenInfo->fFullScreen) {
- /*
- * Activating, attempt to bring our window
- * to the top of the display
- */
- ShowWindow(pScreenPriv->hwndScreen, SW_RESTORE);
- }
-
- /*
- * Are we inactive?
- * Are we fullscreen?
- */
- if (pScreenPriv != NULL
- && !pScreenPriv->fActive
- && pScreenPriv->pScreenInfo && pScreenPriv->pScreenInfo->fFullScreen) {
- /*
- * Deactivating, stuff our window onto the
- * task bar.
- */
- ShowWindow(pScreenPriv->hwndScreen, SW_MINIMIZE);
- }
-
- return TRUE;
-}
-
-HBITMAP
-winCreateDIBNativeGDI(int iWidth, int iHeight, int iDepth,
- BYTE ** ppbBits, BITMAPINFO ** ppbmi)
-{
- BITMAPINFOHEADER *pbmih = NULL;
- HBITMAP hBitmap = NULL;
- BITMAPINFO *pbmi = NULL;
-
- /* Don't create an invalid bitmap */
- if (iWidth == 0 || iHeight == 0 || iDepth == 0) {
- ErrorF("\nwinCreateDIBNativeGDI - Invalid specs w %d h %d d %d\n\n",
- iWidth, iHeight, iDepth);
- return NULL;
- }
-
- /* Allocate bitmap info header */
- pbmih = malloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
- if (pbmih == NULL) {
- ErrorF("winCreateDIBNativeGDI - malloc () failed\n");
- return FALSE;
- }
- ZeroMemory(pbmih, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD));
-
- /* Describe bitmap to be created */
- pbmih->biSize = sizeof(BITMAPINFOHEADER);
- pbmih->biWidth = iWidth;
- pbmih->biHeight = -iHeight;
- pbmih->biPlanes = 1;
- pbmih->biBitCount = iDepth;
- pbmih->biCompression = BI_RGB;
- /*
- pbmih->biSizeImage = 0;
- pbmih->biXPelsPerMeter = 0;
- pbmih->biYPelsPerMeter = 0;
- pbmih->biClrUsed = 0;
- pbmih->biClrImportant = 0;
- */
-
- /* Setup color table for mono DIBs */
- if (iDepth == 1) {
- pbmi = (BITMAPINFO *) pbmih;
- pbmi->bmiColors[1].rgbBlue = 255;
- pbmi->bmiColors[1].rgbGreen = 255;
- pbmi->bmiColors[1].rgbRed = 255;
- }
-
- /* Create a DIB with a bit pointer */
- hBitmap = CreateDIBSection(NULL,
- (BITMAPINFO *) pbmih,
- DIB_RGB_COLORS, (void **) ppbBits, NULL, 0);
- if (hBitmap == NULL) {
- ErrorF("winCreateDIBNativeGDI - CreateDIBSection () failed\n");
- return NULL;
- }
-
- /* Free the bitmap info header memory */
- if (ppbmi != NULL) {
- /* Store the address of the BMIH in the ppbmih parameter */
- *ppbmi = (BITMAPINFO *) pbmih;
- }
- else {
- free(pbmih);
- pbmih = NULL;
- }
-
- return hBitmap;
-}
-
-#if 0
-static Bool
-winBltExposedRegionsNativeGDI(ScreenPtr pScreen)
-{
-
- return TRUE;
-}
-#endif
-
-static Bool
-winRedrawScreenNativeGDI(ScreenPtr pScreen)
-{
- FatalError("winRedrawScreenNativeGDI\n");
- return TRUE;
-}
-
-static Bool
-winRealizeInstalledPaletteNativeGDI(ScreenPtr pScreen)
-{
- FatalError("winRealizeInstalledPaletteNativeGDI\n");
- return TRUE;
-}
-
-static Bool
-winInstallColormapNativeGDI(ColormapPtr pColormap)
-{
- FatalError("winInstallColormapNativeGDI\n");
- return TRUE;
-}
-
-static Bool
-winStoreColorsNativeGDI(ColormapPtr pmap, int ndef, xColorItem * pdefs)
-{
- FatalError("winStoreColorsNativeGDI\n");
- return TRUE;
-}
-
-static Bool
-winCreateColormapNativeGDI(ColormapPtr pColormap)
-{
- FatalError("winCreateColormapNativeGDI\n");
- return TRUE;
-}
-
-static Bool
-winDestroyColormapNativeGDI(ColormapPtr pColormap)
-{
- FatalError("winDestroyColormapNativeGDI\n");
- return TRUE;
-}
-
-/* Set engine specific funtions */
-Bool
-winSetEngineFunctionsNativeGDI(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
- /* Set our pointers */
- pScreenPriv->pwinAllocateFB = winAllocateFBNativeGDI;
- pScreenPriv->pwinFreeFB = winFreeFBNativeGDI;
- pScreenPriv->pwinShadowUpdate = winShadowUpdateNativeGDI;
- pScreenPriv->pwinInitScreen = winInitScreenNativeGDI;
- pScreenPriv->pwinCloseScreen = winCloseScreenNativeGDI;
- pScreenPriv->pwinInitVisuals = winInitVisualsNativeGDI;
- pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModeNativeGDI;
- if (pScreenInfo->fFullScreen)
- pScreenPriv->pwinCreateBoundingWindow =
- winCreateBoundingWindowFullScreen;
- else
- pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
- pScreenPriv->pwinFinishScreenInit = winFinishScreenInitNativeGDI;
- /*
- * WARNING: Do not set the BltExposedRegions procedure pointer to anything
- * other than NULL until a working painting procedure is in place.
- * Else, winWindowProc will get stuck in an infinite loop because
- * Windows expects the BeginPaint and EndPaint functions to be called
- * before a WM_PAINT message can be removed from the queue. We are
- * using NULL here as a signal for winWindowProc that it should
- * not signal that the WM_PAINT message has been processed.
- */
- pScreenPriv->pwinBltExposedRegions = NULL;
- pScreenPriv->pwinActivateApp = winActivateAppNativeGDI;
- pScreenPriv->pwinRedrawScreen = winRedrawScreenNativeGDI;
- pScreenPriv->pwinRealizeInstalledPalette =
- winRealizeInstalledPaletteNativeGDI;
- pScreenPriv->pwinInstallColormap = winInstallColormapNativeGDI;
- pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;
- pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;
- pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;
- pScreenPriv->pwinHotKeyAltTab =
- (winHotKeyAltTabProcPtr) (void (*)(void)) NoopDDA;
-
- return TRUE;
-}
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
deleted file mode 100644
index b5a69cad8..000000000
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ /dev/null
@@ -1,616 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Dakshinamurthy Karra
- * Suhaib M Siddiqi
- * Peter Busch
- * Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/*
- * Local function prototypes
- */
-
-static Bool
- winAllocateFBPrimaryDD(ScreenPtr pScreen);
-
-static Bool
- winCloseScreenPrimaryDD(ScreenPtr pScreen);
-
-static Bool
- winInitVisualsPrimaryDD(ScreenPtr pScreen);
-
-static Bool
- winAdjustVideoModePrimaryDD(ScreenPtr pScreen);
-
-static Bool
- winActivateAppPrimaryDD(ScreenPtr pScreen);
-
-static Bool
- winHotKeyAltTabPrimaryDD(ScreenPtr pScreen);
-
-/*
- * Create a DirectDraw primary surface
- */
-
-static Bool
-winAllocateFBPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
- HRESULT ddrval = DD_OK;
- DDSURFACEDESC ddsd;
- DDSURFACEDESC *pddsdPrimary = NULL;
- DDSURFACEDESC *pddsdOffscreen = NULL;
- RECT rcClient;
-
- winDebug ("winAllocateFBPrimaryDD\n");
-
- /* Get client area location in screen coords */
- GetClientRect(pScreenPriv->hwndScreen, &rcClient);
- MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) &rcClient, 2);
-
- /* Create a DirectDraw object, store the address at lpdd */
- ddrval = (*g_fpDirectDrawCreate) (NULL, &pScreenPriv->pdd, NULL);
- if (ddrval != DD_OK)
- FatalError("winAllocateFBPrimaryDD - Could not start DirectDraw\n");
-
- /* Get a DirectDraw2 interface pointer */
- ddrval = IDirectDraw_QueryInterface(pScreenPriv->pdd,
- &IID_IDirectDraw2,
- (LPVOID *) &pScreenPriv->pdd2);
- if (FAILED(ddrval)) {
- ErrorF("winAllocateFBShadowDD - Failed DD2 query: %08x\n",
- (unsigned int) ddrval);
- return FALSE;
- }
-
- winDebug ("winAllocateFBPrimaryDD - Created and initialized DD\n");
-
- /* Are we windowed or fullscreen? */
- if (pScreenInfo->fFullScreen) {
- /* Full screen mode */
- ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
- pScreenPriv->hwndScreen,
- DDSCL_FULLSCREEN
- | DDSCL_EXCLUSIVE);
- if (FAILED(ddrval))
- FatalError("winAllocateFBPrimaryDD - Could not set "
- "cooperative level\n");
-
- /* Change the video mode to the mode requested */
- ddrval = IDirectDraw2_SetDisplayMode(pScreenPriv->pdd2,
- pScreenInfo->dwWidth,
- pScreenInfo->dwHeight,
- pScreenInfo->dwBPP,
- pScreenInfo->dwRefreshRate, 0);
- if (FAILED(ddrval))
- FatalError("winAllocateFBPrimaryDD - Could not set "
- "full screen display mode\n");
- }
- else {
- /* Windowed mode */
- ddrval = IDirectDraw2_SetCooperativeLevel(pScreenPriv->pdd2,
- pScreenPriv->hwndScreen,
- DDSCL_NORMAL);
- if (FAILED(ddrval))
- FatalError("winAllocateFBPrimaryDD - Could not set "
- "cooperative level\n");
- }
-
- /* Describe the primary surface */
- ZeroMemory(&ddsd, sizeof(ddsd));
- ddsd.dwSize = sizeof(ddsd);
- ddsd.dwFlags = DDSD_CAPS;
- ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
-
- /* Create the primary surface */
- ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
- &ddsd, &pScreenPriv->pddsPrimary, NULL);
- if (FAILED(ddrval))
- FatalError("winAllocateFBPrimaryDD - Could not create primary "
- "surface %08x\n", (unsigned int) ddrval);
-
- winDebug ("winAllocateFBPrimaryDD - Created primary\n");
-
- /* Allocate a DD surface description for our screen privates */
- pddsdPrimary = pScreenPriv->pddsdPrimary = malloc(sizeof(DDSURFACEDESC));
- if (pddsdPrimary == NULL)
- FatalError("winAllocateFBPrimaryDD - Could not allocate surface "
- "description memory\n");
- ZeroMemory(pddsdPrimary, sizeof(*pddsdPrimary));
- pddsdPrimary->dwSize = sizeof(*pddsdPrimary);
-
- /* Describe the offscreen surface to be created */
- /*
- * NOTE: Do not use a DDSCAPS_VIDEOMEMORY surface,
- * as drawing, locking, and unlocking take forever
- * with video memory surfaces. In addition,
- * video memory is a somewhat scarce resource,
- * so you shouldn't be allocating video memory when
- * you have the option of using system memory instead.
- */
- ZeroMemory(&ddsd, sizeof(ddsd));
- ddsd.dwSize = sizeof(ddsd);
- ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
- ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY;
- ddsd.dwHeight = pScreenInfo->dwHeight;
- ddsd.dwWidth = pScreenInfo->dwWidth;
-
- /* Create the shadow surface */
- ddrval = IDirectDraw2_CreateSurface(pScreenPriv->pdd2,
- &ddsd,
- &pScreenPriv->pddsOffscreen, NULL);
- if (ddrval != DD_OK)
- FatalError("winAllocateFBPrimaryDD - Could not create shadow "
- "surface\n");
-
- winDebug ("winAllocateFBPrimaryDD - Created offscreen\n");
-
- /* Allocate a DD surface description for our screen privates */
- pddsdOffscreen = pScreenPriv->pddsdOffscreen
- = malloc(sizeof(DDSURFACEDESC));
- if (pddsdOffscreen == NULL)
- FatalError("winAllocateFBPrimaryDD - Could not allocate surface "
- "description memory\n");
- ZeroMemory(pddsdOffscreen, sizeof(*pddsdOffscreen));
- pddsdOffscreen->dwSize = sizeof(*pddsdOffscreen);
-
- winDebug ("winAllocateFBPrimaryDD - Locking primary\n");
-
- /* Lock the primary surface */
- ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsPrimary,
- pScreenInfo->
- fFullScreen ? NULL : &rcClient,
- pddsdPrimary, DDLOCK_WAIT, NULL);
- if (ddrval != DD_OK || pddsdPrimary->lpSurface == NULL)
- FatalError("winAllocateFBPrimaryDD - Could not lock "
- "primary surface\n");
-
- winDebug ("winAllocateFBPrimaryDD - Locked primary\n");
-
- /* We don't know how to deal with anything other than RGB */
- if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))
- FatalError("winAllocateFBPrimaryDD - Color format other than RGB\n");
-
- /* Grab the pitch from the surface desc */
- pScreenInfo->dwStride = (pddsdPrimary->u1.lPitch * 8)
- / pScreenInfo->dwBPP;
-
- /* Save the pointer to our surface memory */
- pScreenInfo->pfb = pddsdPrimary->lpSurface;
-
- /* Grab the color depth and masks from the surface description */
- pScreenPriv->dwRedMask = pddsdPrimary->ddpfPixelFormat.u2.dwRBitMask;
- pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;
- pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;
-
- winDebug ("winAllocateFBPrimaryDD - Returning\n");
-
- return TRUE;
-}
-
-static void
-winFreeFBPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
- /* Free the offscreen surface, if there is one */
- if (pScreenPriv->pddsOffscreen) {
- IDirectDrawSurface2_Unlock(pScreenPriv->pddsOffscreen, NULL);
- IDirectDrawSurface2_Release(pScreenPriv->pddsOffscreen);
- pScreenPriv->pddsOffscreen = NULL;
- }
-
- /* Release the primary surface, if there is one */
- if (pScreenPriv->pddsPrimary) {
- IDirectDrawSurface2_Unlock(pScreenPriv->pddsPrimary, NULL);
- IDirectDrawSurface2_Release(pScreenPriv->pddsPrimary);
- pScreenPriv->pddsPrimary = NULL;
- }
-
- /* Free the DirectDraw object, if there is one */
- if (pScreenPriv->pdd) {
- IDirectDraw2_RestoreDisplayMode(pScreenPriv->pdd);
- IDirectDraw2_Release(pScreenPriv->pdd);
- pScreenPriv->pdd = NULL;
- }
-
- /* Invalidate the ScreenInfo's fb pointer */
- pScreenInfo->pfb = NULL;
-}
-
-static Bool
-winInitScreenPrimaryDD(ScreenPtr pScreen)
-{
- return winAllocateFBPrimaryDD(pScreen);
-}
-
-/*
- * Call the wrapped CloseScreen function.
- *
- * Free our resources and private structures.
- */
-
-static Bool
-winCloseScreenPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
- Bool fReturn;
-
- ErrorF("winCloseScreenPrimaryDD - Freeing screen resources\n");
-
- /* Flag that the screen is closed */
- pScreenPriv->fClosed = TRUE;
- pScreenPriv->fActive = FALSE;
-
- /* Call the wrapped CloseScreen procedure */
- WIN_UNWRAP(CloseScreen);
- if (pScreen->CloseScreen)
- fReturn = (*pScreen->CloseScreen) (pScreen);
-
- /* Delete the window property */
- RemoveProp(pScreenPriv->hwndScreen, WIN_SCR_PROP);
-
- winFreeFBPrimaryDD(pScreen);
-
- /* Delete tray icon, if we have one */
- if (!pScreenInfo->fNoTrayIcon && !pref.fNoTrayIcon)
- winDeleteNotifyIcon(pScreenPriv);
-
- /* Free the exit confirmation dialog box, if it exists */
- if (g_hDlgExit != NULL) {
- DestroyWindow(g_hDlgExit);
- g_hDlgExit = NULL;
- }
-
- /* Kill our window */
- if (pScreenPriv->hwndScreen) {
- DestroyWindow(pScreenPriv->hwndScreen);
- pScreenPriv->hwndScreen = NULL;
- }
-
- /* Kill our screeninfo's pointer to the screen */
- pScreenInfo->pScreen = NULL;
-
- /* Free the screen privates for this screen */
- free((void *) pScreenPriv);
-
- return fReturn;
-}
-
-/*
- * Tell mi what sort of visuals we need.
- *
- * Generally we only need one visual, as our screen can only
- * handle one format at a time, I believe. You may want
- * to verify that last sentence.
- */
-
-static Bool
-winInitVisualsPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
- DWORD dwRedBits, dwGreenBits, dwBlueBits;
-
- /* Count the number of ones in each color mask */
- dwRedBits = winCountBits(pScreenPriv->dwRedMask);
- dwGreenBits = winCountBits(pScreenPriv->dwGreenMask);
- dwBlueBits = winCountBits(pScreenPriv->dwBlueMask);
-
- /* Store the maximum number of ones in a color mask as the bitsPerRGB */
- if (dwRedBits > dwGreenBits && dwRedBits > dwBlueBits)
- pScreenPriv->dwBitsPerRGB = dwRedBits;
- else if (dwGreenBits > dwRedBits && dwGreenBits > dwBlueBits)
- pScreenPriv->dwBitsPerRGB = dwGreenBits;
- else
- pScreenPriv->dwBitsPerRGB = dwBlueBits;
-
- winDebug ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",
- (unsigned int) pScreenPriv->dwRedMask,
- (unsigned int) pScreenPriv->dwGreenMask,
- (unsigned int) pScreenPriv->dwBlueMask,
- (int) pScreenPriv->dwBitsPerRGB);
-
- /* Create a single visual according to the Windows screen depth */
- switch (pScreenInfo->dwDepth) {
- case 24:
- case 16:
- case 15:
- if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
- TrueColorMask,
- pScreenPriv->dwBitsPerRGB,
- TrueColor,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask)) {
- ErrorF("winInitVisualsPrimaryDD - "
- "miSetVisualTypesAndMasks failed\n");
- return FALSE;
- }
- break;
-
- case 8:
- winDebug("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
- if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
- PseudoColorMask,
- pScreenPriv->dwBitsPerRGB,
- PseudoColor,
- pScreenPriv->dwRedMask,
- pScreenPriv->dwGreenMask,
- pScreenPriv->dwBlueMask)) {
- ErrorF("winInitVisualsPrimaryDD - "
- "miSetVisualTypesAndMasks failed\n");
- return FALSE;
- }
- winDebug("winInitVisualsPrimaryDD - Returned from "
- "miSetVisualTypesAndMasks\n");
- break;
-
- default:
- ErrorF("winInitVisualsPrimaryDD - Unknown screen depth\n");
- return FALSE;
- }
-
- winDebug ("winInitVisualsPrimaryDD - Returning\n");
-
- return TRUE;
-}
-
-static Bool
-winAdjustVideoModePrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
- HDC hdc = NULL;
- DWORD dwBPP;
-
- /* We're in serious trouble if we can't get a DC */
- hdc = GetDC(NULL);
- if (hdc == NULL) {
- ErrorF("winAdjustVideoModePrimaryDD - GetDC failed\n");
- return FALSE;
- }
-
- /* Query GDI for current display depth */
- dwBPP = GetDeviceCaps(hdc, BITSPIXEL);
-
- /* DirectDraw can only change the depth in fullscreen mode */
- if (!(pScreenInfo->fFullScreen && (pScreenInfo->dwBPP != WIN_DEFAULT_BPP))) {
- /* Otherwise, We'll use GDI's depth */
- pScreenInfo->dwBPP = dwBPP;
- }
-
- /* Release our DC */
- ReleaseDC(NULL, hdc);
-
- return TRUE;
-}
-
-/*
- * We need to blit our offscreen fb to
- * the screen when we are activated, and we need to point
- * the fb code back to the primary surface memory.
- */
-
-static Bool
-winActivateAppPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- RECT rcSrc, rcClient;
- HRESULT ddrval = DD_OK;
-
- /* Check for errors */
- if (pScreenPriv == NULL
- || pScreenPriv->pScreenInfo == NULL
- || pScreenPriv->pddsPrimary == NULL
- || pScreenPriv->pddsOffscreen == NULL)
- return FALSE;
-
- /* Check for do-nothing */
- if (!pScreenPriv->fActive)
- return TRUE;
-
- /* We are activating */
- ddrval = IDirectDrawSurface2_IsLost(pScreenPriv->pddsOffscreen);
- if (ddrval == DD_OK) {
- IDirectDrawSurface2_Unlock(pScreenPriv->pddsOffscreen, NULL);
- /*
- * We don't check for an error from Unlock, because it
- * doesn't matter if the Unlock failed.
- */
- }
-
- /* Restore both surfaces, just cause I like it that way */
- IDirectDrawSurface2_Restore(pScreenPriv->pddsOffscreen);
- IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
-
- /* Get client area in screen coords */
- GetClientRect(pScreenPriv->hwndScreen, &rcClient);
- MapWindowPoints(pScreenPriv->hwndScreen,
- HWND_DESKTOP, (LPPOINT) &rcClient, 2);
-
- /* Setup a source rectangle */
- rcSrc.left = 0;
- rcSrc.top = 0;
- rcSrc.right = pScreenPriv->pScreenInfo->dwWidth;
- rcSrc.bottom = pScreenPriv->pScreenInfo->dwHeight;
-
- ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsPrimary,
- &rcClient,
- pScreenPriv->pddsOffscreen,
- &rcSrc, DDBLT_WAIT, NULL);
- if (ddrval != DD_OK)
- FatalError("winActivateAppPrimaryDD () - Failed blitting offscreen "
- "surface to primary surface %08x\n", (unsigned int) ddrval);
-
- /* Lock the primary surface */
- ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsPrimary,
- &rcClient,
- pScreenPriv->pddsdPrimary,
- DDLOCK_WAIT, NULL);
- if (ddrval != DD_OK || pScreenPriv->pddsdPrimary->lpSurface == NULL)
- FatalError("winActivateAppPrimaryDD () - Could not lock "
- "primary surface\n");
-
- /* Notify FB of the new memory pointer */
- winUpdateFBPointer(pScreen, pScreenPriv->pddsdPrimary->lpSurface);
-
- /*
- * Register the Alt-Tab combo as a hotkey so we can copy
- * the primary framebuffer before the display mode changes
- */
- RegisterHotKey(pScreenPriv->hwndScreen, 1, MOD_ALT, 9);
-
- return TRUE;
-}
-
-/*
- * Handle the Alt+Tab hotkey.
- *
- * We need to save the primary fb to an offscreen fb when
- * we get deactivated, and point the fb code at the offscreen
- * fb for the duration of the deactivation.
- */
-
-static Bool
-winHotKeyAltTabPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- HRESULT ddrval = DD_OK;
-
- winDebug ("\nwinHotKeyAltTabPrimaryDD\n\n");
-
- /* Alt+Tab was pressed, we will lose focus very soon */
- pScreenPriv->fActive = FALSE;
-
- /* Check for error conditions */
- if (pScreenPriv->pddsPrimary == NULL || pScreenPriv->pddsOffscreen == NULL)
- return FALSE;
-
- /* Did we loose the primary surface? */
- ddrval = IDirectDrawSurface2_IsLost(pScreenPriv->pddsPrimary);
- if (ddrval == DD_OK) {
- ddrval = IDirectDrawSurface2_Unlock(pScreenPriv->pddsPrimary, NULL);
- if (FAILED(ddrval))
- FatalError("winHotKeyAltTabPrimaryDD - Failed unlocking primary "
- "surface\n");
- }
-
- /* Blit the primary surface to the offscreen surface */
- ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsOffscreen, NULL, /* should be rcDest */
- pScreenPriv->pddsPrimary,
- NULL, DDBLT_WAIT, NULL);
- if (ddrval == DDERR_SURFACELOST) {
- IDirectDrawSurface2_Restore(pScreenPriv->pddsOffscreen);
- IDirectDrawSurface2_Restore(pScreenPriv->pddsPrimary);
-
- /* Blit the primary surface to the offscreen surface */
- ddrval = IDirectDrawSurface2_Blt(pScreenPriv->pddsOffscreen,
- NULL,
- pScreenPriv->pddsPrimary,
- NULL, DDBLT_WAIT, NULL);
- if (FAILED(ddrval))
- FatalError("winHotKeyAltTabPrimaryDD - Failed blitting primary "
- "surface to offscreen surface: %08x\n",
- (unsigned int) ddrval);
- }
- else {
- FatalError("winHotKeyAltTabPrimaryDD - Unknown error from "
- "Blt: %08dx\n", (unsigned int) ddrval);
- }
-
- /* Lock the offscreen surface */
- ddrval = IDirectDrawSurface2_Lock(pScreenPriv->pddsOffscreen,
- NULL,
- pScreenPriv->pddsdOffscreen,
- DDLOCK_WAIT, NULL);
- if (ddrval != DD_OK || pScreenPriv->pddsdPrimary->lpSurface == NULL)
- FatalError("winHotKeyAltTabPrimaryDD - Could not lock "
- "offscreen surface\n");
-
- /* Notify FB of the new memory pointer */
- winUpdateFBPointer(pScreen, pScreenPriv->pddsdOffscreen->lpSurface);
-
- /* Unregister our hotkey */
- UnregisterHotKey(pScreenPriv->hwndScreen, 1);
-
- return TRUE;
-}
-
-/* Set engine specific functions */
-Bool
-winSetEngineFunctionsPrimaryDD(ScreenPtr pScreen)
-{
- winScreenPriv(pScreen);
- winScreenInfo *pScreenInfo = pScreenPriv->pScreenInfo;
-
- /* Set our pointers */
- pScreenPriv->pwinAllocateFB = winAllocateFBPrimaryDD;
- pScreenPriv->pwinFreeFB = winFreeFBPrimaryDD;
- pScreenPriv->pwinShadowUpdate =
- (winShadowUpdateProcPtr) (void (*)(void)) NoopDDA;
- pScreenPriv->pwinInitScreen = winInitScreenPrimaryDD;
- pScreenPriv->pwinCloseScreen = winCloseScreenPrimaryDD;
- pScreenPriv->pwinInitVisuals = winInitVisualsPrimaryDD;
- pScreenPriv->pwinAdjustVideoMode = winAdjustVideoModePrimaryDD;
- if (pScreenInfo->fFullScreen)
- pScreenPriv->pwinCreateBoundingWindow =
- winCreateBoundingWindowFullScreen;
- else
- pScreenPriv->pwinCreateBoundingWindow = winCreateBoundingWindowWindowed;
- pScreenPriv->pwinFinishScreenInit = winFinishScreenInitFB;
- pScreenPriv->pwinBltExposedRegions =
- (winBltExposedRegionsProcPtr) (void (*)(void)) NoopDDA;
- pScreenPriv->pwinActivateApp = winActivateAppPrimaryDD;
- pScreenPriv->pwinRedrawScreen = NULL;
- pScreenPriv->pwinRealizeInstalledPalette = NULL;
- pScreenPriv->pwinInstallColormap = NULL;
- pScreenPriv->pwinStoreColors = NULL;
- pScreenPriv->pwinCreateColormap = NULL;
- pScreenPriv->pwinDestroyColormap = NULL;
- pScreenPriv->pwinHotKeyAltTab = winHotKeyAltTabPrimaryDD;
- pScreenPriv->pwinCreatePrimarySurface =
- (winCreatePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
- pScreenPriv->pwinReleasePrimarySurface =
- (winReleasePrimarySurfaceProcPtr) (void (*)(void)) NoopDDA;
-#ifdef XWIN_MULTIWINDOW
- pScreenPriv->pwinFinishCreateWindowsWindow =
- (winFinishCreateWindowsWindowProcPtr) (void (*)(void)) NoopDDA;
-#endif
-
- return TRUE;
-}
diff --git a/xorg-server/hw/xwin/winpixmap.c b/xorg-server/hw/xwin/winpixmap.c
deleted file mode 100644
index 763d60e8c..000000000
--- a/xorg-server/hw/xwin/winpixmap.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: drewry, september 1986
- * Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/*
- * Local prototypes
- */
-
-#if 0
-static void
- winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw);
-
-static void
- winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh);
-
-static void
-
-winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix,
- int xrot, int yrot);
-#endif
-
-/* See Porting Layer Definition - p. 34 */
-/* See mfb/mfbpixmap.c - mfbCreatePixmap() */
-PixmapPtr
-winCreatePixmapNativeGDI(ScreenPtr pScreen,
- int iWidth, int iHeight,
- int iDepth, unsigned usage_hint)
-{
- winPrivPixmapPtr pPixmapPriv = NULL;
- PixmapPtr pPixmap = NULL;
-
- /* Allocate pixmap memory */
- pPixmap = AllocatePixmap(pScreen, 0);
- if (!pPixmap) {
- ErrorF("winCreatePixmapNativeGDI () - Couldn't allocate a pixmap\n");
- return NullPixmap;
- }
-
- winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n",
- iWidth, iHeight, iDepth, usage_hint,
- PixmapBytePad(iWidth, iDepth));
-
- /* Setup pixmap values */
- pPixmap->drawable.type = DRAWABLE_PIXMAP;
- pPixmap->drawable.class = 0;
- pPixmap->drawable.pScreen = pScreen;
- pPixmap->drawable.depth = iDepth;
- pPixmap->drawable.bitsPerPixel = BitsPerPixel(iDepth);
- pPixmap->drawable.id = 0;
- pPixmap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- pPixmap->drawable.x = 0;
- pPixmap->drawable.y = 0;
- pPixmap->drawable.width = iWidth;
- pPixmap->drawable.height = iHeight;
- pPixmap->devKind = 0;
- pPixmap->refcnt = 1;
- pPixmap->devPrivate.ptr = NULL;
- pPixmap->usage_hint = usage_hint;
-
- /* Pixmap privates are allocated by AllocatePixmap */
- pPixmapPriv = winGetPixmapPriv(pPixmap);
-
- /* Initialize pixmap privates */
- pPixmapPriv->hBitmap = NULL;
- pPixmapPriv->hdcSelected = NULL;
- pPixmapPriv->pbBits = NULL;
- pPixmapPriv->dwScanlineBytes = PixmapBytePad(iWidth, iDepth);
-
- /* Check for zero width or height pixmaps */
- if (iWidth == 0 || iHeight == 0) {
- /* Don't allocate a real pixmap, just set fields and return */
- return pPixmap;
- }
-
- /* Create a DIB for the pixmap */
- pPixmapPriv->hBitmap = winCreateDIBNativeGDI(iWidth, iHeight, iDepth,
- &pPixmapPriv->pbBits,
- (BITMAPINFO **) &pPixmapPriv->
- pbmih);
-
- winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
- "screen: %08x\n",
- pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
-
- return pPixmap;
-}
-
-/*
- * See Porting Layer Definition - p. 35
- *
- * See mfb/mfbpixmap.c - mfbDestroyPixmap()
- */
-
-Bool
-winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
-{
- winPrivPixmapPtr pPixmapPriv = NULL;
-
- winDebug("winDestroyPixmapNativeGDI ()\n");
-
- /* Bail early if there is not a pixmap to destroy */
- if (pPixmap == NULL) {
- ErrorF("winDestroyPixmapNativeGDI () - No pixmap to destroy\n");
- return TRUE;
- }
-
- /* Get a handle to the pixmap privates */
- pPixmapPriv = winGetPixmapPriv(pPixmap);
-
- winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
- pPixmapPriv->hBitmap);
-
- /* Decrement reference count, return if nonzero */
- --pPixmap->refcnt;
- if (pPixmap->refcnt != 0)
- return TRUE;
-
- /* Free GDI bitmap */
- if (pPixmapPriv->hBitmap)
- DeleteObject(pPixmapPriv->hBitmap);
-
- /* Free the bitmap info header memory */
- free(pPixmapPriv->pbmih);
- pPixmapPriv->pbmih = NULL;
-
- /* Free the pixmap memory */
- free(pPixmap);
- pPixmap = NULL;
-
- return TRUE;
-}
-
-/*
- * Not used yet
- */
-
-Bool
-winModifyPixmapHeaderNativeGDI(PixmapPtr pPixmap,
- int iWidth, int iHeight,
- int iDepth,
- int iBitsPerPixel, int devKind, void *pPixData)
-{
- FatalError("winModifyPixmapHeaderNativeGDI ()\n");
- return TRUE;
-}
-
diff --git a/xorg-server/hw/xwin/winpolyline.c b/xorg-server/hw/xwin/winpolyline.c
deleted file mode 100644
index ce7c8de28..000000000
--- a/xorg-server/hw/xwin/winpolyline.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- *Copyright (C) 2001-2004 Harold L Hunt II All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 HAROLD L HUNT II 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 name of Harold L Hunt II
- *shall not be used in advertising or otherwise to promote the sale, use
- *or other dealings in this Software without prior written authorization
- *from Harold L Hunt II.
- *
- * Authors: Harold L Hunt II
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-/* See Porting Layer Definition - p. 50 */
-void
-winPolyLineNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC, int mode, int npt, DDXPointPtr ppt)
-{
- switch (pGC->lineStyle) {
- case LineSolid:
- if (pGC->lineWidth == 0)
- miZeroLine (pDrawable, pGC, mode, npt, ppt);
- else
- miWideLine(pDrawable, pGC, mode, npt, ppt);
- break;
- case LineOnOffDash:
- case LineDoubleDash:
- miWideDash(pDrawable, pGC, mode, npt, ppt);
- break;
- }
-}
diff --git a/xorg-server/hw/xwin/winrop.c b/xorg-server/hw/xwin/winrop.c
deleted file mode 100644
index 1f9ff7320..000000000
--- a/xorg-server/hw/xwin/winrop.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *Copyright (C) 1994-2002 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Alan Hourihane <alanh@fairlite.demon.co.uk>
- */
-
-/*
- * Raster operations used by Windows translated to X's 16 rop codes...
- */
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-void
- ROP16(HDC hdc, int rop);
-
-int g_copyROP[16] = { 0xFF0062, /* GXclear - 0 */
- 0x8800C6, /* GXand - S & D */
- 0x440328, /* GXandReverse - S & !D */
- 0xCC0020, /* GXcopy - S */
- 0x220326, /* GXandInverted - !S & D */
- 0xAA0029, /* GXnoop - D */
- 0x660046, /* GXxor - S ^ D */
- 0xEE0086, /* GXor - S | D */
- 0x1100A6, /* GXnor - !S & !D */
- 0x990126, /* GXequiv - !S ^ D */
- 0x550009, /* GXinvert - !D */
- 0xDD0228, /* GXorReverse - S | !D */
- 0x330008, /* GXcopyInverted - !S */
- 0xBB0226, /* GXorInverted - !S | D */
- 0x7700C6, /* GXnand - !S | !D */
- 0x000042 /* GXset - 1 */
-};
-
-int g_patternROP[16] = { 0xFF0062, /* GXclear - 0 */
- 0xA000C9, /* GXand - P & D */
- 0xF50225, /* GXandReverse - P & !D */
- 0xF00021, /* GXcopy - P */
- 0x5F00E9, /* GXandInverted - !P & D */
- 0xAA0029, /* GXnoop - D */
- 0xA50065, /* GXxor - P ^ D */
- 0xA000C9, /* GXor - P | D */
- 0x5F00E9, /* GXnor - !P & !D */
- 0x5A0049, /* GXequiv - !P ^ D */
- 0x550009, /* GXinvert - !D */
- 0x500325, /* GXorReverse - P | !D */
- 0x0F0001, /* GXcopyInverted - !P */
- 0x0A0329, /* GXorInverted - !P | D */
- 0x0500A9, /* GXnand - !P | !D */
- 0x000042 /* GXset - 1 */
-};
-
-void
-ROP16(HDC hdc, int rop)
-{
- switch (rop) {
- case GXclear:
- SetROP2(hdc, R2_BLACK);
- break;
-
- case GXand:
- SetROP2(hdc, R2_MASKPEN);
- break;
-
- case GXandReverse:
- SetROP2(hdc, R2_MASKPENNOT);
- break;
-
- case GXcopy:
- SetROP2(hdc, R2_COPYPEN);
- break;
-
- case GXnoop:
- SetROP2(hdc, R2_NOP);
- break;
-
- case GXxor:
- SetROP2(hdc, R2_XORPEN);
- break;
-
- case GXor:
- SetROP2(hdc, R2_MERGEPEN);
- break;
-
- case GXnor:
- SetROP2(hdc, R2_NOTMERGEPEN);
- break;
-
- case GXequiv:
- SetROP2(hdc, R2_NOTXORPEN);
- break;
-
- case GXinvert:
- SetROP2(hdc, R2_NOT);
- break;
-
- case GXorReverse:
- SetROP2(hdc, R2_MERGEPENNOT);
- break;
-
- case GXcopyInverted:
- SetROP2(hdc, R2_NOTCOPYPEN);
- break;
-
- case GXorInverted:
- SetROP2(hdc, R2_MERGENOTPEN);
- break;
-
- case GXnand:
- SetROP2(hdc, R2_NOTMASKPEN);
- break;
-
- case GXset:
- SetROP2(hdc, R2_WHITE);
- break;
- }
-}
diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index ae52f8a2c..952e7eb8b 100644..100755
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -557,145 +557,6 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv)
return TRUE;
}
-#ifdef XWIN_NATIVEGDI
-/* See Porting Layer Definition - p. 20 */
-
-Bool
-winFinishScreenInitNativeGDI(int i,
- ScreenPtr pScreen, int argc, char **argv)
-{
- winScreenPriv(pScreen);
- winScreenInfoPtr pScreenInfo = &g_ScreenInfo[i];
- VisualPtr pVisuals = NULL;
- DepthPtr pDepths = NULL;
- VisualID rootVisual = 0;
- int nVisuals = 0, nDepths = 0, nRootDepth = 0;
-
- /* Ignore user input (mouse, keyboard) */
- pScreenInfo->fIgnoreInput = FALSE;
-
- /* Get device contexts for the screen and shadow bitmap */
- pScreenPriv->hdcScreen = GetDC(pScreenPriv->hwndScreen);
- if (pScreenPriv->hdcScreen == NULL)
- FatalError("winFinishScreenInitNativeGDI - Couldn't get a DC\n");
-
- /* Init visuals */
- if (!(*pScreenPriv->pwinInitVisuals) (pScreen)) {
- ErrorF("winFinishScreenInitNativeGDI - pwinInitVisuals failed\n");
- return FALSE;
- }
-
- /* Initialize the mi visuals */
- if (!miInitVisuals(&pVisuals, &pDepths, &nVisuals, &nDepths, &nRootDepth,
- &rootVisual,
- ((unsigned long) 1 << (pScreenInfo->dwDepth - 1)), 8,
- TrueColor)) {
- ErrorF("winFinishScreenInitNativeGDI - miInitVisuals () failed\n");
- return FALSE;
- }
-
- /* Initialize the CloseScreen procedure pointer */
- pScreen->CloseScreen = NULL;
-
- /* Initialize the mi code */
- if (!miScreenInit(pScreen, NULL, /* No framebuffer */
- pScreenInfo->dwWidth, pScreenInfo->dwHeight,
- monitorResolution, monitorResolution,
- pScreenInfo->dwStride,
- nRootDepth, nDepths, pDepths, rootVisual,
- nVisuals, pVisuals)) {
- ErrorF("winFinishScreenInitNativeGDI - miScreenInit failed\n");
- return FALSE;
- }
-
- pScreen->defColormap = FakeClientID(0);
-
- /*
- * Register our block and wakeup handlers; these procedures
- * process messages in our Windows message queue; specifically,
- * they process mouse and keyboard input.
- */
- pScreen->BlockHandler = winBlockHandler;
- pScreen->WakeupHandler = winWakeupHandler;
-
- /* Place our save screen function */
- pScreen->SaveScreen = winSaveScreen;
-
- /* Pixmaps */
- pScreen->CreatePixmap = winCreatePixmapNativeGDI;
- pScreen->DestroyPixmap = winDestroyPixmapNativeGDI;
-
- /* Other Screen Routines */
- pScreen->QueryBestSize = winQueryBestSizeNativeGDI;
- pScreen->SaveScreen = winSaveScreen;
- pScreen->GetImage = miGetImage;
- pScreen->GetSpans = winGetSpansNativeGDI;
-
- /* Window Procedures */
- pScreen->CreateWindow = winCreateWindowNativeGDI;
- pScreen->DestroyWindow = winDestroyWindowNativeGDI;
- pScreen->PositionWindow = winPositionWindowNativeGDI;
- /*pScreen->ChangeWindowAttributes = winChangeWindowAttributesNativeGDI; */
- pScreen->RealizeWindow = winMapWindowNativeGDI;
- pScreen->UnrealizeWindow = winUnmapWindowNativeGDI;
-
- /* Paint window */
- pScreen->CopyWindow = winCopyWindowNativeGDI;
-
- /* Fonts */
- pScreen->RealizeFont = winRealizeFontNativeGDI;
- pScreen->UnrealizeFont = winUnrealizeFontNativeGDI;
-
- /* GC */
- pScreen->CreateGC = winCreateGCNativeGDI;
-
- /* Colormap Routines */
- pScreen->CreateColormap = miInitializeColormap;
- pScreen->DestroyColormap =
- (DestroyColormapProcPtr) (void (*)(void)) NoopDDA;
- pScreen->InstallColormap = miInstallColormap;
- pScreen->UninstallColormap = miUninstallColormap;
- pScreen->ListInstalledColormaps = miListInstalledColormaps;
- pScreen->StoreColors = (StoreColorsProcPtr) (void (*)(void)) NoopDDA;
- pScreen->ResolveColor = miResolveColor;
-
- /* Bitmap */
- pScreen->BitmapToRegion = winPixmapToRegionNativeGDI;
-
- winDebug ("winFinishScreenInitNativeGDI - calling miDCInitialize\n");
-
- /* Set the default white and black pixel positions */
- pScreen->whitePixel = pScreen->blackPixel = (Pixel) 0;
-
- /* Initialize the cursor */
- if (!miDCInitialize(pScreen, &g_winPointerCursorFuncs)) {
- ErrorF("winFinishScreenInitNativeGDI - miDCInitialize failed\n");
- return FALSE;
- }
-
- /* Create a default colormap */
- if (!miCreateDefColormap(pScreen)) {
- ErrorF("winFinishScreenInitNativeGDI - miCreateDefColormap () "
- "failed\n");
- return FALSE;
- }
-
- winDebug ("winFinishScreenInitNativeGDI - miCreateDefColormap () "
- "returned\n");
-
- /* mi doesn't use a CloseScreen procedure, so no need to wrap */
- pScreen->CloseScreen = pScreenPriv->pwinCloseScreen;
-
- /* Tell the server that we are enabled */
- pScreenPriv->fEnabled = TRUE;
-
- winDebug ("winFinishScreenInitNativeGDI - Successful addition of "
- "screen %p\n", pScreen);
-
- return TRUE;
-}
-#endif
-
/* See Porting Layer Definition - p. 33 */
static Bool
winSaveScreen(ScreenPtr pScreen, int on)
diff --git a/xorg-server/hw/xwin/winsetsp.c b/xorg-server/hw/xwin/winsetsp.c
deleted file mode 100644
index 29f49abe1..000000000
--- a/xorg-server/hw/xwin/winsetsp.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- *Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
- *
- *Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- *"Software"), to deal in the Software without restriction, including
- *without limitation 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 XFREE86 PROJECT 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 name of the XFree86 Project
- *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 XFree86 Project.
- *
- * Authors: Harold L Hunt II
- * Alan Hourihane <alanh@fairlite.demon.co.uk>
- */
-
-#ifdef HAVE_XWIN_CONFIG_H
-#include <xwin-config.h>
-#endif
-#include "win.h"
-
-typedef struct mybitmap
-{
- BITMAPINFOHEADER bmiHeader;
- RGBQUAD bmiColors[256]; /* Maximum palette used in case of 8-bit per pixel */
-} mybitmap_t;
-/* See Porting Layer Definition - p. 55 */
-void
-winSetSpansNativeGDI(DrawablePtr pDrawable,
- GCPtr pGC,
- char *pSrcs,
- DDXPointPtr pPoints,
- int *piWidths, int iSpans, int fSorted)
-{
- winGCPriv(pGC);
- PixmapPtr pPixmap = NULL;
- winPrivPixmapPtr pPixmapPriv = NULL;
- HBITMAP hbmpOrig = NULL;
- mybitmap_t bmi;
- HRGN hrgn = NULL, combined = NULL;
- int nbox;
- BoxPtr pbox;
-
- nbox = RegionNumRects(pGC->pCompositeClip);
- pbox = RegionRects(pGC->pCompositeClip);
-
- if (!nbox)
- return;
-
- combined = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
- nbox--;
- pbox++;
- while (nbox--) {
- hrgn = CreateRectRgn(pbox->x1, pbox->y1, pbox->x2, pbox->y2);
- CombineRgn(combined, combined, hrgn, RGN_OR);
- DeleteObject(hrgn);
- hrgn = NULL;
- pbox++;
- }
-
- /* Branch on the drawable type */
- switch (pDrawable->type) {
- case DRAWABLE_PIXMAP:
-
- SelectClipRgn(pGCPriv->hdcMem, combined);
- DeleteObject(combined);
- combined = NULL;
-
- pPixmap = (PixmapPtr) pDrawable;
- pPixmapPriv = winGetPixmapPriv(pPixmap);
-
- /* Select the drawable pixmap into a DC */
- hbmpOrig = SelectObject(pGCPriv->hdcMem, pPixmapPriv->hBitmap);
- if (hbmpOrig == NULL)
- FatalError("winSetSpans - DRAWABLE_PIXMAP - SelectObject () "
- "failed on pPixmapPriv->hBitmap\n");
-
- while (iSpans--) {
- ZeroMemory (&bmi, sizeof (mybitmap_t));
- bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
- bmi.bmiHeader.biWidth = *piWidths;
- bmi.bmiHeader.biHeight = 1;
- bmi.bmiHeader.biPlanes = 1;
- bmi.bmiHeader.biBitCount = pDrawable->depth;
- bmi.bmiHeader.biCompression = BI_RGB;
-
- /* Setup color table for mono DIBs */
- if (pDrawable->depth == 1) {
- bmi.bmiColors[1].rgbBlue = 255;
- bmi.bmiColors[1].rgbGreen = 255;
- bmi.bmiColors[1].rgbRed = 255;
- }
-
- StretchDIBits(pGCPriv->hdcMem,
- pPoints->x, pPoints->y,
- *piWidths, 1,
- 0, 0,
- *piWidths, 1,
- pSrcs,
- (BITMAPINFO *) &bmi,
- DIB_RGB_COLORS, g_copyROP[pGC->alu]);
-
- pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
- pPoints++;
- piWidths++;
- }
-
- /* Reset the clip region */
- SelectClipRgn(pGCPriv->hdcMem, NULL);
-
- /* Push the drawable pixmap out of the GC HDC */
- SelectObject(pGCPriv->hdcMem, hbmpOrig);
- break;
-
- case DRAWABLE_WINDOW:
-
- SelectClipRgn(pGCPriv->hdc, combined);
- DeleteObject(combined);
- combined = NULL;
-
- while (iSpans--) {
- ZeroMemory (&bmi, sizeof (mybitmap_t));
- bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
- bmi.bmiHeader.biWidth = *piWidths;
- bmi.bmiHeader.biHeight = 1;
- bmi.bmiHeader.biPlanes = 1;
- bmi.bmiHeader.biBitCount = pDrawable->depth;
- bmi.bmiHeader.biCompression = BI_RGB;
-
- /* Setup color table for mono DIBs */
- if (pDrawable->depth == 1) {
- bmi.bmiColors[1].rgbBlue = 255;
- bmi.bmiColors[1].rgbGreen = 255;
- bmi.bmiColors[1].rgbRed = 255;
- }
-
- StretchDIBits(pGCPriv->hdc,
- pPoints->x, pPoints->y,
- *piWidths, 1,
- 0, 0,
- *piWidths, 1,
- pSrcs,
- (BITMAPINFO *) &bmi,
- DIB_RGB_COLORS, g_copyROP[pGC->alu]);
-
- pSrcs += PixmapBytePad(*piWidths, pDrawable->depth);
- pPoints++;
- piWidths++;
- }
-
- /* Reset the clip region */
- SelectClipRgn(pGCPriv->hdc, NULL);
- break;
-
- default:
- FatalError("\nwinSetSpansNativeGDI - Unknown drawable type\n\n");
- break;
- }
-}
diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c
index d00a312c1..0ec17bba3 100644..100755
--- a/xorg-server/hw/xwin/winwindow.c
+++ b/xorg-server/hw/xwin/winwindow.c
@@ -49,200 +49,6 @@ static
void
winReshapeRootless(WindowPtr pWin);
-#ifdef XWIN_NATIVEGDI
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbCreateWindow() */
-
-Bool
-winCreateWindowNativeGDI(WindowPtr pWin)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winCreateWindowNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(CreateWindow);
- fResult = (*pScreen->CreateWindow) (pWin);
- WIN_WRAP(CreateWindow, winCreateWindowNativeGDI);
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbDestroyWindow() */
-
-Bool
-winDestroyWindowNativeGDI(WindowPtr pWin)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winDestroyWindowNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(DestroyWindow);
- fResult = (*pScreen->DestroyWindow) (pWin);
- WIN_WRAP(DestroyWindow, winDestroyWindowNativeGDI);
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbPositionWindow() */
-
-Bool
-winPositionWindowNativeGDI(WindowPtr pWin, int x, int y)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winPositionWindowNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(PositionWindow);
- fResult = (*pScreen->PositionWindow) (pWin, x, y);
- WIN_WRAP(PositionWindow, winPositionWindowNativeGDI);
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 39 */
-/* See mfb/mfbwindow.c - mfbCopyWindow() */
-
-void
-winCopyWindowNativeGDI(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
- DDXPointPtr pptSrc;
- DDXPointPtr ppt;
- RegionPtr prgnDst;
- BoxPtr pBox;
- int dx, dy;
- int i, nbox;
- BoxPtr pBoxDst;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
-
- /* Create a region for the destination */
- prgnDst = RegionCreate(NULL, 1);
-
- /* Calculate the shift from the source to the destination */
- dx = ptOldOrg.x - pWin->drawable.x;
- dy = ptOldOrg.y - pWin->drawable.y;
-
- /* Translate the region from the destination to the source? */
- RegionTranslate(prgnSrc, -dx, -dy);
- RegionIntersect(prgnDst, &pWin->borderClip, prgnSrc);
-
- /* Get a pointer to the first box in the region to be copied */
- pBox = RegionRects(prgnDst);
-
- /* Get the number of boxes in the region */
- nbox = RegionNumRects(prgnDst);
-
- /* Allocate source points for each box */
- if (!(pptSrc = malloc(nbox * sizeof(DDXPointRec))))
- return;
-
- /* Set an iterator pointer */
- ppt = pptSrc;
-
- /* Calculate the source point of each box? */
- for (i = nbox; --i >= 0; ppt++, pBox++) {
- ppt->x = pBox->x1 + dx;
- ppt->y = pBox->y1 + dy;
- }
-
- /* Setup loop pointers again */
- pBoxDst = RegionRects(prgnDst);
- ppt = pptSrc;
-
- /* BitBlt each source to the destination point */
- for (i = nbox; --i >= 0; pBoxDst++, ppt++) {
- BitBlt(pScreenPriv->hdcScreen,
- pBoxDst->x1, pBoxDst->y1,
- pBoxDst->x2 - pBoxDst->x1, pBoxDst->y2 - pBoxDst->y1,
- pScreenPriv->hdcScreen, ppt->x, ppt->y, SRCCOPY);
- }
-
- /* Cleanup the regions, etc. */
- free(pptSrc);
- RegionDestroy(prgnDst);
-}
-
-/* See Porting Layer Definition - p. 37 */
-/* See mfb/mfbwindow.c - mfbChangeWindowAttributes() */
-
-Bool
-winChangeWindowAttributesNativeGDI(WindowPtr pWin, unsigned long mask)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winChangeWindowAttributesNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(ChangeWindowAttributes);
- fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask);
- WIN_WRAP(ChangeWindowAttributes, winChangeWindowAttributesNativeGDI);
-
- /*
- * NOTE: We do not currently need to do anything here.
- */
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as UnrealizeWindow
- */
-
-Bool
-winUnmapWindowNativeGDI(WindowPtr pWin)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winUnmapWindowNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(UnrealizeWindow);
- fResult = (*pScreen->UnrealizeWindow) (pWin);
- WIN_WRAP(UnrealizeWindow, winUnmapWindowNativeGDI);
-
- return fResult;
-}
-
-/* See Porting Layer Definition - p. 37
- * Also referred to as RealizeWindow
- */
-
-Bool
-winMapWindowNativeGDI(WindowPtr pWin)
-{
- Bool fResult = TRUE;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- winScreenPriv(pScreen);
-
- winDebug ("winMapWindowNativeGDI (%p)\n", pWin);
-
- WIN_UNWRAP(RealizeWindow);
- fResult = (*pScreen->RealizeWindow) (pWin);
- WIN_WRAP(RealizeWindow, winMapWindowMultiWindow);
-
- return fResult;
-
-}
-#endif
-
/* See Porting Layer Definition - p. 37 */
/* See mfb/mfbwindow.c - mfbCreateWindow() */
diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c
index f2b3f4e20..37d5ef6eb 100644
--- a/xorg-server/hw/xwin/winwndproc.c
+++ b/xorg-server/hw/xwin/winwndproc.c
@@ -163,11 +163,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
*/
if (s_pScreenInfo->fFullScreen
&& (s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD
- || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
-#ifdef XWIN_PRIMARYFB
- || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
-#endif
- )) {
+ || s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
break;
}
@@ -191,11 +187,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
if (s_pScreenInfo->dwBPP !=
GetDeviceCaps(s_pScreenPriv->hdcScreen, BITSPIXEL)) {
if ((s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DD ||
- s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL
-#ifdef XWIN_PRIMARYFB
- || s_pScreenInfo->dwEngine == WIN_SERVER_PRIMARY_DD
-#endif
- )) {
+ s_pScreenInfo->dwEngine == WIN_SERVER_SHADOW_DDNL)) {
/* Cannot display the visual until the depth is restored */
winDebug ("winWindowProc - Disruptive change in depth\n");
diff --git a/xorg-server/mi/mi.h b/xorg-server/mi/mi.h
index 5a455c910..b7e791d19 100755
--- a/xorg-server/mi/mi.h
+++ b/xorg-server/mi/mi.h
@@ -65,6 +65,10 @@ typedef struct _miDash *miDashPtr;
#define EVEN_DASH 0
#define ODD_DASH ~0
+#ifdef _MSC_VER
+#define _X_COLD
+#endif
+
/* miarc.c */
extern _X_EXPORT void miWideArc(DrawablePtr pDraw,
diff --git a/xorg-server/mi/mibitblt.c b/xorg-server/mi/mibitblt.c
index 08bd1c5b2..114f72d5b 100644
--- a/xorg-server/mi/mibitblt.c
+++ b/xorg-server/mi/mibitblt.c
@@ -72,7 +72,7 @@ extern int ffs(int);
* set them in the destination with SetSpans
* We let SetSpans worry about clipping to the destination.
*/
-RegionPtr
+_X_COLD RegionPtr
miCopyArea(DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
@@ -261,8 +261,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
* This should be replaced with something more general. mi shouldn't have to
* care about such things as scanline padding et alia.
*/
-static
-MiBits *
+_X_COLD static MiBits *
miGetPlane(DrawablePtr pDraw, int planeNum, /* number of the bitPlane */
int sx, int sy, int w, int h, MiBits * result)
{
@@ -368,7 +367,7 @@ miGetPlane(DrawablePtr pDraw, int planeNum, /* number of the bitPlane */
* Note how the clipped out bits of the bitmap are always the background
* color so that the stipple never causes FillRect to draw them.
*/
-static void
+_X_COLD static void
miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
MiBits * pbits, int srcx, int w, int h, int dstx, int dsty)
{
@@ -510,7 +509,7 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc,
* build a source clip
* Use the bitmap we've built up as a Stipple for the destination
*/
-RegionPtr
+_X_COLD RegionPtr
miCopyPlane(DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
@@ -599,7 +598,7 @@ miCopyPlane(DrawablePtr pSrcDrawable,
* XY format:
* get the single plane specified in planemask
*/
-void
+_X_COLD void
miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h,
unsigned int format, unsigned long planeMask, char *pDst)
{
@@ -689,7 +688,7 @@ miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h,
* ZPixmap format:
* This part is simple, just call SetSpans
*/
-void
+_X_COLD void
miPutImage(DrawablePtr pDraw, GCPtr pGC, int depth,
int x, int y, int w, int h, int leftPad, int format, char *pImage)
{
diff --git a/xorg-server/mi/mifillrct.c b/xorg-server/mi/mifillrct.c
index 79c4057d7..faf60498b 100644
--- a/xorg-server/mi/mifillrct.c
+++ b/xorg-server/mi/mifillrct.c
@@ -65,7 +65,7 @@ SOFTWARE.
* then call FillSpans to fill each rectangle. We let FillSpans worry about
* clipping to the destination
*/
-void
+_X_COLD void
miPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, /* number of rectangles to fill */
xRectangle *prectInit /* Pointer to first rectangle to fill */
)
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 1a62ff6c9..9fe5547ad 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -1431,6 +1431,7 @@ System(const char *command)
switch (pid = fork()) {
case -1: /* error */
p = -1;
+ break;
case 0: /* child */
if (setgid(getgid()) == -1)
_exit(127);
diff --git a/xorg-server/render/mipict.c b/xorg-server/render/mipict.c
index b90ea232e..62d18cd04 100644
--- a/xorg-server/render/mipict.c
+++ b/xorg-server/render/mipict.c
@@ -49,23 +49,9 @@ miDestroyPicture(PicturePtr pPicture)
void
miDestroyPictureClip(PicturePtr pPicture)
{
- switch (pPicture->clientClipType) {
- case CT_NONE:
- return;
- case CT_PIXMAP:
- (*pPicture->pDrawable->pScreen->
- DestroyPixmap) ((PixmapPtr) (pPicture->clientClip));
- break;
- default:
- /*
- * we know we'll never have a list of rectangles, since ChangeClip
- * immediately turns them into a region
- */
+ if (pPicture->clientClip)
RegionDestroy(pPicture->clientClip);
- break;
- }
pPicture->clientClip = NULL;
- pPicture->clientClipType = CT_NONE;
}
int
@@ -73,37 +59,31 @@ miChangePictureClip(PicturePtr pPicture, int type, void *value, int n)
{
ScreenPtr pScreen = pPicture->pDrawable->pScreen;
PictureScreenPtr ps = GetPictureScreen(pScreen);
- void *clientClip;
- int clientClipType;
+ RegionPtr clientClip;
switch (type) {
case CT_PIXMAP:
/* convert the pixmap to a region */
- clientClip = (void *) BitmapToRegion(pScreen, (PixmapPtr) value);
+ clientClip = BitmapToRegion(pScreen, (PixmapPtr) value);
if (!clientClip)
return BadAlloc;
- clientClipType = CT_REGION;
(*pScreen->DestroyPixmap) ((PixmapPtr) value);
break;
case CT_REGION:
clientClip = value;
- clientClipType = CT_REGION;
break;
case CT_NONE:
clientClip = 0;
- clientClipType = CT_NONE;
break;
default:
- clientClip = (void *) RegionFromRects(n, (xRectangle *) value, type);
+ clientClip = RegionFromRects(n, (xRectangle *) value, type);
if (!clientClip)
return BadAlloc;
- clientClipType = CT_REGION;
free(value);
break;
}
(*ps->DestroyPictureClip) (pPicture);
pPicture->clientClip = clientClip;
- pPicture->clientClipType = clientClipType;
pPicture->stateChanges |= CPClipMask;
return Success;
}
@@ -144,7 +124,7 @@ miValidatePicture(PicturePtr pPicture, Mask mask)
* copying of regions. (this wins especially if many clients clip
* by children and have no client clip.)
*/
- if (pPicture->clientClipType == CT_NONE) {
+ if (!pPicture->clientClip) {
if (freeCompClip)
RegionDestroy(pPicture->pCompositeClip);
pPicture->pCompositeClip = pregWin;
@@ -203,7 +183,7 @@ miValidatePicture(PicturePtr pPicture, Mask mask)
pPicture->pCompositeClip = RegionCreate(&pixbounds, 1);
}
- if (pPicture->clientClipType == CT_REGION) {
+ if (pPicture->clientClip) {
if (pDrawable->x || pDrawable->y) {
RegionTranslate(pPicture->clientClip,
pDrawable->x + pPicture->clipOrigin.x,
@@ -284,7 +264,7 @@ miClipPictureReg(pixman_region16_t * pRegion,
static inline Bool
miClipPictureSrc(RegionPtr pRegion, PicturePtr pPicture, int dx, int dy)
{
- if (pPicture->clientClipType != CT_NONE) {
+ if (pPicture->clientClip) {
Bool result;
pixman_region_translate(pPicture->clientClip,
diff --git a/xorg-server/render/mirect.c b/xorg-server/render/mirect.c
index 4e76972d1..a36d1d6e3 100644
--- a/xorg-server/render/mirect.c
+++ b/xorg-server/render/mirect.c
@@ -54,7 +54,7 @@ miColorRects(PicturePtr pDst,
tmpval[1].val = pixel;
tmpval[2].val = pDst->subWindowMode;
mask = GCFunction | GCForeground | GCSubwindowMode;
- if (pClipPict->clientClipType == CT_REGION) {
+ if (pClipPict->clientClip) {
tmpval[3].val = pDst->clipOrigin.x - xoff;
tmpval[4].val = pDst->clipOrigin.y - yoff;
mask |= GCClipXOrigin | GCClipYOrigin;
diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c
index 58535d475..cd9bc7485 100644
--- a/xorg-server/render/picture.c
+++ b/xorg-server/render/picture.c
@@ -731,7 +731,6 @@ SetPictureToDefaults(PicturePtr pPicture)
pPicture->polyEdge = PolyEdgeSharp;
pPicture->polyMode = PolyModePrecise;
pPicture->freeCompClip = FALSE;
- pPicture->clientClipType = CT_NONE;
pPicture->componentAlpha = FALSE;
pPicture->repeatType = RepeatNone;
diff --git a/xorg-server/render/picturestr.h b/xorg-server/render/picturestr.h
index 1278f620a..177f87b80 100644
--- a/xorg-server/render/picturestr.h
+++ b/xorg-server/render/picturestr.h
@@ -132,7 +132,6 @@ typedef struct _Picture {
unsigned int polyEdge:1;
unsigned int polyMode:1;
unsigned int freeCompClip:1;
- unsigned int clientClipType:2;
unsigned int componentAlpha:1;
unsigned int repeatType:2;
unsigned int filter:3;
@@ -145,7 +144,7 @@ typedef struct _Picture {
DDXPointRec alphaOrigin;
DDXPointRec clipOrigin;
- void *clientClip;
+ RegionPtr clientClip;
unsigned long serialNumber;
diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c
index f9de52542..4cfeee1a1 100644
--- a/xorg-server/xfixes/region.c
+++ b/xorg-server/xfixes/region.c
@@ -272,20 +272,12 @@ ProcXFixesCreateRegionFromPicture(ClientPtr client)
if (!pPicture->pDrawable)
return RenderErrBase + BadPicture;
- switch (pPicture->clientClipType) {
- case CT_PIXMAP:
- pRegion = BitmapToRegion(pPicture->pDrawable->pScreen,
- (PixmapPtr) pPicture->clientClip);
- if (!pRegion)
- return BadAlloc;
- break;
- case CT_REGION:
+ if (pPicture->clientClip) {
pRegion = XFixesRegionCopy((RegionPtr) pPicture->clientClip);
if (!pRegion)
return BadAlloc;
- break;
- default:
- return BadImplementation; /* assume sane server bits */
+ } else {
+ return BadMatch;
}
if (!AddResource(stuff->region, RegionResType, (void *) pRegion))
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 3fd0ce427..682f8c9f9 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -4448,6 +4448,18 @@
</languageList>
</configItem>
</variant>
+ <variant>
+ <configItem>
+ <name>phonetic_azerty</name>
+ <_description>Russian (phonetic azerty)</_description>
+ </configItem>
+ </variant>
+ <variant>
+ <configItem>
+ <name>phonetic_fr</name>
+ <_description>Russian (phonetic French)</_description>
+ </configItem>
+ </variant>
</variantList>
</layout>
<layout>
diff --git a/xorg-server/xkeyboard-config/symbols/keypad b/xorg-server/xkeyboard-config/symbols/keypad
index 1efc02b48..a26602435 100644
--- a/xorg-server/xkeyboard-config/symbols/keypad
+++ b/xorg-server/xkeyboard-config/symbols/keypad
@@ -1,3 +1,27 @@
+default hidden partial keypad_keys
+xkb_symbols "x11" {
+
+ include "keypad(operators)"
+
+ key <KP7> { [ KP_Home, KP_7 ] };
+ key <KP8> { [ KP_Up, KP_8 ] };
+ key <KP9> { [ KP_Prior, KP_9 ] };
+
+ key <KP4> { [ KP_Left, KP_4 ] };
+ key <KP5> { [ KP_Begin, KP_5 ] };
+ key <KP6> { [ KP_Right, KP_6 ] };
+
+ key <KP1> { [ KP_End, KP_1 ] };
+ key <KP2> { [ KP_Down, KP_2 ] };
+ key <KP3> { [ KP_Next, KP_3 ] };
+ key <KPEN> { [ KP_Enter ] };
+ key <KPEQ> { [ KP_Equal ] };
+
+ key <KP0> { [ KP_Insert, KP_0 ] };
+ key <KPDL> { [ KP_Delete, KP_Decimal ] };
+ key <KPPT> { [ KP_Decimal, KP_Decimal ] };
+};
+
hidden partial keypad_keys
xkb_symbols "overlay" {
include "keypad(overlay1)"
@@ -93,31 +117,6 @@ xkb_symbols "operators" {
};
};
-default hidden partial keypad_keys
-xkb_symbols "x11" {
-
- include "keypad(operators)"
-
- key <KP7> { [ KP_Home, KP_7 ] };
- key <KP8> { [ KP_Up, KP_8 ] };
- key <KP9> { [ KP_Prior, KP_9 ] };
-
- key <KP4> { [ KP_Left, KP_4 ] };
- key <KP5> { [ KP_Begin, KP_5 ] };
- key <KP6> { [ KP_Right, KP_6 ] };
-
- key <KP1> { [ KP_End, KP_1 ] };
- key <KP2> { [ KP_Down, KP_2 ] };
- key <KP3> { [ KP_Next, KP_3 ] };
- key <KPEN> { [ KP_Enter ] };
- key <KPEQ> { [ KP_Equal ] };
-
- key <KP0> { [ KP_Insert, KP_0 ] };
- key <KPDL> { [ KP_Delete, KP_Decimal ] };
- key <KPPT> { [ KP_Decimal, KP_Decimal ] };
-};
-
-
// Legacy PC keypad definition
// Copyright © 2006-2007 Nicolas Mailhot <nicolas.mailhot @ laposte.net>
keypad_keys
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 7948ab19d..2f0b4cf03 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -3,6 +3,7 @@
// Andreas Tobler <a.tobler@schweiz.ch>
// modified for Swiss German Apple Extended Keyboard II
+default
partial alphanumeric_keys
xkb_symbols "extended" {
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index e464519e0..d3ba80dcd 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -1,4 +1,4 @@
-partial alphanumeric_keys
+default partial alphanumeric_keys
xkb_symbols "basic" {
// Describes the differences between a very simple en_US
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 3784b0e05..17f78e948 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -1,3 +1,4 @@
+default
xkb_symbols "extended" {
name[Group1]= "Italy - Mac";
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index 81e4b77b9..58bfee509 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -1,6 +1,6 @@
// symbols definition for a Macintosh "Extended" keyboard
-xkb_symbols "extended" {
+default xkb_symbols "extended" {
name[Group1]= "USA";
key <ESC> { [ Escape ] };
@@ -59,7 +59,7 @@ xkb_symbols "extended" {
key <SPCE> { [ space ] };
include "eurosign(e)"
- include "keypad"
+ include "keypad(overlay)"
key <KPEQ> { [ equal ] };
};
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index c4f48186f..37b61a7dc 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -498,6 +498,77 @@ xkb_symbols "chm" {
include "level3(ralt_switch)"
};
+partial alphanumeric_keys
+xkb_symbols "phonetic_azerty" {
+
+ include "level3(ralt_switch)"
+
+ name[Group1]= "Russian (phonetic azerty)";
+
+ key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
+ key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
+ key <AE03> { [ quotedbl, 3, numbersign, sterling ] };
+ key <AE04> { [apostrophe, 4, braceleft, dollar ] };
+ key <AE05> { [ parenleft, 5, bracketleft, threeeighths ] };
+ key <AE06> { [ minus, 6, bar, fiveeighths ] };
+ key <AE07> { [ egrave, 7, grave, seveneighths ] };
+ key <AE08> { [underscore, 8, backslash, trademark ] };
+ key <AE09> { [ ccedilla, 9, asciicircum, plusminus ] };
+ key <AE10> { [ agrave, 0, at, degree ] };
+ key <AE11> { [parenright, degree, bracketright, questiondown ] };
+ key <AE12> { [ equal, plus, braceright, dead_ogonek ] };
+
+ key <AB07> { [ comma, question, acute, doubleacute ] };
+ key <AB08> { [ semicolon, period, horizconnector, multiply ] };
+ key <AB09> { [ colon, slash, periodcentered, division ] };
+ key <AB10> { [ exclam, section, dead_belowdot, dead_abovedot ] };
+
+ key <AC11> { [ ugrave, percent, asciicircum, caron ] };
+ key <LSGT> { [ bar, brokenbar ] };
+
+ key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] };
+ key <AC01> { [ Cyrillic_ya, Cyrillic_YA ] }; // Q
+ key <AD02> { [ Cyrillic_ze, Cyrillic_ZE ] }; // Z
+ key <LatS> { [ Cyrillic_es, Cyrillic_ES ] };
+ key <AD01> { [ Cyrillic_a, Cyrillic_A ] };
+ key <AB01> { [ Cyrillic_ve, Cyrillic_VE ] }; // W
+ key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] };
+ key <LatX> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] };
+ key <LatD> { [ Cyrillic_de, Cyrillic_DE ] };
+ key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] };
+ key <LatV> { [ Cyrillic_zhe, Cyrillic_ZHE ] };
+ key <LatF> { [ Cyrillic_ef, Cyrillic_EF ] };
+ key <LatT> { [ Cyrillic_te, Cyrillic_TE ] };
+ key <LatR> { [ Cyrillic_er, Cyrillic_ER ] };
+ key <LatN> { [ Cyrillic_en, Cyrillic_EN ] };
+ key <LatB> { [ Cyrillic_be, Cyrillic_BE ] };
+ key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] };
+ key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] };
+ key <LatY> { [ Cyrillic_yeru, Cyrillic_YERU ] };
+ key <AC10> { [ Cyrillic_em, Cyrillic_EM ] }; // M
+ key <LatJ> { [ Cyrillic_shorti, Cyrillic_SHORTI ] };
+ key <LatU> { [ Cyrillic_u, Cyrillic_U ] };
+ key <LatK> { [ Cyrillic_ka, Cyrillic_KA ] };
+ key <LatI> { [ Cyrillic_i, Cyrillic_I ] };
+ key <LatO> { [ Cyrillic_o, Cyrillic_O ] };
+ key <LatL> { [ Cyrillic_el, Cyrillic_EL ] };
+ key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] };
+
+ key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] };
+ key <AE12> { [ Cyrillic_che, Cyrillic_CHE ] };
+ key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] };
+ key <BKSL> { [ Cyrillic_e, Cyrillic_E ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "phonetic_fr" {
+
+ include "fr"
+ include "ru(phonetic_azerty)"
+
+ name[Group1]= "Russian (phonetic French)";
+};
+
// EXTRAS:
// Church Slavonic language layout