x2go-commits March 2015

x2go-commits@lists.x2go.org

3 participants
532 discussions

[vcxsrv] 10/13: Merge remote-tracking branch 'origin/released'
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit 7147e58c389cffeb930bdd8e3a2fdfc5d5bb3a0c Merge: 0dbe845 a1011d6 Author: marha <marha(a)users.sourceforge.net> Date: Sat Nov 29 16:13:30 2014 +0100 Merge remote-tracking branch 'origin/released' Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glshim.c xorg-server/hw/xwin/winclipboard/xevents.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/winwndproc.c xorg-server/mi/miarc.c xorg-server/os/connection.c fontconfig/conf.d/30-metric-aliases.conf | 94 +- fontconfig/conf.d/45-latin.conf | 12 + fontconfig/conf.d/60-latin.conf | 3 + libX11/nls/compose.dir.pre | 21 +- libX11/nls/en_US.UTF-8/Compose.pre | 41 +- libxcb/src/c_client.py | 52 +- libxcb/xcb-proto/src/xinput.xml | 37 +- mesalib/VERSION | 2 +- mesalib/configure.ac | 166 +- mesalib/docs/GL3.txt | 18 +- mesalib/docs/egl.html | 7 - mesalib/docs/index.html | 12 + mesalib/docs/llvmpipe.html | 2 +- mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.3.3.html | 209 +++ mesalib/docs/relnotes/10.3.4.html | 106 ++ mesalib/docs/relnotes/10.4.html | 4 +- mesalib/docs/relnotes/{10.4.html => 10.5.0.html} | 11 +- mesalib/include/D3D9/d3d9.h | 1858 ++++++++++++++++++++ mesalib/include/D3D9/d3d9caps.h | 387 ++++ mesalib/include/D3D9/d3d9types.h | 1797 +++++++++++++++++++ mesalib/include/GLES2/gl2ext.h | 313 +++- mesalib/include/d3dadapter/d3dadapter9.h | 101 ++ mesalib/include/d3dadapter/drm.h | 44 + mesalib/include/d3dadapter/present.h | 136 ++ mesalib/scons/gallium.py | 15 +- mesalib/src/gallium/Automake.inc | 3 +- mesalib/src/gallium/Makefile.am | 13 +- mesalib/src/gallium/auxiliary/Android.mk | 4 +- mesalib/src/gallium/auxiliary/Makefile.am | 42 +- mesalib/src/gallium/auxiliary/Makefile.sources | 336 +++- mesalib/src/gallium/auxiliary/SConscript | 2 +- mesalib/src/gallium/auxiliary/hud/hud_context.c | 2 - mesalib/src/gallium/auxiliary/util/u_atomic.h | 56 +- mesalib/src/gallium/auxiliary/util/u_blit.c | 4 +- mesalib/src/gallium/auxiliary/util/u_blitter.c | 7 +- mesalib/src/gallium/auxiliary/util/u_box.h | 118 ++ .../src/gallium/auxiliary/util/u_format_pack.py | 35 +- mesalib/src/gallium/auxiliary/util/u_pstipple.c | 228 +-- mesalib/src/gallium/auxiliary/util/u_pstipple.h | 5 +- mesalib/src/gallium/auxiliary/util/u_rect.h | 18 + .../src/gallium/auxiliary/util/u_simple_shaders.c | 80 +- .../src/gallium/auxiliary/util/u_simple_shaders.h | 10 +- mesalib/src/gallium/auxiliary/util/u_snprintf.c | 2 +- mesalib/src/gallium/auxiliary/util/u_tests.c | 268 +++ .../strtod.h => gallium/auxiliary/util/u_tests.h} | 31 +- mesalib/src/glsl/Makefile.sources | 4 +- mesalib/src/glsl/ast.h | 29 - mesalib/src/glsl/glsl_lexer.ll | 23 +- mesalib/src/glsl/glsl_parser_extras.cpp | 10 +- mesalib/src/glsl/glsl_types.cpp | 59 +- mesalib/src/glsl/glsl_types.h | 33 +- mesalib/src/glsl/ir.cpp | 48 - mesalib/src/glsl/ir.h | 30 +- mesalib/src/glsl/ir_optimization.h | 1 + mesalib/src/glsl/ir_reader.cpp | 2 +- mesalib/src/glsl/ir_uniform.h | 6 + mesalib/src/glsl/link_uniforms.cpp | 50 + mesalib/src/glsl/linker.cpp | 44 +- mesalib/src/glsl/list.h | 21 + mesalib/src/glsl/loop_unroll.cpp | 13 +- .../src/glsl/lower_const_arrays_to_uniforms.cpp | 111 ++ mesalib/src/glsl/main.cpp | 10 + mesalib/src/glsl/opt_algebraic.cpp | 49 +- mesalib/src/glsl/opt_cse.cpp | 9 +- mesalib/src/glsl/s_expression.cpp | 2 +- mesalib/src/glsl/s_expression.h | 2 +- mesalib/src/mapi/glapi/SConscript | 1 + .../mapi/glapi/gen/KHR_context_flush_control.xml | 11 + mesalib/src/mapi/glapi/gen/Makefile.am | 3 - mesalib/src/mapi/glapi/gen/extension_helper.py | 324 ---- mesalib/src/mapi/glapi/gen/gl_API.xml | 2 + mesalib/src/mapi/glapi/gen/gl_offsets.py | 120 -- mesalib/src/mapi/glapi/gen/mesadef.py | 215 --- mesalib/src/mesa/Android.libmesa_dricore.mk | 8 +- mesalib/src/mesa/Android.libmesa_st_mesa.mk | 5 + mesalib/src/mesa/Makefile.am | 3 +- mesalib/src/mesa/drivers/dri/common/dri_util.c | 22 +- .../mesa/drivers/dri/common/xmlpool/t_options.h | 18 + mesalib/src/mesa/drivers/windows/gdi/mesa.def | 839 ++------- mesalib/src/mesa/main/api_validate.c | 56 +- mesalib/src/mesa/main/api_validate.h | 6 - mesalib/src/mesa/main/attrib.c | 3 +- mesalib/src/mesa/main/context.c | 11 +- mesalib/src/mesa/main/errors.c | 172 +- mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/get_hash_params.py | 5 +- mesalib/src/mesa/main/imports.c | 19 - mesalib/src/mesa/main/imports.h | 3 - mesalib/src/mesa/main/mtypes.h | 5 + mesalib/src/mesa/main/shaderapi.c | 6 +- mesalib/src/mesa/main/sse_minmax.c | 97 + .../src/mesa/main/sse_minmax.h | 44 +- mesalib/src/mesa/main/streaming-load-memcpy.c | 3 - mesalib/src/mesa/main/texformat.c | 3 + mesalib/src/mesa/main/texstore.c | 4 +- mesalib/src/mesa/main/uniform_query.cpp | 260 +-- mesalib/src/mesa/main/uniforms.c | 98 +- mesalib/src/mesa/main/uniforms.h | 4 +- mesalib/src/mesa/main/viewport.c | 8 +- mesalib/src/mesa/program/prog_execute.c | 156 -- mesalib/src/mesa/program/prog_instruction.c | 12 - mesalib/src/mesa/program/prog_instruction.h | 12 - mesalib/src/mesa/program/program_lexer.l | 14 +- .../src/mesa/state_tracker/st_atom_rasterizer.c | 11 +- mesalib/src/mesa/state_tracker/st_atom_viewport.c | 2 - mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 5 +- mesalib/src/mesa/state_tracker/st_cb_clear.c | 30 +- mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 2 - mesalib/src/mesa/state_tracker/st_cb_drawtex.c | 4 +- mesalib/src/mesa/state_tracker/st_context.h | 1 + mesalib/src/mesa/state_tracker/st_extensions.c | 3 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 19 +- mesalib/src/mesa/state_tracker/st_manager.c | 3 +- mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c | 12 +- mesalib/src/mesa/state_tracker/st_program.c | 23 +- mesalib/src/mesa/vbo/vbo_exec_array.c | 14 +- mesalib/src/mesa/x86/common_x86_features.h | 26 + mesalib/src/util/Makefile.sources | 3 +- mesalib/src/util/hash_table.c | 10 +- mesalib/src/util/macros.h | 18 +- mesalib/src/{glsl/strtod.c => util/strtod.cpp} | 32 +- mesalib/src/{glsl => util}/strtod.h | 4 +- .../glsl_apps_compile/glsl_apps_compile.vcxproj | 6 +- .../glsl_apps_compile.vcxproj.filters | 12 +- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 6 +- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters | 12 +- xkbcomp/configure.ac | 2 +- xkbcomp/xkbcomp.c | 32 +- xorg-server/Xext/dpms.c | 10 +- xorg-server/Xext/dpmsstubs.c | 10 +- xorg-server/Xext/panoramiX.c | 2 +- xorg-server/Xext/panoramiX.h | 2 +- xorg-server/Xext/panoramiXprocs.c | 4 +- xorg-server/Xext/security.c | 4 +- xorg-server/Xext/shm.c | 21 +- xorg-server/Xext/sync.c | 2 +- xorg-server/Xext/syncsrv.h | 8 +- xorg-server/Xext/xres.c | 12 +- xorg-server/Xext/xvdisp.c | 8 +- xorg-server/Xext/xvdix.h | 14 +- xorg-server/Xext/xvmain.c | 20 +- xorg-server/composite/compalloc.c | 8 +- xorg-server/composite/compext.c | 4 +- xorg-server/composite/compinit.c | 21 +- xorg-server/composite/compint.h | 3 +- xorg-server/composite/compoverlay.c | 4 +- xorg-server/composite/compwindow.c | 7 +- xorg-server/configure.ac | 14 +- xorg-server/dbe/dbe.c | 16 +- xorg-server/dbe/dbestruct.h | 12 +- xorg-server/dbe/midbe.c | 14 +- xorg-server/dbe/midbe.h | 8 +- xorg-server/dix/atom.c | 8 +- xorg-server/dix/colormap.c | 34 +- xorg-server/dix/cursor.c | 8 +- xorg-server/dix/devices.c | 2 +- xorg-server/dix/dispatch.c | 16 +- xorg-server/dix/dispatch.h | 2 +- xorg-server/dix/dixfonts.c | 6 +- xorg-server/dix/dixutils.c | 12 +- xorg-server/dix/extension.c | 8 +- xorg-server/dix/gc.c | 25 +- xorg-server/dix/getevents.c | 22 +- xorg-server/dix/globals.c | 8 +- xorg-server/dix/glyphcurs.c | 8 +- xorg-server/dix/grabs.c | 16 +- xorg-server/dix/inpututils.c | 2 + xorg-server/dix/main.c | 8 +- xorg-server/dix/property.c | 8 +- xorg-server/dix/region.c | 22 +- xorg-server/dix/resource.c | 16 +- xorg-server/dix/selection.c | 10 +- xorg-server/dix/swaprep.c | 8 +- xorg-server/dix/swapreq.c | 8 +- xorg-server/dix/tables.c | 8 +- xorg-server/dix/window.c | 38 +- xorg-server/exa/exa.c | 2 +- xorg-server/exa/exa.h | 8 +- xorg-server/exa/exa_accel.c | 20 +- xorg-server/exa/exa_glyphs.c | 8 +- xorg-server/exa/exa_priv.h | 7 +- xorg-server/exa/exa_render.c | 4 +- xorg-server/exa/exa_unaccel.c | 11 +- xorg-server/fb/Makefile.am | 2 - xorg-server/fb/fb.h | 338 +--- xorg-server/fb/fb24_32.c | 2 +- xorg-server/fb/fb24_32.h | 2 +- xorg-server/fb/fbbits.c | 12 - xorg-server/fb/fbblt.c | 271 +-- xorg-server/fb/fbbltone.c | 320 ++-- xorg-server/fb/fbfill.c | 84 +- xorg-server/fb/fbfillrect.c | 2 +- xorg-server/fb/fbgc.c | 85 +- xorg-server/fb/fbglyph.c | 10 +- xorg-server/fb/fbline.c | 4 +- xorg-server/fb/fboverlay.c | 2 +- xorg-server/fb/fboverlay.h | 2 +- xorg-server/fb/fbpict.c | 16 +- xorg-server/fb/fbpict.h | 4 - xorg-server/fb/fbpixmap.c | 6 +- xorg-server/fb/fbpoint.c | 2 +- xorg-server/fb/fbpush.c | 4 +- xorg-server/fb/fbrop.h | 12 +- xorg-server/fb/fbseg.c | 42 +- xorg-server/fb/fbstipple.c | 264 --- xorg-server/fb/fbtile.c | 163 -- xorg-server/fb/fbutil.c | 308 ---- xorg-server/fb/wfbrename.h | 23 - xorg-server/glamor/glamor.c | 1 + xorg-server/glamor/glamor_fbo.c | 3 +- xorg-server/glamor/glamor_picture.c | 2 +- xorg-server/glamor/glamor_pixmap.c | 75 +- xorg-server/glamor/glamor_priv.h | 2 + xorg-server/glx/glxbyteorder.h | 8 +- xorg-server/glx/glxcmds.c | 22 +- xorg-server/glx/glxdri2.c | 2 +- xorg-server/glx/glxscreens.c | 2 +- xorg-server/glx/glxscreens.h | 2 +- xorg-server/glx/indirect_program.c | 6 +- xorg-server/glx/indirect_table.h | 6 +- xorg-server/glx/indirect_texture_compression.c | 6 +- xorg-server/glx/indirect_util.c | 8 +- xorg-server/glx/indirect_util.h | 6 +- xorg-server/glx/rensize.c | 4 +- xorg-server/hw/dmx/config/Canvas.c | 2 +- xorg-server/hw/dmx/config/dmxprint.c | 2 +- xorg-server/hw/dmx/dmxgc.c | 12 +- xorg-server/hw/dmx/dmxpict.h | 2 +- xorg-server/hw/dmx/glxProxy/glxcmds.c | 16 +- xorg-server/hw/dmx/glxProxy/glxsingle.c | 4 +- xorg-server/hw/dmx/glxProxy/glxvendor.c | 4 +- xorg-server/hw/dmx/input/ChkNotMaskEv.c | 2 +- xorg-server/hw/dmx/input/lnx-keyboard.c | 20 +- xorg-server/hw/dmx/input/lnx-ms.c | 2 +- xorg-server/hw/kdrive/ephyr/ephyr.c | 14 +- xorg-server/hw/kdrive/ephyr/ephyr.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdri.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdri.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdriext.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrglxext.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrglxext.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrhostglx.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrhostglx.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrinit.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrlog.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrvideo.c | 4 +- xorg-server/hw/kdrive/ephyr/hostx.c | 12 +- xorg-server/hw/kdrive/ephyr/hostx.h | 4 +- xorg-server/hw/kdrive/ephyr/os.c | 4 +- xorg-server/hw/kdrive/src/kxv.c | 2 +- xorg-server/hw/xfree86/Makefile.am | 2 +- xorg-server/hw/xfree86/common/Makefile.am | 4 + xorg-server/hw/xfree86/common/compiler.h | 4 +- xorg-server/hw/xfree86/common/xf86AutoConfig.c | 8 +- xorg-server/hw/xfree86/common/xf86Bus.c | 2 +- xorg-server/hw/xfree86/common/xf86Config.c | 4 +- xorg-server/hw/xfree86/common/xf86Configure.c | 4 +- xorg-server/hw/xfree86/common/xf86Mode.c | 8 +- xorg-server/hw/xfree86/common/xf86Module.h | 4 +- xorg-server/hw/xfree86/common/xf86PciInfo.h | 2 +- xorg-server/hw/xfree86/common/xf86Xinput.c | 16 +- xorg-server/hw/xfree86/common/xf86Xinput.h | 6 +- xorg-server/hw/xfree86/common/xf86cmap.c | 4 +- xorg-server/hw/xfree86/common/xf86fbman.c | 6 +- xorg-server/hw/xfree86/common/xf86platformBus.c | 2 +- xorg-server/hw/xfree86/common/xf86str.h | 2 +- xorg-server/hw/xfree86/common/xf86vmode.c | 8 +- xorg-server/hw/xfree86/common/xf86xv.c | 2 +- xorg-server/hw/xfree86/common/xf86xvmc.h | 10 +- xorg-server/hw/xfree86/ddc/ddc.c | 10 +- xorg-server/hw/xfree86/ddc/edid.h | 8 +- xorg-server/hw/xfree86/ddc/print_edid.c | 2 +- xorg-server/hw/xfree86/ddc/xf86DDC.h | 6 +- xorg-server/hw/xfree86/dixmods/xkbKillSrv.c | 16 +- xorg-server/hw/xfree86/dixmods/xkbVT.c | 16 +- xorg-server/hw/xfree86/dri/dri.c | 4 +- xorg-server/hw/xfree86/dri/sarea.h | 10 +- xorg-server/hw/xfree86/dri2/Makefile.am | 2 + xorg-server/hw/xfree86/dri2/dri2.c | 62 +- xorg-server/hw/xfree86/dri2/pci_ids/Makefile.am | 11 + xorg-server/hw/xfree86/dri2/pci_ids/i810_pci_ids.h | 4 + xorg-server/hw/xfree86/dri2/pci_ids/i915_pci_ids.h | 15 + xorg-server/hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 115 ++ .../hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 80 + xorg-server/hw/xfree86/dri2/pci_ids/r200_pci_ids.h | 24 + xorg-server/hw/xfree86/dri2/pci_ids/r300_pci_ids.h | 227 +++ xorg-server/hw/xfree86/dri2/pci_ids/r600_pci_ids.h | 327 ++++ .../hw/xfree86/dri2/pci_ids/radeon_pci_ids.h | 23 + .../hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 157 ++ .../hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h | 1 + .../hw/xfree86/drivers/modesetting/Makefile.am | 6 +- xorg-server/hw/xfree86/drivers/modesetting/dri2.c | 863 +++++++++ .../hw/xfree86/drivers/modesetting/driver.c | 29 +- .../hw/xfree86/drivers/modesetting/driver.h | 44 + .../xfree86/drivers/modesetting/drmmode_display.c | 25 +- .../xfree86/drivers/modesetting/drmmode_display.h | 31 +- .../hw/xfree86/drivers/modesetting/vblank.c | 383 ++++ xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | 2 +- xorg-server/hw/xfree86/i2c/xf86i2c.c | 40 +- xorg-server/hw/xfree86/i2c/xf86i2c.h | 2 +- xorg-server/hw/xfree86/loader/loadmod.c | 4 +- xorg-server/hw/xfree86/modes/xf86Crtc.c | 4 +- xorg-server/hw/xfree86/modes/xf86Crtc.h | 10 +- xorg-server/hw/xfree86/modes/xf86RandR12.c | 4 +- xorg-server/hw/xfree86/modes/xf86cvt.c | 4 +- xorg-server/hw/xfree86/modes/xf86gtf.c | 10 +- .../hw/xfree86/os-support/bsd/alpha_video.c | 20 +- xorg-server/hw/xfree86/os-support/bsd/arm_video.c | 28 +- xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c | 2 +- xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c | 20 +- xorg-server/hw/xfree86/os-support/bsd/bsd_init.c | 24 +- .../hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 16 +- xorg-server/hw/xfree86/os-support/bsd/i386_video.c | 22 +- xorg-server/hw/xfree86/os-support/bsd/ppc_video.c | 20 +- .../hw/xfree86/os-support/bsd/sparc64_video.c | 20 +- .../hw/xfree86/os-support/hurd/hurd_video.c | 4 +- xorg-server/hw/xfree86/os-support/linux/lnx_agp.c | 4 +- xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c | 2 +- .../hw/xfree86/os-support/linux/systemd-logind.c | 2 +- xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c | 8 +- .../hw/xfree86/os-support/shared/ioperm_noop.c | 2 +- xorg-server/hw/xfree86/os-support/shared/sigio.c | 6 +- .../hw/xfree86/os-support/solaris/sun_apm.c | 2 +- xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 30 +- xorg-server/hw/xfree86/os-support/xf86_OSproc.h | 28 +- xorg-server/hw/xfree86/parser/Configint.h | 18 +- xorg-server/hw/xfree86/parser/DRI.c | 8 +- xorg-server/hw/xfree86/parser/Device.c | 16 +- xorg-server/hw/xfree86/parser/Files.c | 14 +- xorg-server/hw/xfree86/parser/Flags.c | 16 +- xorg-server/hw/xfree86/parser/Input.c | 16 +- xorg-server/hw/xfree86/parser/Layout.c | 16 +- xorg-server/hw/xfree86/parser/Module.c | 16 +- xorg-server/hw/xfree86/parser/Monitor.c | 18 +- xorg-server/hw/xfree86/parser/Pointer.c | 16 +- xorg-server/hw/xfree86/parser/Screen.c | 16 +- xorg-server/hw/xfree86/parser/Vendor.c | 16 +- xorg-server/hw/xfree86/parser/Video.c | 16 +- xorg-server/hw/xfree86/parser/read.c | 22 +- xorg-server/hw/xfree86/parser/scan.c | 36 +- xorg-server/hw/xfree86/parser/write.c | 14 +- xorg-server/hw/xfree86/parser/xf86Optrec.h | 18 +- xorg-server/hw/xfree86/parser/xf86Parser.h | 18 +- xorg-server/hw/xfree86/parser/xf86tokens.h | 18 +- xorg-server/hw/xfree86/ramdac/IBM.c | 4 +- xorg-server/hw/xfree86/ramdac/TI.c | 2 +- xorg-server/hw/xfree86/ramdac/xf86Cursor.c | 6 +- xorg-server/hw/xfree86/ramdac/xf86HWCurs.c | 2 +- xorg-server/hw/xfree86/ramdac/xf86RamDac.h | 4 +- xorg-server/hw/xfree86/sdksyms.sh | 3 - xorg-server/hw/xfree86/shadowfb/shadowfb.h | 2 +- xorg-server/hw/xfree86/utils/gtf/gtf.c | 26 +- xorg-server/hw/xfree86/vbe/vbe.c | 4 +- xorg-server/hw/xfree86/vbe/vbe.h | 4 +- xorg-server/hw/xfree86/vgahw/vgaHW.c | 8 +- xorg-server/hw/xfree86/vgahw/vgaHW.h | 2 +- xorg-server/hw/xfree86/x86emu/debug.c | 4 +- xorg-server/hw/xfree86/x86emu/ops.c | 22 +- xorg-server/hw/xfree86/x86emu/prim_ops.c | 70 +- xorg-server/hw/xfree86/x86emu/sys.c | 6 +- xorg-server/hw/xfree86/x86emu/x86emu/regs.h | 10 +- xorg-server/hw/xnest/Color.c | 2 +- xorg-server/hw/xnest/GC.c | 56 +- xorg-server/hw/xnest/XNGC.h | 1 - xorg-server/hw/xnest/Xnest.h | 2 +- xorg-server/hw/xquartz/darwin.c | 8 +- xorg-server/hw/xquartz/darwinEvents.c | 4 +- xorg-server/hw/xwayland/xwayland.c | 1 + xorg-server/hw/xwin/InitInput.c | 2 +- xorg-server/hw/xwin/InitOutput.c | 10 +- xorg-server/hw/xwin/win.h | 2 +- xorg-server/hw/xwin/winSetAppUserModelID.c | 2 +- xorg-server/hw/xwin/wincmap.c | 2 +- xorg-server/hw/xwin/winconfig.c | 10 +- xorg-server/hw/xwin/wincreatewnd.c | 4 +- xorg-server/hw/xwin/wincursor.c | 10 +- xorg-server/hw/xwin/windialogs.c | 12 +- xorg-server/hw/xwin/winlayouts.h | 2 +- xorg-server/hw/xwin/winmsgwindow.c | 5 +- xorg-server/hw/xwin/winmultiwindowicons.c | 4 +- xorg-server/hw/xwin/winmultiwindowshape.c | 2 +- xorg-server/hw/xwin/winmultiwindowwindow.c | 20 +- xorg-server/hw/xwin/winmultiwindowwm.c | 2 +- xorg-server/hw/xwin/winmultiwindowwndproc.c | 4 +- xorg-server/hw/xwin/winprefs.c | 2 +- xorg-server/hw/xwin/winprefslex.l | 2 - xorg-server/hw/xwin/winprefsyacc.y | 11 +- xorg-server/hw/xwin/winscrinit.c | 4 +- xorg-server/hw/xwin/winshaddd.c | 8 +- xorg-server/hw/xwin/winshadddnl.c | 6 +- xorg-server/hw/xwin/winshadgdi.c | 10 +- xorg-server/hw/xwin/winwin32rootlesswndproc.c | 2 +- xorg-server/hw/xwin/winwindowswm.c | 2 +- xorg-server/hw/xwin/winwndproc.c | 8 +- xorg-server/include/closure.h | 8 +- xorg-server/include/colormap.h | 8 +- xorg-server/include/colormapst.h | 8 +- xorg-server/include/cursor.h | 8 +- xorg-server/include/cursorstr.h | 10 +- xorg-server/include/dbus-core.h | 2 +- xorg-server/include/dix.h | 8 +- xorg-server/include/extension.h | 8 +- xorg-server/include/extnsionst.h | 10 +- xorg-server/include/gc.h | 8 +- xorg-server/include/gcstruct.h | 25 +- xorg-server/include/input.h | 8 +- xorg-server/include/inputstr.h | 14 +- xorg-server/include/list.h | 2 +- xorg-server/include/misc.h | 18 +- xorg-server/include/miscstruct.h | 8 +- xorg-server/include/os.h | 8 +- xorg-server/include/pixmap.h | 8 +- xorg-server/include/pixmapstr.h | 10 +- xorg-server/include/property.h | 8 +- xorg-server/include/propertyst.h | 10 +- xorg-server/include/region.h | 8 +- xorg-server/include/regionstr.h | 2 +- xorg-server/include/resource.h | 10 +- xorg-server/include/rgb.h | 8 +- xorg-server/include/screenint.h | 8 +- xorg-server/include/scrnintstr.h | 8 +- xorg-server/include/selection.h | 10 +- xorg-server/include/servermd.h | 10 +- xorg-server/include/site.h | 14 +- xorg-server/include/window.h | 8 +- xorg-server/include/windowstr.h | 8 +- xorg-server/include/xkbfile.h | 18 +- xorg-server/include/xkbsrv.h | 16 +- xorg-server/include/xkbstr.h | 24 +- xorg-server/include/xsha1.h | 2 +- xorg-server/mi/Makefile.am | 11 +- xorg-server/mi/mi.h | 24 +- xorg-server/mi/miarc.c | 244 ++- xorg-server/mi/mibitblt.c | 30 +- xorg-server/mi/micopy.c | 5 +- xorg-server/mi/micursor.c | 68 - xorg-server/mi/midash.c | 9 +- xorg-server/mi/midispcur.c | 4 +- xorg-server/mi/miexpose.c | 18 +- xorg-server/mi/mifillarc.c | 5 +- xorg-server/mi/mifillarc.h | 9 - xorg-server/mi/mifillrct.c | 8 +- xorg-server/mi/mifpoly.h | 50 +- xorg-server/mi/mifpolycon.c | 249 --- xorg-server/mi/migc.c | 45 +- xorg-server/mi/miglblt.c | 8 +- xorg-server/mi/miinitext.c | 8 +- xorg-server/mi/mioverlay.c | 2 +- xorg-server/mi/mipointer.c | 19 + xorg-server/mi/mipoly.c | 627 ++++++- xorg-server/mi/mipoly.h | 22 +- xorg-server/mi/mipolycon.c | 235 --- xorg-server/mi/mipolygen.c | 213 --- xorg-server/mi/mipolypnt.c | 8 +- xorg-server/mi/mipolyrect.c | 8 +- xorg-server/mi/mipolyseg.c | 10 +- xorg-server/mi/mipolytext.c | 8 +- xorg-server/mi/mipolyutil.c | 369 ---- xorg-server/mi/mipushpxl.c | 8 +- xorg-server/mi/miscrinit.c | 2 +- xorg-server/mi/mispans.c | 526 ------ xorg-server/mi/mispans.h | 87 - xorg-server/mi/mistruct.h | 8 +- xorg-server/mi/mivaltree.c | 20 +- xorg-server/mi/miwideline.c | 526 +++++- xorg-server/mi/miwideline.h | 26 - xorg-server/mi/miwindow.c | 8 +- xorg-server/mi/mizerclip.c | 8 +- xorg-server/mi/mizerline.c | 12 +- xorg-server/miext/damage/damage.c | 2 +- xorg-server/miext/rootless/rootless.h | 2 +- xorg-server/miext/rootless/rootlessGC.c | 2 +- xorg-server/miext/rootless/rootlessValTree.c | 32 +- xorg-server/miext/rootless/rootlessWindow.c | 6 +- xorg-server/miext/shadow/shrotate.c | 2 +- xorg-server/miext/sync/misyncfd.c | 4 +- xorg-server/os/WaitFor.c | 18 +- xorg-server/os/access.c | 58 +- xorg-server/os/busfault.c | 2 +- xorg-server/os/connection.c | 18 +- xorg-server/os/io.c | 10 +- xorg-server/os/log.c | 2 +- xorg-server/os/oscolor.c | 8 +- xorg-server/os/osdep.h | 8 +- xorg-server/os/osinit.c | 14 +- xorg-server/os/xdmcp.c | 2 +- xorg-server/present/present.c | 8 +- xorg-server/randr/randrstr.h | 20 +- xorg-server/randr/rrprovider.c | 2 +- xorg-server/randr/rrtransform.c | 2 +- xorg-server/randr/rrtransform.h | 2 +- xorg-server/randr/rrxinerama.c | 2 +- xorg-server/record/record.c | 20 +- xorg-server/render/animcur.c | 2 +- xorg-server/render/glyph.c | 2 +- xorg-server/render/glyphstr.h | 2 +- xorg-server/render/mipict.h | 2 +- xorg-server/render/picture.c | 2 +- xorg-server/render/picture.h | 8 +- xorg-server/render/render.c | 4 +- xorg-server/xfixes/cursor.c | 22 +- xorg-server/xfixes/region.c | 13 +- xorg-server/xkb/XKBAlloc.c | 16 +- xorg-server/xkb/XKBGAlloc.c | 16 +- xorg-server/xkb/XKBMAlloc.c | 18 +- xorg-server/xkb/XKBMisc.c | 16 +- xorg-server/xkb/ddxBeep.c | 16 +- xorg-server/xkb/ddxCtrls.c | 16 +- xorg-server/xkb/ddxKillSrv.c | 16 +- xorg-server/xkb/ddxLEDs.c | 16 +- xorg-server/xkb/ddxLoad.c | 16 +- xorg-server/xkb/ddxVT.c | 16 +- xorg-server/xkb/maprules.c | 18 +- xorg-server/xkb/xkb.c | 18 +- xorg-server/xkb/xkbAccessX.c | 18 +- xorg-server/xkb/xkbActions.c | 16 +- xorg-server/xkb/xkbEvents.c | 16 +- xorg-server/xkb/xkbInit.c | 22 +- xorg-server/xkb/xkbLEDs.c | 44 +- xorg-server/xkb/xkbPrKeyEv.c | 16 +- xorg-server/xkb/xkbSwap.c | 16 +- xorg-server/xkb/xkbUtils.c | 16 +- xorg-server/xkb/xkbfmisc.c | 18 +- xorg-server/xkb/xkbgeom.h | 16 +- xorg-server/xkb/xkbout.c | 18 +- xorg-server/xkb/xkbtext.c | 18 +- xorg-server/xkb/xkmread.c | 18 +- xorg-server/xkeyboard-config/README | 54 +- 530 files changed, 13309 insertions(+), 8075 deletions(-) diff --cc libxcb/src/c_client.py index 27cae36,56a1766..b9f47db mode 100755,100644..100755 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py diff --cc mesalib/src/glsl/ir.cpp index 5907854,fe5601a..f6aeb61 mode 100755,100644..100755 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp diff --cc mesalib/src/mapi/glapi/gen/gl_API.xml index 43e5d35,e1b1246..96146b7 mode 100755,100644..100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml diff --cc mesalib/src/mesa/drivers/dri/common/dri_util.c index f18fac6,d6e875f..2892331 mode 100755,100644..100755 --- a/mesalib/src/mesa/drivers/dri/common/dri_util.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c diff --cc mesalib/src/mesa/main/imports.h index 725416d,0fcba4f..e984cfb mode 100755,100644..100755 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h diff --cc mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj index 4b4c6bc,0000000..55ec5b2 mode 100644,000000..100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj @@@ -1,303 -1,0 +1,301 @@@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{98AB3D51-1820-4D14-9195-75FCA6997784}</ProjectGuid> + <RootNamespace>glsl_apps_compile</RootNamespace> + <Keyword>Win32Proj</Keyword> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <WholeProgramOptimization>true</WholeProgramOptimization> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>Application</ConfigurationType> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> + <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">compile</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">compile</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">compile</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">compile</TargetName> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <MinimalRebuild>true</MinimalRebuild> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\src\mesa;..\..\..\..\src\glsl;..\..\..\..\src\mapi;..\..\..\..\..\include;..\..\..\..\..;..\..\..\..\src</AdditionalIncludeDirectories> + </ClCompile> + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Console</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <RandomizedBaseAddress>false</RandomizedBaseAddress> + <DataExecutionPrevention> + </DataExecutionPrevention> + </Link> + </ItemDefinitionGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" /> ++ <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\main.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp" /> - <ClCompile Include="..\..\..\..\src\glsl\strtod.c" /> + <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" /> + <ClCompile Include="..\..\..\..\src\util\hash_table.c" /> + <ClCompile Include="..\..\..\..\src\util\ralloc.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\glsl\strtod.h" /> ++ <ClCompile Include="..\..\..\..\src\util\strtod.cpp" /> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\doflexbison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\doflexbison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\doflexbison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_lexer.cpp;..\..\..\..\src\glsl\glcpp\glcpp-lex.c;..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_parser.yy;%(AdditionalInputs)</AdditionalInputs> + </CustomBuild> + <None Include="..\..\..\..\src\glsl\glsl_parser.yy"> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\dobison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\dobison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\dobison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\dobison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\glsl\glsl_parser.cpp;..\..\..\..\src\glsl\glsl_parser.h;..\..\..\..\src\glsl\glcpp\glcpp-parse.c;..\..\..\..\src\glsl\glcpp\glcpp-parse.h</Outputs> + <FileType>Document</FileType> + </None> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --cc mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters index 1f603e9,0000000..bbf3c6d mode 100644,000000..100644 --- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters @@@ -1,334 -1,0 +1,332 @@@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> + <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> + </Filter> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\linker.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\main.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> - <ClCompile Include="..\..\..\..\src\glsl\strtod.c"> - <Filter>Source Files</Filter> - </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\standalone_scaffolding.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\imports.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\hash_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\ralloc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp"> + <Filter>Source Files</Filter> + </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\glsl\strtod.h"> ++ <ClCompile Include="..\..\..\..\src\util\strtod.cpp"> + <Filter>Source Files</Filter> - </ClInclude> ++ </ClCompile> ++ <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\src\glsl\glsl_lexer.ll"> + <Filter>Source Files</Filter> + </CustomBuild> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\..\src\glsl\glsl_parser.yy"> + <Filter>Source Files</Filter> + </None> + </ItemGroup> +</Project> diff --cc mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 6b0694a,0000000..1a5af42 mode 100644,000000..100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@@ -1,513 -1,0 +1,511 @@@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{2120C974-2717-4709-B44F-D6E6D0A56448}</ProjectGuid> + <RootNamespace>mesa</RootNamespace> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseOfMfc>false</UseOfMfc> + <CharacterSet>MultiByte</CharacterSet> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup> + <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> + <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreBuildEventUseInBuild> + <PreBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</PreBuildEventUseInBuild> + <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PreLinkEventUseInBuild> + <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PreLinkEventUseInBuild> + <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</PostBuildEventUseInBuild> + <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</PostBuildEventUseInBuild> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> + <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <OmitFramePointers>true</OmitFramePointers> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> + <BufferSecurityCheck>false</BufferSecurityCheck> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> + <OmitFramePointers>true</OmitFramePointers> + <WholeProgramOptimization>true</WholeProgramOptimization> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <StringPooling>true</StringPooling> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <FunctionLevelLinking>true</FunctionLevelLinking> + <PrecompiledHeader> + </PrecompiledHeader> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> + <BufferSecurityCheck>false</BufferSecurityCheck> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <Optimization>Disabled</Optimization> + <AdditionalIncludeDirectories>../../../../include;../../../../src/mesa;../../../../src/glsl;../../../../src/mapi;../../../../src/mesa/main;../../../../src/mesa/shader;../../../../src/mesa/shader/slang;../../../../../include;../../../../..;../../../../src/gallium/auxiliary;../../../../src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_DEBUG;DEBUG;WIN32;_LIB;_DLL;_GDI32_;BUILD_GL32;WIN32_THREADS;MESA_MINWARN;_CRT_SECURE_NO_DEPRECATE;INSERVER;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <BrowseInformation>true</BrowseInformation> + <WarningLevel>Level3</WarningLevel> + <SuppressStartupBanner>true</SuppressStartupBanner> + <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <ForcedIncludeFiles>../../../../src/mesa/main/compiler.h;%(ForcedIncludeFiles)</ForcedIncludeFiles> + </ClCompile> + <ResourceCompile> + <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <Culture>0x0409</Culture> + </ResourceCompile> + <Lib> + <SuppressStartupBanner>true</SuppressStartupBanner> + </Lib> + </ItemDefinitionGroup> + <ItemGroup> + <ProjectReference Include="..\glsl_apps_compile\glsl_apps_compile.vcxproj"> + <Project>{98ab3d51-1820-4d14-9195-75fca6997784}</Project> + <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies> + <ReferenceOutputAssembly>true</ReferenceOutputAssembly> + </ProjectReference> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp"> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </ForcedIncludeFiles> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp"> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + </ForcedIncludeFiles> + <ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + </ForcedIncludeFiles> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\linker.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp" /> ++ <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp" /> + <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp" /> - <ClCompile Include="..\..\..\..\src\glsl\strtod.c" /> + <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\accum.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\blit.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\compute.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\errors.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\formatquery.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pack.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pipelineobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\remap.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\set.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\textureview.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\blend.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\main\clear.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\clip.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\context.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\debug.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\depth.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\enable.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\enums.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\eval.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\fog.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\formats.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\get.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\hash.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\program.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c" /> + <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp" /> + <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\hint.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\image.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\imports.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\light.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\lines.c" /> + <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c" /> + <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c" /> + <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c" /> + <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c" /> + <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\mm.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\points.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\shared.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\state.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c" /> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_etc.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\samplerobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\varray.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_noop.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_primitive_restart.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c" /> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\version.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c" /> + <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c" /> + <ClCompile Include="..\..\..\..\src\util\format_srgb.c" /> + <ClCompile Include="..\..\..\..\src\util\hash_table.c" /> + <ClCompile Include="..\..\..\..\src\util\ralloc.c" /> + <ClCompile Include="..\..\..\..\src\util\rgtc.c" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\glsl\strtod.h" /> ++ <ClCompile Include="..\..\..\..\src\util\strtod.cpp" /> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l"> + <FileType>Document</FileType> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\doflexbison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\doflexbison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\doflexbison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\lex.yy.c;..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs> + <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\program_parse.y;%(AdditionalInputs)</AdditionalInputs> + </CustomBuild> + <None Include="..\..\..\..\src\mesa\program\program_parse.y"> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\dobison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\dobison.bat</Command> + <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\dobison.bat</Command> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\..\src\mesa\program\program_parse.tab.c;..\..\..\..\src\mesa\program\program_parse.tab.h;%(Outputs)</Outputs> + <FileType>Document</FileType> + </None> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project> diff --cc mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters index fdd8481,0000000..68199cc mode 100644,000000..100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters @@@ -1,837 -1,0 +1,835 @@@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Source Files"> + <UniqueIdentifier>{8411a2f0-9621-4bb9-9aec-30713df37794}</UniqueIdentifier> + <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions> + </Filter> + <Filter Include="Header Files"> + <UniqueIdentifier>{82940400-de84-4aa3-8c90-a68fc32ae059}</UniqueIdentifier> + <Extensions>h;hpp;hxx;hm;inl</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\..\..\src\mesa\main\api_arrayelt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\api_exec.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\api_loopback.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\api_validate.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\arrayobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\attrib.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\blend.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\bufferobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\ff_fragment_shader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\buffers.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\clear.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\clip.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\colortab.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\condrender.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\context.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\convolve.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\cpuinfo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\debug.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\depth.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\dlist.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\drawpix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\enable.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\enums.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\eval.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\execmem.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\extensions.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texturebarrier.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\fbobject.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\feedback.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\ffvertex_prog.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\fog.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\formats.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\format_unpack.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\framebuffer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\get.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\getstring.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\hash.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\hint.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\histogram.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\image.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\imports.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\light.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\lines.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\math\m_eval.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\math\m_matrix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\math\m_translate.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\math\m_vector.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\math\m_xform.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\matrix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\mipmap.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\mm.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\multisample.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pixel.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pixelstore.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\points.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\polygon.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\queryobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\rastpos.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\readpix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\renderbuffer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\scissor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\shared.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\state.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\stencil.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\syncobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_context.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_draw.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_pipeline.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_rasterpos.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_fog.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_light.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_normals.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_points.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_program.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_render.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texgen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_texmat.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vb_vertex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vertex_generic.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\tnl\t_vp_build.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_fxt1.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_s3tc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_etc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texenv.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\samplerobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texformat.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texgen.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texgetimage.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\teximage.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texparam.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texstate.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texstore.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\varray.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_noop.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_context.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_api.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_array.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_rebase.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_api.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_draw.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_copy.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\version.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\viewport.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\vtxfmt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\arbprogparse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\arbprogram.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\atifragshader.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\symbol_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\programopt.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\program.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\program_parse_extra.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_cache.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_execute.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_instruction.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_noise.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_optimize.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_opt_constant_fold.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_parameter_layout.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_print.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_statevars.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\lex.yy.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\program_parse.tab.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\transformfeedback.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\shader_query.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\uniform_query.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderapi.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\accum.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\querymatrix.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\uniforms.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\ir_to_mesa.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\string_to_uint_map.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_variable_index_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_hierarchical_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_variables.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_can_inline.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_function_detect_recursion.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_rvalue_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_hv_accept.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_symbol_table.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_constant_expression.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_clone.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\linker.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser_extras.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_variable_refcount.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_basic_block.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_analysis.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_controls.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_expression_flattening.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_import_prototypes.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniforms.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\loop_unroll.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_redundant_jumps.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_expr.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\hir_field_selection.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_lexer.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_reader.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\glsl_parser.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_print_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_validate.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_set_program_inouts.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_noise.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\s_expression.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pack.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pixeltransfer.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_folding.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_structure_splitting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_variable.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_algebraic.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_if_simplification.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_instructions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code_local.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vec_index_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_function_inlining.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_texture_projection.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector.cpp"> + <Filter>Source Files</Filter> + </ClCompile> - <ClCompile Include="..\..\..\..\src\glsl\strtod.c"> - <Filter>Source Files</Filter> - </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_code.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_mat_op_to_vec.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_tree_grafting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_noop_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_jumps.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_clip_distance.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_constant_propagation.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_if_to_cond_assign.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pbo.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_rgtc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texstorage.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\format_pack.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\errors.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_array_splitting.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_builder.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_discard_flow.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\vbo\vbo_primitive_restart.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\glformats.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\es1_conversion.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\drawtex.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\program\prog_hash_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\set.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_packed_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\formatquery.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_uniform_block_active_visitor.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_flatten_nested_if_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\remap.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vector_insert.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_named_interface_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_interface_blocks.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_flip_matrices.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ast_array_index.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_types.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_varyings.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\objectlabel.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\builtin_functions.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\performance_monitor.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\vdpau.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_cse.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\link_atomics.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\ir_equals.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\textureview.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\shaderimage.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_vectorize.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\blit.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\compute.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\genmipmap.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_blit.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\pipelineobj.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_rebalance_tree.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\hash_table.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\ralloc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\format_srgb.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\format_utils.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\copyimage.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_bptc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\util\rgtc.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\lower_vertex_id.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_dead_builtin_variables.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\glsl\opt_minmax.cpp"> + <Filter>Source Files</Filter> + </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\src\glsl\strtod.h"> ++ <ClCompile Include="..\..\..\..\src\util\strtod.cpp"> + <Filter>Source Files</Filter> - </ClInclude> ++ </ClCompile> ++ <ClCompile Include="..\..\..\..\src\glsl\lower_const_arrays_to_uniforms.cpp"> ++ <Filter>Source Files</Filter> ++ </ClCompile> + </ItemGroup> + <ItemGroup> + <CustomBuild Include="..\..\..\..\src\mesa\program\program_lexer.l"> + <Filter>Source Files</Filter> + </CustomBuild> + </ItemGroup> + <ItemGroup> + <None Include="..\..\..\..\src\mesa\program\program_parse.y"> + <Filter>Source Files</Filter> + </None> + </ItemGroup> +</Project> diff --cc xorg-server/Xext/xvmain.c index 607560e,0abf190..8e4c26c mode 100755,100644..100755 --- a/xorg-server/Xext/xvmain.c +++ b/xorg-server/Xext/xvmain.c diff --cc xorg-server/dix/dispatch.c index 36f9418,d844a09..ff59ad2 mode 100755,100644..100755 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@@ -1,4038 -1,3996 +1,4038 @@@ -/************************************************************ - -Copyright 1987, 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -********************************************************/ - -/* The panoramix components contained the following notice */ -/***************************************************************** - -Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. - -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. - -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 -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation -shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital -Equipment Corporation. - -******************************************************************/ - -/* XSERVER_DTRACE additions: - * Copyright (c) 2005-2006, Oracle and/or its affiliates. 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 (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#include <version-config.h> -#endif - -#ifdef PANORAMIX_DEBUG -#include <stdio.h> -int ProcInitialConnection(); -#endif - -#include "windowstr.h" -#include <X11/fonts/fontstruct.h> -#include "dixfontstr.h" -#include "gcstruct.h" -#include "selection.h" -#include "colormapst.h" -#include "cursorstr.h" -#include "scrnintstr.h" -#include "opaque.h" -#include "input.h" -#include "servermd.h" -#include "extnsionst.h" -#include "dixfont.h" -#include "dispatch.h" -#include "swaprep.h" -#include "swapreq.h" -#include "privates.h" -#include "xace.h" -#include "inputstr.h" -#include "xkbsrv.h" -#include "site.h" -#include "client.h" - -#ifdef XSERVER_DTRACE -#include "registry.h" -#include <sys/types.h> -typedef const char *string; - -#include "Xserver-dtrace.h" -#endif - -#define mskcnt ((MAXCLIENTS + 31) / 32) -#define BITMASK(i) (1U << ((i) & 31)) -#define MASKIDX(i) ((i) >> 5) -#define MASKWORD(buf, i) buf[MASKIDX(i)] -#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) -#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) -#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) - -xConnSetupPrefix connSetupPrefix; - -PaddingInfo PixmapWidthPaddingInfo[33]; - -static ClientPtr grabClient; - -#define GrabNone 0 -#define GrabActive 1 -#define GrabKickout 2 -static int grabState = GrabNone; -static long grabWaiters[mskcnt]; -CallbackListPtr ServerGrabCallback = NULL; -HWEventQueuePtr checkForInput[2]; -int connBlockScreenStart; - -static void KillAllClients(void); - -static int nextFreeClientID; /* always MIN free client ID */ - -static int nClients; /* number of authorized clients */ - -CallbackListPtr ClientStateCallback; - -/* dispatchException & isItTimeToYield must be declared volatile since they - * are modified by signal handlers - otherwise optimizer may assume it doesn't - * need to actually check value in memory when used and may miss changes from - * signal handlers. - */ -volatile char dispatchException = 0; -volatile char isItTimeToYield; - -#define SAME_SCREENS(a, b) (\ - (a.pScreen == b.pScreen)) - -void -SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1) -{ - checkForInput[0] = c0; - checkForInput[1] = c1; -} - -void -UpdateCurrentTime(void) -{ - TimeStamp systime; - - /* To avoid time running backwards, we must call GetTimeInMillis before - * calling ProcessInputEvents. - */ - systime.months = currentTime.months; - systime.milliseconds = GetTimeInMillis(); - if (systime.milliseconds < currentTime.milliseconds) - systime.months++; - if (*checkForInput[0] != *checkForInput[1]) - ProcessInputEvents(); - if (CompareTimeStamps(systime, currentTime) == LATER) - currentTime = systime; -} - -/* Like UpdateCurrentTime, but can't call ProcessInputEvents */ -void -UpdateCurrentTimeIf(void) -{ - TimeStamp systime; - - systime.months = currentTime.months; - systime.milliseconds = GetTimeInMillis(); - if (systime.milliseconds < currentTime.milliseconds) - systime.months++; - if (CompareTimeStamps(systime, currentTime) == LATER) - currentTime = systime; -} - -#undef SMART_DEBUG - -/* in milliseconds */ -#define SMART_SCHEDULE_DEFAULT_INTERVAL 5 -#define SMART_SCHEDULE_MAX_SLICE 15 - -#if defined(WIN32) && !defined(__CYGWIN__) -Bool SmartScheduleDisable = TRUE; -#else -Bool SmartScheduleDisable = FALSE; -#endif -long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; -long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; -long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE; -long SmartScheduleTime; -int SmartScheduleLatencyLimited = 0; -static ClientPtr SmartLastClient; -static int SmartLastIndex[SMART_MAX_PRIORITY - SMART_MIN_PRIORITY + 1]; - -#ifdef SMART_DEBUG -long SmartLastPrint; -#endif - -void Dispatch(void); - -static int -SmartScheduleClient(int *clientReady, int nready) -{ - ClientPtr pClient; - int i; - int client; - int bestPrio, best = 0; - int bestRobin, robin; - long now = SmartScheduleTime; - long idle; - - bestPrio = -0x7fffffff; - bestRobin = 0; - idle = 2 * SmartScheduleSlice; - for (i = 0; i < nready; i++) { - client = clientReady[i]; - pClient = clients[client]; - /* Praise clients which haven't run in a while */ - if ((now - pClient->smart_stop_tick) >= idle) { - if (pClient->smart_priority < 0) - pClient->smart_priority++; - } - - /* check priority to select best client */ - robin = - (pClient->index - - SmartLastIndex[pClient->smart_priority - - SMART_MIN_PRIORITY]) & 0xff; - if (pClient->smart_priority > bestPrio || - (pClient->smart_priority == bestPrio && robin > bestRobin)) { - bestPrio = pClient->smart_priority; - bestRobin = robin; - best = client; - } -#ifdef SMART_DEBUG - if ((now - SmartLastPrint) >= 5000) - fprintf(stderr, " %2d: %3d", client, pClient->smart_priority); -#endif - } -#ifdef SMART_DEBUG - if ((now - SmartLastPrint) >= 5000) { - fprintf(stderr, " use %2d\n", best); - SmartLastPrint = now; - } -#endif - pClient = clients[best]; - SmartLastIndex[bestPrio - SMART_MIN_PRIORITY] = pClient->index; - /* - * Set current client pointer - */ - if (SmartLastClient != pClient) { - pClient->smart_start_tick = now; - SmartLastClient = pClient; - } - /* - * Adjust slice - */ - if (nready == 1 && SmartScheduleLatencyLimited == 0) { - /* - * If it's been a long time since another client - * has run, bump the slice up to get maximal - * performance from a single client - */ - if ((now - pClient->smart_start_tick) > 1000 && - SmartScheduleSlice < SmartScheduleMaxSlice) { - SmartScheduleSlice += SmartScheduleInterval; - } - } - else { - SmartScheduleSlice = SmartScheduleInterval; - } - return best; -} - -void -EnableLimitedSchedulingLatency(void) -{ - ++SmartScheduleLatencyLimited; - SmartScheduleSlice = SmartScheduleInterval; -} - -void -DisableLimitedSchedulingLatency(void) -{ - --SmartScheduleLatencyLimited; - - /* protect against bugs */ - if (SmartScheduleLatencyLimited < 0) - SmartScheduleLatencyLimited = 0; -} - -void -Dispatch(void) -{ - int *clientReady; /* array of request ready clients */ - int result; - ClientPtr client; - int nready; - HWEventQueuePtr *icheck = checkForInput; - long start_tick; - - nextFreeClientID = 1; - nClients = 0; - - clientReady = malloc(sizeof(int) * MaxClients); - if (!clientReady) - return; - - SmartScheduleSlice = SmartScheduleInterval; - while (!dispatchException) { - if (*icheck[0] != *icheck[1]) { - ProcessInputEvents(); - FlushIfCriticalOutputPending(); - } - - nready = WaitForSomething(clientReady); - - if (nready && !SmartScheduleDisable) { - clientReady[0] = SmartScheduleClient(clientReady, nready); - nready = 1; - } - /***************** - * Handle events in round robin fashion, doing input between - * each round - *****************/ - - while (!dispatchException && (--nready >= 0)) { - client = clients[clientReady[nready]]; - if (!client) { - /* KillClient can cause this to happen */ - continue; - } - /* GrabServer activation can cause this to be true */ - if (grabState == GrabKickout) { - grabState = GrabActive; - break; - } - isItTimeToYield = FALSE; - - start_tick = SmartScheduleTime; - while (!isItTimeToYield) { - if (*icheck[0] != *icheck[1]) - ProcessInputEvents(); - - FlushIfCriticalOutputPending(); - if (!SmartScheduleDisable && - (SmartScheduleTime - start_tick) >= SmartScheduleSlice) { - /* Penalize clients which consume ticks */ - if (client->smart_priority > SMART_MIN_PRIORITY) - client->smart_priority--; - break; - } - /* now, finally, deal with client requests */ - - /* Update currentTime so request time checks, such as for input - * device grabs, are calculated correctly */ - UpdateCurrentTimeIf(); - result = ReadRequestFromClient(client); - if (result <= 0) { - if (result < 0) - CloseDownClient(client); - break; - } - - client->sequence++; - client->majorOp = ((xReq *) client->requestBuffer)->reqType; - client->minorOp = 0; - if (client->majorOp >= EXTENSION_BASE) { - ExtensionEntry *ext = GetExtensionEntry(client->majorOp); - - if (ext) - client->minorOp = ext->MinorOpcode(client); - } -#ifdef XSERVER_DTRACE - if (XSERVER_REQUEST_START_ENABLED()) - XSERVER_REQUEST_START(LookupMajorName(client->majorOp), - client->majorOp, - ((xReq *) client->requestBuffer)->length, - client->index, - client->requestBuffer); -#endif - if (result > (maxBigRequestSize << 2)) - result = BadLength; - else { - result = XaceHookDispatch(client, client->majorOp); - if (result == Success) - result = - (*client->requestVector[client->majorOp]) (client); - XaceHookAuditEnd(client, result); - } -#ifdef XSERVER_DTRACE - if (XSERVER_REQUEST_DONE_ENABLED()) - XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), - client->majorOp, client->sequence, - client->index, result); -#endif - - if (client->noClientException != Success) { - CloseDownClient(client); - break; - } - else if (result != Success) { - SendErrorToClient(client, client->majorOp, - client->minorOp, - client->errorValue, result); - break; - } - } - FlushAllOutput(); - client = clients[clientReady[nready]]; - if (client) - client->smart_stop_tick = SmartScheduleTime; - } - dispatchException &= ~DE_PRIORITYCHANGE; - } -#if defined(DDXBEFORERESET) - ddxBeforeReset(); -#endif - KillAllClients(); - free(clientReady); - dispatchException &= ~DE_RESET; - SmartScheduleLatencyLimited = 0; - ResetOsBuffers(); -} - -static int VendorRelease = VENDOR_RELEASE; -static const char *VendorString = VENDOR_NAME; - -void -SetVendorRelease(int release) -{ - VendorRelease = release; -} - -void -SetVendorString(const char *vendor) -{ - VendorString = vendor; -} - -Bool -CreateConnectionBlock(void) -{ - xConnSetup setup; - xWindowRoot root; - xDepth depth; - xVisualType visual; - xPixmapFormat format; - unsigned long vid; - int i, j, k, lenofblock, sizesofar = 0; - char *pBuf; - - memset(&setup, 0, sizeof(xConnSetup)); - /* Leave off the ridBase and ridMask, these must be sent with - connection */ - - setup.release = VendorRelease; - /* - * per-server image and bitmap parameters are defined in Xmd.h - */ - setup.imageByteOrder = screenInfo.imageByteOrder; - - setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit; - setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad; - - setup.bitmapBitOrder = screenInfo.bitmapBitOrder; - setup.motionBufferSize = NumMotionEvents(); - setup.numRoots = screenInfo.numScreens; - setup.nbytesVendor = strlen(VendorString); - setup.numFormats = screenInfo.numPixmapFormats; - setup.maxRequestSize = MAX_REQUEST_SIZE; - QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode); - - lenofblock = sizeof(xConnSetup) + - pad_to_int32(setup.nbytesVendor) + - (setup.numFormats * sizeof(xPixmapFormat)) + - (setup.numRoots * sizeof(xWindowRoot)); - ConnectionInfo = malloc(lenofblock); - if (!ConnectionInfo) - return FALSE; - - memmove(ConnectionInfo, (char *) &setup, sizeof(xConnSetup)); - sizesofar = sizeof(xConnSetup); - pBuf = ConnectionInfo + sizeof(xConnSetup); - - memmove(pBuf, VendorString, (int) setup.nbytesVendor); - sizesofar += setup.nbytesVendor; - pBuf += setup.nbytesVendor; - i = padding_for_int32(setup.nbytesVendor); - sizesofar += i; - while (--i >= 0) - *pBuf++ = 0; - - memset(&format, 0, sizeof(xPixmapFormat)); - for (i = 0; i < screenInfo.numPixmapFormats; i++) { - format.depth = screenInfo.formats[i].depth; - format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel; - format.scanLinePad = screenInfo.formats[i].scanlinePad; - memmove(pBuf, (char *) &format, sizeof(xPixmapFormat)); - pBuf += sizeof(xPixmapFormat); - sizesofar += sizeof(xPixmapFormat); - } - - connBlockScreenStart = sizesofar; - memset(&depth, 0, sizeof(xDepth)); - memset(&visual, 0, sizeof(xVisualType)); - for (i = 0; i < screenInfo.numScreens; i++) { - ScreenPtr pScreen; - DepthPtr pDepth; - VisualPtr pVisual; - - pScreen = screenInfo.screens[i]; - root.windowId = pScreen->root->drawable.id; - root.defaultColormap = pScreen->defColormap; - root.whitePixel = pScreen->whitePixel; - root.blackPixel = pScreen->blackPixel; - root.currentInputMask = 0; /* filled in when sent */ - root.pixWidth = pScreen->width; - root.pixHeight = pScreen->height; - root.mmWidth = pScreen->mmWidth; - root.mmHeight = pScreen->mmHeight; - root.minInstalledMaps = pScreen->minInstalledCmaps; - root.maxInstalledMaps = pScreen->maxInstalledCmaps; - root.rootVisualID = pScreen->rootVisual; - root.backingStore = pScreen->backingStoreSupport; - root.saveUnders = FALSE; - root.rootDepth = pScreen->rootDepth; - root.nDepths = pScreen->numDepths; - memmove(pBuf, (char *) &root, sizeof(xWindowRoot)); - sizesofar += sizeof(xWindowRoot); - pBuf += sizeof(xWindowRoot); - - pDepth = pScreen->allowedDepths; - for (j = 0; j < pScreen->numDepths; j++, pDepth++) { - lenofblock += sizeof(xDepth) + - (pDepth->numVids * sizeof(xVisualType)); - pBuf = (char *) realloc(ConnectionInfo, lenofblock); - if (!pBuf) { - free(ConnectionInfo); - return FALSE; - } - ConnectionInfo = pBuf; - pBuf += sizesofar; - depth.depth = pDepth->depth; - depth.nVisuals = pDepth->numVids; - memmove(pBuf, (char *) &depth, sizeof(xDepth)); - pBuf += sizeof(xDepth); - sizesofar += sizeof(xDepth); - for (k = 0; k < pDepth->numVids; k++) { - vid = pDepth->vids[k]; - for (pVisual = pScreen->visuals; - pVisual->vid != vid; pVisual++); - visual.visualID = vid; - visual.class = pVisual->class; - visual.bitsPerRGB = pVisual->bitsPerRGBValue; - visual.colormapEntries = pVisual->ColormapEntries; - visual.redMask = pVisual->redMask; - visual.greenMask = pVisual->greenMask; - visual.blueMask = pVisual->blueMask; - memmove(pBuf, (char *) &visual, sizeof(xVisualType)); - pBuf += sizeof(xVisualType); - sizesofar += sizeof(xVisualType); - } - } - } - connSetupPrefix.success = xTrue; - connSetupPrefix.length = lenofblock / 4; - connSetupPrefix.majorVersion = X_PROTOCOL; - connSetupPrefix.minorVersion = X_PROTOCOL_REVISION; - return TRUE; -} - -int -ProcBadRequest(ClientPtr client) -{ - return BadRequest; -} - -int -ProcCreateWindow(ClientPtr client) -{ - WindowPtr pParent, pWin; - - REQUEST(xCreateWindowReq); - int len, rc; - - REQUEST_AT_LEAST_SIZE(xCreateWindowReq); - - LEGAL_NEW_RESOURCE(stuff->wid, client); - rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess); - if (rc != Success) - return rc; - len = client->req_len - bytes_to_int32(sizeof(xCreateWindowReq)); - if (Ones(stuff->mask) != len) - return BadLength; - if (!stuff->width || !stuff->height) { - client->errorValue = 0; - return BadValue; - } - pWin = CreateWindow(stuff->wid, pParent, stuff->x, - stuff->y, stuff->width, stuff->height, - stuff->borderWidth, stuff->class, - stuff->mask, (XID *) &stuff[1], - (int) stuff->depth, client, stuff->visual, &rc); - if (pWin) { - Mask mask = pWin->eventMask; - - pWin->eventMask = 0; /* subterfuge in case AddResource fails */ - if (!AddResource(stuff->wid, RT_WINDOW, (void *) pWin)) - return BadAlloc; - pWin->eventMask = mask; - } - return rc; -} - -int -ProcChangeWindowAttributes(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xChangeWindowAttributesReq); - int len, rc; - Mask access_mode = 0; - - REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); - access_mode |= (stuff->valueMask & CWEventMask) ? DixReceiveAccess : 0; - access_mode |= (stuff->valueMask & ~CWEventMask) ? DixSetAttrAccess : 0; - rc = dixLookupWindow(&pWin, stuff->window, client, access_mode); - if (rc != Success) - return rc; - len = client->req_len - bytes_to_int32(sizeof(xChangeWindowAttributesReq)); - if (len != Ones(stuff->valueMask)) - return BadLength; - return ChangeWindowAttributes(pWin, - stuff->valueMask, (XID *) &stuff[1], client); -} - -int -ProcGetWindowAttributes(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - xGetWindowAttributesReply wa; - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - memset(&wa, 0, sizeof(xGetWindowAttributesReply)); - GetWindowAttributes(pWin, client, &wa); - WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa); - return Success; -} - -int -ProcDestroyWindow(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess); - if (rc != Success) - return rc; - if (pWin->parent) { - rc = dixLookupWindow(&pWin, pWin->parent->drawable.id, client, - DixRemoveAccess); - if (rc != Success) - return rc; - FreeResource(stuff->id, RT_NONE); - } - return Success; -} - -int -ProcDestroySubwindows(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixRemoveAccess); - if (rc != Success) - return rc; - DestroySubwindows(pWin, client); - return Success; -} - -int -ProcChangeSaveSet(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xChangeSaveSetReq); - int rc; - - REQUEST_SIZE_MATCH(xChangeSaveSetReq); - rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); - if (rc != Success) - return rc; - if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id))) - return BadMatch; - if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete)) - return AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE); - client->errorValue = stuff->mode; - return BadValue; -} - -int -ProcReparentWindow(ClientPtr client) -{ - WindowPtr pWin, pParent; - - REQUEST(xReparentWindowReq); - int rc; - - REQUEST_SIZE_MATCH(xReparentWindowReq); - rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); - if (rc != Success) - return rc; - rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess); - if (rc != Success) - return rc; - if (!SAME_SCREENS(pWin->drawable, pParent->drawable)) - return BadMatch; - if ((pWin->backgroundState == ParentRelative) && - (pParent->drawable.depth != pWin->drawable.depth)) - return BadMatch; - if ((pWin->drawable.class != InputOnly) && - (pParent->drawable.class == InputOnly)) - return BadMatch; - return ReparentWindow(pWin, pParent, - (short) stuff->x, (short) stuff->y, client); -} - -int -ProcMapWindow(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixShowAccess); - if (rc != Success) - return rc; - MapWindow(pWin, client); - /* update cache to say it is mapped */ - return Success; -} - -int -ProcMapSubwindows(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); - if (rc != Success) - return rc; - MapSubwindows(pWin, client); - /* update cache to say it is mapped */ - return Success; -} - -int -ProcUnmapWindow(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixHideAccess); - if (rc != Success) - return rc; - UnmapWindow(pWin, FALSE); - /* update cache to say it is mapped */ - return Success; -} - -int -ProcUnmapSubwindows(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xResourceReq); - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); - if (rc != Success) - return rc; - UnmapSubwindows(pWin); - return Success; -} - -int -ProcConfigureWindow(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xConfigureWindowReq); - int len, rc; - - REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); - rc = dixLookupWindow(&pWin, stuff->window, client, - DixManageAccess | DixSetAttrAccess); - if (rc != Success) - return rc; - len = client->req_len - bytes_to_int32(sizeof(xConfigureWindowReq)); - if (Ones((Mask) stuff->mask) != len) - return BadLength; - return ConfigureWindow(pWin, (Mask) stuff->mask, (XID *) &stuff[1], client); -} - -int -ProcCirculateWindow(ClientPtr client) -{ - WindowPtr pWin; - - REQUEST(xCirculateWindowReq); - int rc; - - REQUEST_SIZE_MATCH(xCirculateWindowReq); - if ((stuff->direction != RaiseLowest) && (stuff->direction != LowerHighest)) { - client->errorValue = stuff->direction; - return BadValue; - } - rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); - if (rc != Success) - return rc; - CirculateWindow(pWin, (int) stuff->direction, client); - return Success; -} - -static int -GetGeometry(ClientPtr client, xGetGeometryReply * rep) -{ - DrawablePtr pDraw; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixGetAttrAccess); - if (rc != Success) - return rc; - - rep->type = X_Reply; - rep->length = 0; - rep->sequenceNumber = client->sequence; - rep->root = pDraw->pScreen->root->drawable.id; - rep->depth = pDraw->depth; - rep->width = pDraw->width; - rep->height = pDraw->height; - - if (WindowDrawable(pDraw->type)) { - WindowPtr pWin = (WindowPtr) pDraw; - - rep->x = pWin->origin.x - wBorderWidth(pWin); - rep->y = pWin->origin.y - wBorderWidth(pWin); - rep->borderWidth = pWin->borderWidth; - } - else { /* DRAWABLE_PIXMAP */ - - rep->x = rep->y = rep->borderWidth = 0; - } - - return Success; -} - -int -ProcGetGeometry(ClientPtr client) -{ - xGetGeometryReply rep = { .type = X_Reply }; - int status; - - if ((status = GetGeometry(client, &rep)) != Success) - return status; - - WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep); - return Success; -} - -int -ProcQueryTree(ClientPtr client) -{ - xQueryTreeReply reply; - int rc, numChildren = 0; - WindowPtr pChild, pWin, pHead; - Window *childIDs = (Window *) NULL; - - REQUEST(xResourceReq); - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); - if (rc != Success) - return rc; - - reply = (xQueryTreeReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .root = pWin->drawable.pScreen->root->drawable.id, - .parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None - }; - pHead = RealChildHead(pWin); - for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib) - numChildren++; - if (numChildren) { - int curChild = 0; - - childIDs = malloc(numChildren * sizeof(Window)); - if (!childIDs) - return BadAlloc; - for (pChild = pWin->lastChild; pChild != pHead; - pChild = pChild->prevSib) - childIDs[curChild++] = pChild->drawable.id; - } - - reply.nChildren = numChildren; - reply.length = bytes_to_int32(numChildren * sizeof(Window)); - - WriteReplyToClient(client, sizeof(xQueryTreeReply), &reply); - if (numChildren) { - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, numChildren * sizeof(Window), - childIDs); - free(childIDs); - } - - return Success; -} - -int -ProcInternAtom(ClientPtr client) -{ - Atom atom; - char *tchar; - - REQUEST(xInternAtomReq); - - REQUEST_FIXED_SIZE(xInternAtomReq, stuff->nbytes); - if ((stuff->onlyIfExists != xTrue) && (stuff->onlyIfExists != xFalse)) { - client->errorValue = stuff->onlyIfExists; - return BadValue; - } - tchar = (char *) &stuff[1]; - atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists); - if (atom != BAD_RESOURCE) { - xInternAtomReply reply = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .atom = atom - }; - WriteReplyToClient(client, sizeof(xInternAtomReply), &reply); - return Success; - } - else - return BadAlloc; -} - -int -ProcGetAtomName(ClientPtr client) -{ - const char *str; - - REQUEST(xResourceReq); - - REQUEST_SIZE_MATCH(xResourceReq); - if ((str = NameForAtom(stuff->id))) { - int len = strlen(str); - xGetAtomNameReply reply = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(len), - .nameLength = len - }; - - WriteReplyToClient(client, sizeof(xGetAtomNameReply), &reply); - WriteToClient(client, len, str); - return Success; - } - else { - client->errorValue = stuff->id; - return BadAtom; - } -} - -int -ProcGrabServer(ClientPtr client) -{ - int rc; - - REQUEST_SIZE_MATCH(xReq); - if (grabState != GrabNone && client != grabClient) { - ResetCurrentRequest(client); - client->sequence--; - BITSET(grabWaiters, client->index); - IgnoreClient(client); - return Success; - } - rc = OnlyListenToOneClient(client); - if (rc != Success) - return rc; - grabState = GrabKickout; - grabClient = client; - - if (ServerGrabCallback) { - ServerGrabInfoRec grabinfo; - - grabinfo.client = client; - grabinfo.grabstate = SERVER_GRABBED; - CallCallbacks(&ServerGrabCallback, (void *) &grabinfo); - } - - return Success; -} - -static void -UngrabServer(ClientPtr client) -{ - int i; - - grabState = GrabNone; - ListenToAllClients(); - for (i = mskcnt; --i >= 0 && !grabWaiters[i];); - if (i >= 0) { - i <<= 5; - while (!GETBIT(grabWaiters, i)) - i++; - BITCLEAR(grabWaiters, i); - AttendClient(clients[i]); - } - - if (ServerGrabCallback) { - ServerGrabInfoRec grabinfo; - - grabinfo.client = client; - grabinfo.grabstate = SERVER_UNGRABBED; - CallCallbacks(&ServerGrabCallback, (void *) &grabinfo); - } -} - -int -ProcUngrabServer(ClientPtr client) -{ - REQUEST_SIZE_MATCH(xReq); - UngrabServer(client); - return Success; -} - -int -ProcTranslateCoords(ClientPtr client) -{ - REQUEST(xTranslateCoordsReq); - - WindowPtr pWin, pDst; - xTranslateCoordsReply rep; - int rc; - - REQUEST_SIZE_MATCH(xTranslateCoordsReq); - rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixGetAttrAccess); - if (rc != Success) - return rc; - rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - rep = (xTranslateCoordsReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0 - }; - if (!SAME_SCREENS(pWin->drawable, pDst->drawable)) { - rep.sameScreen = xFalse; - rep.child = None; - rep.dstX = rep.dstY = 0; - } - else { - INT16 x, y; - - rep.sameScreen = xTrue; - rep.child = None; - /* computing absolute coordinates -- adjust to destination later */ - x = pWin->drawable.x + stuff->srcX; - y = pWin->drawable.y + stuff->srcY; - pWin = pDst->firstChild; - while (pWin) { - BoxRec box; - - if ((pWin->mapped) && - (x >= pWin->drawable.x - wBorderWidth(pWin)) && - (x < pWin->drawable.x + (int) pWin->drawable.width + - wBorderWidth(pWin)) && - (y >= pWin->drawable.y - wBorderWidth(pWin)) && - (y < pWin->drawable.y + (int) pWin->drawable.height + - wBorderWidth(pWin)) - /* When a window is shaped, a further check - * is made to see if the point is inside - * borderSize - */ - && (!wBoundingShape(pWin) || - RegionContainsPoint(&pWin->borderSize, x, y, &box)) - - && (!wInputShape(pWin) || - RegionContainsPoint(wInputShape(pWin), - x - pWin->drawable.x, - y - pWin->drawable.y, &box)) - ) { - rep.child = pWin->drawable.id; - pWin = (WindowPtr) NULL; - } - else - pWin = pWin->nextSib; - } - /* adjust to destination coordinates */ - rep.dstX = x - pDst->drawable.x; - rep.dstY = y - pDst->drawable.y; - } - WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep); - return Success; -} - -int -ProcOpenFont(ClientPtr client) -{ - int err; - - REQUEST(xOpenFontReq); - - REQUEST_FIXED_SIZE(xOpenFontReq, stuff->nbytes); - client->errorValue = stuff->fid; - LEGAL_NEW_RESOURCE(stuff->fid, client); - err = OpenFont(client, stuff->fid, (Mask) 0, - stuff->nbytes, (char *) &stuff[1]); - if (err == Success) { - return Success; - } - else - return err; -} - -int -ProcCloseFont(ClientPtr client) -{ - FontPtr pFont; - int rc; - - REQUEST(xResourceReq); - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResourceByType((void **) &pFont, stuff->id, RT_FONT, - client, DixDestroyAccess); - if (rc == Success) { - FreeResource(stuff->id, RT_NONE); - return Success; - } - else { - client->errorValue = stuff->id; - return rc; - } -} - -int -ProcQueryFont(ClientPtr client) -{ - xQueryFontReply *reply; - FontPtr pFont; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - { - xCharInfo *pmax = FONTINKMAX(pFont); - xCharInfo *pmin = FONTINKMIN(pFont); - int nprotoxcistructs; - int rlength; - - nprotoxcistructs = (pmax->rightSideBearing == pmin->rightSideBearing && - pmax->leftSideBearing == pmin->leftSideBearing && - pmax->descent == pmin->descent && - pmax->ascent == pmin->ascent && - pmax->characterWidth == pmin->characterWidth) ? - 0 : N2dChars(pFont); - - rlength = sizeof(xQueryFontReply) + - FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) + - nprotoxcistructs * sizeof(xCharInfo); - reply = calloc(1, rlength); - if (!reply) { - return BadAlloc; - } - - reply->type = X_Reply; - reply->length = bytes_to_int32(rlength - sizeof(xGenericReply)); - reply->sequenceNumber = client->sequence; - QueryFont(pFont, reply, nprotoxcistructs); - - WriteReplyToClient(client, rlength, reply); - free(reply); - return Success; - } -} - -int -ProcQueryTextExtents(ClientPtr client) -{ - xQueryTextExtentsReply reply; - FontPtr pFont; - ExtentInfoRec info; - unsigned long length; - int rc; - - REQUEST(xQueryTextExtentsReq); - REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq); - - rc = dixLookupFontable(&pFont, stuff->fid, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - length = client->req_len - bytes_to_int32(sizeof(xQueryTextExtentsReq)); - length = length << 1; - if (stuff->oddLength) { - if (length == 0) - return BadLength; - length--; - } - if (!QueryTextExtents(pFont, length, (unsigned char *) &stuff[1], &info)) - return BadAlloc; - reply = (xQueryTextExtentsReply) { - .type = X_Reply, - .drawDirection = info.drawDirection, - .sequenceNumber = client->sequence, - .length = 0, - .fontAscent = info.fontAscent, - .fontDescent = info.fontDescent, - .overallAscent = info.overallAscent, - .overallDescent = info.overallDescent, - .overallWidth = info.overallWidth, - .overallLeft = info.overallLeft, - .overallRight = info.overallRight - }; - WriteReplyToClient(client, sizeof(xQueryTextExtentsReply), &reply); - return Success; -} - -int -ProcListFonts(ClientPtr client) -{ - REQUEST(xListFontsReq); - - REQUEST_FIXED_SIZE(xListFontsReq, stuff->nbytes); - - return ListFonts(client, (unsigned char *) &stuff[1], stuff->nbytes, - stuff->maxNames); -} - -int -ProcListFontsWithInfo(ClientPtr client) -{ - REQUEST(xListFontsWithInfoReq); - - REQUEST_FIXED_SIZE(xListFontsWithInfoReq, stuff->nbytes); - - return StartListFontsWithInfo(client, stuff->nbytes, - (unsigned char *) &stuff[1], stuff->maxNames); -} - -/** - * - * \param value must conform to DeleteType - */ -int -dixDestroyPixmap(void *value, XID pid) -{ - PixmapPtr pPixmap = (PixmapPtr) value; - - return (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap); -} - -int -ProcCreatePixmap(ClientPtr client) -{ - PixmapPtr pMap; - DrawablePtr pDraw; - - REQUEST(xCreatePixmapReq); - DepthPtr pDepth; - int i, rc; - - REQUEST_SIZE_MATCH(xCreatePixmapReq); - client->errorValue = stuff->pid; - LEGAL_NEW_RESOURCE(stuff->pid, client); - - rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, - DixGetAttrAccess); - if (rc != Success) - return rc; - - if (!stuff->width || !stuff->height) { - client->errorValue = 0; - return BadValue; - } - if (stuff->width > 32767 || stuff->height > 32767) { - /* It is allowed to try and allocate a pixmap which is larger than - * 32767 in either dimension. However, all of the framebuffer code - * is buggy and does not reliably draw to such big pixmaps, basically - * because the Region data structure operates with signed shorts - * for the rectangles in it. - * - * Furthermore, several places in the X server computes the - * size in bytes of the pixmap and tries to store it in an - * integer. This integer can overflow and cause the allocated size - * to be much smaller. - * - * So, such big pixmaps are rejected here with a BadAlloc - */ - return BadAlloc; - } - if (stuff->depth != 1) { - pDepth = pDraw->pScreen->allowedDepths; - for (i = 0; i < pDraw->pScreen->numDepths; i++, pDepth++) - if (pDepth->depth == stuff->depth) - goto CreatePmap; - client->errorValue = stuff->depth; - return BadValue; - } - CreatePmap: - pMap = (PixmapPtr) (*pDraw->pScreen->CreatePixmap) - (pDraw->pScreen, stuff->width, stuff->height, stuff->depth, 0); - if (pMap) { - pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; - pMap->drawable.id = stuff->pid; - /* security creation/labeling check */ - rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP, - pMap, RT_NONE, NULL, DixCreateAccess); - if (rc != Success) { - (*pDraw->pScreen->DestroyPixmap) (pMap); - return rc; - } - if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) - return Success; - } - return BadAlloc; -} - -int -ProcFreePixmap(ClientPtr client) -{ - PixmapPtr pMap; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupResourceByType((void **) &pMap, stuff->id, RT_PIXMAP, - client, DixDestroyAccess); - if (rc == Success) { - FreeResource(stuff->id, RT_NONE); - return Success; - } - else { - client->errorValue = stuff->id; - return rc; - } -} - -int -ProcCreateGC(ClientPtr client) -{ - int error, rc; - GC *pGC; - DrawablePtr pDraw; - unsigned len; - - REQUEST(xCreateGCReq); - - REQUEST_AT_LEAST_SIZE(xCreateGCReq); - client->errorValue = stuff->gc; - LEGAL_NEW_RESOURCE(stuff->gc, client); - rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, - DixGetAttrAccess); - if (rc != Success) - return rc; - - len = client->req_len - bytes_to_int32(sizeof(xCreateGCReq)); - if (len != Ones(stuff->mask)) - return BadLength; - pGC = (GC *) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error, - stuff->gc, client); - if (error != Success) - return error; - if (!AddResource(stuff->gc, RT_GC, (void *) pGC)) - return BadAlloc; - return Success; -} - -int -ProcChangeGC(ClientPtr client) -{ - GC *pGC; - int result; - unsigned len; - - REQUEST(xChangeGCReq); - REQUEST_AT_LEAST_SIZE(xChangeGCReq); - - result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); - if (result != Success) - return result; - - len = client->req_len - bytes_to_int32(sizeof(xChangeGCReq)); - if (len != Ones(stuff->mask)) - return BadLength; - - return ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]); -} - -int -ProcCopyGC(ClientPtr client) -{ - GC *dstGC; - GC *pGC; - int result; - - REQUEST(xCopyGCReq); - REQUEST_SIZE_MATCH(xCopyGCReq); - - result = dixLookupGC(&pGC, stuff->srcGC, client, DixGetAttrAccess); - if (result != Success) - return result; - result = dixLookupGC(&dstGC, stuff->dstGC, client, DixSetAttrAccess); - if (result != Success) - return result; - if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth)) - return BadMatch; - if (stuff->mask & ~GCAllBits) { - client->errorValue = stuff->mask; - return BadValue; - } - return CopyGC(pGC, dstGC, stuff->mask); -} - -int -ProcSetDashes(ClientPtr client) -{ - GC *pGC; - int result; - - REQUEST(xSetDashesReq); - - REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes); - if (stuff->nDashes == 0) { - client->errorValue = 0; - return BadValue; - } - - result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); - if (result != Success) - return result; - - /* If there's an error, either there's no sensible errorValue, - * or there was a dash segment of 0. */ - client->errorValue = 0; - return SetDashes(pGC, stuff->dashOffset, stuff->nDashes, - (unsigned char *) &stuff[1]); -} - -int -ProcSetClipRectangles(ClientPtr client) -{ - int nr, result; - GC *pGC; - - REQUEST(xSetClipRectanglesReq); - - REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); - if ((stuff->ordering != Unsorted) && (stuff->ordering != YSorted) && - (stuff->ordering != YXSorted) && (stuff->ordering != YXBanded)) { - client->errorValue = stuff->ordering; - return BadValue; - } - result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); - if (result != Success) - return result; - - nr = (client->req_len << 2) - sizeof(xSetClipRectanglesReq); - if (nr & 4) - return BadLength; - nr >>= 3; - return SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin, - nr, (xRectangle *) &stuff[1], (int) stuff->ordering); -} - -int -ProcFreeGC(ClientPtr client) -{ - GC *pGC; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupGC(&pGC, stuff->id, client, DixDestroyAccess); - if (rc != Success) - return rc; - - FreeResource(stuff->id, RT_NONE); - return Success; -} - -int -ProcClearToBackground(ClientPtr client) -{ - REQUEST(xClearAreaReq); - WindowPtr pWin; - int rc; - - REQUEST_SIZE_MATCH(xClearAreaReq); - rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); - if (rc != Success) - return rc; - if (pWin->drawable.class == InputOnly) { - client->errorValue = stuff->window; - return BadMatch; - } - if ((stuff->exposures != xTrue) && (stuff->exposures != xFalse)) { - client->errorValue = stuff->exposures; - return BadValue; - } - (*pWin->drawable.pScreen->ClearToBackground) (pWin, stuff->x, stuff->y, - stuff->width, stuff->height, - (Bool) stuff->exposures); - return Success; -} - -/* send GraphicsExpose events, or a NoExpose event, based on the region */ -void -SendGraphicsExpose(ClientPtr client, RegionPtr pRgn, XID drawable, - int major, int minor) -{ - if (pRgn && !RegionNil(pRgn)) { - xEvent *pEvent; - xEvent *pe; - BoxPtr pBox; - int i; - int numRects; - - numRects = RegionNumRects(pRgn); - pBox = RegionRects(pRgn); - if (!(pEvent = calloc(numRects, sizeof(xEvent)))) - return; - pe = pEvent; - - for (i = 1; i <= numRects; i++, pe++, pBox++) { - pe->u.u.type = GraphicsExpose; - pe->u.graphicsExposure.drawable = drawable; - pe->u.graphicsExposure.x = pBox->x1; - pe->u.graphicsExposure.y = pBox->y1; - pe->u.graphicsExposure.width = pBox->x2 - pBox->x1; - pe->u.graphicsExposure.height = pBox->y2 - pBox->y1; - pe->u.graphicsExposure.count = numRects - i; - pe->u.graphicsExposure.majorEvent = major; - pe->u.graphicsExposure.minorEvent = minor; - } - /* GraphicsExpose is a "critical event", which TryClientEvents - * handles specially. */ - TryClientEvents(client, NULL, pEvent, numRects, - (Mask) 0, NoEventMask, NullGrab); - free(pEvent); - } - else { - xEvent event = { - .u.noExposure.drawable = drawable, - .u.noExposure.majorEvent = major, - .u.noExposure.minorEvent = minor - }; - event.u.u.type = NoExpose; - WriteEventsToClient(client, 1, &event); - } -} - -int -ProcCopyArea(ClientPtr client) -{ - DrawablePtr pDst; - DrawablePtr pSrc; - GC *pGC; - - REQUEST(xCopyAreaReq); - RegionPtr pRgn; - int rc; - - REQUEST_SIZE_MATCH(xCopyAreaReq); - - VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess); - if (stuff->dstDrawable != stuff->srcDrawable) { - rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0, - DixReadAccess); - if (rc != Success) - return rc; - if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) { - client->errorValue = stuff->dstDrawable; - return BadMatch; - } - } - else - pSrc = pDst; - - pRgn = (*pGC->ops->CopyArea) (pSrc, pDst, pGC, stuff->srcX, stuff->srcY, - stuff->width, stuff->height, - stuff->dstX, stuff->dstY); - if (pGC->graphicsExposures) { - SendGraphicsExpose(client, pRgn, stuff->dstDrawable, X_CopyArea, 0); - if (pRgn) - RegionDestroy(pRgn); - } - - return Success; -} - -int -ProcCopyPlane(ClientPtr client) -{ - DrawablePtr psrcDraw, pdstDraw; - GC *pGC; - - REQUEST(xCopyPlaneReq); - RegionPtr pRgn; - int rc; - - REQUEST_SIZE_MATCH(xCopyPlaneReq); - - VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess); - if (stuff->dstDrawable != stuff->srcDrawable) { - rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0, - DixReadAccess); - if (rc != Success) - return rc; - - if (pdstDraw->pScreen != psrcDraw->pScreen) { - client->errorValue = stuff->dstDrawable; - return BadMatch; - } - } - else - psrcDraw = pdstDraw; - - /* Check to see if stuff->bitPlane has exactly ONE good bit set */ - if (stuff->bitPlane == 0 || (stuff->bitPlane & (stuff->bitPlane - 1)) || - (stuff->bitPlane > (1L << (psrcDraw->depth - 1)))) { - client->errorValue = stuff->bitPlane; - return BadValue; - } - - pRgn = - (*pGC->ops->CopyPlane) (psrcDraw, pdstDraw, pGC, stuff->srcX, - stuff->srcY, stuff->width, stuff->height, - stuff->dstX, stuff->dstY, stuff->bitPlane); - if (pGC->graphicsExposures) { - SendGraphicsExpose(client, pRgn, stuff->dstDrawable, X_CopyPlane, 0); - if (pRgn) - RegionDestroy(pRgn); - } - return Success; -} - -int -ProcPolyPoint(ClientPtr client) -{ - int npoint; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyPointReq); - - REQUEST_AT_LEAST_SIZE(xPolyPointReq); - if ((stuff->coordMode != CoordModeOrigin) && - (stuff->coordMode != CoordModePrevious)) { - client->errorValue = stuff->coordMode; - return BadValue; - } - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyPointReq)); - if (npoint) - (*pGC->ops->PolyPoint) (pDraw, pGC, stuff->coordMode, npoint, - (xPoint *) &stuff[1]); - return Success; -} - -int -ProcPolyLine(ClientPtr client) -{ - int npoint; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyLineReq); - - REQUEST_AT_LEAST_SIZE(xPolyLineReq); - if ((stuff->coordMode != CoordModeOrigin) && - (stuff->coordMode != CoordModePrevious)) { - client->errorValue = stuff->coordMode; - return BadValue; - } - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq)); - if (npoint > 1) - (*pGC->ops->Polylines) (pDraw, pGC, stuff->coordMode, npoint, - (DDXPointPtr) &stuff[1]); - return Success; -} - -int -ProcPolySegment(ClientPtr client) -{ - int nsegs; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolySegmentReq); - - REQUEST_AT_LEAST_SIZE(xPolySegmentReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq); - if (nsegs & 4) - return BadLength; - nsegs >>= 3; - if (nsegs) - (*pGC->ops->PolySegment) (pDraw, pGC, nsegs, (xSegment *) &stuff[1]); - return Success; -} - -int -ProcPolyRectangle(ClientPtr client) -{ - int nrects; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyRectangleReq); - - REQUEST_AT_LEAST_SIZE(xPolyRectangleReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq); - if (nrects & 4) - return BadLength; - nrects >>= 3; - if (nrects) - (*pGC->ops->PolyRectangle) (pDraw, pGC, - nrects, (xRectangle *) &stuff[1]); - return Success; -} - -int -ProcPolyArc(ClientPtr client) -{ - int narcs; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyArcReq); - - REQUEST_AT_LEAST_SIZE(xPolyArcReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - narcs = (client->req_len << 2) - sizeof(xPolyArcReq); - if (narcs % sizeof(xArc)) - return BadLength; - narcs /= sizeof(xArc); - if (narcs) - (*pGC->ops->PolyArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]); - return Success; -} - -int -ProcFillPoly(ClientPtr client) -{ - int things; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xFillPolyReq); - - REQUEST_AT_LEAST_SIZE(xFillPolyReq); - if ((stuff->shape != Complex) && (stuff->shape != Nonconvex) && - (stuff->shape != Convex)) { - client->errorValue = stuff->shape; - return BadValue; - } - if ((stuff->coordMode != CoordModeOrigin) && - (stuff->coordMode != CoordModePrevious)) { - client->errorValue = stuff->coordMode; - return BadValue; - } - - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - things = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq)); - if (things) - (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape, - stuff->coordMode, things, - (DDXPointPtr) &stuff[1]); - return Success; -} - -int -ProcPolyFillRectangle(ClientPtr client) -{ - int things; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyFillRectangleReq); - - REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq); - if (things & 4) - return BadLength; - things >>= 3; - - if (things) - (*pGC->ops->PolyFillRect) (pDraw, pGC, things, - (xRectangle *) &stuff[1]); - return Success; -} - -int -ProcPolyFillArc(ClientPtr client) -{ - int narcs; - GC *pGC; - DrawablePtr pDraw; - - REQUEST(xPolyFillArcReq); - - REQUEST_AT_LEAST_SIZE(xPolyFillArcReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq); - if (narcs % sizeof(xArc)) - return BadLength; - narcs /= sizeof(xArc); - if (narcs) - (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]); - return Success; -} - -#ifdef MATCH_CLIENT_ENDIAN - -int -ServerOrder(void) -{ - int whichbyte = 1; - - if (*((char *) &whichbyte)) - return LSBFirst; - return MSBFirst; -} - -#define ClientOrder(client) ((client)->swapped ? !ServerOrder() : ServerOrder()) - -void -ReformatImage(char *base, int nbytes, int bpp, int order) -{ - switch (bpp) { - case 1: /* yuck */ - if (BITMAP_BIT_ORDER != order) - BitOrderInvert((unsigned char *) base, nbytes); -#if IMAGE_BYTE_ORDER != BITMAP_BIT_ORDER && BITMAP_SCANLINE_UNIT != 8 - ReformatImage(base, nbytes, BITMAP_SCANLINE_UNIT, order); -#endif - break; - case 4: - break; /* yuck */ - case 8: - break; - case 16: - if (IMAGE_BYTE_ORDER != order) - TwoByteSwap((unsigned char *) base, nbytes); - break; - case 32: - if (IMAGE_BYTE_ORDER != order) - FourByteSwap((unsigned char *) base, nbytes); - break; - } -} -#else -#define ReformatImage(b,n,bpp,o) -#endif - -/* 64-bit server notes: the protocol restricts padding of images to - * 8-, 16-, or 32-bits. We would like to have 64-bits for the server - * to use internally. Removes need for internal alignment checking. - * All of the PutImage functions could be changed individually, but - * as currently written, they call other routines which require things - * to be 64-bit padded on scanlines, so we changed things here. - * If an image would be padded differently for 64- versus 32-, then - * copy each scanline to a 64-bit padded scanline. - * Also, we need to make sure that the image is aligned on a 64-bit - * boundary, even if the scanlines are padded to our satisfaction. - */ -int -ProcPutImage(ClientPtr client) -{ - GC *pGC; - DrawablePtr pDraw; - long length; /* length of scanline server padded */ - long lengthProto; /* length of scanline protocol padded */ - char *tmpImage; - - REQUEST(xPutImageReq); - - REQUEST_AT_LEAST_SIZE(xPutImageReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - if (stuff->format == XYBitmap) { - if ((stuff->depth != 1) || - (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad)) - return BadMatch; - length = BitmapBytePad(stuff->width + stuff->leftPad); - } - else if (stuff->format == XYPixmap) { - if ((pDraw->depth != stuff->depth) || - (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad)) - return BadMatch; - length = BitmapBytePad(stuff->width + stuff->leftPad); - length *= stuff->depth; - } - else if (stuff->format == ZPixmap) { - if ((pDraw->depth != stuff->depth) || (stuff->leftPad != 0)) - return BadMatch; - length = PixmapBytePad(stuff->width, stuff->depth); - } - else { - client->errorValue = stuff->format; - return BadValue; - } - - tmpImage = (char *) &stuff[1]; - lengthProto = length; - - if ((bytes_to_int32(lengthProto * stuff->height) + - bytes_to_int32(sizeof(xPutImageReq))) != client->req_len) - return BadLength; - - ReformatImage(tmpImage, lengthProto * stuff->height, - stuff->format == ZPixmap ? BitsPerPixel(stuff->depth) : 1, - ClientOrder(client)); - - (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, stuff->dstX, stuff->dstY, - stuff->width, stuff->height, - stuff->leftPad, stuff->format, tmpImage); - - return Success; -} - -static int -DoGetImage(ClientPtr client, int format, Drawable drawable, - int x, int y, int width, int height, - Mask planemask) -{ - DrawablePtr pDraw, pBoundingDraw; - int nlines, linesPerBuf, rc; - int linesDone; - - /* coordinates relative to the bounding drawable */ - int relx, rely; - long widthBytesLine, length; - Mask plane = 0; - char *pBuf; - xGetImageReply xgi; - RegionPtr pVisibleRegion = NULL; - - if ((format != XYPixmap) && (format != ZPixmap)) { - client->errorValue = format; - return BadValue; - } - rc = dixLookupDrawable(&pDraw, drawable, client, 0, DixReadAccess); - if (rc != Success) - return rc; - - memset(&xgi, 0, sizeof(xGetImageReply)); - - relx = x; - rely = y; - - if (pDraw->type == DRAWABLE_WINDOW) { - WindowPtr pWin = (WindowPtr) pDraw; - - /* "If the drawable is a window, the window must be viewable ... or a - * BadMatch error results" */ - if (!pWin->viewable) - return BadMatch; - - /* If the drawable is a window, the rectangle must be contained within - * its bounds (including the border). */ - if (x < -wBorderWidth(pWin) || - x + width > wBorderWidth(pWin) + (int) pDraw->width || - y < -wBorderWidth(pWin) || - y + height > wBorderWidth(pWin) + (int) pDraw->height) - return BadMatch; - - relx += pDraw->x; - rely += pDraw->y; - - if (pDraw->pScreen->GetWindowPixmap) { - PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin); - - pBoundingDraw = &pPix->drawable; -#ifdef COMPOSITE - relx -= pPix->screen_x; - rely -= pPix->screen_y; -#endif - } - else { - pBoundingDraw = (DrawablePtr) pDraw->pScreen->root; - } - - xgi.visual = wVisual(pWin); - } - else { - pBoundingDraw = pDraw; - xgi.visual = None; - } - - /* "If the drawable is a pixmap, the given rectangle must be wholly - * contained within the pixmap, or a BadMatch error results. If the - * drawable is a window [...] it must be the case that if there were no - * inferiors or overlapping windows, the specified rectangle of the window - * would be fully visible on the screen and wholly contained within the - * outside edges of the window, or a BadMatch error results." - * - * We relax the window case slightly to mean that the rectangle must exist - * within the bounds of the window's backing pixmap. In particular, this - * means that a GetImage request may succeed or fail with BadMatch depending - * on whether any of its ancestor windows are redirected. */ - if (relx < 0 || relx + width > (int) pBoundingDraw->width || - rely < 0 || rely + height > (int) pBoundingDraw->height) - return BadMatch; - - xgi.type = X_Reply; - xgi.sequenceNumber = client->sequence; - xgi.depth = pDraw->depth; - if (format == ZPixmap) { - widthBytesLine = PixmapBytePad(width, pDraw->depth); - length = widthBytesLine * height; - - } - else { - widthBytesLine = BitmapBytePad(width); - plane = ((Mask) 1) << (pDraw->depth - 1); - /* only planes asked for */ - length = widthBytesLine * height * - Ones(planemask & (plane | (plane - 1))); - - } - - xgi.length = length; - - xgi.length = bytes_to_int32(xgi.length); - if (widthBytesLine == 0 || height == 0) - linesPerBuf = 0; - else if (widthBytesLine >= IMAGE_BUFSIZE) - linesPerBuf = 1; - else { - linesPerBuf = IMAGE_BUFSIZE / widthBytesLine; - if (linesPerBuf > height) - linesPerBuf = height; - } - length = linesPerBuf * widthBytesLine; - if (linesPerBuf < height) { - /* we have to make sure intermediate buffers don't need padding */ - while ((linesPerBuf > 1) && - (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) { - linesPerBuf--; - length -= widthBytesLine; - } - while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) { - linesPerBuf++; - length += widthBytesLine; - } - } - if (!(pBuf = calloc(1, length))) - return BadAlloc; - WriteReplyToClient(client, sizeof(xGetImageReply), &xgi); - - if (pDraw->type == DRAWABLE_WINDOW) { - pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw); - if (pVisibleRegion) { - RegionTranslate(pVisibleRegion, -pDraw->x, -pDraw->y); - } - } - - if (linesPerBuf == 0) { - /* nothing to do */ - } - else if (format == ZPixmap) { - linesDone = 0; - while (height - linesDone > 0) { - nlines = min(linesPerBuf, height - linesDone); - (*pDraw->pScreen->GetImage) (pDraw, - x, - y + linesDone, - width, - nlines, - format, planemask, (void *) pBuf); - if (pVisibleRegion) - XaceCensorImage(client, pVisibleRegion, widthBytesLine, - pDraw, x, y + linesDone, width, - nlines, format, pBuf); - - /* Note that this is NOT a call to WriteSwappedDataToClient, - as we do NOT byte swap */ - ReformatImage(pBuf, (int) (nlines * widthBytesLine), - BitsPerPixel(pDraw->depth), ClientOrder(client)); - - WriteToClient(client, (int) (nlines * widthBytesLine), pBuf); - linesDone += nlines; - } - } - else { /* XYPixmap */ - - for (; plane; plane >>= 1) { - if (planemask & plane) { - linesDone = 0; - while (height - linesDone > 0) { - nlines = min(linesPerBuf, height - linesDone); - (*pDraw->pScreen->GetImage) (pDraw, - x, - y + linesDone, - width, - nlines, - format, plane, (void *) pBuf); - if (pVisibleRegion) - XaceCensorImage(client, pVisibleRegion, - widthBytesLine, - pDraw, x, y + linesDone, width, - nlines, format, pBuf); - - /* Note: NOT a call to WriteSwappedDataToClient, - as we do NOT byte swap */ - ReformatImage(pBuf, (int) (nlines * widthBytesLine), - 1, ClientOrder(client)); - - WriteToClient(client, (int)(nlines * widthBytesLine), pBuf); - linesDone += nlines; - } - } - } - } - if (pVisibleRegion) - RegionDestroy(pVisibleRegion); - free(pBuf); - return Success; -} - -int -ProcGetImage(ClientPtr client) -{ - REQUEST(xGetImageReq); - - REQUEST_SIZE_MATCH(xGetImageReq); - - return DoGetImage(client, stuff->format, stuff->drawable, - stuff->x, stuff->y, - (int) stuff->width, (int) stuff->height, - stuff->planeMask); -} - -int -ProcPolyText(ClientPtr client) -{ - int err; - - REQUEST(xPolyTextReq); - DrawablePtr pDraw; - GC *pGC; - - REQUEST_AT_LEAST_SIZE(xPolyTextReq); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - - err = PolyText(client, - pDraw, - pGC, - (unsigned char *) &stuff[1], - ((unsigned char *) stuff) + (client->req_len << 2), - stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; -} - -int -ProcImageText8(ClientPtr client) -{ - int err; - DrawablePtr pDraw; - GC *pGC; - - REQUEST(xImageTextReq); - - REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - - err = ImageText(client, - pDraw, - pGC, - stuff->nChars, - (unsigned char *) &stuff[1], - stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; -} - -int -ProcImageText16(ClientPtr client) -{ - int err; - DrawablePtr pDraw; - GC *pGC; - - REQUEST(xImageTextReq); - - REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); - VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); - - err = ImageText(client, - pDraw, - pGC, - stuff->nChars, - (unsigned char *) &stuff[1], - stuff->x, stuff->y, stuff->reqType, stuff->drawable); - - if (err == Success) { - return Success; - } - else - return err; -} - -int -ProcCreateColormap(ClientPtr client) -{ - VisualPtr pVisual; - ColormapPtr pmap; - Colormap mid; - WindowPtr pWin; - ScreenPtr pScreen; - - REQUEST(xCreateColormapReq); - int i, result; - - REQUEST_SIZE_MATCH(xCreateColormapReq); - - if ((stuff->alloc != AllocNone) && (stuff->alloc != AllocAll)) { - client->errorValue = stuff->alloc; - return BadValue; - } - mid = stuff->mid; - LEGAL_NEW_RESOURCE(mid, client); - result = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); - if (result != Success) - return result; - - pScreen = pWin->drawable.pScreen; - for (i = 0, pVisual = pScreen->visuals; - i < pScreen->numVisuals; i++, pVisual++) { - if (pVisual->vid != stuff->visual) - continue; - return CreateColormap(mid, pScreen, pVisual, &pmap, - (int) stuff->alloc, client->index); - } - client->errorValue = stuff->visual; - return BadMatch; -} - -int -ProcFreeColormap(ClientPtr client) -{ - ColormapPtr pmap; - int rc; - - REQUEST(xResourceReq); - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResourceByType((void **) &pmap, stuff->id, RT_COLORMAP, - client, DixDestroyAccess); - if (rc == Success) { - /* Freeing a default colormap is a no-op */ - if (!(pmap->flags & IsDefault)) - FreeResource(stuff->id, RT_NONE); - return Success; - } - else { - client->errorValue = stuff->id; - return rc; - } -} - -int -ProcCopyColormapAndFree(ClientPtr client) -{ - Colormap mid; - ColormapPtr pSrcMap; - - REQUEST(xCopyColormapAndFreeReq); - int rc; - - REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq); - mid = stuff->mid; - LEGAL_NEW_RESOURCE(mid, client); - rc = dixLookupResourceByType((void **) &pSrcMap, stuff->srcCmap, - RT_COLORMAP, client, - DixReadAccess | DixRemoveAccess); - if (rc == Success) - return CopyColormapAndFree(mid, pSrcMap, client->index); - client->errorValue = stuff->srcCmap; - return rc; -} - -int -ProcInstallColormap(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP, - client, DixInstallAccess); - if (rc != Success) - goto out; - - rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess); - if (rc != Success) { - if (rc == BadValue) - rc = BadColor; - goto out; - } - - (*(pcmp->pScreen->InstallColormap)) (pcmp); - return Success; - - out: - client->errorValue = stuff->id; - return rc; -} - -int -ProcUninstallColormap(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP, - client, DixUninstallAccess); - if (rc != Success) - goto out; - - rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess); - if (rc != Success) { - if (rc == BadValue) - rc = BadColor; - goto out; - } - - if (pcmp->mid != pcmp->pScreen->defColormap) - (*(pcmp->pScreen->UninstallColormap)) (pcmp); - return Success; - - out: - client->errorValue = stuff->id; - return rc; -} - -int -ProcListInstalledColormaps(ClientPtr client) -{ - xListInstalledColormapsReply *preply; - int nummaps, rc; - WindowPtr pWin; - - REQUEST(xResourceReq); - REQUEST_SIZE_MATCH(xResourceReq); - - rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); - if (rc != Success) - return rc; - - rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen, - DixGetAttrAccess); - if (rc != Success) - return rc; - - preply = malloc(sizeof(xListInstalledColormapsReply) + - pWin->drawable.pScreen->maxInstalledCmaps * - sizeof(Colormap)); - if (!preply) - return BadAlloc; - - preply->type = X_Reply; - preply->sequenceNumber = client->sequence; - nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps) - (pWin->drawable.pScreen, (Colormap *) &preply[1]); - preply->nColormaps = nummaps; - preply->length = nummaps; - WriteReplyToClient(client, sizeof(xListInstalledColormapsReply), preply); - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]); - free(preply); - return Success; -} - -int -ProcAllocColor(ClientPtr client) -{ - ColormapPtr pmap; - int rc; - - REQUEST(xAllocColorReq); - - REQUEST_SIZE_MATCH(xAllocColorReq); - rc = dixLookupResourceByType((void **) &pmap, stuff->cmap, RT_COLORMAP, - client, DixAddAccess); - if (rc == Success) { - xAllocColorReply acr = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .red = stuff->red, - .green = stuff->green, - .blue = stuff->blue, - .pixel = 0 - }; - if ((rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue, - &acr.pixel, client->index))) - return rc; -#ifdef PANORAMIX - if (noPanoramiXExtension || !pmap->pScreen->myNum) -#endif - WriteReplyToClient(client, sizeof(xAllocColorReply), &acr); - return Success; - - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcAllocNamedColor(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xAllocNamedColorReq); - - REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixAddAccess); - if (rc == Success) { - xAllocNamedColorReply ancr = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0 - }; - if (OsLookupColor - (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes, - &ancr.exactRed, &ancr.exactGreen, &ancr.exactBlue)) { - ancr.screenRed = ancr.exactRed; - ancr.screenGreen = ancr.exactGreen; - ancr.screenBlue = ancr.exactBlue; - ancr.pixel = 0; - if ((rc = AllocColor(pcmp, - &ancr.screenRed, &ancr.screenGreen, - &ancr.screenBlue, &ancr.pixel, client->index))) - return rc; -#ifdef PANORAMIX - if (noPanoramiXExtension || !pcmp->pScreen->myNum) -#endif - WriteReplyToClient(client, sizeof(xAllocNamedColorReply), - &ancr); - return Success; - } - else - return BadName; - - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcAllocColorCells(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xAllocColorCellsReq); - - REQUEST_SIZE_MATCH(xAllocColorCellsReq); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixAddAccess); - if (rc == Success) { - int npixels, nmasks; - long length; - Pixel *ppixels, *pmasks; - - npixels = stuff->colors; - if (!npixels) { - client->errorValue = npixels; - return BadValue; - } - if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) { - client->errorValue = stuff->contiguous; - return BadValue; - } - nmasks = stuff->planes; - length = ((long) npixels + (long) nmasks) * sizeof(Pixel); - ppixels = malloc(length); - if (!ppixels) - return BadAlloc; - pmasks = ppixels + npixels; - - if ((rc = AllocColorCells(client->index, pcmp, npixels, nmasks, - (Bool) stuff->contiguous, ppixels, pmasks))) { - free(ppixels); - return rc; - } -#ifdef PANORAMIX - if (noPanoramiXExtension || !pcmp->pScreen->myNum) -#endif - { - xAllocColorCellsReply accr = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(length), - .nPixels = npixels, - .nMasks = nmasks - }; - WriteReplyToClient(client, sizeof(xAllocColorCellsReply), &accr); - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, length, ppixels); - } - free(ppixels); - return Success; - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcAllocColorPlanes(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xAllocColorPlanesReq); - - REQUEST_SIZE_MATCH(xAllocColorPlanesReq); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixAddAccess); - if (rc == Success) { - xAllocColorPlanesReply acpr; - int npixels; - long length; - Pixel *ppixels; - - npixels = stuff->colors; - if (!npixels) { - client->errorValue = npixels; - return BadValue; - } - if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) { - client->errorValue = stuff->contiguous; - return BadValue; - } - acpr = (xAllocColorPlanesReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .nPixels = npixels - }; - length = (long) npixels *sizeof(Pixel); - - ppixels = malloc(length); - if (!ppixels) - return BadAlloc; - if ((rc = AllocColorPlanes(client->index, pcmp, npixels, - (int) stuff->red, (int) stuff->green, - (int) stuff->blue, (Bool) stuff->contiguous, - ppixels, &acpr.redMask, &acpr.greenMask, - &acpr.blueMask))) { - free(ppixels); - return rc; - } - acpr.length = bytes_to_int32(length); -#ifdef PANORAMIX - if (noPanoramiXExtension || !pcmp->pScreen->myNum) -#endif - { - WriteReplyToClient(client, sizeof(xAllocColorPlanesReply), &acpr); - client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; - WriteSwappedDataToClient(client, length, ppixels); - } - free(ppixels); - return Success; - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcFreeColors(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xFreeColorsReq); - - REQUEST_AT_LEAST_SIZE(xFreeColorsReq); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixRemoveAccess); - if (rc == Success) { - int count; - - if (pcmp->flags & AllAllocated) - return BadAccess; - count = bytes_to_int32((client->req_len << 2) - sizeof(xFreeColorsReq)); - return FreeColors(pcmp, client->index, count, - (Pixel *) &stuff[1], (Pixel) stuff->planeMask); - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcStoreColors(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xStoreColorsReq); - - REQUEST_AT_LEAST_SIZE(xStoreColorsReq); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixWriteAccess); - if (rc == Success) { - int count; - - count = (client->req_len << 2) - sizeof(xStoreColorsReq); - if (count % sizeof(xColorItem)) - return BadLength; - count /= sizeof(xColorItem); - return StoreColors(pcmp, count, (xColorItem *) &stuff[1], client); - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcStoreNamedColor(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xStoreNamedColorReq); - - REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixWriteAccess); - if (rc == Success) { - xColorItem def; - - if (OsLookupColor(pcmp->pScreen->myNum, (char *) &stuff[1], - stuff->nbytes, &def.red, &def.green, &def.blue)) { - def.flags = stuff->flags; - def.pixel = stuff->pixel; - return StoreColors(pcmp, 1, &def, client); - } - return BadName; - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcQueryColors(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xQueryColorsReq); - - REQUEST_AT_LEAST_SIZE(xQueryColorsReq); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixReadAccess); - if (rc == Success) { - int count; - xrgb *prgbs; - xQueryColorsReply qcr; - - count = - bytes_to_int32((client->req_len << 2) - sizeof(xQueryColorsReq)); - prgbs = calloc(1, count * sizeof(xrgb)); - if (!prgbs && count) - return BadAlloc; - if ((rc = - QueryColors(pcmp, count, (Pixel *) &stuff[1], prgbs, client))) { - free(prgbs); - return rc; - } - qcr = (xQueryColorsReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(count * sizeof(xrgb)), - .nColors = count - }; - WriteReplyToClient(client, sizeof(xQueryColorsReply), &qcr); - if (count) { - client->pSwapReplyFunc = (ReplySwapPtr) SQColorsExtend; - WriteSwappedDataToClient(client, count * sizeof(xrgb), prgbs); - } - free(prgbs); - return Success; - - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcLookupColor(ClientPtr client) -{ - ColormapPtr pcmp; - int rc; - - REQUEST(xLookupColorReq); - - REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes); - rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, - client, DixReadAccess); - if (rc == Success) { - CARD16 exactRed, exactGreen, exactBlue; - - if (OsLookupColor - (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes, - &exactRed, &exactGreen, &exactBlue)) { - xLookupColorReply lcr = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .exactRed = exactRed, - .exactGreen = exactGreen, - .exactBlue = exactBlue, - .screenRed = exactRed, - .screenGreen = exactGreen, - .screenBlue = exactBlue - }; - (*pcmp->pScreen->ResolveColor) (&lcr.screenRed, - &lcr.screenGreen, - &lcr.screenBlue, pcmp->pVisual); - WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr); - return Success; - } - return BadName; - } - else { - client->errorValue = stuff->cmap; - return rc; - } -} - -int -ProcCreateCursor(ClientPtr client) -{ - CursorPtr pCursor; - PixmapPtr src; - PixmapPtr msk; - unsigned char *srcbits; - unsigned char *mskbits; - unsigned short width, height; - long n; - CursorMetricRec cm; - int rc; - - REQUEST(xCreateCursorReq); - - REQUEST_SIZE_MATCH(xCreateCursorReq); - LEGAL_NEW_RESOURCE(stuff->cid, client); - - rc = dixLookupResourceByType((void **) &src, stuff->source, RT_PIXMAP, - client, DixReadAccess); - if (rc != Success) { - client->errorValue = stuff->source; - return rc; - } - - if (src->drawable.depth != 1) - return (BadMatch); - - /* Find and validate cursor mask pixmap, if one is provided */ - if (stuff->mask != None) { - rc = dixLookupResourceByType((void **) &msk, stuff->mask, RT_PIXMAP, - client, DixReadAccess); - if (rc != Success) { - client->errorValue = stuff->mask; - return rc; - } - - if (src->drawable.width != msk->drawable.width - || src->drawable.height != msk->drawable.height - || src->drawable.depth != 1 || msk->drawable.depth != 1) - return BadMatch; - } - else - msk = NULL; - - width = src->drawable.width; - height = src->drawable.height; - - if (stuff->x > width || stuff->y > height) - return BadMatch; - - n = BitmapBytePad(width) * height; - srcbits = calloc(1, n); - if (!srcbits) - return BadAlloc; - mskbits = malloc(n); - if (!mskbits) { - free(srcbits); - return BadAlloc; - } - - (*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height, - XYPixmap, 1, (void *) srcbits); - if (msk == (PixmapPtr) NULL) { - unsigned char *bits = mskbits; - - while (--n >= 0) - *bits++ = ~0; - } - else { - /* zeroing the (pad) bits helps some ddx cursor handling */ - memset((char *) mskbits, 0, n); - (*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width, - height, XYPixmap, 1, - (void *) mskbits); - } - cm.width = width; - cm.height = height; - cm.xhot = stuff->x; - cm.yhot = stuff->y; - rc = AllocARGBCursor(srcbits, mskbits, NULL, &cm, - stuff->foreRed, stuff->foreGreen, stuff->foreBlue, - stuff->backRed, stuff->backGreen, stuff->backBlue, - &pCursor, client, stuff->cid); - - if (rc != Success) - goto bail; - if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) { - rc = BadAlloc; - goto bail; - } - - return Success; - bail: - free(srcbits); - free(mskbits); - return rc; -} - -int -ProcCreateGlyphCursor(ClientPtr client) -{ - CursorPtr pCursor; - int res; - - REQUEST(xCreateGlyphCursorReq); - - REQUEST_SIZE_MATCH(xCreateGlyphCursorReq); - LEGAL_NEW_RESOURCE(stuff->cid, client); - - res = AllocGlyphCursor(stuff->source, stuff->sourceChar, - stuff->mask, stuff->maskChar, - stuff->foreRed, stuff->foreGreen, stuff->foreBlue, - stuff->backRed, stuff->backGreen, stuff->backBlue, - &pCursor, client, stuff->cid); - if (res != Success) - return res; - if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) - return Success; - return BadAlloc; -} - -int -ProcFreeCursor(ClientPtr client) -{ - CursorPtr pCursor; - int rc; - - REQUEST(xResourceReq); - - REQUEST_SIZE_MATCH(xResourceReq); - rc = dixLookupResourceByType((void **) &pCursor, stuff->id, RT_CURSOR, - client, DixDestroyAccess); - if (rc == Success) { - FreeResource(stuff->id, RT_NONE); - return Success; - } - else { - client->errorValue = stuff->id; - return rc; - } -} - -int -ProcQueryBestSize(ClientPtr client) -{ - xQueryBestSizeReply reply; - DrawablePtr pDraw; - ScreenPtr pScreen; - int rc; - - REQUEST(xQueryBestSizeReq); - REQUEST_SIZE_MATCH(xQueryBestSizeReq); - - if ((stuff->class != CursorShape) && - (stuff->class != TileShape) && (stuff->class != StippleShape)) { - client->errorValue = stuff->class; - return BadValue; - } - - rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, - DixGetAttrAccess); - if (rc != Success) - return rc; - if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW) - return BadMatch; - pScreen = pDraw->pScreen; - rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess); - if (rc != Success) - return rc; - (*pScreen->QueryBestSize) (stuff->class, &stuff->width, - &stuff->height, pScreen); - reply = (xQueryBestSizeReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .width = stuff->width, - .height = stuff->height - }; - WriteReplyToClient(client, sizeof(xQueryBestSizeReply), &reply); - return Success; -} - -int -ProcSetScreenSaver(ClientPtr client) -{ - int rc, i, blankingOption, exposureOption; - - REQUEST(xSetScreenSaverReq); - REQUEST_SIZE_MATCH(xSetScreenSaverReq); - - for (i = 0; i < screenInfo.numScreens; i++) { - rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i], - DixSetAttrAccess); - if (rc != Success) - return rc; - } - - blankingOption = stuff->preferBlank; - if ((blankingOption != DontPreferBlanking) && - (blankingOption != PreferBlanking) && - (blankingOption != DefaultBlanking)) { - client->errorValue = blankingOption; - return BadValue; - } - exposureOption = stuff->allowExpose; - if ((exposureOption != DontAllowExposures) && - (exposureOption != AllowExposures) && - (exposureOption != DefaultExposures)) { - client->errorValue = exposureOption; - return BadValue; - } - if (stuff->timeout < -1) { - client->errorValue = stuff->timeout; - return BadValue; - } - if (stuff->interval < -1) { - client->errorValue = stuff->interval; - return BadValue; - } - - if (blankingOption == DefaultBlanking) - ScreenSaverBlanking = defaultScreenSaverBlanking; - else - ScreenSaverBlanking = blankingOption; - if (exposureOption == DefaultExposures) - ScreenSaverAllowExposures = defaultScreenSaverAllowExposures; - else - ScreenSaverAllowExposures = exposureOption; - - if (stuff->timeout >= 0) - ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND; - else - ScreenSaverTime = defaultScreenSaverTime; - if (stuff->interval >= 0) - ScreenSaverInterval = stuff->interval * MILLI_PER_SECOND; - else - ScreenSaverInterval = defaultScreenSaverInterval; - - SetScreenSaverTimer(); - return Success; -} - -int -ProcGetScreenSaver(ClientPtr client) -{ - xGetScreenSaverReply rep; - int rc, i; - - REQUEST_SIZE_MATCH(xReq); - - for (i = 0; i < screenInfo.numScreens; i++) { - rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i], - DixGetAttrAccess); - if (rc != Success) - return rc; - } - - rep = (xGetScreenSaverReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .timeout = ScreenSaverTime / MILLI_PER_SECOND, - .interval = ScreenSaverInterval / MILLI_PER_SECOND, - .preferBlanking = ScreenSaverBlanking, - .allowExposures = ScreenSaverAllowExposures - }; - WriteReplyToClient(client, sizeof(xGetScreenSaverReply), &rep); - return Success; -} - -int -ProcChangeHosts(ClientPtr client) -{ - REQUEST(xChangeHostsReq); - - REQUEST_FIXED_SIZE(xChangeHostsReq, stuff->hostLength); - - if (stuff->mode == HostInsert) - return AddHost(client, (int) stuff->hostFamily, - stuff->hostLength, (void *) &stuff[1]); - if (stuff->mode == HostDelete) - return RemoveHost(client, (int) stuff->hostFamily, - stuff->hostLength, (void *) &stuff[1]); - client->errorValue = stuff->mode; - return BadValue; -} - -int -ProcListHosts(ClientPtr client) -{ - xListHostsReply reply; - int len, nHosts, result; - BOOL enabled; - void *pdata; - - /* REQUEST(xListHostsReq); */ - - REQUEST_SIZE_MATCH(xListHostsReq); - - /* untrusted clients can't list hosts */ - result = XaceHook(XACE_SERVER_ACCESS, client, DixReadAccess); - if (result != Success) - return result; - - result = GetHosts(&pdata, &nHosts, &len, &enabled); - if (result != Success) - return result; - - reply = (xListHostsReply) { - .type = X_Reply, - .enabled = enabled, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(len), - .nHosts = nHosts - }; - WriteReplyToClient(client, sizeof(xListHostsReply), &reply); - if (nHosts) { - client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend; - WriteSwappedDataToClient(client, len, pdata); - } - free(pdata); - return Success; -} - -int -ProcChangeAccessControl(ClientPtr client) -{ - REQUEST(xSetAccessControlReq); - - REQUEST_SIZE_MATCH(xSetAccessControlReq); - if ((stuff->mode != EnableAccess) && (stuff->mode != DisableAccess)) { - client->errorValue = stuff->mode; - return BadValue; - } - return ChangeAccessControl(client, stuff->mode == EnableAccess); -} - -/********************* - * CloseDownRetainedResources - * - * Find all clients that are gone and have terminated in RetainTemporary - * and destroy their resources. - *********************/ - -static void -CloseDownRetainedResources(void) -{ - int i; - ClientPtr client; - - for (i = 1; i < currentMaxClients; i++) { - client = clients[i]; - if (client && (client->closeDownMode == RetainTemporary) - && (client->clientGone)) - CloseDownClient(client); - } -} - -int -ProcKillClient(ClientPtr client) -{ - REQUEST(xResourceReq); - ClientPtr killclient; - int rc; - - REQUEST_SIZE_MATCH(xResourceReq); - if (stuff->id == AllTemporary) { - CloseDownRetainedResources(); - return Success; - } - - rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess); - if (rc == Success) { - CloseDownClient(killclient); - if (client == killclient) { - /* force yield and return Success, so that Dispatch() - * doesn't try to touch client - */ - isItTimeToYield = TRUE; - } - return Success; - } - else - return rc; -} - -int -ProcSetFontPath(ClientPtr client) -{ - unsigned char *ptr; - unsigned long nbytes, total; - long nfonts; - int n; - - REQUEST(xSetFontPathReq); - - REQUEST_AT_LEAST_SIZE(xSetFontPathReq); - - nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq); - total = nbytes; - ptr = (unsigned char *) &stuff[1]; - nfonts = stuff->nFonts; - while (--nfonts >= 0) { - if ((total == 0) || (total < (n = (*ptr + 1)))) - return BadLength; - total -= n; - ptr += n; - } - if (total >= 4) - return BadLength; - return SetFontPath(client, stuff->nFonts, (unsigned char *) &stuff[1]); -} - -int -ProcGetFontPath(ClientPtr client) -{ - xGetFontPathReply reply; - int rc, stringLens, numpaths; - unsigned char *bufferStart; - - /* REQUEST (xReq); */ - - REQUEST_SIZE_MATCH(xReq); - rc = GetFontPath(client, &numpaths, &stringLens, &bufferStart); - if (rc != Success) - return rc; - - reply = (xGetFontPathReply) { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = bytes_to_int32(stringLens + numpaths), - .nPaths = numpaths - }; - - WriteReplyToClient(client, sizeof(xGetFontPathReply), &reply); - if (stringLens || numpaths) - WriteToClient(client, stringLens + numpaths, bufferStart); - return Success; -} - -int -ProcChangeCloseDownMode(ClientPtr client) -{ - int rc; - - REQUEST(xSetCloseDownModeReq); - REQUEST_SIZE_MATCH(xSetCloseDownModeReq); - - rc = XaceHook(XACE_CLIENT_ACCESS, client, client, DixManageAccess); - if (rc != Success) - return rc; - - if ((stuff->mode == AllTemporary) || - (stuff->mode == RetainPermanent) || (stuff->mode == RetainTemporary)) { - client->closeDownMode = stuff->mode; - return Success; - } - else { - client->errorValue = stuff->mode; - return BadValue; - } -} - -int -ProcForceScreenSaver(ClientPtr client) -{ - int rc; - - REQUEST(xForceScreenSaverReq); - - REQUEST_SIZE_MATCH(xForceScreenSaverReq); - - if ((stuff->mode != ScreenSaverReset) && (stuff->mode != ScreenSaverActive)) { - client->errorValue = stuff->mode; - return BadValue; - } - rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int) stuff->mode); - if (rc != Success) - return rc; - return Success; -} - -int -ProcNoOperation(ClientPtr client) -{ - REQUEST_AT_LEAST_SIZE(xReq); - - /* noop -- don't do anything */ - return Success; -} - -/********************** - * CloseDownClient - * - * Client can either mark his resources destroy or retain. If retained and - * then killed again, the client is really destroyed. - *********************/ - -char dispatchExceptionAtReset = DE_RESET; - -void -CloseDownClient(ClientPtr client) -{ - Bool really_close_down = client->clientGone || - client->closeDownMode == DestroyAll; - - if (!client->clientGone) { - /* ungrab server if grabbing client dies */ - if (grabState != GrabNone && grabClient == client) { - UngrabServer(client); - } - BITCLEAR(grabWaiters, client->index); - DeleteClientFromAnySelections(client); - ReleaseActiveGrabs(client); - DeleteClientFontStuff(client); - if (!really_close_down) { - /* This frees resources that should never be retained - * no matter what the close down mode is. Actually we - * could do this unconditionally, but it's probably - * better not to traverse all the client's resources - * twice (once here, once a few lines down in - * FreeClientResources) in the common case of - * really_close_down == TRUE. - */ - FreeClientNeverRetainResources(client); - client->clientState = ClientStateRetained; - if (ClientStateCallback) { - NewClientInfoRec clientinfo; - - clientinfo.client = client; - clientinfo.prefix = (xConnSetupPrefix *) NULL; - clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (void *) &clientinfo); - } - } - client->clientGone = TRUE; /* so events aren't sent to client */ - if (ClientIsAsleep(client)) - ClientSignal(client); - ProcessWorkQueueZombies(); - CloseDownConnection(client); - - /* If the client made it to the Running stage, nClients has - * been incremented on its behalf, so we need to decrement it - * now. If it hasn't gotten to Running, nClients has *not* - * been incremented, so *don't* decrement it. - */ - if (client->clientState != ClientStateInitial) { - --nClients; - } - } - - if (really_close_down) { - if (client->clientState == ClientStateRunning && nClients == 0) - dispatchException |= dispatchExceptionAtReset; - - client->clientState = ClientStateGone; - if (ClientStateCallback) { - NewClientInfoRec clientinfo; - - clientinfo.client = client; - clientinfo.prefix = (xConnSetupPrefix *) NULL; - clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (void *) &clientinfo); - } - TouchListenerGone(client->clientAsMask); - FreeClientResources(client); - /* Disable client ID tracking. This must be done after - * ClientStateCallback. */ - ReleaseClientIds(client); -#ifdef XSERVER_DTRACE - XSERVER_CLIENT_DISCONNECT(client->index); -#endif - if (client->index < nextFreeClientID) - nextFreeClientID = client->index; - clients[client->index] = NullClient; - SmartLastClient = NullClient; - dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); - - while (!clients[currentMaxClients - 1]) - currentMaxClients--; - } -} - -static void -KillAllClients(void) -{ - int i; - - for (i = 1; i < currentMaxClients; i++) - if (clients[i]) { - /* Make sure Retained clients are released. */ - clients[i]->closeDownMode = DestroyAll; - CloseDownClient(clients[i]); - } -} - -void -InitClient(ClientPtr client, int i, void *ospriv) -{ - client->index = i; - client->clientAsMask = ((Mask) i) << CLIENTOFFSET; - client->closeDownMode = i ? DestroyAll : RetainPermanent; - client->requestVector = InitialVector; - client->osPrivate = ospriv; - QueryMinMaxKeyCodes(&client->minKC, &client->maxKC); - client->smart_start_tick = SmartScheduleTime; - client->smart_stop_tick = SmartScheduleTime; - client->clientIds = NULL; -} - -/************************ - * int NextAvailableClient(ospriv) - * - * OS dependent portion can't assign client id's because of CloseDownModes. - * Returns NULL if there are no free clients. - *************************/ - -ClientPtr -NextAvailableClient(void *ospriv) -{ - int i; - ClientPtr client; - xReq data; - - i = nextFreeClientID; - if (i == MAXCLIENTS) - return (ClientPtr) NULL; - clients[i] = client = - dixAllocateObjectWithPrivates(ClientRec, PRIVATE_CLIENT); - if (!client) - return (ClientPtr) NULL; - InitClient(client, i, ospriv); - if (!InitClientResources(client)) { - dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); - return (ClientPtr) NULL; - } - data.reqType = 1; - data.length = bytes_to_int32(sz_xReq + sz_xConnClientPrefix); - if (!InsertFakeRequest(client, (char *) &data, sz_xReq)) { - FreeClientResources(client); - dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); - return (ClientPtr) NULL; - } - if (i == currentMaxClients) - currentMaxClients++; - while ((nextFreeClientID < MAXCLIENTS) && clients[nextFreeClientID]) - nextFreeClientID++; - - /* Enable client ID tracking. This must be done before - * ClientStateCallback. */ - ReserveClientIds(client); - - if (ClientStateCallback) { - NewClientInfoRec clientinfo; - - clientinfo.client = client; - clientinfo.prefix = (xConnSetupPrefix *) NULL; - clientinfo.setup = (xConnSetup *) NULL; - CallCallbacks((&ClientStateCallback), (void *) &clientinfo); - } - return client; -} - -int -ProcInitialConnection(ClientPtr client) -{ - REQUEST(xReq); - xConnClientPrefix *prefix; - int whichbyte = 1; - char order; - - prefix = (xConnClientPrefix *) ((char *)stuff + sz_xReq); - order = prefix->byteOrder; - if (order != 'l' && order != 'B' && order != 'r' && order != 'R') - return client->noClientException = -1; - if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) || - (!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) { - client->swapped = TRUE; - SwapConnClientPrefix(prefix); - } - stuff->reqType = 2; - stuff->length += bytes_to_int32(prefix->nbytesAuthProto) + - bytes_to_int32(prefix->nbytesAuthString); - if (client->swapped) { - swaps(&stuff->length); - } - if (order == 'r' || order == 'R') { - client->local = FALSE; - } - ResetCurrentRequest(client); - return Success; -} - -static int -SendConnSetup(ClientPtr client, const char *reason) -{ - xWindowRoot *root; - int i; - int numScreens; - char *lConnectionInfo; - xConnSetupPrefix *lconnSetupPrefix; - - if (reason) { - xConnSetupPrefix csp; - - csp.success = xFalse; - csp.lengthReason = strlen(reason); - csp.length = bytes_to_int32(csp.lengthReason); - csp.majorVersion = X_PROTOCOL; - csp.minorVersion = X_PROTOCOL_REVISION; - if (client->swapped) - WriteSConnSetupPrefix(client, &csp); - else - WriteToClient(client, sz_xConnSetupPrefix, &csp); - WriteToClient(client, (int) csp.lengthReason, reason); - return client->noClientException = -1; - } - - numScreens = screenInfo.numScreens; - lConnectionInfo = ConnectionInfo; - lconnSetupPrefix = &connSetupPrefix; - - /* We're about to start speaking X protocol back to the client by - * sending the connection setup info. This means the authorization - * step is complete, and we can count the client as an - * authorized one. - */ - nClients++; - - client->requestVector = client->swapped ? SwappedProcVector : ProcVector; - client->sequence = 0; - ((xConnSetup *) lConnectionInfo)->ridBase = client->clientAsMask; - ((xConnSetup *) lConnectionInfo)->ridMask = RESOURCE_ID_MASK; -#ifdef MATCH_CLIENT_ENDIAN - ((xConnSetup *) lConnectionInfo)->imageByteOrder = ClientOrder(client); - ((xConnSetup *) lConnectionInfo)->bitmapBitOrder = ClientOrder(client); -#endif - /* fill in the "currentInputMask" */ - root = (xWindowRoot *) (lConnectionInfo + connBlockScreenStart); -#ifdef PANORAMIX - if (noPanoramiXExtension) - numScreens = screenInfo.numScreens; - else - numScreens = ((xConnSetup *) ConnectionInfo)->numRoots; -#endif - - for (i = 0; i < numScreens; i++) { - unsigned int j; - xDepth *pDepth; - WindowPtr pRoot = screenInfo.screens[i]->root; - - root->currentInputMask = pRoot->eventMask | wOtherEventMasks(pRoot); - pDepth = (xDepth *) (root + 1); - for (j = 0; j < root->nDepths; j++) { - pDepth = (xDepth *) (((char *) (pDepth + 1)) + - pDepth->nVisuals * sizeof(xVisualType)); - } - root = (xWindowRoot *) pDepth; - } - - if (client->swapped) { - WriteSConnSetupPrefix(client, lconnSetupPrefix); - WriteSConnectionInfo(client, - (unsigned long) (lconnSetupPrefix->length << 2), - lConnectionInfo); - } - else { - WriteToClient(client, sizeof(xConnSetupPrefix), lconnSetupPrefix); - WriteToClient(client, (int) (lconnSetupPrefix->length << 2), - lConnectionInfo); - } - client->clientState = ClientStateRunning; - if (ClientStateCallback) { - NewClientInfoRec clientinfo; - - clientinfo.client = client; - clientinfo.prefix = lconnSetupPrefix; - clientinfo.setup = (xConnSetup *) lConnectionInfo; - CallCallbacks((&ClientStateCallback), (void *) &clientinfo); - } - return Success; -} - -int -ProcEstablishConnection(ClientPtr client) -{ - const char *reason; - char *auth_proto, *auth_string; - xConnClientPrefix *prefix; - - REQUEST(xReq); - - prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq); - auth_proto = (char *) prefix + sz_xConnClientPrefix; - auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto); - if ((prefix->majorVersion != X_PROTOCOL) || - (prefix->minorVersion != X_PROTOCOL_REVISION)) - reason = "Protocol version mismatch"; - else - reason = ClientAuthorized(client, - (unsigned short) prefix->nbytesAuthProto, - auth_proto, - (unsigned short) prefix->nbytesAuthString, - auth_string); - - return (SendConnSetup(client, reason)); -} - -void -SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode, - XID resId, int errorCode) -{ - xError rep = { - .type = X_Error, - .errorCode = errorCode, - .resourceID = resId, - .minorCode = minorCode, - .majorCode = majorCode - }; - - WriteEventsToClient(client, 1, (xEvent *) &rep); -} - -void -MarkClientException(ClientPtr client) -{ - client->noClientException = -1; -} - -/* - * This array encodes the answer to the question "what is the log base 2 - * of the number of pixels that fit in a scanline pad unit?" - * Note that ~0 is an invalid entry (mostly for the benefit of the reader). - */ -static int answer[6][4] = { - /* pad pad pad pad */ - /* 8 16 32 64 */ - - {3, 4, 5, 6}, /* 1 bit per pixel */ - {1, 2, 3, 4}, /* 4 bits per pixel */ - {0, 1, 2, 3}, /* 8 bits per pixel */ - {~0, 0, 1, 2}, /* 16 bits per pixel */ - {~0, ~0, 0, 1}, /* 24 bits per pixel */ - {~0, ~0, 0, 1} /* 32 bits per pixel */ -}; - -/* - * This array gives the answer to the question "what is the first index for - * the answer array above given the number of bits per pixel?" - * Note that ~0 is an invalid entry (mostly for the benefit of the reader). - */ -static int indexForBitsPerPixel[33] = { - ~0, 0, ~0, ~0, /* 1 bit per pixel */ - 1, ~0, ~0, ~0, /* 4 bits per pixel */ - 2, ~0, ~0, ~0, /* 8 bits per pixel */ - ~0, ~0, ~0, ~0, - 3, ~0, ~0, ~0, /* 16 bits per pixel */ - ~0, ~0, ~0, ~0, - 4, ~0, ~0, ~0, /* 24 bits per pixel */ - ~0, ~0, ~0, ~0, - 5 /* 32 bits per pixel */ -}; - -/* - * This array gives the bytesperPixel value for cases where the number - * of bits per pixel is a multiple of 8 but not a power of 2. - */ -static int answerBytesPerPixel[33] = { - ~0, 0, ~0, ~0, /* 1 bit per pixel */ - 0, ~0, ~0, ~0, /* 4 bits per pixel */ - 0, ~0, ~0, ~0, /* 8 bits per pixel */ - ~0, ~0, ~0, ~0, - 0, ~0, ~0, ~0, /* 16 bits per pixel */ - ~0, ~0, ~0, ~0, - 3, ~0, ~0, ~0, /* 24 bits per pixel */ - ~0, ~0, ~0, ~0, - 0 /* 32 bits per pixel */ -}; - -/* - * This array gives the answer to the question "what is the second index for - * the answer array above given the number of bits per scanline pad unit?" - * Note that ~0 is an invalid entry (mostly for the benefit of the reader). - */ -static int indexForScanlinePad[65] = { - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - 0, ~0, ~0, ~0, /* 8 bits per scanline pad unit */ - ~0, ~0, ~0, ~0, - 1, ~0, ~0, ~0, /* 16 bits per scanline pad unit */ - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - 2, ~0, ~0, ~0, /* 32 bits per scanline pad unit */ - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - ~0, ~0, ~0, ~0, - 3 /* 64 bits per scanline pad unit */ -}; - -/* - grow the array of screenRecs if necessary. - call the device-supplied initialization procedure -with its screen number, a pointer to its ScreenRec, argc, and argv. - return the number of successfully installed screens. - -*/ - -static int init_screen(ScreenPtr pScreen, int i, Bool gpu) -{ - int scanlinepad, format, depth, bitsPerPixel, j, k; - - dixInitScreenSpecificPrivates(pScreen); - - if (!dixAllocatePrivates(&pScreen->devPrivates, PRIVATE_SCREEN)) { - return -1; - } - pScreen->myNum = i; - if (gpu) { - pScreen->myNum += GPU_SCREEN_OFFSET; - pScreen->isGPU = TRUE; - } - pScreen->totalPixmapSize = 0; /* computed in CreateScratchPixmapForScreen */ - pScreen->ClipNotify = 0; /* for R4 ddx compatibility */ - pScreen->CreateScreenResources = 0; - - xorg_list_init(&pScreen->pixmap_dirty_list); - xorg_list_init(&pScreen->unattached_list); - xorg_list_init(&pScreen->output_slave_list); - xorg_list_init(&pScreen->offload_slave_list); - - /* - * This loop gets run once for every Screen that gets added, - * but thats ok. If the ddx layer initializes the formats - * one at a time calling AddScreen() after each, then each - * iteration will make it a little more accurate. Worst case - * we do this loop N * numPixmapFormats where N is # of screens. - * Anyway, this must be called after InitOutput and before the - * screen init routine is called. - */ - for (format = 0; format < screenInfo.numPixmapFormats; format++) { - depth = screenInfo.formats[format].depth; - bitsPerPixel = screenInfo.formats[format].bitsPerPixel; - scanlinepad = screenInfo.formats[format].scanlinePad; - j = indexForBitsPerPixel[bitsPerPixel]; - k = indexForScanlinePad[scanlinepad]; - PixmapWidthPaddingInfo[depth].padPixelsLog2 = answer[j][k]; - PixmapWidthPaddingInfo[depth].padRoundUp = - (scanlinepad / bitsPerPixel) - 1; - j = indexForBitsPerPixel[8]; /* bits per byte */ - PixmapWidthPaddingInfo[depth].padBytesLog2 = answer[j][k]; - PixmapWidthPaddingInfo[depth].bitsPerPixel = bitsPerPixel; - if (answerBytesPerPixel[bitsPerPixel]) { - PixmapWidthPaddingInfo[depth].notPower2 = 1; - PixmapWidthPaddingInfo[depth].bytesPerPixel = - answerBytesPerPixel[bitsPerPixel]; - } - else { - PixmapWidthPaddingInfo[depth].notPower2 = 0; - } - } - return 0; -} - -int -AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , - int /*argc */ , - char ** /*argv */ - ), int argc, char **argv) -{ - - int i; - ScreenPtr pScreen; - Bool ret; - - i = screenInfo.numScreens; - if (i == MAXSCREENS) - return -1; - - pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec)); - if (!pScreen) - return -1; - - ret = init_screen(pScreen, i, FALSE); - if (ret != 0) { - free(pScreen); - return ret; - } - /* This is where screen specific stuff gets initialized. Load the - screen structure, call the hardware, whatever. - This is also where the default colormap should be allocated and - also pixel values for blackPixel, whitePixel, and the cursor - Note that InitScreen is NOT allowed to modify argc, argv, or - any of the strings pointed to by argv. They may be passed to - multiple screens. - */ - screenInfo.screens[i] = pScreen; - screenInfo.numScreens++; - if (!(*pfnInit) (pScreen, argc, argv)) { - dixFreeScreenSpecificPrivates(pScreen); - dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN); - free(pScreen); - screenInfo.numScreens--; - return -1; - } - - update_desktop_dimensions(); - - dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR, - 0); - - return i; -} - -int -AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , - int /*argc */ , - char ** /*argv */ - ), - int argc, char **argv) -{ - int i; - ScreenPtr pScreen; - Bool ret; - - i = screenInfo.numGPUScreens; - if (i == MAXGPUSCREENS) - return -1; - - pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec)); - if (!pScreen) - return -1; - - ret = init_screen(pScreen, i, TRUE); - if (ret != 0) { - free(pScreen); - return ret; - } - - /* This is where screen specific stuff gets initialized. Load the - screen structure, call the hardware, whatever. - This is also where the default colormap should be allocated and - also pixel values for blackPixel, whitePixel, and the cursor - Note that InitScreen is NOT allowed to modify argc, argv, or - any of the strings pointed to by argv. They may be passed to - multiple screens. - */ - screenInfo.gpuscreens[i] = pScreen; - screenInfo.numGPUScreens++; - if (!(*pfnInit) (pScreen, argc, argv)) { - dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN); - free(pScreen); - screenInfo.numGPUScreens--; - return -1; - } - - update_desktop_dimensions(); - - return i; -} - -void -RemoveGPUScreen(ScreenPtr pScreen) -{ - int idx, j; - if (!pScreen->isGPU) - return; - - idx = pScreen->myNum - GPU_SCREEN_OFFSET; - for (j = idx; j < screenInfo.numGPUScreens - 1; j++) { - screenInfo.gpuscreens[j] = screenInfo.gpuscreens[j + 1]; - screenInfo.gpuscreens[j]->myNum = j + GPU_SCREEN_OFFSET; - } - screenInfo.numGPUScreens--; - - /* this gets freed later in the resource list, but without - * the screen existing it causes crashes - so remove it here */ - if (pScreen->defColormap) - FreeResource(pScreen->defColormap, RT_COLORMAP); - free(pScreen); - -} - -void -AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr new) -{ - assert(new->isGPU); - assert(!new->current_master); - xorg_list_add(&new->unattached_head, &pScreen->unattached_list); - new->current_master = pScreen; -} - -void -DetachUnboundGPU(ScreenPtr slave) -{ - assert(slave->isGPU); - xorg_list_del(&slave->unattached_head); - slave->current_master = NULL; -} - -void -AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new) -{ - assert(new->isGPU); - xorg_list_add(&new->output_head, &pScreen->output_slave_list); - new->current_master = pScreen; -} - -void -DetachOutputGPU(ScreenPtr slave) -{ - assert(slave->isGPU); - xorg_list_del(&slave->output_head); - slave->current_master = NULL; -} - -void -AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new) -{ - assert(new->isGPU); - xorg_list_add(&new->offload_head, &pScreen->offload_slave_list); - new->current_master = pScreen; -} - -void -DetachOffloadGPU(ScreenPtr slave) -{ - assert(slave->isGPU); - xorg_list_del(&slave->offload_head); - slave->current_master = NULL; -} - +/************************************************************ + +Copyright 1987, 1989, 1998 The Open Group + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation. + +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 +OPEN GROUP 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 Open Group 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 Open Group. + +Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, ++Permission to use, copy, modify, and distribute this software and its ++documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in ++both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. ++software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +********************************************************/ + +/* The panoramix components contained the following notice */ +/***************************************************************** + +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. + +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. + +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 +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +shall not be used in advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization from Digital +Equipment Corporation. + +******************************************************************/ + +/* XSERVER_DTRACE additions: + * Copyright (c) 2005-2006, Oracle and/or its affiliates. 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 (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#include <version-config.h> +#endif + +#ifdef CreateWindow +#undef CreateWindow +#endif + +#ifdef PANORAMIX_DEBUG +#include <stdio.h> +int ProcInitialConnection(); +#endif + +#include "windowstr.h" +#include <X11/fonts/fontstruct.h> +#include "dixfontstr.h" +#include "gcstruct.h" +#include "selection.h" +#include "colormapst.h" +#include "cursorstr.h" +#include "scrnintstr.h" +#include "opaque.h" +#include "input.h" +#include "servermd.h" +#include "extnsionst.h" +#include "dixfont.h" +#include "dispatch.h" +#include "swaprep.h" +#include "swapreq.h" +#include "privates.h" +#include "xace.h" +#include "inputstr.h" +#include "xkbsrv.h" +#include "site.h" +#include "client.h" + +#ifdef XSERVER_DTRACE +#include "registry.h" +#include <sys/types.h> +typedef const char *string; + +#include "Xserver-dtrace.h" +#endif + +#define mskcnt ((MAXCLIENTS + 31) / 32) +#define BITMASK(i) (1U << ((i) & 31)) +#define MASKIDX(i) ((i) >> 5) +#define MASKWORD(buf, i) buf[MASKIDX(i)] +#define BITSET(buf, i) MASKWORD(buf, i) |= BITMASK(i) +#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i) +#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i)) + +xConnSetupPrefix connSetupPrefix; + +PaddingInfo PixmapWidthPaddingInfo[33]; + +static ClientPtr grabClient; + +#define GrabNone 0 +#define GrabActive 1 +#define GrabKickout 2 +static int grabState = GrabNone; +static long grabWaiters[mskcnt]; +CallbackListPtr ServerGrabCallback = NULL; +HWEventQueuePtr checkForInput[2]; +int connBlockScreenStart; + +static void KillAllClients(void); + +static int nextFreeClientID; /* always MIN free client ID */ + +static int nClients; /* number of authorized clients */ + +CallbackListPtr ClientStateCallback; + +/* dispatchException & isItTimeToYield must be declared volatile since they + * are modified by signal handlers - otherwise optimizer may assume it doesn't + * need to actually check value in memory when used and may miss changes from + * signal handlers. + */ +volatile char dispatchException = 0; +volatile char isItTimeToYield; + +#define SAME_SCREENS(a, b) (\ + (a.pScreen == b.pScreen)) + +void +SetInputCheck(HWEventQueuePtr c0, HWEventQueuePtr c1) +{ + checkForInput[0] = c0; + checkForInput[1] = c1; +} + +void +UpdateCurrentTime(void) +{ + TimeStamp systime; + + /* To avoid time running backwards, we must call GetTimeInMillis before + * calling ProcessInputEvents. + */ + systime.months = currentTime.months; + systime.milliseconds = GetTimeInMillis(); + if (systime.milliseconds < currentTime.milliseconds) + systime.months++; + if (*checkForInput[0] != *checkForInput[1]) + ProcessInputEvents(); + if (CompareTimeStamps(systime, currentTime) == LATER) + currentTime = systime; +} + +/* Like UpdateCurrentTime, but can't call ProcessInputEvents */ +void +UpdateCurrentTimeIf(void) +{ + TimeStamp systime; + + systime.months = currentTime.months; + systime.milliseconds = GetTimeInMillis(); + if (systime.milliseconds < currentTime.milliseconds) + systime.months++; + if (CompareTimeStamps(systime, currentTime) == LATER) + currentTime = systime; +} + +#undef SMART_DEBUG + +/* in milliseconds */ +#define SMART_SCHEDULE_DEFAULT_INTERVAL 5 +#define SMART_SCHEDULE_MAX_SLICE 15 + +#if defined(WIN32) && !defined(__CYGWIN__) && !defined(_MSC_VER) +Bool SmartScheduleDisable = TRUE; +#else +Bool SmartScheduleDisable = FALSE; +#endif +long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL; +long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL; +long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE; +long SmartScheduleTime; +int SmartScheduleLatencyLimited = 0; +static ClientPtr SmartLastClient; +static int SmartLastIndex[SMART_MAX_PRIORITY - SMART_MIN_PRIORITY + 1]; + +#ifdef SMART_DEBUG +long SmartLastPrint; +#endif + +void Dispatch(void); + +static int +SmartScheduleClient(int *clientReady, int nready) +{ + ClientPtr pClient; + int i; + int client; + int bestPrio, best = 0; + int bestRobin, robin; + long now = SmartScheduleTime; + long idle; + + bestPrio = -0x7fffffff; + bestRobin = 0; + idle = 2 * SmartScheduleSlice; + for (i = 0; i < nready; i++) { + client = clientReady[i]; + pClient = clients[client]; + /* Praise clients which haven't run in a while */ + if ((now - pClient->smart_stop_tick) >= idle) { + if (pClient->smart_priority < 0) + pClient->smart_priority++; + } + + /* check priority to select best client */ + robin = + (pClient->index - + SmartLastIndex[pClient->smart_priority - + SMART_MIN_PRIORITY]) & 0xff; + if (pClient->smart_priority > bestPrio || + (pClient->smart_priority == bestPrio && robin > bestRobin)) { + bestPrio = pClient->smart_priority; + bestRobin = robin; + best = client; + } +#ifdef SMART_DEBUG + if ((now - SmartLastPrint) >= 5000) + fprintf(stderr, " %2d: %3d", client, pClient->smart_priority); +#endif + } +#ifdef SMART_DEBUG + if ((now - SmartLastPrint) >= 5000) { + fprintf(stderr, " use %2d\n", best); + SmartLastPrint = now; + } +#endif + pClient = clients[best]; + SmartLastIndex[bestPrio - SMART_MIN_PRIORITY] = pClient->index; + /* + * Set current client pointer + */ + if (SmartLastClient != pClient) { + pClient->smart_start_tick = now; + SmartLastClient = pClient; + } + /* + * Adjust slice + */ + if (nready == 1 && SmartScheduleLatencyLimited == 0) { + /* + * If it's been a long time since another client + * has run, bump the slice up to get maximal + * performance from a single client + */ + if ((now - pClient->smart_start_tick) > 1000 && + SmartScheduleSlice < SmartScheduleMaxSlice) { + SmartScheduleSlice += SmartScheduleInterval; + } + } + else { + SmartScheduleSlice = SmartScheduleInterval; + } + return best; +} + +void +EnableLimitedSchedulingLatency(void) +{ + ++SmartScheduleLatencyLimited; + SmartScheduleSlice = SmartScheduleInterval; +} + +void +DisableLimitedSchedulingLatency(void) +{ + --SmartScheduleLatencyLimited; + + /* protect against bugs */ + if (SmartScheduleLatencyLimited < 0) + SmartScheduleLatencyLimited = 0; +} + +void +Dispatch(void) +{ + int *clientReady; /* array of request ready clients */ + int result; + ClientPtr client; + int nready; + HWEventQueuePtr *icheck = checkForInput; + long start_tick; + + nextFreeClientID = 1; + nClients = 0; + + clientReady = malloc(sizeof(int) * MaxClients); + if (!clientReady) + return; + + SmartScheduleSlice = SmartScheduleInterval; + while (!dispatchException) { + if (*icheck[0] != *icheck[1]) { + ProcessInputEvents(); + FlushIfCriticalOutputPending(); + } + + nready = WaitForSomething(clientReady); + + if (nready && !SmartScheduleDisable) { + clientReady[0] = SmartScheduleClient(clientReady, nready); + nready = 1; + } - /***************** - * Handle events in round robin fashion, doing input between - * each round ++ /***************** ++ * Handle events in round robin fashion, doing input between ++ * each round + *****************/ + + while (!dispatchException && (--nready >= 0)) { + client = clients[clientReady[nready]]; + if (!client) { + /* KillClient can cause this to happen */ + continue; + } + /* GrabServer activation can cause this to be true */ + if (grabState == GrabKickout) { + grabState = GrabActive; + break; + } + isItTimeToYield = FALSE; + + start_tick = SmartScheduleTime; + while (!isItTimeToYield) { +#ifdef XSERVER_DTRACE + CARD8 StartMajorOp; +#endif + if (*icheck[0] != *icheck[1]) + ProcessInputEvents(); + + FlushIfCriticalOutputPending(); + if (!SmartScheduleDisable && + (SmartScheduleTime - start_tick) >= SmartScheduleSlice) { + /* Penalize clients which consume ticks */ + if (client->smart_priority > SMART_MIN_PRIORITY) + client->smart_priority--; + break; + } + /* now, finally, deal with client requests */ + + /* Update currentTime so request time checks, such as for input + * device grabs, are calculated correctly */ + UpdateCurrentTimeIf(); + result = ReadRequestFromClient(client); + if (result <= 0) { + if (result < 0) + CloseDownClient(client); + break; + } + + client->sequence++; + client->majorOp = ((xReq *) client->requestBuffer)->reqType; + client->minorOp = 0; + if (client->majorOp >= EXTENSION_BASE) { + ExtensionEntry *ext = GetExtensionEntry(client->majorOp); + + if (ext) + client->minorOp = ext->MinorOpcode(client); + } +#ifdef XSERVER_DTRACE + if (XSERVER_REQUEST_START_ENABLED()) + { + StartMajorOp=client->majorOp; + XSERVER_REQUEST_START(LookupMajorName(client->majorOp), + client->majorOp, + ((xReq *) client->requestBuffer)->length, + client->index, + client->requestBuffer); + } +#endif + if (result > (maxBigRequestSize << 2)) + result = BadLength; + else { + result = XaceHookDispatch(client, client->majorOp); + if (result == Success) + result = + (*client->requestVector[client->majorOp]) (client); + XaceHookAuditEnd(client, result); + } +#ifdef XSERVER_DTRACE + if (XSERVER_REQUEST_DONE_ENABLED()) + { + if (result!=Success) + { + char Message[255]; + sprintf(Message,"ERROR: %s (0x%x)",LookupMajorName(client->majorOp),client->errorValue); + XSERVER_REQUEST_DONE(Message, + client->majorOp, client->sequence, + client->index, result); + } + else + { + if (StartMajorOp!=client->majorOp) + { + char Message[255]; + sprintf(Message,"Changed request: %s -> %s",LookupMajorName(StartMajorOp),LookupMajorName(client->majorOp)); + XSERVER_REQUEST_DONE(Message, + client->majorOp, client->sequence, + client->index, result); + } + else + { + XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), + client->majorOp, client->sequence, + client->index, result); + } + } + } +#endif + + if (client->noClientException != Success) { + CloseDownClient(client); + break; + } + else if (result != Success) { + SendErrorToClient(client, client->majorOp, + client->minorOp, + client->errorValue, result); + break; + } + } + FlushAllOutput(); + client = clients[clientReady[nready]]; + if (client) + client->smart_stop_tick = SmartScheduleTime; + } + dispatchException &= ~DE_PRIORITYCHANGE; + } +#if defined(DDXBEFORERESET) + ddxBeforeReset(); +#endif + KillAllClients(); + free(clientReady); + dispatchException &= ~DE_RESET; + SmartScheduleLatencyLimited = 0; + ResetOsBuffers(); +} + +static int VendorRelease = VENDOR_RELEASE; +static const char *VendorString = VENDOR_NAME; + +void +SetVendorRelease(int release) +{ + VendorRelease = release; +} + +void +SetVendorString(const char *vendor) +{ + VendorString = vendor; +} + +Bool +CreateConnectionBlock(void) +{ + xConnSetup setup; + xWindowRoot root; + xDepth depth; + xVisualType visual; + xPixmapFormat format; + unsigned long vid; + int i, j, k, lenofblock, sizesofar = 0; + char *pBuf; + + memset(&setup, 0, sizeof(xConnSetup)); + /* Leave off the ridBase and ridMask, these must be sent with + connection */ + + setup.release = VendorRelease; + /* + * per-server image and bitmap parameters are defined in Xmd.h + */ + setup.imageByteOrder = screenInfo.imageByteOrder; + + setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit; + setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad; + + setup.bitmapBitOrder = screenInfo.bitmapBitOrder; + setup.motionBufferSize = NumMotionEvents(); + setup.numRoots = screenInfo.numScreens; + setup.nbytesVendor = strlen(VendorString); + setup.numFormats = screenInfo.numPixmapFormats; + setup.maxRequestSize = MAX_REQUEST_SIZE; + QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode); + + lenofblock = sizeof(xConnSetup) + + pad_to_int32(setup.nbytesVendor) + + (setup.numFormats * sizeof(xPixmapFormat)) + + (setup.numRoots * sizeof(xWindowRoot)); + ConnectionInfo = malloc(lenofblock); + if (!ConnectionInfo) + return FALSE; + + memmove(ConnectionInfo, (char *) &setup, sizeof(xConnSetup)); + sizesofar = sizeof(xConnSetup); + pBuf = ConnectionInfo + sizeof(xConnSetup); + + memmove(pBuf, VendorString, (int) setup.nbytesVendor); + sizesofar += setup.nbytesVendor; + pBuf += setup.nbytesVendor; + i = padding_for_int32(setup.nbytesVendor); + sizesofar += i; + while (--i >= 0) + *pBuf++ = 0; + + memset(&format, 0, sizeof(xPixmapFormat)); + for (i = 0; i < screenInfo.numPixmapFormats; i++) { + format.depth = screenInfo.formats[i].depth; + format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel; + format.scanLinePad = screenInfo.formats[i].scanlinePad; + memmove(pBuf, (char *) &format, sizeof(xPixmapFormat)); + pBuf += sizeof(xPixmapFormat); + sizesofar += sizeof(xPixmapFormat); + } + + connBlockScreenStart = sizesofar; + memset(&depth, 0, sizeof(xDepth)); + memset(&visual, 0, sizeof(xVisualType)); + for (i = 0; i < screenInfo.numScreens; i++) { + ScreenPtr pScreen; + DepthPtr pDepth; + VisualPtr pVisual; + + pScreen = screenInfo.screens[i]; + root.windowId = pScreen->root->drawable.id; + root.defaultColormap = pScreen->defColormap; + root.whitePixel = pScreen->whitePixel; + root.blackPixel = pScreen->blackPixel; + root.currentInputMask = 0; /* filled in when sent */ + root.pixWidth = pScreen->width; + root.pixHeight = pScreen->height; + root.mmWidth = pScreen->mmWidth; + root.mmHeight = pScreen->mmHeight; + root.minInstalledMaps = pScreen->minInstalledCmaps; + root.maxInstalledMaps = pScreen->maxInstalledCmaps; + root.rootVisualID = pScreen->rootVisual; + root.backingStore = pScreen->backingStoreSupport; + root.saveUnders = FALSE; + root.rootDepth = pScreen->rootDepth; + root.nDepths = pScreen->numDepths; + memmove(pBuf, (char *) &root, sizeof(xWindowRoot)); + sizesofar += sizeof(xWindowRoot); + pBuf += sizeof(xWindowRoot); + + pDepth = pScreen->allowedDepths; + for (j = 0; j < pScreen->numDepths; j++, pDepth++) { + lenofblock += sizeof(xDepth) + + (pDepth->numVids * sizeof(xVisualType)); + pBuf = (char *) realloc(ConnectionInfo, lenofblock); + if (!pBuf) { + free(ConnectionInfo); + return FALSE; + } + ConnectionInfo = pBuf; + pBuf += sizesofar; + depth.depth = pDepth->depth; + depth.nVisuals = pDepth->numVids; + memmove(pBuf, (char *) &depth, sizeof(xDepth)); + pBuf += sizeof(xDepth); + sizesofar += sizeof(xDepth); + for (k = 0; k < pDepth->numVids; k++) { + vid = pDepth->vids[k]; + for (pVisual = pScreen->visuals; + pVisual->vid != vid; pVisual++); + visual.visualID = vid; + visual.class = pVisual->class; + visual.bitsPerRGB = pVisual->bitsPerRGBValue; + visual.colormapEntries = pVisual->ColormapEntries; + visual.redMask = pVisual->redMask; + visual.greenMask = pVisual->greenMask; + visual.blueMask = pVisual->blueMask; + memmove(pBuf, (char *) &visual, sizeof(xVisualType)); + pBuf += sizeof(xVisualType); + sizesofar += sizeof(xVisualType); + } + } + } + connSetupPrefix.success = xTrue; + connSetupPrefix.length = lenofblock / 4; + connSetupPrefix.majorVersion = X_PROTOCOL; + connSetupPrefix.minorVersion = X_PROTOCOL_REVISION; + return TRUE; +} + +int +ProcBadRequest(ClientPtr client) +{ + return BadRequest; +} + +int +ProcCreateWindow(ClientPtr client) +{ + WindowPtr pParent, pWin; + + REQUEST(xCreateWindowReq); + int len, rc; + + REQUEST_AT_LEAST_SIZE(xCreateWindowReq); + + LEGAL_NEW_RESOURCE(stuff->wid, client); + rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess); + if (rc != Success) + return rc; + len = client->req_len - bytes_to_int32(sizeof(xCreateWindowReq)); + if (Ones(stuff->mask) != len) + return BadLength; + if (!stuff->width || !stuff->height) { + client->errorValue = 0; + return BadValue; + } + pWin = CreateWindow(stuff->wid, pParent, stuff->x, + stuff->y, stuff->width, stuff->height, + stuff->borderWidth, stuff->class, + stuff->mask, (XID *) &stuff[1], + (int) stuff->depth, client, stuff->visual, &rc); + if (pWin) { + Mask mask = pWin->eventMask; + + pWin->eventMask = 0; /* subterfuge in case AddResource fails */ + if (!AddResource(stuff->wid, RT_WINDOW, (void *) pWin)) + return BadAlloc; + pWin->eventMask = mask; + } + return rc; +} + +int +ProcChangeWindowAttributes(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xChangeWindowAttributesReq); + int len, rc; + Mask access_mode = 0; + + REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); + access_mode |= (stuff->valueMask & CWEventMask) ? DixReceiveAccess : 0; + access_mode |= (stuff->valueMask & ~CWEventMask) ? DixSetAttrAccess : 0; + rc = dixLookupWindow(&pWin, stuff->window, client, access_mode); + if (rc != Success) + return rc; + len = client->req_len - bytes_to_int32(sizeof(xChangeWindowAttributesReq)); + if (len != Ones(stuff->valueMask)) + return BadLength; + return ChangeWindowAttributes(pWin, + stuff->valueMask, (XID *) &stuff[1], client); +} + +int +ProcGetWindowAttributes(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + xGetWindowAttributesReply wa; + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + memset(&wa, 0, sizeof(xGetWindowAttributesReply)); + GetWindowAttributes(pWin, client, &wa); + WriteReplyToClient(client, sizeof(xGetWindowAttributesReply), &wa); + return Success; +} + +int +ProcDestroyWindow(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixDestroyAccess); + if (rc != Success) + return rc; + if (pWin->parent) { + rc = dixLookupWindow(&pWin, pWin->parent->drawable.id, client, + DixRemoveAccess); + if (rc != Success) + return rc; + FreeResource(stuff->id, RT_NONE); + } + return Success; +} + +int +ProcDestroySubwindows(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixRemoveAccess); + if (rc != Success) + return rc; + DestroySubwindows(pWin, client); + return Success; +} + +int +ProcChangeSaveSet(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xChangeSaveSetReq); + int rc; + + REQUEST_SIZE_MATCH(xChangeSaveSetReq); + rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); + if (rc != Success) + return rc; + if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id))) + return BadMatch; + if ((stuff->mode == SetModeInsert) || (stuff->mode == SetModeDelete)) + return AlterSaveSetForClient(client, pWin, stuff->mode, FALSE, TRUE); + client->errorValue = stuff->mode; + return BadValue; +} + +int +ProcReparentWindow(ClientPtr client) +{ + WindowPtr pWin, pParent; + + REQUEST(xReparentWindowReq); + int rc; + + REQUEST_SIZE_MATCH(xReparentWindowReq); + rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); + if (rc != Success) + return rc; + rc = dixLookupWindow(&pParent, stuff->parent, client, DixAddAccess); + if (rc != Success) + return rc; + if (!SAME_SCREENS(pWin->drawable, pParent->drawable)) + return BadMatch; + if ((pWin->backgroundState == ParentRelative) && + (pParent->drawable.depth != pWin->drawable.depth)) + return BadMatch; + if ((pWin->drawable.class != InputOnly) && + (pParent->drawable.class == InputOnly)) + return BadMatch; + return ReparentWindow(pWin, pParent, + (short) stuff->x, (short) stuff->y, client); +} + +int +ProcMapWindow(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixShowAccess); + if (rc != Success) + return rc; + MapWindow(pWin, client); + /* update cache to say it is mapped */ + return Success; +} + +int +ProcMapSubwindows(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); + if (rc != Success) + return rc; + MapSubwindows(pWin, client); + /* update cache to say it is mapped */ + return Success; +} + +int +ProcUnmapWindow(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixHideAccess); + if (rc != Success) + return rc; + UnmapWindow(pWin, FALSE); + /* update cache to say it is mapped */ + return Success; +} + +int +ProcUnmapSubwindows(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xResourceReq); + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); + if (rc != Success) + return rc; + UnmapSubwindows(pWin); + return Success; +} + +int +ProcConfigureWindow(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xConfigureWindowReq); + int len, rc; + + REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); + rc = dixLookupWindow(&pWin, stuff->window, client, + DixManageAccess | DixSetAttrAccess); + if (rc != Success) + return rc; + len = client->req_len - bytes_to_int32(sizeof(xConfigureWindowReq)); + if (Ones((Mask) stuff->mask) != len) + return BadLength; + return ConfigureWindow(pWin, (Mask) stuff->mask, (XID *) &stuff[1], client); +} + +int +ProcCirculateWindow(ClientPtr client) +{ + WindowPtr pWin; + + REQUEST(xCirculateWindowReq); + int rc; + + REQUEST_SIZE_MATCH(xCirculateWindowReq); + if ((stuff->direction != RaiseLowest) && (stuff->direction != LowerHighest)) { + client->errorValue = stuff->direction; + return BadValue; + } + rc = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess); + if (rc != Success) + return rc; + CirculateWindow(pWin, (int) stuff->direction, client); + return Success; +} + +static int +GetGeometry(ClientPtr client, xGetGeometryReply * rep) +{ + DrawablePtr pDraw; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixGetAttrAccess); + if (rc != Success) + return rc; + + rep->type = X_Reply; + rep->length = 0; + rep->sequenceNumber = client->sequence; + rep->root = pDraw->pScreen->root->drawable.id; + rep->depth = pDraw->depth; + rep->width = pDraw->width; + rep->height = pDraw->height; + + if (WindowDrawable(pDraw->type)) { + WindowPtr pWin = (WindowPtr) pDraw; + + rep->x = pWin->origin.x - wBorderWidth(pWin); + rep->y = pWin->origin.y - wBorderWidth(pWin); + rep->borderWidth = pWin->borderWidth; + } + else { /* DRAWABLE_PIXMAP */ + + rep->x = rep->y = rep->borderWidth = 0; + } + + return Success; +} + +int +ProcGetGeometry(ClientPtr client) +{ + xGetGeometryReply rep; + int status; + + memset(&rep, 0, sizeof(xGetGeometryReply)); + rep.type = X_Reply ; + if ((status = GetGeometry(client, &rep)) != Success) + return status; + + WriteReplyToClient(client, sizeof(xGetGeometryReply), &rep); + return Success; +} + +#ifdef WIN32 +/* Do not return the clipboard window in ProcQueryTree, cause this may cause + the clipboard client being closed when connecting through xdmcp. +*/ +extern Window g_iClipboardWindow; + +#endif +int +ProcQueryTree(ClientPtr client) +{ + xQueryTreeReply reply; + int rc, numChildren = 0; + WindowPtr pChild, pWin, pHead; + Window *childIDs = (Window *) NULL; + + REQUEST(xResourceReq); + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupWindow(&pWin, stuff->id, client, DixListAccess); + if (rc != Success) + return rc; + memset(&reply, 0, sizeof(xQueryTreeReply)); + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + reply.root = pWin->drawable.pScreen->root->drawable.id; + reply.parent = (pWin->parent) ? pWin->parent->drawable.id : (Window) None; + + pHead = RealChildHead(pWin); + for (pChild = pWin->lastChild; pChild != pHead; pChild = pChild->prevSib) +#ifdef WIN32 + if (pChild->drawable.id!=g_iClipboardWindow) +#endif + numChildren++; + if (numChildren) { + int curChild = 0; + + childIDs = malloc(numChildren * sizeof(Window)); + if (!childIDs) + return BadAlloc; + for (pChild = pWin->lastChild; pChild != pHead; + pChild = pChild->prevSib) +#ifdef WIN32 + if (pChild->drawable.id!=g_iClipboardWindow) +#endif + childIDs[curChild++] = pChild->drawable.id; + } + + reply.nChildren = numChildren; + reply.length = bytes_to_int32(numChildren * sizeof(Window)); + + WriteReplyToClient(client, sizeof(xQueryTreeReply), &reply); + if (numChildren) { + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, numChildren * sizeof(Window), + childIDs); + free(childIDs); + } + + return Success; +} + +int +ProcInternAtom(ClientPtr client) +{ + Atom atom; + char *tchar; + + REQUEST(xInternAtomReq); + + REQUEST_FIXED_SIZE(xInternAtomReq, stuff->nbytes); + if ((stuff->onlyIfExists != xTrue) && (stuff->onlyIfExists != xFalse)) { + client->errorValue = stuff->onlyIfExists; + return BadValue; + } + tchar = (char *) &stuff[1]; + atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists); + if (atom != BAD_RESOURCE) { + xInternAtomReply reply; memset(&reply, 0, sizeof(xInternAtomReply)); + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + reply.length = 0; + reply.atom = atom; + + WriteReplyToClient(client, sizeof(xInternAtomReply), &reply); + return Success; + } + else + return BadAlloc; +} + +int +ProcGetAtomName(ClientPtr client) +{ + const char *str; + + REQUEST(xResourceReq); + + REQUEST_SIZE_MATCH(xResourceReq); + if ((str = NameForAtom(stuff->id))) { + xGetAtomNameReply reply; + int len = strlen(str); + memset(&reply, 0, sizeof(xGetAtomNameReply)); + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + reply.length = bytes_to_int32(len); + reply.nameLength = len; + WriteReplyToClient(client, sizeof(xGetAtomNameReply), &reply); + WriteToClient(client, len, str); + return Success; + } + else { + client->errorValue = stuff->id; + return BadAtom; + } +} + +int +ProcGrabServer(ClientPtr client) +{ + int rc; + + REQUEST_SIZE_MATCH(xReq); + if (grabState != GrabNone && client != grabClient) { + ResetCurrentRequest(client); + client->sequence--; + BITSET(grabWaiters, client->index); + IgnoreClient(client); + return Success; + } + rc = OnlyListenToOneClient(client); + if (rc != Success) + return rc; + grabState = GrabKickout; + grabClient = client; + + if (ServerGrabCallback) { + ServerGrabInfoRec grabinfo; + + grabinfo.client = client; + grabinfo.grabstate = SERVER_GRABBED; + CallCallbacks(&ServerGrabCallback, (void *) &grabinfo); + } + + return Success; +} + +static void +UngrabServer(ClientPtr client) +{ + int i; + + grabState = GrabNone; + ListenToAllClients(); + for (i = mskcnt; --i >= 0 && !grabWaiters[i];); + if (i >= 0) { + i <<= 5; + while (!GETBIT(grabWaiters, i)) + i++; + BITCLEAR(grabWaiters, i); + AttendClient(clients[i]); + } + + if (ServerGrabCallback) { + ServerGrabInfoRec grabinfo; + + grabinfo.client = client; + grabinfo.grabstate = SERVER_UNGRABBED; + CallCallbacks(&ServerGrabCallback, (void *) &grabinfo); + } +} + +int +ProcUngrabServer(ClientPtr client) +{ + REQUEST_SIZE_MATCH(xReq); + UngrabServer(client); + return Success; +} + +int +ProcTranslateCoords(ClientPtr client) +{ + REQUEST(xTranslateCoordsReq); + + WindowPtr pWin, pDst; + xTranslateCoordsReply rep; + int rc; + + REQUEST_SIZE_MATCH(xTranslateCoordsReq); + rc = dixLookupWindow(&pWin, stuff->srcWid, client, DixGetAttrAccess); + if (rc != Success) + return rc; + rc = dixLookupWindow(&pDst, stuff->dstWid, client, DixGetAttrAccess); + if (rc != Success) + return rc; + memset(&rep, 0, sizeof(xTranslateCoordsReply)); + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + + if (!SAME_SCREENS(pWin->drawable, pDst->drawable)) { + rep.sameScreen = xFalse; + rep.child = None; + rep.dstX = rep.dstY = 0; + } + else { + INT16 x, y; + + rep.sameScreen = xTrue; + rep.child = None; + /* computing absolute coordinates -- adjust to destination later */ + x = pWin->drawable.x + stuff->srcX; + y = pWin->drawable.y + stuff->srcY; + pWin = pDst->firstChild; + while (pWin) { + BoxRec box; + + if ((pWin->mapped) && + (x >= pWin->drawable.x - wBorderWidth(pWin)) && + (x < pWin->drawable.x + (int) pWin->drawable.width + + wBorderWidth(pWin)) && + (y >= pWin->drawable.y - wBorderWidth(pWin)) && + (y < pWin->drawable.y + (int) pWin->drawable.height + + wBorderWidth(pWin)) + /* When a window is shaped, a further check + * is made to see if the point is inside + * borderSize + */ + && (!wBoundingShape(pWin) || + RegionContainsPoint(&pWin->borderSize, x, y, &box)) + + && (!wInputShape(pWin) || + RegionContainsPoint(wInputShape(pWin), + x - pWin->drawable.x, + y - pWin->drawable.y, &box)) + ) { + rep.child = pWin->drawable.id; + pWin = (WindowPtr) NULL; + } + else + pWin = pWin->nextSib; + } + /* adjust to destination coordinates */ + rep.dstX = x - pDst->drawable.x; + rep.dstY = y - pDst->drawable.y; + } + WriteReplyToClient(client, sizeof(xTranslateCoordsReply), &rep); + return Success; +} + +int +ProcOpenFont(ClientPtr client) +{ + int err; + + REQUEST(xOpenFontReq); + + REQUEST_FIXED_SIZE(xOpenFontReq, stuff->nbytes); + client->errorValue = stuff->fid; + LEGAL_NEW_RESOURCE(stuff->fid, client); + err = OpenFont(client, stuff->fid, (Mask) 0, + stuff->nbytes, (char *) &stuff[1]); + if (err == Success) { + return Success; + } + else + return err; +} + +int +ProcCloseFont(ClientPtr client) +{ + FontPtr pFont; + int rc; + + REQUEST(xResourceReq); + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupResourceByType((void **) &pFont, stuff->id, RT_FONT, + client, DixDestroyAccess); + if (rc == Success) { + FreeResource(stuff->id, RT_NONE); + return Success; + } + else { + client->errorValue = stuff->id; + return rc; + } +} + +int +ProcQueryFont(ClientPtr client) +{ + xQueryFontReply *reply; + FontPtr pFont; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupFontable(&pFont, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + { + xCharInfo *pmax = FONTINKMAX(pFont); + xCharInfo *pmin = FONTINKMIN(pFont); + int nprotoxcistructs; + int rlength; + + nprotoxcistructs = (pmax->rightSideBearing == pmin->rightSideBearing && + pmax->leftSideBearing == pmin->leftSideBearing && + pmax->descent == pmin->descent && + pmax->ascent == pmin->ascent && + pmax->characterWidth == pmin->characterWidth) ? + 0 : N2dChars(pFont); + + rlength = sizeof(xQueryFontReply) + + FONTINFONPROPS(FONTCHARSET(pFont)) * sizeof(xFontProp) + + nprotoxcistructs * sizeof(xCharInfo); + reply = calloc(1, rlength); + if (!reply) { + return BadAlloc; + } + + reply->type = X_Reply; + reply->length = bytes_to_int32(rlength - sizeof(xGenericReply)); + reply->sequenceNumber = client->sequence; + QueryFont(pFont, reply, nprotoxcistructs); + + WriteReplyToClient(client, rlength, reply); + free(reply); + return Success; + } +} + +int +ProcQueryTextExtents(ClientPtr client) +{ + xQueryTextExtentsReply reply; + FontPtr pFont; + ExtentInfoRec info; + unsigned long length; + int rc; + + REQUEST(xQueryTextExtentsReq); + REQUEST_AT_LEAST_SIZE(xQueryTextExtentsReq); + + rc = dixLookupFontable(&pFont, stuff->fid, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + length = client->req_len - bytes_to_int32(sizeof(xQueryTextExtentsReq)); + length = length << 1; + if (stuff->oddLength) { + if (length == 0) + return BadLength; + length--; + } + if (!QueryTextExtents(pFont, length, (unsigned char *) &stuff[1], &info)) + return BadAlloc; + + reply.type = X_Reply; + reply.drawDirection = info.drawDirection; + reply.sequenceNumber = client->sequence; + reply.length = 0; + reply.fontAscent = info.fontAscent; + reply.fontDescent = info.fontDescent; + reply.overallAscent = info.overallAscent; + reply.overallDescent = info.overallDescent; + reply.overallWidth = info.overallWidth; + reply.overallLeft = info.overallLeft; + reply.overallRight = info.overallRight; + + WriteReplyToClient(client, sizeof(xQueryTextExtentsReply), &reply); + return Success; +} + +int +ProcListFonts(ClientPtr client) +{ + REQUEST(xListFontsReq); + + REQUEST_FIXED_SIZE(xListFontsReq, stuff->nbytes); + + return ListFonts(client, (unsigned char *) &stuff[1], stuff->nbytes, + stuff->maxNames); +} + +int +ProcListFontsWithInfo(ClientPtr client) +{ + REQUEST(xListFontsWithInfoReq); + + REQUEST_FIXED_SIZE(xListFontsWithInfoReq, stuff->nbytes); + + return StartListFontsWithInfo(client, stuff->nbytes, + (unsigned char *) &stuff[1], stuff->maxNames); +} + +/** + * + * \param value must conform to DeleteType + */ +int +dixDestroyPixmap(void *value, XID pid) +{ + PixmapPtr pPixmap = (PixmapPtr) value; + + return (*pPixmap->drawable.pScreen->DestroyPixmap) (pPixmap); +} + +int +ProcCreatePixmap(ClientPtr client) +{ + PixmapPtr pMap; + DrawablePtr pDraw; + + REQUEST(xCreatePixmapReq); + DepthPtr pDepth; + int i, rc; + + REQUEST_SIZE_MATCH(xCreatePixmapReq); + client->errorValue = stuff->pid; + LEGAL_NEW_RESOURCE(stuff->pid, client); + + rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, + DixGetAttrAccess); + if (rc != Success) + return rc; + + if (!stuff->width || !stuff->height) { + client->errorValue = 0; + return BadValue; + } + if (stuff->width > 32767 || stuff->height > 32767) { + /* It is allowed to try and allocate a pixmap which is larger than + * 32767 in either dimension. However, all of the framebuffer code + * is buggy and does not reliably draw to such big pixmaps, basically + * because the Region data structure operates with signed shorts + * for the rectangles in it. + * + * Furthermore, several places in the X server computes the + * size in bytes of the pixmap and tries to store it in an + * integer. This integer can overflow and cause the allocated size + * to be much smaller. + * + * So, such big pixmaps are rejected here with a BadAlloc + */ + return BadAlloc; + } + if (stuff->depth != 1) { + pDepth = pDraw->pScreen->allowedDepths; + for (i = 0; i < pDraw->pScreen->numDepths; i++, pDepth++) + if (pDepth->depth == stuff->depth) + goto CreatePmap; + client->errorValue = stuff->depth; + return BadValue; + } + CreatePmap: + pMap = (PixmapPtr) (*pDraw->pScreen->CreatePixmap) + (pDraw->pScreen, stuff->width, stuff->height, stuff->depth, 0); + if (pMap) { + pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; + pMap->drawable.id = stuff->pid; + /* security creation/labeling check */ + rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pid, RT_PIXMAP, + pMap, RT_NONE, NULL, DixCreateAccess); + if (rc != Success) { + (*pDraw->pScreen->DestroyPixmap) (pMap); + return rc; + } + if (AddResource(stuff->pid, RT_PIXMAP, (void *) pMap)) + return Success; + } + return BadAlloc; +} + +int +ProcFreePixmap(ClientPtr client) +{ + PixmapPtr pMap; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupResourceByType((void **) &pMap, stuff->id, RT_PIXMAP, + client, DixDestroyAccess); + if (rc == Success) { + FreeResource(stuff->id, RT_NONE); + return Success; + } + else { + client->errorValue = stuff->id; + return rc; + } +} + +int +ProcCreateGC(ClientPtr client) +{ + int error, rc; + GC *pGC; + DrawablePtr pDraw; + unsigned len; + + REQUEST(xCreateGCReq); + + REQUEST_AT_LEAST_SIZE(xCreateGCReq); + client->errorValue = stuff->gc; + LEGAL_NEW_RESOURCE(stuff->gc, client); + rc = dixLookupDrawable(&pDraw, stuff->drawable, client, 0, + DixGetAttrAccess); + if (rc != Success) + return rc; + + len = client->req_len - bytes_to_int32(sizeof(xCreateGCReq)); + if (len != Ones(stuff->mask)) + return BadLength; + pGC = (GC *) CreateGC(pDraw, stuff->mask, (XID *) &stuff[1], &error, + stuff->gc, client); + if (error != Success) + return error; + if (!AddResource(stuff->gc, RT_GC, (void *) pGC)) + return BadAlloc; + return Success; +} + +int +ProcChangeGC(ClientPtr client) +{ + GC *pGC; + int result; + unsigned len; + + REQUEST(xChangeGCReq); + REQUEST_AT_LEAST_SIZE(xChangeGCReq); + + result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); + if (result != Success) + return result; + + len = client->req_len - bytes_to_int32(sizeof(xChangeGCReq)); + if (len != Ones(stuff->mask)) + return BadLength; + + return ChangeGCXIDs(client, pGC, stuff->mask, (CARD32 *) &stuff[1]); +} + +int +ProcCopyGC(ClientPtr client) +{ + GC *dstGC; + GC *pGC; + int result; + + REQUEST(xCopyGCReq); + REQUEST_SIZE_MATCH(xCopyGCReq); + + result = dixLookupGC(&pGC, stuff->srcGC, client, DixGetAttrAccess); + if (result != Success) + return result; + result = dixLookupGC(&dstGC, stuff->dstGC, client, DixSetAttrAccess); + if (result != Success) + return result; + if ((dstGC->pScreen != pGC->pScreen) || (dstGC->depth != pGC->depth)) + return BadMatch; + if (stuff->mask & ~GCAllBits) { + client->errorValue = stuff->mask; + return BadValue; + } + return CopyGC(pGC, dstGC, stuff->mask); +} + +int +ProcSetDashes(ClientPtr client) +{ + GC *pGC; + int result; + + REQUEST(xSetDashesReq); + + REQUEST_FIXED_SIZE(xSetDashesReq, stuff->nDashes); + if (stuff->nDashes == 0) { + client->errorValue = 0; + return BadValue; + } + + result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); + if (result != Success) + return result; + + /* If there's an error, either there's no sensible errorValue, + * or there was a dash segment of 0. */ + client->errorValue = 0; + return SetDashes(pGC, stuff->dashOffset, stuff->nDashes, + (unsigned char *) &stuff[1]); +} + +int +ProcSetClipRectangles(ClientPtr client) +{ + int nr, result; + GC *pGC; + + REQUEST(xSetClipRectanglesReq); + + REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); + if ((stuff->ordering != Unsorted) && (stuff->ordering != YSorted) && + (stuff->ordering != YXSorted) && (stuff->ordering != YXBanded)) { + client->errorValue = stuff->ordering; + return BadValue; + } + result = dixLookupGC(&pGC, stuff->gc, client, DixSetAttrAccess); + if (result != Success) + return result; + + nr = (client->req_len << 2) - sizeof(xSetClipRectanglesReq); + if (nr & 4) + return BadLength; + nr >>= 3; + return SetClipRects(pGC, stuff->xOrigin, stuff->yOrigin, + nr, (xRectangle *) &stuff[1], (int) stuff->ordering); +} + +int +ProcFreeGC(ClientPtr client) +{ + GC *pGC; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupGC(&pGC, stuff->id, client, DixDestroyAccess); + if (rc != Success) + return rc; + + FreeResource(stuff->id, RT_NONE); + return Success; +} + +int +ProcClearToBackground(ClientPtr client) +{ + REQUEST(xClearAreaReq); + WindowPtr pWin; + int rc; + + REQUEST_SIZE_MATCH(xClearAreaReq); + rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); + if (rc != Success) + return rc; + if (pWin->drawable.class == InputOnly) { + client->errorValue = stuff->window; + return BadMatch; + } + if ((stuff->exposures != xTrue) && (stuff->exposures != xFalse)) { + client->errorValue = stuff->exposures; + return BadValue; + } + (*pWin->drawable.pScreen->ClearToBackground) (pWin, stuff->x, stuff->y, + stuff->width, stuff->height, + (Bool) stuff->exposures); + return Success; +} + +/* send GraphicsExpose events, or a NoExpose event, based on the region */ +void +SendGraphicsExpose(ClientPtr client, RegionPtr pRgn, XID drawable, + int major, int minor) +{ + if (pRgn && !RegionNil(pRgn)) { + xEvent *pEvent; + xEvent *pe; + BoxPtr pBox; + int i; + int numRects; + + numRects = RegionNumRects(pRgn); + pBox = RegionRects(pRgn); + if (!(pEvent = calloc(numRects, sizeof(xEvent)))) + return; + pe = pEvent; + + for (i = 1; i <= numRects; i++, pe++, pBox++) { + pe->u.u.type = GraphicsExpose; + pe->u.graphicsExposure.drawable = drawable; + pe->u.graphicsExposure.x = pBox->x1; + pe->u.graphicsExposure.y = pBox->y1; + pe->u.graphicsExposure.width = pBox->x2 - pBox->x1; + pe->u.graphicsExposure.height = pBox->y2 - pBox->y1; + pe->u.graphicsExposure.count = numRects - i; + pe->u.graphicsExposure.majorEvent = major; + pe->u.graphicsExposure.minorEvent = minor; + } + /* GraphicsExpose is a "critical event", which TryClientEvents + * handles specially. */ + TryClientEvents(client, NULL, pEvent, numRects, + (Mask) 0, NoEventMask, NullGrab); + free(pEvent); + } + else { + xEvent event = { + .u.noExposure.drawable = drawable, + .u.noExposure.majorEvent = major, + .u.noExposure.minorEvent = minor + }; + event.u.u.type = NoExpose; + WriteEventsToClient(client, 1, &event); + } +} + +int +ProcCopyArea(ClientPtr client) +{ + DrawablePtr pDst; + DrawablePtr pSrc; + GC *pGC; + + REQUEST(xCopyAreaReq); + RegionPtr pRgn; + int rc; + + REQUEST_SIZE_MATCH(xCopyAreaReq); + + VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pDst, DixWriteAccess); + if (stuff->dstDrawable != stuff->srcDrawable) { + rc = dixLookupDrawable(&pSrc, stuff->srcDrawable, client, 0, + DixReadAccess); + if (rc != Success) + return rc; + if ((pDst->pScreen != pSrc->pScreen) || (pDst->depth != pSrc->depth)) { + client->errorValue = stuff->dstDrawable; + return BadMatch; + } + } + else + pSrc = pDst; + + pRgn = (*pGC->ops->CopyArea) (pSrc, pDst, pGC, stuff->srcX, stuff->srcY, + stuff->width, stuff->height, + stuff->dstX, stuff->dstY); + if (pGC->graphicsExposures) { + SendGraphicsExpose(client, pRgn, stuff->dstDrawable, X_CopyArea, 0); + if (pRgn) + RegionDestroy(pRgn); + } + + return Success; +} + +int +ProcCopyPlane(ClientPtr client) +{ + DrawablePtr psrcDraw, pdstDraw; + GC *pGC; + + REQUEST(xCopyPlaneReq); + RegionPtr pRgn; + int rc; + + REQUEST_SIZE_MATCH(xCopyPlaneReq); + + VALIDATE_DRAWABLE_AND_GC(stuff->dstDrawable, pdstDraw, DixWriteAccess); + if (stuff->dstDrawable != stuff->srcDrawable) { + rc = dixLookupDrawable(&psrcDraw, stuff->srcDrawable, client, 0, + DixReadAccess); + if (rc != Success) + return rc; + + if (pdstDraw->pScreen != psrcDraw->pScreen) { + client->errorValue = stuff->dstDrawable; + return BadMatch; + } + } + else + psrcDraw = pdstDraw; + + /* Check to see if stuff->bitPlane has exactly ONE good bit set */ + if (stuff->bitPlane == 0 || (stuff->bitPlane & (stuff->bitPlane - 1)) || + (stuff->bitPlane > (1L << (psrcDraw->depth - 1)))) { + client->errorValue = stuff->bitPlane; + return BadValue; + } + + pRgn = + (*pGC->ops->CopyPlane) (psrcDraw, pdstDraw, pGC, stuff->srcX, + stuff->srcY, stuff->width, stuff->height, + stuff->dstX, stuff->dstY, stuff->bitPlane); + if (pGC->graphicsExposures) { + SendGraphicsExpose(client, pRgn, stuff->dstDrawable, X_CopyPlane, 0); + if (pRgn) + RegionDestroy(pRgn); + } + return Success; +} + +int +ProcPolyPoint(ClientPtr client) +{ + int npoint; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyPointReq); + + REQUEST_AT_LEAST_SIZE(xPolyPointReq); + if ((stuff->coordMode != CoordModeOrigin) && + (stuff->coordMode != CoordModePrevious)) { + client->errorValue = stuff->coordMode; + return BadValue; + } + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyPointReq)); + if (npoint) + (*pGC->ops->PolyPoint) (pDraw, pGC, stuff->coordMode, npoint, + (xPoint *) &stuff[1]); + return Success; +} + +int +ProcPolyLine(ClientPtr client) +{ + int npoint; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyLineReq); + + REQUEST_AT_LEAST_SIZE(xPolyLineReq); + if ((stuff->coordMode != CoordModeOrigin) && + (stuff->coordMode != CoordModePrevious)) { + client->errorValue = stuff->coordMode; + return BadValue; + } + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + npoint = bytes_to_int32((client->req_len << 2) - sizeof(xPolyLineReq)); + if (npoint > 1) + (*pGC->ops->Polylines) (pDraw, pGC, stuff->coordMode, npoint, + (DDXPointPtr) &stuff[1]); + return Success; +} + +int +ProcPolySegment(ClientPtr client) +{ + int nsegs; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolySegmentReq); + + REQUEST_AT_LEAST_SIZE(xPolySegmentReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + nsegs = (client->req_len << 2) - sizeof(xPolySegmentReq); + if (nsegs & 4) + return BadLength; + nsegs >>= 3; + if (nsegs) + (*pGC->ops->PolySegment) (pDraw, pGC, nsegs, (xSegment *) &stuff[1]); + return Success; +} + +int +ProcPolyRectangle(ClientPtr client) +{ + int nrects; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyRectangleReq); + + REQUEST_AT_LEAST_SIZE(xPolyRectangleReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + nrects = (client->req_len << 2) - sizeof(xPolyRectangleReq); + if (nrects & 4) + return BadLength; + nrects >>= 3; + if (nrects) + (*pGC->ops->PolyRectangle) (pDraw, pGC, + nrects, (xRectangle *) &stuff[1]); + return Success; +} + +int +ProcPolyArc(ClientPtr client) +{ + int narcs; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyArcReq); + + REQUEST_AT_LEAST_SIZE(xPolyArcReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + narcs = (client->req_len << 2) - sizeof(xPolyArcReq); + if (narcs % sizeof(xArc)) + return BadLength; + narcs /= sizeof(xArc); + if (narcs) + (*pGC->ops->PolyArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]); + return Success; +} + +int +ProcFillPoly(ClientPtr client) +{ + int things; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xFillPolyReq); + + REQUEST_AT_LEAST_SIZE(xFillPolyReq); + if ((stuff->shape != Complex) && (stuff->shape != Nonconvex) && + (stuff->shape != Convex)) { + client->errorValue = stuff->shape; + return BadValue; + } + if ((stuff->coordMode != CoordModeOrigin) && + (stuff->coordMode != CoordModePrevious)) { + client->errorValue = stuff->coordMode; + return BadValue; + } + + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + things = bytes_to_int32((client->req_len << 2) - sizeof(xFillPolyReq)); + if (things) + (*pGC->ops->FillPolygon) (pDraw, pGC, stuff->shape, + stuff->coordMode, things, + (DDXPointPtr) &stuff[1]); + return Success; +} + +int +ProcPolyFillRectangle(ClientPtr client) +{ + int things; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyFillRectangleReq); + + REQUEST_AT_LEAST_SIZE(xPolyFillRectangleReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + things = (client->req_len << 2) - sizeof(xPolyFillRectangleReq); + if (things & 4) + return BadLength; + things >>= 3; + + if (things) + (*pGC->ops->PolyFillRect) (pDraw, pGC, things, + (xRectangle *) &stuff[1]); + return Success; +} + +int +ProcPolyFillArc(ClientPtr client) +{ + int narcs; + GC *pGC; + DrawablePtr pDraw; + + REQUEST(xPolyFillArcReq); + + REQUEST_AT_LEAST_SIZE(xPolyFillArcReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + narcs = (client->req_len << 2) - sizeof(xPolyFillArcReq); + if (narcs % sizeof(xArc)) + return BadLength; + narcs /= sizeof(xArc); + if (narcs) + (*pGC->ops->PolyFillArc) (pDraw, pGC, narcs, (xArc *) &stuff[1]); + return Success; +} + +#ifdef MATCH_CLIENT_ENDIAN + +int +ServerOrder(void) +{ + int whichbyte = 1; + + if (*((char *) &whichbyte)) + return LSBFirst; + return MSBFirst; +} + +#define ClientOrder(client) ((client)->swapped ? !ServerOrder() : ServerOrder()) + +void +ReformatImage(char *base, int nbytes, int bpp, int order) +{ + switch (bpp) { + case 1: /* yuck */ + if (BITMAP_BIT_ORDER != order) + BitOrderInvert((unsigned char *) base, nbytes); +#if IMAGE_BYTE_ORDER != BITMAP_BIT_ORDER && BITMAP_SCANLINE_UNIT != 8 + ReformatImage(base, nbytes, BITMAP_SCANLINE_UNIT, order); +#endif + break; + case 4: + break; /* yuck */ + case 8: + break; + case 16: + if (IMAGE_BYTE_ORDER != order) + TwoByteSwap((unsigned char *) base, nbytes); + break; + case 32: + if (IMAGE_BYTE_ORDER != order) + FourByteSwap((unsigned char *) base, nbytes); + break; + } +} +#else +#define ReformatImage(b,n,bpp,o) +#endif + +/* 64-bit server notes: the protocol restricts padding of images to + * 8-, 16-, or 32-bits. We would like to have 64-bits for the server + * to use internally. Removes need for internal alignment checking. + * All of the PutImage functions could be changed individually, but + * as currently written, they call other routines which require things + * to be 64-bit padded on scanlines, so we changed things here. + * If an image would be padded differently for 64- versus 32-, then + * copy each scanline to a 64-bit padded scanline. + * Also, we need to make sure that the image is aligned on a 64-bit + * boundary, even if the scanlines are padded to our satisfaction. + */ +int +ProcPutImage(ClientPtr client) +{ + GC *pGC; + DrawablePtr pDraw; + long length; /* length of scanline server padded */ + long lengthProto; /* length of scanline protocol padded */ + char *tmpImage; + + REQUEST(xPutImageReq); + + REQUEST_AT_LEAST_SIZE(xPutImageReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + if (stuff->format == XYBitmap) { + if ((stuff->depth != 1) || + (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad)) + return BadMatch; + length = BitmapBytePad(stuff->width + stuff->leftPad); + } + else if (stuff->format == XYPixmap) { + if ((pDraw->depth != stuff->depth) || + (stuff->leftPad >= (unsigned int) screenInfo.bitmapScanlinePad)) + return BadMatch; + length = BitmapBytePad(stuff->width + stuff->leftPad); + length *= stuff->depth; + } + else if (stuff->format == ZPixmap) { + if ((pDraw->depth != stuff->depth) || (stuff->leftPad != 0)) + return BadMatch; + length = PixmapBytePad(stuff->width, stuff->depth); + } + else { + client->errorValue = stuff->format; + return BadValue; + } + + tmpImage = (char *) &stuff[1]; + lengthProto = length; + + if ((bytes_to_int32(lengthProto * stuff->height) + + bytes_to_int32(sizeof(xPutImageReq))) != client->req_len) + return BadLength; + + ReformatImage(tmpImage, lengthProto * stuff->height, + stuff->format == ZPixmap ? BitsPerPixel(stuff->depth) : 1, + ClientOrder(client)); + + (*pGC->ops->PutImage) (pDraw, pGC, stuff->depth, stuff->dstX, stuff->dstY, + stuff->width, stuff->height, + stuff->leftPad, stuff->format, tmpImage); + + return Success; +} + +static int +DoGetImage(ClientPtr client, int format, Drawable drawable, + int x, int y, int width, int height, + Mask planemask) +{ + DrawablePtr pDraw, pBoundingDraw; + int nlines, linesPerBuf, rc; + int linesDone; + + /* coordinates relative to the bounding drawable */ + int relx, rely; + long widthBytesLine, length; + Mask plane = 0; + char *pBuf; + xGetImageReply xgi; + RegionPtr pVisibleRegion = NULL; + + if ((format != XYPixmap) && (format != ZPixmap)) { + client->errorValue = format; + return BadValue; + } + rc = dixLookupDrawable(&pDraw, drawable, client, 0, DixReadAccess); + if (rc != Success) + return rc; + + memset(&xgi, 0, sizeof(xGetImageReply)); + + relx = x; + rely = y; + + if (pDraw->type == DRAWABLE_WINDOW) { + WindowPtr pWin = (WindowPtr) pDraw; + + /* "If the drawable is a window, the window must be viewable ... or a + * BadMatch error results" */ + if (!pWin->viewable) + return BadMatch; + + /* If the drawable is a window, the rectangle must be contained within + * its bounds (including the border). */ + if (x < -wBorderWidth(pWin) || + x + width > wBorderWidth(pWin) + (int) pDraw->width || + y < -wBorderWidth(pWin) || + y + height > wBorderWidth(pWin) + (int) pDraw->height) + return BadMatch; + + relx += pDraw->x; + rely += pDraw->y; + + if (pDraw->pScreen->GetWindowPixmap) { + PixmapPtr pPix = (*pDraw->pScreen->GetWindowPixmap) (pWin); + + pBoundingDraw = &pPix->drawable; +#ifdef COMPOSITE + relx -= pPix->screen_x; + rely -= pPix->screen_y; +#endif + } + else { + pBoundingDraw = (DrawablePtr) pDraw->pScreen->root; + } + + xgi.visual = wVisual(pWin); + } + else { + pBoundingDraw = pDraw; + xgi.visual = None; + } + + /* "If the drawable is a pixmap, the given rectangle must be wholly + * contained within the pixmap, or a BadMatch error results. If the + * drawable is a window [...] it must be the case that if there were no + * inferiors or overlapping windows, the specified rectangle of the window + * would be fully visible on the screen and wholly contained within the + * outside edges of the window, or a BadMatch error results." + * + * We relax the window case slightly to mean that the rectangle must exist + * within the bounds of the window's backing pixmap. In particular, this + * means that a GetImage request may succeed or fail with BadMatch depending + * on whether any of its ancestor windows are redirected. */ + if (relx < 0 || relx + width > (int) pBoundingDraw->width || + rely < 0 || rely + height > (int) pBoundingDraw->height) + return BadMatch; + + xgi.type = X_Reply; + xgi.sequenceNumber = client->sequence; + xgi.depth = pDraw->depth; + if (format == ZPixmap) { + widthBytesLine = PixmapBytePad(width, pDraw->depth); + length = widthBytesLine * height; + + } + else { + widthBytesLine = BitmapBytePad(width); + plane = ((Mask) 1) << (pDraw->depth - 1); + /* only planes asked for */ + length = widthBytesLine * height * + Ones(planemask & (plane | (plane - 1))); + + } + + xgi.length = length; + + xgi.length = bytes_to_int32(xgi.length); + if (widthBytesLine == 0 || height == 0) + linesPerBuf = 0; + else if (widthBytesLine >= IMAGE_BUFSIZE) + linesPerBuf = 1; + else { + linesPerBuf = IMAGE_BUFSIZE / widthBytesLine; + if (linesPerBuf > height) + linesPerBuf = height; + } + length = linesPerBuf * widthBytesLine; + if (linesPerBuf < height) { + /* we have to make sure intermediate buffers don't need padding */ + while ((linesPerBuf > 1) && + (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1))) { + linesPerBuf--; + length -= widthBytesLine; + } + while (length & ((1L << LOG2_BYTES_PER_SCANLINE_PAD) - 1)) { + linesPerBuf++; + length += widthBytesLine; + } + } + if (!(pBuf = calloc(1, length))) + return BadAlloc; + WriteReplyToClient(client, sizeof(xGetImageReply), &xgi); + + if (pDraw->type == DRAWABLE_WINDOW) { + pVisibleRegion = NotClippedByChildren((WindowPtr) pDraw); + if (pVisibleRegion) { + RegionTranslate(pVisibleRegion, -pDraw->x, -pDraw->y); + } + } + + if (linesPerBuf == 0) { + /* nothing to do */ + } + else if (format == ZPixmap) { + linesDone = 0; + while (height - linesDone > 0) { + nlines = min(linesPerBuf, height - linesDone); + (*pDraw->pScreen->GetImage) (pDraw, + x, + y + linesDone, + width, + nlines, + format, planemask, (void *) pBuf); + if (pVisibleRegion) + XaceCensorImage(client, pVisibleRegion, widthBytesLine, + pDraw, x, y + linesDone, width, + nlines, format, pBuf); + + /* Note that this is NOT a call to WriteSwappedDataToClient, + as we do NOT byte swap */ + ReformatImage(pBuf, (int) (nlines * widthBytesLine), + BitsPerPixel(pDraw->depth), ClientOrder(client)); + + WriteToClient(client, (int) (nlines * widthBytesLine), pBuf); + linesDone += nlines; + } + } + else { /* XYPixmap */ + + for (; plane; plane >>= 1) { + if (planemask & plane) { + linesDone = 0; + while (height - linesDone > 0) { + nlines = min(linesPerBuf, height - linesDone); + (*pDraw->pScreen->GetImage) (pDraw, + x, + y + linesDone, + width, + nlines, + format, plane, (void *) pBuf); + if (pVisibleRegion) + XaceCensorImage(client, pVisibleRegion, + widthBytesLine, + pDraw, x, y + linesDone, width, + nlines, format, pBuf); + + /* Note: NOT a call to WriteSwappedDataToClient, + as we do NOT byte swap */ + ReformatImage(pBuf, (int) (nlines * widthBytesLine), + 1, ClientOrder(client)); + + WriteToClient(client, (int)(nlines * widthBytesLine), pBuf); + linesDone += nlines; + } + } + } + } + if (pVisibleRegion) + RegionDestroy(pVisibleRegion); + free(pBuf); + return Success; +} + +int +ProcGetImage(ClientPtr client) +{ + REQUEST(xGetImageReq); + + REQUEST_SIZE_MATCH(xGetImageReq); + + return DoGetImage(client, stuff->format, stuff->drawable, + stuff->x, stuff->y, + (int) stuff->width, (int) stuff->height, + stuff->planeMask); +} + +int +ProcPolyText(ClientPtr client) +{ + int err; + + REQUEST(xPolyTextReq); + DrawablePtr pDraw; + GC *pGC; + + REQUEST_AT_LEAST_SIZE(xPolyTextReq); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + + err = PolyText(client, + pDraw, + pGC, + (unsigned char *) &stuff[1], + ((unsigned char *) stuff) + (client->req_len << 2), + stuff->x, stuff->y, stuff->reqType, stuff->drawable); + + if (err == Success) { + return Success; + } + else + return err; +} + +int +ProcImageText8(ClientPtr client) +{ + int err; + DrawablePtr pDraw; + GC *pGC; + + REQUEST(xImageTextReq); + + REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + + err = ImageText(client, + pDraw, + pGC, + stuff->nChars, + (unsigned char *) &stuff[1], + stuff->x, stuff->y, stuff->reqType, stuff->drawable); + + if (err == Success) { + return Success; + } + else + return err; +} + +int +ProcImageText16(ClientPtr client) +{ + int err; + DrawablePtr pDraw; + GC *pGC; + + REQUEST(xImageTextReq); + + REQUEST_FIXED_SIZE(xImageTextReq, stuff->nChars << 1); + VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, DixWriteAccess); + + err = ImageText(client, + pDraw, + pGC, + stuff->nChars, + (unsigned char *) &stuff[1], + stuff->x, stuff->y, stuff->reqType, stuff->drawable); + + if (err == Success) { + return Success; + } + else + return err; +} + +int +ProcCreateColormap(ClientPtr client) +{ + VisualPtr pVisual; + ColormapPtr pmap; + Colormap mid; + WindowPtr pWin; + ScreenPtr pScreen; + + REQUEST(xCreateColormapReq); + int i, result; + + REQUEST_SIZE_MATCH(xCreateColormapReq); + + if ((stuff->alloc != AllocNone) && (stuff->alloc != AllocAll)) { + client->errorValue = stuff->alloc; + return BadValue; + } + mid = stuff->mid; + LEGAL_NEW_RESOURCE(mid, client); + result = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); + if (result != Success) + return result; + + pScreen = pWin->drawable.pScreen; + for (i = 0, pVisual = pScreen->visuals; + i < pScreen->numVisuals; i++, pVisual++) { + if (pVisual->vid != stuff->visual) + continue; + return CreateColormap(mid, pScreen, pVisual, &pmap, + (int) stuff->alloc, client->index); + } + client->errorValue = stuff->visual; + return BadMatch; +} + +int +ProcFreeColormap(ClientPtr client) +{ + ColormapPtr pmap; + int rc; + + REQUEST(xResourceReq); + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupResourceByType((void **) &pmap, stuff->id, RT_COLORMAP, + client, DixDestroyAccess); + if (rc == Success) { + /* Freeing a default colormap is a no-op */ + if (!(pmap->flags & IsDefault)) + FreeResource(stuff->id, RT_NONE); + return Success; + } + else { + client->errorValue = stuff->id; + return rc; + } +} + +int +ProcCopyColormapAndFree(ClientPtr client) +{ + Colormap mid; + ColormapPtr pSrcMap; + + REQUEST(xCopyColormapAndFreeReq); + int rc; + + REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq); + mid = stuff->mid; + LEGAL_NEW_RESOURCE(mid, client); + rc = dixLookupResourceByType((void **) &pSrcMap, stuff->srcCmap, + RT_COLORMAP, client, + DixReadAccess | DixRemoveAccess); + if (rc == Success) + return CopyColormapAndFree(mid, pSrcMap, client->index); + client->errorValue = stuff->srcCmap; + return rc; +} + +int +ProcInstallColormap(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP, + client, DixInstallAccess); + if (rc != Success) + goto out; + + rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess); + if (rc != Success) { + if (rc == BadValue) + rc = BadColor; + goto out; + } + + (*(pcmp->pScreen->InstallColormap)) (pcmp); + return Success; + + out: + client->errorValue = stuff->id; + return rc; +} + +int +ProcUninstallColormap(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupResourceByType((void **) &pcmp, stuff->id, RT_COLORMAP, + client, DixUninstallAccess); + if (rc != Success) + goto out; + + rc = XaceHook(XACE_SCREEN_ACCESS, client, pcmp->pScreen, DixSetAttrAccess); + if (rc != Success) { + if (rc == BadValue) + rc = BadColor; + goto out; + } + + if (pcmp->mid != pcmp->pScreen->defColormap) + (*(pcmp->pScreen->UninstallColormap)) (pcmp); + return Success; + + out: + client->errorValue = stuff->id; + return rc; +} + +int +ProcListInstalledColormaps(ClientPtr client) +{ + xListInstalledColormapsReply *preply; + int nummaps, rc; + WindowPtr pWin; + + REQUEST(xResourceReq); + REQUEST_SIZE_MATCH(xResourceReq); + + rc = dixLookupWindow(&pWin, stuff->id, client, DixGetAttrAccess); + if (rc != Success) + return rc; + + rc = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen, + DixGetAttrAccess); + if (rc != Success) + return rc; + + preply = malloc(sizeof(xListInstalledColormapsReply) + + pWin->drawable.pScreen->maxInstalledCmaps * + sizeof(Colormap)); + if (!preply) + return BadAlloc; + + preply->type = X_Reply; + preply->sequenceNumber = client->sequence; + nummaps = (*pWin->drawable.pScreen->ListInstalledColormaps) + (pWin->drawable.pScreen, (Colormap *) &preply[1]); + preply->nColormaps = nummaps; + preply->length = nummaps; + WriteReplyToClient(client, sizeof(xListInstalledColormapsReply), preply); + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, nummaps * sizeof(Colormap), &preply[1]); + free(preply); + return Success; +} + +int +ProcAllocColor(ClientPtr client) +{ + ColormapPtr pmap; + int rc; + + REQUEST(xAllocColorReq); + + REQUEST_SIZE_MATCH(xAllocColorReq); + rc = dixLookupResourceByType((void **) &pmap, stuff->cmap, RT_COLORMAP, + client, DixAddAccess); + if (rc == Success) { + xAllocColorReply acr; + acr.type = X_Reply; + acr.sequenceNumber = client->sequence; + acr.length = 0; + acr.red = stuff->red; + acr.green = stuff->green; + acr.blue = stuff->blue; + acr.pixel = 0; + if ((rc = AllocColor(pmap, &acr.red, &acr.green, &acr.blue, + &acr.pixel, client->index))) + return rc; +#ifdef PANORAMIX + if (noPanoramiXExtension || !pmap->pScreen->myNum) +#endif + WriteReplyToClient(client, sizeof(xAllocColorReply), &acr); + return Success; + + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcAllocNamedColor(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xAllocNamedColorReq); + + REQUEST_FIXED_SIZE(xAllocNamedColorReq, stuff->nbytes); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixAddAccess); + if (rc == Success) { + xAllocNamedColorReply ancr; + ancr.type = X_Reply; + ancr.sequenceNumber = client->sequence; + ancr.length = 0; + + if (OsLookupColor + (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes, + &ancr.exactRed, &ancr.exactGreen, &ancr.exactBlue)) { + ancr.screenRed = ancr.exactRed; + ancr.screenGreen = ancr.exactGreen; + ancr.screenBlue = ancr.exactBlue; + ancr.pixel = 0; + if ((rc = AllocColor(pcmp, + &ancr.screenRed, &ancr.screenGreen, + &ancr.screenBlue, &ancr.pixel, client->index))) + return rc; +#ifdef PANORAMIX + if (noPanoramiXExtension || !pcmp->pScreen->myNum) +#endif + WriteReplyToClient(client, sizeof(xAllocNamedColorReply), + &ancr); + return Success; + } + else + return BadName; + + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcAllocColorCells(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xAllocColorCellsReq); + + REQUEST_SIZE_MATCH(xAllocColorCellsReq); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixAddAccess); + if (rc == Success) { + int npixels, nmasks; + long length; + Pixel *ppixels, *pmasks; + + npixels = stuff->colors; + if (!npixels) { + client->errorValue = npixels; + return BadValue; + } + if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) { + client->errorValue = stuff->contiguous; + return BadValue; + } + nmasks = stuff->planes; + length = ((long) npixels + (long) nmasks) * sizeof(Pixel); + ppixels = malloc(length); + if (!ppixels) + return BadAlloc; + pmasks = ppixels + npixels; + + if ((rc = AllocColorCells(client->index, pcmp, npixels, nmasks, + (Bool) stuff->contiguous, ppixels, pmasks))) { + free(ppixels); + return rc; + } +#ifdef PANORAMIX + if (noPanoramiXExtension || !pcmp->pScreen->myNum) +#endif + { + xAllocColorCellsReply accr; + accr.type = X_Reply; + accr.sequenceNumber = client->sequence; + accr.length = bytes_to_int32(length); + accr.nPixels = npixels; + accr.nMasks = nmasks; + WriteReplyToClient(client, sizeof(xAllocColorCellsReply), &accr); + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, length, ppixels); + } + free(ppixels); + return Success; + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcAllocColorPlanes(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xAllocColorPlanesReq); + + REQUEST_SIZE_MATCH(xAllocColorPlanesReq); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixAddAccess); + if (rc == Success) { + xAllocColorPlanesReply acpr; + int npixels; + long length; + Pixel *ppixels; + + npixels = stuff->colors; + if (!npixels) { + client->errorValue = npixels; + return BadValue; + } + if (stuff->contiguous != xTrue && stuff->contiguous != xFalse) { + client->errorValue = stuff->contiguous; + return BadValue; + } + + acpr.type = X_Reply; + acpr.sequenceNumber = client->sequence; + acpr.nPixels = npixels; + + length = (long) npixels *sizeof(Pixel); + + ppixels = malloc(length); + if (!ppixels) + return BadAlloc; + if ((rc = AllocColorPlanes(client->index, pcmp, npixels, + (int) stuff->red, (int) stuff->green, + (int) stuff->blue, (Bool) stuff->contiguous, + ppixels, &acpr.redMask, &acpr.greenMask, + &acpr.blueMask))) { + free(ppixels); + return rc; + } + acpr.length = bytes_to_int32(length); +#ifdef PANORAMIX + if (noPanoramiXExtension || !pcmp->pScreen->myNum) +#endif + { + WriteReplyToClient(client, sizeof(xAllocColorPlanesReply), &acpr); + client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write; + WriteSwappedDataToClient(client, length, ppixels); + } + free(ppixels); + return Success; + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcFreeColors(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xFreeColorsReq); + + REQUEST_AT_LEAST_SIZE(xFreeColorsReq); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixRemoveAccess); + if (rc == Success) { + int count; + + if (pcmp->flags & AllAllocated) + return BadAccess; + count = bytes_to_int32((client->req_len << 2) - sizeof(xFreeColorsReq)); + return FreeColors(pcmp, client->index, count, + (Pixel *) &stuff[1], (Pixel) stuff->planeMask); + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcStoreColors(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xStoreColorsReq); + + REQUEST_AT_LEAST_SIZE(xStoreColorsReq); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixWriteAccess); + if (rc == Success) { + int count; + + count = (client->req_len << 2) - sizeof(xStoreColorsReq); + if (count % sizeof(xColorItem)) + return BadLength; + count /= sizeof(xColorItem); + return StoreColors(pcmp, count, (xColorItem *) &stuff[1], client); + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcStoreNamedColor(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xStoreNamedColorReq); + + REQUEST_FIXED_SIZE(xStoreNamedColorReq, stuff->nbytes); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixWriteAccess); + if (rc == Success) { + xColorItem def; + + if (OsLookupColor(pcmp->pScreen->myNum, (char *) &stuff[1], + stuff->nbytes, &def.red, &def.green, &def.blue)) { + def.flags = stuff->flags; + def.pixel = stuff->pixel; + return StoreColors(pcmp, 1, &def, client); + } + return BadName; + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcQueryColors(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xQueryColorsReq); + + REQUEST_AT_LEAST_SIZE(xQueryColorsReq); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixReadAccess); + if (rc == Success) { + int count; + xrgb *prgbs; + xQueryColorsReply qcr; + + count = + bytes_to_int32((client->req_len << 2) - sizeof(xQueryColorsReq)); + prgbs = calloc(1, count * sizeof(xrgb)); + if (!prgbs && count) + return BadAlloc; + if ((rc = + QueryColors(pcmp, count, (Pixel *) &stuff[1], prgbs, client))) { + free(prgbs); + return rc; + } + memset(&qcr, 0, sizeof(xQueryColorsReply)); + qcr.type = X_Reply; + qcr.sequenceNumber = client->sequence; + qcr.length = bytes_to_int32(count * sizeof(xrgb)); + qcr.nColors = count; + + WriteReplyToClient(client, sizeof(xQueryColorsReply), &qcr); + if (count) { + client->pSwapReplyFunc = (ReplySwapPtr) SQColorsExtend; + WriteSwappedDataToClient(client, count * sizeof(xrgb), prgbs); + } + free(prgbs); + return Success; + + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcLookupColor(ClientPtr client) +{ + ColormapPtr pcmp; + int rc; + + REQUEST(xLookupColorReq); + + REQUEST_FIXED_SIZE(xLookupColorReq, stuff->nbytes); + rc = dixLookupResourceByType((void **) &pcmp, stuff->cmap, RT_COLORMAP, + client, DixReadAccess); + if (rc == Success) { + CARD16 exactRed, exactGreen, exactBlue; + + if (OsLookupColor + (pcmp->pScreen->myNum, (char *) &stuff[1], stuff->nbytes, + &exactRed, &exactGreen, &exactBlue)) { + xLookupColorReply lcr; + lcr.type = X_Reply; + lcr.sequenceNumber = client->sequence; + lcr.length = 0; + lcr.exactRed = exactRed; + lcr.exactGreen = exactGreen; + lcr.exactBlue = exactBlue; + lcr.screenRed = exactRed; + lcr.screenGreen = exactGreen; + lcr.screenBlue = exactBlue; + + (*pcmp->pScreen->ResolveColor) (&lcr.screenRed, + &lcr.screenGreen, + &lcr.screenBlue, pcmp->pVisual); + WriteReplyToClient(client, sizeof(xLookupColorReply), &lcr); + return Success; + } + return BadName; + } + else { + client->errorValue = stuff->cmap; + return rc; + } +} + +int +ProcCreateCursor(ClientPtr client) +{ + CursorPtr pCursor; + PixmapPtr src; + PixmapPtr msk; + unsigned char *srcbits; + unsigned char *mskbits; + unsigned short width, height; + long n; + CursorMetricRec cm; + int rc; + + REQUEST(xCreateCursorReq); + + REQUEST_SIZE_MATCH(xCreateCursorReq); + LEGAL_NEW_RESOURCE(stuff->cid, client); + + rc = dixLookupResourceByType((void **) &src, stuff->source, RT_PIXMAP, + client, DixReadAccess); + if (rc != Success) { + client->errorValue = stuff->source; + return rc; + } + + if (src->drawable.depth != 1) + return (BadMatch); + + /* Find and validate cursor mask pixmap, if one is provided */ + if (stuff->mask != None) { + rc = dixLookupResourceByType((void **) &msk, stuff->mask, RT_PIXMAP, + client, DixReadAccess); + if (rc != Success) { + client->errorValue = stuff->mask; + return rc; + } + + if (src->drawable.width != msk->drawable.width + || src->drawable.height != msk->drawable.height + || src->drawable.depth != 1 || msk->drawable.depth != 1) + return BadMatch; + } + else + msk = NULL; + + width = src->drawable.width; + height = src->drawable.height; + + if (stuff->x > width || stuff->y > height) + return BadMatch; + + n = BitmapBytePad(width) * height; + srcbits = calloc(1, n); + if (!srcbits) + return BadAlloc; + mskbits = malloc(n); + if (!mskbits) { + free(srcbits); + return BadAlloc; + } + + (*src->drawable.pScreen->GetImage) ((DrawablePtr) src, 0, 0, width, height, + XYPixmap, 1, (void *) srcbits); + if (msk == (PixmapPtr) NULL) { + unsigned char *bits = mskbits; + + while (--n >= 0) + *bits++ = ~0; + } + else { + /* zeroing the (pad) bits helps some ddx cursor handling */ + memset((char *) mskbits, 0, n); + (*msk->drawable.pScreen->GetImage) ((DrawablePtr) msk, 0, 0, width, + height, XYPixmap, 1, + (void *) mskbits); + } + cm.width = width; + cm.height = height; + cm.xhot = stuff->x; + cm.yhot = stuff->y; + rc = AllocARGBCursor(srcbits, mskbits, NULL, &cm, + stuff->foreRed, stuff->foreGreen, stuff->foreBlue, + stuff->backRed, stuff->backGreen, stuff->backBlue, + &pCursor, client, stuff->cid); + + if (rc != Success) + goto bail; + if (!AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) { + rc = BadAlloc; + goto bail; + } + + return Success; + bail: + free(srcbits); + free(mskbits); + return rc; +} + +int +ProcCreateGlyphCursor(ClientPtr client) +{ + CursorPtr pCursor; + int res; + + REQUEST(xCreateGlyphCursorReq); + + REQUEST_SIZE_MATCH(xCreateGlyphCursorReq); + LEGAL_NEW_RESOURCE(stuff->cid, client); + + res = AllocGlyphCursor(stuff->source, stuff->sourceChar, + stuff->mask, stuff->maskChar, + stuff->foreRed, stuff->foreGreen, stuff->foreBlue, + stuff->backRed, stuff->backGreen, stuff->backBlue, + &pCursor, client, stuff->cid); + if (res != Success) + return res; + if (AddResource(stuff->cid, RT_CURSOR, (void *) pCursor)) + return Success; + return BadAlloc; +} + +int +ProcFreeCursor(ClientPtr client) +{ + CursorPtr pCursor; + int rc; + + REQUEST(xResourceReq); + + REQUEST_SIZE_MATCH(xResourceReq); + rc = dixLookupResourceByType((void **) &pCursor, stuff->id, RT_CURSOR, + client, DixDestroyAccess); + if (rc == Success) { + FreeResource(stuff->id, RT_NONE); + return Success; + } + else { + client->errorValue = stuff->id; + return rc; + } +} + +int +ProcQueryBestSize(ClientPtr client) +{ + xQueryBestSizeReply reply; + DrawablePtr pDraw; + ScreenPtr pScreen; + int rc; + + REQUEST(xQueryBestSizeReq); + REQUEST_SIZE_MATCH(xQueryBestSizeReq); + + if ((stuff->class != CursorShape) && + (stuff->class != TileShape) && (stuff->class != StippleShape)) { + client->errorValue = stuff->class; + return BadValue; + } + + rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY, + DixGetAttrAccess); + if (rc != Success) + return rc; + if (stuff->class != CursorShape && pDraw->type == UNDRAWABLE_WINDOW) + return BadMatch; + pScreen = pDraw->pScreen; + rc = XaceHook(XACE_SCREEN_ACCESS, client, pScreen, DixGetAttrAccess); + if (rc != Success) + return rc; + (*pScreen->QueryBestSize) (stuff->class, &stuff->width, + &stuff->height, pScreen); + memset(&reply, 0, sizeof(xQueryBestSizeReply)); + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + reply.length = 0; + reply.width = stuff->width; + reply.height = stuff->height; + + WriteReplyToClient(client, sizeof(xQueryBestSizeReply), &reply); + return Success; +} + +int +ProcSetScreenSaver(ClientPtr client) +{ + int rc, i, blankingOption, exposureOption; + + REQUEST(xSetScreenSaverReq); + REQUEST_SIZE_MATCH(xSetScreenSaverReq); + + for (i = 0; i < screenInfo.numScreens; i++) { + rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i], + DixSetAttrAccess); + if (rc != Success) + return rc; + } + + blankingOption = stuff->preferBlank; + if ((blankingOption != DontPreferBlanking) && + (blankingOption != PreferBlanking) && + (blankingOption != DefaultBlanking)) { + client->errorValue = blankingOption; + return BadValue; + } + exposureOption = stuff->allowExpose; + if ((exposureOption != DontAllowExposures) && + (exposureOption != AllowExposures) && + (exposureOption != DefaultExposures)) { + client->errorValue = exposureOption; + return BadValue; + } + if (stuff->timeout < -1) { + client->errorValue = stuff->timeout; + return BadValue; + } + if (stuff->interval < -1) { + client->errorValue = stuff->interval; + return BadValue; + } + + if (blankingOption == DefaultBlanking) + ScreenSaverBlanking = defaultScreenSaverBlanking; + else + ScreenSaverBlanking = blankingOption; + if (exposureOption == DefaultExposures) + ScreenSaverAllowExposures = defaultScreenSaverAllowExposures; + else + ScreenSaverAllowExposures = exposureOption; + + if (stuff->timeout >= 0) + ScreenSaverTime = stuff->timeout * MILLI_PER_SECOND; + else + ScreenSaverTime = defaultScreenSaverTime; + if (stuff->interval >= 0) + ScreenSaverInterval = stuff->interval * MILLI_PER_SECOND; + else + ScreenSaverInterval = defaultScreenSaverInterval; + + SetScreenSaverTimer(); + return Success; +} + +int +ProcGetScreenSaver(ClientPtr client) +{ + xGetScreenSaverReply rep; + int rc, i; + + REQUEST_SIZE_MATCH(xReq); + + for (i = 0; i < screenInfo.numScreens; i++) { + rc = XaceHook(XACE_SCREENSAVER_ACCESS, client, screenInfo.screens[i], + DixGetAttrAccess); + if (rc != Success) + return rc; + } + + + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.timeout = ScreenSaverTime / MILLI_PER_SECOND; + rep.interval = ScreenSaverInterval / MILLI_PER_SECOND; + rep.preferBlanking = ScreenSaverBlanking; + rep.allowExposures = ScreenSaverAllowExposures; + + WriteReplyToClient(client, sizeof(xGetScreenSaverReply), &rep); + return Success; +} + +int +ProcChangeHosts(ClientPtr client) +{ + REQUEST(xChangeHostsReq); + + REQUEST_FIXED_SIZE(xChangeHostsReq, stuff->hostLength); + + if (stuff->mode == HostInsert) + return AddHost(client, (int) stuff->hostFamily, + stuff->hostLength, (void *) &stuff[1]); + if (stuff->mode == HostDelete) + return RemoveHost(client, (int) stuff->hostFamily, + stuff->hostLength, (void *) &stuff[1]); + client->errorValue = stuff->mode; + return BadValue; +} + +int +ProcListHosts(ClientPtr client) +{ + xListHostsReply reply; + int len, nHosts, result; + BOOL enabled; + void *pdata; + + /* REQUEST(xListHostsReq); */ + + REQUEST_SIZE_MATCH(xListHostsReq); + + /* untrusted clients can't list hosts */ + result = XaceHook(XACE_SERVER_ACCESS, client, DixReadAccess); + if (result != Success) + return result; + + result = GetHosts(&pdata, &nHosts, &len, &enabled); + if (result != Success) + return result; + + + reply.type = X_Reply; + reply.enabled = enabled; + reply.sequenceNumber = client->sequence; + reply.length = bytes_to_int32(len); + reply.nHosts = nHosts; + + WriteReplyToClient(client, sizeof(xListHostsReply), &reply); + if (nHosts) { + client->pSwapReplyFunc = (ReplySwapPtr) SLHostsExtend; + WriteSwappedDataToClient(client, len, pdata); + } + free(pdata); + return Success; +} + +int +ProcChangeAccessControl(ClientPtr client) +{ + REQUEST(xSetAccessControlReq); + + REQUEST_SIZE_MATCH(xSetAccessControlReq); + if ((stuff->mode != EnableAccess) && (stuff->mode != DisableAccess)) { + client->errorValue = stuff->mode; + return BadValue; + } + return ChangeAccessControl(client, stuff->mode == EnableAccess); +} + +/********************* + * CloseDownRetainedResources + * - * Find all clients that are gone and have terminated in RetainTemporary ++ * Find all clients that are gone and have terminated in RetainTemporary + * and destroy their resources. + *********************/ + +static void +CloseDownRetainedResources(void) +{ + int i; + ClientPtr client; + + for (i = 1; i < currentMaxClients; i++) { + client = clients[i]; + if (client && (client->closeDownMode == RetainTemporary) + && (client->clientGone)) + CloseDownClient(client); + } +} + +int +ProcKillClient(ClientPtr client) +{ + REQUEST(xResourceReq); + ClientPtr killclient; + int rc; + + REQUEST_SIZE_MATCH(xResourceReq); + if (stuff->id == AllTemporary) { + CloseDownRetainedResources(); + return Success; + } + + rc = dixLookupClient(&killclient, stuff->id, client, DixDestroyAccess); + if (rc == Success) { + CloseDownClient(killclient); + if (client == killclient) { + /* force yield and return Success, so that Dispatch() + * doesn't try to touch client + */ + isItTimeToYield = TRUE; + } + return Success; + } + else + return rc; +} + +int +ProcSetFontPath(ClientPtr client) +{ + unsigned char *ptr; + unsigned long nbytes, total; + long nfonts; + int n; + + REQUEST(xSetFontPathReq); + + REQUEST_AT_LEAST_SIZE(xSetFontPathReq); + + nbytes = (client->req_len << 2) - sizeof(xSetFontPathReq); + total = nbytes; + ptr = (unsigned char *) &stuff[1]; + nfonts = stuff->nFonts; + while (--nfonts >= 0) { + if ((total == 0) || (total < (n = (*ptr + 1)))) + return BadLength; + total -= n; + ptr += n; + } + if (total >= 4) + return BadLength; + return SetFontPath(client, stuff->nFonts, (unsigned char *) &stuff[1]); +} + +int +ProcGetFontPath(ClientPtr client) +{ + xGetFontPathReply reply; + int rc, stringLens, numpaths; + unsigned char *bufferStart; + + /* REQUEST (xReq); */ + + REQUEST_SIZE_MATCH(xReq); + rc = GetFontPath(client, &numpaths, &stringLens, &bufferStart); + if (rc != Success) + return rc; + + + reply.type = X_Reply; + reply.sequenceNumber = client->sequence; + reply.length = bytes_to_int32(stringLens + numpaths); + reply.nPaths = numpaths; + + WriteReplyToClient(client, sizeof(xGetFontPathReply), &reply); + if (stringLens || numpaths) + WriteToClient(client, stringLens + numpaths, bufferStart); + return Success; +} + +int +ProcChangeCloseDownMode(ClientPtr client) +{ + int rc; + + REQUEST(xSetCloseDownModeReq); + REQUEST_SIZE_MATCH(xSetCloseDownModeReq); + + rc = XaceHook(XACE_CLIENT_ACCESS, client, client, DixManageAccess); + if (rc != Success) + return rc; + + if ((stuff->mode == AllTemporary) || + (stuff->mode == RetainPermanent) || (stuff->mode == RetainTemporary)) { + client->closeDownMode = stuff->mode; + return Success; + } + else { + client->errorValue = stuff->mode; + return BadValue; + } +} + +int +ProcForceScreenSaver(ClientPtr client) +{ + int rc; + + REQUEST(xForceScreenSaverReq); + + REQUEST_SIZE_MATCH(xForceScreenSaverReq); + + if ((stuff->mode != ScreenSaverReset) && (stuff->mode != ScreenSaverActive)) { + client->errorValue = stuff->mode; + return BadValue; + } + rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, (int) stuff->mode); + if (rc != Success) + return rc; + return Success; +} + +int +ProcNoOperation(ClientPtr client) +{ + REQUEST_AT_LEAST_SIZE(xReq); + + /* noop -- don't do anything */ + return Success; +} + +/********************** + * CloseDownClient + * + * Client can either mark his resources destroy or retain. If retained and + * then killed again, the client is really destroyed. + *********************/ + +char dispatchExceptionAtReset = DE_RESET; + +void +CloseDownClient(ClientPtr client) +{ + Bool really_close_down = client->clientGone || + client->closeDownMode == DestroyAll; + + if (!client->clientGone) { + /* ungrab server if grabbing client dies */ + if (grabState != GrabNone && grabClient == client) { + UngrabServer(client); + } + BITCLEAR(grabWaiters, client->index); + DeleteClientFromAnySelections(client); + ReleaseActiveGrabs(client); + DeleteClientFontStuff(client); + if (!really_close_down) { + /* This frees resources that should never be retained + * no matter what the close down mode is. Actually we + * could do this unconditionally, but it's probably + * better not to traverse all the client's resources + * twice (once here, once a few lines down in + * FreeClientResources) in the common case of + * really_close_down == TRUE. + */ + FreeClientNeverRetainResources(client); + client->clientState = ClientStateRetained; + if (ClientStateCallback) { + NewClientInfoRec clientinfo; + + clientinfo.client = client; + clientinfo.prefix = (xConnSetupPrefix *) NULL; + clientinfo.setup = (xConnSetup *) NULL; + CallCallbacks((&ClientStateCallback), (void *) &clientinfo); + } + } + client->clientGone = TRUE; /* so events aren't sent to client */ + if (ClientIsAsleep(client)) + ClientSignal(client); + ProcessWorkQueueZombies(); + CloseDownConnection(client); + + /* If the client made it to the Running stage, nClients has + * been incremented on its behalf, so we need to decrement it + * now. If it hasn't gotten to Running, nClients has *not* + * been incremented, so *don't* decrement it. + */ + if (client->clientState != ClientStateInitial) { + --nClients; + } + } + + if (really_close_down) { + if (client->clientState == ClientStateRunning && nClients == 0) + dispatchException |= dispatchExceptionAtReset; + + client->clientState = ClientStateGone; + if (ClientStateCallback) { + NewClientInfoRec clientinfo; + + clientinfo.client = client; + clientinfo.prefix = (xConnSetupPrefix *) NULL; + clientinfo.setup = (xConnSetup *) NULL; + CallCallbacks((&ClientStateCallback), (void *) &clientinfo); + } + TouchListenerGone(client->clientAsMask); + FreeClientResources(client); + /* Disable client ID tracking. This must be done after + * ClientStateCallback. */ + ReleaseClientIds(client); +#ifdef XSERVER_DTRACE + XSERVER_CLIENT_DISCONNECT(client->index); +#endif + if (client->index < nextFreeClientID) + nextFreeClientID = client->index; + clients[client->index] = NullClient; + SmartLastClient = NullClient; + dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); + + while (!clients[currentMaxClients - 1]) + currentMaxClients--; + } +} + +static void +KillAllClients(void) +{ + int i; + + for (i = 1; i < currentMaxClients; i++) + if (clients[i]) { + /* Make sure Retained clients are released. */ + clients[i]->closeDownMode = DestroyAll; + CloseDownClient(clients[i]); + } +} + +void +InitClient(ClientPtr client, int i, void *ospriv) +{ + client->index = i; + client->clientAsMask = ((Mask) i) << CLIENTOFFSET; + client->closeDownMode = i ? DestroyAll : RetainPermanent; + client->requestVector = InitialVector; + client->osPrivate = ospriv; + QueryMinMaxKeyCodes(&client->minKC, &client->maxKC); + client->smart_start_tick = SmartScheduleTime; + client->smart_stop_tick = SmartScheduleTime; + client->clientIds = NULL; +} + +/************************ + * int NextAvailableClient(ospriv) + * + * OS dependent portion can't assign client id's because of CloseDownModes. + * Returns NULL if there are no free clients. + *************************/ + +ClientPtr +NextAvailableClient(void *ospriv) +{ + int i; + ClientPtr client; + xReq data; + + i = nextFreeClientID; + if (i == MAXCLIENTS) + return (ClientPtr) NULL; + clients[i] = client = + dixAllocateObjectWithPrivates(ClientRec, PRIVATE_CLIENT); + if (!client) + return (ClientPtr) NULL; + InitClient(client, i, ospriv); + if (!InitClientResources(client)) { + dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); + return (ClientPtr) NULL; + } + data.reqType = 1; + data.length = bytes_to_int32(sz_xReq + sz_xConnClientPrefix); + if (!InsertFakeRequest(client, (char *) &data, sz_xReq)) { + FreeClientResources(client); + dixFreeObjectWithPrivates(client, PRIVATE_CLIENT); + return (ClientPtr) NULL; + } + if (i == currentMaxClients) + currentMaxClients++; + while ((nextFreeClientID < MAXCLIENTS) && clients[nextFreeClientID]) + nextFreeClientID++; + + /* Enable client ID tracking. This must be done before + * ClientStateCallback. */ + ReserveClientIds(client); + + if (ClientStateCallback) { + NewClientInfoRec clientinfo; + + clientinfo.client = client; + clientinfo.prefix = (xConnSetupPrefix *) NULL; + clientinfo.setup = (xConnSetup *) NULL; + CallCallbacks((&ClientStateCallback), (void *) &clientinfo); + } + return client; +} + +int +ProcInitialConnection(ClientPtr client) +{ + REQUEST(xReq); + xConnClientPrefix *prefix; + int whichbyte = 1; + char order; + + prefix = (xConnClientPrefix *) ((char *)stuff + sz_xReq); + order = prefix->byteOrder; + if (order != 'l' && order != 'B' && order != 'r' && order != 'R') + return client->noClientException = -1; + if (((*(char *) &whichbyte) && (order == 'B' || order == 'R')) || + (!(*(char *) &whichbyte) && (order == 'l' || order == 'r'))) { + client->swapped = TRUE; + SwapConnClientPrefix(prefix); + } + stuff->reqType = 2; + stuff->length += bytes_to_int32(prefix->nbytesAuthProto) + + bytes_to_int32(prefix->nbytesAuthString); + if (client->swapped) { + swaps(&stuff->length); + } + if (order == 'r' || order == 'R') { + client->local = FALSE; + } + ResetCurrentRequest(client); + return Success; +} + +static int +SendConnSetup(ClientPtr client, const char *reason) +{ + xWindowRoot *root; + int i; + int numScreens; + char *lConnectionInfo; + xConnSetupPrefix *lconnSetupPrefix; + + if (reason) { + xConnSetupPrefix csp; + + csp.success = xFalse; + csp.lengthReason = strlen(reason); + csp.length = bytes_to_int32(csp.lengthReason); + csp.majorVersion = X_PROTOCOL; + csp.minorVersion = X_PROTOCOL_REVISION; + if (client->swapped) + WriteSConnSetupPrefix(client, &csp); + else + WriteToClient(client, sz_xConnSetupPrefix, &csp); + WriteToClient(client, (int) csp.lengthReason, reason); + return client->noClientException = -1; + } + + numScreens = screenInfo.numScreens; + lConnectionInfo = ConnectionInfo; + lconnSetupPrefix = &connSetupPrefix; + + /* We're about to start speaking X protocol back to the client by + * sending the connection setup info. This means the authorization + * step is complete, and we can count the client as an + * authorized one. + */ + nClients++; + + client->requestVector = client->swapped ? SwappedProcVector : ProcVector; + client->sequence = 0; + ((xConnSetup *) lConnectionInfo)->ridBase = client->clientAsMask; + ((xConnSetup *) lConnectionInfo)->ridMask = RESOURCE_ID_MASK; +#ifdef MATCH_CLIENT_ENDIAN + ((xConnSetup *) lConnectionInfo)->imageByteOrder = ClientOrder(client); + ((xConnSetup *) lConnectionInfo)->bitmapBitOrder = ClientOrder(client); +#endif + /* fill in the "currentInputMask" */ + root = (xWindowRoot *) (lConnectionInfo + connBlockScreenStart); +#ifdef PANORAMIX + if (noPanoramiXExtension) + numScreens = screenInfo.numScreens; + else + numScreens = ((xConnSetup *) ConnectionInfo)->numRoots; +#endif + + for (i = 0; i < numScreens; i++) { + unsigned int j; + xDepth *pDepth; + WindowPtr pRoot = screenInfo.screens[i]->root; + + root->currentInputMask = pRoot->eventMask | wOtherEventMasks(pRoot); + pDepth = (xDepth *) (root + 1); + for (j = 0; j < root->nDepths; j++) { + pDepth = (xDepth *) (((char *) (pDepth + 1)) + + pDepth->nVisuals * sizeof(xVisualType)); + } + root = (xWindowRoot *) pDepth; + } + + if (client->swapped) { + WriteSConnSetupPrefix(client, lconnSetupPrefix); + WriteSConnectionInfo(client, + (unsigned long) (lconnSetupPrefix->length << 2), + lConnectionInfo); + } + else { + WriteToClient(client, sizeof(xConnSetupPrefix), lconnSetupPrefix); + WriteToClient(client, (int) (lconnSetupPrefix->length << 2), + lConnectionInfo); + } + client->clientState = ClientStateRunning; + if (ClientStateCallback) { + NewClientInfoRec clientinfo; + + clientinfo.client = client; + clientinfo.prefix = lconnSetupPrefix; + clientinfo.setup = (xConnSetup *) lConnectionInfo; + CallCallbacks((&ClientStateCallback), (void *) &clientinfo); + } + return Success; +} + +int +ProcEstablishConnection(ClientPtr client) +{ + const char *reason; + char *auth_proto, *auth_string; + xConnClientPrefix *prefix; + + REQUEST(xReq); + + prefix = (xConnClientPrefix *) ((char *) stuff + sz_xReq); + auth_proto = (char *) prefix + sz_xConnClientPrefix; + auth_string = auth_proto + pad_to_int32(prefix->nbytesAuthProto); + if ((prefix->majorVersion != X_PROTOCOL) || + (prefix->minorVersion != X_PROTOCOL_REVISION)) + reason = "Protocol version mismatch"; + else + reason = ClientAuthorized(client, + (unsigned short) prefix->nbytesAuthProto, + auth_proto, + (unsigned short) prefix->nbytesAuthString, + auth_string); + + return (SendConnSetup(client, reason)); +} + +void +SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode, + XID resId, int errorCode) +{ + xError rep; memset(&rep, 0, sizeof(xError)); + rep.type = X_Error; + rep.errorCode = errorCode; + rep.resourceID = resId; + rep.minorCode = minorCode; + rep.majorCode = majorCode; + + WriteEventsToClient(client, 1, (xEvent *) &rep); +} + +void +MarkClientException(ClientPtr client) +{ + client->noClientException = -1; +} + +/* + * This array encodes the answer to the question "what is the log base 2 + * of the number of pixels that fit in a scanline pad unit?" + * Note that ~0 is an invalid entry (mostly for the benefit of the reader). + */ +static int answer[6][4] = { + /* pad pad pad pad */ + /* 8 16 32 64 */ + + {3, 4, 5, 6}, /* 1 bit per pixel */ + {1, 2, 3, 4}, /* 4 bits per pixel */ + {0, 1, 2, 3}, /* 8 bits per pixel */ + {~0, 0, 1, 2}, /* 16 bits per pixel */ + {~0, ~0, 0, 1}, /* 24 bits per pixel */ + {~0, ~0, 0, 1} /* 32 bits per pixel */ +}; + +/* + * This array gives the answer to the question "what is the first index for + * the answer array above given the number of bits per pixel?" + * Note that ~0 is an invalid entry (mostly for the benefit of the reader). + */ +static int indexForBitsPerPixel[33] = { + ~0, 0, ~0, ~0, /* 1 bit per pixel */ + 1, ~0, ~0, ~0, /* 4 bits per pixel */ + 2, ~0, ~0, ~0, /* 8 bits per pixel */ + ~0, ~0, ~0, ~0, + 3, ~0, ~0, ~0, /* 16 bits per pixel */ + ~0, ~0, ~0, ~0, + 4, ~0, ~0, ~0, /* 24 bits per pixel */ + ~0, ~0, ~0, ~0, + 5 /* 32 bits per pixel */ +}; + +/* + * This array gives the bytesperPixel value for cases where the number + * of bits per pixel is a multiple of 8 but not a power of 2. + */ +static int answerBytesPerPixel[33] = { + ~0, 0, ~0, ~0, /* 1 bit per pixel */ + 0, ~0, ~0, ~0, /* 4 bits per pixel */ + 0, ~0, ~0, ~0, /* 8 bits per pixel */ + ~0, ~0, ~0, ~0, + 0, ~0, ~0, ~0, /* 16 bits per pixel */ + ~0, ~0, ~0, ~0, + 3, ~0, ~0, ~0, /* 24 bits per pixel */ + ~0, ~0, ~0, ~0, + 0 /* 32 bits per pixel */ +}; + +/* + * This array gives the answer to the question "what is the second index for + * the answer array above given the number of bits per scanline pad unit?" + * Note that ~0 is an invalid entry (mostly for the benefit of the reader). + */ +static int indexForScanlinePad[65] = { + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + 0, ~0, ~0, ~0, /* 8 bits per scanline pad unit */ + ~0, ~0, ~0, ~0, + 1, ~0, ~0, ~0, /* 16 bits per scanline pad unit */ + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + 2, ~0, ~0, ~0, /* 32 bits per scanline pad unit */ + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + ~0, ~0, ~0, ~0, + 3 /* 64 bits per scanline pad unit */ +}; + +/* + grow the array of screenRecs if necessary. + call the device-supplied initialization procedure +with its screen number, a pointer to its ScreenRec, argc, and argv. + return the number of successfully installed screens. + +*/ + +static int init_screen(ScreenPtr pScreen, int i, Bool gpu) +{ + int scanlinepad, format, depth, bitsPerPixel, j, k; + + dixInitScreenSpecificPrivates(pScreen); + + if (!dixAllocatePrivates(&pScreen->devPrivates, PRIVATE_SCREEN)) { + return -1; + } + pScreen->myNum = i; + if (gpu) { + pScreen->myNum += GPU_SCREEN_OFFSET; + pScreen->isGPU = TRUE; + } + pScreen->totalPixmapSize = 0; /* computed in CreateScratchPixmapForScreen */ + pScreen->ClipNotify = 0; /* for R4 ddx compatibility */ + pScreen->CreateScreenResources = 0; + + xorg_list_init(&pScreen->pixmap_dirty_list); + xorg_list_init(&pScreen->unattached_list); + xorg_list_init(&pScreen->output_slave_list); + xorg_list_init(&pScreen->offload_slave_list); + + /* + * This loop gets run once for every Screen that gets added, + * but thats ok. If the ddx layer initializes the formats + * one at a time calling AddScreen() after each, then each + * iteration will make it a little more accurate. Worst case + * we do this loop N * numPixmapFormats where N is # of screens. + * Anyway, this must be called after InitOutput and before the + * screen init routine is called. + */ + for (format = 0; format < screenInfo.numPixmapFormats; format++) { + depth = screenInfo.formats[format].depth; + bitsPerPixel = screenInfo.formats[format].bitsPerPixel; + scanlinepad = screenInfo.formats[format].scanlinePad; + j = indexForBitsPerPixel[bitsPerPixel]; + k = indexForScanlinePad[scanlinepad]; + PixmapWidthPaddingInfo[depth].padPixelsLog2 = answer[j][k]; + PixmapWidthPaddingInfo[depth].padRoundUp = + (scanlinepad / bitsPerPixel) - 1; + j = indexForBitsPerPixel[8]; /* bits per byte */ + PixmapWidthPaddingInfo[depth].padBytesLog2 = answer[j][k]; + PixmapWidthPaddingInfo[depth].bitsPerPixel = bitsPerPixel; + if (answerBytesPerPixel[bitsPerPixel]) { + PixmapWidthPaddingInfo[depth].notPower2 = 1; + PixmapWidthPaddingInfo[depth].bytesPerPixel = + answerBytesPerPixel[bitsPerPixel]; + } + else { + PixmapWidthPaddingInfo[depth].notPower2 = 0; + } + } + return 0; +} + +int +AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , + int /*argc */ , + char ** /*argv */ + ), int argc, char **argv) +{ + + int i; + ScreenPtr pScreen; + Bool ret; + + i = screenInfo.numScreens; + if (i == MAXSCREENS) + return -1; + + pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec)); + if (!pScreen) + return -1; + + ret = init_screen(pScreen, i, FALSE); + if (ret != 0) { + free(pScreen); + return ret; + } + /* This is where screen specific stuff gets initialized. Load the + screen structure, call the hardware, whatever. + This is also where the default colormap should be allocated and + also pixel values for blackPixel, whitePixel, and the cursor + Note that InitScreen is NOT allowed to modify argc, argv, or + any of the strings pointed to by argv. They may be passed to + multiple screens. + */ + screenInfo.screens[i] = pScreen; + screenInfo.numScreens++; + if (!(*pfnInit) (pScreen, argc, argv)) { + dixFreeScreenSpecificPrivates(pScreen); + dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN); + free(pScreen); + screenInfo.numScreens--; + return -1; + } + + update_desktop_dimensions(); + + dixRegisterScreenPrivateKey(&cursorScreenDevPriv, pScreen, PRIVATE_CURSOR, + 0); + + return i; +} + +int +AddGPUScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ , + int /*argc */ , + char ** /*argv */ + ), + int argc, char **argv) +{ + int i; + ScreenPtr pScreen; + Bool ret; + + i = screenInfo.numGPUScreens; + if (i == MAXGPUSCREENS) + return -1; + + pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec)); + if (!pScreen) + return -1; + + ret = init_screen(pScreen, i, TRUE); + if (ret != 0) { + free(pScreen); + return ret; + } + + /* This is where screen specific stuff gets initialized. Load the + screen structure, call the hardware, whatever. + This is also where the default colormap should be allocated and + also pixel values for blackPixel, whitePixel, and the cursor + Note that InitScreen is NOT allowed to modify argc, argv, or + any of the strings pointed to by argv. They may be passed to + multiple screens. + */ + screenInfo.gpuscreens[i] = pScreen; + screenInfo.numGPUScreens++; + if (!(*pfnInit) (pScreen, argc, argv)) { + dixFreePrivates(pScreen->devPrivates, PRIVATE_SCREEN); + free(pScreen); + screenInfo.numGPUScreens--; + return -1; + } + + update_desktop_dimensions(); + + return i; +} + +void +RemoveGPUScreen(ScreenPtr pScreen) +{ + int idx, j; + if (!pScreen->isGPU) + return; + + idx = pScreen->myNum - GPU_SCREEN_OFFSET; + for (j = idx; j < screenInfo.numGPUScreens - 1; j++) { + screenInfo.gpuscreens[j] = screenInfo.gpuscreens[j + 1]; + screenInfo.gpuscreens[j]->myNum = j + GPU_SCREEN_OFFSET; + } + screenInfo.numGPUScreens--; + + /* this gets freed later in the resource list, but without + * the screen existing it causes crashes - so remove it here */ + if (pScreen->defColormap) + FreeResource(pScreen->defColormap, RT_COLORMAP); + free(pScreen); + +} + +void +AttachUnboundGPU(ScreenPtr pScreen, ScreenPtr new) +{ + assert(new->isGPU); + assert(!new->current_master); + xorg_list_add(&new->unattached_head, &pScreen->unattached_list); + new->current_master = pScreen; +} + +void +DetachUnboundGPU(ScreenPtr slave) +{ + assert(slave->isGPU); + xorg_list_del(&slave->unattached_head); + slave->current_master = NULL; +} + +void +AttachOutputGPU(ScreenPtr pScreen, ScreenPtr new) +{ + assert(new->isGPU); + xorg_list_add(&new->output_head, &pScreen->output_slave_list); + new->current_master = pScreen; +} + +void +DetachOutputGPU(ScreenPtr slave) +{ + assert(slave->isGPU); + xorg_list_del(&slave->output_head); + slave->current_master = NULL; +} + +void +AttachOffloadGPU(ScreenPtr pScreen, ScreenPtr new) +{ + assert(new->isGPU); + xorg_list_add(&new->offload_head, &pScreen->offload_slave_list); + new->current_master = pScreen; +} + +void +DetachOffloadGPU(ScreenPtr slave) +{ + assert(slave->isGPU); + xorg_list_del(&slave->offload_head); + slave->current_master = NULL; +} + diff --cc xorg-server/hw/kdrive/ephyr/ephyrinit.c index 8311a5f,897aa19..65b1a47 mode 100755,100644..100755 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c diff --cc xorg-server/hw/kdrive/ephyr/hostx.c index ae92545,8d6d5e8..7a3338f mode 100755,100644..100755 --- a/xorg-server/hw/kdrive/ephyr/hostx.c +++ b/xorg-server/hw/kdrive/ephyr/hostx.c diff --cc xorg-server/hw/xfree86/common/compiler.h index 4cb1277,1653574..2ee5e22 mode 100755,100644..100755 --- a/xorg-server/hw/xfree86/common/compiler.h +++ b/xorg-server/hw/xfree86/common/compiler.h diff --cc xorg-server/hw/xwin/InitOutput.c index 9e9491d,fef46a9..4e099d2 mode 100755,100644..100755 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c diff --cc xorg-server/hw/xwin/windialogs.c index 3d95f36,6fe3fc4..b0e7a18 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/windialogs.c +++ b/xorg-server/hw/xwin/windialogs.c @@@ -440,10 -436,13 +440,10 @@@ winChangeDepthDlgProc(HWND hwndDialog, s_pScreenPriv = (winPrivScreenPtr) lParam; s_pScreenInfo = s_pScreenPriv->pScreenInfo; - winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, " - "s_pScreenInfo: %08x\n", -#if CYGDEBUG + winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, " + "s_pScreenInfo: %p\n", s_pScreenPriv, s_pScreenInfo); -#endif -#if CYGDEBUG winDebug("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, " "current bpp: %d\n", s_pScreenInfo->dwBPP, diff --cc xorg-server/hw/xwin/winmultiwindowshape.c index 0a00e79,73afaea..15c5ebe mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winmultiwindowshape.c +++ b/xorg-server/hw/xwin/winmultiwindowshape.c @@@ -46,7 -46,9 +46,7 @@@ winSetShapeMultiWindow(WindowPtr pWin, winScreenPriv(pScreen); - winDebug ("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind); -#if CYGMULTIWINDOW_DEBUG - ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind); -#endif ++ winDebug ("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind); WIN_UNWRAP(SetShape); (*pScreen->SetShape) (pWin, kind); diff --cc xorg-server/hw/xwin/winmultiwindowwindow.c index 2439ddb,c22d690..850edc1 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winmultiwindowwindow.c +++ b/xorg-server/hw/xwin/winmultiwindowwindow.c @@@ -288,7 -285,9 +288,7 @@@ winChangeWindowAttributesMultiWindow(Wi winScreenPriv(pScreen); - winDebug ("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin); -#if CYGMULTIWINDOW_DEBUG - ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin); -#endif ++ winDebug ("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin); WIN_UNWRAP(ChangeWindowAttributes); fResult = (*pScreen->ChangeWindowAttributes) (pWin, mask); @@@ -316,7 -315,7 +316,7 @@@ winUnmapWindowMultiWindow(WindowPtr pWi winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - winDebug ("winUnmapWindowMultiWindow - pWin: %08x\n", pWin); - ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin); ++ winDebug ("winUnmapWindowMultiWindow - pWin: %p\n", pWin); #endif WIN_UNWRAP(UnrealizeWindow); @@@ -347,7 -346,7 +347,7 @@@ winMapWindowMultiWindow(WindowPtr pWin winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - winDebug ("winMapWindowMultiWindow - pWin: %08x\n", pWin); - ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin); ++ winDebug ("winMapWindowMultiWindow - pWin: %p\n", pWin); #endif WIN_UNWRAP(RealizeWindow); @@@ -403,7 -408,9 +403,7 @@@ winRestackWindowMultiWindow(WindowPtr p winScreenPriv(pScreen); - winDebug ("winRestackMultiWindow - %08x\n", pWin); -#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG - winTrace("winRestackMultiWindow - %p\n", pWin); -#endif ++ winDebug ("winRestackMultiWindow - %p\n", pWin); WIN_UNWRAP(RestackWindow); if (pScreen->RestackWindow) diff --cc xorg-server/hw/xwin/winprefslex.l index 5a6c969,9e6f0d6..0caeb67 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winprefslex.l +++ b/xorg-server/hw/xwin/winprefslex.l @@@ -37,8 -37,8 +37,6 @@@ #include <string.h> #include "winprefsyacc.h" - extern int yyparse(void); - -extern void ErrorF (const char* /*f*/, ...); - /* Copy the parsed string, must be free()d in yacc parser */ static char *makestr(char *str) { diff --cc xorg-server/hw/xwin/winprefsyacc.y index 8dae912,9bb28ae..6cbb9cc --- a/xorg-server/hw/xwin/winprefsyacc.y +++ b/xorg-server/hw/xwin/winprefsyacc.y @@@ -86,14 -79,12 +86,15 @@@ static void OpenSysMenu(void) static void AddSysMenuLine(char *matchstr, char *menuname, int pos); static void CloseSysMenu(void); - static int yyerror (char *s); + static int yyerror (const char *s); extern char *yytext; + extern int yylineno; extern int yylex(void); +#define YYMALLOC malloc +#define YYFREE free + %} %union { diff --cc xorg-server/hw/xwin/winscrinit.c index 952e7eb,ce0aada..9f106f7 mode 100755,100644..100755 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c diff --cc xorg-server/hw/xwin/winshadddnl.c index b7187b1,48599b2..4170953 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winshadddnl.c +++ b/xorg-server/hw/xwin/winshadddnl.c @@@ -293,34 -208,19 +293,34 @@@ winAllocateFBShadowDDNL(ScreenPtr pScre pScreenInfo->dwPaddedWidth = PixmapBytePad(pScreenInfo->dwWidth, pScreenInfo->dwBPP); - /* Allocate memory for our shadow surface */ - lpSurface = malloc(pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight); - if (lpSurface == NULL) { - ErrorF("winAllocateFBShadowDDNL - Could not allocate bits\n"); - return FALSE; - } - - /* - * Initialize the framebuffer memory so we don't get a - * strange display at startup - */ - ZeroMemory(lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight); + if ( pScreenInfo->pfb) + { + ErrorF("winAllocateFBShadowDDNL calling for the second time, reallocating\n"); + lpSurface=pScreenInfo->pfb; + if (pScreenPriv->pddsShadow4) + { + IDirectDrawSurface4_Release (pScreenPriv->pddsShadow4); + pScreenPriv->pddsShadow4 = NULL; + } + ClosePrimarySurfaceShadowDDNL(pScreenPriv); + ReleaseDDNL(pScreenPriv); + } + else + { + /* Allocate memory for our shadow surface */ + lpSurface = malloc (pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight); + if (lpSurface == NULL) { + ErrorF ("winAllocateFBShadowDDNL - Could not allocate bits\n"); + return FALSE; + } + + /* - * Initialize the framebuffer memory so we don't get a ++ * Initialize the framebuffer memory so we don't get a + * strange display at startup + */ + ZeroMemory (lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight); + } /* Create a clipper */ ddrval = (*g_fpDirectDrawCreateClipper) (0, &pScreenPriv->pddcPrimary, NULL); diff --cc xorg-server/hw/xwin/winshadgdi.c index f04d256,3d222ad..cda4759 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winshadgdi.c +++ b/xorg-server/hw/xwin/winshadgdi.c @@@ -366,11 -372,16 +366,11 @@@ winAllocateFBShadowGDI(ScreenPtr pScree pScreenInfo->dwWidth, pScreenInfo->dwHeight, pScreenPriv->hdcShadow, 0, 0, SRCCOPY); if (fReturn) { -#if CYGDEBUG winDebug("winAllocateFBShadowGDI - Shadow blit success\n"); -#endif } else { - winW32Error(2, "winAllocateFBShadowGDI - Shadow blit failure\n"); -#if 0 - return FALSE; -#else + winW32Error ("winAllocateFBShadowGDI - Shadow blit failure\n"); - /* ago: ignore this error. The blit fails with wine, but does not + /* ago: ignore this error. The blit fails with wine, but does not * cause any problems later. */ fReturn = TRUE; diff --cc xorg-server/hw/xwin/winwndproc.c index 37d5ef6,0c434c9..9a150d5 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winwndproc.c +++ b/xorg-server/hw/xwin/winwndproc.c @@@ -624,8 -620,10 +624,8 @@@ winWindowProc(HWND hwnd, UINT message, int iCaptionHeight; int iBorderHeight, iBorderWidth; - winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n", -#if CYGDEBUG + winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n", s_pScreenInfo); -#endif /* Can't do anything without screen info */ if (s_pScreenInfo == NULL diff --cc xorg-server/include/colormap.h index b89bbe1,5f6b97f..5f6b97f mode 100755,100644..100755 --- a/xorg-server/include/colormap.h +++ b/xorg-server/include/colormap.h diff --cc xorg-server/include/cursor.h index 1e483ac,281d88b..281d88b mode 100755,100644..100755 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h diff --cc xorg-server/include/dix.h index 116da2e,991a3ce..991a3ce mode 100755,100644..100755 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h diff --cc xorg-server/include/gc.h index cb2909e,53f9c29..70695f1 mode 100755,100644..100755 --- a/xorg-server/include/gc.h +++ b/xorg-server/include/gc.h diff --cc xorg-server/include/gcstruct.h index 6358b8c,e48d610..e48d610 mode 100755,100644..100755 --- a/xorg-server/include/gcstruct.h +++ b/xorg-server/include/gcstruct.h diff --cc xorg-server/include/input.h index d30333a,bf22dc7..605e383 mode 100755,100644..100755 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h diff --cc xorg-server/include/os.h index 2e2dca0,3e68c49..cee8f3c mode 100755,100644..100755 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h diff --cc xorg-server/include/pixmap.h index 4b8fc24,9656c3a..9656c3a mode 100755,100644..100755 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h diff --cc xorg-server/include/property.h index cae4471,e350513..e350513 mode 100755,100644..100755 --- a/xorg-server/include/property.h +++ b/xorg-server/include/property.h diff --cc xorg-server/include/resource.h index 8ebced3,772f363..a2d6b6c mode 100755,100644..100755 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h diff --cc xorg-server/include/scrnintstr.h index 444340c,faf0563..96bfd93 mode 100755,100644..100755 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h diff --cc xorg-server/include/servermd.h index 3e6bcf4,a3b5c3a..6aeed82 mode 100755,100644..100755 --- a/xorg-server/include/servermd.h +++ b/xorg-server/include/servermd.h diff --cc xorg-server/include/window.h index c123728,6daec85..6daec85 mode 100755,100644..100755 --- a/xorg-server/include/window.h +++ b/xorg-server/include/window.h diff --cc xorg-server/include/xkbsrv.h index a4878fc,cc6307a..cc6307a mode 100755,100644..100755 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h diff --cc xorg-server/mi/mi.h index b7e791d,db62c91..d41a5d5 mode 100755,100644..100755 --- a/xorg-server/mi/mi.h +++ b/xorg-server/mi/mi.h diff --cc xorg-server/mi/miarc.c index e0f09d2,e8bc87e..fa7befa mode 100644,100644..100755 --- a/xorg-server/mi/miarc.c +++ b/xorg-server/mi/miarc.c @@@ -63,11 -63,22 +63,27 @@@ SOFTWARE #include "mifillarc.h" #include <X11/Xfuncproto.h> +#ifdef _MSC_VER +#define hypot _hypot +#define HAVE_CBRT +#endif + + #define EPSILON 0.000001 + #define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON) + #define UNEQUAL(a,b) (fabs((a) - (b)) > EPSILON) + #define PTISEQUAL(a,b) (ISEQUAL(a.x,b.x) && ISEQUAL(a.y,b.y)) + #define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */ + + /* Point with sub-pixel positioning. */ + typedef struct _SppPoint { + double x, y; + } SppPointRec, *SppPointPtr; + + typedef struct _SppArc { + double x, y, width, height; + double angle1, angle2; + } SppArcRec, *SppArcPtr; + static double miDsin(double a); static double miDcos(double a); static double miDasin(double v); diff --cc xorg-server/mi/miexpose.c index de8ee6c,fc4dbc0..fc4dbc0 mode 100755,100644..100755 --- a/xorg-server/mi/miexpose.c +++ b/xorg-server/mi/miexpose.c diff --cc xorg-server/os/access.c index 0dda35b,5c510de..1644e95 --- a/xorg-server/os/access.c +++ b/xorg-server/os/access.c @@@ -389,9 -307,9 +389,9 @@@ ifioctl(int fd, int cmd, char *arg #endif /* - * DefineSelf (fd): + * DefineSelf (fd, protocol): * - * Define this host for access control. Find all the hosts the OS knows about + * Define this host for access control. Find all the hosts the OS knows about * for this fd and add them to the selfhosts list. */ @@@ -1824,9 -1647,8 +1824,9 @@@ siHostnameAddrMatch(int family, void *a char hostname[SI_HOSTNAME_MAXLEN]; struct addrinfo *addresses; struct addrinfo *a; + struct addrinfo hints; int f, hostaddrlen; - void *hostaddr; + void *hostaddr = NULL; if (siAddrLen >= sizeof(hostname)) return FALSE; diff --cc xorg-server/os/connection.c index 616c201,da3397d..2d9d74b mode 100644,100644..100755 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@@ -453,8 -421,8 +453,8 @@@ CreateWellKnownSockets(void } else { /* -displayfd and no explicit display number */ Bool found = 0; - for (i = 0; i < 65535 - X_TCP_PORT; i++) { + for (i = 0; i < 65536 - X_TCP_PORT; i++) { - if (TryCreateSocket(i, &partial) && !partial) { + if (TryCreateSocket(i, &partial) && ListenTransCount >= 1 && (PartialNetwork || !partial)) { found = 1; break; } -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 09/13: Merge remote-tracking branch 'origin/released'
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit 0dbe845b2f4ba08924d6fcb9634d09dc3dde13d6 Merge: d175789 d6d5581 Author: marha <marha(a)users.sourceforge.net> Date: Sat Nov 29 12:44:10 2014 +0100 Merge remote-tracking branch 'origin/released' Conflicts: xorg-server/hw/xwin/winclip.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winfont.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwindow.c libXft/src/xftdpy.c | 4 + libXft/src/xftdraw.c | 71 +- libXft/src/xftint.h | 1 + mesalib/configure.ac | 12 +- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 6 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.3.2.html | 115 ++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/scons/llvm.py | 16 +- mesalib/src/gallium/auxiliary/util/u_blitter.c | 77 +- mesalib/src/gallium/auxiliary/util/u_math.h | 2 +- mesalib/src/glsl/ast_array_index.cpp | 6 +- mesalib/src/glsl/ast_to_hir.cpp | 107 +- mesalib/src/glsl/glsl_parser_extras.h | 4 +- mesalib/src/glsl/ir_uniform.h | 11 - mesalib/src/glsl/linker.cpp | 18 +- mesalib/src/glsl/lower_offset_array.cpp | 10 +- mesalib/src/glsl/main.cpp | 2 + mesalib/src/glsl/opt_array_splitting.cpp | 2 +- mesalib/src/glsl/standalone_scaffolding.cpp | 27 + mesalib/src/glsl/standalone_scaffolding.h | 3 + mesalib/src/mapi/glapi/gen/ARB_clip_control.xml | 25 + mesalib/src/mapi/glapi/gen/Makefile.am | 1 + mesalib/src/mapi/glapi/gen/gl_API.xml | 4 +- mesalib/src/mapi/glapi/gen/gl_gentable.py | 4 +- mesalib/src/mesa/drivers/common/meta.c | 9 + mesalib/src/mesa/drivers/common/meta.h | 3 + mesalib/src/mesa/main/attrib.c | 1 + mesalib/src/mesa/main/bufferobj.c | 4 +- mesalib/src/mesa/main/context.c | 12 + mesalib/src/mesa/main/dd.h | 3 +- mesalib/src/mesa/main/dlist.c | 26 + mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/ff_fragment_shader.cpp | 14 +- mesalib/src/mesa/main/get.c | 1 + mesalib/src/mesa/main/get_hash_params.py | 2 + mesalib/src/mesa/main/mtypes.h | 7 +- mesalib/src/mesa/main/polygon.c | 2 - mesalib/src/mesa/main/shaderapi.c | 2 +- mesalib/src/mesa/main/shaderapi.h | 9 - mesalib/src/mesa/main/shaderimage.c | 2 +- mesalib/src/mesa/main/shaderobj.c | 28 +- mesalib/src/mesa/main/shaderobj.h | 6 +- mesalib/src/mesa/main/state.c | 25 +- mesalib/src/mesa/main/uniform_query.cpp | 74 +- mesalib/src/mesa/main/uniforms.c | 22 +- mesalib/src/mesa/main/uniforms.h | 2 +- mesalib/src/mesa/main/version.c | 2 - mesalib/src/mesa/main/viewport.c | 122 +- mesalib/src/mesa/main/viewport.h | 6 + mesalib/src/mesa/math/m_matrix.c | 17 +- mesalib/src/mesa/math/m_matrix.h | 4 +- mesalib/src/mesa/program/ir_to_mesa.cpp | 2 +- .../src/mesa/state_tracker/st_atom_rasterizer.c | 25 +- mesalib/src/mesa/state_tracker/st_atom_viewport.c | 23 +- mesalib/src/mesa/state_tracker/st_cb_program.c | 2 - mesalib/src/mesa/state_tracker/st_debug.c | 1 + mesalib/src/mesa/state_tracker/st_debug.h | 1 + mesalib/src/mesa/state_tracker/st_extensions.c | 9 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 47 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h | 5 - mesalib/src/util/macros.h | 14 + mesalib/src/util/register_allocate.c | 2 +- pixman/pixman/pixman-mmx.c | 6 + xorg-server/Xext/panoramiXprocs.c | 2 +- xorg-server/configure.ac | 2 - xorg-server/fb/fbpict.c | 2 +- xorg-server/glx/dispatch.h | 599 +++---- xorg-server/glx/glapitable.h | 583 +++---- xorg-server/glx/glfunctions.h | 1 + xorg-server/glx/glprocs.h | 1754 ++++++++++---------- xorg-server/glx/glxdri2.c | 4 +- xorg-server/glx/remap_helper.h | 849 +++++----- xorg-server/hw/kdrive/ephyr/ephyr.c | 12 +- xorg-server/hw/kdrive/ephyr/ephyrinit.c | 6 + xorg-server/hw/kdrive/ephyr/man/Xephyr.man | 3 + xorg-server/hw/xwin/InitOutput.c | 6 - xorg-server/hw/xwin/Makefile.am | 21 - xorg-server/hw/xwin/makefile | 5 +- xorg-server/hw/xwin/man/XWin.man | 4 - xorg-server/hw/xwin/win.h | 182 -- xorg-server/hw/xwin/winclip.c | 42 - xorg-server/hw/xwin/wincreatewnd.c | 22 +- xorg-server/hw/xwin/winengine.c | 27 +- xorg-server/hw/xwin/winfillsp.c | 842 ---------- xorg-server/hw/xwin/winfont.c | 74 - xorg-server/hw/xwin/wingc.c | 151 -- xorg-server/hw/xwin/wingetsp.c | 154 -- xorg-server/hw/xwin/winmisc.c | 63 - xorg-server/hw/xwin/winnativegdi.c | 491 ------ xorg-server/hw/xwin/winpfbdd.c | 616 ------- xorg-server/hw/xwin/winpixmap.c | 178 -- xorg-server/hw/xwin/winpolyline.c | 53 - xorg-server/hw/xwin/winrop.c | 142 -- xorg-server/hw/xwin/winscrinit.c | 139 -- xorg-server/hw/xwin/winsetsp.c | 174 -- xorg-server/hw/xwin/winwindow.c | 194 --- xorg-server/hw/xwin/winwndproc.c | 12 +- xorg-server/mi/mi.h | 4 + xorg-server/mi/mibitblt.c | 13 +- xorg-server/mi/mifillrct.c | 2 +- xorg-server/os/utils.c | 1 + xorg-server/render/mipict.c | 34 +- xorg-server/render/mirect.c | 2 +- xorg-server/render/picture.c | 1 - xorg-server/render/picturestr.h | 3 +- xorg-server/xfixes/region.c | 14 +- xorg-server/xkeyboard-config/rules/base.xml.in | 12 + xorg-server/xkeyboard-config/symbols/keypad | 49 +- .../xkeyboard-config/symbols/macintosh_vndr/ch | 1 + .../xkeyboard-config/symbols/macintosh_vndr/dk | 2 +- .../xkeyboard-config/symbols/macintosh_vndr/it | 1 + .../xkeyboard-config/symbols/macintosh_vndr/us | 4 +- xorg-server/xkeyboard-config/symbols/ru | 71 + 115 files changed, 2792 insertions(+), 5906 deletions(-) diff --cc mesalib/src/mapi/glapi/gen/gl_API.xml index 16a2a08,534e6a0..43e5d35 mode 100755,100644..100755 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml diff --cc mesalib/src/mapi/glapi/gen/gl_gentable.py index 28079de,06a5ebf..efac46e mode 100755,100644..100755 --- a/mesalib/src/mapi/glapi/gen/gl_gentable.py +++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py diff --cc mesalib/src/mesa/main/bufferobj.c index c88744a,2bae1bc..011e7be mode 100755,100644..100755 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c diff --cc xorg-server/glx/dispatch.h index a726773,0000000..027b395 mode 100644,000000..100644 --- a/xorg-server/glx/dispatch.h +++ b/xorg-server/glx/dispatch.h @@@ -1,14681 -1,0 +1,14694 @@@ +/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */ + +/* + * (C) Copyright IBM Corporation 2005 + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * IBM, + * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#if !defined( _DISPATCH_H_ ) +# define _DISPATCH_H_ + + +#include "glapitable.h" +/** + * \file main/dispatch.h + * Macros for handling GL dispatch tables. + * + * For each known GL function, there are 3 macros in this file. The first + * macro is named CALL_FuncName and is used to call that GL function using + * the specified dispatch table. The other 2 macros, called GET_FuncName + * can SET_FuncName, are used to get and set the dispatch pointer for the + * named function in the specified dispatch table. + */ + +#ifdef _MSC_VER +#ifndef INLINE +#define INLINE __inline +#endif +#endif +#define CALL_by_offset(disp, cast, offset, parameters) \ + (*(cast (GET_by_offset(disp, offset)))) parameters +#define GET_by_offset(disp, offset) \ + (offset >= 0) ? (((_glapi_proc *)(disp))[offset]) : NULL +#define SET_by_offset(disp, offset, fn) \ + do { \ + if ( (offset) < 0 ) { \ + /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \ + /* __func__, __LINE__, disp, offset, # fn); */ \ + /* abort(); */ \ + } \ + else { \ + ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \ + } \ + } while(0) + +/* total number of offsets below */ - #define _gloffset_COUNT 1155 ++#define _gloffset_COUNT 1156 + +#define _gloffset_NewList 0 +#define _gloffset_EndList 1 +#define _gloffset_CallList 2 +#define _gloffset_CallLists 3 +#define _gloffset_DeleteLists 4 +#define _gloffset_GenLists 5 +#define _gloffset_ListBase 6 +#define _gloffset_Begin 7 +#define _gloffset_Bitmap 8 +#define _gloffset_Color3b 9 +#define _gloffset_Color3bv 10 +#define _gloffset_Color3d 11 +#define _gloffset_Color3dv 12 +#define _gloffset_Color3f 13 +#define _gloffset_Color3fv 14 +#define _gloffset_Color3i 15 +#define _gloffset_Color3iv 16 +#define _gloffset_Color3s 17 +#define _gloffset_Color3sv 18 +#define _gloffset_Color3ub 19 +#define _gloffset_Color3ubv 20 +#define _gloffset_Color3ui 21 +#define _gloffset_Color3uiv 22 +#define _gloffset_Color3us 23 +#define _gloffset_Color3usv 24 +#define _gloffset_Color4b 25 +#define _gloffset_Color4bv 26 +#define _gloffset_Color4d 27 +#define _gloffset_Color4dv 28 +#define _gloffset_Color4f 29 +#define _gloffset_Color4fv 30 +#define _gloffset_Color4i 31 +#define _gloffset_Color4iv 32 +#define _gloffset_Color4s 33 +#define _gloffset_Color4sv 34 +#define _gloffset_Color4ub 35 +#define _gloffset_Color4ubv 36 +#define _gloffset_Color4ui 37 +#define _gloffset_Color4uiv 38 +#define _gloffset_Color4us 39 +#define _gloffset_Color4usv 40 +#define _gloffset_EdgeFlag 41 +#define _gloffset_EdgeFlagv 42 +#define _gloffset_End 43 +#define _gloffset_Indexd 44 +#define _gloffset_Indexdv 45 +#define _gloffset_Indexf 46 +#define _gloffset_Indexfv 47 +#define _gloffset_Indexi 48 +#define _gloffset_Indexiv 49 +#define _gloffset_Indexs 50 +#define _gloffset_Indexsv 51 +#define _gloffset_Normal3b 52 +#define _gloffset_Normal3bv 53 +#define _gloffset_Normal3d 54 +#define _gloffset_Normal3dv 55 +#define _gloffset_Normal3f 56 +#define _gloffset_Normal3fv 57 +#define _gloffset_Normal3i 58 +#define _gloffset_Normal3iv 59 +#define _gloffset_Normal3s 60 +#define _gloffset_Normal3sv 61 +#define _gloffset_RasterPos2d 62 +#define _gloffset_RasterPos2dv 63 +#define _gloffset_RasterPos2f 64 +#define _gloffset_RasterPos2fv 65 +#define _gloffset_RasterPos2i 66 +#define _gloffset_RasterPos2iv 67 +#define _gloffset_RasterPos2s 68 +#define _gloffset_RasterPos2sv 69 +#define _gloffset_RasterPos3d 70 +#define _gloffset_RasterPos3dv 71 +#define _gloffset_RasterPos3f 72 +#define _gloffset_RasterPos3fv 73 +#define _gloffset_RasterPos3i 74 +#define _gloffset_RasterPos3iv 75 +#define _gloffset_RasterPos3s 76 +#define _gloffset_RasterPos3sv 77 +#define _gloffset_RasterPos4d 78 +#define _gloffset_RasterPos4dv 79 +#define _gloffset_RasterPos4f 80 +#define _gloffset_RasterPos4fv 81 +#define _gloffset_RasterPos4i 82 +#define _gloffset_RasterPos4iv 83 +#define _gloffset_RasterPos4s 84 +#define _gloffset_RasterPos4sv 85 +#define _gloffset_Rectd 86 +#define _gloffset_Rectdv 87 +#define _gloffset_Rectf 88 +#define _gloffset_Rectfv 89 +#define _gloffset_Recti 90 +#define _gloffset_Rectiv 91 +#define _gloffset_Rects 92 +#define _gloffset_Rectsv 93 +#define _gloffset_TexCoord1d 94 +#define _gloffset_TexCoord1dv 95 +#define _gloffset_TexCoord1f 96 +#define _gloffset_TexCoord1fv 97 +#define _gloffset_TexCoord1i 98 +#define _gloffset_TexCoord1iv 99 +#define _gloffset_TexCoord1s 100 +#define _gloffset_TexCoord1sv 101 +#define _gloffset_TexCoord2d 102 +#define _gloffset_TexCoord2dv 103 +#define _gloffset_TexCoord2f 104 +#define _gloffset_TexCoord2fv 105 +#define _gloffset_TexCoord2i 106 +#define _gloffset_TexCoord2iv 107 +#define _gloffset_TexCoord2s 108 +#define _gloffset_TexCoord2sv 109 +#define _gloffset_TexCoord3d 110 +#define _gloffset_TexCoord3dv 111 +#define _gloffset_TexCoord3f 112 +#define _gloffset_TexCoord3fv 113 +#define _gloffset_TexCoord3i 114 +#define _gloffset_TexCoord3iv 115 +#define _gloffset_TexCoord3s 116 +#define _gloffset_TexCoord3sv 117 +#define _gloffset_TexCoord4d 118 +#define _gloffset_TexCoord4dv 119 +#define _gloffset_TexCoord4f 120 +#define _gloffset_TexCoord4fv 121 +#define _gloffset_TexCoord4i 122 +#define _gloffset_TexCoord4iv 123 +#define _gloffset_TexCoord4s 124 +#define _gloffset_TexCoord4sv 125 +#define _gloffset_Vertex2d 126 +#define _gloffset_Vertex2dv 127 +#define _gloffset_Vertex2f 128 +#define _gloffset_Vertex2fv 129 +#define _gloffset_Vertex2i 130 +#define _gloffset_Vertex2iv 131 +#define _gloffset_Vertex2s 132 +#define _gloffset_Vertex2sv 133 +#define _gloffset_Vertex3d 134 +#define _gloffset_Vertex3dv 135 +#define _gloffset_Vertex3f 136 +#define _gloffset_Vertex3fv 137 +#define _gloffset_Vertex3i 138 +#define _gloffset_Vertex3iv 139 +#define _gloffset_Vertex3s 140 +#define _gloffset_Vertex3sv 141 +#define _gloffset_Vertex4d 142 +#define _gloffset_Vertex4dv 143 +#define _gloffset_Vertex4f 144 +#define _gloffset_Vertex4fv 145 +#define _gloffset_Vertex4i 146 +#define _gloffset_Vertex4iv 147 +#define _gloffset_Vertex4s 148 +#define _gloffset_Vertex4sv 149 +#define _gloffset_ClipPlane 150 +#define _gloffset_ColorMaterial 151 +#define _gloffset_CullFace 152 +#define _gloffset_Fogf 153 +#define _gloffset_Fogfv 154 +#define _gloffset_Fogi 155 +#define _gloffset_Fogiv 156 +#define _gloffset_FrontFace 157 +#define _gloffset_Hint 158 +#define _gloffset_Lightf 159 +#define _gloffset_Lightfv 160 +#define _gloffset_Lighti 161 +#define _gloffset_Lightiv 162 +#define _gloffset_LightModelf 163 +#define _gloffset_LightModelfv 164 +#define _gloffset_LightModeli 165 +#define _gloffset_LightModeliv 166 +#define _gloffset_LineStipple 167 +#define _gloffset_LineWidth 168 +#define _gloffset_Materialf 169 +#define _gloffset_Materialfv 170 +#define _gloffset_Materiali 171 +#define _gloffset_Materialiv 172 +#define _gloffset_PointSize 173 +#define _gloffset_PolygonMode 174 +#define _gloffset_PolygonStipple 175 +#define _gloffset_Scissor 176 +#define _gloffset_ShadeModel 177 +#define _gloffset_TexParameterf 178 +#define _gloffset_TexParameterfv 179 +#define _gloffset_TexParameteri 180 +#define _gloffset_TexParameteriv 181 +#define _gloffset_TexImage1D 182 +#define _gloffset_TexImage2D 183 +#define _gloffset_TexEnvf 184 +#define _gloffset_TexEnvfv 185 +#define _gloffset_TexEnvi 186 +#define _gloffset_TexEnviv 187 +#define _gloffset_TexGend 188 +#define _gloffset_TexGendv 189 +#define _gloffset_TexGenf 190 +#define _gloffset_TexGenfv 191 +#define _gloffset_TexGeni 192 +#define _gloffset_TexGeniv 193 +#define _gloffset_FeedbackBuffer 194 +#define _gloffset_SelectBuffer 195 +#define _gloffset_RenderMode 196 +#define _gloffset_InitNames 197 +#define _gloffset_LoadName 198 +#define _gloffset_PassThrough 199 +#define _gloffset_PopName 200 +#define _gloffset_PushName 201 +#define _gloffset_DrawBuffer 202 +#define _gloffset_Clear 203 +#define _gloffset_ClearAccum 204 +#define _gloffset_ClearIndex 205 +#define _gloffset_ClearColor 206 +#define _gloffset_ClearStencil 207 +#define _gloffset_ClearDepth 208 +#define _gloffset_StencilMask 209 +#define _gloffset_ColorMask 210 +#define _gloffset_DepthMask 211 +#define _gloffset_IndexMask 212 +#define _gloffset_Accum 213 +#define _gloffset_Disable 214 +#define _gloffset_Enable 215 +#define _gloffset_Finish 216 +#define _gloffset_Flush 217 +#define _gloffset_PopAttrib 218 +#define _gloffset_PushAttrib 219 +#define _gloffset_Map1d 220 +#define _gloffset_Map1f 221 +#define _gloffset_Map2d 222 +#define _gloffset_Map2f 223 +#define _gloffset_MapGrid1d 224 +#define _gloffset_MapGrid1f 225 +#define _gloffset_MapGrid2d 226 +#define _gloffset_MapGrid2f 227 +#define _gloffset_EvalCoord1d 228 +#define _gloffset_EvalCoord1dv 229 +#define _gloffset_EvalCoord1f 230 +#define _gloffset_EvalCoord1fv 231 +#define _gloffset_EvalCoord2d 232 +#define _gloffset_EvalCoord2dv 233 +#define _gloffset_EvalCoord2f 234 +#define _gloffset_EvalCoord2fv 235 +#define _gloffset_EvalMesh1 236 +#define _gloffset_EvalPoint1 237 +#define _gloffset_EvalMesh2 238 +#define _gloffset_EvalPoint2 239 +#define _gloffset_AlphaFunc 240 +#define _gloffset_BlendFunc 241 +#define _gloffset_LogicOp 242 +#define _gloffset_StencilFunc 243 +#define _gloffset_StencilOp 244 +#define _gloffset_DepthFunc 245 +#define _gloffset_PixelZoom 246 +#define _gloffset_PixelTransferf 247 +#define _gloffset_PixelTransferi 248 +#define _gloffset_PixelStoref 249 +#define _gloffset_PixelStorei 250 +#define _gloffset_PixelMapfv 251 +#define _gloffset_PixelMapuiv 252 +#define _gloffset_PixelMapusv 253 +#define _gloffset_ReadBuffer 254 +#define _gloffset_CopyPixels 255 +#define _gloffset_ReadPixels 256 +#define _gloffset_DrawPixels 257 +#define _gloffset_GetBooleanv 258 +#define _gloffset_GetClipPlane 259 +#define _gloffset_GetDoublev 260 +#define _gloffset_GetError 261 +#define _gloffset_GetFloatv 262 +#define _gloffset_GetIntegerv 263 +#define _gloffset_GetLightfv 264 +#define _gloffset_GetLightiv 265 +#define _gloffset_GetMapdv 266 +#define _gloffset_GetMapfv 267 +#define _gloffset_GetMapiv 268 +#define _gloffset_GetMaterialfv 269 +#define _gloffset_GetMaterialiv 270 +#define _gloffset_GetPixelMapfv 271 +#define _gloffset_GetPixelMapuiv 272 +#define _gloffset_GetPixelMapusv 273 +#define _gloffset_GetPolygonStipple 274 +#define _gloffset_GetString 275 +#define _gloffset_GetTexEnvfv 276 +#define _gloffset_GetTexEnviv 277 +#define _gloffset_GetTexGendv 278 +#define _gloffset_GetTexGenfv 279 +#define _gloffset_GetTexGeniv 280 +#define _gloffset_GetTexImage 281 +#define _gloffset_GetTexParameterfv 282 +#define _gloffset_GetTexParameteriv 283 +#define _gloffset_GetTexLevelParameterfv 284 +#define _gloffset_GetTexLevelParameteriv 285 +#define _gloffset_IsEnabled 286 +#define _gloffset_IsList 287 +#define _gloffset_DepthRange 288 +#define _gloffset_Frustum 289 +#define _gloffset_LoadIdentity 290 +#define _gloffset_LoadMatrixf 291 +#define _gloffset_LoadMatrixd 292 +#define _gloffset_MatrixMode 293 +#define _gloffset_MultMatrixf 294 +#define _gloffset_MultMatrixd 295 +#define _gloffset_Ortho 296 +#define _gloffset_PopMatrix 297 +#define _gloffset_PushMatrix 298 +#define _gloffset_Rotated 299 +#define _gloffset_Rotatef 300 +#define _gloffset_Scaled 301 +#define _gloffset_Scalef 302 +#define _gloffset_Translated 303 +#define _gloffset_Translatef 304 +#define _gloffset_Viewport 305 +#define _gloffset_ArrayElement 306 +#define _gloffset_BindTexture 307 +#define _gloffset_ColorPointer 308 +#define _gloffset_DisableClientState 309 +#define _gloffset_DrawArrays 310 +#define _gloffset_DrawElements 311 +#define _gloffset_EdgeFlagPointer 312 +#define _gloffset_EnableClientState 313 +#define _gloffset_IndexPointer 314 +#define _gloffset_Indexub 315 +#define _gloffset_Indexubv 316 +#define _gloffset_InterleavedArrays 317 +#define _gloffset_NormalPointer 318 +#define _gloffset_PolygonOffset 319 +#define _gloffset_TexCoordPointer 320 +#define _gloffset_VertexPointer 321 +#define _gloffset_AreTexturesResident 322 +#define _gloffset_CopyTexImage1D 323 +#define _gloffset_CopyTexImage2D 324 +#define _gloffset_CopyTexSubImage1D 325 +#define _gloffset_CopyTexSubImage2D 326 +#define _gloffset_DeleteTextures 327 +#define _gloffset_GenTextures 328 +#define _gloffset_GetPointerv 329 +#define _gloffset_IsTexture 330 +#define _gloffset_PrioritizeTextures 331 +#define _gloffset_TexSubImage1D 332 +#define _gloffset_TexSubImage2D 333 +#define _gloffset_PopClientAttrib 334 +#define _gloffset_PushClientAttrib 335 +#define _gloffset_BlendColor 336 +#define _gloffset_BlendEquation 337 +#define _gloffset_DrawRangeElements 338 +#define _gloffset_ColorTable 339 +#define _gloffset_ColorTableParameterfv 340 +#define _gloffset_ColorTableParameteriv 341 +#define _gloffset_CopyColorTable 342 +#define _gloffset_GetColorTable 343 +#define _gloffset_GetColorTableParameterfv 344 +#define _gloffset_GetColorTableParameteriv 345 +#define _gloffset_ColorSubTable 346 +#define _gloffset_CopyColorSubTable 347 +#define _gloffset_ConvolutionFilter1D 348 +#define _gloffset_ConvolutionFilter2D 349 +#define _gloffset_ConvolutionParameterf 350 +#define _gloffset_ConvolutionParameterfv 351 +#define _gloffset_ConvolutionParameteri 352 +#define _gloffset_ConvolutionParameteriv 353 +#define _gloffset_CopyConvolutionFilter1D 354 +#define _gloffset_CopyConvolutionFilter2D 355 +#define _gloffset_GetConvolutionFilter 356 +#define _gloffset_GetConvolutionParameterfv 357 +#define _gloffset_GetConvolutionParameteriv 358 +#define _gloffset_GetSeparableFilter 359 +#define _gloffset_SeparableFilter2D 360 +#define _gloffset_GetHistogram 361 +#define _gloffset_GetHistogramParameterfv 362 +#define _gloffset_GetHistogramParameteriv 363 +#define _gloffset_GetMinmax 364 +#define _gloffset_GetMinmaxParameterfv 365 +#define _gloffset_GetMinmaxParameteriv 366 +#define _gloffset_Histogram 367 +#define _gloffset_Minmax 368 +#define _gloffset_ResetHistogram 369 +#define _gloffset_ResetMinmax 370 +#define _gloffset_TexImage3D 371 +#define _gloffset_TexSubImage3D 372 +#define _gloffset_CopyTexSubImage3D 373 +#define _gloffset_ActiveTexture 374 +#define _gloffset_ClientActiveTexture 375 +#define _gloffset_MultiTexCoord1d 376 +#define _gloffset_MultiTexCoord1dv 377 +#define _gloffset_MultiTexCoord1fARB 378 +#define _gloffset_MultiTexCoord1fvARB 379 +#define _gloffset_MultiTexCoord1i 380 +#define _gloffset_MultiTexCoord1iv 381 +#define _gloffset_MultiTexCoord1s 382 +#define _gloffset_MultiTexCoord1sv 383 +#define _gloffset_MultiTexCoord2d 384 +#define _gloffset_MultiTexCoord2dv 385 +#define _gloffset_MultiTexCoord2fARB 386 +#define _gloffset_MultiTexCoord2fvARB 387 +#define _gloffset_MultiTexCoord2i 388 +#define _gloffset_MultiTexCoord2iv 389 +#define _gloffset_MultiTexCoord2s 390 +#define _gloffset_MultiTexCoord2sv 391 +#define _gloffset_MultiTexCoord3d 392 +#define _gloffset_MultiTexCoord3dv 393 +#define _gloffset_MultiTexCoord3fARB 394 +#define _gloffset_MultiTexCoord3fvARB 395 +#define _gloffset_MultiTexCoord3i 396 +#define _gloffset_MultiTexCoord3iv 397 +#define _gloffset_MultiTexCoord3s 398 +#define _gloffset_MultiTexCoord3sv 399 +#define _gloffset_MultiTexCoord4d 400 +#define _gloffset_MultiTexCoord4dv 401 +#define _gloffset_MultiTexCoord4fARB 402 +#define _gloffset_MultiTexCoord4fvARB 403 +#define _gloffset_MultiTexCoord4i 404 +#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 +#define CompressedTexImage2D_remap_index 1 +#define CompressedTexImage3D_remap_index 2 +#define CompressedTexSubImage1D_remap_index 3 +#define CompressedTexSubImage2D_remap_index 4 +#define CompressedTexSubImage3D_remap_index 5 +#define GetCompressedTexImage_remap_index 6 +#define LoadTransposeMatrixd_remap_index 7 +#define LoadTransposeMatrixf_remap_index 8 +#define MultTransposeMatrixd_remap_index 9 +#define MultTransposeMatrixf_remap_index 10 +#define SampleCoverage_remap_index 11 +#define BlendFuncSeparate_remap_index 12 +#define FogCoordPointer_remap_index 13 +#define FogCoordd_remap_index 14 +#define FogCoorddv_remap_index 15 +#define MultiDrawArrays_remap_index 16 +#define PointParameterf_remap_index 17 +#define PointParameterfv_remap_index 18 +#define PointParameteri_remap_index 19 +#define PointParameteriv_remap_index 20 +#define SecondaryColor3b_remap_index 21 +#define SecondaryColor3bv_remap_index 22 +#define SecondaryColor3d_remap_index 23 +#define SecondaryColor3dv_remap_index 24 +#define SecondaryColor3i_remap_index 25 +#define SecondaryColor3iv_remap_index 26 +#define SecondaryColor3s_remap_index 27 +#define SecondaryColor3sv_remap_index 28 +#define SecondaryColor3ub_remap_index 29 +#define SecondaryColor3ubv_remap_index 30 +#define SecondaryColor3ui_remap_index 31 +#define SecondaryColor3uiv_remap_index 32 +#define SecondaryColor3us_remap_index 33 +#define SecondaryColor3usv_remap_index 34 +#define SecondaryColorPointer_remap_index 35 +#define WindowPos2d_remap_index 36 +#define WindowPos2dv_remap_index 37 +#define WindowPos2f_remap_index 38 +#define WindowPos2fv_remap_index 39 +#define WindowPos2i_remap_index 40 +#define WindowPos2iv_remap_index 41 +#define WindowPos2s_remap_index 42 +#define WindowPos2sv_remap_index 43 +#define WindowPos3d_remap_index 44 +#define WindowPos3dv_remap_index 45 +#define WindowPos3f_remap_index 46 +#define WindowPos3fv_remap_index 47 +#define WindowPos3i_remap_index 48 +#define WindowPos3iv_remap_index 49 +#define WindowPos3s_remap_index 50 +#define WindowPos3sv_remap_index 51 +#define BeginQuery_remap_index 52 +#define BindBuffer_remap_index 53 +#define BufferData_remap_index 54 +#define BufferSubData_remap_index 55 +#define DeleteBuffers_remap_index 56 +#define DeleteQueries_remap_index 57 +#define EndQuery_remap_index 58 +#define GenBuffers_remap_index 59 +#define GenQueries_remap_index 60 +#define GetBufferParameteriv_remap_index 61 +#define GetBufferPointerv_remap_index 62 +#define GetBufferSubData_remap_index 63 +#define GetQueryObjectiv_remap_index 64 +#define GetQueryObjectuiv_remap_index 65 +#define GetQueryiv_remap_index 66 +#define IsBuffer_remap_index 67 +#define IsQuery_remap_index 68 +#define MapBuffer_remap_index 69 +#define UnmapBuffer_remap_index 70 +#define AttachShader_remap_index 71 +#define BindAttribLocation_remap_index 72 +#define BlendEquationSeparate_remap_index 73 +#define CompileShader_remap_index 74 +#define CreateProgram_remap_index 75 +#define CreateShader_remap_index 76 +#define DeleteProgram_remap_index 77 +#define DeleteShader_remap_index 78 +#define DetachShader_remap_index 79 +#define DisableVertexAttribArray_remap_index 80 +#define DrawBuffers_remap_index 81 +#define EnableVertexAttribArray_remap_index 82 +#define GetActiveAttrib_remap_index 83 +#define GetActiveUniform_remap_index 84 +#define GetAttachedShaders_remap_index 85 +#define GetAttribLocation_remap_index 86 +#define GetProgramInfoLog_remap_index 87 +#define GetProgramiv_remap_index 88 +#define GetShaderInfoLog_remap_index 89 +#define GetShaderSource_remap_index 90 +#define GetShaderiv_remap_index 91 +#define GetUniformLocation_remap_index 92 +#define GetUniformfv_remap_index 93 +#define GetUniformiv_remap_index 94 +#define GetVertexAttribPointerv_remap_index 95 +#define GetVertexAttribdv_remap_index 96 +#define GetVertexAttribfv_remap_index 97 +#define GetVertexAttribiv_remap_index 98 +#define IsProgram_remap_index 99 +#define IsShader_remap_index 100 +#define LinkProgram_remap_index 101 +#define ShaderSource_remap_index 102 +#define StencilFuncSeparate_remap_index 103 +#define StencilMaskSeparate_remap_index 104 +#define StencilOpSeparate_remap_index 105 +#define Uniform1f_remap_index 106 +#define Uniform1fv_remap_index 107 +#define Uniform1i_remap_index 108 +#define Uniform1iv_remap_index 109 +#define Uniform2f_remap_index 110 +#define Uniform2fv_remap_index 111 +#define Uniform2i_remap_index 112 +#define Uniform2iv_remap_index 113 +#define Uniform3f_remap_index 114 +#define Uniform3fv_remap_index 115 +#define Uniform3i_remap_index 116 +#define Uniform3iv_remap_index 117 +#define Uniform4f_remap_index 118 +#define Uniform4fv_remap_index 119 +#define Uniform4i_remap_index 120 +#define Uniform4iv_remap_index 121 +#define UniformMatrix2fv_remap_index 122 +#define UniformMatrix3fv_remap_index 123 +#define UniformMatrix4fv_remap_index 124 +#define UseProgram_remap_index 125 +#define ValidateProgram_remap_index 126 +#define VertexAttrib1d_remap_index 127 +#define VertexAttrib1dv_remap_index 128 +#define VertexAttrib1s_remap_index 129 +#define VertexAttrib1sv_remap_index 130 +#define VertexAttrib2d_remap_index 131 +#define VertexAttrib2dv_remap_index 132 +#define VertexAttrib2s_remap_index 133 +#define VertexAttrib2sv_remap_index 134 +#define VertexAttrib3d_remap_index 135 +#define VertexAttrib3dv_remap_index 136 +#define VertexAttrib3s_remap_index 137 +#define VertexAttrib3sv_remap_index 138 +#define VertexAttrib4Nbv_remap_index 139 +#define VertexAttrib4Niv_remap_index 140 +#define VertexAttrib4Nsv_remap_index 141 +#define VertexAttrib4Nub_remap_index 142 +#define VertexAttrib4Nubv_remap_index 143 +#define VertexAttrib4Nuiv_remap_index 144 +#define VertexAttrib4Nusv_remap_index 145 +#define VertexAttrib4bv_remap_index 146 +#define VertexAttrib4d_remap_index 147 +#define VertexAttrib4dv_remap_index 148 +#define VertexAttrib4iv_remap_index 149 +#define VertexAttrib4s_remap_index 150 +#define VertexAttrib4sv_remap_index 151 +#define VertexAttrib4ubv_remap_index 152 +#define VertexAttrib4uiv_remap_index 153 +#define VertexAttrib4usv_remap_index 154 +#define VertexAttribPointer_remap_index 155 +#define UniformMatrix2x3fv_remap_index 156 +#define UniformMatrix2x4fv_remap_index 157 +#define UniformMatrix3x2fv_remap_index 158 +#define UniformMatrix3x4fv_remap_index 159 +#define UniformMatrix4x2fv_remap_index 160 +#define UniformMatrix4x3fv_remap_index 161 +#define BeginConditionalRender_remap_index 162 +#define BeginTransformFeedback_remap_index 163 +#define BindBufferBase_remap_index 164 +#define BindBufferRange_remap_index 165 +#define BindFragDataLocation_remap_index 166 +#define ClampColor_remap_index 167 +#define ClearBufferfi_remap_index 168 +#define ClearBufferfv_remap_index 169 +#define ClearBufferiv_remap_index 170 +#define ClearBufferuiv_remap_index 171 +#define ColorMaski_remap_index 172 +#define Disablei_remap_index 173 +#define Enablei_remap_index 174 +#define EndConditionalRender_remap_index 175 +#define EndTransformFeedback_remap_index 176 +#define GetBooleani_v_remap_index 177 +#define GetFragDataLocation_remap_index 178 +#define GetIntegeri_v_remap_index 179 +#define GetStringi_remap_index 180 +#define GetTexParameterIiv_remap_index 181 +#define GetTexParameterIuiv_remap_index 182 +#define GetTransformFeedbackVarying_remap_index 183 +#define GetUniformuiv_remap_index 184 +#define GetVertexAttribIiv_remap_index 185 +#define GetVertexAttribIuiv_remap_index 186 +#define IsEnabledi_remap_index 187 +#define TexParameterIiv_remap_index 188 +#define TexParameterIuiv_remap_index 189 +#define TransformFeedbackVaryings_remap_index 190 +#define Uniform1ui_remap_index 191 +#define Uniform1uiv_remap_index 192 +#define Uniform2ui_remap_index 193 +#define Uniform2uiv_remap_index 194 +#define Uniform3ui_remap_index 195 +#define Uniform3uiv_remap_index 196 +#define Uniform4ui_remap_index 197 +#define Uniform4uiv_remap_index 198 +#define VertexAttribI1iv_remap_index 199 +#define VertexAttribI1uiv_remap_index 200 +#define VertexAttribI4bv_remap_index 201 +#define VertexAttribI4sv_remap_index 202 +#define VertexAttribI4ubv_remap_index 203 +#define VertexAttribI4usv_remap_index 204 +#define VertexAttribIPointer_remap_index 205 +#define PrimitiveRestartIndex_remap_index 206 +#define TexBuffer_remap_index 207 +#define FramebufferTexture_remap_index 208 +#define GetBufferParameteri64v_remap_index 209 +#define GetInteger64i_v_remap_index 210 +#define VertexAttribDivisor_remap_index 211 +#define MinSampleShading_remap_index 212 +#define BindProgramARB_remap_index 213 +#define DeleteProgramsARB_remap_index 214 +#define GenProgramsARB_remap_index 215 +#define GetProgramEnvParameterdvARB_remap_index 216 +#define GetProgramEnvParameterfvARB_remap_index 217 +#define GetProgramLocalParameterdvARB_remap_index 218 +#define GetProgramLocalParameterfvARB_remap_index 219 +#define GetProgramStringARB_remap_index 220 +#define GetProgramivARB_remap_index 221 +#define IsProgramARB_remap_index 222 +#define ProgramEnvParameter4dARB_remap_index 223 +#define ProgramEnvParameter4dvARB_remap_index 224 +#define ProgramEnvParameter4fARB_remap_index 225 +#define ProgramEnvParameter4fvARB_remap_index 226 +#define ProgramLocalParameter4dARB_remap_index 227 +#define ProgramLocalParameter4dvARB_remap_index 228 +#define ProgramLocalParameter4fARB_remap_index 229 +#define ProgramLocalParameter4fvARB_remap_index 230 +#define ProgramStringARB_remap_index 231 +#define VertexAttrib1fARB_remap_index 232 +#define VertexAttrib1fvARB_remap_index 233 +#define VertexAttrib2fARB_remap_index 234 +#define VertexAttrib2fvARB_remap_index 235 +#define VertexAttrib3fARB_remap_index 236 +#define VertexAttrib3fvARB_remap_index 237 +#define VertexAttrib4fARB_remap_index 238 +#define VertexAttrib4fvARB_remap_index 239 +#define AttachObjectARB_remap_index 240 +#define CreateProgramObjectARB_remap_index 241 +#define CreateShaderObjectARB_remap_index 242 +#define DeleteObjectARB_remap_index 243 +#define DetachObjectARB_remap_index 244 +#define GetAttachedObjectsARB_remap_index 245 +#define GetHandleARB_remap_index 246 +#define GetInfoLogARB_remap_index 247 +#define GetObjectParameterfvARB_remap_index 248 +#define GetObjectParameterivARB_remap_index 249 +#define DrawArraysInstancedARB_remap_index 250 +#define DrawElementsInstancedARB_remap_index 251 +#define BindFramebuffer_remap_index 252 +#define BindRenderbuffer_remap_index 253 +#define BlitFramebuffer_remap_index 254 +#define CheckFramebufferStatus_remap_index 255 +#define DeleteFramebuffers_remap_index 256 +#define DeleteRenderbuffers_remap_index 257 +#define FramebufferRenderbuffer_remap_index 258 +#define FramebufferTexture1D_remap_index 259 +#define FramebufferTexture2D_remap_index 260 +#define FramebufferTexture3D_remap_index 261 +#define FramebufferTextureLayer_remap_index 262 +#define GenFramebuffers_remap_index 263 +#define GenRenderbuffers_remap_index 264 +#define GenerateMipmap_remap_index 265 +#define GetFramebufferAttachmentParameteriv_remap_index 266 +#define GetRenderbufferParameteriv_remap_index 267 +#define IsFramebuffer_remap_index 268 +#define IsRenderbuffer_remap_index 269 +#define RenderbufferStorage_remap_index 270 +#define RenderbufferStorageMultisample_remap_index 271 +#define FramebufferTextureFaceARB_remap_index 272 +#define FlushMappedBufferRange_remap_index 273 +#define MapBufferRange_remap_index 274 +#define BindVertexArray_remap_index 275 +#define DeleteVertexArrays_remap_index 276 +#define GenVertexArrays_remap_index 277 +#define IsVertexArray_remap_index 278 +#define GetActiveUniformBlockName_remap_index 279 +#define GetActiveUniformBlockiv_remap_index 280 +#define GetActiveUniformName_remap_index 281 +#define GetActiveUniformsiv_remap_index 282 +#define GetUniformBlockIndex_remap_index 283 +#define GetUniformIndices_remap_index 284 +#define UniformBlockBinding_remap_index 285 +#define CopyBufferSubData_remap_index 286 +#define ClientWaitSync_remap_index 287 +#define DeleteSync_remap_index 288 +#define FenceSync_remap_index 289 +#define GetInteger64v_remap_index 290 +#define GetSynciv_remap_index 291 +#define IsSync_remap_index 292 +#define WaitSync_remap_index 293 +#define DrawElementsBaseVertex_remap_index 294 +#define DrawElementsInstancedBaseVertex_remap_index 295 +#define DrawRangeElementsBaseVertex_remap_index 296 +#define MultiDrawElementsBaseVertex_remap_index 297 +#define ProvokingVertex_remap_index 298 +#define GetMultisamplefv_remap_index 299 +#define SampleMaski_remap_index 300 +#define TexImage2DMultisample_remap_index 301 +#define TexImage3DMultisample_remap_index 302 +#define BlendEquationSeparateiARB_remap_index 303 +#define BlendEquationiARB_remap_index 304 +#define BlendFuncSeparateiARB_remap_index 305 +#define BlendFunciARB_remap_index 306 +#define BindFragDataLocationIndexed_remap_index 307 +#define GetFragDataIndex_remap_index 308 +#define BindSampler_remap_index 309 +#define DeleteSamplers_remap_index 310 +#define GenSamplers_remap_index 311 +#define GetSamplerParameterIiv_remap_index 312 +#define GetSamplerParameterIuiv_remap_index 313 +#define GetSamplerParameterfv_remap_index 314 +#define GetSamplerParameteriv_remap_index 315 +#define IsSampler_remap_index 316 +#define SamplerParameterIiv_remap_index 317 +#define SamplerParameterIuiv_remap_index 318 +#define SamplerParameterf_remap_index 319 +#define SamplerParameterfv_remap_index 320 +#define SamplerParameteri_remap_index 321 +#define SamplerParameteriv_remap_index 322 +#define GetQueryObjecti64v_remap_index 323 +#define GetQueryObjectui64v_remap_index 324 +#define QueryCounter_remap_index 325 +#define ColorP3ui_remap_index 326 +#define ColorP3uiv_remap_index 327 +#define ColorP4ui_remap_index 328 +#define ColorP4uiv_remap_index 329 +#define MultiTexCoordP1ui_remap_index 330 +#define MultiTexCoordP1uiv_remap_index 331 +#define MultiTexCoordP2ui_remap_index 332 +#define MultiTexCoordP2uiv_remap_index 333 +#define MultiTexCoordP3ui_remap_index 334 +#define MultiTexCoordP3uiv_remap_index 335 +#define MultiTexCoordP4ui_remap_index 336 +#define MultiTexCoordP4uiv_remap_index 337 +#define NormalP3ui_remap_index 338 +#define NormalP3uiv_remap_index 339 +#define SecondaryColorP3ui_remap_index 340 +#define SecondaryColorP3uiv_remap_index 341 +#define TexCoordP1ui_remap_index 342 +#define TexCoordP1uiv_remap_index 343 +#define TexCoordP2ui_remap_index 344 +#define TexCoordP2uiv_remap_index 345 +#define TexCoordP3ui_remap_index 346 +#define TexCoordP3uiv_remap_index 347 +#define TexCoordP4ui_remap_index 348 +#define TexCoordP4uiv_remap_index 349 +#define VertexAttribP1ui_remap_index 350 +#define VertexAttribP1uiv_remap_index 351 +#define VertexAttribP2ui_remap_index 352 +#define VertexAttribP2uiv_remap_index 353 +#define VertexAttribP3ui_remap_index 354 +#define VertexAttribP3uiv_remap_index 355 +#define VertexAttribP4ui_remap_index 356 +#define VertexAttribP4uiv_remap_index 357 +#define VertexP2ui_remap_index 358 +#define VertexP2uiv_remap_index 359 +#define VertexP3ui_remap_index 360 +#define VertexP3uiv_remap_index 361 +#define VertexP4ui_remap_index 362 +#define VertexP4uiv_remap_index 363 +#define DrawArraysIndirect_remap_index 364 +#define DrawElementsIndirect_remap_index 365 +#define BindTransformFeedback_remap_index 366 +#define DeleteTransformFeedbacks_remap_index 367 +#define DrawTransformFeedback_remap_index 368 +#define GenTransformFeedbacks_remap_index 369 +#define IsTransformFeedback_remap_index 370 +#define PauseTransformFeedback_remap_index 371 +#define ResumeTransformFeedback_remap_index 372 +#define BeginQueryIndexed_remap_index 373 +#define DrawTransformFeedbackStream_remap_index 374 +#define EndQueryIndexed_remap_index 375 +#define GetQueryIndexediv_remap_index 376 +#define ClearDepthf_remap_index 377 +#define DepthRangef_remap_index 378 +#define GetShaderPrecisionFormat_remap_index 379 +#define ReleaseShaderCompiler_remap_index 380 +#define ShaderBinary_remap_index 381 +#define GetProgramBinary_remap_index 382 +#define ProgramBinary_remap_index 383 +#define ProgramParameteri_remap_index 384 +#define DepthRangeArrayv_remap_index 385 +#define DepthRangeIndexed_remap_index 386 +#define GetDoublei_v_remap_index 387 +#define GetFloati_v_remap_index 388 +#define ScissorArrayv_remap_index 389 +#define ScissorIndexed_remap_index 390 +#define ScissorIndexedv_remap_index 391 +#define ViewportArrayv_remap_index 392 +#define ViewportIndexedf_remap_index 393 +#define ViewportIndexedfv_remap_index 394 +#define GetGraphicsResetStatusARB_remap_index 395 +#define GetnColorTableARB_remap_index 396 +#define GetnCompressedTexImageARB_remap_index 397 +#define GetnConvolutionFilterARB_remap_index 398 +#define GetnHistogramARB_remap_index 399 +#define GetnMapdvARB_remap_index 400 +#define GetnMapfvARB_remap_index 401 +#define GetnMapivARB_remap_index 402 +#define GetnMinmaxARB_remap_index 403 +#define GetnPixelMapfvARB_remap_index 404 +#define GetnPixelMapuivARB_remap_index 405 +#define GetnPixelMapusvARB_remap_index 406 +#define GetnPolygonStippleARB_remap_index 407 +#define GetnSeparableFilterARB_remap_index 408 +#define GetnTexImageARB_remap_index 409 +#define GetnUniformdvARB_remap_index 410 +#define GetnUniformfvARB_remap_index 411 +#define GetnUniformivARB_remap_index 412 +#define GetnUniformuivARB_remap_index 413 +#define ReadnPixelsARB_remap_index 414 +#define DrawArraysInstancedBaseInstance_remap_index 415 +#define DrawElementsInstancedBaseInstance_remap_index 416 +#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 417 +#define DrawTransformFeedbackInstanced_remap_index 418 +#define DrawTransformFeedbackStreamInstanced_remap_index 419 +#define GetInternalformativ_remap_index 420 +#define GetActiveAtomicCounterBufferiv_remap_index 421 +#define BindImageTexture_remap_index 422 +#define MemoryBarrier_remap_index 423 +#define TexStorage1D_remap_index 424 +#define TexStorage2D_remap_index 425 +#define TexStorage3D_remap_index 426 +#define TextureStorage1DEXT_remap_index 427 +#define TextureStorage2DEXT_remap_index 428 +#define TextureStorage3DEXT_remap_index 429 +#define ClearBufferData_remap_index 430 +#define ClearBufferSubData_remap_index 431 +#define DispatchCompute_remap_index 432 +#define DispatchComputeIndirect_remap_index 433 +#define CopyImageSubData_remap_index 434 +#define TextureView_remap_index 435 +#define BindVertexBuffer_remap_index 436 +#define VertexAttribBinding_remap_index 437 +#define VertexAttribFormat_remap_index 438 +#define VertexAttribIFormat_remap_index 439 +#define VertexAttribLFormat_remap_index 440 +#define VertexBindingDivisor_remap_index 441 +#define MultiDrawArraysIndirect_remap_index 442 +#define MultiDrawElementsIndirect_remap_index 443 +#define TexBufferRange_remap_index 444 +#define TexStorage2DMultisample_remap_index 445 +#define TexStorage3DMultisample_remap_index 446 +#define BufferStorage_remap_index 447 +#define ClearTexImage_remap_index 448 +#define ClearTexSubImage_remap_index 449 +#define BindBuffersBase_remap_index 450 +#define BindBuffersRange_remap_index 451 +#define BindImageTextures_remap_index 452 +#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] +#define _gloffset_CompressedTexImage3D driDispatchRemapTable[CompressedTexImage3D_remap_index] +#define _gloffset_CompressedTexSubImage1D driDispatchRemapTable[CompressedTexSubImage1D_remap_index] +#define _gloffset_CompressedTexSubImage2D driDispatchRemapTable[CompressedTexSubImage2D_remap_index] +#define _gloffset_CompressedTexSubImage3D driDispatchRemapTable[CompressedTexSubImage3D_remap_index] +#define _gloffset_GetCompressedTexImage driDispatchRemapTable[GetCompressedTexImage_remap_index] +#define _gloffset_LoadTransposeMatrixd driDispatchRemapTable[LoadTransposeMatrixd_remap_index] +#define _gloffset_LoadTransposeMatrixf driDispatchRemapTable[LoadTransposeMatrixf_remap_index] +#define _gloffset_MultTransposeMatrixd driDispatchRemapTable[MultTransposeMatrixd_remap_index] +#define _gloffset_MultTransposeMatrixf driDispatchRemapTable[MultTransposeMatrixf_remap_index] +#define _gloffset_SampleCoverage driDispatchRemapTable[SampleCoverage_remap_index] +#define _gloffset_BlendFuncSeparate driDispatchRemapTable[BlendFuncSeparate_remap_index] +#define _gloffset_FogCoordPointer driDispatchRemapTable[FogCoordPointer_remap_index] +#define _gloffset_FogCoordd driDispatchRemapTable[FogCoordd_remap_index] +#define _gloffset_FogCoorddv driDispatchRemapTable[FogCoorddv_remap_index] +#define _gloffset_MultiDrawArrays driDispatchRemapTable[MultiDrawArrays_remap_index] +#define _gloffset_PointParameterf driDispatchRemapTable[PointParameterf_remap_index] +#define _gloffset_PointParameterfv driDispatchRemapTable[PointParameterfv_remap_index] +#define _gloffset_PointParameteri driDispatchRemapTable[PointParameteri_remap_index] +#define _gloffset_PointParameteriv driDispatchRemapTable[PointParameteriv_remap_index] +#define _gloffset_SecondaryColor3b driDispatchRemapTable[SecondaryColor3b_remap_index] +#define _gloffset_SecondaryColor3bv driDispatchRemapTable[SecondaryColor3bv_remap_index] +#define _gloffset_SecondaryColor3d driDispatchRemapTable[SecondaryColor3d_remap_index] +#define _gloffset_SecondaryColor3dv driDispatchRemapTable[SecondaryColor3dv_remap_index] +#define _gloffset_SecondaryColor3i driDispatchRemapTable[SecondaryColor3i_remap_index] +#define _gloffset_SecondaryColor3iv driDispatchRemapTable[SecondaryColor3iv_remap_index] +#define _gloffset_SecondaryColor3s driDispatchRemapTable[SecondaryColor3s_remap_index] +#define _gloffset_SecondaryColor3sv driDispatchRemapTable[SecondaryColor3sv_remap_index] +#define _gloffset_SecondaryColor3ub driDispatchRemapTable[SecondaryColor3ub_remap_index] +#define _gloffset_SecondaryColor3ubv driDispatchRemapTable[SecondaryColor3ubv_remap_index] +#define _gloffset_SecondaryColor3ui driDispatchRemapTable[SecondaryColor3ui_remap_index] +#define _gloffset_SecondaryColor3uiv driDispatchRemapTable[SecondaryColor3uiv_remap_index] +#define _gloffset_SecondaryColor3us driDispatchRemapTable[SecondaryColor3us_remap_index] +#define _gloffset_SecondaryColor3usv driDispatchRemapTable[SecondaryColor3usv_remap_index] +#define _gloffset_SecondaryColorPointer driDispatchRemapTable[SecondaryColorPointer_remap_index] +#define _gloffset_WindowPos2d driDispatchRemapTable[WindowPos2d_remap_index] +#define _gloffset_WindowPos2dv driDispatchRemapTable[WindowPos2dv_remap_index] +#define _gloffset_WindowPos2f driDispatchRemapTable[WindowPos2f_remap_index] +#define _gloffset_WindowPos2fv driDispatchRemapTable[WindowPos2fv_remap_index] +#define _gloffset_WindowPos2i driDispatchRemapTable[WindowPos2i_remap_index] +#define _gloffset_WindowPos2iv driDispatchRemapTable[WindowPos2iv_remap_index] +#define _gloffset_WindowPos2s driDispatchRemapTable[WindowPos2s_remap_index] +#define _gloffset_WindowPos2sv driDispatchRemapTable[WindowPos2sv_remap_index] +#define _gloffset_WindowPos3d driDispatchRemapTable[WindowPos3d_remap_index] +#define _gloffset_WindowPos3dv driDispatchRemapTable[WindowPos3dv_remap_index] +#define _gloffset_WindowPos3f driDispatchRemapTable[WindowPos3f_remap_index] +#define _gloffset_WindowPos3fv driDispatchRemapTable[WindowPos3fv_remap_index] +#define _gloffset_WindowPos3i driDispatchRemapTable[WindowPos3i_remap_index] +#define _gloffset_WindowPos3iv driDispatchRemapTable[WindowPos3iv_remap_index] +#define _gloffset_WindowPos3s driDispatchRemapTable[WindowPos3s_remap_index] +#define _gloffset_WindowPos3sv driDispatchRemapTable[WindowPos3sv_remap_index] +#define _gloffset_BeginQuery driDispatchRemapTable[BeginQuery_remap_index] +#define _gloffset_BindBuffer driDispatchRemapTable[BindBuffer_remap_index] +#define _gloffset_BufferData driDispatchRemapTable[BufferData_remap_index] +#define _gloffset_BufferSubData driDispatchRemapTable[BufferSubData_remap_index] +#define _gloffset_DeleteBuffers driDispatchRemapTable[DeleteBuffers_remap_index] +#define _gloffset_DeleteQueries driDispatchRemapTable[DeleteQueries_remap_index] +#define _gloffset_EndQuery driDispatchRemapTable[EndQuery_remap_index] +#define _gloffset_GenBuffers driDispatchRemapTable[GenBuffers_remap_index] +#define _gloffset_GenQueries driDispatchRemapTable[GenQueries_remap_index] +#define _gloffset_GetBufferParameteriv driDispatchRemapTable[GetBufferParameteriv_remap_index] +#define _gloffset_GetBufferPointerv driDispatchRemapTable[GetBufferPointerv_remap_index] +#define _gloffset_GetBufferSubData driDispatchRemapTable[GetBufferSubData_remap_index] +#define _gloffset_GetQueryObjectiv driDispatchRemapTable[GetQueryObjectiv_remap_index] +#define _gloffset_GetQueryObjectuiv driDispatchRemapTable[GetQueryObjectuiv_remap_index] +#define _gloffset_GetQueryiv driDispatchRemapTable[GetQueryiv_remap_index] +#define _gloffset_IsBuffer driDispatchRemapTable[IsBuffer_remap_index] +#define _gloffset_IsQuery driDispatchRemapTable[IsQuery_remap_index] +#define _gloffset_MapBuffer driDispatchRemapTable[MapBuffer_remap_index] +#define _gloffset_UnmapBuffer driDispatchRemapTable[UnmapBuffer_remap_index] +#define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index] +#define _gloffset_BindAttribLocation driDispatchRemapTable[BindAttribLocation_remap_index] +#define _gloffset_BlendEquationSeparate driDispatchRemapTable[BlendEquationSeparate_remap_index] +#define _gloffset_CompileShader driDispatchRemapTable[CompileShader_remap_index] +#define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index] +#define _gloffset_CreateShader driDispatchRemapTable[CreateShader_remap_index] +#define _gloffset_DeleteProgram driDispatchRemapTable[DeleteProgram_remap_index] +#define _gloffset_DeleteShader driDispatchRemapTable[DeleteShader_remap_index] +#define _gloffset_DetachShader driDispatchRemapTable[DetachShader_remap_index] +#define _gloffset_DisableVertexAttribArray driDispatchRemapTable[DisableVertexAttribArray_remap_index] +#define _gloffset_DrawBuffers driDispatchRemapTable[DrawBuffers_remap_index] +#define _gloffset_EnableVertexAttribArray driDispatchRemapTable[EnableVertexAttribArray_remap_index] +#define _gloffset_GetActiveAttrib driDispatchRemapTable[GetActiveAttrib_remap_index] +#define _gloffset_GetActiveUniform driDispatchRemapTable[GetActiveUniform_remap_index] +#define _gloffset_GetAttachedShaders driDispatchRemapTable[GetAttachedShaders_remap_index] +#define _gloffset_GetAttribLocation driDispatchRemapTable[GetAttribLocation_remap_index] +#define _gloffset_GetProgramInfoLog driDispatchRemapTable[GetProgramInfoLog_remap_index] +#define _gloffset_GetProgramiv driDispatchRemapTable[GetProgramiv_remap_index] +#define _gloffset_GetShaderInfoLog driDispatchRemapTable[GetShaderInfoLog_remap_index] +#define _gloffset_GetShaderSource driDispatchRemapTable[GetShaderSource_remap_index] +#define _gloffset_GetShaderiv driDispatchRemapTable[GetShaderiv_remap_index] +#define _gloffset_GetUniformLocation driDispatchRemapTable[GetUniformLocation_remap_index] +#define _gloffset_GetUniformfv driDispatchRemapTable[GetUniformfv_remap_index] +#define _gloffset_GetUniformiv driDispatchRemapTable[GetUniformiv_remap_index] +#define _gloffset_GetVertexAttribPointerv driDispatchRemapTable[GetVertexAttribPointerv_remap_index] +#define _gloffset_GetVertexAttribdv driDispatchRemapTable[GetVertexAttribdv_remap_index] +#define _gloffset_GetVertexAttribfv driDispatchRemapTable[GetVertexAttribfv_remap_index] +#define _gloffset_GetVertexAttribiv driDispatchRemapTable[GetVertexAttribiv_remap_index] +#define _gloffset_IsProgram driDispatchRemapTable[IsProgram_remap_index] +#define _gloffset_IsShader driDispatchRemapTable[IsShader_remap_index] +#define _gloffset_LinkProgram driDispatchRemapTable[LinkProgram_remap_index] +#define _gloffset_ShaderSource driDispatchRemapTable[ShaderSource_remap_index] +#define _gloffset_StencilFuncSeparate driDispatchRemapTable[StencilFuncSeparate_remap_index] +#define _gloffset_StencilMaskSeparate driDispatchRemapTable[StencilMaskSeparate_remap_index] +#define _gloffset_StencilOpSeparate driDispatchRemapTable[StencilOpSeparate_remap_index] +#define _gloffset_Uniform1f driDispatchRemapTable[Uniform1f_remap_index] +#define _gloffset_Uniform1fv driDispatchRemapTable[Uniform1fv_remap_index] +#define _gloffset_Uniform1i driDispatchRemapTable[Uniform1i_remap_index] +#define _gloffset_Uniform1iv driDispatchRemapTable[Uniform1iv_remap_index] +#define _gloffset_Uniform2f driDispatchRemapTable[Uniform2f_remap_index] +#define _gloffset_Uniform2fv driDispatchRemapTable[Uniform2fv_remap_index] +#define _gloffset_Uniform2i driDispatchRemapTable[Uniform2i_remap_index] +#define _gloffset_Uniform2iv driDispatchRemapTable[Uniform2iv_remap_index] +#define _gloffset_Uniform3f driDispatchRemapTable[Uniform3f_remap_index] +#define _gloffset_Uniform3fv driDispatchRemapTable[Uniform3fv_remap_index] +#define _gloffset_Uniform3i driDispatchRemapTable[Uniform3i_remap_index] +#define _gloffset_Uniform3iv driDispatchRemapTable[Uniform3iv_remap_index] +#define _gloffset_Uniform4f driDispatchRemapTable[Uniform4f_remap_index] +#define _gloffset_Uniform4fv driDispatchRemapTable[Uniform4fv_remap_index] +#define _gloffset_Uniform4i driDispatchRemapTable[Uniform4i_remap_index] +#define _gloffset_Uniform4iv driDispatchRemapTable[Uniform4iv_remap_index] +#define _gloffset_UniformMatrix2fv driDispatchRemapTable[UniformMatrix2fv_remap_index] +#define _gloffset_UniformMatrix3fv driDispatchRemapTable[UniformMatrix3fv_remap_index] +#define _gloffset_UniformMatrix4fv driDispatchRemapTable[UniformMatrix4fv_remap_index] +#define _gloffset_UseProgram driDispatchRemapTable[UseProgram_remap_index] +#define _gloffset_ValidateProgram driDispatchRemapTable[ValidateProgram_remap_index] +#define _gloffset_VertexAttrib1d driDispatchRemapTable[VertexAttrib1d_remap_index] +#define _gloffset_VertexAttrib1dv driDispatchRemapTable[VertexAttrib1dv_remap_index] +#define _gloffset_VertexAttrib1s driDispatchRemapTable[VertexAttrib1s_remap_index] +#define _gloffset_VertexAttrib1sv driDispatchRemapTable[VertexAttrib1sv_remap_index] +#define _gloffset_VertexAttrib2d driDispatchRemapTable[VertexAttrib2d_remap_index] +#define _gloffset_VertexAttrib2dv driDispatchRemapTable[VertexAttrib2dv_remap_index] +#define _gloffset_VertexAttrib2s driDispatchRemapTable[VertexAttrib2s_remap_index] +#define _gloffset_VertexAttrib2sv driDispatchRemapTable[VertexAttrib2sv_remap_index] +#define _gloffset_VertexAttrib3d driDispatchRemapTable[VertexAttrib3d_remap_index] +#define _gloffset_VertexAttrib3dv driDispatchRemapTable[VertexAttrib3dv_remap_index] +#define _gloffset_VertexAttrib3s driDispatchRemapTable[VertexAttrib3s_remap_index] +#define _gloffset_VertexAttrib3sv driDispatchRemapTable[VertexAttrib3sv_remap_index] +#define _gloffset_VertexAttrib4Nbv driDispatchRemapTable[VertexAttrib4Nbv_remap_index] +#define _gloffset_VertexAttrib4Niv driDispatchRemapTable[VertexAttrib4Niv_remap_index] +#define _gloffset_VertexAttrib4Nsv driDispatchRemapTable[VertexAttrib4Nsv_remap_index] +#define _gloffset_VertexAttrib4Nub driDispatchRemapTable[VertexAttrib4Nub_remap_index] +#define _gloffset_VertexAttrib4Nubv driDispatchRemapTable[VertexAttrib4Nubv_remap_index] +#define _gloffset_VertexAttrib4Nuiv driDispatchRemapTable[VertexAttrib4Nuiv_remap_index] +#define _gloffset_VertexAttrib4Nusv driDispatchRemapTable[VertexAttrib4Nusv_remap_index] +#define _gloffset_VertexAttrib4bv driDispatchRemapTable[VertexAttrib4bv_remap_index] +#define _gloffset_VertexAttrib4d driDispatchRemapTable[VertexAttrib4d_remap_index] +#define _gloffset_VertexAttrib4dv driDispatchRemapTable[VertexAttrib4dv_remap_index] +#define _gloffset_VertexAttrib4iv driDispatchRemapTable[VertexAttrib4iv_remap_index] +#define _gloffset_VertexAttrib4s driDispatchRemapTable[VertexAttrib4s_remap_index] +#define _gloffset_VertexAttrib4sv driDispatchRemapTable[VertexAttrib4sv_remap_index] +#define _gloffset_VertexAttrib4ubv driDispatchRemapTable[VertexAttrib4ubv_remap_index] +#define _gloffset_VertexAttrib4uiv driDispatchRemapTable[VertexAttrib4uiv_remap_index] +#define _gloffset_VertexAttrib4usv driDispatchRemapTable[VertexAttrib4usv_remap_index] +#define _gloffset_VertexAttribPointer driDispatchRemapTable[VertexAttribPointer_remap_index] +#define _gloffset_UniformMatrix2x3fv driDispatchRemapTable[UniformMatrix2x3fv_remap_index] +#define _gloffset_UniformMatrix2x4fv driDispatchRemapTable[UniformMatrix2x4fv_remap_index] +#define _gloffset_UniformMatrix3x2fv driDispatchRemapTable[UniformMatrix3x2fv_remap_index] +#define _gloffset_UniformMatrix3x4fv driDispatchRemapTable[UniformMatrix3x4fv_remap_index] +#define _gloffset_UniformMatrix4x2fv driDispatchRemapTable[UniformMatrix4x2fv_remap_index] +#define _gloffset_UniformMatrix4x3fv driDispatchRemapTable[UniformMatrix4x3fv_remap_index] +#define _gloffset_BeginConditionalRender driDispatchRemapTable[BeginConditionalRender_remap_index] +#define _gloffset_BeginTransformFeedback driDispatchRemapTable[BeginTransformFeedback_remap_index] +#define _gloffset_BindBufferBase driDispatchRemapTable[BindBufferBase_remap_index] +#define _gloffset_BindBufferRange driDispatchRemapTable[BindBufferRange_remap_index] +#define _gloffset_BindFragDataLocation driDispatchRemapTable[BindFragDataLocation_remap_index] +#define _gloffset_ClampColor driDispatchRemapTable[ClampColor_remap_index] +#define _gloffset_ClearBufferfi driDispatchRemapTable[ClearBufferfi_remap_index] +#define _gloffset_ClearBufferfv driDispatchRemapTable[ClearBufferfv_remap_index] +#define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index] +#define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index] +#define _gloffset_ColorMaski driDispatchRemapTable[ColorMaski_remap_index] +#define _gloffset_Disablei driDispatchRemapTable[Disablei_remap_index] +#define _gloffset_Enablei driDispatchRemapTable[Enablei_remap_index] +#define _gloffset_EndConditionalRender driDispatchRemapTable[EndConditionalRender_remap_index] +#define _gloffset_EndTransformFeedback driDispatchRemapTable[EndTransformFeedback_remap_index] +#define _gloffset_GetBooleani_v driDispatchRemapTable[GetBooleani_v_remap_index] +#define _gloffset_GetFragDataLocation driDispatchRemapTable[GetFragDataLocation_remap_index] +#define _gloffset_GetIntegeri_v driDispatchRemapTable[GetIntegeri_v_remap_index] +#define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index] +#define _gloffset_GetTexParameterIiv driDispatchRemapTable[GetTexParameterIiv_remap_index] +#define _gloffset_GetTexParameterIuiv driDispatchRemapTable[GetTexParameterIuiv_remap_index] +#define _gloffset_GetTransformFeedbackVarying driDispatchRemapTable[GetTransformFeedbackVarying_remap_index] +#define _gloffset_GetUniformuiv driDispatchRemapTable[GetUniformuiv_remap_index] +#define _gloffset_GetVertexAttribIiv driDispatchRemapTable[GetVertexAttribIiv_remap_index] +#define _gloffset_GetVertexAttribIuiv driDispatchRemapTable[GetVertexAttribIuiv_remap_index] +#define _gloffset_IsEnabledi driDispatchRemapTable[IsEnabledi_remap_index] +#define _gloffset_TexParameterIiv driDispatchRemapTable[TexParameterIiv_remap_index] +#define _gloffset_TexParameterIuiv driDispatchRemapTable[TexParameterIuiv_remap_index] +#define _gloffset_TransformFeedbackVaryings driDispatchRemapTable[TransformFeedbackVaryings_remap_index] +#define _gloffset_Uniform1ui driDispatchRemapTable[Uniform1ui_remap_index] +#define _gloffset_Uniform1uiv driDispatchRemapTable[Uniform1uiv_remap_index] +#define _gloffset_Uniform2ui driDispatchRemapTable[Uniform2ui_remap_index] +#define _gloffset_Uniform2uiv driDispatchRemapTable[Uniform2uiv_remap_index] +#define _gloffset_Uniform3ui driDispatchRemapTable[Uniform3ui_remap_index] +#define _gloffset_Uniform3uiv driDispatchRemapTable[Uniform3uiv_remap_index] +#define _gloffset_Uniform4ui driDispatchRemapTable[Uniform4ui_remap_index] +#define _gloffset_Uniform4uiv driDispatchRemapTable[Uniform4uiv_remap_index] +#define _gloffset_VertexAttribI1iv driDispatchRemapTable[VertexAttribI1iv_remap_index] +#define _gloffset_VertexAttribI1uiv driDispatchRemapTable[VertexAttribI1uiv_remap_index] +#define _gloffset_VertexAttribI4bv driDispatchRemapTable[VertexAttribI4bv_remap_index] +#define _gloffset_VertexAttribI4sv driDispatchRemapTable[VertexAttribI4sv_remap_index] +#define _gloffset_VertexAttribI4ubv driDispatchRemapTable[VertexAttribI4ubv_remap_index] +#define _gloffset_VertexAttribI4usv driDispatchRemapTable[VertexAttribI4usv_remap_index] +#define _gloffset_VertexAttribIPointer driDispatchRemapTable[VertexAttribIPointer_remap_index] +#define _gloffset_PrimitiveRestartIndex driDispatchRemapTable[PrimitiveRestartIndex_remap_index] +#define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index] +#define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index] +#define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index] +#define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index] +#define _gloffset_VertexAttribDivisor driDispatchRemapTable[VertexAttribDivisor_remap_index] +#define _gloffset_MinSampleShading driDispatchRemapTable[MinSampleShading_remap_index] +#define _gloffset_BindProgramARB driDispatchRemapTable[BindProgramARB_remap_index] +#define _gloffset_DeleteProgramsARB driDispatchRemapTable[DeleteProgramsARB_remap_index] +#define _gloffset_GenProgramsARB driDispatchRemapTable[GenProgramsARB_remap_index] +#define _gloffset_GetProgramEnvParameterdvARB driDispatchRemapTable[GetProgramEnvParameterdvARB_remap_index] +#define _gloffset_GetProgramEnvParameterfvARB driDispatchRemapTable[GetProgramEnvParameterfvARB_remap_index] +#define _gloffset_GetProgramLocalParameterdvARB driDispatchRemapTable[GetProgramLocalParameterdvARB_remap_index] +#define _gloffset_GetProgramLocalParameterfvARB driDispatchRemapTable[GetProgramLocalParameterfvARB_remap_index] +#define _gloffset_GetProgramStringARB driDispatchRemapTable[GetProgramStringARB_remap_index] +#define _gloffset_GetProgramivARB driDispatchRemapTable[GetProgramivARB_remap_index] +#define _gloffset_IsProgramARB driDispatchRemapTable[IsProgramARB_remap_index] +#define _gloffset_ProgramEnvParameter4dARB driDispatchRemapTable[ProgramEnvParameter4dARB_remap_index] +#define _gloffset_ProgramEnvParameter4dvARB driDispatchRemapTable[ProgramEnvParameter4dvARB_remap_index] +#define _gloffset_ProgramEnvParameter4fARB driDispatchRemapTable[ProgramEnvParameter4fARB_remap_index] +#define _gloffset_ProgramEnvParameter4fvARB driDispatchRemapTable[ProgramEnvParameter4fvARB_remap_index] +#define _gloffset_ProgramLocalParameter4dARB driDispatchRemapTable[ProgramLocalParameter4dARB_remap_index] +#define _gloffset_ProgramLocalParameter4dvARB driDispatchRemapTable[ProgramLocalParameter4dvARB_remap_index] +#define _gloffset_ProgramLocalParameter4fARB driDispatchRemapTable[ProgramLocalParameter4fARB_remap_index] +#define _gloffset_ProgramLocalParameter4fvARB driDispatchRemapTable[ProgramLocalParameter4fvARB_remap_index] +#define _gloffset_ProgramStringARB driDispatchRemapTable[ProgramStringARB_remap_index] +#define _gloffset_VertexAttrib1fARB driDispatchRemapTable[VertexAttrib1fARB_remap_index] +#define _gloffset_VertexAttrib1fvARB driDispatchRemapTable[VertexAttrib1fvARB_remap_index] +#define _gloffset_VertexAttrib2fARB driDispatchRemapTable[VertexAttrib2fARB_remap_index] +#define _gloffset_VertexAttrib2fvARB driDispatchRemapTable[VertexAttrib2fvARB_remap_index] +#define _gloffset_VertexAttrib3fARB driDispatchRemapTable[VertexAttrib3fARB_remap_index] +#define _gloffset_VertexAttrib3fvARB driDispatchRemapTable[VertexAttrib3fvARB_remap_index] +#define _gloffset_VertexAttrib4fARB driDispatchRemapTable[VertexAttrib4fARB_remap_index] +#define _gloffset_VertexAttrib4fvARB driDispatchRemapTable[VertexAttrib4fvARB_remap_index] +#define _gloffset_AttachObjectARB driDispatchRemapTable[AttachObjectARB_remap_index] +#define _gloffset_CreateProgramObjectARB driDispatchRemapTable[CreateProgramObjectARB_remap_index] +#define _gloffset_CreateShaderObjectARB driDispatchRemapTable[CreateShaderObjectARB_remap_index] +#define _gloffset_DeleteObjectARB driDispatchRemapTable[DeleteObjectARB_remap_index] +#define _gloffset_DetachObjectARB driDispatchRemapTable[DetachObjectARB_remap_index] +#define _gloffset_GetAttachedObjectsARB driDispatchRemapTable[GetAttachedObjectsARB_remap_index] +#define _gloffset_GetHandleARB driDispatchRemapTable[GetHandleARB_remap_index] +#define _gloffset_GetInfoLogARB driDispatchRemapTable[GetInfoLogARB_remap_index] +#define _gloffset_GetObjectParameterfvARB driDispatchRemapTable[GetObjectParameterfvARB_remap_index] +#define _gloffset_GetObjectParameterivARB driDispatchRemapTable[GetObjectParameterivARB_remap_index] +#define _gloffset_DrawArraysInstancedARB driDispatchRemapTable[DrawArraysInstancedARB_remap_index] +#define _gloffset_DrawElementsInstancedARB driDispatchRemapTable[DrawElementsInstancedARB_remap_index] +#define _gloffset_BindFramebuffer driDispatchRemapTable[BindFramebuffer_remap_index] +#define _gloffset_BindRenderbuffer driDispatchRemapTable[BindRenderbuffer_remap_index] +#define _gloffset_BlitFramebuffer driDispatchRemapTable[BlitFramebuffer_remap_index] +#define _gloffset_CheckFramebufferStatus driDispatchRemapTable[CheckFramebufferStatus_remap_index] +#define _gloffset_DeleteFramebuffers driDispatchRemapTable[DeleteFramebuffers_remap_index] +#define _gloffset_DeleteRenderbuffers driDispatchRemapTable[DeleteRenderbuffers_remap_index] +#define _gloffset_FramebufferRenderbuffer driDispatchRemapTable[FramebufferRenderbuffer_remap_index] +#define _gloffset_FramebufferTexture1D driDispatchRemapTable[FramebufferTexture1D_remap_index] +#define _gloffset_FramebufferTexture2D driDispatchRemapTable[FramebufferTexture2D_remap_index] +#define _gloffset_FramebufferTexture3D driDispatchRemapTable[FramebufferTexture3D_remap_index] +#define _gloffset_FramebufferTextureLayer driDispatchRemapTable[FramebufferTextureLayer_remap_index] +#define _gloffset_GenFramebuffers driDispatchRemapTable[GenFramebuffers_remap_index] +#define _gloffset_GenRenderbuffers driDispatchRemapTable[GenRenderbuffers_remap_index] +#define _gloffset_GenerateMipmap driDispatchRemapTable[GenerateMipmap_remap_index] +#define _gloffset_GetFramebufferAttachmentParameteriv driDispatchRemapTable[GetFramebufferAttachmentParameteriv_remap_index] +#define _gloffset_GetRenderbufferParameteriv driDispatchRemapTable[GetRenderbufferParameteriv_remap_index] +#define _gloffset_IsFramebuffer driDispatchRemapTable[IsFramebuffer_remap_index] +#define _gloffset_IsRenderbuffer driDispatchRemapTable[IsRenderbuffer_remap_index] +#define _gloffset_RenderbufferStorage driDispatchRemapTable[RenderbufferStorage_remap_index] +#define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index] +#define _gloffset_FramebufferTextureFaceARB driDispatchRemapTable[FramebufferTextureFaceARB_remap_index] +#define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index] +#define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index] +#define _gloffset_BindVertexArray driDispatchRemapTable[BindVertexArray_remap_index] +#define _gloffset_DeleteVertexArrays driDispatchRemapTable[DeleteVertexArrays_remap_index] +#define _gloffset_GenVertexArrays driDispatchRemapTable[GenVertexArrays_remap_index] +#define _gloffset_IsVertexArray driDispatchRemapTable[IsVertexArray_remap_index] +#define _gloffset_GetActiveUniformBlockName driDispatchRemapTable[GetActiveUniformBlockName_remap_index] +#define _gloffset_GetActiveUniformBlockiv driDispatchRemapTable[GetActiveUniformBlockiv_remap_index] +#define _gloffset_GetActiveUniformName driDispatchRemapTable[GetActiveUniformName_remap_index] +#define _gloffset_GetActiveUniformsiv driDispatchRemapTable[GetActiveUniformsiv_remap_index] +#define _gloffset_GetUniformBlockIndex driDispatchRemapTable[GetUniformBlockIndex_remap_index] +#define _gloffset_GetUniformIndices driDispatchRemapTable[GetUniformIndices_remap_index] +#define _gloffset_UniformBlockBinding driDispatchRemapTable[UniformBlockBinding_remap_index] +#define _gloffset_CopyBufferSubData driDispatchRemapTable[CopyBufferSubData_remap_index] +#define _gloffset_ClientWaitSync driDispatchRemapTable[ClientWaitSync_remap_index] +#define _gloffset_DeleteSync driDispatchRemapTable[DeleteSync_remap_index] +#define _gloffset_FenceSync driDispatchRemapTable[FenceSync_remap_index] +#define _gloffset_GetInteger64v driDispatchRemapTable[GetInteger64v_remap_index] +#define _gloffset_GetSynciv driDispatchRemapTable[GetSynciv_remap_index] +#define _gloffset_IsSync driDispatchRemapTable[IsSync_remap_index] +#define _gloffset_WaitSync driDispatchRemapTable[WaitSync_remap_index] +#define _gloffset_DrawElementsBaseVertex driDispatchRemapTable[DrawElementsBaseVertex_remap_index] +#define _gloffset_DrawElementsInstancedBaseVertex driDispatchRemapTable[DrawElementsInstancedBaseVertex_remap_index] +#define _gloffset_DrawRangeElementsBaseVertex driDispatchRemapTable[DrawRangeElementsBaseVertex_remap_index] +#define _gloffset_MultiDrawElementsBaseVertex driDispatchRemapTable[MultiDrawElementsBaseVertex_remap_index] +#define _gloffset_ProvokingVertex driDispatchRemapTable[ProvokingVertex_remap_index] +#define _gloffset_GetMultisamplefv driDispatchRemapTable[GetMultisamplefv_remap_index] +#define _gloffset_SampleMaski driDispatchRemapTable[SampleMaski_remap_index] +#define _gloffset_TexImage2DMultisample driDispatchRemapTable[TexImage2DMultisample_remap_index] +#define _gloffset_TexImage3DMultisample driDispatchRemapTable[TexImage3DMultisample_remap_index] +#define _gloffset_BlendEquationSeparateiARB driDispatchRemapTable[BlendEquationSeparateiARB_remap_index] +#define _gloffset_BlendEquationiARB driDispatchRemapTable[BlendEquationiARB_remap_index] +#define _gloffset_BlendFuncSeparateiARB driDispatchRemapTable[BlendFuncSeparateiARB_remap_index] +#define _gloffset_BlendFunciARB driDispatchRemapTable[BlendFunciARB_remap_index] +#define _gloffset_BindFragDataLocationIndexed driDispatchRemapTable[BindFragDataLocationIndexed_remap_index] +#define _gloffset_GetFragDataIndex driDispatchRemapTable[GetFragDataIndex_remap_index] +#define _gloffset_BindSampler driDispatchRemapTable[BindSampler_remap_index] +#define _gloffset_DeleteSamplers driDispatchRemapTable[DeleteSamplers_remap_index] +#define _gloffset_GenSamplers driDispatchRemapTable[GenSamplers_remap_index] +#define _gloffset_GetSamplerParameterIiv driDispatchRemapTable[GetSamplerParameterIiv_remap_index] +#define _gloffset_GetSamplerParameterIuiv driDispatchRemapTable[GetSamplerParameterIuiv_remap_index] +#define _gloffset_GetSamplerParameterfv driDispatchRemapTable[GetSamplerParameterfv_remap_index] +#define _gloffset_GetSamplerParameteriv driDispatchRemapTable[GetSamplerParameteriv_remap_index] +#define _gloffset_IsSampler driDispatchRemapTable[IsSampler_remap_index] +#define _gloffset_SamplerParameterIiv driDispatchRemapTable[SamplerParameterIiv_remap_index] +#define _gloffset_SamplerParameterIuiv driDispatchRemapTable[SamplerParameterIuiv_remap_index] +#define _gloffset_SamplerParameterf driDispatchRemapTable[SamplerParameterf_remap_index] +#define _gloffset_SamplerParameterfv driDispatchRemapTable[SamplerParameterfv_remap_index] +#define _gloffset_SamplerParameteri driDispatchRemapTable[SamplerParameteri_remap_index] +#define _gloffset_SamplerParameteriv driDispatchRemapTable[SamplerParameteriv_remap_index] +#define _gloffset_GetQueryObjecti64v driDispatchRemapTable[GetQueryObjecti64v_remap_index] +#define _gloffset_GetQueryObjectui64v driDispatchRemapTable[GetQueryObjectui64v_remap_index] +#define _gloffset_QueryCounter driDispatchRemapTable[QueryCounter_remap_index] +#define _gloffset_ColorP3ui driDispatchRemapTable[ColorP3ui_remap_index] +#define _gloffset_ColorP3uiv driDispatchRemapTable[ColorP3uiv_remap_index] +#define _gloffset_ColorP4ui driDispatchRemapTable[ColorP4ui_remap_index] +#define _gloffset_ColorP4uiv driDispatchRemapTable[ColorP4uiv_remap_index] +#define _gloffset_MultiTexCoordP1ui driDispatchRemapTable[MultiTexCoordP1ui_remap_index] +#define _gloffset_MultiTexCoordP1uiv driDispatchRemapTable[MultiTexCoordP1uiv_remap_index] +#define _gloffset_MultiTexCoordP2ui driDispatchRemapTable[MultiTexCoordP2ui_remap_index] +#define _gloffset_MultiTexCoordP2uiv driDispatchRemapTable[MultiTexCoordP2uiv_remap_index] +#define _gloffset_MultiTexCoordP3ui driDispatchRemapTable[MultiTexCoordP3ui_remap_index] +#define _gloffset_MultiTexCoordP3uiv driDispatchRemapTable[MultiTexCoordP3uiv_remap_index] +#define _gloffset_MultiTexCoordP4ui driDispatchRemapTable[MultiTexCoordP4ui_remap_index] +#define _gloffset_MultiTexCoordP4uiv driDispatchRemapTable[MultiTexCoordP4uiv_remap_index] +#define _gloffset_NormalP3ui driDispatchRemapTable[NormalP3ui_remap_index] +#define _gloffset_NormalP3uiv driDispatchRemapTable[NormalP3uiv_remap_index] +#define _gloffset_SecondaryColorP3ui driDispatchRemapTable[SecondaryColorP3ui_remap_index] +#define _gloffset_SecondaryColorP3uiv driDispatchRemapTable[SecondaryColorP3uiv_remap_index] +#define _gloffset_TexCoordP1ui driDispatchRemapTable[TexCoordP1ui_remap_index] +#define _gloffset_TexCoordP1uiv driDispatchRemapTable[TexCoordP1uiv_remap_index] +#define _gloffset_TexCoordP2ui driDispatchRemapTable[TexCoordP2ui_remap_index] +#define _gloffset_TexCoordP2uiv driDispatchRemapTable[TexCoordP2uiv_remap_index] +#define _gloffset_TexCoordP3ui driDispatchRemapTable[TexCoordP3ui_remap_index] +#define _gloffset_TexCoordP3uiv driDispatchRemapTable[TexCoordP3uiv_remap_index] +#define _gloffset_TexCoordP4ui driDispatchRemapTable[TexCoordP4ui_remap_index] +#define _gloffset_TexCoordP4uiv driDispatchRemapTable[TexCoordP4uiv_remap_index] +#define _gloffset_VertexAttribP1ui driDispatchRemapTable[VertexAttribP1ui_remap_index] +#define _gloffset_VertexAttribP1uiv driDispatchRemapTable[VertexAttribP1uiv_remap_index] +#define _gloffset_VertexAttribP2ui driDispatchRemapTable[VertexAttribP2ui_remap_index] +#define _gloffset_VertexAttribP2uiv driDispatchRemapTable[VertexAttribP2uiv_remap_index] +#define _gloffset_VertexAttribP3ui driDispatchRemapTable[VertexAttribP3ui_remap_index] +#define _gloffset_VertexAttribP3uiv driDispatchRemapTable[VertexAttribP3uiv_remap_index] +#define _gloffset_VertexAttribP4ui driDispatchRemapTable[VertexAttribP4ui_remap_index] +#define _gloffset_VertexAttribP4uiv driDispatchRemapTable[VertexAttribP4uiv_remap_index] +#define _gloffset_VertexP2ui driDispatchRemapTable[VertexP2ui_remap_index] +#define _gloffset_VertexP2uiv driDispatchRemapTable[VertexP2uiv_remap_index] +#define _gloffset_VertexP3ui driDispatchRemapTable[VertexP3ui_remap_index] +#define _gloffset_VertexP3uiv driDispatchRemapTable[VertexP3uiv_remap_index] +#define _gloffset_VertexP4ui driDispatchRemapTable[VertexP4ui_remap_index] +#define _gloffset_VertexP4uiv driDispatchRemapTable[VertexP4uiv_remap_index] +#define _gloffset_DrawArraysIndirect driDispatchRemapTable[DrawArraysIndirect_remap_index] +#define _gloffset_DrawElementsIndirect driDispatchRemapTable[DrawElementsIndirect_remap_index] +#define _gloffset_BindTransformFeedback driDispatchRemapTable[BindTransformFeedback_remap_index] +#define _gloffset_DeleteTransformFeedbacks driDispatchRemapTable[DeleteTransformFeedbacks_remap_index] +#define _gloffset_DrawTransformFeedback driDispatchRemapTable[DrawTransformFeedback_remap_index] +#define _gloffset_GenTransformFeedbacks driDispatchRemapTable[GenTransformFeedbacks_remap_index] +#define _gloffset_IsTransformFeedback driDispatchRemapTable[IsTransformFeedback_remap_index] +#define _gloffset_PauseTransformFeedback driDispatchRemapTable[PauseTransformFeedback_remap_index] +#define _gloffset_ResumeTransformFeedback driDispatchRemapTable[ResumeTransformFeedback_remap_index] +#define _gloffset_BeginQueryIndexed driDispatchRemapTable[BeginQueryIndexed_remap_index] +#define _gloffset_DrawTransformFeedbackStream driDispatchRemapTable[DrawTransformFeedbackStream_remap_index] +#define _gloffset_EndQueryIndexed driDispatchRemapTable[EndQueryIndexed_remap_index] +#define _gloffset_GetQueryIndexediv driDispatchRemapTable[GetQueryIndexediv_remap_index] +#define _gloffset_ClearDepthf driDispatchRemapTable[ClearDepthf_remap_index] +#define _gloffset_DepthRangef driDispatchRemapTable[DepthRangef_remap_index] +#define _gloffset_GetShaderPrecisionFormat driDispatchRemapTable[GetShaderPrecisionFormat_remap_index] +#define _gloffset_ReleaseShaderCompiler driDispatchRemapTable[ReleaseShaderCompiler_remap_index] +#define _gloffset_ShaderBinary driDispatchRemapTable[ShaderBinary_remap_index] +#define _gloffset_GetProgramBinary driDispatchRemapTable[GetProgramBinary_remap_index] +#define _gloffset_ProgramBinary driDispatchRemapTable[ProgramBinary_remap_index] +#define _gloffset_ProgramParameteri driDispatchRemapTable[ProgramParameteri_remap_index] +#define _gloffset_DepthRangeArrayv driDispatchRemapTable[DepthRangeArrayv_remap_index] +#define _gloffset_DepthRangeIndexed driDispatchRemapTable[DepthRangeIndexed_remap_index] +#define _gloffset_GetDoublei_v driDispatchRemapTable[GetDoublei_v_remap_index] +#define _gloffset_GetFloati_v driDispatchRemapTable[GetFloati_v_remap_index] +#define _gloffset_ScissorArrayv driDispatchRemapTable[ScissorArrayv_remap_index] +#define _gloffset_ScissorIndexed driDispatchRemapTable[ScissorIndexed_remap_index] +#define _gloffset_ScissorIndexedv driDispatchRemapTable[ScissorIndexedv_remap_index] +#define _gloffset_ViewportArrayv driDispatchRemapTable[ViewportArrayv_remap_index] +#define _gloffset_ViewportIndexedf driDispatchRemapTable[ViewportIndexedf_remap_index] +#define _gloffset_ViewportIndexedfv driDispatchRemapTable[ViewportIndexedfv_remap_index] +#define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index] +#define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index] +#define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index] +#define _gloffset_GetnConvolutionFilterARB driDispatchRemapTable[GetnConvolutionFilterARB_remap_index] +#define _gloffset_GetnHistogramARB driDispatchRemapTable[GetnHistogramARB_remap_index] +#define _gloffset_GetnMapdvARB driDispatchRemapTable[GetnMapdvARB_remap_index] +#define _gloffset_GetnMapfvARB driDispatchRemapTable[GetnMapfvARB_remap_index] +#define _gloffset_GetnMapivARB driDispatchRemapTable[GetnMapivARB_remap_index] +#define _gloffset_GetnMinmaxARB driDispatchRemapTable[GetnMinmaxARB_remap_index] +#define _gloffset_GetnPixelMapfvARB driDispatchRemapTable[GetnPixelMapfvARB_remap_index] +#define _gloffset_GetnPixelMapuivARB driDispatchRemapTable[GetnPixelMapuivARB_remap_index] +#define _gloffset_GetnPixelMapusvARB driDispatchRemapTable[GetnPixelMapusvARB_remap_index] +#define _gloffset_GetnPolygonStippleARB driDispatchRemapTable[GetnPolygonStippleARB_remap_index] +#define _gloffset_GetnSeparableFilterARB driDispatchRemapTable[GetnSeparableFilterARB_remap_index] +#define _gloffset_GetnTexImageARB driDispatchRemapTable[GetnTexImageARB_remap_index] +#define _gloffset_GetnUniformdvARB driDispatchRemapTable[GetnUniformdvARB_remap_index] +#define _gloffset_GetnUniformfvARB driDispatchRemapTable[GetnUniformfvARB_remap_index] +#define _gloffset_GetnUniformivARB driDispatchRemapTable[GetnUniformivARB_remap_index] +#define _gloffset_GetnUniformuivARB driDispatchRemapTable[GetnUniformuivARB_remap_index] +#define _gloffset_ReadnPixelsARB driDispatchRemapTable[ReadnPixelsARB_remap_index] +#define _gloffset_DrawArraysInstancedBaseInstance driDispatchRemapTable[DrawArraysInstancedBaseInstance_remap_index] +#define _gloffset_DrawElementsInstancedBaseInstance driDispatchRemapTable[DrawElementsInstancedBaseInstance_remap_index] +#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance driDispatchRemapTable[DrawElementsInstancedBaseVertexBaseInstance_remap_index] +#define _gloffset_DrawTransformFeedbackInstanced driDispatchRemapTable[DrawTransformFeedbackInstanced_remap_index] +#define _gloffset_DrawTransformFeedbackStreamInstanced driDispatchRemapTable[DrawTransformFeedbackStreamInstanced_remap_index] +#define _gloffset_GetInternalformativ driDispatchRemapTable[GetInternalformativ_remap_index] +#define _gloffset_GetActiveAtomicCounterBufferiv driDispatchRemapTable[GetActiveAtomicCounterBufferiv_remap_index] +#define _gloffset_BindImageTexture driDispatchRemapTable[BindImageTexture_remap_index] +#define _gloffset_MemoryBarrier driDispatchRemapTable[MemoryBarrier_remap_index] +#define _gloffset_TexStorage1D driDispatchRemapTable[TexStorage1D_remap_index] +#define _gloffset_TexStorage2D driDispatchRemapTable[TexStorage2D_remap_index] +#define _gloffset_TexStorage3D driDispatchRemapTable[TexStorage3D_remap_index] +#define _gloffset_TextureStorage1DEXT driDispatchRemapTable[TextureStorage1DEXT_remap_index] +#define _gloffset_TextureStorage2DEXT driDispatchRemapTable[TextureStorage2DEXT_remap_index] +#define _gloffset_TextureStorage3DEXT driDispatchRemapTable[TextureStorage3DEXT_remap_index] +#define _gloffset_ClearBufferData driDispatchRemapTable[ClearBufferData_remap_index] +#define _gloffset_ClearBufferSubData driDispatchRemapTable[ClearBufferSubData_remap_index] +#define _gloffset_DispatchCompute driDispatchRemapTable[DispatchCompute_remap_index] +#define _gloffset_DispatchComputeIndirect driDispatchRemapTable[DispatchComputeIndirect_remap_index] +#define _gloffset_CopyImageSubData driDispatchRemapTable[CopyImageSubData_remap_index] +#define _gloffset_TextureView driDispatchRemapTable[TextureView_remap_index] +#define _gloffset_BindVertexBuffer driDispatchRemapTable[BindVertexBuffer_remap_index] +#define _gloffset_VertexAttribBinding driDispatchRemapTable[VertexAttribBinding_remap_index] +#define _gloffset_VertexAttribFormat driDispatchRemapTable[VertexAttribFormat_remap_index] +#define _gloffset_VertexAttribIFormat driDispatchRemapTable[VertexAttribIFormat_remap_index] +#define _gloffset_VertexAttribLFormat driDispatchRemapTable[VertexAttribLFormat_remap_index] +#define _gloffset_VertexBindingDivisor driDispatchRemapTable[VertexBindingDivisor_remap_index] +#define _gloffset_MultiDrawArraysIndirect driDispatchRemapTable[MultiDrawArraysIndirect_remap_index] +#define _gloffset_MultiDrawElementsIndirect driDispatchRemapTable[MultiDrawElementsIndirect_remap_index] +#define _gloffset_TexBufferRange driDispatchRemapTable[TexBufferRange_remap_index] +#define _gloffset_TexStorage2DMultisample driDispatchRemapTable[TexStorage2DMultisample_remap_index] +#define _gloffset_TexStorage3DMultisample driDispatchRemapTable[TexStorage3DMultisample_remap_index] +#define _gloffset_BufferStorage driDispatchRemapTable[BufferStorage_remap_index] +#define _gloffset_ClearTexImage driDispatchRemapTable[ClearTexImage_remap_index] +#define _gloffset_ClearTexSubImage driDispatchRemapTable[ClearTexSubImage_remap_index] +#define _gloffset_BindBuffersBase driDispatchRemapTable[BindBuffersBase_remap_index] +#define _gloffset_BindBuffersRange driDispatchRemapTable[BindBuffersRange_remap_index] +#define _gloffset_BindImageTextures driDispatchRemapTable[BindImageTextures_remap_index] +#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] +#define _gloffset_InvalidateSubFramebuffer driDispatchRemapTable[InvalidateSubFramebuffer_remap_index] +#define _gloffset_InvalidateTexImage driDispatchRemapTable[InvalidateTexImage_remap_index] +#define _gloffset_InvalidateTexSubImage driDispatchRemapTable[InvalidateTexSubImage_remap_index] +#define _gloffset_PolygonOffsetEXT driDispatchRemapTable[PolygonOffsetEXT_remap_index] +#define _gloffset_DrawTexfOES driDispatchRemapTable[DrawTexfOES_remap_index] +#define _gloffset_DrawTexfvOES driDispatchRemapTable[DrawTexfvOES_remap_index] +#define _gloffset_DrawTexiOES driDispatchRemapTable[DrawTexiOES_remap_index] +#define _gloffset_DrawTexivOES driDispatchRemapTable[DrawTexivOES_remap_index] +#define _gloffset_DrawTexsOES driDispatchRemapTable[DrawTexsOES_remap_index] +#define _gloffset_DrawTexsvOES driDispatchRemapTable[DrawTexsvOES_remap_index] +#define _gloffset_DrawTexxOES driDispatchRemapTable[DrawTexxOES_remap_index] +#define _gloffset_DrawTexxvOES driDispatchRemapTable[DrawTexxvOES_remap_index] +#define _gloffset_PointSizePointerOES driDispatchRemapTable[PointSizePointerOES_remap_index] +#define _gloffset_QueryMatrixxOES driDispatchRemapTable[QueryMatrixxOES_remap_index] +#define _gloffset_SampleMaskSGIS driDispatchRemapTable[SampleMaskSGIS_remap_index] +#define _gloffset_SamplePatternSGIS driDispatchRemapTable[SamplePatternSGIS_remap_index] +#define _gloffset_ColorPointerEXT driDispatchRemapTable[ColorPointerEXT_remap_index] +#define _gloffset_EdgeFlagPointerEXT driDispatchRemapTable[EdgeFlagPointerEXT_remap_index] +#define _gloffset_IndexPointerEXT driDispatchRemapTable[IndexPointerEXT_remap_index] +#define _gloffset_NormalPointerEXT driDispatchRemapTable[NormalPointerEXT_remap_index] +#define _gloffset_TexCoordPointerEXT driDispatchRemapTable[TexCoordPointerEXT_remap_index] +#define _gloffset_VertexPointerEXT driDispatchRemapTable[VertexPointerEXT_remap_index] +#define _gloffset_DiscardFramebufferEXT driDispatchRemapTable[DiscardFramebufferEXT_remap_index] +#define _gloffset_ActiveShaderProgram driDispatchRemapTable[ActiveShaderProgram_remap_index] +#define _gloffset_BindProgramPipeline driDispatchRemapTable[BindProgramPipeline_remap_index] +#define _gloffset_CreateShaderProgramv driDispatchRemapTable[CreateShaderProgramv_remap_index] +#define _gloffset_DeleteProgramPipelines driDispatchRemapTable[DeleteProgramPipelines_remap_index] +#define _gloffset_GenProgramPipelines driDispatchRemapTable[GenProgramPipelines_remap_index] +#define _gloffset_GetProgramPipelineInfoLog driDispatchRemapTable[GetProgramPipelineInfoLog_remap_index] +#define _gloffset_GetProgramPipelineiv driDispatchRemapTable[GetProgramPipelineiv_remap_index] +#define _gloffset_IsProgramPipeline driDispatchRemapTable[IsProgramPipeline_remap_index] +#define _gloffset_LockArraysEXT driDispatchRemapTable[LockArraysEXT_remap_index] +#define _gloffset_ProgramUniform1f driDispatchRemapTable[ProgramUniform1f_remap_index] +#define _gloffset_ProgramUniform1fv driDispatchRemapTable[ProgramUniform1fv_remap_index] +#define _gloffset_ProgramUniform1i driDispatchRemapTable[ProgramUniform1i_remap_index] +#define _gloffset_ProgramUniform1iv driDispatchRemapTable[ProgramUniform1iv_remap_index] +#define _gloffset_ProgramUniform1ui driDispatchRemapTable[ProgramUniform1ui_remap_index] +#define _gloffset_ProgramUniform1uiv driDispatchRemapTable[ProgramUniform1uiv_remap_index] +#define _gloffset_ProgramUniform2f driDispatchRemapTable[ProgramUniform2f_remap_index] +#define _gloffset_ProgramUniform2fv driDispatchRemapTable[ProgramUniform2fv_remap_index] +#define _gloffset_ProgramUniform2i driDispatchRemapTable[ProgramUniform2i_remap_index] +#define _gloffset_ProgramUniform2iv driDispatchRemapTable[ProgramUniform2iv_remap_index] +#define _gloffset_ProgramUniform2ui driDispatchRemapTable[ProgramUniform2ui_remap_index] +#define _gloffset_ProgramUniform2uiv driDispatchRemapTable[ProgramUniform2uiv_remap_index] +#define _gloffset_ProgramUniform3f driDispatchRemapTable[ProgramUniform3f_remap_index] +#define _gloffset_ProgramUniform3fv driDispatchRemapTable[ProgramUniform3fv_remap_index] +#define _gloffset_ProgramUniform3i driDispatchRemapTable[ProgramUniform3i_remap_index] +#define _gloffset_ProgramUniform3iv driDispatchRemapTable[ProgramUniform3iv_remap_index] +#define _gloffset_ProgramUniform3ui driDispatchRemapTable[ProgramUniform3ui_remap_index] +#define _gloffset_ProgramUniform3uiv driDispatchRemapTable[ProgramUniform3uiv_remap_index] +#define _gloffset_ProgramUniform4f driDispatchRemapTable[ProgramUniform4f_remap_index] +#define _gloffset_ProgramUniform4fv driDispatchRemapTable[ProgramUniform4fv_remap_index] +#define _gloffset_ProgramUniform4i driDispatchRemapTable[ProgramUniform4i_remap_index] +#define _gloffset_ProgramUniform4iv driDispatchRemapTable[ProgramUniform4iv_remap_index] +#define _gloffset_ProgramUniform4ui driDispatchRemapTable[ProgramUniform4ui_remap_index] +#define _gloffset_ProgramUniform4uiv driDispatchRemapTable[ProgramUniform4uiv_remap_index] +#define _gloffset_ProgramUniformMatrix2fv driDispatchRemapTable[ProgramUniformMatrix2fv_remap_index] +#define _gloffset_ProgramUniformMatrix2x3fv driDispatchRemapTable[ProgramUniformMatrix2x3fv_remap_index] +#define _gloffset_ProgramUniformMatrix2x4fv driDispatchRemapTable[ProgramUniformMatrix2x4fv_remap_index] +#define _gloffset_ProgramUniformMatrix3fv driDispatchRemapTable[ProgramUniformMatrix3fv_remap_index] +#define _gloffset_ProgramUniformMatrix3x2fv driDispatchRemapTable[ProgramUniformMatrix3x2fv_remap_index] +#define _gloffset_ProgramUniformMatrix3x4fv driDispatchRemapTable[ProgramUniformMatrix3x4fv_remap_index] +#define _gloffset_ProgramUniformMatrix4fv driDispatchRemapTable[ProgramUniformMatrix4fv_remap_index] +#define _gloffset_ProgramUniformMatrix4x2fv driDispatchRemapTable[ProgramUniformMatrix4x2fv_remap_index] +#define _gloffset_ProgramUniformMatrix4x3fv driDispatchRemapTable[ProgramUniformMatrix4x3fv_remap_index] +#define _gloffset_UnlockArraysEXT driDispatchRemapTable[UnlockArraysEXT_remap_index] +#define _gloffset_UseProgramStages driDispatchRemapTable[UseProgramStages_remap_index] +#define _gloffset_ValidateProgramPipeline driDispatchRemapTable[ValidateProgramPipeline_remap_index] +#define _gloffset_DebugMessageCallback driDispatchRemapTable[DebugMessageCallback_remap_index] +#define _gloffset_DebugMessageControl driDispatchRemapTable[DebugMessageControl_remap_index] +#define _gloffset_DebugMessageInsert driDispatchRemapTable[DebugMessageInsert_remap_index] +#define _gloffset_GetDebugMessageLog driDispatchRemapTable[GetDebugMessageLog_remap_index] +#define _gloffset_GetObjectLabel driDispatchRemapTable[GetObjectLabel_remap_index] +#define _gloffset_GetObjectPtrLabel driDispatchRemapTable[GetObjectPtrLabel_remap_index] +#define _gloffset_ObjectLabel driDispatchRemapTable[ObjectLabel_remap_index] +#define _gloffset_ObjectPtrLabel driDispatchRemapTable[ObjectPtrLabel_remap_index] +#define _gloffset_PopDebugGroup driDispatchRemapTable[PopDebugGroup_remap_index] +#define _gloffset_PushDebugGroup driDispatchRemapTable[PushDebugGroup_remap_index] +#define _gloffset_SecondaryColor3fEXT driDispatchRemapTable[SecondaryColor3fEXT_remap_index] +#define _gloffset_SecondaryColor3fvEXT driDispatchRemapTable[SecondaryColor3fvEXT_remap_index] +#define _gloffset_MultiDrawElementsEXT driDispatchRemapTable[MultiDrawElementsEXT_remap_index] +#define _gloffset_FogCoordfEXT driDispatchRemapTable[FogCoordfEXT_remap_index] +#define _gloffset_FogCoordfvEXT driDispatchRemapTable[FogCoordfvEXT_remap_index] +#define _gloffset_ResizeBuffersMESA driDispatchRemapTable[ResizeBuffersMESA_remap_index] +#define _gloffset_WindowPos4dMESA driDispatchRemapTable[WindowPos4dMESA_remap_index] +#define _gloffset_WindowPos4dvMESA driDispatchRemapTable[WindowPos4dvMESA_remap_index] +#define _gloffset_WindowPos4fMESA driDispatchRemapTable[WindowPos4fMESA_remap_index] +#define _gloffset_WindowPos4fvMESA driDispatchRemapTable[WindowPos4fvMESA_remap_index] +#define _gloffset_WindowPos4iMESA driDispatchRemapTable[WindowPos4iMESA_remap_index] +#define _gloffset_WindowPos4ivMESA driDispatchRemapTable[WindowPos4ivMESA_remap_index] +#define _gloffset_WindowPos4sMESA driDispatchRemapTable[WindowPos4sMESA_remap_index] +#define _gloffset_WindowPos4svMESA driDispatchRemapTable[WindowPos4svMESA_remap_index] +#define _gloffset_MultiModeDrawArraysIBM driDispatchRemapTable[MultiModeDrawArraysIBM_remap_index] +#define _gloffset_MultiModeDrawElementsIBM driDispatchRemapTable[MultiModeDrawElementsIBM_remap_index] +#define _gloffset_AreProgramsResidentNV driDispatchRemapTable[AreProgramsResidentNV_remap_index] +#define _gloffset_ExecuteProgramNV driDispatchRemapTable[ExecuteProgramNV_remap_index] +#define _gloffset_GetProgramParameterdvNV driDispatchRemapTable[GetProgramParameterdvNV_remap_index] +#define _gloffset_GetProgramParameterfvNV driDispatchRemapTable[GetProgramParameterfvNV_remap_index] +#define _gloffset_GetProgramStringNV driDispatchRemapTable[GetProgramStringNV_remap_index] +#define _gloffset_GetProgramivNV driDispatchRemapTable[GetProgramivNV_remap_index] +#define _gloffset_GetTrackMatrixivNV driDispatchRemapTable[GetTrackMatrixivNV_remap_index] +#define _gloffset_GetVertexAttribdvNV driDispatchRemapTable[GetVertexAttribdvNV_remap_index] +#define _gloffset_GetVertexAttribfvNV driDispatchRemapTable[GetVertexAttribfvNV_remap_index] +#define _gloffset_GetVertexAttribivNV driDispatchRemapTable[GetVertexAttribivNV_remap_index] +#define _gloffset_LoadProgramNV driDispatchRemapTable[LoadProgramNV_remap_index] +#define _gloffset_ProgramParameters4dvNV driDispatchRemapTable[ProgramParameters4dvNV_remap_index] +#define _gloffset_ProgramParameters4fvNV driDispatchRemapTable[ProgramParameters4fvNV_remap_index] +#define _gloffset_RequestResidentProgramsNV driDispatchRemapTable[RequestResidentProgramsNV_remap_index] +#define _gloffset_TrackMatrixNV driDispatchRemapTable[TrackMatrixNV_remap_index] +#define _gloffset_VertexAttrib1dNV driDispatchRemapTable[VertexAttrib1dNV_remap_index] +#define _gloffset_VertexAttrib1dvNV driDispatchRemapTable[VertexAttrib1dvNV_remap_index] +#define _gloffset_VertexAttrib1fNV driDispatchRemapTable[VertexAttrib1fNV_remap_index] +#define _gloffset_VertexAttrib1fvNV driDispatchRemapTable[VertexAttrib1fvNV_remap_index] +#define _gloffset_VertexAttrib1sNV driDispatchRemapTable[VertexAttrib1sNV_remap_index] +#define _gloffset_VertexAttrib1svNV driDispatchRemapTable[VertexAttrib1svNV_remap_index] +#define _gloffset_VertexAttrib2dNV driDispatchRemapTable[VertexAttrib2dNV_remap_index] +#define _gloffset_VertexAttrib2dvNV driDispatchRemapTable[VertexAttrib2dvNV_remap_index] +#define _gloffset_VertexAttrib2fNV driDispatchRemapTable[VertexAttrib2fNV_remap_index] +#define _gloffset_VertexAttrib2fvNV driDispatchRemapTable[VertexAttrib2fvNV_remap_index] +#define _gloffset_VertexAttrib2sNV driDispatchRemapTable[VertexAttrib2sNV_remap_index] +#define _gloffset_VertexAttrib2svNV driDispatchRemapTable[VertexAttrib2svNV_remap_index] +#define _gloffset_VertexAttrib3dNV driDispatchRemapTable[VertexAttrib3dNV_remap_index] +#define _gloffset_VertexAttrib3dvNV driDispatchRemapTable[VertexAttrib3dvNV_remap_index] +#define _gloffset_VertexAttrib3fNV driDispatchRemapTable[VertexAttrib3fNV_remap_index] +#define _gloffset_VertexAttrib3fvNV driDispatchRemapTable[VertexAttrib3fvNV_remap_index] +#define _gloffset_VertexAttrib3sNV driDispatchRemapTable[VertexAttrib3sNV_remap_index] +#define _gloffset_VertexAttrib3svNV driDispatchRemapTable[VertexAttrib3svNV_remap_index] +#define _gloffset_VertexAttrib4dNV driDispatchRemapTable[VertexAttrib4dNV_remap_index] +#define _gloffset_VertexAttrib4dvNV driDispatchRemapTable[VertexAttrib4dvNV_remap_index] +#define _gloffset_VertexAttrib4fNV driDispatchRemapTable[VertexAttrib4fNV_remap_index] +#define _gloffset_VertexAttrib4fvNV driDispatchRemapTable[VertexAttrib4fvNV_remap_index] +#define _gloffset_VertexAttrib4sNV driDispatchRemapTable[VertexAttrib4sNV_remap_index] +#define _gloffset_VertexAttrib4svNV driDispatchRemapTable[VertexAttrib4svNV_remap_index] +#define _gloffset_VertexAttrib4ubNV driDispatchRemapTable[VertexAttrib4ubNV_remap_index] +#define _gloffset_VertexAttrib4ubvNV driDispatchRemapTable[VertexAttrib4ubvNV_remap_index] +#define _gloffset_VertexAttribPointerNV driDispatchRemapTable[VertexAttribPointerNV_remap_index] +#define _gloffset_VertexAttribs1dvNV driDispatchRemapTable[VertexAttribs1dvNV_remap_index] +#define _gloffset_VertexAttribs1fvNV driDispatchRemapTable[VertexAttribs1fvNV_remap_index] +#define _gloffset_VertexAttribs1svNV driDispatchRemapTable[VertexAttribs1svNV_remap_index] +#define _gloffset_VertexAttribs2dvNV driDispatchRemapTable[VertexAttribs2dvNV_remap_index] +#define _gloffset_VertexAttribs2fvNV driDispatchRemapTable[VertexAttribs2fvNV_remap_index] +#define _gloffset_VertexAttribs2svNV driDispatchRemapTable[VertexAttribs2svNV_remap_index] +#define _gloffset_VertexAttribs3dvNV driDispatchRemapTable[VertexAttribs3dvNV_remap_index] +#define _gloffset_VertexAttribs3fvNV driDispatchRemapTable[VertexAttribs3fvNV_remap_index] +#define _gloffset_VertexAttribs3svNV driDispatchRemapTable[VertexAttribs3svNV_remap_index] +#define _gloffset_VertexAttribs4dvNV driDispatchRemapTable[VertexAttribs4dvNV_remap_index] +#define _gloffset_VertexAttribs4fvNV driDispatchRemapTable[VertexAttribs4fvNV_remap_index] +#define _gloffset_VertexAttribs4svNV driDispatchRemapTable[VertexAttribs4svNV_remap_index] +#define _gloffset_VertexAttribs4ubvNV driDispatchRemapTable[VertexAttribs4ubvNV_remap_index] +#define _gloffset_GetTexBumpParameterfvATI driDispatchRemapTable[GetTexBumpParameterfvATI_remap_index] +#define _gloffset_GetTexBumpParameterivATI driDispatchRemapTable[GetTexBumpParameterivATI_remap_index] +#define _gloffset_TexBumpParameterfvATI driDispatchRemapTable[TexBumpParameterfvATI_remap_index] +#define _gloffset_TexBumpParameterivATI driDispatchRemapTable[TexBumpParameterivATI_remap_index] +#define _gloffset_AlphaFragmentOp1ATI driDispatchRemapTable[AlphaFragmentOp1ATI_remap_index] +#define _gloffset_AlphaFragmentOp2ATI driDispatchRemapTable[AlphaFragmentOp2ATI_remap_index] +#define _gloffset_AlphaFragmentOp3ATI driDispatchRemapTable[AlphaFragmentOp3ATI_remap_index] +#define _gloffset_BeginFragmentShaderATI driDispatchRemapTable[BeginFragmentShaderATI_remap_index] +#define _gloffset_BindFragmentShaderATI driDispatchRemapTable[BindFragmentShaderATI_remap_index] +#define _gloffset_ColorFragmentOp1ATI driDispatchRemapTable[ColorFragmentOp1ATI_remap_index] +#define _gloffset_ColorFragmentOp2ATI driDispatchRemapTable[ColorFragmentOp2ATI_remap_index] +#define _gloffset_ColorFragmentOp3ATI driDispatchRemapTable[ColorFragmentOp3ATI_remap_index] +#define _gloffset_DeleteFragmentShaderATI driDispatchRemapTable[DeleteFragmentShaderATI_remap_index] +#define _gloffset_EndFragmentShaderATI driDispatchRemapTable[EndFragmentShaderATI_remap_index] +#define _gloffset_GenFragmentShadersATI driDispatchRemapTable[GenFragmentShadersATI_remap_index] +#define _gloffset_PassTexCoordATI driDispatchRemapTable[PassTexCoordATI_remap_index] +#define _gloffset_SampleMapATI driDispatchRemapTable[SampleMapATI_remap_index] +#define _gloffset_SetFragmentShaderConstantATI driDispatchRemapTable[SetFragmentShaderConstantATI_remap_index] +#define _gloffset_ActiveStencilFaceEXT driDispatchRemapTable[ActiveStencilFaceEXT_remap_index] +#define _gloffset_BindVertexArrayAPPLE driDispatchRemapTable[BindVertexArrayAPPLE_remap_index] +#define _gloffset_GenVertexArraysAPPLE driDispatchRemapTable[GenVertexArraysAPPLE_remap_index] +#define _gloffset_GetProgramNamedParameterdvNV driDispatchRemapTable[GetProgramNamedParameterdvNV_remap_index] +#define _gloffset_GetProgramNamedParameterfvNV driDispatchRemapTable[GetProgramNamedParameterfvNV_remap_index] +#define _gloffset_ProgramNamedParameter4dNV driDispatchRemapTable[ProgramNamedParameter4dNV_remap_index] +#define _gloffset_ProgramNamedParameter4dvNV driDispatchRemapTable[ProgramNamedParameter4dvNV_remap_index] +#define _gloffset_ProgramNamedParameter4fNV driDispatchRemapTable[ProgramNamedParameter4fNV_remap_index] +#define _gloffset_ProgramNamedParameter4fvNV driDispatchRemapTable[ProgramNamedParameter4fvNV_remap_index] +#define _gloffset_PrimitiveRestartNV driDispatchRemapTable[PrimitiveRestartNV_remap_index] +#define _gloffset_GetTexGenxvOES driDispatchRemapTable[GetTexGenxvOES_remap_index] +#define _gloffset_TexGenxOES driDispatchRemapTable[TexGenxOES_remap_index] +#define _gloffset_TexGenxvOES driDispatchRemapTable[TexGenxvOES_remap_index] +#define _gloffset_DepthBoundsEXT driDispatchRemapTable[DepthBoundsEXT_remap_index] +#define _gloffset_BindFramebufferEXT driDispatchRemapTable[BindFramebufferEXT_remap_index] +#define _gloffset_BindRenderbufferEXT driDispatchRemapTable[BindRenderbufferEXT_remap_index] +#define _gloffset_BufferParameteriAPPLE driDispatchRemapTable[BufferParameteriAPPLE_remap_index] +#define _gloffset_FlushMappedBufferRangeAPPLE driDispatchRemapTable[FlushMappedBufferRangeAPPLE_remap_index] +#define _gloffset_VertexAttribI1iEXT driDispatchRemapTable[VertexAttribI1iEXT_remap_index] +#define _gloffset_VertexAttribI1uiEXT driDispatchRemapTable[VertexAttribI1uiEXT_remap_index] +#define _gloffset_VertexAttribI2iEXT driDispatchRemapTable[VertexAttribI2iEXT_remap_index] +#define _gloffset_VertexAttribI2ivEXT driDispatchRemapTable[VertexAttribI2ivEXT_remap_index] +#define _gloffset_VertexAttribI2uiEXT driDispatchRemapTable[VertexAttribI2uiEXT_remap_index] +#define _gloffset_VertexAttribI2uivEXT driDispatchRemapTable[VertexAttribI2uivEXT_remap_index] +#define _gloffset_VertexAttribI3iEXT driDispatchRemapTable[VertexAttribI3iEXT_remap_index] +#define _gloffset_VertexAttribI3ivEXT driDispatchRemapTable[VertexAttribI3ivEXT_remap_index] +#define _gloffset_VertexAttribI3uiEXT driDispatchRemapTable[VertexAttribI3uiEXT_remap_index] +#define _gloffset_VertexAttribI3uivEXT driDispatchRemapTable[VertexAttribI3uivEXT_remap_index] +#define _gloffset_VertexAttribI4iEXT driDispatchRemapTable[VertexAttribI4iEXT_remap_index] +#define _gloffset_VertexAttribI4ivEXT driDispatchRemapTable[VertexAttribI4ivEXT_remap_index] +#define _gloffset_VertexAttribI4uiEXT driDispatchRemapTable[VertexAttribI4uiEXT_remap_index] +#define _gloffset_VertexAttribI4uivEXT driDispatchRemapTable[VertexAttribI4uivEXT_remap_index] +#define _gloffset_ClearColorIiEXT driDispatchRemapTable[ClearColorIiEXT_remap_index] +#define _gloffset_ClearColorIuiEXT driDispatchRemapTable[ClearColorIuiEXT_remap_index] +#define _gloffset_BindBufferOffsetEXT driDispatchRemapTable[BindBufferOffsetEXT_remap_index] +#define _gloffset_BeginPerfMonitorAMD driDispatchRemapTable[BeginPerfMonitorAMD_remap_index] +#define _gloffset_DeletePerfMonitorsAMD driDispatchRemapTable[DeletePerfMonitorsAMD_remap_index] +#define _gloffset_EndPerfMonitorAMD driDispatchRemapTable[EndPerfMonitorAMD_remap_index] +#define _gloffset_GenPerfMonitorsAMD driDispatchRemapTable[GenPerfMonitorsAMD_remap_index] +#define _gloffset_GetPerfMonitorCounterDataAMD driDispatchRemapTable[GetPerfMonitorCounterDataAMD_remap_index] +#define _gloffset_GetPerfMonitorCounterInfoAMD driDispatchRemapTable[GetPerfMonitorCounterInfoAMD_remap_index] +#define _gloffset_GetPerfMonitorCounterStringAMD driDispatchRemapTable[GetPerfMonitorCounterStringAMD_remap_index] +#define _gloffset_GetPerfMonitorCountersAMD driDispatchRemapTable[GetPerfMonitorCountersAMD_remap_index] +#define _gloffset_GetPerfMonitorGroupStringAMD driDispatchRemapTable[GetPerfMonitorGroupStringAMD_remap_index] +#define _gloffset_GetPerfMonitorGroupsAMD driDispatchRemapTable[GetPerfMonitorGroupsAMD_remap_index] +#define _gloffset_SelectPerfMonitorCountersAMD driDispatchRemapTable[SelectPerfMonitorCountersAMD_remap_index] +#define _gloffset_GetObjectParameterivAPPLE driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index] +#define _gloffset_ObjectPurgeableAPPLE driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index] +#define _gloffset_ObjectUnpurgeableAPPLE driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index] +#define _gloffset_ActiveProgramEXT driDispatchRemapTable[ActiveProgramEXT_remap_index] +#define _gloffset_CreateShaderProgramEXT driDispatchRemapTable[CreateShaderProgramEXT_remap_index] +#define _gloffset_UseShaderProgramEXT driDispatchRemapTable[UseShaderProgramEXT_remap_index] +#define _gloffset_TextureBarrierNV driDispatchRemapTable[TextureBarrierNV_remap_index] +#define _gloffset_VDPAUFiniNV driDispatchRemapTable[VDPAUFiniNV_remap_index] +#define _gloffset_VDPAUGetSurfaceivNV driDispatchRemapTable[VDPAUGetSurfaceivNV_remap_index] +#define _gloffset_VDPAUInitNV driDispatchRemapTable[VDPAUInitNV_remap_index] +#define _gloffset_VDPAUIsSurfaceNV driDispatchRemapTable[VDPAUIsSurfaceNV_remap_index] +#define _gloffset_VDPAUMapSurfacesNV driDispatchRemapTable[VDPAUMapSurfacesNV_remap_index] +#define _gloffset_VDPAURegisterOutputSurfaceNV driDispatchRemapTable[VDPAURegisterOutputSurfaceNV_remap_index] +#define _gloffset_VDPAURegisterVideoSurfaceNV driDispatchRemapTable[VDPAURegisterVideoSurfaceNV_remap_index] +#define _gloffset_VDPAUSurfaceAccessNV driDispatchRemapTable[VDPAUSurfaceAccessNV_remap_index] +#define _gloffset_VDPAUUnmapSurfacesNV driDispatchRemapTable[VDPAUUnmapSurfacesNV_remap_index] +#define _gloffset_VDPAUUnregisterSurfaceNV driDispatchRemapTable[VDPAUUnregisterSurfaceNV_remap_index] +#define _gloffset_BeginPerfQueryINTEL driDispatchRemapTable[BeginPerfQueryINTEL_remap_index] +#define _gloffset_CreatePerfQueryINTEL driDispatchRemapTable[CreatePerfQueryINTEL_remap_index] +#define _gloffset_DeletePerfQueryINTEL driDispatchRemapTable[DeletePerfQueryINTEL_remap_index] +#define _gloffset_EndPerfQueryINTEL driDispatchRemapTable[EndPerfQueryINTEL_remap_index] +#define _gloffset_GetFirstPerfQueryIdINTEL driDispatchRemapTable[GetFirstPerfQueryIdINTEL_remap_index] +#define _gloffset_GetNextPerfQueryIdINTEL driDispatchRemapTable[GetNextPerfQueryIdINTEL_remap_index] +#define _gloffset_GetPerfCounterInfoINTEL driDispatchRemapTable[GetPerfCounterInfoINTEL_remap_index] +#define _gloffset_GetPerfQueryDataINTEL driDispatchRemapTable[GetPerfQueryDataINTEL_remap_index] +#define _gloffset_GetPerfQueryIdByNameINTEL driDispatchRemapTable[GetPerfQueryIdByNameINTEL_remap_index] +#define _gloffset_GetPerfQueryInfoINTEL driDispatchRemapTable[GetPerfQueryInfoINTEL_remap_index] +#define _gloffset_StencilFuncSeparateATI driDispatchRemapTable[StencilFuncSeparateATI_remap_index] +#define _gloffset_ProgramEnvParameters4fvEXT driDispatchRemapTable[ProgramEnvParameters4fvEXT_remap_index] +#define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index] +#define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index] +#define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index] +#define _gloffset_AlphaFuncx driDispatchRemapTable[AlphaFuncx_remap_index] +#define _gloffset_ClearColorx driDispatchRemapTable[ClearColorx_remap_index] +#define _gloffset_ClearDepthx driDispatchRemapTable[ClearDepthx_remap_index] +#define _gloffset_Color4x driDispatchRemapTable[Color4x_remap_index] +#define _gloffset_DepthRangex driDispatchRemapTable[DepthRangex_remap_index] +#define _gloffset_Fogx driDispatchRemapTable[Fogx_remap_index] +#define _gloffset_Fogxv driDispatchRemapTable[Fogxv_remap_index] +#define _gloffset_Frustumf driDispatchRemapTable[Frustumf_remap_index] +#define _gloffset_Frustumx driDispatchRemapTable[Frustumx_remap_index] +#define _gloffset_LightModelx driDispatchRemapTable[LightModelx_remap_index] +#define _gloffset_LightModelxv driDispatchRemapTable[LightModelxv_remap_index] +#define _gloffset_Lightx driDispatchRemapTable[Lightx_remap_index] +#define _gloffset_Lightxv driDispatchRemapTable[Lightxv_remap_index] +#define _gloffset_LineWidthx driDispatchRemapTable[LineWidthx_remap_index] +#define _gloffset_LoadMatrixx driDispatchRemapTable[LoadMatrixx_remap_index] +#define _gloffset_Materialx driDispatchRemapTable[Materialx_remap_index] +#define _gloffset_Materialxv driDispatchRemapTable[Materialxv_remap_index] +#define _gloffset_MultMatrixx driDispatchRemapTable[MultMatrixx_remap_index] +#define _gloffset_MultiTexCoord4x driDispatchRemapTable[MultiTexCoord4x_remap_index] +#define _gloffset_Normal3x driDispatchRemapTable[Normal3x_remap_index] +#define _gloffset_Orthof driDispatchRemapTable[Orthof_remap_index] +#define _gloffset_Orthox driDispatchRemapTable[Orthox_remap_index] +#define _gloffset_PointSizex driDispatchRemapTable[PointSizex_remap_index] +#define _gloffset_PolygonOffsetx driDispatchRemapTable[PolygonOffsetx_remap_index] +#define _gloffset_Rotatex driDispatchRemapTable[Rotatex_remap_index] +#define _gloffset_SampleCoveragex driDispatchRemapTable[SampleCoveragex_remap_index] +#define _gloffset_Scalex driDispatchRemapTable[Scalex_remap_index] +#define _gloffset_TexEnvx driDispatchRemapTable[TexEnvx_remap_index] +#define _gloffset_TexEnvxv driDispatchRemapTable[TexEnvxv_remap_index] +#define _gloffset_TexParameterx driDispatchRemapTable[TexParameterx_remap_index] +#define _gloffset_Translatex driDispatchRemapTable[Translatex_remap_index] +#define _gloffset_ClipPlanef driDispatchRemapTable[ClipPlanef_remap_index] +#define _gloffset_ClipPlanex driDispatchRemapTable[ClipPlanex_remap_index] +#define _gloffset_GetClipPlanef driDispatchRemapTable[GetClipPlanef_remap_index] +#define _gloffset_GetClipPlanex driDispatchRemapTable[GetClipPlanex_remap_index] +#define _gloffset_GetFixedv driDispatchRemapTable[GetFixedv_remap_index] +#define _gloffset_GetLightxv driDispatchRemapTable[GetLightxv_remap_index] +#define _gloffset_GetMaterialxv driDispatchRemapTable[GetMaterialxv_remap_index] +#define _gloffset_GetTexEnvxv driDispatchRemapTable[GetTexEnvxv_remap_index] +#define _gloffset_GetTexParameterxv driDispatchRemapTable[GetTexParameterxv_remap_index] +#define _gloffset_PointParameterx driDispatchRemapTable[PointParameterx_remap_index] +#define _gloffset_PointParameterxv driDispatchRemapTable[PointParameterxv_remap_index] +#define _gloffset_TexParameterxv driDispatchRemapTable[TexParameterxv_remap_index] + +typedef void (GLAPIENTRYP _glptr_NewList)(GLuint, GLenum); +#define CALL_NewList(disp, parameters) \ + (* GET_NewList(disp)) parameters +static INLINE _glptr_NewList GET_NewList(struct _glapi_table *disp) { + return (_glptr_NewList) (GET_by_offset(disp, _gloffset_NewList)); +} + +static INLINE void SET_NewList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_NewList, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndList)(void); +#define CALL_EndList(disp, parameters) \ + (* GET_EndList(disp)) parameters +static INLINE _glptr_EndList GET_EndList(struct _glapi_table *disp) { + return (_glptr_EndList) (GET_by_offset(disp, _gloffset_EndList)); +} + +static INLINE void SET_EndList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_EndList, fn); +} + +typedef void (GLAPIENTRYP _glptr_CallList)(GLuint); +#define CALL_CallList(disp, parameters) \ + (* GET_CallList(disp)) parameters +static INLINE _glptr_CallList GET_CallList(struct _glapi_table *disp) { + return (_glptr_CallList) (GET_by_offset(disp, _gloffset_CallList)); +} + +static INLINE void SET_CallList(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_CallList, fn); +} + +typedef void (GLAPIENTRYP _glptr_CallLists)(GLsizei, GLenum, const GLvoid *); +#define CALL_CallLists(disp, parameters) \ + (* GET_CallLists(disp)) parameters +static INLINE _glptr_CallLists GET_CallLists(struct _glapi_table *disp) { + return (_glptr_CallLists) (GET_by_offset(disp, _gloffset_CallLists)); +} + +static INLINE void SET_CallLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CallLists, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteLists)(GLuint, GLsizei); +#define CALL_DeleteLists(disp, parameters) \ + (* GET_DeleteLists(disp)) parameters +static INLINE _glptr_DeleteLists GET_DeleteLists(struct _glapi_table *disp) { + return (_glptr_DeleteLists) (GET_by_offset(disp, _gloffset_DeleteLists)); +} + +static INLINE void SET_DeleteLists(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei)) { + SET_by_offset(disp, _gloffset_DeleteLists, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_GenLists)(GLsizei); +#define CALL_GenLists(disp, parameters) \ + (* GET_GenLists(disp)) parameters +static INLINE _glptr_GenLists GET_GenLists(struct _glapi_table *disp) { + return (_glptr_GenLists) (GET_by_offset(disp, _gloffset_GenLists)); +} + +static INLINE void SET_GenLists(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLsizei)) { + SET_by_offset(disp, _gloffset_GenLists, fn); +} + +typedef void (GLAPIENTRYP _glptr_ListBase)(GLuint); +#define CALL_ListBase(disp, parameters) \ + (* GET_ListBase(disp)) parameters +static INLINE _glptr_ListBase GET_ListBase(struct _glapi_table *disp) { + return (_glptr_ListBase) (GET_by_offset(disp, _gloffset_ListBase)); +} + +static INLINE void SET_ListBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_ListBase, fn); +} + +typedef void (GLAPIENTRYP _glptr_Begin)(GLenum); +#define CALL_Begin(disp, parameters) \ + (* GET_Begin(disp)) parameters +static INLINE _glptr_Begin GET_Begin(struct _glapi_table *disp) { + return (_glptr_Begin) (GET_by_offset(disp, _gloffset_Begin)); +} + +static INLINE void SET_Begin(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_Begin, fn); +} + +typedef void (GLAPIENTRYP _glptr_Bitmap)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *); +#define CALL_Bitmap(disp, parameters) \ + (* GET_Bitmap(disp)) parameters +static INLINE _glptr_Bitmap GET_Bitmap(struct _glapi_table *disp) { + return (_glptr_Bitmap) (GET_by_offset(disp, _gloffset_Bitmap)); +} + +static INLINE void SET_Bitmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLfloat, GLfloat, GLfloat, GLfloat, const GLubyte *)) { + SET_by_offset(disp, _gloffset_Bitmap, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3b)(GLbyte, GLbyte, GLbyte); +#define CALL_Color3b(disp, parameters) \ + (* GET_Color3b(disp)) parameters +static INLINE _glptr_Color3b GET_Color3b(struct _glapi_table *disp) { + return (_glptr_Color3b) (GET_by_offset(disp, _gloffset_Color3b)); +} + +static INLINE void SET_Color3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) { + SET_by_offset(disp, _gloffset_Color3b, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3bv)(const GLbyte *); +#define CALL_Color3bv(disp, parameters) \ + (* GET_Color3bv(disp)) parameters +static INLINE _glptr_Color3bv GET_Color3bv(struct _glapi_table *disp) { + return (_glptr_Color3bv) (GET_by_offset(disp, _gloffset_Color3bv)); +} + +static INLINE void SET_Color3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) { + SET_by_offset(disp, _gloffset_Color3bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3d)(GLdouble, GLdouble, GLdouble); +#define CALL_Color3d(disp, parameters) \ + (* GET_Color3d(disp)) parameters +static INLINE _glptr_Color3d GET_Color3d(struct _glapi_table *disp) { + return (_glptr_Color3d) (GET_by_offset(disp, _gloffset_Color3d)); +} + +static INLINE void SET_Color3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Color3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3dv)(const GLdouble *); +#define CALL_Color3dv(disp, parameters) \ + (* GET_Color3dv(disp)) parameters +static INLINE _glptr_Color3dv GET_Color3dv(struct _glapi_table *disp) { + return (_glptr_Color3dv) (GET_by_offset(disp, _gloffset_Color3dv)); +} + +static INLINE void SET_Color3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Color3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3f)(GLfloat, GLfloat, GLfloat); +#define CALL_Color3f(disp, parameters) \ + (* GET_Color3f(disp)) parameters +static INLINE _glptr_Color3f GET_Color3f(struct _glapi_table *disp) { + return (_glptr_Color3f) (GET_by_offset(disp, _gloffset_Color3f)); +} + +static INLINE void SET_Color3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Color3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3fv)(const GLfloat *); +#define CALL_Color3fv(disp, parameters) \ + (* GET_Color3fv(disp)) parameters +static INLINE _glptr_Color3fv GET_Color3fv(struct _glapi_table *disp) { + return (_glptr_Color3fv) (GET_by_offset(disp, _gloffset_Color3fv)); +} + +static INLINE void SET_Color3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Color3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3i)(GLint, GLint, GLint); +#define CALL_Color3i(disp, parameters) \ + (* GET_Color3i(disp)) parameters +static INLINE _glptr_Color3i GET_Color3i(struct _glapi_table *disp) { + return (_glptr_Color3i) (GET_by_offset(disp, _gloffset_Color3i)); +} + +static INLINE void SET_Color3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Color3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3iv)(const GLint *); +#define CALL_Color3iv(disp, parameters) \ + (* GET_Color3iv(disp)) parameters +static INLINE _glptr_Color3iv GET_Color3iv(struct _glapi_table *disp) { + return (_glptr_Color3iv) (GET_by_offset(disp, _gloffset_Color3iv)); +} + +static INLINE void SET_Color3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Color3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3s)(GLshort, GLshort, GLshort); +#define CALL_Color3s(disp, parameters) \ + (* GET_Color3s(disp)) parameters +static INLINE _glptr_Color3s GET_Color3s(struct _glapi_table *disp) { + return (_glptr_Color3s) (GET_by_offset(disp, _gloffset_Color3s)); +} + +static INLINE void SET_Color3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Color3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3sv)(const GLshort *); +#define CALL_Color3sv(disp, parameters) \ + (* GET_Color3sv(disp)) parameters +static INLINE _glptr_Color3sv GET_Color3sv(struct _glapi_table *disp) { + return (_glptr_Color3sv) (GET_by_offset(disp, _gloffset_Color3sv)); +} + +static INLINE void SET_Color3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Color3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3ub)(GLubyte, GLubyte, GLubyte); +#define CALL_Color3ub(disp, parameters) \ + (* GET_Color3ub(disp)) parameters +static INLINE _glptr_Color3ub GET_Color3ub(struct _glapi_table *disp) { + return (_glptr_Color3ub) (GET_by_offset(disp, _gloffset_Color3ub)); +} + +static INLINE void SET_Color3ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) { + SET_by_offset(disp, _gloffset_Color3ub, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3ubv)(const GLubyte *); +#define CALL_Color3ubv(disp, parameters) \ + (* GET_Color3ubv(disp)) parameters +static INLINE _glptr_Color3ubv GET_Color3ubv(struct _glapi_table *disp) { + return (_glptr_Color3ubv) (GET_by_offset(disp, _gloffset_Color3ubv)); +} + +static INLINE void SET_Color3ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) { + SET_by_offset(disp, _gloffset_Color3ubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3ui)(GLuint, GLuint, GLuint); +#define CALL_Color3ui(disp, parameters) \ + (* GET_Color3ui(disp)) parameters +static INLINE _glptr_Color3ui GET_Color3ui(struct _glapi_table *disp) { + return (_glptr_Color3ui) (GET_by_offset(disp, _gloffset_Color3ui)); +} + +static INLINE void SET_Color3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_Color3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3uiv)(const GLuint *); +#define CALL_Color3uiv(disp, parameters) \ + (* GET_Color3uiv(disp)) parameters +static INLINE _glptr_Color3uiv GET_Color3uiv(struct _glapi_table *disp) { + return (_glptr_Color3uiv) (GET_by_offset(disp, _gloffset_Color3uiv)); +} + +static INLINE void SET_Color3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) { + SET_by_offset(disp, _gloffset_Color3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3us)(GLushort, GLushort, GLushort); +#define CALL_Color3us(disp, parameters) \ + (* GET_Color3us(disp)) parameters +static INLINE _glptr_Color3us GET_Color3us(struct _glapi_table *disp) { + return (_glptr_Color3us) (GET_by_offset(disp, _gloffset_Color3us)); +} + +static INLINE void SET_Color3us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) { + SET_by_offset(disp, _gloffset_Color3us, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color3usv)(const GLushort *); +#define CALL_Color3usv(disp, parameters) \ + (* GET_Color3usv(disp)) parameters +static INLINE _glptr_Color3usv GET_Color3usv(struct _glapi_table *disp) { + return (_glptr_Color3usv) (GET_by_offset(disp, _gloffset_Color3usv)); +} + +static INLINE void SET_Color3usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) { + SET_by_offset(disp, _gloffset_Color3usv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4b)(GLbyte, GLbyte, GLbyte, GLbyte); +#define CALL_Color4b(disp, parameters) \ + (* GET_Color4b(disp)) parameters +static INLINE _glptr_Color4b GET_Color4b(struct _glapi_table *disp) { + return (_glptr_Color4b) (GET_by_offset(disp, _gloffset_Color4b)); +} + +static INLINE void SET_Color4b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte, GLbyte)) { + SET_by_offset(disp, _gloffset_Color4b, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4bv)(const GLbyte *); +#define CALL_Color4bv(disp, parameters) \ + (* GET_Color4bv(disp)) parameters +static INLINE _glptr_Color4bv GET_Color4bv(struct _glapi_table *disp) { + return (_glptr_Color4bv) (GET_by_offset(disp, _gloffset_Color4bv)); +} + +static INLINE void SET_Color4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) { + SET_by_offset(disp, _gloffset_Color4bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4d)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Color4d(disp, parameters) \ + (* GET_Color4d(disp)) parameters +static INLINE _glptr_Color4d GET_Color4d(struct _glapi_table *disp) { + return (_glptr_Color4d) (GET_by_offset(disp, _gloffset_Color4d)); +} + +static INLINE void SET_Color4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Color4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4dv)(const GLdouble *); +#define CALL_Color4dv(disp, parameters) \ + (* GET_Color4dv(disp)) parameters +static INLINE _glptr_Color4dv GET_Color4dv(struct _glapi_table *disp) { + return (_glptr_Color4dv) (GET_by_offset(disp, _gloffset_Color4dv)); +} + +static INLINE void SET_Color4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Color4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4f)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Color4f(disp, parameters) \ + (* GET_Color4f(disp)) parameters +static INLINE _glptr_Color4f GET_Color4f(struct _glapi_table *disp) { + return (_glptr_Color4f) (GET_by_offset(disp, _gloffset_Color4f)); +} + +static INLINE void SET_Color4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Color4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4fv)(const GLfloat *); +#define CALL_Color4fv(disp, parameters) \ + (* GET_Color4fv(disp)) parameters +static INLINE _glptr_Color4fv GET_Color4fv(struct _glapi_table *disp) { + return (_glptr_Color4fv) (GET_by_offset(disp, _gloffset_Color4fv)); +} + +static INLINE void SET_Color4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Color4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4i)(GLint, GLint, GLint, GLint); +#define CALL_Color4i(disp, parameters) \ + (* GET_Color4i(disp)) parameters +static INLINE _glptr_Color4i GET_Color4i(struct _glapi_table *disp) { + return (_glptr_Color4i) (GET_by_offset(disp, _gloffset_Color4i)); +} + +static INLINE void SET_Color4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Color4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4iv)(const GLint *); +#define CALL_Color4iv(disp, parameters) \ + (* GET_Color4iv(disp)) parameters +static INLINE _glptr_Color4iv GET_Color4iv(struct _glapi_table *disp) { + return (_glptr_Color4iv) (GET_by_offset(disp, _gloffset_Color4iv)); +} + +static INLINE void SET_Color4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Color4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4s)(GLshort, GLshort, GLshort, GLshort); +#define CALL_Color4s(disp, parameters) \ + (* GET_Color4s(disp)) parameters +static INLINE _glptr_Color4s GET_Color4s(struct _glapi_table *disp) { + return (_glptr_Color4s) (GET_by_offset(disp, _gloffset_Color4s)); +} + +static INLINE void SET_Color4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Color4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4sv)(const GLshort *); +#define CALL_Color4sv(disp, parameters) \ + (* GET_Color4sv(disp)) parameters +static INLINE _glptr_Color4sv GET_Color4sv(struct _glapi_table *disp) { + return (_glptr_Color4sv) (GET_by_offset(disp, _gloffset_Color4sv)); +} + +static INLINE void SET_Color4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Color4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte); +#define CALL_Color4ub(disp, parameters) \ + (* GET_Color4ub(disp)) parameters +static INLINE _glptr_Color4ub GET_Color4ub(struct _glapi_table *disp) { + return (_glptr_Color4ub) (GET_by_offset(disp, _gloffset_Color4ub)); +} + +static INLINE void SET_Color4ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte, GLubyte)) { + SET_by_offset(disp, _gloffset_Color4ub, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4ubv)(const GLubyte *); +#define CALL_Color4ubv(disp, parameters) \ + (* GET_Color4ubv(disp)) parameters +static INLINE _glptr_Color4ubv GET_Color4ubv(struct _glapi_table *disp) { + return (_glptr_Color4ubv) (GET_by_offset(disp, _gloffset_Color4ubv)); +} + +static INLINE void SET_Color4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) { + SET_by_offset(disp, _gloffset_Color4ubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4ui)(GLuint, GLuint, GLuint, GLuint); +#define CALL_Color4ui(disp, parameters) \ + (* GET_Color4ui(disp)) parameters +static INLINE _glptr_Color4ui GET_Color4ui(struct _glapi_table *disp) { + return (_glptr_Color4ui) (GET_by_offset(disp, _gloffset_Color4ui)); +} + +static INLINE void SET_Color4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_Color4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4uiv)(const GLuint *); +#define CALL_Color4uiv(disp, parameters) \ + (* GET_Color4uiv(disp)) parameters +static INLINE _glptr_Color4uiv GET_Color4uiv(struct _glapi_table *disp) { + return (_glptr_Color4uiv) (GET_by_offset(disp, _gloffset_Color4uiv)); +} + +static INLINE void SET_Color4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) { + SET_by_offset(disp, _gloffset_Color4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4us)(GLushort, GLushort, GLushort, GLushort); +#define CALL_Color4us(disp, parameters) \ + (* GET_Color4us(disp)) parameters +static INLINE _glptr_Color4us GET_Color4us(struct _glapi_table *disp) { + return (_glptr_Color4us) (GET_by_offset(disp, _gloffset_Color4us)); +} + +static INLINE void SET_Color4us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort, GLushort)) { + SET_by_offset(disp, _gloffset_Color4us, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4usv)(const GLushort *); +#define CALL_Color4usv(disp, parameters) \ + (* GET_Color4usv(disp)) parameters +static INLINE _glptr_Color4usv GET_Color4usv(struct _glapi_table *disp) { + return (_glptr_Color4usv) (GET_by_offset(disp, _gloffset_Color4usv)); +} + +static INLINE void SET_Color4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) { + SET_by_offset(disp, _gloffset_Color4usv, fn); +} + +typedef void (GLAPIENTRYP _glptr_EdgeFlag)(GLboolean); +#define CALL_EdgeFlag(disp, parameters) \ + (* GET_EdgeFlag(disp)) parameters +static INLINE _glptr_EdgeFlag GET_EdgeFlag(struct _glapi_table *disp) { + return (_glptr_EdgeFlag) (GET_by_offset(disp, _gloffset_EdgeFlag)); +} + +static INLINE void SET_EdgeFlag(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) { + SET_by_offset(disp, _gloffset_EdgeFlag, fn); +} + +typedef void (GLAPIENTRYP _glptr_EdgeFlagv)(const GLboolean *); +#define CALL_EdgeFlagv(disp, parameters) \ + (* GET_EdgeFlagv(disp)) parameters +static INLINE _glptr_EdgeFlagv GET_EdgeFlagv(struct _glapi_table *disp) { + return (_glptr_EdgeFlagv) (GET_by_offset(disp, _gloffset_EdgeFlagv)); +} + +static INLINE void SET_EdgeFlagv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLboolean *)) { + SET_by_offset(disp, _gloffset_EdgeFlagv, fn); +} + +typedef void (GLAPIENTRYP _glptr_End)(void); +#define CALL_End(disp, parameters) \ + (* GET_End(disp)) parameters +static INLINE _glptr_End GET_End(struct _glapi_table *disp) { + return (_glptr_End) (GET_by_offset(disp, _gloffset_End)); +} + +static INLINE void SET_End(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_End, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexd)(GLdouble); +#define CALL_Indexd(disp, parameters) \ + (* GET_Indexd(disp)) parameters +static INLINE _glptr_Indexd GET_Indexd(struct _glapi_table *disp) { + return (_glptr_Indexd) (GET_by_offset(disp, _gloffset_Indexd)); +} + +static INLINE void SET_Indexd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) { + SET_by_offset(disp, _gloffset_Indexd, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexdv)(const GLdouble *); +#define CALL_Indexdv(disp, parameters) \ + (* GET_Indexdv(disp)) parameters +static INLINE _glptr_Indexdv GET_Indexdv(struct _glapi_table *disp) { + return (_glptr_Indexdv) (GET_by_offset(disp, _gloffset_Indexdv)); +} + +static INLINE void SET_Indexdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Indexdv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexf)(GLfloat); +#define CALL_Indexf(disp, parameters) \ + (* GET_Indexf(disp)) parameters +static INLINE _glptr_Indexf GET_Indexf(struct _glapi_table *disp) { + return (_glptr_Indexf) (GET_by_offset(disp, _gloffset_Indexf)); +} + +static INLINE void SET_Indexf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_Indexf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexfv)(const GLfloat *); +#define CALL_Indexfv(disp, parameters) \ + (* GET_Indexfv(disp)) parameters +static INLINE _glptr_Indexfv GET_Indexfv(struct _glapi_table *disp) { + return (_glptr_Indexfv) (GET_by_offset(disp, _gloffset_Indexfv)); +} + +static INLINE void SET_Indexfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Indexfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexi)(GLint); +#define CALL_Indexi(disp, parameters) \ + (* GET_Indexi(disp)) parameters +static INLINE _glptr_Indexi GET_Indexi(struct _glapi_table *disp) { + return (_glptr_Indexi) (GET_by_offset(disp, _gloffset_Indexi)); +} + +static INLINE void SET_Indexi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) { + SET_by_offset(disp, _gloffset_Indexi, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexiv)(const GLint *); +#define CALL_Indexiv(disp, parameters) \ + (* GET_Indexiv(disp)) parameters +static INLINE _glptr_Indexiv GET_Indexiv(struct _glapi_table *disp) { + return (_glptr_Indexiv) (GET_by_offset(disp, _gloffset_Indexiv)); +} + +static INLINE void SET_Indexiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Indexiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexs)(GLshort); +#define CALL_Indexs(disp, parameters) \ + (* GET_Indexs(disp)) parameters +static INLINE _glptr_Indexs GET_Indexs(struct _glapi_table *disp) { + return (_glptr_Indexs) (GET_by_offset(disp, _gloffset_Indexs)); +} + +static INLINE void SET_Indexs(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) { + SET_by_offset(disp, _gloffset_Indexs, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexsv)(const GLshort *); +#define CALL_Indexsv(disp, parameters) \ + (* GET_Indexsv(disp)) parameters +static INLINE _glptr_Indexsv GET_Indexsv(struct _glapi_table *disp) { + return (_glptr_Indexsv) (GET_by_offset(disp, _gloffset_Indexsv)); +} + +static INLINE void SET_Indexsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Indexsv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3b)(GLbyte, GLbyte, GLbyte); +#define CALL_Normal3b(disp, parameters) \ + (* GET_Normal3b(disp)) parameters +static INLINE _glptr_Normal3b GET_Normal3b(struct _glapi_table *disp) { + return (_glptr_Normal3b) (GET_by_offset(disp, _gloffset_Normal3b)); +} + +static INLINE void SET_Normal3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) { + SET_by_offset(disp, _gloffset_Normal3b, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3bv)(const GLbyte *); +#define CALL_Normal3bv(disp, parameters) \ + (* GET_Normal3bv(disp)) parameters +static INLINE _glptr_Normal3bv GET_Normal3bv(struct _glapi_table *disp) { + return (_glptr_Normal3bv) (GET_by_offset(disp, _gloffset_Normal3bv)); +} + +static INLINE void SET_Normal3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) { + SET_by_offset(disp, _gloffset_Normal3bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3d)(GLdouble, GLdouble, GLdouble); +#define CALL_Normal3d(disp, parameters) \ + (* GET_Normal3d(disp)) parameters +static INLINE _glptr_Normal3d GET_Normal3d(struct _glapi_table *disp) { + return (_glptr_Normal3d) (GET_by_offset(disp, _gloffset_Normal3d)); +} + +static INLINE void SET_Normal3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Normal3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3dv)(const GLdouble *); +#define CALL_Normal3dv(disp, parameters) \ + (* GET_Normal3dv(disp)) parameters +static INLINE _glptr_Normal3dv GET_Normal3dv(struct _glapi_table *disp) { + return (_glptr_Normal3dv) (GET_by_offset(disp, _gloffset_Normal3dv)); +} + +static INLINE void SET_Normal3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Normal3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3f)(GLfloat, GLfloat, GLfloat); +#define CALL_Normal3f(disp, parameters) \ + (* GET_Normal3f(disp)) parameters +static INLINE _glptr_Normal3f GET_Normal3f(struct _glapi_table *disp) { + return (_glptr_Normal3f) (GET_by_offset(disp, _gloffset_Normal3f)); +} + +static INLINE void SET_Normal3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Normal3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3fv)(const GLfloat *); +#define CALL_Normal3fv(disp, parameters) \ + (* GET_Normal3fv(disp)) parameters +static INLINE _glptr_Normal3fv GET_Normal3fv(struct _glapi_table *disp) { + return (_glptr_Normal3fv) (GET_by_offset(disp, _gloffset_Normal3fv)); +} + +static INLINE void SET_Normal3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Normal3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3i)(GLint, GLint, GLint); +#define CALL_Normal3i(disp, parameters) \ + (* GET_Normal3i(disp)) parameters +static INLINE _glptr_Normal3i GET_Normal3i(struct _glapi_table *disp) { + return (_glptr_Normal3i) (GET_by_offset(disp, _gloffset_Normal3i)); +} + +static INLINE void SET_Normal3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Normal3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3iv)(const GLint *); +#define CALL_Normal3iv(disp, parameters) \ + (* GET_Normal3iv(disp)) parameters +static INLINE _glptr_Normal3iv GET_Normal3iv(struct _glapi_table *disp) { + return (_glptr_Normal3iv) (GET_by_offset(disp, _gloffset_Normal3iv)); +} + +static INLINE void SET_Normal3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Normal3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3s)(GLshort, GLshort, GLshort); +#define CALL_Normal3s(disp, parameters) \ + (* GET_Normal3s(disp)) parameters +static INLINE _glptr_Normal3s GET_Normal3s(struct _glapi_table *disp) { + return (_glptr_Normal3s) (GET_by_offset(disp, _gloffset_Normal3s)); +} + +static INLINE void SET_Normal3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Normal3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3sv)(const GLshort *); +#define CALL_Normal3sv(disp, parameters) \ + (* GET_Normal3sv(disp)) parameters +static INLINE _glptr_Normal3sv GET_Normal3sv(struct _glapi_table *disp) { + return (_glptr_Normal3sv) (GET_by_offset(disp, _gloffset_Normal3sv)); +} + +static INLINE void SET_Normal3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Normal3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2d)(GLdouble, GLdouble); +#define CALL_RasterPos2d(disp, parameters) \ + (* GET_RasterPos2d(disp)) parameters +static INLINE _glptr_RasterPos2d GET_RasterPos2d(struct _glapi_table *disp) { + return (_glptr_RasterPos2d) (GET_by_offset(disp, _gloffset_RasterPos2d)); +} + +static INLINE void SET_RasterPos2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_RasterPos2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2dv)(const GLdouble *); +#define CALL_RasterPos2dv(disp, parameters) \ + (* GET_RasterPos2dv(disp)) parameters +static INLINE _glptr_RasterPos2dv GET_RasterPos2dv(struct _glapi_table *disp) { + return (_glptr_RasterPos2dv) (GET_by_offset(disp, _gloffset_RasterPos2dv)); +} + +static INLINE void SET_RasterPos2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_RasterPos2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2f)(GLfloat, GLfloat); +#define CALL_RasterPos2f(disp, parameters) \ + (* GET_RasterPos2f(disp)) parameters +static INLINE _glptr_RasterPos2f GET_RasterPos2f(struct _glapi_table *disp) { + return (_glptr_RasterPos2f) (GET_by_offset(disp, _gloffset_RasterPos2f)); +} + +static INLINE void SET_RasterPos2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_RasterPos2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2fv)(const GLfloat *); +#define CALL_RasterPos2fv(disp, parameters) \ + (* GET_RasterPos2fv(disp)) parameters +static INLINE _glptr_RasterPos2fv GET_RasterPos2fv(struct _glapi_table *disp) { + return (_glptr_RasterPos2fv) (GET_by_offset(disp, _gloffset_RasterPos2fv)); +} + +static INLINE void SET_RasterPos2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_RasterPos2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2i)(GLint, GLint); +#define CALL_RasterPos2i(disp, parameters) \ + (* GET_RasterPos2i(disp)) parameters +static INLINE _glptr_RasterPos2i GET_RasterPos2i(struct _glapi_table *disp) { + return (_glptr_RasterPos2i) (GET_by_offset(disp, _gloffset_RasterPos2i)); +} + +static INLINE void SET_RasterPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_RasterPos2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2iv)(const GLint *); +#define CALL_RasterPos2iv(disp, parameters) \ + (* GET_RasterPos2iv(disp)) parameters +static INLINE _glptr_RasterPos2iv GET_RasterPos2iv(struct _glapi_table *disp) { + return (_glptr_RasterPos2iv) (GET_by_offset(disp, _gloffset_RasterPos2iv)); +} + +static INLINE void SET_RasterPos2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_RasterPos2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2s)(GLshort, GLshort); +#define CALL_RasterPos2s(disp, parameters) \ + (* GET_RasterPos2s(disp)) parameters +static INLINE _glptr_RasterPos2s GET_RasterPos2s(struct _glapi_table *disp) { + return (_glptr_RasterPos2s) (GET_by_offset(disp, _gloffset_RasterPos2s)); +} + +static INLINE void SET_RasterPos2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_RasterPos2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos2sv)(const GLshort *); +#define CALL_RasterPos2sv(disp, parameters) \ + (* GET_RasterPos2sv(disp)) parameters +static INLINE _glptr_RasterPos2sv GET_RasterPos2sv(struct _glapi_table *disp) { + return (_glptr_RasterPos2sv) (GET_by_offset(disp, _gloffset_RasterPos2sv)); +} + +static INLINE void SET_RasterPos2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_RasterPos2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3d)(GLdouble, GLdouble, GLdouble); +#define CALL_RasterPos3d(disp, parameters) \ + (* GET_RasterPos3d(disp)) parameters +static INLINE _glptr_RasterPos3d GET_RasterPos3d(struct _glapi_table *disp) { + return (_glptr_RasterPos3d) (GET_by_offset(disp, _gloffset_RasterPos3d)); +} + +static INLINE void SET_RasterPos3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_RasterPos3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3dv)(const GLdouble *); +#define CALL_RasterPos3dv(disp, parameters) \ + (* GET_RasterPos3dv(disp)) parameters +static INLINE _glptr_RasterPos3dv GET_RasterPos3dv(struct _glapi_table *disp) { + return (_glptr_RasterPos3dv) (GET_by_offset(disp, _gloffset_RasterPos3dv)); +} + +static INLINE void SET_RasterPos3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_RasterPos3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3f)(GLfloat, GLfloat, GLfloat); +#define CALL_RasterPos3f(disp, parameters) \ + (* GET_RasterPos3f(disp)) parameters +static INLINE _glptr_RasterPos3f GET_RasterPos3f(struct _glapi_table *disp) { + return (_glptr_RasterPos3f) (GET_by_offset(disp, _gloffset_RasterPos3f)); +} + +static INLINE void SET_RasterPos3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_RasterPos3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3fv)(const GLfloat *); +#define CALL_RasterPos3fv(disp, parameters) \ + (* GET_RasterPos3fv(disp)) parameters +static INLINE _glptr_RasterPos3fv GET_RasterPos3fv(struct _glapi_table *disp) { + return (_glptr_RasterPos3fv) (GET_by_offset(disp, _gloffset_RasterPos3fv)); +} + +static INLINE void SET_RasterPos3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_RasterPos3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3i)(GLint, GLint, GLint); +#define CALL_RasterPos3i(disp, parameters) \ + (* GET_RasterPos3i(disp)) parameters +static INLINE _glptr_RasterPos3i GET_RasterPos3i(struct _glapi_table *disp) { + return (_glptr_RasterPos3i) (GET_by_offset(disp, _gloffset_RasterPos3i)); +} + +static INLINE void SET_RasterPos3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_RasterPos3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3iv)(const GLint *); +#define CALL_RasterPos3iv(disp, parameters) \ + (* GET_RasterPos3iv(disp)) parameters +static INLINE _glptr_RasterPos3iv GET_RasterPos3iv(struct _glapi_table *disp) { + return (_glptr_RasterPos3iv) (GET_by_offset(disp, _gloffset_RasterPos3iv)); +} + +static INLINE void SET_RasterPos3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_RasterPos3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3s)(GLshort, GLshort, GLshort); +#define CALL_RasterPos3s(disp, parameters) \ + (* GET_RasterPos3s(disp)) parameters +static INLINE _glptr_RasterPos3s GET_RasterPos3s(struct _glapi_table *disp) { + return (_glptr_RasterPos3s) (GET_by_offset(disp, _gloffset_RasterPos3s)); +} + +static INLINE void SET_RasterPos3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_RasterPos3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos3sv)(const GLshort *); +#define CALL_RasterPos3sv(disp, parameters) \ + (* GET_RasterPos3sv(disp)) parameters +static INLINE _glptr_RasterPos3sv GET_RasterPos3sv(struct _glapi_table *disp) { + return (_glptr_RasterPos3sv) (GET_by_offset(disp, _gloffset_RasterPos3sv)); +} + +static INLINE void SET_RasterPos3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_RasterPos3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4d)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_RasterPos4d(disp, parameters) \ + (* GET_RasterPos4d(disp)) parameters +static INLINE _glptr_RasterPos4d GET_RasterPos4d(struct _glapi_table *disp) { + return (_glptr_RasterPos4d) (GET_by_offset(disp, _gloffset_RasterPos4d)); +} + +static INLINE void SET_RasterPos4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_RasterPos4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4dv)(const GLdouble *); +#define CALL_RasterPos4dv(disp, parameters) \ + (* GET_RasterPos4dv(disp)) parameters +static INLINE _glptr_RasterPos4dv GET_RasterPos4dv(struct _glapi_table *disp) { + return (_glptr_RasterPos4dv) (GET_by_offset(disp, _gloffset_RasterPos4dv)); +} + +static INLINE void SET_RasterPos4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_RasterPos4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4f)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_RasterPos4f(disp, parameters) \ + (* GET_RasterPos4f(disp)) parameters +static INLINE _glptr_RasterPos4f GET_RasterPos4f(struct _glapi_table *disp) { + return (_glptr_RasterPos4f) (GET_by_offset(disp, _gloffset_RasterPos4f)); +} + +static INLINE void SET_RasterPos4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_RasterPos4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4fv)(const GLfloat *); +#define CALL_RasterPos4fv(disp, parameters) \ + (* GET_RasterPos4fv(disp)) parameters +static INLINE _glptr_RasterPos4fv GET_RasterPos4fv(struct _glapi_table *disp) { + return (_glptr_RasterPos4fv) (GET_by_offset(disp, _gloffset_RasterPos4fv)); +} + +static INLINE void SET_RasterPos4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_RasterPos4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4i)(GLint, GLint, GLint, GLint); +#define CALL_RasterPos4i(disp, parameters) \ + (* GET_RasterPos4i(disp)) parameters +static INLINE _glptr_RasterPos4i GET_RasterPos4i(struct _glapi_table *disp) { + return (_glptr_RasterPos4i) (GET_by_offset(disp, _gloffset_RasterPos4i)); +} + +static INLINE void SET_RasterPos4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_RasterPos4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4iv)(const GLint *); +#define CALL_RasterPos4iv(disp, parameters) \ + (* GET_RasterPos4iv(disp)) parameters +static INLINE _glptr_RasterPos4iv GET_RasterPos4iv(struct _glapi_table *disp) { + return (_glptr_RasterPos4iv) (GET_by_offset(disp, _gloffset_RasterPos4iv)); +} + +static INLINE void SET_RasterPos4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_RasterPos4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4s)(GLshort, GLshort, GLshort, GLshort); +#define CALL_RasterPos4s(disp, parameters) \ + (* GET_RasterPos4s(disp)) parameters +static INLINE _glptr_RasterPos4s GET_RasterPos4s(struct _glapi_table *disp) { + return (_glptr_RasterPos4s) (GET_by_offset(disp, _gloffset_RasterPos4s)); +} + +static INLINE void SET_RasterPos4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_RasterPos4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_RasterPos4sv)(const GLshort *); +#define CALL_RasterPos4sv(disp, parameters) \ + (* GET_RasterPos4sv(disp)) parameters +static INLINE _glptr_RasterPos4sv GET_RasterPos4sv(struct _glapi_table *disp) { + return (_glptr_RasterPos4sv) (GET_by_offset(disp, _gloffset_RasterPos4sv)); +} + +static INLINE void SET_RasterPos4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_RasterPos4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectd)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Rectd(disp, parameters) \ + (* GET_Rectd(disp)) parameters +static INLINE _glptr_Rectd GET_Rectd(struct _glapi_table *disp) { + return (_glptr_Rectd) (GET_by_offset(disp, _gloffset_Rectd)); +} + +static INLINE void SET_Rectd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Rectd, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectdv)(const GLdouble *, const GLdouble *); +#define CALL_Rectdv(disp, parameters) \ + (* GET_Rectdv(disp)) parameters +static INLINE _glptr_Rectdv GET_Rectdv(struct _glapi_table *disp) { + return (_glptr_Rectdv) (GET_by_offset(disp, _gloffset_Rectdv)); +} + +static INLINE void SET_Rectdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *, const GLdouble *)) { + SET_by_offset(disp, _gloffset_Rectdv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectf)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Rectf(disp, parameters) \ + (* GET_Rectf(disp)) parameters +static INLINE _glptr_Rectf GET_Rectf(struct _glapi_table *disp) { + return (_glptr_Rectf) (GET_by_offset(disp, _gloffset_Rectf)); +} + +static INLINE void SET_Rectf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Rectf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectfv)(const GLfloat *, const GLfloat *); +#define CALL_Rectfv(disp, parameters) \ + (* GET_Rectfv(disp)) parameters +static INLINE _glptr_Rectfv GET_Rectfv(struct _glapi_table *disp) { + return (_glptr_Rectfv) (GET_by_offset(disp, _gloffset_Rectfv)); +} + +static INLINE void SET_Rectfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Rectfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Recti)(GLint, GLint, GLint, GLint); +#define CALL_Recti(disp, parameters) \ + (* GET_Recti(disp)) parameters +static INLINE _glptr_Recti GET_Recti(struct _glapi_table *disp) { + return (_glptr_Recti) (GET_by_offset(disp, _gloffset_Recti)); +} + +static INLINE void SET_Recti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Recti, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectiv)(const GLint *, const GLint *); +#define CALL_Rectiv(disp, parameters) \ + (* GET_Rectiv(disp)) parameters +static INLINE _glptr_Rectiv GET_Rectiv(struct _glapi_table *disp) { + return (_glptr_Rectiv) (GET_by_offset(disp, _gloffset_Rectiv)); +} + +static INLINE void SET_Rectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *, const GLint *)) { + SET_by_offset(disp, _gloffset_Rectiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rects)(GLshort, GLshort, GLshort, GLshort); +#define CALL_Rects(disp, parameters) \ + (* GET_Rects(disp)) parameters +static INLINE _glptr_Rects GET_Rects(struct _glapi_table *disp) { + return (_glptr_Rects) (GET_by_offset(disp, _gloffset_Rects)); +} + +static INLINE void SET_Rects(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Rects, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rectsv)(const GLshort *, const GLshort *); +#define CALL_Rectsv(disp, parameters) \ + (* GET_Rectsv(disp)) parameters +static INLINE _glptr_Rectsv GET_Rectsv(struct _glapi_table *disp) { + return (_glptr_Rectsv) (GET_by_offset(disp, _gloffset_Rectsv)); +} + +static INLINE void SET_Rectsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *, const GLshort *)) { + SET_by_offset(disp, _gloffset_Rectsv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1d)(GLdouble); +#define CALL_TexCoord1d(disp, parameters) \ + (* GET_TexCoord1d(disp)) parameters +static INLINE _glptr_TexCoord1d GET_TexCoord1d(struct _glapi_table *disp) { + return (_glptr_TexCoord1d) (GET_by_offset(disp, _gloffset_TexCoord1d)); +} + +static INLINE void SET_TexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) { + SET_by_offset(disp, _gloffset_TexCoord1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1dv)(const GLdouble *); +#define CALL_TexCoord1dv(disp, parameters) \ + (* GET_TexCoord1dv(disp)) parameters +static INLINE _glptr_TexCoord1dv GET_TexCoord1dv(struct _glapi_table *disp) { + return (_glptr_TexCoord1dv) (GET_by_offset(disp, _gloffset_TexCoord1dv)); +} + +static INLINE void SET_TexCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_TexCoord1dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1f)(GLfloat); +#define CALL_TexCoord1f(disp, parameters) \ + (* GET_TexCoord1f(disp)) parameters +static INLINE _glptr_TexCoord1f GET_TexCoord1f(struct _glapi_table *disp) { + return (_glptr_TexCoord1f) (GET_by_offset(disp, _gloffset_TexCoord1f)); +} + +static INLINE void SET_TexCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_TexCoord1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1fv)(const GLfloat *); +#define CALL_TexCoord1fv(disp, parameters) \ + (* GET_TexCoord1fv(disp)) parameters +static INLINE _glptr_TexCoord1fv GET_TexCoord1fv(struct _glapi_table *disp) { + return (_glptr_TexCoord1fv) (GET_by_offset(disp, _gloffset_TexCoord1fv)); +} + +static INLINE void SET_TexCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexCoord1fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1i)(GLint); +#define CALL_TexCoord1i(disp, parameters) \ + (* GET_TexCoord1i(disp)) parameters +static INLINE _glptr_TexCoord1i GET_TexCoord1i(struct _glapi_table *disp) { + return (_glptr_TexCoord1i) (GET_by_offset(disp, _gloffset_TexCoord1i)); +} + +static INLINE void SET_TexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) { + SET_by_offset(disp, _gloffset_TexCoord1i, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1iv)(const GLint *); +#define CALL_TexCoord1iv(disp, parameters) \ + (* GET_TexCoord1iv(disp)) parameters +static INLINE _glptr_TexCoord1iv GET_TexCoord1iv(struct _glapi_table *disp) { + return (_glptr_TexCoord1iv) (GET_by_offset(disp, _gloffset_TexCoord1iv)); +} + +static INLINE void SET_TexCoord1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_TexCoord1iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1s)(GLshort); +#define CALL_TexCoord1s(disp, parameters) \ + (* GET_TexCoord1s(disp)) parameters +static INLINE _glptr_TexCoord1s GET_TexCoord1s(struct _glapi_table *disp) { + return (_glptr_TexCoord1s) (GET_by_offset(disp, _gloffset_TexCoord1s)); +} + +static INLINE void SET_TexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort)) { + SET_by_offset(disp, _gloffset_TexCoord1s, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord1sv)(const GLshort *); +#define CALL_TexCoord1sv(disp, parameters) \ + (* GET_TexCoord1sv(disp)) parameters +static INLINE _glptr_TexCoord1sv GET_TexCoord1sv(struct _glapi_table *disp) { + return (_glptr_TexCoord1sv) (GET_by_offset(disp, _gloffset_TexCoord1sv)); +} + +static INLINE void SET_TexCoord1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_TexCoord1sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2d)(GLdouble, GLdouble); +#define CALL_TexCoord2d(disp, parameters) \ + (* GET_TexCoord2d(disp)) parameters +static INLINE _glptr_TexCoord2d GET_TexCoord2d(struct _glapi_table *disp) { + return (_glptr_TexCoord2d) (GET_by_offset(disp, _gloffset_TexCoord2d)); +} + +static INLINE void SET_TexCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_TexCoord2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2dv)(const GLdouble *); +#define CALL_TexCoord2dv(disp, parameters) \ + (* GET_TexCoord2dv(disp)) parameters +static INLINE _glptr_TexCoord2dv GET_TexCoord2dv(struct _glapi_table *disp) { + return (_glptr_TexCoord2dv) (GET_by_offset(disp, _gloffset_TexCoord2dv)); +} + +static INLINE void SET_TexCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_TexCoord2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2f)(GLfloat, GLfloat); +#define CALL_TexCoord2f(disp, parameters) \ + (* GET_TexCoord2f(disp)) parameters +static INLINE _glptr_TexCoord2f GET_TexCoord2f(struct _glapi_table *disp) { + return (_glptr_TexCoord2f) (GET_by_offset(disp, _gloffset_TexCoord2f)); +} + +static INLINE void SET_TexCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_TexCoord2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2fv)(const GLfloat *); +#define CALL_TexCoord2fv(disp, parameters) \ + (* GET_TexCoord2fv(disp)) parameters +static INLINE _glptr_TexCoord2fv GET_TexCoord2fv(struct _glapi_table *disp) { + return (_glptr_TexCoord2fv) (GET_by_offset(disp, _gloffset_TexCoord2fv)); +} + +static INLINE void SET_TexCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexCoord2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2i)(GLint, GLint); +#define CALL_TexCoord2i(disp, parameters) \ + (* GET_TexCoord2i(disp)) parameters +static INLINE _glptr_TexCoord2i GET_TexCoord2i(struct _glapi_table *disp) { + return (_glptr_TexCoord2i) (GET_by_offset(disp, _gloffset_TexCoord2i)); +} + +static INLINE void SET_TexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_TexCoord2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2iv)(const GLint *); +#define CALL_TexCoord2iv(disp, parameters) \ + (* GET_TexCoord2iv(disp)) parameters +static INLINE _glptr_TexCoord2iv GET_TexCoord2iv(struct _glapi_table *disp) { + return (_glptr_TexCoord2iv) (GET_by_offset(disp, _gloffset_TexCoord2iv)); +} + +static INLINE void SET_TexCoord2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_TexCoord2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2s)(GLshort, GLshort); +#define CALL_TexCoord2s(disp, parameters) \ + (* GET_TexCoord2s(disp)) parameters +static INLINE _glptr_TexCoord2s GET_TexCoord2s(struct _glapi_table *disp) { + return (_glptr_TexCoord2s) (GET_by_offset(disp, _gloffset_TexCoord2s)); +} + +static INLINE void SET_TexCoord2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_TexCoord2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord2sv)(const GLshort *); +#define CALL_TexCoord2sv(disp, parameters) \ + (* GET_TexCoord2sv(disp)) parameters +static INLINE _glptr_TexCoord2sv GET_TexCoord2sv(struct _glapi_table *disp) { + return (_glptr_TexCoord2sv) (GET_by_offset(disp, _gloffset_TexCoord2sv)); +} + +static INLINE void SET_TexCoord2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_TexCoord2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3d)(GLdouble, GLdouble, GLdouble); +#define CALL_TexCoord3d(disp, parameters) \ + (* GET_TexCoord3d(disp)) parameters +static INLINE _glptr_TexCoord3d GET_TexCoord3d(struct _glapi_table *disp) { + return (_glptr_TexCoord3d) (GET_by_offset(disp, _gloffset_TexCoord3d)); +} + +static INLINE void SET_TexCoord3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_TexCoord3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3dv)(const GLdouble *); +#define CALL_TexCoord3dv(disp, parameters) \ + (* GET_TexCoord3dv(disp)) parameters +static INLINE _glptr_TexCoord3dv GET_TexCoord3dv(struct _glapi_table *disp) { + return (_glptr_TexCoord3dv) (GET_by_offset(disp, _gloffset_TexCoord3dv)); +} + +static INLINE void SET_TexCoord3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_TexCoord3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3f)(GLfloat, GLfloat, GLfloat); +#define CALL_TexCoord3f(disp, parameters) \ + (* GET_TexCoord3f(disp)) parameters +static INLINE _glptr_TexCoord3f GET_TexCoord3f(struct _glapi_table *disp) { + return (_glptr_TexCoord3f) (GET_by_offset(disp, _gloffset_TexCoord3f)); +} + +static INLINE void SET_TexCoord3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_TexCoord3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3fv)(const GLfloat *); +#define CALL_TexCoord3fv(disp, parameters) \ + (* GET_TexCoord3fv(disp)) parameters +static INLINE _glptr_TexCoord3fv GET_TexCoord3fv(struct _glapi_table *disp) { + return (_glptr_TexCoord3fv) (GET_by_offset(disp, _gloffset_TexCoord3fv)); +} + +static INLINE void SET_TexCoord3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexCoord3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3i)(GLint, GLint, GLint); +#define CALL_TexCoord3i(disp, parameters) \ + (* GET_TexCoord3i(disp)) parameters +static INLINE _glptr_TexCoord3i GET_TexCoord3i(struct _glapi_table *disp) { + return (_glptr_TexCoord3i) (GET_by_offset(disp, _gloffset_TexCoord3i)); +} + +static INLINE void SET_TexCoord3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_TexCoord3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3iv)(const GLint *); +#define CALL_TexCoord3iv(disp, parameters) \ + (* GET_TexCoord3iv(disp)) parameters +static INLINE _glptr_TexCoord3iv GET_TexCoord3iv(struct _glapi_table *disp) { + return (_glptr_TexCoord3iv) (GET_by_offset(disp, _gloffset_TexCoord3iv)); +} + +static INLINE void SET_TexCoord3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_TexCoord3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3s)(GLshort, GLshort, GLshort); +#define CALL_TexCoord3s(disp, parameters) \ + (* GET_TexCoord3s(disp)) parameters +static INLINE _glptr_TexCoord3s GET_TexCoord3s(struct _glapi_table *disp) { + return (_glptr_TexCoord3s) (GET_by_offset(disp, _gloffset_TexCoord3s)); +} + +static INLINE void SET_TexCoord3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_TexCoord3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord3sv)(const GLshort *); +#define CALL_TexCoord3sv(disp, parameters) \ + (* GET_TexCoord3sv(disp)) parameters +static INLINE _glptr_TexCoord3sv GET_TexCoord3sv(struct _glapi_table *disp) { + return (_glptr_TexCoord3sv) (GET_by_offset(disp, _gloffset_TexCoord3sv)); +} + +static INLINE void SET_TexCoord3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_TexCoord3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4d)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_TexCoord4d(disp, parameters) \ + (* GET_TexCoord4d(disp)) parameters +static INLINE _glptr_TexCoord4d GET_TexCoord4d(struct _glapi_table *disp) { + return (_glptr_TexCoord4d) (GET_by_offset(disp, _gloffset_TexCoord4d)); +} + +static INLINE void SET_TexCoord4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_TexCoord4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4dv)(const GLdouble *); +#define CALL_TexCoord4dv(disp, parameters) \ + (* GET_TexCoord4dv(disp)) parameters +static INLINE _glptr_TexCoord4dv GET_TexCoord4dv(struct _glapi_table *disp) { + return (_glptr_TexCoord4dv) (GET_by_offset(disp, _gloffset_TexCoord4dv)); +} + +static INLINE void SET_TexCoord4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_TexCoord4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4f)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_TexCoord4f(disp, parameters) \ + (* GET_TexCoord4f(disp)) parameters +static INLINE _glptr_TexCoord4f GET_TexCoord4f(struct _glapi_table *disp) { + return (_glptr_TexCoord4f) (GET_by_offset(disp, _gloffset_TexCoord4f)); +} + +static INLINE void SET_TexCoord4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_TexCoord4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4fv)(const GLfloat *); +#define CALL_TexCoord4fv(disp, parameters) \ + (* GET_TexCoord4fv(disp)) parameters +static INLINE _glptr_TexCoord4fv GET_TexCoord4fv(struct _glapi_table *disp) { + return (_glptr_TexCoord4fv) (GET_by_offset(disp, _gloffset_TexCoord4fv)); +} + +static INLINE void SET_TexCoord4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexCoord4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4i)(GLint, GLint, GLint, GLint); +#define CALL_TexCoord4i(disp, parameters) \ + (* GET_TexCoord4i(disp)) parameters +static INLINE _glptr_TexCoord4i GET_TexCoord4i(struct _glapi_table *disp) { + return (_glptr_TexCoord4i) (GET_by_offset(disp, _gloffset_TexCoord4i)); +} + +static INLINE void SET_TexCoord4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_TexCoord4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4iv)(const GLint *); +#define CALL_TexCoord4iv(disp, parameters) \ + (* GET_TexCoord4iv(disp)) parameters +static INLINE _glptr_TexCoord4iv GET_TexCoord4iv(struct _glapi_table *disp) { + return (_glptr_TexCoord4iv) (GET_by_offset(disp, _gloffset_TexCoord4iv)); +} + +static INLINE void SET_TexCoord4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_TexCoord4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4s)(GLshort, GLshort, GLshort, GLshort); +#define CALL_TexCoord4s(disp, parameters) \ + (* GET_TexCoord4s(disp)) parameters +static INLINE _glptr_TexCoord4s GET_TexCoord4s(struct _glapi_table *disp) { + return (_glptr_TexCoord4s) (GET_by_offset(disp, _gloffset_TexCoord4s)); +} + +static INLINE void SET_TexCoord4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_TexCoord4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoord4sv)(const GLshort *); +#define CALL_TexCoord4sv(disp, parameters) \ + (* GET_TexCoord4sv(disp)) parameters +static INLINE _glptr_TexCoord4sv GET_TexCoord4sv(struct _glapi_table *disp) { + return (_glptr_TexCoord4sv) (GET_by_offset(disp, _gloffset_TexCoord4sv)); +} + +static INLINE void SET_TexCoord4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_TexCoord4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2d)(GLdouble, GLdouble); +#define CALL_Vertex2d(disp, parameters) \ + (* GET_Vertex2d(disp)) parameters +static INLINE _glptr_Vertex2d GET_Vertex2d(struct _glapi_table *disp) { + return (_glptr_Vertex2d) (GET_by_offset(disp, _gloffset_Vertex2d)); +} + +static INLINE void SET_Vertex2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Vertex2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2dv)(const GLdouble *); +#define CALL_Vertex2dv(disp, parameters) \ + (* GET_Vertex2dv(disp)) parameters +static INLINE _glptr_Vertex2dv GET_Vertex2dv(struct _glapi_table *disp) { + return (_glptr_Vertex2dv) (GET_by_offset(disp, _gloffset_Vertex2dv)); +} + +static INLINE void SET_Vertex2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Vertex2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2f)(GLfloat, GLfloat); +#define CALL_Vertex2f(disp, parameters) \ + (* GET_Vertex2f(disp)) parameters +static INLINE _glptr_Vertex2f GET_Vertex2f(struct _glapi_table *disp) { + return (_glptr_Vertex2f) (GET_by_offset(disp, _gloffset_Vertex2f)); +} + +static INLINE void SET_Vertex2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Vertex2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2fv)(const GLfloat *); +#define CALL_Vertex2fv(disp, parameters) \ + (* GET_Vertex2fv(disp)) parameters +static INLINE _glptr_Vertex2fv GET_Vertex2fv(struct _glapi_table *disp) { + return (_glptr_Vertex2fv) (GET_by_offset(disp, _gloffset_Vertex2fv)); +} + +static INLINE void SET_Vertex2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Vertex2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2i)(GLint, GLint); +#define CALL_Vertex2i(disp, parameters) \ + (* GET_Vertex2i(disp)) parameters +static INLINE _glptr_Vertex2i GET_Vertex2i(struct _glapi_table *disp) { + return (_glptr_Vertex2i) (GET_by_offset(disp, _gloffset_Vertex2i)); +} + +static INLINE void SET_Vertex2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_Vertex2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2iv)(const GLint *); +#define CALL_Vertex2iv(disp, parameters) \ + (* GET_Vertex2iv(disp)) parameters +static INLINE _glptr_Vertex2iv GET_Vertex2iv(struct _glapi_table *disp) { + return (_glptr_Vertex2iv) (GET_by_offset(disp, _gloffset_Vertex2iv)); +} + +static INLINE void SET_Vertex2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Vertex2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2s)(GLshort, GLshort); +#define CALL_Vertex2s(disp, parameters) \ + (* GET_Vertex2s(disp)) parameters +static INLINE _glptr_Vertex2s GET_Vertex2s(struct _glapi_table *disp) { + return (_glptr_Vertex2s) (GET_by_offset(disp, _gloffset_Vertex2s)); +} + +static INLINE void SET_Vertex2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Vertex2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex2sv)(const GLshort *); +#define CALL_Vertex2sv(disp, parameters) \ + (* GET_Vertex2sv(disp)) parameters +static INLINE _glptr_Vertex2sv GET_Vertex2sv(struct _glapi_table *disp) { + return (_glptr_Vertex2sv) (GET_by_offset(disp, _gloffset_Vertex2sv)); +} + +static INLINE void SET_Vertex2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Vertex2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3d)(GLdouble, GLdouble, GLdouble); +#define CALL_Vertex3d(disp, parameters) \ + (* GET_Vertex3d(disp)) parameters +static INLINE _glptr_Vertex3d GET_Vertex3d(struct _glapi_table *disp) { + return (_glptr_Vertex3d) (GET_by_offset(disp, _gloffset_Vertex3d)); +} + +static INLINE void SET_Vertex3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Vertex3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3dv)(const GLdouble *); +#define CALL_Vertex3dv(disp, parameters) \ + (* GET_Vertex3dv(disp)) parameters +static INLINE _glptr_Vertex3dv GET_Vertex3dv(struct _glapi_table *disp) { + return (_glptr_Vertex3dv) (GET_by_offset(disp, _gloffset_Vertex3dv)); +} + +static INLINE void SET_Vertex3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Vertex3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3f)(GLfloat, GLfloat, GLfloat); +#define CALL_Vertex3f(disp, parameters) \ + (* GET_Vertex3f(disp)) parameters +static INLINE _glptr_Vertex3f GET_Vertex3f(struct _glapi_table *disp) { + return (_glptr_Vertex3f) (GET_by_offset(disp, _gloffset_Vertex3f)); +} + +static INLINE void SET_Vertex3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Vertex3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3fv)(const GLfloat *); +#define CALL_Vertex3fv(disp, parameters) \ + (* GET_Vertex3fv(disp)) parameters +static INLINE _glptr_Vertex3fv GET_Vertex3fv(struct _glapi_table *disp) { + return (_glptr_Vertex3fv) (GET_by_offset(disp, _gloffset_Vertex3fv)); +} + +static INLINE void SET_Vertex3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Vertex3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3i)(GLint, GLint, GLint); +#define CALL_Vertex3i(disp, parameters) \ + (* GET_Vertex3i(disp)) parameters +static INLINE _glptr_Vertex3i GET_Vertex3i(struct _glapi_table *disp) { + return (_glptr_Vertex3i) (GET_by_offset(disp, _gloffset_Vertex3i)); +} + +static INLINE void SET_Vertex3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Vertex3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3iv)(const GLint *); +#define CALL_Vertex3iv(disp, parameters) \ + (* GET_Vertex3iv(disp)) parameters +static INLINE _glptr_Vertex3iv GET_Vertex3iv(struct _glapi_table *disp) { + return (_glptr_Vertex3iv) (GET_by_offset(disp, _gloffset_Vertex3iv)); +} + +static INLINE void SET_Vertex3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Vertex3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3s)(GLshort, GLshort, GLshort); +#define CALL_Vertex3s(disp, parameters) \ + (* GET_Vertex3s(disp)) parameters +static INLINE _glptr_Vertex3s GET_Vertex3s(struct _glapi_table *disp) { + return (_glptr_Vertex3s) (GET_by_offset(disp, _gloffset_Vertex3s)); +} + +static INLINE void SET_Vertex3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Vertex3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex3sv)(const GLshort *); +#define CALL_Vertex3sv(disp, parameters) \ + (* GET_Vertex3sv(disp)) parameters +static INLINE _glptr_Vertex3sv GET_Vertex3sv(struct _glapi_table *disp) { + return (_glptr_Vertex3sv) (GET_by_offset(disp, _gloffset_Vertex3sv)); +} + +static INLINE void SET_Vertex3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Vertex3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4d)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Vertex4d(disp, parameters) \ + (* GET_Vertex4d(disp)) parameters +static INLINE _glptr_Vertex4d GET_Vertex4d(struct _glapi_table *disp) { + return (_glptr_Vertex4d) (GET_by_offset(disp, _gloffset_Vertex4d)); +} + +static INLINE void SET_Vertex4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Vertex4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4dv)(const GLdouble *); +#define CALL_Vertex4dv(disp, parameters) \ + (* GET_Vertex4dv(disp)) parameters +static INLINE _glptr_Vertex4dv GET_Vertex4dv(struct _glapi_table *disp) { + return (_glptr_Vertex4dv) (GET_by_offset(disp, _gloffset_Vertex4dv)); +} + +static INLINE void SET_Vertex4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_Vertex4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4f)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Vertex4f(disp, parameters) \ + (* GET_Vertex4f(disp)) parameters +static INLINE _glptr_Vertex4f GET_Vertex4f(struct _glapi_table *disp) { + return (_glptr_Vertex4f) (GET_by_offset(disp, _gloffset_Vertex4f)); +} + +static INLINE void SET_Vertex4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Vertex4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4fv)(const GLfloat *); +#define CALL_Vertex4fv(disp, parameters) \ + (* GET_Vertex4fv(disp)) parameters +static INLINE _glptr_Vertex4fv GET_Vertex4fv(struct _glapi_table *disp) { + return (_glptr_Vertex4fv) (GET_by_offset(disp, _gloffset_Vertex4fv)); +} + +static INLINE void SET_Vertex4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_Vertex4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4i)(GLint, GLint, GLint, GLint); +#define CALL_Vertex4i(disp, parameters) \ + (* GET_Vertex4i(disp)) parameters +static INLINE _glptr_Vertex4i GET_Vertex4i(struct _glapi_table *disp) { + return (_glptr_Vertex4i) (GET_by_offset(disp, _gloffset_Vertex4i)); +} + +static INLINE void SET_Vertex4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Vertex4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4iv)(const GLint *); +#define CALL_Vertex4iv(disp, parameters) \ + (* GET_Vertex4iv(disp)) parameters +static INLINE _glptr_Vertex4iv GET_Vertex4iv(struct _glapi_table *disp) { + return (_glptr_Vertex4iv) (GET_by_offset(disp, _gloffset_Vertex4iv)); +} + +static INLINE void SET_Vertex4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_Vertex4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4s)(GLshort, GLshort, GLshort, GLshort); +#define CALL_Vertex4s(disp, parameters) \ + (* GET_Vertex4s(disp)) parameters +static INLINE _glptr_Vertex4s GET_Vertex4s(struct _glapi_table *disp) { + return (_glptr_Vertex4s) (GET_by_offset(disp, _gloffset_Vertex4s)); +} + +static INLINE void SET_Vertex4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_Vertex4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_Vertex4sv)(const GLshort *); +#define CALL_Vertex4sv(disp, parameters) \ + (* GET_Vertex4sv(disp)) parameters +static INLINE _glptr_Vertex4sv GET_Vertex4sv(struct _glapi_table *disp) { + return (_glptr_Vertex4sv) (GET_by_offset(disp, _gloffset_Vertex4sv)); +} + +static INLINE void SET_Vertex4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_Vertex4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClipPlane)(GLenum, const GLdouble *); +#define CALL_ClipPlane(disp, parameters) \ + (* GET_ClipPlane(disp)) parameters +static INLINE _glptr_ClipPlane GET_ClipPlane(struct _glapi_table *disp) { + return (_glptr_ClipPlane) (GET_by_offset(disp, _gloffset_ClipPlane)); +} + +static INLINE void SET_ClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_ClipPlane, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorMaterial)(GLenum, GLenum); +#define CALL_ColorMaterial(disp, parameters) \ + (* GET_ColorMaterial(disp)) parameters +static INLINE _glptr_ColorMaterial GET_ColorMaterial(struct _glapi_table *disp) { + return (_glptr_ColorMaterial) (GET_by_offset(disp, _gloffset_ColorMaterial)); +} + +static INLINE void SET_ColorMaterial(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_ColorMaterial, fn); +} + +typedef void (GLAPIENTRYP _glptr_CullFace)(GLenum); +#define CALL_CullFace(disp, parameters) \ + (* GET_CullFace(disp)) parameters +static INLINE _glptr_CullFace GET_CullFace(struct _glapi_table *disp) { + return (_glptr_CullFace) (GET_by_offset(disp, _gloffset_CullFace)); +} + +static INLINE void SET_CullFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_CullFace, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogf)(GLenum, GLfloat); +#define CALL_Fogf(disp, parameters) \ + (* GET_Fogf(disp)) parameters +static INLINE _glptr_Fogf GET_Fogf(struct _glapi_table *disp) { + return (_glptr_Fogf) (GET_by_offset(disp, _gloffset_Fogf)); +} + +static INLINE void SET_Fogf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_Fogf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogfv)(GLenum, const GLfloat *); +#define CALL_Fogfv(disp, parameters) \ + (* GET_Fogfv(disp)) parameters +static INLINE _glptr_Fogfv GET_Fogfv(struct _glapi_table *disp) { + return (_glptr_Fogfv) (GET_by_offset(disp, _gloffset_Fogfv)); +} + +static INLINE void SET_Fogfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Fogfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogi)(GLenum, GLint); +#define CALL_Fogi(disp, parameters) \ + (* GET_Fogi(disp)) parameters +static INLINE _glptr_Fogi GET_Fogi(struct _glapi_table *disp) { + return (_glptr_Fogi) (GET_by_offset(disp, _gloffset_Fogi)); +} + +static INLINE void SET_Fogi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_Fogi, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogiv)(GLenum, const GLint *); +#define CALL_Fogiv(disp, parameters) \ + (* GET_Fogiv(disp)) parameters +static INLINE _glptr_Fogiv GET_Fogiv(struct _glapi_table *disp) { + return (_glptr_Fogiv) (GET_by_offset(disp, _gloffset_Fogiv)); +} + +static INLINE void SET_Fogiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_Fogiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_FrontFace)(GLenum); +#define CALL_FrontFace(disp, parameters) \ + (* GET_FrontFace(disp)) parameters +static INLINE _glptr_FrontFace GET_FrontFace(struct _glapi_table *disp) { + return (_glptr_FrontFace) (GET_by_offset(disp, _gloffset_FrontFace)); +} + +static INLINE void SET_FrontFace(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_FrontFace, fn); +} + +typedef void (GLAPIENTRYP _glptr_Hint)(GLenum, GLenum); +#define CALL_Hint(disp, parameters) \ + (* GET_Hint(disp)) parameters +static INLINE _glptr_Hint GET_Hint(struct _glapi_table *disp) { + return (_glptr_Hint) (GET_by_offset(disp, _gloffset_Hint)); +} + +static INLINE void SET_Hint(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_Hint, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lightf)(GLenum, GLenum, GLfloat); +#define CALL_Lightf(disp, parameters) \ + (* GET_Lightf(disp)) parameters +static INLINE _glptr_Lightf GET_Lightf(struct _glapi_table *disp) { + return (_glptr_Lightf) (GET_by_offset(disp, _gloffset_Lightf)); +} + +static INLINE void SET_Lightf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_Lightf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lightfv)(GLenum, GLenum, const GLfloat *); +#define CALL_Lightfv(disp, parameters) \ + (* GET_Lightfv(disp)) parameters +static INLINE _glptr_Lightfv GET_Lightfv(struct _glapi_table *disp) { + return (_glptr_Lightfv) (GET_by_offset(disp, _gloffset_Lightfv)); +} + +static INLINE void SET_Lightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Lightfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lighti)(GLenum, GLenum, GLint); +#define CALL_Lighti(disp, parameters) \ + (* GET_Lighti(disp)) parameters +static INLINE _glptr_Lighti GET_Lighti(struct _glapi_table *disp) { + return (_glptr_Lighti) (GET_by_offset(disp, _gloffset_Lighti)); +} + +static INLINE void SET_Lighti(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_Lighti, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lightiv)(GLenum, GLenum, const GLint *); +#define CALL_Lightiv(disp, parameters) \ + (* GET_Lightiv(disp)) parameters +static INLINE _glptr_Lightiv GET_Lightiv(struct _glapi_table *disp) { + return (_glptr_Lightiv) (GET_by_offset(disp, _gloffset_Lightiv)); +} + +static INLINE void SET_Lightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_Lightiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModelf)(GLenum, GLfloat); +#define CALL_LightModelf(disp, parameters) \ + (* GET_LightModelf(disp)) parameters +static INLINE _glptr_LightModelf GET_LightModelf(struct _glapi_table *disp) { + return (_glptr_LightModelf) (GET_by_offset(disp, _gloffset_LightModelf)); +} + +static INLINE void SET_LightModelf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_LightModelf, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModelfv)(GLenum, const GLfloat *); +#define CALL_LightModelfv(disp, parameters) \ + (* GET_LightModelfv(disp)) parameters +static INLINE _glptr_LightModelfv GET_LightModelfv(struct _glapi_table *disp) { + return (_glptr_LightModelfv) (GET_by_offset(disp, _gloffset_LightModelfv)); +} + +static INLINE void SET_LightModelfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_LightModelfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModeli)(GLenum, GLint); +#define CALL_LightModeli(disp, parameters) \ + (* GET_LightModeli(disp)) parameters +static INLINE _glptr_LightModeli GET_LightModeli(struct _glapi_table *disp) { + return (_glptr_LightModeli) (GET_by_offset(disp, _gloffset_LightModeli)); +} + +static INLINE void SET_LightModeli(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_LightModeli, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModeliv)(GLenum, const GLint *); +#define CALL_LightModeliv(disp, parameters) \ + (* GET_LightModeliv(disp)) parameters +static INLINE _glptr_LightModeliv GET_LightModeliv(struct _glapi_table *disp) { + return (_glptr_LightModeliv) (GET_by_offset(disp, _gloffset_LightModeliv)); +} + +static INLINE void SET_LightModeliv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_LightModeliv, fn); +} + +typedef void (GLAPIENTRYP _glptr_LineStipple)(GLint, GLushort); +#define CALL_LineStipple(disp, parameters) \ + (* GET_LineStipple(disp)) parameters +static INLINE _glptr_LineStipple GET_LineStipple(struct _glapi_table *disp) { + return (_glptr_LineStipple) (GET_by_offset(disp, _gloffset_LineStipple)); +} + +static INLINE void SET_LineStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLushort)) { + SET_by_offset(disp, _gloffset_LineStipple, fn); +} + +typedef void (GLAPIENTRYP _glptr_LineWidth)(GLfloat); +#define CALL_LineWidth(disp, parameters) \ + (* GET_LineWidth(disp)) parameters +static INLINE _glptr_LineWidth GET_LineWidth(struct _glapi_table *disp) { + return (_glptr_LineWidth) (GET_by_offset(disp, _gloffset_LineWidth)); +} + +static INLINE void SET_LineWidth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_LineWidth, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materialf)(GLenum, GLenum, GLfloat); +#define CALL_Materialf(disp, parameters) \ + (* GET_Materialf(disp)) parameters +static INLINE _glptr_Materialf GET_Materialf(struct _glapi_table *disp) { + return (_glptr_Materialf) (GET_by_offset(disp, _gloffset_Materialf)); +} + +static INLINE void SET_Materialf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_Materialf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materialfv)(GLenum, GLenum, const GLfloat *); +#define CALL_Materialfv(disp, parameters) \ + (* GET_Materialfv(disp)) parameters +static INLINE _glptr_Materialfv GET_Materialfv(struct _glapi_table *disp) { + return (_glptr_Materialfv) (GET_by_offset(disp, _gloffset_Materialfv)); +} + +static INLINE void SET_Materialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Materialfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materiali)(GLenum, GLenum, GLint); +#define CALL_Materiali(disp, parameters) \ + (* GET_Materiali(disp)) parameters +static INLINE _glptr_Materiali GET_Materiali(struct _glapi_table *disp) { + return (_glptr_Materiali) (GET_by_offset(disp, _gloffset_Materiali)); +} + +static INLINE void SET_Materiali(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_Materiali, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materialiv)(GLenum, GLenum, const GLint *); +#define CALL_Materialiv(disp, parameters) \ + (* GET_Materialiv(disp)) parameters +static INLINE _glptr_Materialiv GET_Materialiv(struct _glapi_table *disp) { + return (_glptr_Materialiv) (GET_by_offset(disp, _gloffset_Materialiv)); +} + +static INLINE void SET_Materialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_Materialiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointSize)(GLfloat); +#define CALL_PointSize(disp, parameters) \ + (* GET_PointSize(disp)) parameters +static INLINE _glptr_PointSize GET_PointSize(struct _glapi_table *disp) { + return (_glptr_PointSize) (GET_by_offset(disp, _gloffset_PointSize)); +} + +static INLINE void SET_PointSize(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_PointSize, fn); +} + +typedef void (GLAPIENTRYP _glptr_PolygonMode)(GLenum, GLenum); +#define CALL_PolygonMode(disp, parameters) \ + (* GET_PolygonMode(disp)) parameters +static INLINE _glptr_PolygonMode GET_PolygonMode(struct _glapi_table *disp) { + return (_glptr_PolygonMode) (GET_by_offset(disp, _gloffset_PolygonMode)); +} + +static INLINE void SET_PolygonMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_PolygonMode, fn); +} + +typedef void (GLAPIENTRYP _glptr_PolygonStipple)(const GLubyte *); +#define CALL_PolygonStipple(disp, parameters) \ + (* GET_PolygonStipple(disp)) parameters +static INLINE _glptr_PolygonStipple GET_PolygonStipple(struct _glapi_table *disp) { + return (_glptr_PolygonStipple) (GET_by_offset(disp, _gloffset_PolygonStipple)); +} + +static INLINE void SET_PolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) { + SET_by_offset(disp, _gloffset_PolygonStipple, fn); +} + +typedef void (GLAPIENTRYP _glptr_Scissor)(GLint, GLint, GLsizei, GLsizei); +#define CALL_Scissor(disp, parameters) \ + (* GET_Scissor(disp)) parameters +static INLINE _glptr_Scissor GET_Scissor(struct _glapi_table *disp) { + return (_glptr_Scissor) (GET_by_offset(disp, _gloffset_Scissor)); +} + +static INLINE void SET_Scissor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_Scissor, fn); +} + +typedef void (GLAPIENTRYP _glptr_ShadeModel)(GLenum); +#define CALL_ShadeModel(disp, parameters) \ + (* GET_ShadeModel(disp)) parameters +static INLINE _glptr_ShadeModel GET_ShadeModel(struct _glapi_table *disp) { + return (_glptr_ShadeModel) (GET_by_offset(disp, _gloffset_ShadeModel)); +} + +static INLINE void SET_ShadeModel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ShadeModel, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterf)(GLenum, GLenum, GLfloat); +#define CALL_TexParameterf(disp, parameters) \ + (* GET_TexParameterf(disp)) parameters +static INLINE _glptr_TexParameterf GET_TexParameterf(struct _glapi_table *disp) { + return (_glptr_TexParameterf) (GET_by_offset(disp, _gloffset_TexParameterf)); +} + +static INLINE void SET_TexParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_TexParameterf, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterfv)(GLenum, GLenum, const GLfloat *); +#define CALL_TexParameterfv(disp, parameters) \ + (* GET_TexParameterfv(disp)) parameters +static INLINE _glptr_TexParameterfv GET_TexParameterfv(struct _glapi_table *disp) { + return (_glptr_TexParameterfv) (GET_by_offset(disp, _gloffset_TexParameterfv)); +} + +static INLINE void SET_TexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameteri)(GLenum, GLenum, GLint); +#define CALL_TexParameteri(disp, parameters) \ + (* GET_TexParameteri(disp)) parameters +static INLINE _glptr_TexParameteri GET_TexParameteri(struct _glapi_table *disp) { + return (_glptr_TexParameteri) (GET_by_offset(disp, _gloffset_TexParameteri)); +} + +static INLINE void SET_TexParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_TexParameteri, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameteriv)(GLenum, GLenum, const GLint *); +#define CALL_TexParameteriv(disp, parameters) \ + (* GET_TexParameteriv(disp)) parameters +static INLINE _glptr_TexParameteriv GET_TexParameteriv(struct _glapi_table *disp) { + return (_glptr_TexParameteriv) (GET_by_offset(disp, _gloffset_TexParameteriv)); +} + +static INLINE void SET_TexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_TexParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +#define CALL_TexImage1D(disp, parameters) \ + (* GET_TexImage1D(disp)) parameters +static INLINE _glptr_TexImage1D GET_TexImage1D(struct _glapi_table *disp) { + return (_glptr_TexImage1D) (GET_by_offset(disp, _gloffset_TexImage1D)); +} + +static INLINE void SET_TexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +#define CALL_TexImage2D(disp, parameters) \ + (* GET_TexImage2D(disp)) parameters +static INLINE _glptr_TexImage2D GET_TexImage2D(struct _glapi_table *disp) { + return (_glptr_TexImage2D) (GET_by_offset(disp, _gloffset_TexImage2D)); +} + +static INLINE void SET_TexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnvf)(GLenum, GLenum, GLfloat); +#define CALL_TexEnvf(disp, parameters) \ + (* GET_TexEnvf(disp)) parameters +static INLINE _glptr_TexEnvf GET_TexEnvf(struct _glapi_table *disp) { + return (_glptr_TexEnvf) (GET_by_offset(disp, _gloffset_TexEnvf)); +} + +static INLINE void SET_TexEnvf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_TexEnvf, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnvfv)(GLenum, GLenum, const GLfloat *); +#define CALL_TexEnvfv(disp, parameters) \ + (* GET_TexEnvfv(disp)) parameters +static INLINE _glptr_TexEnvfv GET_TexEnvfv(struct _glapi_table *disp) { + return (_glptr_TexEnvfv) (GET_by_offset(disp, _gloffset_TexEnvfv)); +} + +static INLINE void SET_TexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexEnvfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnvi)(GLenum, GLenum, GLint); +#define CALL_TexEnvi(disp, parameters) \ + (* GET_TexEnvi(disp)) parameters +static INLINE _glptr_TexEnvi GET_TexEnvi(struct _glapi_table *disp) { + return (_glptr_TexEnvi) (GET_by_offset(disp, _gloffset_TexEnvi)); +} + +static INLINE void SET_TexEnvi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_TexEnvi, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnviv)(GLenum, GLenum, const GLint *); +#define CALL_TexEnviv(disp, parameters) \ + (* GET_TexEnviv(disp)) parameters +static INLINE _glptr_TexEnviv GET_TexEnviv(struct _glapi_table *disp) { + return (_glptr_TexEnviv) (GET_by_offset(disp, _gloffset_TexEnviv)); +} + +static INLINE void SET_TexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_TexEnviv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGend)(GLenum, GLenum, GLdouble); +#define CALL_TexGend(disp, parameters) \ + (* GET_TexGend(disp)) parameters +static INLINE _glptr_TexGend GET_TexGend(struct _glapi_table *disp) { + return (_glptr_TexGend) (GET_by_offset(disp, _gloffset_TexGend)); +} + +static INLINE void SET_TexGend(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble)) { + SET_by_offset(disp, _gloffset_TexGend, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGendv)(GLenum, GLenum, const GLdouble *); +#define CALL_TexGendv(disp, parameters) \ + (* GET_TexGendv(disp)) parameters +static INLINE _glptr_TexGendv GET_TexGendv(struct _glapi_table *disp) { + return (_glptr_TexGendv) (GET_by_offset(disp, _gloffset_TexGendv)); +} + +static INLINE void SET_TexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_TexGendv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGenf)(GLenum, GLenum, GLfloat); +#define CALL_TexGenf(disp, parameters) \ + (* GET_TexGenf(disp)) parameters +static INLINE _glptr_TexGenf GET_TexGenf(struct _glapi_table *disp) { + return (_glptr_TexGenf) (GET_by_offset(disp, _gloffset_TexGenf)); +} + +static INLINE void SET_TexGenf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_TexGenf, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGenfv)(GLenum, GLenum, const GLfloat *); +#define CALL_TexGenfv(disp, parameters) \ + (* GET_TexGenfv(disp)) parameters +static INLINE _glptr_TexGenfv GET_TexGenfv(struct _glapi_table *disp) { + return (_glptr_TexGenfv) (GET_by_offset(disp, _gloffset_TexGenfv)); +} + +static INLINE void SET_TexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexGenfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGeni)(GLenum, GLenum, GLint); +#define CALL_TexGeni(disp, parameters) \ + (* GET_TexGeni(disp)) parameters +static INLINE _glptr_TexGeni GET_TexGeni(struct _glapi_table *disp) { + return (_glptr_TexGeni) (GET_by_offset(disp, _gloffset_TexGeni)); +} + +static INLINE void SET_TexGeni(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_TexGeni, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGeniv)(GLenum, GLenum, const GLint *); +#define CALL_TexGeniv(disp, parameters) \ + (* GET_TexGeniv(disp)) parameters +static INLINE _glptr_TexGeniv GET_TexGeniv(struct _glapi_table *disp) { + return (_glptr_TexGeniv) (GET_by_offset(disp, _gloffset_TexGeniv)); +} + +static INLINE void SET_TexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_TexGeniv, fn); +} + +typedef void (GLAPIENTRYP _glptr_FeedbackBuffer)(GLsizei, GLenum, GLfloat *); +#define CALL_FeedbackBuffer(disp, parameters) \ + (* GET_FeedbackBuffer(disp)) parameters +static INLINE _glptr_FeedbackBuffer GET_FeedbackBuffer(struct _glapi_table *disp) { + return (_glptr_FeedbackBuffer) (GET_by_offset(disp, _gloffset_FeedbackBuffer)); +} + +static INLINE void SET_FeedbackBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_FeedbackBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_SelectBuffer)(GLsizei, GLuint *); +#define CALL_SelectBuffer(disp, parameters) \ + (* GET_SelectBuffer(disp)) parameters +static INLINE _glptr_SelectBuffer GET_SelectBuffer(struct _glapi_table *disp) { + return (_glptr_SelectBuffer) (GET_by_offset(disp, _gloffset_SelectBuffer)); +} + +static INLINE void SET_SelectBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_SelectBuffer, fn); +} + +typedef GLint (GLAPIENTRYP _glptr_RenderMode)(GLenum); +#define CALL_RenderMode(disp, parameters) \ + (* GET_RenderMode(disp)) parameters +static INLINE _glptr_RenderMode GET_RenderMode(struct _glapi_table *disp) { + return (_glptr_RenderMode) (GET_by_offset(disp, _gloffset_RenderMode)); +} + +static INLINE void SET_RenderMode(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_RenderMode, fn); +} + +typedef void (GLAPIENTRYP _glptr_InitNames)(void); +#define CALL_InitNames(disp, parameters) \ + (* GET_InitNames(disp)) parameters +static INLINE _glptr_InitNames GET_InitNames(struct _glapi_table *disp) { + return (_glptr_InitNames) (GET_by_offset(disp, _gloffset_InitNames)); +} + +static INLINE void SET_InitNames(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_InitNames, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadName)(GLuint); +#define CALL_LoadName(disp, parameters) \ + (* GET_LoadName(disp)) parameters +static INLINE _glptr_LoadName GET_LoadName(struct _glapi_table *disp) { + return (_glptr_LoadName) (GET_by_offset(disp, _gloffset_LoadName)); +} + +static INLINE void SET_LoadName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_LoadName, fn); +} + +typedef void (GLAPIENTRYP _glptr_PassThrough)(GLfloat); +#define CALL_PassThrough(disp, parameters) \ + (* GET_PassThrough(disp)) parameters +static INLINE _glptr_PassThrough GET_PassThrough(struct _glapi_table *disp) { + return (_glptr_PassThrough) (GET_by_offset(disp, _gloffset_PassThrough)); +} + +static INLINE void SET_PassThrough(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_PassThrough, fn); +} + +typedef void (GLAPIENTRYP _glptr_PopName)(void); +#define CALL_PopName(disp, parameters) \ + (* GET_PopName(disp)) parameters +static INLINE _glptr_PopName GET_PopName(struct _glapi_table *disp) { + return (_glptr_PopName) (GET_by_offset(disp, _gloffset_PopName)); +} + +static INLINE void SET_PopName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PopName, fn); +} + +typedef void (GLAPIENTRYP _glptr_PushName)(GLuint); +#define CALL_PushName(disp, parameters) \ + (* GET_PushName(disp)) parameters +static INLINE _glptr_PushName GET_PushName(struct _glapi_table *disp) { + return (_glptr_PushName) (GET_by_offset(disp, _gloffset_PushName)); +} + +static INLINE void SET_PushName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_PushName, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawBuffer)(GLenum); +#define CALL_DrawBuffer(disp, parameters) \ + (* GET_DrawBuffer(disp)) parameters +static INLINE _glptr_DrawBuffer GET_DrawBuffer(struct _glapi_table *disp) { + return (_glptr_DrawBuffer) (GET_by_offset(disp, _gloffset_DrawBuffer)); +} + +static INLINE void SET_DrawBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_DrawBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_Clear)(GLbitfield); +#define CALL_Clear(disp, parameters) \ + (* GET_Clear(disp)) parameters +static INLINE _glptr_Clear GET_Clear(struct _glapi_table *disp) { + return (_glptr_Clear) (GET_by_offset(disp, _gloffset_Clear)); +} + +static INLINE void SET_Clear(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) { + SET_by_offset(disp, _gloffset_Clear, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearAccum)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ClearAccum(disp, parameters) \ + (* GET_ClearAccum(disp)) parameters +static INLINE _glptr_ClearAccum GET_ClearAccum(struct _glapi_table *disp) { + return (_glptr_ClearAccum) (GET_by_offset(disp, _gloffset_ClearAccum)); +} + +static INLINE void SET_ClearAccum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ClearAccum, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearIndex)(GLfloat); +#define CALL_ClearIndex(disp, parameters) \ + (* GET_ClearIndex(disp)) parameters +static INLINE _glptr_ClearIndex GET_ClearIndex(struct _glapi_table *disp) { + return (_glptr_ClearIndex) (GET_by_offset(disp, _gloffset_ClearIndex)); +} + +static INLINE void SET_ClearIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_ClearIndex, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf); +#define CALL_ClearColor(disp, parameters) \ + (* GET_ClearColor(disp)) parameters +static INLINE _glptr_ClearColor GET_ClearColor(struct _glapi_table *disp) { + return (_glptr_ClearColor) (GET_by_offset(disp, _gloffset_ClearColor)); +} + +static INLINE void SET_ClearColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) { + SET_by_offset(disp, _gloffset_ClearColor, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearStencil)(GLint); +#define CALL_ClearStencil(disp, parameters) \ + (* GET_ClearStencil(disp)) parameters +static INLINE _glptr_ClearStencil GET_ClearStencil(struct _glapi_table *disp) { + return (_glptr_ClearStencil) (GET_by_offset(disp, _gloffset_ClearStencil)); +} + +static INLINE void SET_ClearStencil(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) { + SET_by_offset(disp, _gloffset_ClearStencil, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearDepth)(GLclampd); +#define CALL_ClearDepth(disp, parameters) \ + (* GET_ClearDepth(disp)) parameters +static INLINE _glptr_ClearDepth GET_ClearDepth(struct _glapi_table *disp) { + return (_glptr_ClearDepth) (GET_by_offset(disp, _gloffset_ClearDepth)); +} + +static INLINE void SET_ClearDepth(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd)) { + SET_by_offset(disp, _gloffset_ClearDepth, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilMask)(GLuint); +#define CALL_StencilMask(disp, parameters) \ + (* GET_StencilMask(disp)) parameters +static INLINE _glptr_StencilMask GET_StencilMask(struct _glapi_table *disp) { + return (_glptr_StencilMask) (GET_by_offset(disp, _gloffset_StencilMask)); +} + +static INLINE void SET_StencilMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_StencilMask, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorMask)(GLboolean, GLboolean, GLboolean, GLboolean); +#define CALL_ColorMask(disp, parameters) \ + (* GET_ColorMask(disp)) parameters +static INLINE _glptr_ColorMask GET_ColorMask(struct _glapi_table *disp) { + return (_glptr_ColorMask) (GET_by_offset(disp, _gloffset_ColorMask)); +} + +static INLINE void SET_ColorMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean, GLboolean, GLboolean, GLboolean)) { + SET_by_offset(disp, _gloffset_ColorMask, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthMask)(GLboolean); +#define CALL_DepthMask(disp, parameters) \ + (* GET_DepthMask(disp)) parameters +static INLINE _glptr_DepthMask GET_DepthMask(struct _glapi_table *disp) { + return (_glptr_DepthMask) (GET_by_offset(disp, _gloffset_DepthMask)); +} + +static INLINE void SET_DepthMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLboolean)) { + SET_by_offset(disp, _gloffset_DepthMask, fn); +} + +typedef void (GLAPIENTRYP _glptr_IndexMask)(GLuint); +#define CALL_IndexMask(disp, parameters) \ + (* GET_IndexMask(disp)) parameters +static INLINE _glptr_IndexMask GET_IndexMask(struct _glapi_table *disp) { + return (_glptr_IndexMask) (GET_by_offset(disp, _gloffset_IndexMask)); +} + +static INLINE void SET_IndexMask(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IndexMask, fn); +} + +typedef void (GLAPIENTRYP _glptr_Accum)(GLenum, GLfloat); +#define CALL_Accum(disp, parameters) \ + (* GET_Accum(disp)) parameters +static INLINE _glptr_Accum GET_Accum(struct _glapi_table *disp) { + return (_glptr_Accum) (GET_by_offset(disp, _gloffset_Accum)); +} + +static INLINE void SET_Accum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_Accum, fn); +} + +typedef void (GLAPIENTRYP _glptr_Disable)(GLenum); +#define CALL_Disable(disp, parameters) \ + (* GET_Disable(disp)) parameters +static INLINE _glptr_Disable GET_Disable(struct _glapi_table *disp) { + return (_glptr_Disable) (GET_by_offset(disp, _gloffset_Disable)); +} + +static INLINE void SET_Disable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_Disable, fn); +} + +typedef void (GLAPIENTRYP _glptr_Enable)(GLenum); +#define CALL_Enable(disp, parameters) \ + (* GET_Enable(disp)) parameters +static INLINE _glptr_Enable GET_Enable(struct _glapi_table *disp) { + return (_glptr_Enable) (GET_by_offset(disp, _gloffset_Enable)); +} + +static INLINE void SET_Enable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_Enable, fn); +} + +typedef void (GLAPIENTRYP _glptr_Finish)(void); +#define CALL_Finish(disp, parameters) \ + (* GET_Finish(disp)) parameters +static INLINE _glptr_Finish GET_Finish(struct _glapi_table *disp) { + return (_glptr_Finish) (GET_by_offset(disp, _gloffset_Finish)); +} + +static INLINE void SET_Finish(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_Finish, fn); +} + +typedef void (GLAPIENTRYP _glptr_Flush)(void); +#define CALL_Flush(disp, parameters) \ + (* GET_Flush(disp)) parameters +static INLINE _glptr_Flush GET_Flush(struct _glapi_table *disp) { + return (_glptr_Flush) (GET_by_offset(disp, _gloffset_Flush)); +} + +static INLINE void SET_Flush(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_Flush, fn); +} + +typedef void (GLAPIENTRYP _glptr_PopAttrib)(void); +#define CALL_PopAttrib(disp, parameters) \ + (* GET_PopAttrib(disp)) parameters +static INLINE _glptr_PopAttrib GET_PopAttrib(struct _glapi_table *disp) { + return (_glptr_PopAttrib) (GET_by_offset(disp, _gloffset_PopAttrib)); +} + +static INLINE void SET_PopAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PopAttrib, fn); +} + +typedef void (GLAPIENTRYP _glptr_PushAttrib)(GLbitfield); +#define CALL_PushAttrib(disp, parameters) \ + (* GET_PushAttrib(disp)) parameters +static INLINE _glptr_PushAttrib GET_PushAttrib(struct _glapi_table *disp) { + return (_glptr_PushAttrib) (GET_by_offset(disp, _gloffset_PushAttrib)); +} + +static INLINE void SET_PushAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) { + SET_by_offset(disp, _gloffset_PushAttrib, fn); +} + +typedef void (GLAPIENTRYP _glptr_Map1d)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *); +#define CALL_Map1d(disp, parameters) \ + (* GET_Map1d(disp)) parameters +static INLINE _glptr_Map1d GET_Map1d(struct _glapi_table *disp) { + return (_glptr_Map1d) (GET_by_offset(disp, _gloffset_Map1d)); +} + +static INLINE void SET_Map1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_Map1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Map1f)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *); +#define CALL_Map1f(disp, parameters) \ + (* GET_Map1f(disp)) parameters +static INLINE _glptr_Map1f GET_Map1f(struct _glapi_table *disp) { + return (_glptr_Map1f) (GET_by_offset(disp, _gloffset_Map1f)); +} + +static INLINE void SET_Map1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Map1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Map2d)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *); +#define CALL_Map2d(disp, parameters) \ + (* GET_Map2d(disp)) parameters +static INLINE _glptr_Map2d GET_Map2d(struct _glapi_table *disp) { + return (_glptr_Map2d) (GET_by_offset(disp, _gloffset_Map2d)); +} + +static INLINE void SET_Map2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_Map2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_Map2f)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *); +#define CALL_Map2f(disp, parameters) \ + (* GET_Map2f(disp)) parameters +static INLINE _glptr_Map2f GET_Map2f(struct _glapi_table *disp) { + return (_glptr_Map2f) (GET_by_offset(disp, _gloffset_Map2f)); +} + +static INLINE void SET_Map2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Map2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_MapGrid1d)(GLint, GLdouble, GLdouble); +#define CALL_MapGrid1d(disp, parameters) \ + (* GET_MapGrid1d(disp)) parameters +static INLINE _glptr_MapGrid1d GET_MapGrid1d(struct _glapi_table *disp) { + return (_glptr_MapGrid1d) (GET_by_offset(disp, _gloffset_MapGrid1d)); +} + +static INLINE void SET_MapGrid1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_MapGrid1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MapGrid1f)(GLint, GLfloat, GLfloat); +#define CALL_MapGrid1f(disp, parameters) \ + (* GET_MapGrid1f(disp)) parameters +static INLINE _glptr_MapGrid1f GET_MapGrid1f(struct _glapi_table *disp) { + return (_glptr_MapGrid1f) (GET_by_offset(disp, _gloffset_MapGrid1f)); +} + +static INLINE void SET_MapGrid1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_MapGrid1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_MapGrid2d)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble); +#define CALL_MapGrid2d(disp, parameters) \ + (* GET_MapGrid2d(disp)) parameters +static INLINE _glptr_MapGrid2d GET_MapGrid2d(struct _glapi_table *disp) { + return (_glptr_MapGrid2d) (GET_by_offset(disp, _gloffset_MapGrid2d)); +} + +static INLINE void SET_MapGrid2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLdouble, GLdouble, GLint, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_MapGrid2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MapGrid2f)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat); +#define CALL_MapGrid2f(disp, parameters) \ + (* GET_MapGrid2f(disp)) parameters +static INLINE _glptr_MapGrid2f GET_MapGrid2f(struct _glapi_table *disp) { + return (_glptr_MapGrid2f) (GET_by_offset(disp, _gloffset_MapGrid2f)); +} + +static INLINE void SET_MapGrid2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_MapGrid2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord1d)(GLdouble); +#define CALL_EvalCoord1d(disp, parameters) \ + (* GET_EvalCoord1d(disp)) parameters +static INLINE _glptr_EvalCoord1d GET_EvalCoord1d(struct _glapi_table *disp) { + return (_glptr_EvalCoord1d) (GET_by_offset(disp, _gloffset_EvalCoord1d)); +} + +static INLINE void SET_EvalCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) { + SET_by_offset(disp, _gloffset_EvalCoord1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord1dv)(const GLdouble *); +#define CALL_EvalCoord1dv(disp, parameters) \ + (* GET_EvalCoord1dv(disp)) parameters +static INLINE _glptr_EvalCoord1dv GET_EvalCoord1dv(struct _glapi_table *disp) { + return (_glptr_EvalCoord1dv) (GET_by_offset(disp, _gloffset_EvalCoord1dv)); +} + +static INLINE void SET_EvalCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_EvalCoord1dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord1f)(GLfloat); +#define CALL_EvalCoord1f(disp, parameters) \ + (* GET_EvalCoord1f(disp)) parameters +static INLINE _glptr_EvalCoord1f GET_EvalCoord1f(struct _glapi_table *disp) { + return (_glptr_EvalCoord1f) (GET_by_offset(disp, _gloffset_EvalCoord1f)); +} + +static INLINE void SET_EvalCoord1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_EvalCoord1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord1fv)(const GLfloat *); +#define CALL_EvalCoord1fv(disp, parameters) \ + (* GET_EvalCoord1fv(disp)) parameters +static INLINE _glptr_EvalCoord1fv GET_EvalCoord1fv(struct _glapi_table *disp) { + return (_glptr_EvalCoord1fv) (GET_by_offset(disp, _gloffset_EvalCoord1fv)); +} + +static INLINE void SET_EvalCoord1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_EvalCoord1fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord2d)(GLdouble, GLdouble); +#define CALL_EvalCoord2d(disp, parameters) \ + (* GET_EvalCoord2d(disp)) parameters +static INLINE _glptr_EvalCoord2d GET_EvalCoord2d(struct _glapi_table *disp) { + return (_glptr_EvalCoord2d) (GET_by_offset(disp, _gloffset_EvalCoord2d)); +} + +static INLINE void SET_EvalCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_EvalCoord2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord2dv)(const GLdouble *); +#define CALL_EvalCoord2dv(disp, parameters) \ + (* GET_EvalCoord2dv(disp)) parameters +static INLINE _glptr_EvalCoord2dv GET_EvalCoord2dv(struct _glapi_table *disp) { + return (_glptr_EvalCoord2dv) (GET_by_offset(disp, _gloffset_EvalCoord2dv)); +} + +static INLINE void SET_EvalCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_EvalCoord2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord2f)(GLfloat, GLfloat); +#define CALL_EvalCoord2f(disp, parameters) \ + (* GET_EvalCoord2f(disp)) parameters +static INLINE _glptr_EvalCoord2f GET_EvalCoord2f(struct _glapi_table *disp) { + return (_glptr_EvalCoord2f) (GET_by_offset(disp, _gloffset_EvalCoord2f)); +} + +static INLINE void SET_EvalCoord2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_EvalCoord2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalCoord2fv)(const GLfloat *); +#define CALL_EvalCoord2fv(disp, parameters) \ + (* GET_EvalCoord2fv(disp)) parameters +static INLINE _glptr_EvalCoord2fv GET_EvalCoord2fv(struct _glapi_table *disp) { + return (_glptr_EvalCoord2fv) (GET_by_offset(disp, _gloffset_EvalCoord2fv)); +} + +static INLINE void SET_EvalCoord2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_EvalCoord2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalMesh1)(GLenum, GLint, GLint); +#define CALL_EvalMesh1(disp, parameters) \ + (* GET_EvalMesh1(disp)) parameters +static INLINE _glptr_EvalMesh1 GET_EvalMesh1(struct _glapi_table *disp) { + return (_glptr_EvalMesh1) (GET_by_offset(disp, _gloffset_EvalMesh1)); +} + +static INLINE void SET_EvalMesh1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) { + SET_by_offset(disp, _gloffset_EvalMesh1, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalPoint1)(GLint); +#define CALL_EvalPoint1(disp, parameters) \ + (* GET_EvalPoint1(disp)) parameters +static INLINE _glptr_EvalPoint1 GET_EvalPoint1(struct _glapi_table *disp) { + return (_glptr_EvalPoint1) (GET_by_offset(disp, _gloffset_EvalPoint1)); +} + +static INLINE void SET_EvalPoint1(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) { + SET_by_offset(disp, _gloffset_EvalPoint1, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalMesh2)(GLenum, GLint, GLint, GLint, GLint); +#define CALL_EvalMesh2(disp, parameters) \ + (* GET_EvalMesh2(disp)) parameters +static INLINE _glptr_EvalMesh2 GET_EvalMesh2(struct _glapi_table *disp) { + return (_glptr_EvalMesh2) (GET_by_offset(disp, _gloffset_EvalMesh2)); +} + +static INLINE void SET_EvalMesh2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_EvalMesh2, fn); +} + +typedef void (GLAPIENTRYP _glptr_EvalPoint2)(GLint, GLint); +#define CALL_EvalPoint2(disp, parameters) \ + (* GET_EvalPoint2(disp)) parameters +static INLINE _glptr_EvalPoint2 GET_EvalPoint2(struct _glapi_table *disp) { + return (_glptr_EvalPoint2) (GET_by_offset(disp, _gloffset_EvalPoint2)); +} + +static INLINE void SET_EvalPoint2(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_EvalPoint2, fn); +} + +typedef void (GLAPIENTRYP _glptr_AlphaFunc)(GLenum, GLclampf); +#define CALL_AlphaFunc(disp, parameters) \ + (* GET_AlphaFunc(disp)) parameters +static INLINE _glptr_AlphaFunc GET_AlphaFunc(struct _glapi_table *disp) { + return (_glptr_AlphaFunc) (GET_by_offset(disp, _gloffset_AlphaFunc)); +} + +static INLINE void SET_AlphaFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampf)) { + SET_by_offset(disp, _gloffset_AlphaFunc, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendFunc)(GLenum, GLenum); +#define CALL_BlendFunc(disp, parameters) \ + (* GET_BlendFunc(disp)) parameters +static INLINE _glptr_BlendFunc GET_BlendFunc(struct _glapi_table *disp) { + return (_glptr_BlendFunc) (GET_by_offset(disp, _gloffset_BlendFunc)); +} + +static INLINE void SET_BlendFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendFunc, fn); +} + +typedef void (GLAPIENTRYP _glptr_LogicOp)(GLenum); +#define CALL_LogicOp(disp, parameters) \ + (* GET_LogicOp(disp)) parameters +static INLINE _glptr_LogicOp GET_LogicOp(struct _glapi_table *disp) { + return (_glptr_LogicOp) (GET_by_offset(disp, _gloffset_LogicOp)); +} + +static INLINE void SET_LogicOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_LogicOp, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilFunc)(GLenum, GLint, GLuint); +#define CALL_StencilFunc(disp, parameters) \ + (* GET_StencilFunc(disp)) parameters +static INLINE _glptr_StencilFunc GET_StencilFunc(struct _glapi_table *disp) { + return (_glptr_StencilFunc) (GET_by_offset(disp, _gloffset_StencilFunc)); +} + +static INLINE void SET_StencilFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLuint)) { + SET_by_offset(disp, _gloffset_StencilFunc, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilOp)(GLenum, GLenum, GLenum); +#define CALL_StencilOp(disp, parameters) \ + (* GET_StencilOp(disp)) parameters +static INLINE _glptr_StencilOp GET_StencilOp(struct _glapi_table *disp) { + return (_glptr_StencilOp) (GET_by_offset(disp, _gloffset_StencilOp)); +} + +static INLINE void SET_StencilOp(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_StencilOp, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthFunc)(GLenum); +#define CALL_DepthFunc(disp, parameters) \ + (* GET_DepthFunc(disp)) parameters +static INLINE _glptr_DepthFunc GET_DepthFunc(struct _glapi_table *disp) { + return (_glptr_DepthFunc) (GET_by_offset(disp, _gloffset_DepthFunc)); +} + +static INLINE void SET_DepthFunc(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_DepthFunc, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelZoom)(GLfloat, GLfloat); +#define CALL_PixelZoom(disp, parameters) \ + (* GET_PixelZoom(disp)) parameters +static INLINE _glptr_PixelZoom GET_PixelZoom(struct _glapi_table *disp) { + return (_glptr_PixelZoom) (GET_by_offset(disp, _gloffset_PixelZoom)); +} + +static INLINE void SET_PixelZoom(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_PixelZoom, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelTransferf)(GLenum, GLfloat); +#define CALL_PixelTransferf(disp, parameters) \ + (* GET_PixelTransferf(disp)) parameters +static INLINE _glptr_PixelTransferf GET_PixelTransferf(struct _glapi_table *disp) { + return (_glptr_PixelTransferf) (GET_by_offset(disp, _gloffset_PixelTransferf)); +} + +static INLINE void SET_PixelTransferf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_PixelTransferf, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelTransferi)(GLenum, GLint); +#define CALL_PixelTransferi(disp, parameters) \ + (* GET_PixelTransferi(disp)) parameters +static INLINE _glptr_PixelTransferi GET_PixelTransferi(struct _glapi_table *disp) { + return (_glptr_PixelTransferi) (GET_by_offset(disp, _gloffset_PixelTransferi)); +} + +static INLINE void SET_PixelTransferi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_PixelTransferi, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelStoref)(GLenum, GLfloat); +#define CALL_PixelStoref(disp, parameters) \ + (* GET_PixelStoref(disp)) parameters +static INLINE _glptr_PixelStoref GET_PixelStoref(struct _glapi_table *disp) { + return (_glptr_PixelStoref) (GET_by_offset(disp, _gloffset_PixelStoref)); +} + +static INLINE void SET_PixelStoref(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_PixelStoref, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelStorei)(GLenum, GLint); +#define CALL_PixelStorei(disp, parameters) \ + (* GET_PixelStorei(disp)) parameters +static INLINE _glptr_PixelStorei GET_PixelStorei(struct _glapi_table *disp) { + return (_glptr_PixelStorei) (GET_by_offset(disp, _gloffset_PixelStorei)); +} + +static INLINE void SET_PixelStorei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_PixelStorei, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelMapfv)(GLenum, GLsizei, const GLfloat *); +#define CALL_PixelMapfv(disp, parameters) \ + (* GET_PixelMapfv(disp)) parameters +static INLINE _glptr_PixelMapfv GET_PixelMapfv(struct _glapi_table *disp) { + return (_glptr_PixelMapfv) (GET_by_offset(disp, _gloffset_PixelMapfv)); +} + +static INLINE void SET_PixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_PixelMapfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelMapuiv)(GLenum, GLsizei, const GLuint *); +#define CALL_PixelMapuiv(disp, parameters) \ + (* GET_PixelMapuiv(disp)) parameters +static INLINE _glptr_PixelMapuiv GET_PixelMapuiv(struct _glapi_table *disp) { + return (_glptr_PixelMapuiv) (GET_by_offset(disp, _gloffset_PixelMapuiv)); +} + +static INLINE void SET_PixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_PixelMapuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_PixelMapusv)(GLenum, GLsizei, const GLushort *); +#define CALL_PixelMapusv(disp, parameters) \ + (* GET_PixelMapusv(disp)) parameters +static INLINE _glptr_PixelMapusv GET_PixelMapusv(struct _glapi_table *disp) { + return (_glptr_PixelMapusv) (GET_by_offset(disp, _gloffset_PixelMapusv)); +} + +static INLINE void SET_PixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLushort *)) { + SET_by_offset(disp, _gloffset_PixelMapusv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ReadBuffer)(GLenum); +#define CALL_ReadBuffer(disp, parameters) \ + (* GET_ReadBuffer(disp)) parameters +static INLINE _glptr_ReadBuffer GET_ReadBuffer(struct _glapi_table *disp) { + return (_glptr_ReadBuffer) (GET_by_offset(disp, _gloffset_ReadBuffer)); +} + +static INLINE void SET_ReadBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ReadBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyPixels)(GLint, GLint, GLsizei, GLsizei, GLenum); +#define CALL_CopyPixels(disp, parameters) \ + (* GET_CopyPixels(disp)) parameters +static INLINE _glptr_CopyPixels GET_CopyPixels(struct _glapi_table *disp) { + return (_glptr_CopyPixels) (GET_by_offset(disp, _gloffset_CopyPixels)); +} + +static INLINE void SET_CopyPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum)) { + SET_by_offset(disp, _gloffset_CopyPixels, fn); +} + +typedef void (GLAPIENTRYP _glptr_ReadPixels)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *); +#define CALL_ReadPixels(disp, parameters) \ + (* GET_ReadPixels(disp)) parameters +static INLINE _glptr_ReadPixels GET_ReadPixels(struct _glapi_table *disp) { + return (_glptr_ReadPixels) (GET_by_offset(disp, _gloffset_ReadPixels)); +} + +static INLINE void SET_ReadPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_ReadPixels, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawPixels)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_DrawPixels(disp, parameters) \ + (* GET_DrawPixels(disp)) parameters +static INLINE _glptr_DrawPixels GET_DrawPixels(struct _glapi_table *disp) { + return (_glptr_DrawPixels) (GET_by_offset(disp, _gloffset_DrawPixels)); +} + +static INLINE void SET_DrawPixels(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DrawPixels, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBooleanv)(GLenum, GLboolean *); +#define CALL_GetBooleanv(disp, parameters) \ + (* GET_GetBooleanv(disp)) parameters +static INLINE _glptr_GetBooleanv GET_GetBooleanv(struct _glapi_table *disp) { + return (_glptr_GetBooleanv) (GET_by_offset(disp, _gloffset_GetBooleanv)); +} + +static INLINE void SET_GetBooleanv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean *)) { + SET_by_offset(disp, _gloffset_GetBooleanv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetClipPlane)(GLenum, GLdouble *); +#define CALL_GetClipPlane(disp, parameters) \ + (* GET_GetClipPlane(disp)) parameters +static INLINE _glptr_GetClipPlane GET_GetClipPlane(struct _glapi_table *disp) { + return (_glptr_GetClipPlane) (GET_by_offset(disp, _gloffset_GetClipPlane)); +} + +static INLINE void SET_GetClipPlane(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetClipPlane, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetDoublev)(GLenum, GLdouble *); +#define CALL_GetDoublev(disp, parameters) \ + (* GET_GetDoublev(disp)) parameters +static INLINE _glptr_GetDoublev GET_GetDoublev(struct _glapi_table *disp) { + return (_glptr_GetDoublev) (GET_by_offset(disp, _gloffset_GetDoublev)); +} + +static INLINE void SET_GetDoublev(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetDoublev, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_GetError)(void); +#define CALL_GetError(disp, parameters) \ + (* GET_GetError(disp)) parameters +static INLINE _glptr_GetError GET_GetError(struct _glapi_table *disp) { + return (_glptr_GetError) (GET_by_offset(disp, _gloffset_GetError)); +} + +static INLINE void SET_GetError(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_GetError, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetFloatv)(GLenum, GLfloat *); +#define CALL_GetFloatv(disp, parameters) \ + (* GET_GetFloatv(disp)) parameters +static INLINE _glptr_GetFloatv GET_GetFloatv(struct _glapi_table *disp) { + return (_glptr_GetFloatv) (GET_by_offset(disp, _gloffset_GetFloatv)); +} + +static INLINE void SET_GetFloatv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetFloatv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetIntegerv)(GLenum, GLint *); +#define CALL_GetIntegerv(disp, parameters) \ + (* GET_GetIntegerv(disp)) parameters +static INLINE _glptr_GetIntegerv GET_GetIntegerv(struct _glapi_table *disp) { + return (_glptr_GetIntegerv) (GET_by_offset(disp, _gloffset_GetIntegerv)); +} + +static INLINE void SET_GetIntegerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetIntegerv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetLightfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetLightfv(disp, parameters) \ + (* GET_GetLightfv(disp)) parameters +static INLINE _glptr_GetLightfv GET_GetLightfv(struct _glapi_table *disp) { + return (_glptr_GetLightfv) (GET_by_offset(disp, _gloffset_GetLightfv)); +} + +static INLINE void SET_GetLightfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetLightfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetLightiv)(GLenum, GLenum, GLint *); +#define CALL_GetLightiv(disp, parameters) \ + (* GET_GetLightiv(disp)) parameters +static INLINE _glptr_GetLightiv GET_GetLightiv(struct _glapi_table *disp) { + return (_glptr_GetLightiv) (GET_by_offset(disp, _gloffset_GetLightiv)); +} + +static INLINE void SET_GetLightiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetLightiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMapdv)(GLenum, GLenum, GLdouble *); +#define CALL_GetMapdv(disp, parameters) \ + (* GET_GetMapdv(disp)) parameters +static INLINE _glptr_GetMapdv GET_GetMapdv(struct _glapi_table *disp) { + return (_glptr_GetMapdv) (GET_by_offset(disp, _gloffset_GetMapdv)); +} + +static INLINE void SET_GetMapdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetMapdv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMapfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetMapfv(disp, parameters) \ + (* GET_GetMapfv(disp)) parameters +static INLINE _glptr_GetMapfv GET_GetMapfv(struct _glapi_table *disp) { + return (_glptr_GetMapfv) (GET_by_offset(disp, _gloffset_GetMapfv)); +} + +static INLINE void SET_GetMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetMapfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMapiv)(GLenum, GLenum, GLint *); +#define CALL_GetMapiv(disp, parameters) \ + (* GET_GetMapiv(disp)) parameters +static INLINE _glptr_GetMapiv GET_GetMapiv(struct _glapi_table *disp) { + return (_glptr_GetMapiv) (GET_by_offset(disp, _gloffset_GetMapiv)); +} + +static INLINE void SET_GetMapiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetMapiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMaterialfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetMaterialfv(disp, parameters) \ + (* GET_GetMaterialfv(disp)) parameters +static INLINE _glptr_GetMaterialfv GET_GetMaterialfv(struct _glapi_table *disp) { + return (_glptr_GetMaterialfv) (GET_by_offset(disp, _gloffset_GetMaterialfv)); +} + +static INLINE void SET_GetMaterialfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetMaterialfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMaterialiv)(GLenum, GLenum, GLint *); +#define CALL_GetMaterialiv(disp, parameters) \ + (* GET_GetMaterialiv(disp)) parameters +static INLINE _glptr_GetMaterialiv GET_GetMaterialiv(struct _glapi_table *disp) { + return (_glptr_GetMaterialiv) (GET_by_offset(disp, _gloffset_GetMaterialiv)); +} + +static INLINE void SET_GetMaterialiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetMaterialiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPixelMapfv)(GLenum, GLfloat *); +#define CALL_GetPixelMapfv(disp, parameters) \ + (* GET_GetPixelMapfv(disp)) parameters +static INLINE _glptr_GetPixelMapfv GET_GetPixelMapfv(struct _glapi_table *disp) { + return (_glptr_GetPixelMapfv) (GET_by_offset(disp, _gloffset_GetPixelMapfv)); +} + +static INLINE void SET_GetPixelMapfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetPixelMapfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPixelMapuiv)(GLenum, GLuint *); +#define CALL_GetPixelMapuiv(disp, parameters) \ + (* GET_GetPixelMapuiv(disp)) parameters +static INLINE _glptr_GetPixelMapuiv GET_GetPixelMapuiv(struct _glapi_table *disp) { + return (_glptr_GetPixelMapuiv) (GET_by_offset(disp, _gloffset_GetPixelMapuiv)); +} + +static INLINE void SET_GetPixelMapuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPixelMapuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPixelMapusv)(GLenum, GLushort *); +#define CALL_GetPixelMapusv(disp, parameters) \ + (* GET_GetPixelMapusv(disp)) parameters +static INLINE _glptr_GetPixelMapusv GET_GetPixelMapusv(struct _glapi_table *disp) { + return (_glptr_GetPixelMapusv) (GET_by_offset(disp, _gloffset_GetPixelMapusv)); +} + +static INLINE void SET_GetPixelMapusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLushort *)) { + SET_by_offset(disp, _gloffset_GetPixelMapusv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPolygonStipple)(GLubyte *); +#define CALL_GetPolygonStipple(disp, parameters) \ + (* GET_GetPolygonStipple(disp)) parameters +static INLINE _glptr_GetPolygonStipple GET_GetPolygonStipple(struct _glapi_table *disp) { + return (_glptr_GetPolygonStipple) (GET_by_offset(disp, _gloffset_GetPolygonStipple)); +} + +static INLINE void SET_GetPolygonStipple(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte *)) { + SET_by_offset(disp, _gloffset_GetPolygonStipple, fn); +} + +typedef const GLubyte * (GLAPIENTRYP _glptr_GetString)(GLenum); +#define CALL_GetString(disp, parameters) \ + (* GET_GetString(disp)) parameters +static INLINE _glptr_GetString GET_GetString(struct _glapi_table *disp) { + return (_glptr_GetString) (GET_by_offset(disp, _gloffset_GetString)); +} + +static INLINE void SET_GetString(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_GetString, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexEnvfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetTexEnvfv(disp, parameters) \ + (* GET_GetTexEnvfv(disp)) parameters +static INLINE _glptr_GetTexEnvfv GET_GetTexEnvfv(struct _glapi_table *disp) { + return (_glptr_GetTexEnvfv) (GET_by_offset(disp, _gloffset_GetTexEnvfv)); +} + +static INLINE void SET_GetTexEnvfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetTexEnvfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexEnviv)(GLenum, GLenum, GLint *); +#define CALL_GetTexEnviv(disp, parameters) \ + (* GET_GetTexEnviv(disp)) parameters +static INLINE _glptr_GetTexEnviv GET_GetTexEnviv(struct _glapi_table *disp) { + return (_glptr_GetTexEnviv) (GET_by_offset(disp, _gloffset_GetTexEnviv)); +} + +static INLINE void SET_GetTexEnviv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexEnviv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexGendv)(GLenum, GLenum, GLdouble *); +#define CALL_GetTexGendv(disp, parameters) \ + (* GET_GetTexGendv(disp)) parameters +static INLINE _glptr_GetTexGendv GET_GetTexGendv(struct _glapi_table *disp) { + return (_glptr_GetTexGendv) (GET_by_offset(disp, _gloffset_GetTexGendv)); +} + +static INLINE void SET_GetTexGendv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetTexGendv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexGenfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetTexGenfv(disp, parameters) \ + (* GET_GetTexGenfv(disp)) parameters +static INLINE _glptr_GetTexGenfv GET_GetTexGenfv(struct _glapi_table *disp) { + return (_glptr_GetTexGenfv) (GET_by_offset(disp, _gloffset_GetTexGenfv)); +} + +static INLINE void SET_GetTexGenfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetTexGenfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexGeniv)(GLenum, GLenum, GLint *); +#define CALL_GetTexGeniv(disp, parameters) \ + (* GET_GetTexGeniv(disp)) parameters +static INLINE _glptr_GetTexGeniv GET_GetTexGeniv(struct _glapi_table *disp) { + return (_glptr_GetTexGeniv) (GET_by_offset(disp, _gloffset_GetTexGeniv)); +} + +static INLINE void SET_GetTexGeniv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexGeniv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexImage)(GLenum, GLint, GLenum, GLenum, GLvoid *); +#define CALL_GetTexImage(disp, parameters) \ + (* GET_GetTexImage(disp)) parameters +static INLINE _glptr_GetTexImage GET_GetTexImage(struct _glapi_table *disp) { + return (_glptr_GetTexImage) (GET_by_offset(disp, _gloffset_GetTexImage)); +} + +static INLINE void SET_GetTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetTexImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexParameterfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetTexParameterfv(disp, parameters) \ + (* GET_GetTexParameterfv(disp)) parameters +static INLINE _glptr_GetTexParameterfv GET_GetTexParameterfv(struct _glapi_table *disp) { + return (_glptr_GetTexParameterfv) (GET_by_offset(disp, _gloffset_GetTexParameterfv)); +} + +static INLINE void SET_GetTexParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetTexParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetTexParameteriv(disp, parameters) \ + (* GET_GetTexParameteriv(disp)) parameters +static INLINE _glptr_GetTexParameteriv GET_GetTexParameteriv(struct _glapi_table *disp) { + return (_glptr_GetTexParameteriv) (GET_by_offset(disp, _gloffset_GetTexParameteriv)); +} + +static INLINE void SET_GetTexParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexLevelParameterfv)(GLenum, GLint, GLenum, GLfloat *); +#define CALL_GetTexLevelParameterfv(disp, parameters) \ + (* GET_GetTexLevelParameterfv(disp)) parameters +static INLINE _glptr_GetTexLevelParameterfv GET_GetTexLevelParameterfv(struct _glapi_table *disp) { + return (_glptr_GetTexLevelParameterfv) (GET_by_offset(disp, _gloffset_GetTexLevelParameterfv)); +} + +static INLINE void SET_GetTexLevelParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetTexLevelParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexLevelParameteriv)(GLenum, GLint, GLenum, GLint *); +#define CALL_GetTexLevelParameteriv(disp, parameters) \ + (* GET_GetTexLevelParameteriv(disp)) parameters +static INLINE _glptr_GetTexLevelParameteriv GET_GetTexLevelParameteriv(struct _glapi_table *disp) { + return (_glptr_GetTexLevelParameteriv) (GET_by_offset(disp, _gloffset_GetTexLevelParameteriv)); +} + +static INLINE void SET_GetTexLevelParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexLevelParameteriv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsEnabled)(GLenum); +#define CALL_IsEnabled(disp, parameters) \ + (* GET_IsEnabled(disp)) parameters +static INLINE _glptr_IsEnabled GET_IsEnabled(struct _glapi_table *disp) { + return (_glptr_IsEnabled) (GET_by_offset(disp, _gloffset_IsEnabled)); +} + +static INLINE void SET_IsEnabled(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_IsEnabled, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsList)(GLuint); +#define CALL_IsList(disp, parameters) \ + (* GET_IsList(disp)) parameters +static INLINE _glptr_IsList GET_IsList(struct _glapi_table *disp) { + return (_glptr_IsList) (GET_by_offset(disp, _gloffset_IsList)); +} + +static INLINE void SET_IsList(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsList, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthRange)(GLclampd, GLclampd); +#define CALL_DepthRange(disp, parameters) \ + (* GET_DepthRange(disp)) parameters +static INLINE _glptr_DepthRange GET_DepthRange(struct _glapi_table *disp) { + return (_glptr_DepthRange) (GET_by_offset(disp, _gloffset_DepthRange)); +} + +static INLINE void SET_DepthRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) { + SET_by_offset(disp, _gloffset_DepthRange, fn); +} + +typedef void (GLAPIENTRYP _glptr_Frustum)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Frustum(disp, parameters) \ + (* GET_Frustum(disp)) parameters +static INLINE _glptr_Frustum GET_Frustum(struct _glapi_table *disp) { + return (_glptr_Frustum) (GET_by_offset(disp, _gloffset_Frustum)); +} + +static INLINE void SET_Frustum(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Frustum, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadIdentity)(void); +#define CALL_LoadIdentity(disp, parameters) \ + (* GET_LoadIdentity(disp)) parameters +static INLINE _glptr_LoadIdentity GET_LoadIdentity(struct _glapi_table *disp) { + return (_glptr_LoadIdentity) (GET_by_offset(disp, _gloffset_LoadIdentity)); +} + +static INLINE void SET_LoadIdentity(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_LoadIdentity, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadMatrixf)(const GLfloat *); +#define CALL_LoadMatrixf(disp, parameters) \ + (* GET_LoadMatrixf(disp)) parameters +static INLINE _glptr_LoadMatrixf GET_LoadMatrixf(struct _glapi_table *disp) { + return (_glptr_LoadMatrixf) (GET_by_offset(disp, _gloffset_LoadMatrixf)); +} + +static INLINE void SET_LoadMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_LoadMatrixf, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadMatrixd)(const GLdouble *); +#define CALL_LoadMatrixd(disp, parameters) \ + (* GET_LoadMatrixd(disp)) parameters +static INLINE _glptr_LoadMatrixd GET_LoadMatrixd(struct _glapi_table *disp) { + return (_glptr_LoadMatrixd) (GET_by_offset(disp, _gloffset_LoadMatrixd)); +} + +static INLINE void SET_LoadMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_LoadMatrixd, fn); +} + +typedef void (GLAPIENTRYP _glptr_MatrixMode)(GLenum); +#define CALL_MatrixMode(disp, parameters) \ + (* GET_MatrixMode(disp)) parameters +static INLINE _glptr_MatrixMode GET_MatrixMode(struct _glapi_table *disp) { + return (_glptr_MatrixMode) (GET_by_offset(disp, _gloffset_MatrixMode)); +} + +static INLINE void SET_MatrixMode(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_MatrixMode, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultMatrixf)(const GLfloat *); +#define CALL_MultMatrixf(disp, parameters) \ + (* GET_MultMatrixf(disp)) parameters +static INLINE _glptr_MultMatrixf GET_MultMatrixf(struct _glapi_table *disp) { + return (_glptr_MultMatrixf) (GET_by_offset(disp, _gloffset_MultMatrixf)); +} + +static INLINE void SET_MultMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultMatrixf, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultMatrixd)(const GLdouble *); +#define CALL_MultMatrixd(disp, parameters) \ + (* GET_MultMatrixd(disp)) parameters +static INLINE _glptr_MultMatrixd GET_MultMatrixd(struct _glapi_table *disp) { + return (_glptr_MultMatrixd) (GET_by_offset(disp, _gloffset_MultMatrixd)); +} + +static INLINE void SET_MultMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultMatrixd, fn); +} + +typedef void (GLAPIENTRYP _glptr_Ortho)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Ortho(disp, parameters) \ + (* GET_Ortho(disp)) parameters +static INLINE _glptr_Ortho GET_Ortho(struct _glapi_table *disp) { + return (_glptr_Ortho) (GET_by_offset(disp, _gloffset_Ortho)); +} + +static INLINE void SET_Ortho(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Ortho, fn); +} + +typedef void (GLAPIENTRYP _glptr_PopMatrix)(void); +#define CALL_PopMatrix(disp, parameters) \ + (* GET_PopMatrix(disp)) parameters +static INLINE _glptr_PopMatrix GET_PopMatrix(struct _glapi_table *disp) { + return (_glptr_PopMatrix) (GET_by_offset(disp, _gloffset_PopMatrix)); +} + +static INLINE void SET_PopMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PopMatrix, fn); +} + +typedef void (GLAPIENTRYP _glptr_PushMatrix)(void); +#define CALL_PushMatrix(disp, parameters) \ + (* GET_PushMatrix(disp)) parameters +static INLINE _glptr_PushMatrix GET_PushMatrix(struct _glapi_table *disp) { + return (_glptr_PushMatrix) (GET_by_offset(disp, _gloffset_PushMatrix)); +} + +static INLINE void SET_PushMatrix(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PushMatrix, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rotated)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_Rotated(disp, parameters) \ + (* GET_Rotated(disp)) parameters +static INLINE _glptr_Rotated GET_Rotated(struct _glapi_table *disp) { + return (_glptr_Rotated) (GET_by_offset(disp, _gloffset_Rotated)); +} + +static INLINE void SET_Rotated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Rotated, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rotatef)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Rotatef(disp, parameters) \ + (* GET_Rotatef(disp)) parameters +static INLINE _glptr_Rotatef GET_Rotatef(struct _glapi_table *disp) { + return (_glptr_Rotatef) (GET_by_offset(disp, _gloffset_Rotatef)); +} + +static INLINE void SET_Rotatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Rotatef, fn); +} + +typedef void (GLAPIENTRYP _glptr_Scaled)(GLdouble, GLdouble, GLdouble); +#define CALL_Scaled(disp, parameters) \ + (* GET_Scaled(disp)) parameters +static INLINE _glptr_Scaled GET_Scaled(struct _glapi_table *disp) { + return (_glptr_Scaled) (GET_by_offset(disp, _gloffset_Scaled)); +} + +static INLINE void SET_Scaled(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Scaled, fn); +} + +typedef void (GLAPIENTRYP _glptr_Scalef)(GLfloat, GLfloat, GLfloat); +#define CALL_Scalef(disp, parameters) \ + (* GET_Scalef(disp)) parameters +static INLINE _glptr_Scalef GET_Scalef(struct _glapi_table *disp) { + return (_glptr_Scalef) (GET_by_offset(disp, _gloffset_Scalef)); +} + +static INLINE void SET_Scalef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Scalef, fn); +} + +typedef void (GLAPIENTRYP _glptr_Translated)(GLdouble, GLdouble, GLdouble); +#define CALL_Translated(disp, parameters) \ + (* GET_Translated(disp)) parameters +static INLINE _glptr_Translated GET_Translated(struct _glapi_table *disp) { + return (_glptr_Translated) (GET_by_offset(disp, _gloffset_Translated)); +} + +static INLINE void SET_Translated(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_Translated, fn); +} + +typedef void (GLAPIENTRYP _glptr_Translatef)(GLfloat, GLfloat, GLfloat); +#define CALL_Translatef(disp, parameters) \ + (* GET_Translatef(disp)) parameters +static INLINE _glptr_Translatef GET_Translatef(struct _glapi_table *disp) { + return (_glptr_Translatef) (GET_by_offset(disp, _gloffset_Translatef)); +} + +static INLINE void SET_Translatef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Translatef, fn); +} + +typedef void (GLAPIENTRYP _glptr_Viewport)(GLint, GLint, GLsizei, GLsizei); +#define CALL_Viewport(disp, parameters) \ + (* GET_Viewport(disp)) parameters +static INLINE _glptr_Viewport GET_Viewport(struct _glapi_table *disp) { + return (_glptr_Viewport) (GET_by_offset(disp, _gloffset_Viewport)); +} + +static INLINE void SET_Viewport(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_Viewport, fn); +} + +typedef void (GLAPIENTRYP _glptr_ArrayElement)(GLint); +#define CALL_ArrayElement(disp, parameters) \ + (* GET_ArrayElement(disp)) parameters +static INLINE _glptr_ArrayElement GET_ArrayElement(struct _glapi_table *disp) { + return (_glptr_ArrayElement) (GET_by_offset(disp, _gloffset_ArrayElement)); +} + +static INLINE void SET_ArrayElement(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint)) { + SET_by_offset(disp, _gloffset_ArrayElement, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindTexture)(GLenum, GLuint); +#define CALL_BindTexture(disp, parameters) \ + (* GET_BindTexture(disp)) parameters +static INLINE _glptr_BindTexture GET_BindTexture(struct _glapi_table *disp) { + return (_glptr_BindTexture) (GET_by_offset(disp, _gloffset_BindTexture)); +} + +static INLINE void SET_BindTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorPointer)(GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_ColorPointer(disp, parameters) \ + (* GET_ColorPointer(disp)) parameters +static INLINE _glptr_ColorPointer GET_ColorPointer(struct _glapi_table *disp) { + return (_glptr_ColorPointer) (GET_by_offset(disp, _gloffset_ColorPointer)); +} + +static INLINE void SET_ColorPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ColorPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_DisableClientState)(GLenum); +#define CALL_DisableClientState(disp, parameters) \ + (* GET_DisableClientState(disp)) parameters +static INLINE _glptr_DisableClientState GET_DisableClientState(struct _glapi_table *disp) { + return (_glptr_DisableClientState) (GET_by_offset(disp, _gloffset_DisableClientState)); +} + +static INLINE void SET_DisableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_DisableClientState, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawArrays)(GLenum, GLint, GLsizei); +#define CALL_DrawArrays(disp, parameters) \ + (* GET_DrawArrays(disp)) parameters +static INLINE _glptr_DrawArrays GET_DrawArrays(struct _glapi_table *disp) { + return (_glptr_DrawArrays) (GET_by_offset(disp, _gloffset_DrawArrays)); +} + +static INLINE void SET_DrawArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_DrawArrays, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElements)(GLenum, GLsizei, GLenum, const GLvoid *); +#define CALL_DrawElements(disp, parameters) \ + (* GET_DrawElements(disp)) parameters +static INLINE _glptr_DrawElements GET_DrawElements(struct _glapi_table *disp) { + return (_glptr_DrawElements) (GET_by_offset(disp, _gloffset_DrawElements)); +} + +static INLINE void SET_DrawElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DrawElements, fn); +} + +typedef void (GLAPIENTRYP _glptr_EdgeFlagPointer)(GLsizei, const GLvoid *); +#define CALL_EdgeFlagPointer(disp, parameters) \ + (* GET_EdgeFlagPointer(disp)) parameters +static INLINE _glptr_EdgeFlagPointer GET_EdgeFlagPointer(struct _glapi_table *disp) { + return (_glptr_EdgeFlagPointer) (GET_by_offset(disp, _gloffset_EdgeFlagPointer)); +} + +static INLINE void SET_EdgeFlagPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_EdgeFlagPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_EnableClientState)(GLenum); +#define CALL_EnableClientState(disp, parameters) \ + (* GET_EnableClientState(disp)) parameters +static INLINE _glptr_EnableClientState GET_EnableClientState(struct _glapi_table *disp) { + return (_glptr_EnableClientState) (GET_by_offset(disp, _gloffset_EnableClientState)); +} + +static INLINE void SET_EnableClientState(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_EnableClientState, fn); +} + +typedef void (GLAPIENTRYP _glptr_IndexPointer)(GLenum, GLsizei, const GLvoid *); +#define CALL_IndexPointer(disp, parameters) \ + (* GET_IndexPointer(disp)) parameters +static INLINE _glptr_IndexPointer GET_IndexPointer(struct _glapi_table *disp) { + return (_glptr_IndexPointer) (GET_by_offset(disp, _gloffset_IndexPointer)); +} + +static INLINE void SET_IndexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_IndexPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexub)(GLubyte); +#define CALL_Indexub(disp, parameters) \ + (* GET_Indexub(disp)) parameters +static INLINE _glptr_Indexub GET_Indexub(struct _glapi_table *disp) { + return (_glptr_Indexub) (GET_by_offset(disp, _gloffset_Indexub)); +} + +static INLINE void SET_Indexub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte)) { + SET_by_offset(disp, _gloffset_Indexub, fn); +} + +typedef void (GLAPIENTRYP _glptr_Indexubv)(const GLubyte *); +#define CALL_Indexubv(disp, parameters) \ + (* GET_Indexubv(disp)) parameters +static INLINE _glptr_Indexubv GET_Indexubv(struct _glapi_table *disp) { + return (_glptr_Indexubv) (GET_by_offset(disp, _gloffset_Indexubv)); +} + +static INLINE void SET_Indexubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) { + SET_by_offset(disp, _gloffset_Indexubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_InterleavedArrays)(GLenum, GLsizei, const GLvoid *); +#define CALL_InterleavedArrays(disp, parameters) \ + (* GET_InterleavedArrays(disp)) parameters +static INLINE _glptr_InterleavedArrays GET_InterleavedArrays(struct _glapi_table *disp) { + return (_glptr_InterleavedArrays) (GET_by_offset(disp, _gloffset_InterleavedArrays)); +} + +static INLINE void SET_InterleavedArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_InterleavedArrays, fn); +} + +typedef void (GLAPIENTRYP _glptr_NormalPointer)(GLenum, GLsizei, const GLvoid *); +#define CALL_NormalPointer(disp, parameters) \ + (* GET_NormalPointer(disp)) parameters +static INLINE _glptr_NormalPointer GET_NormalPointer(struct _glapi_table *disp) { + return (_glptr_NormalPointer) (GET_by_offset(disp, _gloffset_NormalPointer)); +} + +static INLINE void SET_NormalPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_NormalPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_PolygonOffset)(GLfloat, GLfloat); +#define CALL_PolygonOffset(disp, parameters) \ + (* GET_PolygonOffset(disp)) parameters +static INLINE _glptr_PolygonOffset GET_PolygonOffset(struct _glapi_table *disp) { + return (_glptr_PolygonOffset) (GET_by_offset(disp, _gloffset_PolygonOffset)); +} + +static INLINE void SET_PolygonOffset(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_PolygonOffset, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordPointer)(GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_TexCoordPointer(disp, parameters) \ + (* GET_TexCoordPointer(disp)) parameters +static INLINE _glptr_TexCoordPointer GET_TexCoordPointer(struct _glapi_table *disp) { + return (_glptr_TexCoordPointer) (GET_by_offset(disp, _gloffset_TexCoordPointer)); +} + +static INLINE void SET_TexCoordPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexCoordPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexPointer)(GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_VertexPointer(disp, parameters) \ + (* GET_VertexPointer(disp)) parameters +static INLINE _glptr_VertexPointer GET_VertexPointer(struct _glapi_table *disp) { + return (_glptr_VertexPointer) (GET_by_offset(disp, _gloffset_VertexPointer)); +} + +static INLINE void SET_VertexPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VertexPointer, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_AreTexturesResident)(GLsizei, const GLuint *, GLboolean *); +#define CALL_AreTexturesResident(disp, parameters) \ + (* GET_AreTexturesResident(disp)) parameters +static INLINE _glptr_AreTexturesResident GET_AreTexturesResident(struct _glapi_table *disp) { + return (_glptr_AreTexturesResident) (GET_by_offset(disp, _gloffset_AreTexturesResident)); +} + +static INLINE void SET_AreTexturesResident(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) { + SET_by_offset(disp, _gloffset_AreTexturesResident, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyTexImage1D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint); +#define CALL_CopyTexImage1D(disp, parameters) \ + (* GET_CopyTexImage1D(disp)) parameters +static INLINE _glptr_CopyTexImage1D GET_CopyTexImage1D(struct _glapi_table *disp) { + return (_glptr_CopyTexImage1D) (GET_by_offset(disp, _gloffset_CopyTexImage1D)); +} + +static INLINE void SET_CopyTexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint)) { + SET_by_offset(disp, _gloffset_CopyTexImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyTexImage2D)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint); +#define CALL_CopyTexImage2D(disp, parameters) \ + (* GET_CopyTexImage2D(disp)) parameters +static INLINE _glptr_CopyTexImage2D GET_CopyTexImage2D(struct _glapi_table *disp) { + return (_glptr_CopyTexImage2D) (GET_by_offset(disp, _gloffset_CopyTexImage2D)); +} + +static INLINE void SET_CopyTexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint)) { + SET_by_offset(disp, _gloffset_CopyTexImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyTexSubImage1D)(GLenum, GLint, GLint, GLint, GLint, GLsizei); +#define CALL_CopyTexSubImage1D(disp, parameters) \ + (* GET_CopyTexSubImage1D(disp)) parameters +static INLINE _glptr_CopyTexSubImage1D GET_CopyTexSubImage1D(struct _glapi_table *disp) { + return (_glptr_CopyTexSubImage1D) (GET_by_offset(disp, _gloffset_CopyTexSubImage1D)); +} + +static INLINE void SET_CopyTexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyTexSubImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyTexSubImage2D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); +#define CALL_CopyTexSubImage2D(disp, parameters) \ + (* GET_CopyTexSubImage2D(disp)) parameters +static INLINE _glptr_CopyTexSubImage2D GET_CopyTexSubImage2D(struct _glapi_table *disp) { + return (_glptr_CopyTexSubImage2D) (GET_by_offset(disp, _gloffset_CopyTexSubImage2D)); +} + +static INLINE void SET_CopyTexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyTexSubImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteTextures)(GLsizei, const GLuint *); +#define CALL_DeleteTextures(disp, parameters) \ + (* GET_DeleteTextures(disp)) parameters +static INLINE _glptr_DeleteTextures GET_DeleteTextures(struct _glapi_table *disp) { + return (_glptr_DeleteTextures) (GET_by_offset(disp, _gloffset_DeleteTextures)); +} + +static INLINE void SET_DeleteTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteTextures, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenTextures)(GLsizei, GLuint *); +#define CALL_GenTextures(disp, parameters) \ + (* GET_GenTextures(disp)) parameters +static INLINE _glptr_GenTextures GET_GenTextures(struct _glapi_table *disp) { + return (_glptr_GenTextures) (GET_by_offset(disp, _gloffset_GenTextures)); +} + +static INLINE void SET_GenTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenTextures, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPointerv)(GLenum, GLvoid **); +#define CALL_GetPointerv(disp, parameters) \ + (* GET_GetPointerv(disp)) parameters +static INLINE _glptr_GetPointerv GET_GetPointerv(struct _glapi_table *disp) { + return (_glptr_GetPointerv) (GET_by_offset(disp, _gloffset_GetPointerv)); +} + +static INLINE void SET_GetPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid **)) { + SET_by_offset(disp, _gloffset_GetPointerv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsTexture)(GLuint); +#define CALL_IsTexture(disp, parameters) \ + (* GET_IsTexture(disp)) parameters +static INLINE _glptr_IsTexture GET_IsTexture(struct _glapi_table *disp) { + return (_glptr_IsTexture) (GET_by_offset(disp, _gloffset_IsTexture)); +} + +static INLINE void SET_IsTexture(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_PrioritizeTextures)(GLsizei, const GLuint *, const GLclampf *); +#define CALL_PrioritizeTextures(disp, parameters) \ + (* GET_PrioritizeTextures(disp)) parameters +static INLINE _glptr_PrioritizeTextures GET_PrioritizeTextures(struct _glapi_table *disp) { + return (_glptr_PrioritizeTextures) (GET_by_offset(disp, _gloffset_PrioritizeTextures)); +} + +static INLINE void SET_PrioritizeTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, const GLclampf *)) { + SET_by_offset(disp, _gloffset_PrioritizeTextures, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexSubImage1D)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_TexSubImage1D(disp, parameters) \ + (* GET_TexSubImage1D(disp)) parameters +static INLINE _glptr_TexSubImage1D GET_TexSubImage1D(struct _glapi_table *disp) { + return (_glptr_TexSubImage1D) (GET_by_offset(disp, _gloffset_TexSubImage1D)); +} + +static INLINE void SET_TexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexSubImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_TexSubImage2D(disp, parameters) \ + (* GET_TexSubImage2D(disp)) parameters +static INLINE _glptr_TexSubImage2D GET_TexSubImage2D(struct _glapi_table *disp) { + return (_glptr_TexSubImage2D) (GET_by_offset(disp, _gloffset_TexSubImage2D)); +} + +static INLINE void SET_TexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexSubImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_PopClientAttrib)(void); +#define CALL_PopClientAttrib(disp, parameters) \ + (* GET_PopClientAttrib(disp)) parameters +static INLINE _glptr_PopClientAttrib GET_PopClientAttrib(struct _glapi_table *disp) { + return (_glptr_PopClientAttrib) (GET_by_offset(disp, _gloffset_PopClientAttrib)); +} + +static INLINE void SET_PopClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PopClientAttrib, fn); +} + +typedef void (GLAPIENTRYP _glptr_PushClientAttrib)(GLbitfield); +#define CALL_PushClientAttrib(disp, parameters) \ + (* GET_PushClientAttrib(disp)) parameters +static INLINE _glptr_PushClientAttrib GET_PushClientAttrib(struct _glapi_table *disp) { + return (_glptr_PushClientAttrib) (GET_by_offset(disp, _gloffset_PushClientAttrib)); +} + +static INLINE void SET_PushClientAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) { + SET_by_offset(disp, _gloffset_PushClientAttrib, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendColor)(GLclampf, GLclampf, GLclampf, GLclampf); +#define CALL_BlendColor(disp, parameters) \ + (* GET_BlendColor(disp)) parameters +static INLINE _glptr_BlendColor GET_BlendColor(struct _glapi_table *disp) { + return (_glptr_BlendColor) (GET_by_offset(disp, _gloffset_BlendColor)); +} + +static INLINE void SET_BlendColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf, GLclampf, GLclampf)) { + SET_by_offset(disp, _gloffset_BlendColor, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendEquation)(GLenum); +#define CALL_BlendEquation(disp, parameters) \ + (* GET_BlendEquation(disp)) parameters +static INLINE _glptr_BlendEquation GET_BlendEquation(struct _glapi_table *disp) { + return (_glptr_BlendEquation) (GET_by_offset(disp, _gloffset_BlendEquation)); +} + +static INLINE void SET_BlendEquation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_BlendEquation, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawRangeElements)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); +#define CALL_DrawRangeElements(disp, parameters) \ + (* GET_DrawRangeElements(disp)) parameters +static INLINE _glptr_DrawRangeElements GET_DrawRangeElements(struct _glapi_table *disp) { + return (_glptr_DrawRangeElements) (GET_by_offset(disp, _gloffset_DrawRangeElements)); +} + +static INLINE void SET_DrawRangeElements(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DrawRangeElements, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorTable)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_ColorTable(disp, parameters) \ + (* GET_ColorTable(disp)) parameters +static INLINE _glptr_ColorTable GET_ColorTable(struct _glapi_table *disp) { + return (_glptr_ColorTable) (GET_by_offset(disp, _gloffset_ColorTable)); +} + +static INLINE void SET_ColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ColorTable, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorTableParameterfv)(GLenum, GLenum, const GLfloat *); +#define CALL_ColorTableParameterfv(disp, parameters) \ + (* GET_ColorTableParameterfv(disp)) parameters +static INLINE _glptr_ColorTableParameterfv GET_ColorTableParameterfv(struct _glapi_table *disp) { + return (_glptr_ColorTableParameterfv) (GET_by_offset(disp, _gloffset_ColorTableParameterfv)); +} + +static INLINE void SET_ColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ColorTableParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorTableParameteriv)(GLenum, GLenum, const GLint *); +#define CALL_ColorTableParameteriv(disp, parameters) \ + (* GET_ColorTableParameteriv(disp)) parameters +static INLINE _glptr_ColorTableParameteriv GET_ColorTableParameteriv(struct _glapi_table *disp) { + return (_glptr_ColorTableParameteriv) (GET_by_offset(disp, _gloffset_ColorTableParameteriv)); +} + +static INLINE void SET_ColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_ColorTableParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyColorTable)(GLenum, GLenum, GLint, GLint, GLsizei); +#define CALL_CopyColorTable(disp, parameters) \ + (* GET_CopyColorTable(disp)) parameters +static INLINE _glptr_CopyColorTable GET_CopyColorTable(struct _glapi_table *disp) { + return (_glptr_CopyColorTable) (GET_by_offset(disp, _gloffset_CopyColorTable)); +} + +static INLINE void SET_CopyColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyColorTable, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetColorTable)(GLenum, GLenum, GLenum, GLvoid *); +#define CALL_GetColorTable(disp, parameters) \ + (* GET_GetColorTable(disp)) parameters +static INLINE _glptr_GetColorTable GET_GetColorTable(struct _glapi_table *disp) { + return (_glptr_GetColorTable) (GET_by_offset(disp, _gloffset_GetColorTable)); +} + +static INLINE void SET_GetColorTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetColorTable, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetColorTableParameterfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetColorTableParameterfv(disp, parameters) \ + (* GET_GetColorTableParameterfv(disp)) parameters +static INLINE _glptr_GetColorTableParameterfv GET_GetColorTableParameterfv(struct _glapi_table *disp) { + return (_glptr_GetColorTableParameterfv) (GET_by_offset(disp, _gloffset_GetColorTableParameterfv)); +} + +static INLINE void SET_GetColorTableParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetColorTableParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetColorTableParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetColorTableParameteriv(disp, parameters) \ + (* GET_GetColorTableParameteriv(disp)) parameters +static INLINE _glptr_GetColorTableParameteriv GET_GetColorTableParameteriv(struct _glapi_table *disp) { + return (_glptr_GetColorTableParameteriv) (GET_by_offset(disp, _gloffset_GetColorTableParameteriv)); +} + +static INLINE void SET_GetColorTableParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetColorTableParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorSubTable)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_ColorSubTable(disp, parameters) \ + (* GET_ColorSubTable(disp)) parameters +static INLINE _glptr_ColorSubTable GET_ColorSubTable(struct _glapi_table *disp) { + return (_glptr_ColorSubTable) (GET_by_offset(disp, _gloffset_ColorSubTable)); +} + +static INLINE void SET_ColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ColorSubTable, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyColorSubTable)(GLenum, GLsizei, GLint, GLint, GLsizei); +#define CALL_CopyColorSubTable(disp, parameters) \ + (* GET_CopyColorSubTable(disp)) parameters +static INLINE _glptr_CopyColorSubTable GET_CopyColorSubTable(struct _glapi_table *disp) { + return (_glptr_CopyColorSubTable) (GET_by_offset(disp, _gloffset_CopyColorSubTable)); +} + +static INLINE void SET_CopyColorSubTable(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLint, GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyColorSubTable, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionFilter1D)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_ConvolutionFilter1D(disp, parameters) \ + (* GET_ConvolutionFilter1D(disp)) parameters +static INLINE _glptr_ConvolutionFilter1D GET_ConvolutionFilter1D(struct _glapi_table *disp) { + return (_glptr_ConvolutionFilter1D) (GET_by_offset(disp, _gloffset_ConvolutionFilter1D)); +} + +static INLINE void SET_ConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ConvolutionFilter1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_ConvolutionFilter2D(disp, parameters) \ + (* GET_ConvolutionFilter2D(disp)) parameters +static INLINE _glptr_ConvolutionFilter2D GET_ConvolutionFilter2D(struct _glapi_table *disp) { + return (_glptr_ConvolutionFilter2D) (GET_by_offset(disp, _gloffset_ConvolutionFilter2D)); +} + +static INLINE void SET_ConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ConvolutionFilter2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionParameterf)(GLenum, GLenum, GLfloat); +#define CALL_ConvolutionParameterf(disp, parameters) \ + (* GET_ConvolutionParameterf(disp)) parameters +static INLINE _glptr_ConvolutionParameterf GET_ConvolutionParameterf(struct _glapi_table *disp) { + return (_glptr_ConvolutionParameterf) (GET_by_offset(disp, _gloffset_ConvolutionParameterf)); +} + +static INLINE void SET_ConvolutionParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_ConvolutionParameterf, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionParameterfv)(GLenum, GLenum, const GLfloat *); +#define CALL_ConvolutionParameterfv(disp, parameters) \ + (* GET_ConvolutionParameterfv(disp)) parameters +static INLINE _glptr_ConvolutionParameterfv GET_ConvolutionParameterfv(struct _glapi_table *disp) { + return (_glptr_ConvolutionParameterfv) (GET_by_offset(disp, _gloffset_ConvolutionParameterfv)); +} + +static INLINE void SET_ConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ConvolutionParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionParameteri)(GLenum, GLenum, GLint); +#define CALL_ConvolutionParameteri(disp, parameters) \ + (* GET_ConvolutionParameteri(disp)) parameters +static INLINE _glptr_ConvolutionParameteri GET_ConvolutionParameteri(struct _glapi_table *disp) { + return (_glptr_ConvolutionParameteri) (GET_by_offset(disp, _gloffset_ConvolutionParameteri)); +} + +static INLINE void SET_ConvolutionParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_ConvolutionParameteri, fn); +} + +typedef void (GLAPIENTRYP _glptr_ConvolutionParameteriv)(GLenum, GLenum, const GLint *); +#define CALL_ConvolutionParameteriv(disp, parameters) \ + (* GET_ConvolutionParameteriv(disp)) parameters +static INLINE _glptr_ConvolutionParameteriv GET_ConvolutionParameteriv(struct _glapi_table *disp) { + return (_glptr_ConvolutionParameteriv) (GET_by_offset(disp, _gloffset_ConvolutionParameteriv)); +} + +static INLINE void SET_ConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_ConvolutionParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter1D)(GLenum, GLenum, GLint, GLint, GLsizei); +#define CALL_CopyConvolutionFilter1D(disp, parameters) \ + (* GET_CopyConvolutionFilter1D(disp)) parameters +static INLINE _glptr_CopyConvolutionFilter1D GET_CopyConvolutionFilter1D(struct _glapi_table *disp) { + return (_glptr_CopyConvolutionFilter1D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter1D)); +} + +static INLINE void SET_CopyConvolutionFilter1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyConvolutionFilter1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyConvolutionFilter2D)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); +#define CALL_CopyConvolutionFilter2D(disp, parameters) \ + (* GET_CopyConvolutionFilter2D(disp)) parameters +static INLINE _glptr_CopyConvolutionFilter2D GET_CopyConvolutionFilter2D(struct _glapi_table *disp) { + return (_glptr_CopyConvolutionFilter2D) (GET_by_offset(disp, _gloffset_CopyConvolutionFilter2D)); +} + +static INLINE void SET_CopyConvolutionFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyConvolutionFilter2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetConvolutionFilter)(GLenum, GLenum, GLenum, GLvoid *); +#define CALL_GetConvolutionFilter(disp, parameters) \ + (* GET_GetConvolutionFilter(disp)) parameters +static INLINE _glptr_GetConvolutionFilter GET_GetConvolutionFilter(struct _glapi_table *disp) { + return (_glptr_GetConvolutionFilter) (GET_by_offset(disp, _gloffset_GetConvolutionFilter)); +} + +static INLINE void SET_GetConvolutionFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetConvolutionFilter, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetConvolutionParameterfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetConvolutionParameterfv(disp, parameters) \ + (* GET_GetConvolutionParameterfv(disp)) parameters +static INLINE _glptr_GetConvolutionParameterfv GET_GetConvolutionParameterfv(struct _glapi_table *disp) { + return (_glptr_GetConvolutionParameterfv) (GET_by_offset(disp, _gloffset_GetConvolutionParameterfv)); +} + +static INLINE void SET_GetConvolutionParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetConvolutionParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetConvolutionParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetConvolutionParameteriv(disp, parameters) \ + (* GET_GetConvolutionParameteriv(disp)) parameters +static INLINE _glptr_GetConvolutionParameteriv GET_GetConvolutionParameteriv(struct _glapi_table *disp) { + return (_glptr_GetConvolutionParameteriv) (GET_by_offset(disp, _gloffset_GetConvolutionParameteriv)); +} + +static INLINE void SET_GetConvolutionParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetConvolutionParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSeparableFilter)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); +#define CALL_GetSeparableFilter(disp, parameters) \ + (* GET_GetSeparableFilter(disp)) parameters +static INLINE _glptr_GetSeparableFilter GET_GetSeparableFilter(struct _glapi_table *disp) { + return (_glptr_GetSeparableFilter) (GET_by_offset(disp, _gloffset_GetSeparableFilter)); +} + +static INLINE void SET_GetSeparableFilter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetSeparableFilter, fn); +} + +typedef void (GLAPIENTRYP _glptr_SeparableFilter2D)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); +#define CALL_SeparableFilter2D(disp, parameters) \ + (* GET_SeparableFilter2D(disp)) parameters +static INLINE _glptr_SeparableFilter2D GET_SeparableFilter2D(struct _glapi_table *disp) { + return (_glptr_SeparableFilter2D) (GET_by_offset(disp, _gloffset_SeparableFilter2D)); +} + +static INLINE void SET_SeparableFilter2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *)) { + SET_by_offset(disp, _gloffset_SeparableFilter2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetHistogram)(GLenum, GLboolean, GLenum, GLenum, GLvoid *); +#define CALL_GetHistogram(disp, parameters) \ + (* GET_GetHistogram(disp)) parameters +static INLINE _glptr_GetHistogram GET_GetHistogram(struct _glapi_table *disp) { + return (_glptr_GetHistogram) (GET_by_offset(disp, _gloffset_GetHistogram)); +} + +static INLINE void SET_GetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetHistogram, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetHistogramParameterfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetHistogramParameterfv(disp, parameters) \ + (* GET_GetHistogramParameterfv(disp)) parameters +static INLINE _glptr_GetHistogramParameterfv GET_GetHistogramParameterfv(struct _glapi_table *disp) { + return (_glptr_GetHistogramParameterfv) (GET_by_offset(disp, _gloffset_GetHistogramParameterfv)); +} + +static INLINE void SET_GetHistogramParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetHistogramParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetHistogramParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetHistogramParameteriv(disp, parameters) \ + (* GET_GetHistogramParameteriv(disp)) parameters +static INLINE _glptr_GetHistogramParameteriv GET_GetHistogramParameteriv(struct _glapi_table *disp) { + return (_glptr_GetHistogramParameteriv) (GET_by_offset(disp, _gloffset_GetHistogramParameteriv)); +} + +static INLINE void SET_GetHistogramParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetHistogramParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMinmax)(GLenum, GLboolean, GLenum, GLenum, GLvoid *); +#define CALL_GetMinmax(disp, parameters) \ + (* GET_GetMinmax(disp)) parameters +static INLINE _glptr_GetMinmax GET_GetMinmax(struct _glapi_table *disp) { + return (_glptr_GetMinmax) (GET_by_offset(disp, _gloffset_GetMinmax)); +} + +static INLINE void SET_GetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetMinmax, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMinmaxParameterfv)(GLenum, GLenum, GLfloat *); +#define CALL_GetMinmaxParameterfv(disp, parameters) \ + (* GET_GetMinmaxParameterfv(disp)) parameters +static INLINE _glptr_GetMinmaxParameterfv GET_GetMinmaxParameterfv(struct _glapi_table *disp) { + return (_glptr_GetMinmaxParameterfv) (GET_by_offset(disp, _gloffset_GetMinmaxParameterfv)); +} + +static INLINE void SET_GetMinmaxParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetMinmaxParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMinmaxParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetMinmaxParameteriv(disp, parameters) \ + (* GET_GetMinmaxParameteriv(disp)) parameters +static INLINE _glptr_GetMinmaxParameteriv GET_GetMinmaxParameteriv(struct _glapi_table *disp) { + return (_glptr_GetMinmaxParameteriv) (GET_by_offset(disp, _gloffset_GetMinmaxParameteriv)); +} + +static INLINE void SET_GetMinmaxParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetMinmaxParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Histogram)(GLenum, GLsizei, GLenum, GLboolean); +#define CALL_Histogram(disp, parameters) \ + (* GET_Histogram(disp)) parameters +static INLINE _glptr_Histogram GET_Histogram(struct _glapi_table *disp) { + return (_glptr_Histogram) (GET_by_offset(disp, _gloffset_Histogram)); +} + +static INLINE void SET_Histogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLboolean)) { + SET_by_offset(disp, _gloffset_Histogram, fn); +} + +typedef void (GLAPIENTRYP _glptr_Minmax)(GLenum, GLenum, GLboolean); +#define CALL_Minmax(disp, parameters) \ + (* GET_Minmax(disp)) parameters +static INLINE _glptr_Minmax GET_Minmax(struct _glapi_table *disp) { + return (_glptr_Minmax) (GET_by_offset(disp, _gloffset_Minmax)); +} + +static INLINE void SET_Minmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLboolean)) { + SET_by_offset(disp, _gloffset_Minmax, fn); +} + +typedef void (GLAPIENTRYP _glptr_ResetHistogram)(GLenum); +#define CALL_ResetHistogram(disp, parameters) \ + (* GET_ResetHistogram(disp)) parameters +static INLINE _glptr_ResetHistogram GET_ResetHistogram(struct _glapi_table *disp) { + return (_glptr_ResetHistogram) (GET_by_offset(disp, _gloffset_ResetHistogram)); +} + +static INLINE void SET_ResetHistogram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ResetHistogram, fn); +} + +typedef void (GLAPIENTRYP _glptr_ResetMinmax)(GLenum); +#define CALL_ResetMinmax(disp, parameters) \ + (* GET_ResetMinmax(disp)) parameters +static INLINE _glptr_ResetMinmax GET_ResetMinmax(struct _glapi_table *disp) { + return (_glptr_ResetMinmax) (GET_by_offset(disp, _gloffset_ResetMinmax)); +} + +static INLINE void SET_ResetMinmax(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ResetMinmax, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexImage3D)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); +#define CALL_TexImage3D(disp, parameters) \ + (* GET_TexImage3D(disp)) parameters +static INLINE _glptr_TexImage3D GET_TexImage3D(struct _glapi_table *disp) { + return (_glptr_TexImage3D) (GET_by_offset(disp, _gloffset_TexImage3D)); +} + +static INLINE void SET_TexImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexImage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_TexSubImage3D(disp, parameters) \ + (* GET_TexSubImage3D(disp)) parameters +static INLINE _glptr_TexSubImage3D GET_TexSubImage3D(struct _glapi_table *disp) { + return (_glptr_TexSubImage3D) (GET_by_offset(disp, _gloffset_TexSubImage3D)); +} + +static INLINE void SET_TexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexSubImage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); +#define CALL_CopyTexSubImage3D(disp, parameters) \ + (* GET_CopyTexSubImage3D(disp)) parameters +static INLINE _glptr_CopyTexSubImage3D GET_CopyTexSubImage3D(struct _glapi_table *disp) { + return (_glptr_CopyTexSubImage3D) (GET_by_offset(disp, _gloffset_CopyTexSubImage3D)); +} + +static INLINE void SET_CopyTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyTexSubImage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_ActiveTexture)(GLenum); +#define CALL_ActiveTexture(disp, parameters) \ + (* GET_ActiveTexture(disp)) parameters +static INLINE _glptr_ActiveTexture GET_ActiveTexture(struct _glapi_table *disp) { + return (_glptr_ActiveTexture) (GET_by_offset(disp, _gloffset_ActiveTexture)); +} + +static INLINE void SET_ActiveTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ActiveTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClientActiveTexture)(GLenum); +#define CALL_ClientActiveTexture(disp, parameters) \ + (* GET_ClientActiveTexture(disp)) parameters +static INLINE _glptr_ClientActiveTexture GET_ClientActiveTexture(struct _glapi_table *disp) { + return (_glptr_ClientActiveTexture) (GET_by_offset(disp, _gloffset_ClientActiveTexture)); +} + +static INLINE void SET_ClientActiveTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ClientActiveTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1d)(GLenum, GLdouble); +#define CALL_MultiTexCoord1d(disp, parameters) \ + (* GET_MultiTexCoord1d(disp)) parameters +static INLINE _glptr_MultiTexCoord1d GET_MultiTexCoord1d(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1d) (GET_by_offset(disp, _gloffset_MultiTexCoord1d)); +} + +static INLINE void SET_MultiTexCoord1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1dv)(GLenum, const GLdouble *); +#define CALL_MultiTexCoord1dv(disp, parameters) \ + (* GET_MultiTexCoord1dv(disp)) parameters +static INLINE _glptr_MultiTexCoord1dv GET_MultiTexCoord1dv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1dv) (GET_by_offset(disp, _gloffset_MultiTexCoord1dv)); +} + +static INLINE void SET_MultiTexCoord1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fARB)(GLenum, GLfloat); +#define CALL_MultiTexCoord1fARB(disp, parameters) \ + (* GET_MultiTexCoord1fARB(disp)) parameters +static INLINE _glptr_MultiTexCoord1fARB GET_MultiTexCoord1fARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fARB)); +} + +static INLINE void SET_MultiTexCoord1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1fvARB)(GLenum, const GLfloat *); +#define CALL_MultiTexCoord1fvARB(disp, parameters) \ + (* GET_MultiTexCoord1fvARB(disp)) parameters +static INLINE _glptr_MultiTexCoord1fvARB GET_MultiTexCoord1fvARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord1fvARB)); +} + +static INLINE void SET_MultiTexCoord1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1i)(GLenum, GLint); +#define CALL_MultiTexCoord1i(disp, parameters) \ + (* GET_MultiTexCoord1i(disp)) parameters +static INLINE _glptr_MultiTexCoord1i GET_MultiTexCoord1i(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1i) (GET_by_offset(disp, _gloffset_MultiTexCoord1i)); +} + +static INLINE void SET_MultiTexCoord1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1i, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1iv)(GLenum, const GLint *); +#define CALL_MultiTexCoord1iv(disp, parameters) \ + (* GET_MultiTexCoord1iv(disp)) parameters +static INLINE _glptr_MultiTexCoord1iv GET_MultiTexCoord1iv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1iv) (GET_by_offset(disp, _gloffset_MultiTexCoord1iv)); +} + +static INLINE void SET_MultiTexCoord1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1s)(GLenum, GLshort); +#define CALL_MultiTexCoord1s(disp, parameters) \ + (* GET_MultiTexCoord1s(disp)) parameters +static INLINE _glptr_MultiTexCoord1s GET_MultiTexCoord1s(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1s) (GET_by_offset(disp, _gloffset_MultiTexCoord1s)); +} + +static INLINE void SET_MultiTexCoord1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1s, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord1sv)(GLenum, const GLshort *); +#define CALL_MultiTexCoord1sv(disp, parameters) \ + (* GET_MultiTexCoord1sv(disp)) parameters +static INLINE _glptr_MultiTexCoord1sv GET_MultiTexCoord1sv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord1sv) (GET_by_offset(disp, _gloffset_MultiTexCoord1sv)); +} + +static INLINE void SET_MultiTexCoord1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord1sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2d)(GLenum, GLdouble, GLdouble); +#define CALL_MultiTexCoord2d(disp, parameters) \ + (* GET_MultiTexCoord2d(disp)) parameters +static INLINE _glptr_MultiTexCoord2d GET_MultiTexCoord2d(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2d) (GET_by_offset(disp, _gloffset_MultiTexCoord2d)); +} + +static INLINE void SET_MultiTexCoord2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2dv)(GLenum, const GLdouble *); +#define CALL_MultiTexCoord2dv(disp, parameters) \ + (* GET_MultiTexCoord2dv(disp)) parameters +static INLINE _glptr_MultiTexCoord2dv GET_MultiTexCoord2dv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2dv) (GET_by_offset(disp, _gloffset_MultiTexCoord2dv)); +} + +static INLINE void SET_MultiTexCoord2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fARB)(GLenum, GLfloat, GLfloat); +#define CALL_MultiTexCoord2fARB(disp, parameters) \ + (* GET_MultiTexCoord2fARB(disp)) parameters +static INLINE _glptr_MultiTexCoord2fARB GET_MultiTexCoord2fARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fARB)); +} + +static INLINE void SET_MultiTexCoord2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2fvARB)(GLenum, const GLfloat *); +#define CALL_MultiTexCoord2fvARB(disp, parameters) \ + (* GET_MultiTexCoord2fvARB(disp)) parameters +static INLINE _glptr_MultiTexCoord2fvARB GET_MultiTexCoord2fvARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord2fvARB)); +} + +static INLINE void SET_MultiTexCoord2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2i)(GLenum, GLint, GLint); +#define CALL_MultiTexCoord2i(disp, parameters) \ + (* GET_MultiTexCoord2i(disp)) parameters +static INLINE _glptr_MultiTexCoord2i GET_MultiTexCoord2i(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2i) (GET_by_offset(disp, _gloffset_MultiTexCoord2i)); +} + +static INLINE void SET_MultiTexCoord2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2iv)(GLenum, const GLint *); +#define CALL_MultiTexCoord2iv(disp, parameters) \ + (* GET_MultiTexCoord2iv(disp)) parameters +static INLINE _glptr_MultiTexCoord2iv GET_MultiTexCoord2iv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2iv) (GET_by_offset(disp, _gloffset_MultiTexCoord2iv)); +} + +static INLINE void SET_MultiTexCoord2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2s)(GLenum, GLshort, GLshort); +#define CALL_MultiTexCoord2s(disp, parameters) \ + (* GET_MultiTexCoord2s(disp)) parameters +static INLINE _glptr_MultiTexCoord2s GET_MultiTexCoord2s(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2s) (GET_by_offset(disp, _gloffset_MultiTexCoord2s)); +} + +static INLINE void SET_MultiTexCoord2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord2sv)(GLenum, const GLshort *); +#define CALL_MultiTexCoord2sv(disp, parameters) \ + (* GET_MultiTexCoord2sv(disp)) parameters +static INLINE _glptr_MultiTexCoord2sv GET_MultiTexCoord2sv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord2sv) (GET_by_offset(disp, _gloffset_MultiTexCoord2sv)); +} + +static INLINE void SET_MultiTexCoord2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3d)(GLenum, GLdouble, GLdouble, GLdouble); +#define CALL_MultiTexCoord3d(disp, parameters) \ + (* GET_MultiTexCoord3d(disp)) parameters +static INLINE _glptr_MultiTexCoord3d GET_MultiTexCoord3d(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3d) (GET_by_offset(disp, _gloffset_MultiTexCoord3d)); +} + +static INLINE void SET_MultiTexCoord3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3dv)(GLenum, const GLdouble *); +#define CALL_MultiTexCoord3dv(disp, parameters) \ + (* GET_MultiTexCoord3dv(disp)) parameters +static INLINE _glptr_MultiTexCoord3dv GET_MultiTexCoord3dv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3dv) (GET_by_offset(disp, _gloffset_MultiTexCoord3dv)); +} + +static INLINE void SET_MultiTexCoord3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fARB)(GLenum, GLfloat, GLfloat, GLfloat); +#define CALL_MultiTexCoord3fARB(disp, parameters) \ + (* GET_MultiTexCoord3fARB(disp)) parameters +static INLINE _glptr_MultiTexCoord3fARB GET_MultiTexCoord3fARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fARB)); +} + +static INLINE void SET_MultiTexCoord3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3fvARB)(GLenum, const GLfloat *); +#define CALL_MultiTexCoord3fvARB(disp, parameters) \ + (* GET_MultiTexCoord3fvARB(disp)) parameters +static INLINE _glptr_MultiTexCoord3fvARB GET_MultiTexCoord3fvARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord3fvARB)); +} + +static INLINE void SET_MultiTexCoord3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3i)(GLenum, GLint, GLint, GLint); +#define CALL_MultiTexCoord3i(disp, parameters) \ + (* GET_MultiTexCoord3i(disp)) parameters +static INLINE _glptr_MultiTexCoord3i GET_MultiTexCoord3i(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3i) (GET_by_offset(disp, _gloffset_MultiTexCoord3i)); +} + +static INLINE void SET_MultiTexCoord3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3iv)(GLenum, const GLint *); +#define CALL_MultiTexCoord3iv(disp, parameters) \ + (* GET_MultiTexCoord3iv(disp)) parameters +static INLINE _glptr_MultiTexCoord3iv GET_MultiTexCoord3iv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3iv) (GET_by_offset(disp, _gloffset_MultiTexCoord3iv)); +} + +static INLINE void SET_MultiTexCoord3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3s)(GLenum, GLshort, GLshort, GLshort); +#define CALL_MultiTexCoord3s(disp, parameters) \ + (* GET_MultiTexCoord3s(disp)) parameters +static INLINE _glptr_MultiTexCoord3s GET_MultiTexCoord3s(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3s) (GET_by_offset(disp, _gloffset_MultiTexCoord3s)); +} + +static INLINE void SET_MultiTexCoord3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord3sv)(GLenum, const GLshort *); +#define CALL_MultiTexCoord3sv(disp, parameters) \ + (* GET_MultiTexCoord3sv(disp)) parameters +static INLINE _glptr_MultiTexCoord3sv GET_MultiTexCoord3sv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord3sv) (GET_by_offset(disp, _gloffset_MultiTexCoord3sv)); +} + +static INLINE void SET_MultiTexCoord3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4d)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_MultiTexCoord4d(disp, parameters) \ + (* GET_MultiTexCoord4d(disp)) parameters +static INLINE _glptr_MultiTexCoord4d GET_MultiTexCoord4d(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4d) (GET_by_offset(disp, _gloffset_MultiTexCoord4d)); +} + +static INLINE void SET_MultiTexCoord4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4dv)(GLenum, const GLdouble *); +#define CALL_MultiTexCoord4dv(disp, parameters) \ + (* GET_MultiTexCoord4dv(disp)) parameters +static INLINE _glptr_MultiTexCoord4dv GET_MultiTexCoord4dv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4dv) (GET_by_offset(disp, _gloffset_MultiTexCoord4dv)); +} + +static INLINE void SET_MultiTexCoord4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fARB)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_MultiTexCoord4fARB(disp, parameters) \ + (* GET_MultiTexCoord4fARB(disp)) parameters +static INLINE _glptr_MultiTexCoord4fARB GET_MultiTexCoord4fARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4fARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fARB)); +} + +static INLINE void SET_MultiTexCoord4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4fvARB)(GLenum, const GLfloat *); +#define CALL_MultiTexCoord4fvARB(disp, parameters) \ + (* GET_MultiTexCoord4fvARB(disp)) parameters +static INLINE _glptr_MultiTexCoord4fvARB GET_MultiTexCoord4fvARB(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4fvARB) (GET_by_offset(disp, _gloffset_MultiTexCoord4fvARB)); +} + +static INLINE void SET_MultiTexCoord4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4i)(GLenum, GLint, GLint, GLint, GLint); +#define CALL_MultiTexCoord4i(disp, parameters) \ + (* GET_MultiTexCoord4i(disp)) parameters +static INLINE _glptr_MultiTexCoord4i GET_MultiTexCoord4i(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4i) (GET_by_offset(disp, _gloffset_MultiTexCoord4i)); +} + +static INLINE void SET_MultiTexCoord4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4iv)(GLenum, const GLint *); +#define CALL_MultiTexCoord4iv(disp, parameters) \ + (* GET_MultiTexCoord4iv(disp)) parameters +static INLINE _glptr_MultiTexCoord4iv GET_MultiTexCoord4iv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4iv) (GET_by_offset(disp, _gloffset_MultiTexCoord4iv)); +} + +static INLINE void SET_MultiTexCoord4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4s)(GLenum, GLshort, GLshort, GLshort, GLshort); +#define CALL_MultiTexCoord4s(disp, parameters) \ + (* GET_MultiTexCoord4s(disp)) parameters +static INLINE _glptr_MultiTexCoord4s GET_MultiTexCoord4s(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4s) (GET_by_offset(disp, _gloffset_MultiTexCoord4s)); +} + +static INLINE void SET_MultiTexCoord4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4sv)(GLenum, const GLshort *); +#define CALL_MultiTexCoord4sv(disp, parameters) \ + (* GET_MultiTexCoord4sv(disp)) parameters +static INLINE _glptr_MultiTexCoord4sv GET_MultiTexCoord4sv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4sv) (GET_by_offset(disp, _gloffset_MultiTexCoord4sv)); +} + +static INLINE void SET_MultiTexCoord4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLshort *)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexImage1D)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); +#define CALL_CompressedTexImage1D(disp, parameters) \ + (* GET_CompressedTexImage1D(disp)) parameters +static INLINE _glptr_CompressedTexImage1D GET_CompressedTexImage1D(struct _glapi_table *disp) { + return (_glptr_CompressedTexImage1D) (GET_by_offset(disp, _gloffset_CompressedTexImage1D)); +} + +static INLINE void SET_CompressedTexImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexImage2D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +#define CALL_CompressedTexImage2D(disp, parameters) \ + (* GET_CompressedTexImage2D(disp)) parameters +static INLINE _glptr_CompressedTexImage2D GET_CompressedTexImage2D(struct _glapi_table *disp) { + return (_glptr_CompressedTexImage2D) (GET_by_offset(disp, _gloffset_CompressedTexImage2D)); +} + +static INLINE void SET_CompressedTexImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); +#define CALL_CompressedTexImage3D(disp, parameters) \ + (* GET_CompressedTexImage3D(disp)) parameters +static INLINE _glptr_CompressedTexImage3D GET_CompressedTexImage3D(struct _glapi_table *disp) { + return (_glptr_CompressedTexImage3D) (GET_by_offset(disp, _gloffset_CompressedTexImage3D)); +} + +static INLINE void SET_CompressedTexImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexImage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage1D)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); +#define CALL_CompressedTexSubImage1D(disp, parameters) \ + (* GET_CompressedTexSubImage1D(disp)) parameters +static INLINE _glptr_CompressedTexSubImage1D GET_CompressedTexSubImage1D(struct _glapi_table *disp) { + return (_glptr_CompressedTexSubImage1D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage1D)); +} + +static INLINE void SET_CompressedTexSubImage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexSubImage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage2D)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +#define CALL_CompressedTexSubImage2D(disp, parameters) \ + (* GET_CompressedTexSubImage2D(disp)) parameters +static INLINE _glptr_CompressedTexSubImage2D GET_CompressedTexSubImage2D(struct _glapi_table *disp) { + return (_glptr_CompressedTexSubImage2D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage2D)); +} + +static INLINE void SET_CompressedTexSubImage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexSubImage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompressedTexSubImage3D)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); +#define CALL_CompressedTexSubImage3D(disp, parameters) \ + (* GET_CompressedTexSubImage3D(disp)) parameters +static INLINE _glptr_CompressedTexSubImage3D GET_CompressedTexSubImage3D(struct _glapi_table *disp) { + return (_glptr_CompressedTexSubImage3D) (GET_by_offset(disp, _gloffset_CompressedTexSubImage3D)); +} + +static INLINE void SET_CompressedTexSubImage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_CompressedTexSubImage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetCompressedTexImage)(GLenum, GLint, GLvoid *); +#define CALL_GetCompressedTexImage(disp, parameters) \ + (* GET_GetCompressedTexImage(disp)) parameters +static INLINE _glptr_GetCompressedTexImage GET_GetCompressedTexImage(struct _glapi_table *disp) { + return (_glptr_GetCompressedTexImage) (GET_by_offset(disp, _gloffset_GetCompressedTexImage)); +} + +static INLINE void SET_GetCompressedTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetCompressedTexImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixd)(const GLdouble *); +#define CALL_LoadTransposeMatrixd(disp, parameters) \ + (* GET_LoadTransposeMatrixd(disp)) parameters +static INLINE _glptr_LoadTransposeMatrixd GET_LoadTransposeMatrixd(struct _glapi_table *disp) { + return (_glptr_LoadTransposeMatrixd) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixd)); +} + +static INLINE void SET_LoadTransposeMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_LoadTransposeMatrixd, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixf)(const GLfloat *); +#define CALL_LoadTransposeMatrixf(disp, parameters) \ + (* GET_LoadTransposeMatrixf(disp)) parameters +static INLINE _glptr_LoadTransposeMatrixf GET_LoadTransposeMatrixf(struct _glapi_table *disp) { + return (_glptr_LoadTransposeMatrixf) (GET_by_offset(disp, _gloffset_LoadTransposeMatrixf)); +} + +static INLINE void SET_LoadTransposeMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_LoadTransposeMatrixf, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixd)(const GLdouble *); +#define CALL_MultTransposeMatrixd(disp, parameters) \ + (* GET_MultTransposeMatrixd(disp)) parameters +static INLINE _glptr_MultTransposeMatrixd GET_MultTransposeMatrixd(struct _glapi_table *disp) { + return (_glptr_MultTransposeMatrixd) (GET_by_offset(disp, _gloffset_MultTransposeMatrixd)); +} + +static INLINE void SET_MultTransposeMatrixd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_MultTransposeMatrixd, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultTransposeMatrixf)(const GLfloat *); +#define CALL_MultTransposeMatrixf(disp, parameters) \ + (* GET_MultTransposeMatrixf(disp)) parameters +static INLINE _glptr_MultTransposeMatrixf GET_MultTransposeMatrixf(struct _glapi_table *disp) { + return (_glptr_MultTransposeMatrixf) (GET_by_offset(disp, _gloffset_MultTransposeMatrixf)); +} + +static INLINE void SET_MultTransposeMatrixf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_MultTransposeMatrixf, fn); +} + +typedef void (GLAPIENTRYP _glptr_SampleCoverage)(GLclampf, GLboolean); +#define CALL_SampleCoverage(disp, parameters) \ + (* GET_SampleCoverage(disp)) parameters +static INLINE _glptr_SampleCoverage GET_SampleCoverage(struct _glapi_table *disp) { + return (_glptr_SampleCoverage) (GET_by_offset(disp, _gloffset_SampleCoverage)); +} + +static INLINE void SET_SampleCoverage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) { + SET_by_offset(disp, _gloffset_SampleCoverage, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendFuncSeparate)(GLenum, GLenum, GLenum, GLenum); +#define CALL_BlendFuncSeparate(disp, parameters) \ + (* GET_BlendFuncSeparate(disp)) parameters +static INLINE _glptr_BlendFuncSeparate GET_BlendFuncSeparate(struct _glapi_table *disp) { + return (_glptr_BlendFuncSeparate) (GET_by_offset(disp, _gloffset_BlendFuncSeparate)); +} + +static INLINE void SET_BlendFuncSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendFuncSeparate, fn); +} + +typedef void (GLAPIENTRYP _glptr_FogCoordPointer)(GLenum, GLsizei, const GLvoid *); +#define CALL_FogCoordPointer(disp, parameters) \ + (* GET_FogCoordPointer(disp)) parameters +static INLINE _glptr_FogCoordPointer GET_FogCoordPointer(struct _glapi_table *disp) { + return (_glptr_FogCoordPointer) (GET_by_offset(disp, _gloffset_FogCoordPointer)); +} + +static INLINE void SET_FogCoordPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_FogCoordPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_FogCoordd)(GLdouble); +#define CALL_FogCoordd(disp, parameters) \ + (* GET_FogCoordd(disp)) parameters +static INLINE _glptr_FogCoordd GET_FogCoordd(struct _glapi_table *disp) { + return (_glptr_FogCoordd) (GET_by_offset(disp, _gloffset_FogCoordd)); +} + +static INLINE void SET_FogCoordd(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble)) { + SET_by_offset(disp, _gloffset_FogCoordd, fn); +} + +typedef void (GLAPIENTRYP _glptr_FogCoorddv)(const GLdouble *); +#define CALL_FogCoorddv(disp, parameters) \ + (* GET_FogCoorddv(disp)) parameters +static INLINE _glptr_FogCoorddv GET_FogCoorddv(struct _glapi_table *disp) { + return (_glptr_FogCoorddv) (GET_by_offset(disp, _gloffset_FogCoorddv)); +} + +static INLINE void SET_FogCoorddv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_FogCoorddv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiDrawArrays)(GLenum, const GLint *, const GLsizei *, GLsizei); +#define CALL_MultiDrawArrays(disp, parameters) \ + (* GET_MultiDrawArrays(disp)) parameters +static INLINE _glptr_MultiDrawArrays GET_MultiDrawArrays(struct _glapi_table *disp) { + return (_glptr_MultiDrawArrays) (GET_by_offset(disp, _gloffset_MultiDrawArrays)); +} + +static INLINE void SET_MultiDrawArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *, const GLsizei *, GLsizei)) { + SET_by_offset(disp, _gloffset_MultiDrawArrays, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameterf)(GLenum, GLfloat); +#define CALL_PointParameterf(disp, parameters) \ + (* GET_PointParameterf(disp)) parameters +static INLINE _glptr_PointParameterf GET_PointParameterf(struct _glapi_table *disp) { + return (_glptr_PointParameterf) (GET_by_offset(disp, _gloffset_PointParameterf)); +} + +static INLINE void SET_PointParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_PointParameterf, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameterfv)(GLenum, const GLfloat *); +#define CALL_PointParameterfv(disp, parameters) \ + (* GET_PointParameterfv(disp)) parameters +static INLINE _glptr_PointParameterfv GET_PointParameterfv(struct _glapi_table *disp) { + return (_glptr_PointParameterfv) (GET_by_offset(disp, _gloffset_PointParameterfv)); +} + +static INLINE void SET_PointParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_PointParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameteri)(GLenum, GLint); +#define CALL_PointParameteri(disp, parameters) \ + (* GET_PointParameteri(disp)) parameters +static INLINE _glptr_PointParameteri GET_PointParameteri(struct _glapi_table *disp) { + return (_glptr_PointParameteri) (GET_by_offset(disp, _gloffset_PointParameteri)); +} + +static INLINE void SET_PointParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint)) { + SET_by_offset(disp, _gloffset_PointParameteri, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameteriv)(GLenum, const GLint *); +#define CALL_PointParameteriv(disp, parameters) \ + (* GET_PointParameteriv(disp)) parameters +static INLINE _glptr_PointParameteriv GET_PointParameteriv(struct _glapi_table *disp) { + return (_glptr_PointParameteriv) (GET_by_offset(disp, _gloffset_PointParameteriv)); +} + +static INLINE void SET_PointParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_PointParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3b)(GLbyte, GLbyte, GLbyte); +#define CALL_SecondaryColor3b(disp, parameters) \ + (* GET_SecondaryColor3b(disp)) parameters +static INLINE _glptr_SecondaryColor3b GET_SecondaryColor3b(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3b) (GET_by_offset(disp, _gloffset_SecondaryColor3b)); +} + +static INLINE void SET_SecondaryColor3b(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbyte, GLbyte, GLbyte)) { + SET_by_offset(disp, _gloffset_SecondaryColor3b, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3bv)(const GLbyte *); +#define CALL_SecondaryColor3bv(disp, parameters) \ + (* GET_SecondaryColor3bv(disp)) parameters +static INLINE _glptr_SecondaryColor3bv GET_SecondaryColor3bv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3bv) (GET_by_offset(disp, _gloffset_SecondaryColor3bv)); +} + +static INLINE void SET_SecondaryColor3bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLbyte *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3d)(GLdouble, GLdouble, GLdouble); +#define CALL_SecondaryColor3d(disp, parameters) \ + (* GET_SecondaryColor3d(disp)) parameters +static INLINE _glptr_SecondaryColor3d GET_SecondaryColor3d(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3d) (GET_by_offset(disp, _gloffset_SecondaryColor3d)); +} + +static INLINE void SET_SecondaryColor3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_SecondaryColor3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3dv)(const GLdouble *); +#define CALL_SecondaryColor3dv(disp, parameters) \ + (* GET_SecondaryColor3dv(disp)) parameters +static INLINE _glptr_SecondaryColor3dv GET_SecondaryColor3dv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3dv) (GET_by_offset(disp, _gloffset_SecondaryColor3dv)); +} + +static INLINE void SET_SecondaryColor3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3i)(GLint, GLint, GLint); +#define CALL_SecondaryColor3i(disp, parameters) \ + (* GET_SecondaryColor3i(disp)) parameters +static INLINE _glptr_SecondaryColor3i GET_SecondaryColor3i(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3i) (GET_by_offset(disp, _gloffset_SecondaryColor3i)); +} + +static INLINE void SET_SecondaryColor3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_SecondaryColor3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3iv)(const GLint *); +#define CALL_SecondaryColor3iv(disp, parameters) \ + (* GET_SecondaryColor3iv(disp)) parameters +static INLINE _glptr_SecondaryColor3iv GET_SecondaryColor3iv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3iv) (GET_by_offset(disp, _gloffset_SecondaryColor3iv)); +} + +static INLINE void SET_SecondaryColor3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3s)(GLshort, GLshort, GLshort); +#define CALL_SecondaryColor3s(disp, parameters) \ + (* GET_SecondaryColor3s(disp)) parameters +static INLINE _glptr_SecondaryColor3s GET_SecondaryColor3s(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3s) (GET_by_offset(disp, _gloffset_SecondaryColor3s)); +} + +static INLINE void SET_SecondaryColor3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_SecondaryColor3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3sv)(const GLshort *); +#define CALL_SecondaryColor3sv(disp, parameters) \ + (* GET_SecondaryColor3sv(disp)) parameters +static INLINE _glptr_SecondaryColor3sv GET_SecondaryColor3sv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3sv) (GET_by_offset(disp, _gloffset_SecondaryColor3sv)); +} + +static INLINE void SET_SecondaryColor3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3ub)(GLubyte, GLubyte, GLubyte); +#define CALL_SecondaryColor3ub(disp, parameters) \ + (* GET_SecondaryColor3ub(disp)) parameters +static INLINE _glptr_SecondaryColor3ub GET_SecondaryColor3ub(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3ub) (GET_by_offset(disp, _gloffset_SecondaryColor3ub)); +} + +static INLINE void SET_SecondaryColor3ub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLubyte, GLubyte, GLubyte)) { + SET_by_offset(disp, _gloffset_SecondaryColor3ub, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3ubv)(const GLubyte *); +#define CALL_SecondaryColor3ubv(disp, parameters) \ + (* GET_SecondaryColor3ubv(disp)) parameters +static INLINE _glptr_SecondaryColor3ubv GET_SecondaryColor3ubv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3ubv) (GET_by_offset(disp, _gloffset_SecondaryColor3ubv)); +} + +static INLINE void SET_SecondaryColor3ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLubyte *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3ubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3ui)(GLuint, GLuint, GLuint); +#define CALL_SecondaryColor3ui(disp, parameters) \ + (* GET_SecondaryColor3ui(disp)) parameters +static INLINE _glptr_SecondaryColor3ui GET_SecondaryColor3ui(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3ui) (GET_by_offset(disp, _gloffset_SecondaryColor3ui)); +} + +static INLINE void SET_SecondaryColor3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_SecondaryColor3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3uiv)(const GLuint *); +#define CALL_SecondaryColor3uiv(disp, parameters) \ + (* GET_SecondaryColor3uiv(disp)) parameters +static INLINE _glptr_SecondaryColor3uiv GET_SecondaryColor3uiv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3uiv) (GET_by_offset(disp, _gloffset_SecondaryColor3uiv)); +} + +static INLINE void SET_SecondaryColor3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLuint *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3us)(GLushort, GLushort, GLushort); +#define CALL_SecondaryColor3us(disp, parameters) \ + (* GET_SecondaryColor3us(disp)) parameters +static INLINE _glptr_SecondaryColor3us GET_SecondaryColor3us(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3us) (GET_by_offset(disp, _gloffset_SecondaryColor3us)); +} + +static INLINE void SET_SecondaryColor3us(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLushort, GLushort, GLushort)) { + SET_by_offset(disp, _gloffset_SecondaryColor3us, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3usv)(const GLushort *); +#define CALL_SecondaryColor3usv(disp, parameters) \ + (* GET_SecondaryColor3usv(disp)) parameters +static INLINE _glptr_SecondaryColor3usv GET_SecondaryColor3usv(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3usv) (GET_by_offset(disp, _gloffset_SecondaryColor3usv)); +} + +static INLINE void SET_SecondaryColor3usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLushort *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3usv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColorPointer)(GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_SecondaryColorPointer(disp, parameters) \ + (* GET_SecondaryColorPointer(disp)) parameters +static INLINE _glptr_SecondaryColorPointer GET_SecondaryColorPointer(struct _glapi_table *disp) { + return (_glptr_SecondaryColorPointer) (GET_by_offset(disp, _gloffset_SecondaryColorPointer)); +} + +static INLINE void SET_SecondaryColorPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_SecondaryColorPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2d)(GLdouble, GLdouble); +#define CALL_WindowPos2d(disp, parameters) \ + (* GET_WindowPos2d(disp)) parameters +static INLINE _glptr_WindowPos2d GET_WindowPos2d(struct _glapi_table *disp) { + return (_glptr_WindowPos2d) (GET_by_offset(disp, _gloffset_WindowPos2d)); +} + +static INLINE void SET_WindowPos2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_WindowPos2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2dv)(const GLdouble *); +#define CALL_WindowPos2dv(disp, parameters) \ + (* GET_WindowPos2dv(disp)) parameters +static INLINE _glptr_WindowPos2dv GET_WindowPos2dv(struct _glapi_table *disp) { + return (_glptr_WindowPos2dv) (GET_by_offset(disp, _gloffset_WindowPos2dv)); +} + +static INLINE void SET_WindowPos2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_WindowPos2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2f)(GLfloat, GLfloat); +#define CALL_WindowPos2f(disp, parameters) \ + (* GET_WindowPos2f(disp)) parameters +static INLINE _glptr_WindowPos2f GET_WindowPos2f(struct _glapi_table *disp) { + return (_glptr_WindowPos2f) (GET_by_offset(disp, _gloffset_WindowPos2f)); +} + +static INLINE void SET_WindowPos2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_WindowPos2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2fv)(const GLfloat *); +#define CALL_WindowPos2fv(disp, parameters) \ + (* GET_WindowPos2fv(disp)) parameters +static INLINE _glptr_WindowPos2fv GET_WindowPos2fv(struct _glapi_table *disp) { + return (_glptr_WindowPos2fv) (GET_by_offset(disp, _gloffset_WindowPos2fv)); +} + +static INLINE void SET_WindowPos2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_WindowPos2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2i)(GLint, GLint); +#define CALL_WindowPos2i(disp, parameters) \ + (* GET_WindowPos2i(disp)) parameters +static INLINE _glptr_WindowPos2i GET_WindowPos2i(struct _glapi_table *disp) { + return (_glptr_WindowPos2i) (GET_by_offset(disp, _gloffset_WindowPos2i)); +} + +static INLINE void SET_WindowPos2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_WindowPos2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2iv)(const GLint *); +#define CALL_WindowPos2iv(disp, parameters) \ + (* GET_WindowPos2iv(disp)) parameters +static INLINE _glptr_WindowPos2iv GET_WindowPos2iv(struct _glapi_table *disp) { + return (_glptr_WindowPos2iv) (GET_by_offset(disp, _gloffset_WindowPos2iv)); +} + +static INLINE void SET_WindowPos2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_WindowPos2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2s)(GLshort, GLshort); +#define CALL_WindowPos2s(disp, parameters) \ + (* GET_WindowPos2s(disp)) parameters +static INLINE _glptr_WindowPos2s GET_WindowPos2s(struct _glapi_table *disp) { + return (_glptr_WindowPos2s) (GET_by_offset(disp, _gloffset_WindowPos2s)); +} + +static INLINE void SET_WindowPos2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_WindowPos2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos2sv)(const GLshort *); +#define CALL_WindowPos2sv(disp, parameters) \ + (* GET_WindowPos2sv(disp)) parameters +static INLINE _glptr_WindowPos2sv GET_WindowPos2sv(struct _glapi_table *disp) { + return (_glptr_WindowPos2sv) (GET_by_offset(disp, _gloffset_WindowPos2sv)); +} + +static INLINE void SET_WindowPos2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_WindowPos2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3d)(GLdouble, GLdouble, GLdouble); +#define CALL_WindowPos3d(disp, parameters) \ + (* GET_WindowPos3d(disp)) parameters +static INLINE _glptr_WindowPos3d GET_WindowPos3d(struct _glapi_table *disp) { + return (_glptr_WindowPos3d) (GET_by_offset(disp, _gloffset_WindowPos3d)); +} + +static INLINE void SET_WindowPos3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_WindowPos3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3dv)(const GLdouble *); +#define CALL_WindowPos3dv(disp, parameters) \ + (* GET_WindowPos3dv(disp)) parameters +static INLINE _glptr_WindowPos3dv GET_WindowPos3dv(struct _glapi_table *disp) { + return (_glptr_WindowPos3dv) (GET_by_offset(disp, _gloffset_WindowPos3dv)); +} + +static INLINE void SET_WindowPos3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_WindowPos3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3f)(GLfloat, GLfloat, GLfloat); +#define CALL_WindowPos3f(disp, parameters) \ + (* GET_WindowPos3f(disp)) parameters +static INLINE _glptr_WindowPos3f GET_WindowPos3f(struct _glapi_table *disp) { + return (_glptr_WindowPos3f) (GET_by_offset(disp, _gloffset_WindowPos3f)); +} + +static INLINE void SET_WindowPos3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_WindowPos3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3fv)(const GLfloat *); +#define CALL_WindowPos3fv(disp, parameters) \ + (* GET_WindowPos3fv(disp)) parameters +static INLINE _glptr_WindowPos3fv GET_WindowPos3fv(struct _glapi_table *disp) { + return (_glptr_WindowPos3fv) (GET_by_offset(disp, _gloffset_WindowPos3fv)); +} + +static INLINE void SET_WindowPos3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_WindowPos3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3i)(GLint, GLint, GLint); +#define CALL_WindowPos3i(disp, parameters) \ + (* GET_WindowPos3i(disp)) parameters +static INLINE _glptr_WindowPos3i GET_WindowPos3i(struct _glapi_table *disp) { + return (_glptr_WindowPos3i) (GET_by_offset(disp, _gloffset_WindowPos3i)); +} + +static INLINE void SET_WindowPos3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_WindowPos3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3iv)(const GLint *); +#define CALL_WindowPos3iv(disp, parameters) \ + (* GET_WindowPos3iv(disp)) parameters +static INLINE _glptr_WindowPos3iv GET_WindowPos3iv(struct _glapi_table *disp) { + return (_glptr_WindowPos3iv) (GET_by_offset(disp, _gloffset_WindowPos3iv)); +} + +static INLINE void SET_WindowPos3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_WindowPos3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3s)(GLshort, GLshort, GLshort); +#define CALL_WindowPos3s(disp, parameters) \ + (* GET_WindowPos3s(disp)) parameters +static INLINE _glptr_WindowPos3s GET_WindowPos3s(struct _glapi_table *disp) { + return (_glptr_WindowPos3s) (GET_by_offset(disp, _gloffset_WindowPos3s)); +} + +static INLINE void SET_WindowPos3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_WindowPos3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos3sv)(const GLshort *); +#define CALL_WindowPos3sv(disp, parameters) \ + (* GET_WindowPos3sv(disp)) parameters +static INLINE _glptr_WindowPos3sv GET_WindowPos3sv(struct _glapi_table *disp) { + return (_glptr_WindowPos3sv) (GET_by_offset(disp, _gloffset_WindowPos3sv)); +} + +static INLINE void SET_WindowPos3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_WindowPos3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginQuery)(GLenum, GLuint); +#define CALL_BeginQuery(disp, parameters) \ + (* GET_BeginQuery(disp)) parameters +static INLINE _glptr_BeginQuery GET_BeginQuery(struct _glapi_table *disp) { + return (_glptr_BeginQuery) (GET_by_offset(disp, _gloffset_BeginQuery)); +} + +static INLINE void SET_BeginQuery(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BeginQuery, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBuffer)(GLenum, GLuint); +#define CALL_BindBuffer(disp, parameters) \ + (* GET_BindBuffer(disp)) parameters +static INLINE _glptr_BindBuffer GET_BindBuffer(struct _glapi_table *disp) { + return (_glptr_BindBuffer) (GET_by_offset(disp, _gloffset_BindBuffer)); +} + +static INLINE void SET_BindBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_BufferData)(GLenum, GLsizeiptr, const GLvoid *, GLenum); +#define CALL_BufferData(disp, parameters) \ + (* GET_BufferData(disp)) parameters +static INLINE _glptr_BufferData GET_BufferData(struct _glapi_table *disp) { + return (_glptr_BufferData) (GET_by_offset(disp, _gloffset_BufferData)); +} + +static INLINE void SET_BufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizeiptr, const GLvoid *, GLenum)) { + SET_by_offset(disp, _gloffset_BufferData, fn); +} + +typedef void (GLAPIENTRYP _glptr_BufferSubData)(GLenum, GLintptr, GLsizeiptr, const GLvoid *); +#define CALL_BufferSubData(disp, parameters) \ + (* GET_BufferSubData(disp)) parameters +static INLINE _glptr_BufferSubData GET_BufferSubData(struct _glapi_table *disp) { + return (_glptr_BufferSubData) (GET_by_offset(disp, _gloffset_BufferSubData)); +} + +static INLINE void SET_BufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, const GLvoid *)) { + SET_by_offset(disp, _gloffset_BufferSubData, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteBuffers)(GLsizei, const GLuint *); +#define CALL_DeleteBuffers(disp, parameters) \ + (* GET_DeleteBuffers(disp)) parameters +static INLINE _glptr_DeleteBuffers GET_DeleteBuffers(struct _glapi_table *disp) { + return (_glptr_DeleteBuffers) (GET_by_offset(disp, _gloffset_DeleteBuffers)); +} + +static INLINE void SET_DeleteBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteBuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteQueries)(GLsizei, const GLuint *); +#define CALL_DeleteQueries(disp, parameters) \ + (* GET_DeleteQueries(disp)) parameters +static INLINE _glptr_DeleteQueries GET_DeleteQueries(struct _glapi_table *disp) { + return (_glptr_DeleteQueries) (GET_by_offset(disp, _gloffset_DeleteQueries)); +} + +static INLINE void SET_DeleteQueries(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteQueries, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndQuery)(GLenum); +#define CALL_EndQuery(disp, parameters) \ + (* GET_EndQuery(disp)) parameters +static INLINE _glptr_EndQuery GET_EndQuery(struct _glapi_table *disp) { + return (_glptr_EndQuery) (GET_by_offset(disp, _gloffset_EndQuery)); +} + +static INLINE void SET_EndQuery(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_EndQuery, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenBuffers)(GLsizei, GLuint *); +#define CALL_GenBuffers(disp, parameters) \ + (* GET_GenBuffers(disp)) parameters +static INLINE _glptr_GenBuffers GET_GenBuffers(struct _glapi_table *disp) { + return (_glptr_GenBuffers) (GET_by_offset(disp, _gloffset_GenBuffers)); +} + +static INLINE void SET_GenBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenBuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenQueries)(GLsizei, GLuint *); +#define CALL_GenQueries(disp, parameters) \ + (* GET_GenQueries(disp)) parameters +static INLINE _glptr_GenQueries GET_GenQueries(struct _glapi_table *disp) { + return (_glptr_GenQueries) (GET_by_offset(disp, _gloffset_GenQueries)); +} + +static INLINE void SET_GenQueries(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenQueries, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBufferParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetBufferParameteriv(disp, parameters) \ + (* GET_GetBufferParameteriv(disp)) parameters +static INLINE _glptr_GetBufferParameteriv GET_GetBufferParameteriv(struct _glapi_table *disp) { + return (_glptr_GetBufferParameteriv) (GET_by_offset(disp, _gloffset_GetBufferParameteriv)); +} + +static INLINE void SET_GetBufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetBufferParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBufferPointerv)(GLenum, GLenum, GLvoid **); +#define CALL_GetBufferPointerv(disp, parameters) \ + (* GET_GetBufferPointerv(disp)) parameters +static INLINE _glptr_GetBufferPointerv GET_GetBufferPointerv(struct _glapi_table *disp) { + return (_glptr_GetBufferPointerv) (GET_by_offset(disp, _gloffset_GetBufferPointerv)); +} + +static INLINE void SET_GetBufferPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid **)) { + SET_by_offset(disp, _gloffset_GetBufferPointerv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBufferSubData)(GLenum, GLintptr, GLsizeiptr, GLvoid *); +#define CALL_GetBufferSubData(disp, parameters) \ + (* GET_GetBufferSubData(disp)) parameters +static INLINE _glptr_GetBufferSubData GET_GetBufferSubData(struct _glapi_table *disp) { + return (_glptr_GetBufferSubData) (GET_by_offset(disp, _gloffset_GetBufferSubData)); +} + +static INLINE void SET_GetBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetBufferSubData, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryObjectiv)(GLuint, GLenum, GLint *); +#define CALL_GetQueryObjectiv(disp, parameters) \ + (* GET_GetQueryObjectiv(disp)) parameters +static INLINE _glptr_GetQueryObjectiv GET_GetQueryObjectiv(struct _glapi_table *disp) { + return (_glptr_GetQueryObjectiv) (GET_by_offset(disp, _gloffset_GetQueryObjectiv)); +} + +static INLINE void SET_GetQueryObjectiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetQueryObjectiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryObjectuiv)(GLuint, GLenum, GLuint *); +#define CALL_GetQueryObjectuiv(disp, parameters) \ + (* GET_GetQueryObjectuiv(disp)) parameters +static INLINE _glptr_GetQueryObjectuiv GET_GetQueryObjectuiv(struct _glapi_table *disp) { + return (_glptr_GetQueryObjectuiv) (GET_by_offset(disp, _gloffset_GetQueryObjectuiv)); +} + +static INLINE void SET_GetQueryObjectuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) { + SET_by_offset(disp, _gloffset_GetQueryObjectuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryiv)(GLenum, GLenum, GLint *); +#define CALL_GetQueryiv(disp, parameters) \ + (* GET_GetQueryiv(disp)) parameters +static INLINE _glptr_GetQueryiv GET_GetQueryiv(struct _glapi_table *disp) { + return (_glptr_GetQueryiv) (GET_by_offset(disp, _gloffset_GetQueryiv)); +} + +static INLINE void SET_GetQueryiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetQueryiv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsBuffer)(GLuint); +#define CALL_IsBuffer(disp, parameters) \ + (* GET_IsBuffer(disp)) parameters +static INLINE _glptr_IsBuffer GET_IsBuffer(struct _glapi_table *disp) { + return (_glptr_IsBuffer) (GET_by_offset(disp, _gloffset_IsBuffer)); +} + +static INLINE void SET_IsBuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsBuffer, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsQuery)(GLuint); +#define CALL_IsQuery(disp, parameters) \ + (* GET_IsQuery(disp)) parameters +static INLINE _glptr_IsQuery GET_IsQuery(struct _glapi_table *disp) { + return (_glptr_IsQuery) (GET_by_offset(disp, _gloffset_IsQuery)); +} + +static INLINE void SET_IsQuery(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsQuery, fn); +} + +typedef GLvoid * (GLAPIENTRYP _glptr_MapBuffer)(GLenum, GLenum); +#define CALL_MapBuffer(disp, parameters) \ + (* GET_MapBuffer(disp)) parameters +static INLINE _glptr_MapBuffer GET_MapBuffer(struct _glapi_table *disp) { + return (_glptr_MapBuffer) (GET_by_offset(disp, _gloffset_MapBuffer)); +} + +static INLINE void SET_MapBuffer(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_MapBuffer, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_UnmapBuffer)(GLenum); +#define CALL_UnmapBuffer(disp, parameters) \ + (* GET_UnmapBuffer(disp)) parameters +static INLINE _glptr_UnmapBuffer GET_UnmapBuffer(struct _glapi_table *disp) { + return (_glptr_UnmapBuffer) (GET_by_offset(disp, _gloffset_UnmapBuffer)); +} + +static INLINE void SET_UnmapBuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_UnmapBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_AttachShader)(GLuint, GLuint); +#define CALL_AttachShader(disp, parameters) \ + (* GET_AttachShader(disp)) parameters +static INLINE _glptr_AttachShader GET_AttachShader(struct _glapi_table *disp) { + return (_glptr_AttachShader) (GET_by_offset(disp, _gloffset_AttachShader)); +} + +static INLINE void SET_AttachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_AttachShader, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindAttribLocation)(GLuint, GLuint, const GLchar *); +#define CALL_BindAttribLocation(disp, parameters) \ + (* GET_BindAttribLocation(disp)) parameters +static INLINE _glptr_BindAttribLocation GET_BindAttribLocation(struct _glapi_table *disp) { + return (_glptr_BindAttribLocation) (GET_by_offset(disp, _gloffset_BindAttribLocation)); +} + +static INLINE void SET_BindAttribLocation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_BindAttribLocation, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendEquationSeparate)(GLenum, GLenum); +#define CALL_BlendEquationSeparate(disp, parameters) \ + (* GET_BlendEquationSeparate(disp)) parameters +static INLINE _glptr_BlendEquationSeparate GET_BlendEquationSeparate(struct _glapi_table *disp) { + return (_glptr_BlendEquationSeparate) (GET_by_offset(disp, _gloffset_BlendEquationSeparate)); +} + +static INLINE void SET_BlendEquationSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendEquationSeparate, fn); +} + +typedef void (GLAPIENTRYP _glptr_CompileShader)(GLuint); +#define CALL_CompileShader(disp, parameters) \ + (* GET_CompileShader(disp)) parameters +static INLINE _glptr_CompileShader GET_CompileShader(struct _glapi_table *disp) { + return (_glptr_CompileShader) (GET_by_offset(disp, _gloffset_CompileShader)); +} + +static INLINE void SET_CompileShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_CompileShader, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_CreateProgram)(void); +#define CALL_CreateProgram(disp, parameters) \ + (* GET_CreateProgram(disp)) parameters +static INLINE _glptr_CreateProgram GET_CreateProgram(struct _glapi_table *disp) { + return (_glptr_CreateProgram) (GET_by_offset(disp, _gloffset_CreateProgram)); +} + +static INLINE void SET_CreateProgram(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_CreateProgram, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_CreateShader)(GLenum); +#define CALL_CreateShader(disp, parameters) \ + (* GET_CreateShader(disp)) parameters +static INLINE _glptr_CreateShader GET_CreateShader(struct _glapi_table *disp) { + return (_glptr_CreateShader) (GET_by_offset(disp, _gloffset_CreateShader)); +} + +static INLINE void SET_CreateShader(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_CreateShader, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteProgram)(GLuint); +#define CALL_DeleteProgram(disp, parameters) \ + (* GET_DeleteProgram(disp)) parameters +static INLINE _glptr_DeleteProgram GET_DeleteProgram(struct _glapi_table *disp) { + return (_glptr_DeleteProgram) (GET_by_offset(disp, _gloffset_DeleteProgram)); +} + +static INLINE void SET_DeleteProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_DeleteProgram, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteShader)(GLuint); +#define CALL_DeleteShader(disp, parameters) \ + (* GET_DeleteShader(disp)) parameters +static INLINE _glptr_DeleteShader GET_DeleteShader(struct _glapi_table *disp) { + return (_glptr_DeleteShader) (GET_by_offset(disp, _gloffset_DeleteShader)); +} + +static INLINE void SET_DeleteShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_DeleteShader, fn); +} + +typedef void (GLAPIENTRYP _glptr_DetachShader)(GLuint, GLuint); +#define CALL_DetachShader(disp, parameters) \ + (* GET_DetachShader(disp)) parameters +static INLINE _glptr_DetachShader GET_DetachShader(struct _glapi_table *disp) { + return (_glptr_DetachShader) (GET_by_offset(disp, _gloffset_DetachShader)); +} + +static INLINE void SET_DetachShader(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_DetachShader, fn); +} + +typedef void (GLAPIENTRYP _glptr_DisableVertexAttribArray)(GLuint); +#define CALL_DisableVertexAttribArray(disp, parameters) \ + (* GET_DisableVertexAttribArray(disp)) parameters +static INLINE _glptr_DisableVertexAttribArray GET_DisableVertexAttribArray(struct _glapi_table *disp) { + return (_glptr_DisableVertexAttribArray) (GET_by_offset(disp, _gloffset_DisableVertexAttribArray)); +} + +static INLINE void SET_DisableVertexAttribArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_DisableVertexAttribArray, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawBuffers)(GLsizei, const GLenum *); +#define CALL_DrawBuffers(disp, parameters) \ + (* GET_DrawBuffers(disp)) parameters +static INLINE _glptr_DrawBuffers GET_DrawBuffers(struct _glapi_table *disp) { + return (_glptr_DrawBuffers) (GET_by_offset(disp, _gloffset_DrawBuffers)); +} + +static INLINE void SET_DrawBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLenum *)) { + SET_by_offset(disp, _gloffset_DrawBuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_EnableVertexAttribArray)(GLuint); +#define CALL_EnableVertexAttribArray(disp, parameters) \ + (* GET_EnableVertexAttribArray(disp)) parameters +static INLINE _glptr_EnableVertexAttribArray GET_EnableVertexAttribArray(struct _glapi_table *disp) { + return (_glptr_EnableVertexAttribArray) (GET_by_offset(disp, _gloffset_EnableVertexAttribArray)); +} + +static INLINE void SET_EnableVertexAttribArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_EnableVertexAttribArray, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveAttrib)(GLuint, GLuint, GLsizei , GLsizei *, GLint *, GLenum *, GLchar *); +#define CALL_GetActiveAttrib(disp, parameters) \ + (* GET_GetActiveAttrib(disp)) parameters +static INLINE _glptr_GetActiveAttrib GET_GetActiveAttrib(struct _glapi_table *disp) { + return (_glptr_GetActiveAttrib) (GET_by_offset(disp, _gloffset_GetActiveAttrib)); +} + +static INLINE void SET_GetActiveAttrib(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei , GLsizei *, GLint *, GLenum *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetActiveAttrib, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveUniform)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); +#define CALL_GetActiveUniform(disp, parameters) \ + (* GET_GetActiveUniform(disp)) parameters +static INLINE _glptr_GetActiveUniform GET_GetActiveUniform(struct _glapi_table *disp) { + return (_glptr_GetActiveUniform) (GET_by_offset(disp, _gloffset_GetActiveUniform)); +} + +static INLINE void SET_GetActiveUniform(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetActiveUniform, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetAttachedShaders)(GLuint, GLsizei, GLsizei *, GLuint *); +#define CALL_GetAttachedShaders(disp, parameters) \ + (* GET_GetAttachedShaders(disp)) parameters +static INLINE _glptr_GetAttachedShaders GET_GetAttachedShaders(struct _glapi_table *disp) { + return (_glptr_GetAttachedShaders) (GET_by_offset(disp, _gloffset_GetAttachedShaders)); +} + +static INLINE void SET_GetAttachedShaders(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLuint *)) { + SET_by_offset(disp, _gloffset_GetAttachedShaders, fn); +} + +typedef GLint (GLAPIENTRYP _glptr_GetAttribLocation)(GLuint, const GLchar *); +#define CALL_GetAttribLocation(disp, parameters) \ + (* GET_GetAttribLocation(disp)) parameters +static INLINE _glptr_GetAttribLocation GET_GetAttribLocation(struct _glapi_table *disp) { + return (_glptr_GetAttribLocation) (GET_by_offset(disp, _gloffset_GetAttribLocation)); +} + +static INLINE void SET_GetAttribLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_GetAttribLocation, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetProgramInfoLog(disp, parameters) \ + (* GET_GetProgramInfoLog(disp)) parameters +static INLINE _glptr_GetProgramInfoLog GET_GetProgramInfoLog(struct _glapi_table *disp) { + return (_glptr_GetProgramInfoLog) (GET_by_offset(disp, _gloffset_GetProgramInfoLog)); +} + +static INLINE void SET_GetProgramInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetProgramInfoLog, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramiv)(GLuint, GLenum, GLint *); +#define CALL_GetProgramiv(disp, parameters) \ + (* GET_GetProgramiv(disp)) parameters +static INLINE _glptr_GetProgramiv GET_GetProgramiv(struct _glapi_table *disp) { + return (_glptr_GetProgramiv) (GET_by_offset(disp, _gloffset_GetProgramiv)); +} + +static INLINE void SET_GetProgramiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetProgramiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetShaderInfoLog(disp, parameters) \ + (* GET_GetShaderInfoLog(disp)) parameters +static INLINE _glptr_GetShaderInfoLog GET_GetShaderInfoLog(struct _glapi_table *disp) { + return (_glptr_GetShaderInfoLog) (GET_by_offset(disp, _gloffset_GetShaderInfoLog)); +} + +static INLINE void SET_GetShaderInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetShaderInfoLog, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetShaderSource)(GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetShaderSource(disp, parameters) \ + (* GET_GetShaderSource(disp)) parameters +static INLINE _glptr_GetShaderSource GET_GetShaderSource(struct _glapi_table *disp) { + return (_glptr_GetShaderSource) (GET_by_offset(disp, _gloffset_GetShaderSource)); +} + +static INLINE void SET_GetShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetShaderSource, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetShaderiv)(GLuint, GLenum, GLint *); +#define CALL_GetShaderiv(disp, parameters) \ + (* GET_GetShaderiv(disp)) parameters +static INLINE _glptr_GetShaderiv GET_GetShaderiv(struct _glapi_table *disp) { + return (_glptr_GetShaderiv) (GET_by_offset(disp, _gloffset_GetShaderiv)); +} + +static INLINE void SET_GetShaderiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetShaderiv, fn); +} + +typedef GLint (GLAPIENTRYP _glptr_GetUniformLocation)(GLuint, const GLchar *); +#define CALL_GetUniformLocation(disp, parameters) \ + (* GET_GetUniformLocation(disp)) parameters +static INLINE _glptr_GetUniformLocation GET_GetUniformLocation(struct _glapi_table *disp) { + return (_glptr_GetUniformLocation) (GET_by_offset(disp, _gloffset_GetUniformLocation)); +} + +static INLINE void SET_GetUniformLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_GetUniformLocation, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetUniformfv)(GLuint, GLint, GLfloat *); +#define CALL_GetUniformfv(disp, parameters) \ + (* GET_GetUniformfv(disp)) parameters +static INLINE _glptr_GetUniformfv GET_GetUniformfv(struct _glapi_table *disp) { + return (_glptr_GetUniformfv) (GET_by_offset(disp, _gloffset_GetUniformfv)); +} + +static INLINE void SET_GetUniformfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetUniformfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetUniformiv)(GLuint, GLint, GLint *); +#define CALL_GetUniformiv(disp, parameters) \ + (* GET_GetUniformiv(disp)) parameters +static INLINE _glptr_GetUniformiv GET_GetUniformiv(struct _glapi_table *disp) { + return (_glptr_GetUniformiv) (GET_by_offset(disp, _gloffset_GetUniformiv)); +} + +static INLINE void SET_GetUniformiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint *)) { + SET_by_offset(disp, _gloffset_GetUniformiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribPointerv)(GLuint, GLenum, GLvoid **); +#define CALL_GetVertexAttribPointerv(disp, parameters) \ + (* GET_GetVertexAttribPointerv(disp)) parameters +static INLINE _glptr_GetVertexAttribPointerv GET_GetVertexAttribPointerv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribPointerv) (GET_by_offset(disp, _gloffset_GetVertexAttribPointerv)); +} + +static INLINE void SET_GetVertexAttribPointerv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLvoid **)) { + SET_by_offset(disp, _gloffset_GetVertexAttribPointerv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribdv)(GLuint, GLenum, GLdouble *); +#define CALL_GetVertexAttribdv(disp, parameters) \ + (* GET_GetVertexAttribdv(disp)) parameters +static INLINE _glptr_GetVertexAttribdv GET_GetVertexAttribdv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribdv) (GET_by_offset(disp, _gloffset_GetVertexAttribdv)); +} + +static INLINE void SET_GetVertexAttribdv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribdv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribfv)(GLuint, GLenum, GLfloat *); +#define CALL_GetVertexAttribfv(disp, parameters) \ + (* GET_GetVertexAttribfv(disp)) parameters +static INLINE _glptr_GetVertexAttribfv GET_GetVertexAttribfv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribfv) (GET_by_offset(disp, _gloffset_GetVertexAttribfv)); +} + +static INLINE void SET_GetVertexAttribfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribiv)(GLuint, GLenum, GLint *); +#define CALL_GetVertexAttribiv(disp, parameters) \ + (* GET_GetVertexAttribiv(disp)) parameters +static INLINE _glptr_GetVertexAttribiv GET_GetVertexAttribiv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribiv) (GET_by_offset(disp, _gloffset_GetVertexAttribiv)); +} + +static INLINE void SET_GetVertexAttribiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribiv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsProgram)(GLuint); +#define CALL_IsProgram(disp, parameters) \ + (* GET_IsProgram(disp)) parameters +static INLINE _glptr_IsProgram GET_IsProgram(struct _glapi_table *disp) { + return (_glptr_IsProgram) (GET_by_offset(disp, _gloffset_IsProgram)); +} + +static INLINE void SET_IsProgram(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsProgram, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsShader)(GLuint); +#define CALL_IsShader(disp, parameters) \ + (* GET_IsShader(disp)) parameters +static INLINE _glptr_IsShader GET_IsShader(struct _glapi_table *disp) { + return (_glptr_IsShader) (GET_by_offset(disp, _gloffset_IsShader)); +} + +static INLINE void SET_IsShader(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsShader, fn); +} + +typedef void (GLAPIENTRYP _glptr_LinkProgram)(GLuint); +#define CALL_LinkProgram(disp, parameters) \ + (* GET_LinkProgram(disp)) parameters +static INLINE _glptr_LinkProgram GET_LinkProgram(struct _glapi_table *disp) { + return (_glptr_LinkProgram) (GET_by_offset(disp, _gloffset_LinkProgram)); +} + +static INLINE void SET_LinkProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_LinkProgram, fn); +} + +typedef void (GLAPIENTRYP _glptr_ShaderSource)(GLuint, GLsizei, const GLchar * const *, const GLint *); +#define CALL_ShaderSource(disp, parameters) \ + (* GET_ShaderSource(disp)) parameters +static INLINE _glptr_ShaderSource GET_ShaderSource(struct _glapi_table *disp) { + return (_glptr_ShaderSource) (GET_by_offset(disp, _gloffset_ShaderSource)); +} + +static INLINE void SET_ShaderSource(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, const GLint *)) { + SET_by_offset(disp, _gloffset_ShaderSource, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilFuncSeparate)(GLenum, GLenum, GLint, GLuint); +#define CALL_StencilFuncSeparate(disp, parameters) \ + (* GET_StencilFuncSeparate(disp)) parameters +static INLINE _glptr_StencilFuncSeparate GET_StencilFuncSeparate(struct _glapi_table *disp) { + return (_glptr_StencilFuncSeparate) (GET_by_offset(disp, _gloffset_StencilFuncSeparate)); +} + +static INLINE void SET_StencilFuncSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) { + SET_by_offset(disp, _gloffset_StencilFuncSeparate, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilMaskSeparate)(GLenum, GLuint); +#define CALL_StencilMaskSeparate(disp, parameters) \ + (* GET_StencilMaskSeparate(disp)) parameters +static INLINE _glptr_StencilMaskSeparate GET_StencilMaskSeparate(struct _glapi_table *disp) { + return (_glptr_StencilMaskSeparate) (GET_by_offset(disp, _gloffset_StencilMaskSeparate)); +} + +static INLINE void SET_StencilMaskSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_StencilMaskSeparate, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilOpSeparate)(GLenum, GLenum, GLenum, GLenum); +#define CALL_StencilOpSeparate(disp, parameters) \ + (* GET_StencilOpSeparate(disp)) parameters +static INLINE _glptr_StencilOpSeparate GET_StencilOpSeparate(struct _glapi_table *disp) { + return (_glptr_StencilOpSeparate) (GET_by_offset(disp, _gloffset_StencilOpSeparate)); +} + +static INLINE void SET_StencilOpSeparate(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_StencilOpSeparate, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1f)(GLint, GLfloat); +#define CALL_Uniform1f(disp, parameters) \ + (* GET_Uniform1f(disp)) parameters +static INLINE _glptr_Uniform1f GET_Uniform1f(struct _glapi_table *disp) { + return (_glptr_Uniform1f) (GET_by_offset(disp, _gloffset_Uniform1f)); +} + +static INLINE void SET_Uniform1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat)) { + SET_by_offset(disp, _gloffset_Uniform1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1fv)(GLint, GLsizei, const GLfloat *); +#define CALL_Uniform1fv(disp, parameters) \ + (* GET_Uniform1fv(disp)) parameters +static INLINE _glptr_Uniform1fv GET_Uniform1fv(struct _glapi_table *disp) { + return (_glptr_Uniform1fv) (GET_by_offset(disp, _gloffset_Uniform1fv)); +} + +static INLINE void SET_Uniform1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Uniform1fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1i)(GLint, GLint); +#define CALL_Uniform1i(disp, parameters) \ + (* GET_Uniform1i(disp)) parameters +static INLINE _glptr_Uniform1i GET_Uniform1i(struct _glapi_table *disp) { + return (_glptr_Uniform1i) (GET_by_offset(disp, _gloffset_Uniform1i)); +} + +static INLINE void SET_Uniform1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint)) { + SET_by_offset(disp, _gloffset_Uniform1i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1iv)(GLint, GLsizei, const GLint *); +#define CALL_Uniform1iv(disp, parameters) \ + (* GET_Uniform1iv(disp)) parameters +static INLINE _glptr_Uniform1iv GET_Uniform1iv(struct _glapi_table *disp) { + return (_glptr_Uniform1iv) (GET_by_offset(disp, _gloffset_Uniform1iv)); +} + +static INLINE void SET_Uniform1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_Uniform1iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2f)(GLint, GLfloat, GLfloat); +#define CALL_Uniform2f(disp, parameters) \ + (* GET_Uniform2f(disp)) parameters +static INLINE _glptr_Uniform2f GET_Uniform2f(struct _glapi_table *disp) { + return (_glptr_Uniform2f) (GET_by_offset(disp, _gloffset_Uniform2f)); +} + +static INLINE void SET_Uniform2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Uniform2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2fv)(GLint, GLsizei, const GLfloat *); +#define CALL_Uniform2fv(disp, parameters) \ + (* GET_Uniform2fv(disp)) parameters +static INLINE _glptr_Uniform2fv GET_Uniform2fv(struct _glapi_table *disp) { + return (_glptr_Uniform2fv) (GET_by_offset(disp, _gloffset_Uniform2fv)); +} + +static INLINE void SET_Uniform2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Uniform2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2i)(GLint, GLint, GLint); +#define CALL_Uniform2i(disp, parameters) \ + (* GET_Uniform2i(disp)) parameters +static INLINE _glptr_Uniform2i GET_Uniform2i(struct _glapi_table *disp) { + return (_glptr_Uniform2i) (GET_by_offset(disp, _gloffset_Uniform2i)); +} + +static INLINE void SET_Uniform2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Uniform2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2iv)(GLint, GLsizei, const GLint *); +#define CALL_Uniform2iv(disp, parameters) \ + (* GET_Uniform2iv(disp)) parameters +static INLINE _glptr_Uniform2iv GET_Uniform2iv(struct _glapi_table *disp) { + return (_glptr_Uniform2iv) (GET_by_offset(disp, _gloffset_Uniform2iv)); +} + +static INLINE void SET_Uniform2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_Uniform2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3f)(GLint, GLfloat, GLfloat, GLfloat); +#define CALL_Uniform3f(disp, parameters) \ + (* GET_Uniform3f(disp)) parameters +static INLINE _glptr_Uniform3f GET_Uniform3f(struct _glapi_table *disp) { + return (_glptr_Uniform3f) (GET_by_offset(disp, _gloffset_Uniform3f)); +} + +static INLINE void SET_Uniform3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Uniform3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3fv)(GLint, GLsizei, const GLfloat *); +#define CALL_Uniform3fv(disp, parameters) \ + (* GET_Uniform3fv(disp)) parameters +static INLINE _glptr_Uniform3fv GET_Uniform3fv(struct _glapi_table *disp) { + return (_glptr_Uniform3fv) (GET_by_offset(disp, _gloffset_Uniform3fv)); +} + +static INLINE void SET_Uniform3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Uniform3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3i)(GLint, GLint, GLint, GLint); +#define CALL_Uniform3i(disp, parameters) \ + (* GET_Uniform3i(disp)) parameters +static INLINE _glptr_Uniform3i GET_Uniform3i(struct _glapi_table *disp) { + return (_glptr_Uniform3i) (GET_by_offset(disp, _gloffset_Uniform3i)); +} + +static INLINE void SET_Uniform3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Uniform3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3iv)(GLint, GLsizei, const GLint *); +#define CALL_Uniform3iv(disp, parameters) \ + (* GET_Uniform3iv(disp)) parameters +static INLINE _glptr_Uniform3iv GET_Uniform3iv(struct _glapi_table *disp) { + return (_glptr_Uniform3iv) (GET_by_offset(disp, _gloffset_Uniform3iv)); +} + +static INLINE void SET_Uniform3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_Uniform3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4f)(GLint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Uniform4f(disp, parameters) \ + (* GET_Uniform4f(disp)) parameters +static INLINE _glptr_Uniform4f GET_Uniform4f(struct _glapi_table *disp) { + return (_glptr_Uniform4f) (GET_by_offset(disp, _gloffset_Uniform4f)); +} + +static INLINE void SET_Uniform4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Uniform4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4fv)(GLint, GLsizei, const GLfloat *); +#define CALL_Uniform4fv(disp, parameters) \ + (* GET_Uniform4fv(disp)) parameters +static INLINE _glptr_Uniform4fv GET_Uniform4fv(struct _glapi_table *disp) { + return (_glptr_Uniform4fv) (GET_by_offset(disp, _gloffset_Uniform4fv)); +} + +static INLINE void SET_Uniform4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_Uniform4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4i)(GLint, GLint, GLint, GLint, GLint); +#define CALL_Uniform4i(disp, parameters) \ + (* GET_Uniform4i(disp)) parameters +static INLINE _glptr_Uniform4i GET_Uniform4i(struct _glapi_table *disp) { + return (_glptr_Uniform4i) (GET_by_offset(disp, _gloffset_Uniform4i)); +} + +static INLINE void SET_Uniform4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_Uniform4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4iv)(GLint, GLsizei, const GLint *); +#define CALL_Uniform4iv(disp, parameters) \ + (* GET_Uniform4iv(disp)) parameters +static INLINE _glptr_Uniform4iv GET_Uniform4iv(struct _glapi_table *disp) { + return (_glptr_Uniform4iv) (GET_by_offset(disp, _gloffset_Uniform4iv)); +} + +static INLINE void SET_Uniform4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_Uniform4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix2fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix2fv(disp, parameters) \ + (* GET_UniformMatrix2fv(disp)) parameters +static INLINE _glptr_UniformMatrix2fv GET_UniformMatrix2fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix2fv) (GET_by_offset(disp, _gloffset_UniformMatrix2fv)); +} + +static INLINE void SET_UniformMatrix2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix3fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix3fv(disp, parameters) \ + (* GET_UniformMatrix3fv(disp)) parameters +static INLINE _glptr_UniformMatrix3fv GET_UniformMatrix3fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix3fv) (GET_by_offset(disp, _gloffset_UniformMatrix3fv)); +} + +static INLINE void SET_UniformMatrix3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix4fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix4fv(disp, parameters) \ + (* GET_UniformMatrix4fv(disp)) parameters +static INLINE _glptr_UniformMatrix4fv GET_UniformMatrix4fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix4fv) (GET_by_offset(disp, _gloffset_UniformMatrix4fv)); +} + +static INLINE void SET_UniformMatrix4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UseProgram)(GLuint); +#define CALL_UseProgram(disp, parameters) \ + (* GET_UseProgram(disp)) parameters +static INLINE _glptr_UseProgram GET_UseProgram(struct _glapi_table *disp) { + return (_glptr_UseProgram) (GET_by_offset(disp, _gloffset_UseProgram)); +} + +static INLINE void SET_UseProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_UseProgram, fn); +} + +typedef void (GLAPIENTRYP _glptr_ValidateProgram)(GLuint); +#define CALL_ValidateProgram(disp, parameters) \ + (* GET_ValidateProgram(disp)) parameters +static INLINE _glptr_ValidateProgram GET_ValidateProgram(struct _glapi_table *disp) { + return (_glptr_ValidateProgram) (GET_by_offset(disp, _gloffset_ValidateProgram)); +} + +static INLINE void SET_ValidateProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_ValidateProgram, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1d)(GLuint, GLdouble); +#define CALL_VertexAttrib1d(disp, parameters) \ + (* GET_VertexAttrib1d(disp)) parameters +static INLINE _glptr_VertexAttrib1d GET_VertexAttrib1d(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1d) (GET_by_offset(disp, _gloffset_VertexAttrib1d)); +} + +static INLINE void SET_VertexAttrib1d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib1d, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1dv)(GLuint, const GLdouble *); +#define CALL_VertexAttrib1dv(disp, parameters) \ + (* GET_VertexAttrib1dv(disp)) parameters +static INLINE _glptr_VertexAttrib1dv GET_VertexAttrib1dv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1dv) (GET_by_offset(disp, _gloffset_VertexAttrib1dv)); +} + +static INLINE void SET_VertexAttrib1dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1s)(GLuint, GLshort); +#define CALL_VertexAttrib1s(disp, parameters) \ + (* GET_VertexAttrib1s(disp)) parameters +static INLINE _glptr_VertexAttrib1s GET_VertexAttrib1s(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1s) (GET_by_offset(disp, _gloffset_VertexAttrib1s)); +} + +static INLINE void SET_VertexAttrib1s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib1s, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1sv)(GLuint, const GLshort *); +#define CALL_VertexAttrib1sv(disp, parameters) \ + (* GET_VertexAttrib1sv(disp)) parameters +static INLINE _glptr_VertexAttrib1sv GET_VertexAttrib1sv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1sv) (GET_by_offset(disp, _gloffset_VertexAttrib1sv)); +} + +static INLINE void SET_VertexAttrib1sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2d)(GLuint, GLdouble, GLdouble); +#define CALL_VertexAttrib2d(disp, parameters) \ + (* GET_VertexAttrib2d(disp)) parameters +static INLINE _glptr_VertexAttrib2d GET_VertexAttrib2d(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2d) (GET_by_offset(disp, _gloffset_VertexAttrib2d)); +} + +static INLINE void SET_VertexAttrib2d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib2d, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2dv)(GLuint, const GLdouble *); +#define CALL_VertexAttrib2dv(disp, parameters) \ + (* GET_VertexAttrib2dv(disp)) parameters +static INLINE _glptr_VertexAttrib2dv GET_VertexAttrib2dv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2dv) (GET_by_offset(disp, _gloffset_VertexAttrib2dv)); +} + +static INLINE void SET_VertexAttrib2dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2s)(GLuint, GLshort, GLshort); +#define CALL_VertexAttrib2s(disp, parameters) \ + (* GET_VertexAttrib2s(disp)) parameters +static INLINE _glptr_VertexAttrib2s GET_VertexAttrib2s(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2s) (GET_by_offset(disp, _gloffset_VertexAttrib2s)); +} + +static INLINE void SET_VertexAttrib2s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib2s, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2sv)(GLuint, const GLshort *); +#define CALL_VertexAttrib2sv(disp, parameters) \ + (* GET_VertexAttrib2sv(disp)) parameters +static INLINE _glptr_VertexAttrib2sv GET_VertexAttrib2sv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2sv) (GET_by_offset(disp, _gloffset_VertexAttrib2sv)); +} + +static INLINE void SET_VertexAttrib2sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3d)(GLuint, GLdouble, GLdouble, GLdouble); +#define CALL_VertexAttrib3d(disp, parameters) \ + (* GET_VertexAttrib3d(disp)) parameters +static INLINE _glptr_VertexAttrib3d GET_VertexAttrib3d(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3d) (GET_by_offset(disp, _gloffset_VertexAttrib3d)); +} + +static INLINE void SET_VertexAttrib3d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib3d, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3dv)(GLuint, const GLdouble *); +#define CALL_VertexAttrib3dv(disp, parameters) \ + (* GET_VertexAttrib3dv(disp)) parameters +static INLINE _glptr_VertexAttrib3dv GET_VertexAttrib3dv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3dv) (GET_by_offset(disp, _gloffset_VertexAttrib3dv)); +} + +static INLINE void SET_VertexAttrib3dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3s)(GLuint, GLshort, GLshort, GLshort); +#define CALL_VertexAttrib3s(disp, parameters) \ + (* GET_VertexAttrib3s(disp)) parameters +static INLINE _glptr_VertexAttrib3s GET_VertexAttrib3s(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3s) (GET_by_offset(disp, _gloffset_VertexAttrib3s)); +} + +static INLINE void SET_VertexAttrib3s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib3s, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3sv)(GLuint, const GLshort *); +#define CALL_VertexAttrib3sv(disp, parameters) \ + (* GET_VertexAttrib3sv(disp)) parameters +static INLINE _glptr_VertexAttrib3sv GET_VertexAttrib3sv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3sv) (GET_by_offset(disp, _gloffset_VertexAttrib3sv)); +} + +static INLINE void SET_VertexAttrib3sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nbv)(GLuint, const GLbyte *); +#define CALL_VertexAttrib4Nbv(disp, parameters) \ + (* GET_VertexAttrib4Nbv(disp)) parameters +static INLINE _glptr_VertexAttrib4Nbv GET_VertexAttrib4Nbv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nbv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nbv)); +} + +static INLINE void SET_VertexAttrib4Nbv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nbv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Niv)(GLuint, const GLint *); +#define CALL_VertexAttrib4Niv(disp, parameters) \ + (* GET_VertexAttrib4Niv(disp)) parameters +static INLINE _glptr_VertexAttrib4Niv GET_VertexAttrib4Niv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Niv) (GET_by_offset(disp, _gloffset_VertexAttrib4Niv)); +} + +static INLINE void SET_VertexAttrib4Niv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Niv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nsv)(GLuint, const GLshort *); +#define CALL_VertexAttrib4Nsv(disp, parameters) \ + (* GET_VertexAttrib4Nsv(disp)) parameters +static INLINE _glptr_VertexAttrib4Nsv GET_VertexAttrib4Nsv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nsv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nsv)); +} + +static INLINE void SET_VertexAttrib4Nsv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nsv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nub)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte); +#define CALL_VertexAttrib4Nub(disp, parameters) \ + (* GET_VertexAttrib4Nub(disp)) parameters +static INLINE _glptr_VertexAttrib4Nub GET_VertexAttrib4Nub(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nub) (GET_by_offset(disp, _gloffset_VertexAttrib4Nub)); +} + +static INLINE void SET_VertexAttrib4Nub(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nub, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nubv)(GLuint, const GLubyte *); +#define CALL_VertexAttrib4Nubv(disp, parameters) \ + (* GET_VertexAttrib4Nubv(disp)) parameters +static INLINE _glptr_VertexAttrib4Nubv GET_VertexAttrib4Nubv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nubv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nubv)); +} + +static INLINE void SET_VertexAttrib4Nubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nuiv)(GLuint, const GLuint *); +#define CALL_VertexAttrib4Nuiv(disp, parameters) \ + (* GET_VertexAttrib4Nuiv(disp)) parameters +static INLINE _glptr_VertexAttrib4Nuiv GET_VertexAttrib4Nuiv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nuiv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nuiv)); +} + +static INLINE void SET_VertexAttrib4Nuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4Nusv)(GLuint, const GLushort *); +#define CALL_VertexAttrib4Nusv(disp, parameters) \ + (* GET_VertexAttrib4Nusv(disp)) parameters +static INLINE _glptr_VertexAttrib4Nusv GET_VertexAttrib4Nusv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4Nusv) (GET_by_offset(disp, _gloffset_VertexAttrib4Nusv)); +} + +static INLINE void SET_VertexAttrib4Nusv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4Nusv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4bv)(GLuint, const GLbyte *); +#define CALL_VertexAttrib4bv(disp, parameters) \ + (* GET_VertexAttrib4bv(disp)) parameters +static INLINE _glptr_VertexAttrib4bv GET_VertexAttrib4bv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4bv) (GET_by_offset(disp, _gloffset_VertexAttrib4bv)); +} + +static INLINE void SET_VertexAttrib4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4d)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_VertexAttrib4d(disp, parameters) \ + (* GET_VertexAttrib4d(disp)) parameters +static INLINE _glptr_VertexAttrib4d GET_VertexAttrib4d(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4d) (GET_by_offset(disp, _gloffset_VertexAttrib4d)); +} + +static INLINE void SET_VertexAttrib4d(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib4d, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4dv)(GLuint, const GLdouble *); +#define CALL_VertexAttrib4dv(disp, parameters) \ + (* GET_VertexAttrib4dv(disp)) parameters +static INLINE _glptr_VertexAttrib4dv GET_VertexAttrib4dv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4dv) (GET_by_offset(disp, _gloffset_VertexAttrib4dv)); +} + +static INLINE void SET_VertexAttrib4dv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4dv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4iv)(GLuint, const GLint *); +#define CALL_VertexAttrib4iv(disp, parameters) \ + (* GET_VertexAttrib4iv(disp)) parameters +static INLINE _glptr_VertexAttrib4iv GET_VertexAttrib4iv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4iv) (GET_by_offset(disp, _gloffset_VertexAttrib4iv)); +} + +static INLINE void SET_VertexAttrib4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4s)(GLuint, GLshort, GLshort, GLshort, GLshort); +#define CALL_VertexAttrib4s(disp, parameters) \ + (* GET_VertexAttrib4s(disp)) parameters +static INLINE _glptr_VertexAttrib4s GET_VertexAttrib4s(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4s) (GET_by_offset(disp, _gloffset_VertexAttrib4s)); +} + +static INLINE void SET_VertexAttrib4s(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib4s, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4sv)(GLuint, const GLshort *); +#define CALL_VertexAttrib4sv(disp, parameters) \ + (* GET_VertexAttrib4sv(disp)) parameters +static INLINE _glptr_VertexAttrib4sv GET_VertexAttrib4sv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4sv) (GET_by_offset(disp, _gloffset_VertexAttrib4sv)); +} + +static INLINE void SET_VertexAttrib4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubv)(GLuint, const GLubyte *); +#define CALL_VertexAttrib4ubv(disp, parameters) \ + (* GET_VertexAttrib4ubv(disp)) parameters +static INLINE _glptr_VertexAttrib4ubv GET_VertexAttrib4ubv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4ubv) (GET_by_offset(disp, _gloffset_VertexAttrib4ubv)); +} + +static INLINE void SET_VertexAttrib4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4ubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4uiv)(GLuint, const GLuint *); +#define CALL_VertexAttrib4uiv(disp, parameters) \ + (* GET_VertexAttrib4uiv(disp)) parameters +static INLINE _glptr_VertexAttrib4uiv GET_VertexAttrib4uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4uiv) (GET_by_offset(disp, _gloffset_VertexAttrib4uiv)); +} + +static INLINE void SET_VertexAttrib4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4usv)(GLuint, const GLushort *); +#define CALL_VertexAttrib4usv(disp, parameters) \ + (* GET_VertexAttrib4usv(disp)) parameters +static INLINE _glptr_VertexAttrib4usv GET_VertexAttrib4usv(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4usv) (GET_by_offset(disp, _gloffset_VertexAttrib4usv)); +} + +static INLINE void SET_VertexAttrib4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4usv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribPointer)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); +#define CALL_VertexAttribPointer(disp, parameters) \ + (* GET_VertexAttribPointer(disp)) parameters +static INLINE _glptr_VertexAttribPointer GET_VertexAttribPointer(struct _glapi_table *disp) { + return (_glptr_VertexAttribPointer) (GET_by_offset(disp, _gloffset_VertexAttribPointer)); +} + +static INLINE void SET_VertexAttribPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VertexAttribPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix2x3fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix2x3fv(disp, parameters) \ + (* GET_UniformMatrix2x3fv(disp)) parameters +static INLINE _glptr_UniformMatrix2x3fv GET_UniformMatrix2x3fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix2x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x3fv)); +} + +static INLINE void SET_UniformMatrix2x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix2x3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix2x4fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix2x4fv(disp, parameters) \ + (* GET_UniformMatrix2x4fv(disp)) parameters +static INLINE _glptr_UniformMatrix2x4fv GET_UniformMatrix2x4fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix2x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix2x4fv)); +} + +static INLINE void SET_UniformMatrix2x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix2x4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix3x2fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix3x2fv(disp, parameters) \ + (* GET_UniformMatrix3x2fv(disp)) parameters +static INLINE _glptr_UniformMatrix3x2fv GET_UniformMatrix3x2fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix3x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x2fv)); +} + +static INLINE void SET_UniformMatrix3x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix3x2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix3x4fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix3x4fv(disp, parameters) \ + (* GET_UniformMatrix3x4fv(disp)) parameters +static INLINE _glptr_UniformMatrix3x4fv GET_UniformMatrix3x4fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix3x4fv) (GET_by_offset(disp, _gloffset_UniformMatrix3x4fv)); +} + +static INLINE void SET_UniformMatrix3x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix3x4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix4x2fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix4x2fv(disp, parameters) \ + (* GET_UniformMatrix4x2fv(disp)) parameters +static INLINE _glptr_UniformMatrix4x2fv GET_UniformMatrix4x2fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix4x2fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x2fv)); +} + +static INLINE void SET_UniformMatrix4x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix4x2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformMatrix4x3fv)(GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_UniformMatrix4x3fv(disp, parameters) \ + (* GET_UniformMatrix4x3fv(disp)) parameters +static INLINE _glptr_UniformMatrix4x3fv GET_UniformMatrix4x3fv(struct _glapi_table *disp) { + return (_glptr_UniformMatrix4x3fv) (GET_by_offset(disp, _gloffset_UniformMatrix4x3fv)); +} + +static INLINE void SET_UniformMatrix4x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_UniformMatrix4x3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginConditionalRender)(GLuint, GLenum); +#define CALL_BeginConditionalRender(disp, parameters) \ + (* GET_BeginConditionalRender(disp)) parameters +static INLINE _glptr_BeginConditionalRender GET_BeginConditionalRender(struct _glapi_table *disp) { + return (_glptr_BeginConditionalRender) (GET_by_offset(disp, _gloffset_BeginConditionalRender)); +} + +static INLINE void SET_BeginConditionalRender(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_BeginConditionalRender, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginTransformFeedback)(GLenum); +#define CALL_BeginTransformFeedback(disp, parameters) \ + (* GET_BeginTransformFeedback(disp)) parameters +static INLINE _glptr_BeginTransformFeedback GET_BeginTransformFeedback(struct _glapi_table *disp) { + return (_glptr_BeginTransformFeedback) (GET_by_offset(disp, _gloffset_BeginTransformFeedback)); +} + +static INLINE void SET_BeginTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_BeginTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBufferBase)(GLenum, GLuint, GLuint); +#define CALL_BindBufferBase(disp, parameters) \ + (* GET_BindBufferBase(disp)) parameters +static INLINE _glptr_BindBufferBase GET_BindBufferBase(struct _glapi_table *disp) { + return (_glptr_BindBufferBase) (GET_by_offset(disp, _gloffset_BindBufferBase)); +} + +static INLINE void SET_BindBufferBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_BindBufferBase, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBufferRange)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr); +#define CALL_BindBufferRange(disp, parameters) \ + (* GET_BindBufferRange(disp)) parameters +static INLINE _glptr_BindBufferRange GET_BindBufferRange(struct _glapi_table *disp) { + return (_glptr_BindBufferRange) (GET_by_offset(disp, _gloffset_BindBufferRange)); +} + +static INLINE void SET_BindBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_BindBufferRange, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindFragDataLocation)(GLuint, GLuint, const GLchar *); +#define CALL_BindFragDataLocation(disp, parameters) \ + (* GET_BindFragDataLocation(disp)) parameters +static INLINE _glptr_BindFragDataLocation GET_BindFragDataLocation(struct _glapi_table *disp) { + return (_glptr_BindFragDataLocation) (GET_by_offset(disp, _gloffset_BindFragDataLocation)); +} + +static INLINE void SET_BindFragDataLocation(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_BindFragDataLocation, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClampColor)(GLenum, GLenum); +#define CALL_ClampColor(disp, parameters) \ + (* GET_ClampColor(disp)) parameters +static INLINE _glptr_ClampColor GET_ClampColor(struct _glapi_table *disp) { + return (_glptr_ClampColor) (GET_by_offset(disp, _gloffset_ClampColor)); +} + +static INLINE void SET_ClampColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_ClampColor, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferfi)(GLenum, GLint, GLfloat, GLint); +#define CALL_ClearBufferfi(disp, parameters) \ + (* GET_ClearBufferfi(disp)) parameters +static INLINE _glptr_ClearBufferfi GET_ClearBufferfi(struct _glapi_table *disp) { + return (_glptr_ClearBufferfi) (GET_by_offset(disp, _gloffset_ClearBufferfi)); +} + +static INLINE void SET_ClearBufferfi(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLfloat, GLint)) { + SET_by_offset(disp, _gloffset_ClearBufferfi, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferfv)(GLenum, GLint, const GLfloat *); +#define CALL_ClearBufferfv(disp, parameters) \ + (* GET_ClearBufferfv(disp)) parameters +static INLINE _glptr_ClearBufferfv GET_ClearBufferfv(struct _glapi_table *disp) { + return (_glptr_ClearBufferfv) (GET_by_offset(disp, _gloffset_ClearBufferfv)); +} + +static INLINE void SET_ClearBufferfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ClearBufferfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferiv)(GLenum, GLint, const GLint *); +#define CALL_ClearBufferiv(disp, parameters) \ + (* GET_ClearBufferiv(disp)) parameters +static INLINE _glptr_ClearBufferiv GET_ClearBufferiv(struct _glapi_table *disp) { + return (_glptr_ClearBufferiv) (GET_by_offset(disp, _gloffset_ClearBufferiv)); +} + +static INLINE void SET_ClearBufferiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLint *)) { + SET_by_offset(disp, _gloffset_ClearBufferiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferuiv)(GLenum, GLint, const GLuint *); +#define CALL_ClearBufferuiv(disp, parameters) \ + (* GET_ClearBufferuiv(disp)) parameters +static INLINE _glptr_ClearBufferuiv GET_ClearBufferuiv(struct _glapi_table *disp) { + return (_glptr_ClearBufferuiv) (GET_by_offset(disp, _gloffset_ClearBufferuiv)); +} + +static INLINE void SET_ClearBufferuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, const GLuint *)) { + SET_by_offset(disp, _gloffset_ClearBufferuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorMaski)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean); +#define CALL_ColorMaski(disp, parameters) \ + (* GET_ColorMaski(disp)) parameters +static INLINE _glptr_ColorMaski GET_ColorMaski(struct _glapi_table *disp) { + return (_glptr_ColorMaski) (GET_by_offset(disp, _gloffset_ColorMaski)); +} + +static INLINE void SET_ColorMaski(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLboolean, GLboolean, GLboolean, GLboolean)) { + SET_by_offset(disp, _gloffset_ColorMaski, fn); +} + +typedef void (GLAPIENTRYP _glptr_Disablei)(GLenum, GLuint); +#define CALL_Disablei(disp, parameters) \ + (* GET_Disablei(disp)) parameters +static INLINE _glptr_Disablei GET_Disablei(struct _glapi_table *disp) { + return (_glptr_Disablei) (GET_by_offset(disp, _gloffset_Disablei)); +} + +static INLINE void SET_Disablei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_Disablei, fn); +} + +typedef void (GLAPIENTRYP _glptr_Enablei)(GLenum, GLuint); +#define CALL_Enablei(disp, parameters) \ + (* GET_Enablei(disp)) parameters +static INLINE _glptr_Enablei GET_Enablei(struct _glapi_table *disp) { + return (_glptr_Enablei) (GET_by_offset(disp, _gloffset_Enablei)); +} + +static INLINE void SET_Enablei(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_Enablei, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndConditionalRender)(void); +#define CALL_EndConditionalRender(disp, parameters) \ + (* GET_EndConditionalRender(disp)) parameters +static INLINE _glptr_EndConditionalRender GET_EndConditionalRender(struct _glapi_table *disp) { + return (_glptr_EndConditionalRender) (GET_by_offset(disp, _gloffset_EndConditionalRender)); +} + +static INLINE void SET_EndConditionalRender(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_EndConditionalRender, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndTransformFeedback)(void); +#define CALL_EndTransformFeedback(disp, parameters) \ + (* GET_EndTransformFeedback(disp)) parameters +static INLINE _glptr_EndTransformFeedback GET_EndTransformFeedback(struct _glapi_table *disp) { + return (_glptr_EndTransformFeedback) (GET_by_offset(disp, _gloffset_EndTransformFeedback)); +} + +static INLINE void SET_EndTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_EndTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBooleani_v)(GLenum, GLuint, GLboolean *); +#define CALL_GetBooleani_v(disp, parameters) \ + (* GET_GetBooleani_v(disp)) parameters +static INLINE _glptr_GetBooleani_v GET_GetBooleani_v(struct _glapi_table *disp) { + return (_glptr_GetBooleani_v) (GET_by_offset(disp, _gloffset_GetBooleani_v)); +} + +static INLINE void SET_GetBooleani_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLboolean *)) { + SET_by_offset(disp, _gloffset_GetBooleani_v, fn); +} + +typedef GLint (GLAPIENTRYP _glptr_GetFragDataLocation)(GLuint, const GLchar *); +#define CALL_GetFragDataLocation(disp, parameters) \ + (* GET_GetFragDataLocation(disp)) parameters +static INLINE _glptr_GetFragDataLocation GET_GetFragDataLocation(struct _glapi_table *disp) { + return (_glptr_GetFragDataLocation) (GET_by_offset(disp, _gloffset_GetFragDataLocation)); +} + +static INLINE void SET_GetFragDataLocation(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_GetFragDataLocation, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetIntegeri_v)(GLenum, GLuint, GLint *); +#define CALL_GetIntegeri_v(disp, parameters) \ + (* GET_GetIntegeri_v(disp)) parameters +static INLINE _glptr_GetIntegeri_v GET_GetIntegeri_v(struct _glapi_table *disp) { + return (_glptr_GetIntegeri_v) (GET_by_offset(disp, _gloffset_GetIntegeri_v)); +} + +static INLINE void SET_GetIntegeri_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint *)) { + SET_by_offset(disp, _gloffset_GetIntegeri_v, fn); +} + +typedef const GLubyte * (GLAPIENTRYP _glptr_GetStringi)(GLenum, GLuint); +#define CALL_GetStringi(disp, parameters) \ + (* GET_GetStringi(disp)) parameters +static INLINE _glptr_GetStringi GET_GetStringi(struct _glapi_table *disp) { + return (_glptr_GetStringi) (GET_by_offset(disp, _gloffset_GetStringi)); +} + +static INLINE void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_GetStringi, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexParameterIiv)(GLenum, GLenum, GLint *); +#define CALL_GetTexParameterIiv(disp, parameters) \ + (* GET_GetTexParameterIiv(disp)) parameters +static INLINE _glptr_GetTexParameterIiv GET_GetTexParameterIiv(struct _glapi_table *disp) { + return (_glptr_GetTexParameterIiv) (GET_by_offset(disp, _gloffset_GetTexParameterIiv)); +} + +static INLINE void SET_GetTexParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexParameterIiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexParameterIuiv)(GLenum, GLenum, GLuint *); +#define CALL_GetTexParameterIuiv(disp, parameters) \ + (* GET_GetTexParameterIuiv(disp)) parameters +static INLINE _glptr_GetTexParameterIuiv GET_GetTexParameterIuiv(struct _glapi_table *disp) { + return (_glptr_GetTexParameterIuiv) (GET_by_offset(disp, _gloffset_GetTexParameterIuiv)); +} + +static INLINE void SET_GetTexParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint *)) { + SET_by_offset(disp, _gloffset_GetTexParameterIuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTransformFeedbackVarying)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *); +#define CALL_GetTransformFeedbackVarying(disp, parameters) \ + (* GET_GetTransformFeedbackVarying(disp)) parameters +static INLINE _glptr_GetTransformFeedbackVarying GET_GetTransformFeedbackVarying(struct _glapi_table *disp) { + return (_glptr_GetTransformFeedbackVarying) (GET_by_offset(disp, _gloffset_GetTransformFeedbackVarying)); +} + +static INLINE void SET_GetTransformFeedbackVarying(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetTransformFeedbackVarying, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetUniformuiv)(GLuint, GLint, GLuint *); +#define CALL_GetUniformuiv(disp, parameters) \ + (* GET_GetUniformuiv(disp)) parameters +static INLINE _glptr_GetUniformuiv GET_GetUniformuiv(struct _glapi_table *disp) { + return (_glptr_GetUniformuiv) (GET_by_offset(disp, _gloffset_GetUniformuiv)); +} + +static INLINE void SET_GetUniformuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint *)) { + SET_by_offset(disp, _gloffset_GetUniformuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribIiv)(GLuint, GLenum, GLint *); +#define CALL_GetVertexAttribIiv(disp, parameters) \ + (* GET_GetVertexAttribIiv(disp)) parameters +static INLINE _glptr_GetVertexAttribIiv GET_GetVertexAttribIiv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribIiv) (GET_by_offset(disp, _gloffset_GetVertexAttribIiv)); +} + +static INLINE void SET_GetVertexAttribIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribIiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribIuiv)(GLuint, GLenum, GLuint *); +#define CALL_GetVertexAttribIuiv(disp, parameters) \ + (* GET_GetVertexAttribIuiv(disp)) parameters +static INLINE _glptr_GetVertexAttribIuiv GET_GetVertexAttribIuiv(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribIuiv) (GET_by_offset(disp, _gloffset_GetVertexAttribIuiv)); +} + +static INLINE void SET_GetVertexAttribIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribIuiv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsEnabledi)(GLenum, GLuint); +#define CALL_IsEnabledi(disp, parameters) \ + (* GET_IsEnabledi(disp)) parameters +static INLINE _glptr_IsEnabledi GET_IsEnabledi(struct _glapi_table *disp) { + return (_glptr_IsEnabledi) (GET_by_offset(disp, _gloffset_IsEnabledi)); +} + +static INLINE void SET_IsEnabledi(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_IsEnabledi, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterIiv)(GLenum, GLenum, const GLint *); +#define CALL_TexParameterIiv(disp, parameters) \ + (* GET_TexParameterIiv(disp)) parameters +static INLINE _glptr_TexParameterIiv GET_TexParameterIiv(struct _glapi_table *disp) { + return (_glptr_TexParameterIiv) (GET_by_offset(disp, _gloffset_TexParameterIiv)); +} + +static INLINE void SET_TexParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_TexParameterIiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterIuiv)(GLenum, GLenum, const GLuint *); +#define CALL_TexParameterIuiv(disp, parameters) \ + (* GET_TexParameterIuiv(disp)) parameters +static INLINE _glptr_TexParameterIuiv GET_TexParameterIuiv(struct _glapi_table *disp) { + return (_glptr_TexParameterIuiv) (GET_by_offset(disp, _gloffset_TexParameterIuiv)); +} + +static INLINE void SET_TexParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_TexParameterIuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TransformFeedbackVaryings)(GLuint, GLsizei, const GLchar * const *, GLenum); +#define CALL_TransformFeedbackVaryings(disp, parameters) \ + (* GET_TransformFeedbackVaryings(disp)) parameters +static INLINE _glptr_TransformFeedbackVaryings GET_TransformFeedbackVaryings(struct _glapi_table *disp) { + return (_glptr_TransformFeedbackVaryings) (GET_by_offset(disp, _gloffset_TransformFeedbackVaryings)); +} + +static INLINE void SET_TransformFeedbackVaryings(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, GLenum)) { + SET_by_offset(disp, _gloffset_TransformFeedbackVaryings, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1ui)(GLint, GLuint); +#define CALL_Uniform1ui(disp, parameters) \ + (* GET_Uniform1ui(disp)) parameters +static INLINE _glptr_Uniform1ui GET_Uniform1ui(struct _glapi_table *disp) { + return (_glptr_Uniform1ui) (GET_by_offset(disp, _gloffset_Uniform1ui)); +} + +static INLINE void SET_Uniform1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint)) { + SET_by_offset(disp, _gloffset_Uniform1ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform1uiv)(GLint, GLsizei, const GLuint *); +#define CALL_Uniform1uiv(disp, parameters) \ + (* GET_Uniform1uiv(disp)) parameters +static INLINE _glptr_Uniform1uiv GET_Uniform1uiv(struct _glapi_table *disp) { + return (_glptr_Uniform1uiv) (GET_by_offset(disp, _gloffset_Uniform1uiv)); +} + +static INLINE void SET_Uniform1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_Uniform1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2ui)(GLint, GLuint, GLuint); +#define CALL_Uniform2ui(disp, parameters) \ + (* GET_Uniform2ui(disp)) parameters +static INLINE _glptr_Uniform2ui GET_Uniform2ui(struct _glapi_table *disp) { + return (_glptr_Uniform2ui) (GET_by_offset(disp, _gloffset_Uniform2ui)); +} + +static INLINE void SET_Uniform2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_Uniform2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform2uiv)(GLint, GLsizei, const GLuint *); +#define CALL_Uniform2uiv(disp, parameters) \ + (* GET_Uniform2uiv(disp)) parameters +static INLINE _glptr_Uniform2uiv GET_Uniform2uiv(struct _glapi_table *disp) { + return (_glptr_Uniform2uiv) (GET_by_offset(disp, _gloffset_Uniform2uiv)); +} + +static INLINE void SET_Uniform2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_Uniform2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3ui)(GLint, GLuint, GLuint, GLuint); +#define CALL_Uniform3ui(disp, parameters) \ + (* GET_Uniform3ui(disp)) parameters +static INLINE _glptr_Uniform3ui GET_Uniform3ui(struct _glapi_table *disp) { + return (_glptr_Uniform3ui) (GET_by_offset(disp, _gloffset_Uniform3ui)); +} + +static INLINE void SET_Uniform3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_Uniform3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform3uiv)(GLint, GLsizei, const GLuint *); +#define CALL_Uniform3uiv(disp, parameters) \ + (* GET_Uniform3uiv(disp)) parameters +static INLINE _glptr_Uniform3uiv GET_Uniform3uiv(struct _glapi_table *disp) { + return (_glptr_Uniform3uiv) (GET_by_offset(disp, _gloffset_Uniform3uiv)); +} + +static INLINE void SET_Uniform3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_Uniform3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4ui)(GLint, GLuint, GLuint, GLuint, GLuint); +#define CALL_Uniform4ui(disp, parameters) \ + (* GET_Uniform4ui(disp)) parameters +static INLINE _glptr_Uniform4ui GET_Uniform4ui(struct _glapi_table *disp) { + return (_glptr_Uniform4ui) (GET_by_offset(disp, _gloffset_Uniform4ui)); +} + +static INLINE void SET_Uniform4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_Uniform4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_Uniform4uiv)(GLint, GLsizei, const GLuint *); +#define CALL_Uniform4uiv(disp, parameters) \ + (* GET_Uniform4uiv(disp)) parameters +static INLINE _glptr_Uniform4uiv GET_Uniform4uiv(struct _glapi_table *disp) { + return (_glptr_Uniform4uiv) (GET_by_offset(disp, _gloffset_Uniform4uiv)); +} + +static INLINE void SET_Uniform4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_Uniform4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI1iv)(GLuint, const GLint *); +#define CALL_VertexAttribI1iv(disp, parameters) \ + (* GET_VertexAttribI1iv(disp)) parameters +static INLINE _glptr_VertexAttribI1iv GET_VertexAttribI1iv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI1iv) (GET_by_offset(disp, _gloffset_VertexAttribI1iv)); +} + +static INLINE void SET_VertexAttribI1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI1iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiv)(GLuint, const GLuint *); +#define CALL_VertexAttribI1uiv(disp, parameters) \ + (* GET_VertexAttribI1uiv(disp)) parameters +static INLINE _glptr_VertexAttribI1uiv GET_VertexAttribI1uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI1uiv) (GET_by_offset(disp, _gloffset_VertexAttribI1uiv)); +} + +static INLINE void SET_VertexAttribI1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4bv)(GLuint, const GLbyte *); +#define CALL_VertexAttribI4bv(disp, parameters) \ + (* GET_VertexAttribI4bv(disp)) parameters +static INLINE _glptr_VertexAttribI4bv GET_VertexAttribI4bv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4bv) (GET_by_offset(disp, _gloffset_VertexAttribI4bv)); +} + +static INLINE void SET_VertexAttribI4bv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLbyte *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4bv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4sv)(GLuint, const GLshort *); +#define CALL_VertexAttribI4sv(disp, parameters) \ + (* GET_VertexAttribI4sv(disp)) parameters +static INLINE _glptr_VertexAttribI4sv GET_VertexAttribI4sv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4sv) (GET_by_offset(disp, _gloffset_VertexAttribI4sv)); +} + +static INLINE void SET_VertexAttribI4sv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4sv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4ubv)(GLuint, const GLubyte *); +#define CALL_VertexAttribI4ubv(disp, parameters) \ + (* GET_VertexAttribI4ubv(disp)) parameters +static INLINE _glptr_VertexAttribI4ubv GET_VertexAttribI4ubv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4ubv) (GET_by_offset(disp, _gloffset_VertexAttribI4ubv)); +} + +static INLINE void SET_VertexAttribI4ubv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4ubv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4usv)(GLuint, const GLushort *); +#define CALL_VertexAttribI4usv(disp, parameters) \ + (* GET_VertexAttribI4usv(disp)) parameters +static INLINE _glptr_VertexAttribI4usv GET_VertexAttribI4usv(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4usv) (GET_by_offset(disp, _gloffset_VertexAttribI4usv)); +} + +static INLINE void SET_VertexAttribI4usv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLushort *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4usv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribIPointer)(GLuint, GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_VertexAttribIPointer(disp, parameters) \ + (* GET_VertexAttribIPointer(disp)) parameters +static INLINE _glptr_VertexAttribIPointer GET_VertexAttribIPointer(struct _glapi_table *disp) { + return (_glptr_VertexAttribIPointer) (GET_by_offset(disp, _gloffset_VertexAttribIPointer)); +} + +static INLINE void SET_VertexAttribIPointer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VertexAttribIPointer, fn); +} + +typedef void (GLAPIENTRYP _glptr_PrimitiveRestartIndex)(GLuint); +#define CALL_PrimitiveRestartIndex(disp, parameters) \ + (* GET_PrimitiveRestartIndex(disp)) parameters +static INLINE _glptr_PrimitiveRestartIndex GET_PrimitiveRestartIndex(struct _glapi_table *disp) { + return (_glptr_PrimitiveRestartIndex) (GET_by_offset(disp, _gloffset_PrimitiveRestartIndex)); +} + +static INLINE void SET_PrimitiveRestartIndex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_PrimitiveRestartIndex, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexBuffer)(GLenum, GLenum, GLuint); +#define CALL_TexBuffer(disp, parameters) \ + (* GET_TexBuffer(disp)) parameters +static INLINE _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) { + return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer)); +} + +static INLINE void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_TexBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTexture)(GLenum, GLenum, GLuint, GLint); +#define CALL_FramebufferTexture(disp, parameters) \ + (* GET_FramebufferTexture(disp)) parameters +static INLINE _glptr_FramebufferTexture GET_FramebufferTexture(struct _glapi_table *disp) { + return (_glptr_FramebufferTexture) (GET_by_offset(disp, _gloffset_FramebufferTexture)); +} + +static INLINE void SET_FramebufferTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) { + SET_by_offset(disp, _gloffset_FramebufferTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetBufferParameteri64v)(GLenum, GLenum, GLint64 *); +#define CALL_GetBufferParameteri64v(disp, parameters) \ + (* GET_GetBufferParameteri64v(disp)) parameters +static INLINE _glptr_GetBufferParameteri64v GET_GetBufferParameteri64v(struct _glapi_table *disp) { + return (_glptr_GetBufferParameteri64v) (GET_by_offset(disp, _gloffset_GetBufferParameteri64v)); +} + +static INLINE void SET_GetBufferParameteri64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint64 *)) { + SET_by_offset(disp, _gloffset_GetBufferParameteri64v, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetInteger64i_v)(GLenum, GLuint, GLint64 *); +#define CALL_GetInteger64i_v(disp, parameters) \ + (* GET_GetInteger64i_v(disp)) parameters +static INLINE _glptr_GetInteger64i_v GET_GetInteger64i_v(struct _glapi_table *disp) { + return (_glptr_GetInteger64i_v) (GET_by_offset(disp, _gloffset_GetInteger64i_v)); +} + +static INLINE void SET_GetInteger64i_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLint64 *)) { + SET_by_offset(disp, _gloffset_GetInteger64i_v, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint); +#define CALL_VertexAttribDivisor(disp, parameters) \ + (* GET_VertexAttribDivisor(disp)) parameters +static INLINE _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) { + return (_glptr_VertexAttribDivisor) (GET_by_offset(disp, _gloffset_VertexAttribDivisor)); +} + +static INLINE void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn); +} + +typedef void (GLAPIENTRYP _glptr_MinSampleShading)(GLfloat); +#define CALL_MinSampleShading(disp, parameters) \ + (* GET_MinSampleShading(disp)) parameters +static INLINE _glptr_MinSampleShading GET_MinSampleShading(struct _glapi_table *disp) { + return (_glptr_MinSampleShading) (GET_by_offset(disp, _gloffset_MinSampleShading)); +} + +static INLINE void SET_MinSampleShading(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_MinSampleShading, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindProgramARB)(GLenum, GLuint); +#define CALL_BindProgramARB(disp, parameters) \ + (* GET_BindProgramARB(disp)) parameters +static INLINE _glptr_BindProgramARB GET_BindProgramARB(struct _glapi_table *disp) { + return (_glptr_BindProgramARB) (GET_by_offset(disp, _gloffset_BindProgramARB)); +} + +static INLINE void SET_BindProgramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindProgramARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteProgramsARB)(GLsizei, const GLuint *); +#define CALL_DeleteProgramsARB(disp, parameters) \ + (* GET_DeleteProgramsARB(disp)) parameters +static INLINE _glptr_DeleteProgramsARB GET_DeleteProgramsARB(struct _glapi_table *disp) { + return (_glptr_DeleteProgramsARB) (GET_by_offset(disp, _gloffset_DeleteProgramsARB)); +} + +static INLINE void SET_DeleteProgramsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteProgramsARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenProgramsARB)(GLsizei, GLuint *); +#define CALL_GenProgramsARB(disp, parameters) \ + (* GET_GenProgramsARB(disp)) parameters +static INLINE _glptr_GenProgramsARB GET_GenProgramsARB(struct _glapi_table *disp) { + return (_glptr_GenProgramsARB) (GET_by_offset(disp, _gloffset_GenProgramsARB)); +} + +static INLINE void SET_GenProgramsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenProgramsARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterdvARB)(GLenum, GLuint, GLdouble *); +#define CALL_GetProgramEnvParameterdvARB(disp, parameters) \ + (* GET_GetProgramEnvParameterdvARB(disp)) parameters +static INLINE _glptr_GetProgramEnvParameterdvARB GET_GetProgramEnvParameterdvARB(struct _glapi_table *disp) { + return (_glptr_GetProgramEnvParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB)); +} + +static INLINE void SET_GetProgramEnvParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetProgramEnvParameterdvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramEnvParameterfvARB)(GLenum, GLuint, GLfloat *); +#define CALL_GetProgramEnvParameterfvARB(disp, parameters) \ + (* GET_GetProgramEnvParameterfvARB(disp)) parameters +static INLINE _glptr_GetProgramEnvParameterfvARB GET_GetProgramEnvParameterfvARB(struct _glapi_table *disp) { + return (_glptr_GetProgramEnvParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB)); +} + +static INLINE void SET_GetProgramEnvParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetProgramEnvParameterfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterdvARB)(GLenum, GLuint, GLdouble *); +#define CALL_GetProgramLocalParameterdvARB(disp, parameters) \ + (* GET_GetProgramLocalParameterdvARB(disp)) parameters +static INLINE _glptr_GetProgramLocalParameterdvARB GET_GetProgramLocalParameterdvARB(struct _glapi_table *disp) { + return (_glptr_GetProgramLocalParameterdvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB)); +} + +static INLINE void SET_GetProgramLocalParameterdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetProgramLocalParameterdvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramLocalParameterfvARB)(GLenum, GLuint, GLfloat *); +#define CALL_GetProgramLocalParameterfvARB(disp, parameters) \ + (* GET_GetProgramLocalParameterfvARB(disp)) parameters +static INLINE _glptr_GetProgramLocalParameterfvARB GET_GetProgramLocalParameterfvARB(struct _glapi_table *disp) { + return (_glptr_GetProgramLocalParameterfvARB) (GET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB)); +} + +static INLINE void SET_GetProgramLocalParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetProgramLocalParameterfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramStringARB)(GLenum, GLenum, GLvoid *); +#define CALL_GetProgramStringARB(disp, parameters) \ + (* GET_GetProgramStringARB(disp)) parameters +static INLINE _glptr_GetProgramStringARB GET_GetProgramStringARB(struct _glapi_table *disp) { + return (_glptr_GetProgramStringARB) (GET_by_offset(disp, _gloffset_GetProgramStringARB)); +} + +static INLINE void SET_GetProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetProgramStringARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramivARB)(GLenum, GLenum, GLint *); +#define CALL_GetProgramivARB(disp, parameters) \ + (* GET_GetProgramivARB(disp)) parameters +static INLINE _glptr_GetProgramivARB GET_GetProgramivARB(struct _glapi_table *disp) { + return (_glptr_GetProgramivARB) (GET_by_offset(disp, _gloffset_GetProgramivARB)); +} + +static INLINE void SET_GetProgramivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetProgramivARB, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsProgramARB)(GLuint); +#define CALL_IsProgramARB(disp, parameters) \ + (* GET_IsProgramARB(disp)) parameters +static INLINE _glptr_IsProgramARB GET_IsProgramARB(struct _glapi_table *disp) { + return (_glptr_IsProgramARB) (GET_by_offset(disp, _gloffset_IsProgramARB)); +} + +static INLINE void SET_IsProgramARB(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsProgramARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_ProgramEnvParameter4dARB(disp, parameters) \ + (* GET_ProgramEnvParameter4dARB(disp)) parameters +static INLINE _glptr_ProgramEnvParameter4dARB GET_ProgramEnvParameter4dARB(struct _glapi_table *disp) { + return (_glptr_ProgramEnvParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB)); +} + +static INLINE void SET_ProgramEnvParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_ProgramEnvParameter4dARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4dvARB)(GLenum, GLuint, const GLdouble *); +#define CALL_ProgramEnvParameter4dvARB(disp, parameters) \ + (* GET_ProgramEnvParameter4dvARB(disp)) parameters +static INLINE _glptr_ProgramEnvParameter4dvARB GET_ProgramEnvParameter4dvARB(struct _glapi_table *disp) { + return (_glptr_ProgramEnvParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB)); +} + +static INLINE void SET_ProgramEnvParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_ProgramEnvParameter4dvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ProgramEnvParameter4fARB(disp, parameters) \ + (* GET_ProgramEnvParameter4fARB(disp)) parameters +static INLINE _glptr_ProgramEnvParameter4fARB GET_ProgramEnvParameter4fARB(struct _glapi_table *disp) { + return (_glptr_ProgramEnvParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB)); +} + +static INLINE void SET_ProgramEnvParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramEnvParameter4fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramEnvParameter4fvARB)(GLenum, GLuint, const GLfloat *); +#define CALL_ProgramEnvParameter4fvARB(disp, parameters) \ + (* GET_ProgramEnvParameter4fvARB(disp)) parameters +static INLINE _glptr_ProgramEnvParameter4fvARB GET_ProgramEnvParameter4fvARB(struct _glapi_table *disp) { + return (_glptr_ProgramEnvParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB)); +} + +static INLINE void SET_ProgramEnvParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramEnvParameter4fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dARB)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_ProgramLocalParameter4dARB(disp, parameters) \ + (* GET_ProgramLocalParameter4dARB(disp)) parameters +static INLINE _glptr_ProgramLocalParameter4dARB GET_ProgramLocalParameter4dARB(struct _glapi_table *disp) { + return (_glptr_ProgramLocalParameter4dARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB)); +} + +static INLINE void SET_ProgramLocalParameter4dARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_ProgramLocalParameter4dARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4dvARB)(GLenum, GLuint, const GLdouble *); +#define CALL_ProgramLocalParameter4dvARB(disp, parameters) \ + (* GET_ProgramLocalParameter4dvARB(disp)) parameters +static INLINE _glptr_ProgramLocalParameter4dvARB GET_ProgramLocalParameter4dvARB(struct _glapi_table *disp) { + return (_glptr_ProgramLocalParameter4dvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB)); +} + +static INLINE void SET_ProgramLocalParameter4dvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_ProgramLocalParameter4dvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fARB)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ProgramLocalParameter4fARB(disp, parameters) \ + (* GET_ProgramLocalParameter4fARB(disp)) parameters +static INLINE _glptr_ProgramLocalParameter4fARB GET_ProgramLocalParameter4fARB(struct _glapi_table *disp) { + return (_glptr_ProgramLocalParameter4fARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB)); +} + +static INLINE void SET_ProgramLocalParameter4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramLocalParameter4fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramLocalParameter4fvARB)(GLenum, GLuint, const GLfloat *); +#define CALL_ProgramLocalParameter4fvARB(disp, parameters) \ + (* GET_ProgramLocalParameter4fvARB(disp)) parameters +static INLINE _glptr_ProgramLocalParameter4fvARB GET_ProgramLocalParameter4fvARB(struct _glapi_table *disp) { + return (_glptr_ProgramLocalParameter4fvARB) (GET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB)); +} + +static INLINE void SET_ProgramLocalParameter4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramLocalParameter4fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramStringARB)(GLenum, GLenum, GLsizei, const GLvoid *); +#define CALL_ProgramStringARB(disp, parameters) \ + (* GET_ProgramStringARB(disp)) parameters +static INLINE _glptr_ProgramStringARB GET_ProgramStringARB(struct _glapi_table *disp) { + return (_glptr_ProgramStringARB) (GET_by_offset(disp, _gloffset_ProgramStringARB)); +} + +static INLINE void SET_ProgramStringARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ProgramStringARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1fARB)(GLuint, GLfloat); +#define CALL_VertexAttrib1fARB(disp, parameters) \ + (* GET_VertexAttrib1fARB(disp)) parameters +static INLINE _glptr_VertexAttrib1fARB GET_VertexAttrib1fARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1fARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fARB)); +} + +static INLINE void SET_VertexAttrib1fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib1fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvARB)(GLuint, const GLfloat *); +#define CALL_VertexAttrib1fvARB(disp, parameters) \ + (* GET_VertexAttrib1fvARB(disp)) parameters +static INLINE _glptr_VertexAttrib1fvARB GET_VertexAttrib1fvARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib1fvARB)); +} + +static INLINE void SET_VertexAttrib1fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2fARB)(GLuint, GLfloat, GLfloat); +#define CALL_VertexAttrib2fARB(disp, parameters) \ + (* GET_VertexAttrib2fARB(disp)) parameters +static INLINE _glptr_VertexAttrib2fARB GET_VertexAttrib2fARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2fARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fARB)); +} + +static INLINE void SET_VertexAttrib2fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib2fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvARB)(GLuint, const GLfloat *); +#define CALL_VertexAttrib2fvARB(disp, parameters) \ + (* GET_VertexAttrib2fvARB(disp)) parameters +static INLINE _glptr_VertexAttrib2fvARB GET_VertexAttrib2fvARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib2fvARB)); +} + +static INLINE void SET_VertexAttrib2fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3fARB)(GLuint, GLfloat, GLfloat, GLfloat); +#define CALL_VertexAttrib3fARB(disp, parameters) \ + (* GET_VertexAttrib3fARB(disp)) parameters +static INLINE _glptr_VertexAttrib3fARB GET_VertexAttrib3fARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3fARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fARB)); +} + +static INLINE void SET_VertexAttrib3fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib3fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvARB)(GLuint, const GLfloat *); +#define CALL_VertexAttrib3fvARB(disp, parameters) \ + (* GET_VertexAttrib3fvARB(disp)) parameters +static INLINE _glptr_VertexAttrib3fvARB GET_VertexAttrib3fvARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib3fvARB)); +} + +static INLINE void SET_VertexAttrib3fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4fARB)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_VertexAttrib4fARB(disp, parameters) \ + (* GET_VertexAttrib4fARB(disp)) parameters +static INLINE _glptr_VertexAttrib4fARB GET_VertexAttrib4fARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4fARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fARB)); +} + +static INLINE void SET_VertexAttrib4fARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib4fARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvARB)(GLuint, const GLfloat *); +#define CALL_VertexAttrib4fvARB(disp, parameters) \ + (* GET_VertexAttrib4fvARB(disp)) parameters +static INLINE _glptr_VertexAttrib4fvARB GET_VertexAttrib4fvARB(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4fvARB) (GET_by_offset(disp, _gloffset_VertexAttrib4fvARB)); +} + +static INLINE void SET_VertexAttrib4fvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4fvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_AttachObjectARB)(GLhandleARB, GLhandleARB); +#define CALL_AttachObjectARB(disp, parameters) \ + (* GET_AttachObjectARB(disp)) parameters +static INLINE _glptr_AttachObjectARB GET_AttachObjectARB(struct _glapi_table *disp) { + return (_glptr_AttachObjectARB) (GET_by_offset(disp, _gloffset_AttachObjectARB)); +} + +static INLINE void SET_AttachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) { + SET_by_offset(disp, _gloffset_AttachObjectARB, fn); +} + +typedef GLhandleARB (GLAPIENTRYP _glptr_CreateProgramObjectARB)(void); +#define CALL_CreateProgramObjectARB(disp, parameters) \ + (* GET_CreateProgramObjectARB(disp)) parameters +static INLINE _glptr_CreateProgramObjectARB GET_CreateProgramObjectARB(struct _glapi_table *disp) { + return (_glptr_CreateProgramObjectARB) (GET_by_offset(disp, _gloffset_CreateProgramObjectARB)); +} + +static INLINE void SET_CreateProgramObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_CreateProgramObjectARB, fn); +} + +typedef GLhandleARB (GLAPIENTRYP _glptr_CreateShaderObjectARB)(GLenum); +#define CALL_CreateShaderObjectARB(disp, parameters) \ + (* GET_CreateShaderObjectARB(disp)) parameters +static INLINE _glptr_CreateShaderObjectARB GET_CreateShaderObjectARB(struct _glapi_table *disp) { + return (_glptr_CreateShaderObjectARB) (GET_by_offset(disp, _gloffset_CreateShaderObjectARB)); +} + +static INLINE void SET_CreateShaderObjectARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_CreateShaderObjectARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteObjectARB)(GLhandleARB); +#define CALL_DeleteObjectARB(disp, parameters) \ + (* GET_DeleteObjectARB(disp)) parameters +static INLINE _glptr_DeleteObjectARB GET_DeleteObjectARB(struct _glapi_table *disp) { + return (_glptr_DeleteObjectARB) (GET_by_offset(disp, _gloffset_DeleteObjectARB)); +} + +static INLINE void SET_DeleteObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB)) { + SET_by_offset(disp, _gloffset_DeleteObjectARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DetachObjectARB)(GLhandleARB, GLhandleARB); +#define CALL_DetachObjectARB(disp, parameters) \ + (* GET_DetachObjectARB(disp)) parameters +static INLINE _glptr_DetachObjectARB GET_DetachObjectARB(struct _glapi_table *disp) { + return (_glptr_DetachObjectARB) (GET_by_offset(disp, _gloffset_DetachObjectARB)); +} + +static INLINE void SET_DetachObjectARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLhandleARB)) { + SET_by_offset(disp, _gloffset_DetachObjectARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetAttachedObjectsARB)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *); +#define CALL_GetAttachedObjectsARB(disp, parameters) \ + (* GET_GetAttachedObjectsARB(disp)) parameters +static INLINE _glptr_GetAttachedObjectsARB GET_GetAttachedObjectsARB(struct _glapi_table *disp) { + return (_glptr_GetAttachedObjectsARB) (GET_by_offset(disp, _gloffset_GetAttachedObjectsARB)); +} + +static INLINE void SET_GetAttachedObjectsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *)) { + SET_by_offset(disp, _gloffset_GetAttachedObjectsARB, fn); +} + +typedef GLhandleARB (GLAPIENTRYP _glptr_GetHandleARB)(GLenum); +#define CALL_GetHandleARB(disp, parameters) \ + (* GET_GetHandleARB(disp)) parameters +static INLINE _glptr_GetHandleARB GET_GetHandleARB(struct _glapi_table *disp) { + return (_glptr_GetHandleARB) (GET_by_offset(disp, _gloffset_GetHandleARB)); +} + +static INLINE void SET_GetHandleARB(struct _glapi_table *disp, GLhandleARB (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_GetHandleARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetInfoLogARB)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); +#define CALL_GetInfoLogARB(disp, parameters) \ + (* GET_GetInfoLogARB(disp)) parameters +static INLINE _glptr_GetInfoLogARB GET_GetInfoLogARB(struct _glapi_table *disp) { + return (_glptr_GetInfoLogARB) (GET_by_offset(disp, _gloffset_GetInfoLogARB)); +} + +static INLINE void SET_GetInfoLogARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLsizei, GLsizei *, GLcharARB *)) { + SET_by_offset(disp, _gloffset_GetInfoLogARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetObjectParameterfvARB)(GLhandleARB, GLenum, GLfloat *); +#define CALL_GetObjectParameterfvARB(disp, parameters) \ + (* GET_GetObjectParameterfvARB(disp)) parameters +static INLINE _glptr_GetObjectParameterfvARB GET_GetObjectParameterfvARB(struct _glapi_table *disp) { + return (_glptr_GetObjectParameterfvARB) (GET_by_offset(disp, _gloffset_GetObjectParameterfvARB)); +} + +static INLINE void SET_GetObjectParameterfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetObjectParameterfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetObjectParameterivARB)(GLhandleARB, GLenum, GLint *); +#define CALL_GetObjectParameterivARB(disp, parameters) \ + (* GET_GetObjectParameterivARB(disp)) parameters +static INLINE _glptr_GetObjectParameterivARB GET_GetObjectParameterivARB(struct _glapi_table *disp) { + return (_glptr_GetObjectParameterivARB) (GET_by_offset(disp, _gloffset_GetObjectParameterivARB)); +} + +static INLINE void SET_GetObjectParameterivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLhandleARB, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetObjectParameterivARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedARB)(GLenum, GLint, GLsizei, GLsizei); +#define CALL_DrawArraysInstancedARB(disp, parameters) \ + (* GET_DrawArraysInstancedARB(disp)) parameters +static INLINE _glptr_DrawArraysInstancedARB GET_DrawArraysInstancedARB(struct _glapi_table *disp) { + return (_glptr_DrawArraysInstancedARB) (GET_by_offset(disp, _gloffset_DrawArraysInstancedARB)); +} + +static INLINE void SET_DrawArraysInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_DrawArraysInstancedARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedARB)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei); +#define CALL_DrawElementsInstancedARB(disp, parameters) \ + (* GET_DrawElementsInstancedARB(disp)) parameters +static INLINE _glptr_DrawElementsInstancedARB GET_DrawElementsInstancedARB(struct _glapi_table *disp) { + return (_glptr_DrawElementsInstancedARB) (GET_by_offset(disp, _gloffset_DrawElementsInstancedARB)); +} + +static INLINE void SET_DrawElementsInstancedARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei)) { + SET_by_offset(disp, _gloffset_DrawElementsInstancedARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindFramebuffer)(GLenum, GLuint); +#define CALL_BindFramebuffer(disp, parameters) \ + (* GET_BindFramebuffer(disp)) parameters +static INLINE _glptr_BindFramebuffer GET_BindFramebuffer(struct _glapi_table *disp) { + return (_glptr_BindFramebuffer) (GET_by_offset(disp, _gloffset_BindFramebuffer)); +} + +static INLINE void SET_BindFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindFramebuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindRenderbuffer)(GLenum, GLuint); +#define CALL_BindRenderbuffer(disp, parameters) \ + (* GET_BindRenderbuffer(disp)) parameters +static INLINE _glptr_BindRenderbuffer GET_BindRenderbuffer(struct _glapi_table *disp) { + return (_glptr_BindRenderbuffer) (GET_by_offset(disp, _gloffset_BindRenderbuffer)); +} + +static INLINE void SET_BindRenderbuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindRenderbuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlitFramebuffer)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); +#define CALL_BlitFramebuffer(disp, parameters) \ + (* GET_BlitFramebuffer(disp)) parameters +static INLINE _glptr_BlitFramebuffer GET_BlitFramebuffer(struct _glapi_table *disp) { + return (_glptr_BlitFramebuffer) (GET_by_offset(disp, _gloffset_BlitFramebuffer)); +} + +static INLINE void SET_BlitFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum)) { + SET_by_offset(disp, _gloffset_BlitFramebuffer, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_CheckFramebufferStatus)(GLenum); +#define CALL_CheckFramebufferStatus(disp, parameters) \ + (* GET_CheckFramebufferStatus(disp)) parameters +static INLINE _glptr_CheckFramebufferStatus GET_CheckFramebufferStatus(struct _glapi_table *disp) { + return (_glptr_CheckFramebufferStatus) (GET_by_offset(disp, _gloffset_CheckFramebufferStatus)); +} + +static INLINE void SET_CheckFramebufferStatus(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_CheckFramebufferStatus, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteFramebuffers)(GLsizei, const GLuint *); +#define CALL_DeleteFramebuffers(disp, parameters) \ + (* GET_DeleteFramebuffers(disp)) parameters +static INLINE _glptr_DeleteFramebuffers GET_DeleteFramebuffers(struct _glapi_table *disp) { + return (_glptr_DeleteFramebuffers) (GET_by_offset(disp, _gloffset_DeleteFramebuffers)); +} + +static INLINE void SET_DeleteFramebuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteFramebuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteRenderbuffers)(GLsizei, const GLuint *); +#define CALL_DeleteRenderbuffers(disp, parameters) \ + (* GET_DeleteRenderbuffers(disp)) parameters +static INLINE _glptr_DeleteRenderbuffers GET_DeleteRenderbuffers(struct _glapi_table *disp) { + return (_glptr_DeleteRenderbuffers) (GET_by_offset(disp, _gloffset_DeleteRenderbuffers)); +} + +static INLINE void SET_DeleteRenderbuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteRenderbuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferRenderbuffer)(GLenum, GLenum, GLenum, GLuint); +#define CALL_FramebufferRenderbuffer(disp, parameters) \ + (* GET_FramebufferRenderbuffer(disp)) parameters +static INLINE _glptr_FramebufferRenderbuffer GET_FramebufferRenderbuffer(struct _glapi_table *disp) { + return (_glptr_FramebufferRenderbuffer) (GET_by_offset(disp, _gloffset_FramebufferRenderbuffer)); +} + +static INLINE void SET_FramebufferRenderbuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_FramebufferRenderbuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTexture1D)(GLenum, GLenum, GLenum, GLuint, GLint); +#define CALL_FramebufferTexture1D(disp, parameters) \ + (* GET_FramebufferTexture1D(disp)) parameters +static INLINE _glptr_FramebufferTexture1D GET_FramebufferTexture1D(struct _glapi_table *disp) { + return (_glptr_FramebufferTexture1D) (GET_by_offset(disp, _gloffset_FramebufferTexture1D)); +} + +static INLINE void SET_FramebufferTexture1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) { + SET_by_offset(disp, _gloffset_FramebufferTexture1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTexture2D)(GLenum, GLenum, GLenum, GLuint, GLint); +#define CALL_FramebufferTexture2D(disp, parameters) \ + (* GET_FramebufferTexture2D(disp)) parameters +static INLINE _glptr_FramebufferTexture2D GET_FramebufferTexture2D(struct _glapi_table *disp) { + return (_glptr_FramebufferTexture2D) (GET_by_offset(disp, _gloffset_FramebufferTexture2D)); +} + +static INLINE void SET_FramebufferTexture2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint)) { + SET_by_offset(disp, _gloffset_FramebufferTexture2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTexture3D)(GLenum, GLenum, GLenum, GLuint, GLint, GLint); +#define CALL_FramebufferTexture3D(disp, parameters) \ + (* GET_FramebufferTexture3D(disp)) parameters +static INLINE _glptr_FramebufferTexture3D GET_FramebufferTexture3D(struct _glapi_table *disp) { + return (_glptr_FramebufferTexture3D) (GET_by_offset(disp, _gloffset_FramebufferTexture3D)); +} + +static INLINE void SET_FramebufferTexture3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLuint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_FramebufferTexture3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTextureLayer)(GLenum, GLenum, GLuint, GLint, GLint); +#define CALL_FramebufferTextureLayer(disp, parameters) \ + (* GET_FramebufferTextureLayer(disp)) parameters +static INLINE _glptr_FramebufferTextureLayer GET_FramebufferTextureLayer(struct _glapi_table *disp) { + return (_glptr_FramebufferTextureLayer) (GET_by_offset(disp, _gloffset_FramebufferTextureLayer)); +} + +static INLINE void SET_FramebufferTextureLayer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_FramebufferTextureLayer, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenFramebuffers)(GLsizei, GLuint *); +#define CALL_GenFramebuffers(disp, parameters) \ + (* GET_GenFramebuffers(disp)) parameters +static INLINE _glptr_GenFramebuffers GET_GenFramebuffers(struct _glapi_table *disp) { + return (_glptr_GenFramebuffers) (GET_by_offset(disp, _gloffset_GenFramebuffers)); +} + +static INLINE void SET_GenFramebuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenFramebuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenRenderbuffers)(GLsizei, GLuint *); +#define CALL_GenRenderbuffers(disp, parameters) \ + (* GET_GenRenderbuffers(disp)) parameters +static INLINE _glptr_GenRenderbuffers GET_GenRenderbuffers(struct _glapi_table *disp) { + return (_glptr_GenRenderbuffers) (GET_by_offset(disp, _gloffset_GenRenderbuffers)); +} + +static INLINE void SET_GenRenderbuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenRenderbuffers, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenerateMipmap)(GLenum); +#define CALL_GenerateMipmap(disp, parameters) \ + (* GET_GenerateMipmap(disp)) parameters +static INLINE _glptr_GenerateMipmap GET_GenerateMipmap(struct _glapi_table *disp) { + return (_glptr_GenerateMipmap) (GET_by_offset(disp, _gloffset_GenerateMipmap)); +} + +static INLINE void SET_GenerateMipmap(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_GenerateMipmap, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetFramebufferAttachmentParameteriv)(GLenum, GLenum, GLenum, GLint *); +#define CALL_GetFramebufferAttachmentParameteriv(disp, parameters) \ + (* GET_GetFramebufferAttachmentParameteriv(disp)) parameters +static INLINE _glptr_GetFramebufferAttachmentParameteriv GET_GetFramebufferAttachmentParameteriv(struct _glapi_table *disp) { + return (_glptr_GetFramebufferAttachmentParameteriv) (GET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameteriv)); +} + +static INLINE void SET_GetFramebufferAttachmentParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetFramebufferAttachmentParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetRenderbufferParameteriv)(GLenum, GLenum, GLint *); +#define CALL_GetRenderbufferParameteriv(disp, parameters) \ + (* GET_GetRenderbufferParameteriv(disp)) parameters +static INLINE _glptr_GetRenderbufferParameteriv GET_GetRenderbufferParameteriv(struct _glapi_table *disp) { + return (_glptr_GetRenderbufferParameteriv) (GET_by_offset(disp, _gloffset_GetRenderbufferParameteriv)); +} + +static INLINE void SET_GetRenderbufferParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetRenderbufferParameteriv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsFramebuffer)(GLuint); +#define CALL_IsFramebuffer(disp, parameters) \ + (* GET_IsFramebuffer(disp)) parameters +static INLINE _glptr_IsFramebuffer GET_IsFramebuffer(struct _glapi_table *disp) { + return (_glptr_IsFramebuffer) (GET_by_offset(disp, _gloffset_IsFramebuffer)); +} + +static INLINE void SET_IsFramebuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsFramebuffer, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsRenderbuffer)(GLuint); +#define CALL_IsRenderbuffer(disp, parameters) \ + (* GET_IsRenderbuffer(disp)) parameters +static INLINE _glptr_IsRenderbuffer GET_IsRenderbuffer(struct _glapi_table *disp) { + return (_glptr_IsRenderbuffer) (GET_by_offset(disp, _gloffset_IsRenderbuffer)); +} + +static INLINE void SET_IsRenderbuffer(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsRenderbuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_RenderbufferStorage)(GLenum, GLenum, GLsizei, GLsizei); +#define CALL_RenderbufferStorage(disp, parameters) \ + (* GET_RenderbufferStorage(disp)) parameters +static INLINE _glptr_RenderbufferStorage GET_RenderbufferStorage(struct _glapi_table *disp) { + return (_glptr_RenderbufferStorage) (GET_by_offset(disp, _gloffset_RenderbufferStorage)); +} + +static INLINE void SET_RenderbufferStorage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_RenderbufferStorage, fn); +} + +typedef void (GLAPIENTRYP _glptr_RenderbufferStorageMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei); +#define CALL_RenderbufferStorageMultisample(disp, parameters) \ + (* GET_RenderbufferStorageMultisample(disp)) parameters +static INLINE _glptr_RenderbufferStorageMultisample GET_RenderbufferStorageMultisample(struct _glapi_table *disp) { + return (_glptr_RenderbufferStorageMultisample) (GET_by_offset(disp, _gloffset_RenderbufferStorageMultisample)); +} + +static INLINE void SET_RenderbufferStorageMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn); +} + +typedef void (GLAPIENTRYP _glptr_FramebufferTextureFaceARB)(GLenum, GLenum, GLuint, GLint, GLenum); +#define CALL_FramebufferTextureFaceARB(disp, parameters) \ + (* GET_FramebufferTextureFaceARB(disp)) parameters +static INLINE _glptr_FramebufferTextureFaceARB GET_FramebufferTextureFaceARB(struct _glapi_table *disp) { + return (_glptr_FramebufferTextureFaceARB) (GET_by_offset(disp, _gloffset_FramebufferTextureFaceARB)); +} + +static INLINE void SET_FramebufferTextureFaceARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint, GLenum)) { + SET_by_offset(disp, _gloffset_FramebufferTextureFaceARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRange)(GLenum, GLintptr, GLsizeiptr); +#define CALL_FlushMappedBufferRange(disp, parameters) \ + (* GET_FlushMappedBufferRange(disp)) parameters +static INLINE _glptr_FlushMappedBufferRange GET_FlushMappedBufferRange(struct _glapi_table *disp) { + return (_glptr_FlushMappedBufferRange) (GET_by_offset(disp, _gloffset_FlushMappedBufferRange)); +} + +static INLINE void SET_FlushMappedBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_FlushMappedBufferRange, fn); +} + +typedef GLvoid * (GLAPIENTRYP _glptr_MapBufferRange)(GLenum, GLintptr, GLsizeiptr, GLbitfield); +#define CALL_MapBufferRange(disp, parameters) \ + (* GET_MapBufferRange(disp)) parameters +static INLINE _glptr_MapBufferRange GET_MapBufferRange(struct _glapi_table *disp) { + return (_glptr_MapBufferRange) (GET_by_offset(disp, _gloffset_MapBufferRange)); +} + +static INLINE void SET_MapBufferRange(struct _glapi_table *disp, GLvoid * (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr, GLbitfield)) { + SET_by_offset(disp, _gloffset_MapBufferRange, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindVertexArray)(GLuint); +#define CALL_BindVertexArray(disp, parameters) \ + (* GET_BindVertexArray(disp)) parameters +static INLINE _glptr_BindVertexArray GET_BindVertexArray(struct _glapi_table *disp) { + return (_glptr_BindVertexArray) (GET_by_offset(disp, _gloffset_BindVertexArray)); +} + +static INLINE void SET_BindVertexArray(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BindVertexArray, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteVertexArrays)(GLsizei, const GLuint *); +#define CALL_DeleteVertexArrays(disp, parameters) \ + (* GET_DeleteVertexArrays(disp)) parameters +static INLINE _glptr_DeleteVertexArrays GET_DeleteVertexArrays(struct _glapi_table *disp) { + return (_glptr_DeleteVertexArrays) (GET_by_offset(disp, _gloffset_DeleteVertexArrays)); +} + +static INLINE void SET_DeleteVertexArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteVertexArrays, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenVertexArrays)(GLsizei, GLuint *); +#define CALL_GenVertexArrays(disp, parameters) \ + (* GET_GenVertexArrays(disp)) parameters +static INLINE _glptr_GenVertexArrays GET_GenVertexArrays(struct _glapi_table *disp) { + return (_glptr_GenVertexArrays) (GET_by_offset(disp, _gloffset_GenVertexArrays)); +} + +static INLINE void SET_GenVertexArrays(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenVertexArrays, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsVertexArray)(GLuint); +#define CALL_IsVertexArray(disp, parameters) \ + (* GET_IsVertexArray(disp)) parameters +static INLINE _glptr_IsVertexArray GET_IsVertexArray(struct _glapi_table *disp) { + return (_glptr_IsVertexArray) (GET_by_offset(disp, _gloffset_IsVertexArray)); +} + +static INLINE void SET_IsVertexArray(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsVertexArray, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveUniformBlockName)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetActiveUniformBlockName(disp, parameters) \ + (* GET_GetActiveUniformBlockName(disp)) parameters +static INLINE _glptr_GetActiveUniformBlockName GET_GetActiveUniformBlockName(struct _glapi_table *disp) { + return (_glptr_GetActiveUniformBlockName) (GET_by_offset(disp, _gloffset_GetActiveUniformBlockName)); +} + +static INLINE void SET_GetActiveUniformBlockName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetActiveUniformBlockName, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveUniformBlockiv)(GLuint, GLuint, GLenum, GLint *); +#define CALL_GetActiveUniformBlockiv(disp, parameters) \ + (* GET_GetActiveUniformBlockiv(disp)) parameters +static INLINE _glptr_GetActiveUniformBlockiv GET_GetActiveUniformBlockiv(struct _glapi_table *disp) { + return (_glptr_GetActiveUniformBlockiv) (GET_by_offset(disp, _gloffset_GetActiveUniformBlockiv)); +} + +static INLINE void SET_GetActiveUniformBlockiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetActiveUniformBlockiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveUniformName)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetActiveUniformName(disp, parameters) \ + (* GET_GetActiveUniformName(disp)) parameters +static INLINE _glptr_GetActiveUniformName GET_GetActiveUniformName(struct _glapi_table *disp) { + return (_glptr_GetActiveUniformName) (GET_by_offset(disp, _gloffset_GetActiveUniformName)); +} + +static INLINE void SET_GetActiveUniformName(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetActiveUniformName, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveUniformsiv)(GLuint, GLsizei, const GLuint *, GLenum, GLint *); +#define CALL_GetActiveUniformsiv(disp, parameters) \ + (* GET_GetActiveUniformsiv(disp)) parameters +static INLINE _glptr_GetActiveUniformsiv GET_GetActiveUniformsiv(struct _glapi_table *disp) { + return (_glptr_GetActiveUniformsiv) (GET_by_offset(disp, _gloffset_GetActiveUniformsiv)); +} + +static INLINE void SET_GetActiveUniformsiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetActiveUniformsiv, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_GetUniformBlockIndex)(GLuint, const GLchar *); +#define CALL_GetUniformBlockIndex(disp, parameters) \ + (* GET_GetUniformBlockIndex(disp)) parameters +static INLINE _glptr_GetUniformBlockIndex GET_GetUniformBlockIndex(struct _glapi_table *disp) { + return (_glptr_GetUniformBlockIndex) (GET_by_offset(disp, _gloffset_GetUniformBlockIndex)); +} + +static INLINE void SET_GetUniformBlockIndex(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_GetUniformBlockIndex, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetUniformIndices)(GLuint, GLsizei, const GLchar * const *, GLuint *); +#define CALL_GetUniformIndices(disp, parameters) \ + (* GET_GetUniformIndices(disp)) parameters +static INLINE _glptr_GetUniformIndices GET_GetUniformIndices(struct _glapi_table *disp) { + return (_glptr_GetUniformIndices) (GET_by_offset(disp, _gloffset_GetUniformIndices)); +} + +static INLINE void SET_GetUniformIndices(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLchar * const *, GLuint *)) { + SET_by_offset(disp, _gloffset_GetUniformIndices, fn); +} + +typedef void (GLAPIENTRYP _glptr_UniformBlockBinding)(GLuint, GLuint, GLuint); +#define CALL_UniformBlockBinding(disp, parameters) \ + (* GET_UniformBlockBinding(disp)) parameters +static INLINE _glptr_UniformBlockBinding GET_UniformBlockBinding(struct _glapi_table *disp) { + return (_glptr_UniformBlockBinding) (GET_by_offset(disp, _gloffset_UniformBlockBinding)); +} + +static INLINE void SET_UniformBlockBinding(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_UniformBlockBinding, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyBufferSubData)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr); +#define CALL_CopyBufferSubData(disp, parameters) \ + (* GET_CopyBufferSubData(disp)) parameters +static INLINE _glptr_CopyBufferSubData GET_CopyBufferSubData(struct _glapi_table *disp) { + return (_glptr_CopyBufferSubData) (GET_by_offset(disp, _gloffset_CopyBufferSubData)); +} + +static INLINE void SET_CopyBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLintptr, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_CopyBufferSubData, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_ClientWaitSync)(GLsync, GLbitfield, GLuint64); +#define CALL_ClientWaitSync(disp, parameters) \ + (* GET_ClientWaitSync(disp)) parameters +static INLINE _glptr_ClientWaitSync GET_ClientWaitSync(struct _glapi_table *disp) { + return (_glptr_ClientWaitSync) (GET_by_offset(disp, _gloffset_ClientWaitSync)); +} + +static INLINE void SET_ClientWaitSync(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) { + SET_by_offset(disp, _gloffset_ClientWaitSync, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteSync)(GLsync); +#define CALL_DeleteSync(disp, parameters) \ + (* GET_DeleteSync(disp)) parameters +static INLINE _glptr_DeleteSync GET_DeleteSync(struct _glapi_table *disp) { + return (_glptr_DeleteSync) (GET_by_offset(disp, _gloffset_DeleteSync)); +} + +static INLINE void SET_DeleteSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync)) { + SET_by_offset(disp, _gloffset_DeleteSync, fn); +} + +typedef GLsync (GLAPIENTRYP _glptr_FenceSync)(GLenum, GLbitfield); +#define CALL_FenceSync(disp, parameters) \ + (* GET_FenceSync(disp)) parameters +static INLINE _glptr_FenceSync GET_FenceSync(struct _glapi_table *disp) { + return (_glptr_FenceSync) (GET_by_offset(disp, _gloffset_FenceSync)); +} + +static INLINE void SET_FenceSync(struct _glapi_table *disp, GLsync (GLAPIENTRYP fn)(GLenum, GLbitfield)) { + SET_by_offset(disp, _gloffset_FenceSync, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetInteger64v)(GLenum, GLint64 *); +#define CALL_GetInteger64v(disp, parameters) \ + (* GET_GetInteger64v(disp)) parameters +static INLINE _glptr_GetInteger64v GET_GetInteger64v(struct _glapi_table *disp) { + return (_glptr_GetInteger64v) (GET_by_offset(disp, _gloffset_GetInteger64v)); +} + +static INLINE void SET_GetInteger64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint64 *)) { + SET_by_offset(disp, _gloffset_GetInteger64v, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSynciv)(GLsync, GLenum, GLsizei, GLsizei *, GLint *); +#define CALL_GetSynciv(disp, parameters) \ + (* GET_GetSynciv(disp)) parameters +static INLINE _glptr_GetSynciv GET_GetSynciv(struct _glapi_table *disp) { + return (_glptr_GetSynciv) (GET_by_offset(disp, _gloffset_GetSynciv)); +} + +static INLINE void SET_GetSynciv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLenum, GLsizei, GLsizei *, GLint *)) { + SET_by_offset(disp, _gloffset_GetSynciv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsSync)(GLsync); +#define CALL_IsSync(disp, parameters) \ + (* GET_IsSync(disp)) parameters +static INLINE _glptr_IsSync GET_IsSync(struct _glapi_table *disp) { + return (_glptr_IsSync) (GET_by_offset(disp, _gloffset_IsSync)); +} + +static INLINE void SET_IsSync(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsync)) { + SET_by_offset(disp, _gloffset_IsSync, fn); +} + +typedef void (GLAPIENTRYP _glptr_WaitSync)(GLsync, GLbitfield, GLuint64); +#define CALL_WaitSync(disp, parameters) \ + (* GET_WaitSync(disp)) parameters +static INLINE _glptr_WaitSync GET_WaitSync(struct _glapi_table *disp) { + return (_glptr_WaitSync) (GET_by_offset(disp, _gloffset_WaitSync)); +} + +static INLINE void SET_WaitSync(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsync, GLbitfield, GLuint64)) { + SET_by_offset(disp, _gloffset_WaitSync, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLint); +#define CALL_DrawElementsBaseVertex(disp, parameters) \ + (* GET_DrawElementsBaseVertex(disp)) parameters +static INLINE _glptr_DrawElementsBaseVertex GET_DrawElementsBaseVertex(struct _glapi_table *disp) { + return (_glptr_DrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsBaseVertex)); +} + +static INLINE void SET_DrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLint)) { + SET_by_offset(disp, _gloffset_DrawElementsBaseVertex, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertex)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint); +#define CALL_DrawElementsInstancedBaseVertex(disp, parameters) \ + (* GET_DrawElementsInstancedBaseVertex(disp)) parameters +static INLINE _glptr_DrawElementsInstancedBaseVertex GET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp) { + return (_glptr_DrawElementsInstancedBaseVertex) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex)); +} + +static INLINE void SET_DrawElementsInstancedBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint)) { + SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertex, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawRangeElementsBaseVertex)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint); +#define CALL_DrawRangeElementsBaseVertex(disp, parameters) \ + (* GET_DrawRangeElementsBaseVertex(disp)) parameters +static INLINE _glptr_DrawRangeElementsBaseVertex GET_DrawRangeElementsBaseVertex(struct _glapi_table *disp) { + return (_glptr_DrawRangeElementsBaseVertex) (GET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex)); +} + +static INLINE void SET_DrawRangeElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *, GLint)) { + SET_by_offset(disp, _gloffset_DrawRangeElementsBaseVertex, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiDrawElementsBaseVertex)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, const GLint *); +#define CALL_MultiDrawElementsBaseVertex(disp, parameters) \ + (* GET_MultiDrawElementsBaseVertex(disp)) parameters +static INLINE _glptr_MultiDrawElementsBaseVertex GET_MultiDrawElementsBaseVertex(struct _glapi_table *disp) { + return (_glptr_MultiDrawElementsBaseVertex) (GET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex)); +} + +static INLINE void SET_MultiDrawElementsBaseVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_MultiDrawElementsBaseVertex, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProvokingVertex)(GLenum); +#define CALL_ProvokingVertex(disp, parameters) \ + (* GET_ProvokingVertex(disp)) parameters +static INLINE _glptr_ProvokingVertex GET_ProvokingVertex(struct _glapi_table *disp) { + return (_glptr_ProvokingVertex) (GET_by_offset(disp, _gloffset_ProvokingVertex)); +} + +static INLINE void SET_ProvokingVertex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ProvokingVertex, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMultisamplefv)(GLenum, GLuint, GLfloat *); +#define CALL_GetMultisamplefv(disp, parameters) \ + (* GET_GetMultisamplefv(disp)) parameters +static INLINE _glptr_GetMultisamplefv GET_GetMultisamplefv(struct _glapi_table *disp) { + return (_glptr_GetMultisamplefv) (GET_by_offset(disp, _gloffset_GetMultisamplefv)); +} + +static INLINE void SET_GetMultisamplefv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetMultisamplefv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SampleMaski)(GLuint, GLbitfield); +#define CALL_SampleMaski(disp, parameters) \ + (* GET_SampleMaski(disp)) parameters +static INLINE _glptr_SampleMaski GET_SampleMaski(struct _glapi_table *disp) { + return (_glptr_SampleMaski) (GET_by_offset(disp, _gloffset_SampleMaski)); +} + +static INLINE void SET_SampleMaski(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLbitfield)) { + SET_by_offset(disp, _gloffset_SampleMaski, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexImage2DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean); +#define CALL_TexImage2DMultisample(disp, parameters) \ + (* GET_TexImage2DMultisample(disp)) parameters +static INLINE _glptr_TexImage2DMultisample GET_TexImage2DMultisample(struct _glapi_table *disp) { + return (_glptr_TexImage2DMultisample) (GET_by_offset(disp, _gloffset_TexImage2DMultisample)); +} + +static INLINE void SET_TexImage2DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean)) { + SET_by_offset(disp, _gloffset_TexImage2DMultisample, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexImage3DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean); +#define CALL_TexImage3DMultisample(disp, parameters) \ + (* GET_TexImage3DMultisample(disp)) parameters +static INLINE _glptr_TexImage3DMultisample GET_TexImage3DMultisample(struct _glapi_table *disp) { + return (_glptr_TexImage3DMultisample) (GET_by_offset(disp, _gloffset_TexImage3DMultisample)); +} + +static INLINE void SET_TexImage3DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean)) { + SET_by_offset(disp, _gloffset_TexImage3DMultisample, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendEquationSeparateiARB)(GLuint, GLenum, GLenum); +#define CALL_BlendEquationSeparateiARB(disp, parameters) \ + (* GET_BlendEquationSeparateiARB(disp)) parameters +static INLINE _glptr_BlendEquationSeparateiARB GET_BlendEquationSeparateiARB(struct _glapi_table *disp) { + return (_glptr_BlendEquationSeparateiARB) (GET_by_offset(disp, _gloffset_BlendEquationSeparateiARB)); +} + +static INLINE void SET_BlendEquationSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendEquationSeparateiARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendEquationiARB)(GLuint, GLenum); +#define CALL_BlendEquationiARB(disp, parameters) \ + (* GET_BlendEquationiARB(disp)) parameters +static INLINE _glptr_BlendEquationiARB GET_BlendEquationiARB(struct _glapi_table *disp) { + return (_glptr_BlendEquationiARB) (GET_by_offset(disp, _gloffset_BlendEquationiARB)); +} + +static INLINE void SET_BlendEquationiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_BlendEquationiARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendFuncSeparateiARB)(GLuint, GLenum, GLenum, GLenum, GLenum); +#define CALL_BlendFuncSeparateiARB(disp, parameters) \ + (* GET_BlendFuncSeparateiARB(disp)) parameters +static INLINE _glptr_BlendFuncSeparateiARB GET_BlendFuncSeparateiARB(struct _glapi_table *disp) { + return (_glptr_BlendFuncSeparateiARB) (GET_by_offset(disp, _gloffset_BlendFuncSeparateiARB)); +} + +static INLINE void SET_BlendFuncSeparateiARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendFuncSeparateiARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_BlendFunciARB)(GLuint, GLenum, GLenum); +#define CALL_BlendFunciARB(disp, parameters) \ + (* GET_BlendFunciARB(disp)) parameters +static INLINE _glptr_BlendFunciARB GET_BlendFunciARB(struct _glapi_table *disp) { + return (_glptr_BlendFunciARB) (GET_by_offset(disp, _gloffset_BlendFunciARB)); +} + +static INLINE void SET_BlendFunciARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BlendFunciARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindFragDataLocationIndexed)(GLuint, GLuint, GLuint, const GLchar *); +#define CALL_BindFragDataLocationIndexed(disp, parameters) \ + (* GET_BindFragDataLocationIndexed(disp)) parameters +static INLINE _glptr_BindFragDataLocationIndexed GET_BindFragDataLocationIndexed(struct _glapi_table *disp) { + return (_glptr_BindFragDataLocationIndexed) (GET_by_offset(disp, _gloffset_BindFragDataLocationIndexed)); +} + +static INLINE void SET_BindFragDataLocationIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_BindFragDataLocationIndexed, fn); +} + +typedef GLint (GLAPIENTRYP _glptr_GetFragDataIndex)(GLuint, const GLchar *); +#define CALL_GetFragDataIndex(disp, parameters) \ + (* GET_GetFragDataIndex(disp)) parameters +static INLINE _glptr_GetFragDataIndex GET_GetFragDataIndex(struct _glapi_table *disp) { + return (_glptr_GetFragDataIndex) (GET_by_offset(disp, _gloffset_GetFragDataIndex)); +} + +static INLINE void SET_GetFragDataIndex(struct _glapi_table *disp, GLint (GLAPIENTRYP fn)(GLuint, const GLchar *)) { + SET_by_offset(disp, _gloffset_GetFragDataIndex, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindSampler)(GLuint, GLuint); +#define CALL_BindSampler(disp, parameters) \ + (* GET_BindSampler(disp)) parameters +static INLINE _glptr_BindSampler GET_BindSampler(struct _glapi_table *disp) { + return (_glptr_BindSampler) (GET_by_offset(disp, _gloffset_BindSampler)); +} + +static INLINE void SET_BindSampler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_BindSampler, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteSamplers)(GLsizei, const GLuint *); +#define CALL_DeleteSamplers(disp, parameters) \ + (* GET_DeleteSamplers(disp)) parameters +static INLINE _glptr_DeleteSamplers GET_DeleteSamplers(struct _glapi_table *disp) { + return (_glptr_DeleteSamplers) (GET_by_offset(disp, _gloffset_DeleteSamplers)); +} + +static INLINE void SET_DeleteSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteSamplers, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenSamplers)(GLsizei, GLuint *); +#define CALL_GenSamplers(disp, parameters) \ + (* GET_GenSamplers(disp)) parameters +static INLINE _glptr_GenSamplers GET_GenSamplers(struct _glapi_table *disp) { + return (_glptr_GenSamplers) (GET_by_offset(disp, _gloffset_GenSamplers)); +} + +static INLINE void SET_GenSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenSamplers, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIiv)(GLuint, GLenum, GLint *); +#define CALL_GetSamplerParameterIiv(disp, parameters) \ + (* GET_GetSamplerParameterIiv(disp)) parameters +static INLINE _glptr_GetSamplerParameterIiv GET_GetSamplerParameterIiv(struct _glapi_table *disp) { + return (_glptr_GetSamplerParameterIiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIiv)); +} + +static INLINE void SET_GetSamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetSamplerParameterIiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSamplerParameterIuiv)(GLuint, GLenum, GLuint *); +#define CALL_GetSamplerParameterIuiv(disp, parameters) \ + (* GET_GetSamplerParameterIuiv(disp)) parameters +static INLINE _glptr_GetSamplerParameterIuiv GET_GetSamplerParameterIuiv(struct _glapi_table *disp) { + return (_glptr_GetSamplerParameterIuiv) (GET_by_offset(disp, _gloffset_GetSamplerParameterIuiv)); +} + +static INLINE void SET_GetSamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint *)) { + SET_by_offset(disp, _gloffset_GetSamplerParameterIuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSamplerParameterfv)(GLuint, GLenum, GLfloat *); +#define CALL_GetSamplerParameterfv(disp, parameters) \ + (* GET_GetSamplerParameterfv(disp)) parameters +static INLINE _glptr_GetSamplerParameterfv GET_GetSamplerParameterfv(struct _glapi_table *disp) { + return (_glptr_GetSamplerParameterfv) (GET_by_offset(disp, _gloffset_GetSamplerParameterfv)); +} + +static INLINE void SET_GetSamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetSamplerParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetSamplerParameteriv)(GLuint, GLenum, GLint *); +#define CALL_GetSamplerParameteriv(disp, parameters) \ + (* GET_GetSamplerParameteriv(disp)) parameters +static INLINE _glptr_GetSamplerParameteriv GET_GetSamplerParameteriv(struct _glapi_table *disp) { + return (_glptr_GetSamplerParameteriv) (GET_by_offset(disp, _gloffset_GetSamplerParameteriv)); +} + +static INLINE void SET_GetSamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetSamplerParameteriv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsSampler)(GLuint); +#define CALL_IsSampler(disp, parameters) \ + (* GET_IsSampler(disp)) parameters +static INLINE _glptr_IsSampler GET_IsSampler(struct _glapi_table *disp) { + return (_glptr_IsSampler) (GET_by_offset(disp, _gloffset_IsSampler)); +} + +static INLINE void SET_IsSampler(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsSampler, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameterIiv)(GLuint, GLenum, const GLint *); +#define CALL_SamplerParameterIiv(disp, parameters) \ + (* GET_SamplerParameterIiv(disp)) parameters +static INLINE _glptr_SamplerParameterIiv GET_SamplerParameterIiv(struct _glapi_table *disp) { + return (_glptr_SamplerParameterIiv) (GET_by_offset(disp, _gloffset_SamplerParameterIiv)); +} + +static INLINE void SET_SamplerParameterIiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_SamplerParameterIiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameterIuiv)(GLuint, GLenum, const GLuint *); +#define CALL_SamplerParameterIuiv(disp, parameters) \ + (* GET_SamplerParameterIuiv(disp)) parameters +static INLINE _glptr_SamplerParameterIuiv GET_SamplerParameterIuiv(struct _glapi_table *disp) { + return (_glptr_SamplerParameterIuiv) (GET_by_offset(disp, _gloffset_SamplerParameterIuiv)); +} + +static INLINE void SET_SamplerParameterIuiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_SamplerParameterIuiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameterf)(GLuint, GLenum, GLfloat); +#define CALL_SamplerParameterf(disp, parameters) \ + (* GET_SamplerParameterf(disp)) parameters +static INLINE _glptr_SamplerParameterf GET_SamplerParameterf(struct _glapi_table *disp) { + return (_glptr_SamplerParameterf) (GET_by_offset(disp, _gloffset_SamplerParameterf)); +} + +static INLINE void SET_SamplerParameterf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat)) { + SET_by_offset(disp, _gloffset_SamplerParameterf, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameterfv)(GLuint, GLenum, const GLfloat *); +#define CALL_SamplerParameterfv(disp, parameters) \ + (* GET_SamplerParameterfv(disp)) parameters +static INLINE _glptr_SamplerParameterfv GET_SamplerParameterfv(struct _glapi_table *disp) { + return (_glptr_SamplerParameterfv) (GET_by_offset(disp, _gloffset_SamplerParameterfv)); +} + +static INLINE void SET_SamplerParameterfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_SamplerParameterfv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameteri)(GLuint, GLenum, GLint); +#define CALL_SamplerParameteri(disp, parameters) \ + (* GET_SamplerParameteri(disp)) parameters +static INLINE _glptr_SamplerParameteri GET_SamplerParameteri(struct _glapi_table *disp) { + return (_glptr_SamplerParameteri) (GET_by_offset(disp, _gloffset_SamplerParameteri)); +} + +static INLINE void SET_SamplerParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_SamplerParameteri, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplerParameteriv)(GLuint, GLenum, const GLint *); +#define CALL_SamplerParameteriv(disp, parameters) \ + (* GET_SamplerParameteriv(disp)) parameters +static INLINE _glptr_SamplerParameteriv GET_SamplerParameteriv(struct _glapi_table *disp) { + return (_glptr_SamplerParameteriv) (GET_by_offset(disp, _gloffset_SamplerParameteriv)); +} + +static INLINE void SET_SamplerParameteriv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_SamplerParameteriv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryObjecti64v)(GLuint, GLenum, GLint64 *); +#define CALL_GetQueryObjecti64v(disp, parameters) \ + (* GET_GetQueryObjecti64v(disp)) parameters +static INLINE _glptr_GetQueryObjecti64v GET_GetQueryObjecti64v(struct _glapi_table *disp) { + return (_glptr_GetQueryObjecti64v) (GET_by_offset(disp, _gloffset_GetQueryObjecti64v)); +} + +static INLINE void SET_GetQueryObjecti64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint64 *)) { + SET_by_offset(disp, _gloffset_GetQueryObjecti64v, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryObjectui64v)(GLuint, GLenum, GLuint64 *); +#define CALL_GetQueryObjectui64v(disp, parameters) \ + (* GET_GetQueryObjectui64v(disp)) parameters +static INLINE _glptr_GetQueryObjectui64v GET_GetQueryObjectui64v(struct _glapi_table *disp) { + return (_glptr_GetQueryObjectui64v) (GET_by_offset(disp, _gloffset_GetQueryObjectui64v)); +} + +static INLINE void SET_GetQueryObjectui64v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint64 *)) { + SET_by_offset(disp, _gloffset_GetQueryObjectui64v, fn); +} + +typedef void (GLAPIENTRYP _glptr_QueryCounter)(GLuint, GLenum); +#define CALL_QueryCounter(disp, parameters) \ + (* GET_QueryCounter(disp)) parameters +static INLINE _glptr_QueryCounter GET_QueryCounter(struct _glapi_table *disp) { + return (_glptr_QueryCounter) (GET_by_offset(disp, _gloffset_QueryCounter)); +} + +static INLINE void SET_QueryCounter(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_QueryCounter, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorP3ui)(GLenum, GLuint); +#define CALL_ColorP3ui(disp, parameters) \ + (* GET_ColorP3ui(disp)) parameters +static INLINE _glptr_ColorP3ui GET_ColorP3ui(struct _glapi_table *disp) { + return (_glptr_ColorP3ui) (GET_by_offset(disp, _gloffset_ColorP3ui)); +} + +static INLINE void SET_ColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_ColorP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorP3uiv)(GLenum, const GLuint *); +#define CALL_ColorP3uiv(disp, parameters) \ + (* GET_ColorP3uiv(disp)) parameters +static INLINE _glptr_ColorP3uiv GET_ColorP3uiv(struct _glapi_table *disp) { + return (_glptr_ColorP3uiv) (GET_by_offset(disp, _gloffset_ColorP3uiv)); +} + +static INLINE void SET_ColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_ColorP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorP4ui)(GLenum, GLuint); +#define CALL_ColorP4ui(disp, parameters) \ + (* GET_ColorP4ui(disp)) parameters +static INLINE _glptr_ColorP4ui GET_ColorP4ui(struct _glapi_table *disp) { + return (_glptr_ColorP4ui) (GET_by_offset(disp, _gloffset_ColorP4ui)); +} + +static INLINE void SET_ColorP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_ColorP4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorP4uiv)(GLenum, const GLuint *); +#define CALL_ColorP4uiv(disp, parameters) \ + (* GET_ColorP4uiv(disp)) parameters +static INLINE _glptr_ColorP4uiv GET_ColorP4uiv(struct _glapi_table *disp) { + return (_glptr_ColorP4uiv) (GET_by_offset(disp, _gloffset_ColorP4uiv)); +} + +static INLINE void SET_ColorP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_ColorP4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1ui)(GLenum, GLenum, GLuint); +#define CALL_MultiTexCoordP1ui(disp, parameters) \ + (* GET_MultiTexCoordP1ui(disp)) parameters +static INLINE _glptr_MultiTexCoordP1ui GET_MultiTexCoordP1ui(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP1ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP1ui)); +} + +static INLINE void SET_MultiTexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP1ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP1uiv)(GLenum, GLenum, const GLuint *); +#define CALL_MultiTexCoordP1uiv(disp, parameters) \ + (* GET_MultiTexCoordP1uiv(disp)) parameters +static INLINE _glptr_MultiTexCoordP1uiv GET_MultiTexCoordP1uiv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP1uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP1uiv)); +} + +static INLINE void SET_MultiTexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2ui)(GLenum, GLenum, GLuint); +#define CALL_MultiTexCoordP2ui(disp, parameters) \ + (* GET_MultiTexCoordP2ui(disp)) parameters +static INLINE _glptr_MultiTexCoordP2ui GET_MultiTexCoordP2ui(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP2ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP2ui)); +} + +static INLINE void SET_MultiTexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP2uiv)(GLenum, GLenum, const GLuint *); +#define CALL_MultiTexCoordP2uiv(disp, parameters) \ + (* GET_MultiTexCoordP2uiv(disp)) parameters +static INLINE _glptr_MultiTexCoordP2uiv GET_MultiTexCoordP2uiv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP2uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP2uiv)); +} + +static INLINE void SET_MultiTexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3ui)(GLenum, GLenum, GLuint); +#define CALL_MultiTexCoordP3ui(disp, parameters) \ + (* GET_MultiTexCoordP3ui(disp)) parameters +static INLINE _glptr_MultiTexCoordP3ui GET_MultiTexCoordP3ui(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP3ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP3ui)); +} + +static INLINE void SET_MultiTexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP3uiv)(GLenum, GLenum, const GLuint *); +#define CALL_MultiTexCoordP3uiv(disp, parameters) \ + (* GET_MultiTexCoordP3uiv(disp)) parameters +static INLINE _glptr_MultiTexCoordP3uiv GET_MultiTexCoordP3uiv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP3uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP3uiv)); +} + +static INLINE void SET_MultiTexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4ui)(GLenum, GLenum, GLuint); +#define CALL_MultiTexCoordP4ui(disp, parameters) \ + (* GET_MultiTexCoordP4ui(disp)) parameters +static INLINE _glptr_MultiTexCoordP4ui GET_MultiTexCoordP4ui(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP4ui) (GET_by_offset(disp, _gloffset_MultiTexCoordP4ui)); +} + +static INLINE void SET_MultiTexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoordP4uiv)(GLenum, GLenum, const GLuint *); +#define CALL_MultiTexCoordP4uiv(disp, parameters) \ + (* GET_MultiTexCoordP4uiv(disp)) parameters +static INLINE _glptr_MultiTexCoordP4uiv GET_MultiTexCoordP4uiv(struct _glapi_table *disp) { + return (_glptr_MultiTexCoordP4uiv) (GET_by_offset(disp, _gloffset_MultiTexCoordP4uiv)); +} + +static INLINE void SET_MultiTexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_MultiTexCoordP4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_NormalP3ui)(GLenum, GLuint); +#define CALL_NormalP3ui(disp, parameters) \ + (* GET_NormalP3ui(disp)) parameters +static INLINE _glptr_NormalP3ui GET_NormalP3ui(struct _glapi_table *disp) { + return (_glptr_NormalP3ui) (GET_by_offset(disp, _gloffset_NormalP3ui)); +} + +static INLINE void SET_NormalP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_NormalP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_NormalP3uiv)(GLenum, const GLuint *); +#define CALL_NormalP3uiv(disp, parameters) \ + (* GET_NormalP3uiv(disp)) parameters +static INLINE _glptr_NormalP3uiv GET_NormalP3uiv(struct _glapi_table *disp) { + return (_glptr_NormalP3uiv) (GET_by_offset(disp, _gloffset_NormalP3uiv)); +} + +static INLINE void SET_NormalP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_NormalP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColorP3ui)(GLenum, GLuint); +#define CALL_SecondaryColorP3ui(disp, parameters) \ + (* GET_SecondaryColorP3ui(disp)) parameters +static INLINE _glptr_SecondaryColorP3ui GET_SecondaryColorP3ui(struct _glapi_table *disp) { + return (_glptr_SecondaryColorP3ui) (GET_by_offset(disp, _gloffset_SecondaryColorP3ui)); +} + +static INLINE void SET_SecondaryColorP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_SecondaryColorP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColorP3uiv)(GLenum, const GLuint *); +#define CALL_SecondaryColorP3uiv(disp, parameters) \ + (* GET_SecondaryColorP3uiv(disp)) parameters +static INLINE _glptr_SecondaryColorP3uiv GET_SecondaryColorP3uiv(struct _glapi_table *disp) { + return (_glptr_SecondaryColorP3uiv) (GET_by_offset(disp, _gloffset_SecondaryColorP3uiv)); +} + +static INLINE void SET_SecondaryColorP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_SecondaryColorP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP1ui)(GLenum, GLuint); +#define CALL_TexCoordP1ui(disp, parameters) \ + (* GET_TexCoordP1ui(disp)) parameters +static INLINE _glptr_TexCoordP1ui GET_TexCoordP1ui(struct _glapi_table *disp) { + return (_glptr_TexCoordP1ui) (GET_by_offset(disp, _gloffset_TexCoordP1ui)); +} + +static INLINE void SET_TexCoordP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_TexCoordP1ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP1uiv)(GLenum, const GLuint *); +#define CALL_TexCoordP1uiv(disp, parameters) \ + (* GET_TexCoordP1uiv(disp)) parameters +static INLINE _glptr_TexCoordP1uiv GET_TexCoordP1uiv(struct _glapi_table *disp) { + return (_glptr_TexCoordP1uiv) (GET_by_offset(disp, _gloffset_TexCoordP1uiv)); +} + +static INLINE void SET_TexCoordP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_TexCoordP1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP2ui)(GLenum, GLuint); +#define CALL_TexCoordP2ui(disp, parameters) \ + (* GET_TexCoordP2ui(disp)) parameters +static INLINE _glptr_TexCoordP2ui GET_TexCoordP2ui(struct _glapi_table *disp) { + return (_glptr_TexCoordP2ui) (GET_by_offset(disp, _gloffset_TexCoordP2ui)); +} + +static INLINE void SET_TexCoordP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_TexCoordP2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP2uiv)(GLenum, const GLuint *); +#define CALL_TexCoordP2uiv(disp, parameters) \ + (* GET_TexCoordP2uiv(disp)) parameters +static INLINE _glptr_TexCoordP2uiv GET_TexCoordP2uiv(struct _glapi_table *disp) { + return (_glptr_TexCoordP2uiv) (GET_by_offset(disp, _gloffset_TexCoordP2uiv)); +} + +static INLINE void SET_TexCoordP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_TexCoordP2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP3ui)(GLenum, GLuint); +#define CALL_TexCoordP3ui(disp, parameters) \ + (* GET_TexCoordP3ui(disp)) parameters +static INLINE _glptr_TexCoordP3ui GET_TexCoordP3ui(struct _glapi_table *disp) { + return (_glptr_TexCoordP3ui) (GET_by_offset(disp, _gloffset_TexCoordP3ui)); +} + +static INLINE void SET_TexCoordP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_TexCoordP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP3uiv)(GLenum, const GLuint *); +#define CALL_TexCoordP3uiv(disp, parameters) \ + (* GET_TexCoordP3uiv(disp)) parameters +static INLINE _glptr_TexCoordP3uiv GET_TexCoordP3uiv(struct _glapi_table *disp) { + return (_glptr_TexCoordP3uiv) (GET_by_offset(disp, _gloffset_TexCoordP3uiv)); +} + +static INLINE void SET_TexCoordP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_TexCoordP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP4ui)(GLenum, GLuint); +#define CALL_TexCoordP4ui(disp, parameters) \ + (* GET_TexCoordP4ui(disp)) parameters +static INLINE _glptr_TexCoordP4ui GET_TexCoordP4ui(struct _glapi_table *disp) { + return (_glptr_TexCoordP4ui) (GET_by_offset(disp, _gloffset_TexCoordP4ui)); +} + +static INLINE void SET_TexCoordP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_TexCoordP4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordP4uiv)(GLenum, const GLuint *); +#define CALL_TexCoordP4uiv(disp, parameters) \ + (* GET_TexCoordP4uiv(disp)) parameters +static INLINE _glptr_TexCoordP4uiv GET_TexCoordP4uiv(struct _glapi_table *disp) { + return (_glptr_TexCoordP4uiv) (GET_by_offset(disp, _gloffset_TexCoordP4uiv)); +} + +static INLINE void SET_TexCoordP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_TexCoordP4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP1ui)(GLuint, GLenum, GLboolean, GLuint); +#define CALL_VertexAttribP1ui(disp, parameters) \ + (* GET_VertexAttribP1ui(disp)) parameters +static INLINE _glptr_VertexAttribP1ui GET_VertexAttribP1ui(struct _glapi_table *disp) { + return (_glptr_VertexAttribP1ui) (GET_by_offset(disp, _gloffset_VertexAttribP1ui)); +} + +static INLINE void SET_VertexAttribP1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribP1ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP1uiv)(GLuint, GLenum, GLboolean, const GLuint *); +#define CALL_VertexAttribP1uiv(disp, parameters) \ + (* GET_VertexAttribP1uiv(disp)) parameters +static INLINE _glptr_VertexAttribP1uiv GET_VertexAttribP1uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttribP1uiv) (GET_by_offset(disp, _gloffset_VertexAttribP1uiv)); +} + +static INLINE void SET_VertexAttribP1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribP1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP2ui)(GLuint, GLenum, GLboolean, GLuint); +#define CALL_VertexAttribP2ui(disp, parameters) \ + (* GET_VertexAttribP2ui(disp)) parameters +static INLINE _glptr_VertexAttribP2ui GET_VertexAttribP2ui(struct _glapi_table *disp) { + return (_glptr_VertexAttribP2ui) (GET_by_offset(disp, _gloffset_VertexAttribP2ui)); +} + +static INLINE void SET_VertexAttribP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribP2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP2uiv)(GLuint, GLenum, GLboolean, const GLuint *); +#define CALL_VertexAttribP2uiv(disp, parameters) \ + (* GET_VertexAttribP2uiv(disp)) parameters +static INLINE _glptr_VertexAttribP2uiv GET_VertexAttribP2uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttribP2uiv) (GET_by_offset(disp, _gloffset_VertexAttribP2uiv)); +} + +static INLINE void SET_VertexAttribP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribP2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP3ui)(GLuint, GLenum, GLboolean, GLuint); +#define CALL_VertexAttribP3ui(disp, parameters) \ + (* GET_VertexAttribP3ui(disp)) parameters +static INLINE _glptr_VertexAttribP3ui GET_VertexAttribP3ui(struct _glapi_table *disp) { + return (_glptr_VertexAttribP3ui) (GET_by_offset(disp, _gloffset_VertexAttribP3ui)); +} + +static INLINE void SET_VertexAttribP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP3uiv)(GLuint, GLenum, GLboolean, const GLuint *); +#define CALL_VertexAttribP3uiv(disp, parameters) \ + (* GET_VertexAttribP3uiv(disp)) parameters +static INLINE _glptr_VertexAttribP3uiv GET_VertexAttribP3uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttribP3uiv) (GET_by_offset(disp, _gloffset_VertexAttribP3uiv)); +} + +static INLINE void SET_VertexAttribP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP4ui)(GLuint, GLenum, GLboolean, GLuint); +#define CALL_VertexAttribP4ui(disp, parameters) \ + (* GET_VertexAttribP4ui(disp)) parameters +static INLINE _glptr_VertexAttribP4ui GET_VertexAttribP4ui(struct _glapi_table *disp) { + return (_glptr_VertexAttribP4ui) (GET_by_offset(disp, _gloffset_VertexAttribP4ui)); +} + +static INLINE void SET_VertexAttribP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribP4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribP4uiv)(GLuint, GLenum, GLboolean, const GLuint *); +#define CALL_VertexAttribP4uiv(disp, parameters) \ + (* GET_VertexAttribP4uiv(disp)) parameters +static INLINE _glptr_VertexAttribP4uiv GET_VertexAttribP4uiv(struct _glapi_table *disp) { + return (_glptr_VertexAttribP4uiv) (GET_by_offset(disp, _gloffset_VertexAttribP4uiv)); +} + +static INLINE void SET_VertexAttribP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLboolean, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribP4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP2ui)(GLenum, GLuint); +#define CALL_VertexP2ui(disp, parameters) \ + (* GET_VertexP2ui(disp)) parameters +static INLINE _glptr_VertexP2ui GET_VertexP2ui(struct _glapi_table *disp) { + return (_glptr_VertexP2ui) (GET_by_offset(disp, _gloffset_VertexP2ui)); +} + +static INLINE void SET_VertexP2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_VertexP2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP2uiv)(GLenum, const GLuint *); +#define CALL_VertexP2uiv(disp, parameters) \ + (* GET_VertexP2uiv(disp)) parameters +static INLINE _glptr_VertexP2uiv GET_VertexP2uiv(struct _glapi_table *disp) { + return (_glptr_VertexP2uiv) (GET_by_offset(disp, _gloffset_VertexP2uiv)); +} + +static INLINE void SET_VertexP2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexP2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP3ui)(GLenum, GLuint); +#define CALL_VertexP3ui(disp, parameters) \ + (* GET_VertexP3ui(disp)) parameters +static INLINE _glptr_VertexP3ui GET_VertexP3ui(struct _glapi_table *disp) { + return (_glptr_VertexP3ui) (GET_by_offset(disp, _gloffset_VertexP3ui)); +} + +static INLINE void SET_VertexP3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_VertexP3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP3uiv)(GLenum, const GLuint *); +#define CALL_VertexP3uiv(disp, parameters) \ + (* GET_VertexP3uiv(disp)) parameters +static INLINE _glptr_VertexP3uiv GET_VertexP3uiv(struct _glapi_table *disp) { + return (_glptr_VertexP3uiv) (GET_by_offset(disp, _gloffset_VertexP3uiv)); +} + +static INLINE void SET_VertexP3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexP3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP4ui)(GLenum, GLuint); +#define CALL_VertexP4ui(disp, parameters) \ + (* GET_VertexP4ui(disp)) parameters +static INLINE _glptr_VertexP4ui GET_VertexP4ui(struct _glapi_table *disp) { + return (_glptr_VertexP4ui) (GET_by_offset(disp, _gloffset_VertexP4ui)); +} + +static INLINE void SET_VertexP4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_VertexP4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexP4uiv)(GLenum, const GLuint *); +#define CALL_VertexP4uiv(disp, parameters) \ + (* GET_VertexP4uiv(disp)) parameters +static INLINE _glptr_VertexP4uiv GET_VertexP4uiv(struct _glapi_table *disp) { + return (_glptr_VertexP4uiv) (GET_by_offset(disp, _gloffset_VertexP4uiv)); +} + +static INLINE void SET_VertexP4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexP4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawArraysIndirect)(GLenum, const GLvoid *); +#define CALL_DrawArraysIndirect(disp, parameters) \ + (* GET_DrawArraysIndirect(disp)) parameters +static INLINE _glptr_DrawArraysIndirect GET_DrawArraysIndirect(struct _glapi_table *disp) { + return (_glptr_DrawArraysIndirect) (GET_by_offset(disp, _gloffset_DrawArraysIndirect)); +} + +static INLINE void SET_DrawArraysIndirect(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DrawArraysIndirect, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsIndirect)(GLenum, GLenum, const GLvoid *); +#define CALL_DrawElementsIndirect(disp, parameters) \ + (* GET_DrawElementsIndirect(disp)) parameters +static INLINE _glptr_DrawElementsIndirect GET_DrawElementsIndirect(struct _glapi_table *disp) { + return (_glptr_DrawElementsIndirect) (GET_by_offset(disp, _gloffset_DrawElementsIndirect)); +} + +static INLINE void SET_DrawElementsIndirect(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DrawElementsIndirect, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindTransformFeedback)(GLenum, GLuint); +#define CALL_BindTransformFeedback(disp, parameters) \ + (* GET_BindTransformFeedback(disp)) parameters +static INLINE _glptr_BindTransformFeedback GET_BindTransformFeedback(struct _glapi_table *disp) { + return (_glptr_BindTransformFeedback) (GET_by_offset(disp, _gloffset_BindTransformFeedback)); +} + +static INLINE void SET_BindTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteTransformFeedbacks)(GLsizei, const GLuint *); +#define CALL_DeleteTransformFeedbacks(disp, parameters) \ + (* GET_DeleteTransformFeedbacks(disp)) parameters +static INLINE _glptr_DeleteTransformFeedbacks GET_DeleteTransformFeedbacks(struct _glapi_table *disp) { + return (_glptr_DeleteTransformFeedbacks) (GET_by_offset(disp, _gloffset_DeleteTransformFeedbacks)); +} + +static INLINE void SET_DeleteTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteTransformFeedbacks, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTransformFeedback)(GLenum, GLuint); +#define CALL_DrawTransformFeedback(disp, parameters) \ + (* GET_DrawTransformFeedback(disp)) parameters +static INLINE _glptr_DrawTransformFeedback GET_DrawTransformFeedback(struct _glapi_table *disp) { + return (_glptr_DrawTransformFeedback) (GET_by_offset(disp, _gloffset_DrawTransformFeedback)); +} + +static INLINE void SET_DrawTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_DrawTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenTransformFeedbacks)(GLsizei, GLuint *); +#define CALL_GenTransformFeedbacks(disp, parameters) \ + (* GET_GenTransformFeedbacks(disp)) parameters +static INLINE _glptr_GenTransformFeedbacks GET_GenTransformFeedbacks(struct _glapi_table *disp) { + return (_glptr_GenTransformFeedbacks) (GET_by_offset(disp, _gloffset_GenTransformFeedbacks)); +} + +static INLINE void SET_GenTransformFeedbacks(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenTransformFeedbacks, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsTransformFeedback)(GLuint); +#define CALL_IsTransformFeedback(disp, parameters) \ + (* GET_IsTransformFeedback(disp)) parameters +static INLINE _glptr_IsTransformFeedback GET_IsTransformFeedback(struct _glapi_table *disp) { + return (_glptr_IsTransformFeedback) (GET_by_offset(disp, _gloffset_IsTransformFeedback)); +} + +static INLINE void SET_IsTransformFeedback(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_PauseTransformFeedback)(void); +#define CALL_PauseTransformFeedback(disp, parameters) \ + (* GET_PauseTransformFeedback(disp)) parameters +static INLINE _glptr_PauseTransformFeedback GET_PauseTransformFeedback(struct _glapi_table *disp) { + return (_glptr_PauseTransformFeedback) (GET_by_offset(disp, _gloffset_PauseTransformFeedback)); +} + +static INLINE void SET_PauseTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PauseTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_ResumeTransformFeedback)(void); +#define CALL_ResumeTransformFeedback(disp, parameters) \ + (* GET_ResumeTransformFeedback(disp)) parameters +static INLINE _glptr_ResumeTransformFeedback GET_ResumeTransformFeedback(struct _glapi_table *disp) { + return (_glptr_ResumeTransformFeedback) (GET_by_offset(disp, _gloffset_ResumeTransformFeedback)); +} + +static INLINE void SET_ResumeTransformFeedback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_ResumeTransformFeedback, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginQueryIndexed)(GLenum, GLuint, GLuint); +#define CALL_BeginQueryIndexed(disp, parameters) \ + (* GET_BeginQueryIndexed(disp)) parameters +static INLINE _glptr_BeginQueryIndexed GET_BeginQueryIndexed(struct _glapi_table *disp) { + return (_glptr_BeginQueryIndexed) (GET_by_offset(disp, _gloffset_BeginQueryIndexed)); +} + +static INLINE void SET_BeginQueryIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_BeginQueryIndexed, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackStream)(GLenum, GLuint, GLuint); +#define CALL_DrawTransformFeedbackStream(disp, parameters) \ + (* GET_DrawTransformFeedbackStream(disp)) parameters +static INLINE _glptr_DrawTransformFeedbackStream GET_DrawTransformFeedbackStream(struct _glapi_table *disp) { + return (_glptr_DrawTransformFeedbackStream) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackStream)); +} + +static INLINE void SET_DrawTransformFeedbackStream(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_DrawTransformFeedbackStream, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndQueryIndexed)(GLenum, GLuint); +#define CALL_EndQueryIndexed(disp, parameters) \ + (* GET_EndQueryIndexed(disp)) parameters +static INLINE _glptr_EndQueryIndexed GET_EndQueryIndexed(struct _glapi_table *disp) { + return (_glptr_EndQueryIndexed) (GET_by_offset(disp, _gloffset_EndQueryIndexed)); +} + +static INLINE void SET_EndQueryIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_EndQueryIndexed, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetQueryIndexediv)(GLenum, GLuint, GLenum, GLint *); +#define CALL_GetQueryIndexediv(disp, parameters) \ + (* GET_GetQueryIndexediv(disp)) parameters +static INLINE _glptr_GetQueryIndexediv GET_GetQueryIndexediv(struct _glapi_table *disp) { + return (_glptr_GetQueryIndexediv) (GET_by_offset(disp, _gloffset_GetQueryIndexediv)); +} + +static INLINE void SET_GetQueryIndexediv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetQueryIndexediv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearDepthf)(GLclampf); +#define CALL_ClearDepthf(disp, parameters) \ + (* GET_ClearDepthf(disp)) parameters +static INLINE _glptr_ClearDepthf GET_ClearDepthf(struct _glapi_table *disp) { + return (_glptr_ClearDepthf) (GET_by_offset(disp, _gloffset_ClearDepthf)); +} + +static INLINE void SET_ClearDepthf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf)) { + SET_by_offset(disp, _gloffset_ClearDepthf, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthRangef)(GLclampf, GLclampf); +#define CALL_DepthRangef(disp, parameters) \ + (* GET_DepthRangef(disp)) parameters +static INLINE _glptr_DepthRangef GET_DepthRangef(struct _glapi_table *disp) { + return (_glptr_DepthRangef) (GET_by_offset(disp, _gloffset_DepthRangef)); +} + +static INLINE void SET_DepthRangef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLclampf)) { + SET_by_offset(disp, _gloffset_DepthRangef, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetShaderPrecisionFormat)(GLenum, GLenum, GLint *, GLint *); +#define CALL_GetShaderPrecisionFormat(disp, parameters) \ + (* GET_GetShaderPrecisionFormat(disp)) parameters +static INLINE _glptr_GetShaderPrecisionFormat GET_GetShaderPrecisionFormat(struct _glapi_table *disp) { + return (_glptr_GetShaderPrecisionFormat) (GET_by_offset(disp, _gloffset_GetShaderPrecisionFormat)); +} + +static INLINE void SET_GetShaderPrecisionFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint *, GLint *)) { + SET_by_offset(disp, _gloffset_GetShaderPrecisionFormat, fn); +} + +typedef void (GLAPIENTRYP _glptr_ReleaseShaderCompiler)(void); +#define CALL_ReleaseShaderCompiler(disp, parameters) \ + (* GET_ReleaseShaderCompiler(disp)) parameters +static INLINE _glptr_ReleaseShaderCompiler GET_ReleaseShaderCompiler(struct _glapi_table *disp) { + return (_glptr_ReleaseShaderCompiler) (GET_by_offset(disp, _gloffset_ReleaseShaderCompiler)); +} + +static INLINE void SET_ReleaseShaderCompiler(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_ReleaseShaderCompiler, fn); +} + +typedef void (GLAPIENTRYP _glptr_ShaderBinary)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei); +#define CALL_ShaderBinary(disp, parameters) \ + (* GET_ShaderBinary(disp)) parameters +static INLINE _glptr_ShaderBinary GET_ShaderBinary(struct _glapi_table *disp) { + return (_glptr_ShaderBinary) (GET_by_offset(disp, _gloffset_ShaderBinary)); +} + +static INLINE void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLenum, const GLvoid *, GLsizei)) { + SET_by_offset(disp, _gloffset_ShaderBinary, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramBinary)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *); +#define CALL_GetProgramBinary(disp, parameters) \ + (* GET_GetProgramBinary(disp)) parameters +static INLINE _glptr_GetProgramBinary GET_GetProgramBinary(struct _glapi_table *disp) { + return (_glptr_GetProgramBinary) (GET_by_offset(disp, _gloffset_GetProgramBinary)); +} + +static INLINE void SET_GetProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetProgramBinary, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramBinary)(GLuint, GLenum, const GLvoid *, GLsizei); +#define CALL_ProgramBinary(disp, parameters) \ + (* GET_ProgramBinary(disp)) parameters +static INLINE _glptr_ProgramBinary GET_ProgramBinary(struct _glapi_table *disp) { + return (_glptr_ProgramBinary) (GET_by_offset(disp, _gloffset_ProgramBinary)); +} + +static INLINE void SET_ProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLvoid *, GLsizei)) { + SET_by_offset(disp, _gloffset_ProgramBinary, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramParameteri)(GLuint, GLenum, GLint); +#define CALL_ProgramParameteri(disp, parameters) \ + (* GET_ProgramParameteri(disp)) parameters +static INLINE _glptr_ProgramParameteri GET_ProgramParameteri(struct _glapi_table *disp) { + return (_glptr_ProgramParameteri) (GET_by_offset(disp, _gloffset_ProgramParameteri)); +} + +static INLINE void SET_ProgramParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_ProgramParameteri, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthRangeArrayv)(GLuint, GLsizei, const GLclampd *); +#define CALL_DepthRangeArrayv(disp, parameters) \ + (* GET_DepthRangeArrayv(disp)) parameters +static INLINE _glptr_DepthRangeArrayv GET_DepthRangeArrayv(struct _glapi_table *disp) { + return (_glptr_DepthRangeArrayv) (GET_by_offset(disp, _gloffset_DepthRangeArrayv)); +} + +static INLINE void SET_DepthRangeArrayv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLclampd *)) { + SET_by_offset(disp, _gloffset_DepthRangeArrayv, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthRangeIndexed)(GLuint, GLclampd, GLclampd); +#define CALL_DepthRangeIndexed(disp, parameters) \ + (* GET_DepthRangeIndexed(disp)) parameters +static INLINE _glptr_DepthRangeIndexed GET_DepthRangeIndexed(struct _glapi_table *disp) { + return (_glptr_DepthRangeIndexed) (GET_by_offset(disp, _gloffset_DepthRangeIndexed)); +} + +static INLINE void SET_DepthRangeIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLclampd, GLclampd)) { + SET_by_offset(disp, _gloffset_DepthRangeIndexed, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetDoublei_v)(GLenum, GLuint, GLdouble *); +#define CALL_GetDoublei_v(disp, parameters) \ + (* GET_GetDoublei_v(disp)) parameters +static INLINE _glptr_GetDoublei_v GET_GetDoublei_v(struct _glapi_table *disp) { + return (_glptr_GetDoublei_v) (GET_by_offset(disp, _gloffset_GetDoublei_v)); +} + +static INLINE void SET_GetDoublei_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetDoublei_v, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetFloati_v)(GLenum, GLuint, GLfloat *); +#define CALL_GetFloati_v(disp, parameters) \ + (* GET_GetFloati_v(disp)) parameters +static INLINE _glptr_GetFloati_v GET_GetFloati_v(struct _glapi_table *disp) { + return (_glptr_GetFloati_v) (GET_by_offset(disp, _gloffset_GetFloati_v)); +} + +static INLINE void SET_GetFloati_v(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetFloati_v, fn); +} + +typedef void (GLAPIENTRYP _glptr_ScissorArrayv)(GLuint, GLsizei, const int *); +#define CALL_ScissorArrayv(disp, parameters) \ + (* GET_ScissorArrayv(disp)) parameters +static INLINE _glptr_ScissorArrayv GET_ScissorArrayv(struct _glapi_table *disp) { + return (_glptr_ScissorArrayv) (GET_by_offset(disp, _gloffset_ScissorArrayv)); +} + +static INLINE void SET_ScissorArrayv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const int *)) { + SET_by_offset(disp, _gloffset_ScissorArrayv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ScissorIndexed)(GLuint, GLint, GLint, GLsizei, GLsizei); +#define CALL_ScissorIndexed(disp, parameters) \ + (* GET_ScissorIndexed(disp)) parameters +static INLINE _glptr_ScissorIndexed GET_ScissorIndexed(struct _glapi_table *disp) { + return (_glptr_ScissorIndexed) (GET_by_offset(disp, _gloffset_ScissorIndexed)); +} + +static INLINE void SET_ScissorIndexed(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_ScissorIndexed, fn); +} + +typedef void (GLAPIENTRYP _glptr_ScissorIndexedv)(GLuint, const GLint *); +#define CALL_ScissorIndexedv(disp, parameters) \ + (* GET_ScissorIndexedv(disp)) parameters +static INLINE _glptr_ScissorIndexedv GET_ScissorIndexedv(struct _glapi_table *disp) { + return (_glptr_ScissorIndexedv) (GET_by_offset(disp, _gloffset_ScissorIndexedv)); +} + +static INLINE void SET_ScissorIndexedv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_ScissorIndexedv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ViewportArrayv)(GLuint, GLsizei, const GLfloat *); +#define CALL_ViewportArrayv(disp, parameters) \ + (* GET_ViewportArrayv(disp)) parameters +static INLINE _glptr_ViewportArrayv GET_ViewportArrayv(struct _glapi_table *disp) { + return (_glptr_ViewportArrayv) (GET_by_offset(disp, _gloffset_ViewportArrayv)); +} + +static INLINE void SET_ViewportArrayv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ViewportArrayv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ViewportIndexedf)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ViewportIndexedf(disp, parameters) \ + (* GET_ViewportIndexedf(disp)) parameters +static INLINE _glptr_ViewportIndexedf GET_ViewportIndexedf(struct _glapi_table *disp) { + return (_glptr_ViewportIndexedf) (GET_by_offset(disp, _gloffset_ViewportIndexedf)); +} + +static INLINE void SET_ViewportIndexedf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ViewportIndexedf, fn); +} + +typedef void (GLAPIENTRYP _glptr_ViewportIndexedfv)(GLuint, const GLfloat *); +#define CALL_ViewportIndexedfv(disp, parameters) \ + (* GET_ViewportIndexedfv(disp)) parameters +static INLINE _glptr_ViewportIndexedfv GET_ViewportIndexedfv(struct _glapi_table *disp) { + return (_glptr_ViewportIndexedfv) (GET_by_offset(disp, _gloffset_ViewportIndexedfv)); +} + +static INLINE void SET_ViewportIndexedfv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ViewportIndexedfv, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void); +#define CALL_GetGraphicsResetStatusARB(disp, parameters) \ + (* GET_GetGraphicsResetStatusARB(disp)) parameters +static INLINE _glptr_GetGraphicsResetStatusARB GET_GetGraphicsResetStatusARB(struct _glapi_table *disp) { + return (_glptr_GetGraphicsResetStatusARB) (GET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB)); +} + +static INLINE void SET_GetGraphicsResetStatusARB(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_GetGraphicsResetStatusARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnColorTableARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_GetnColorTableARB(disp, parameters) \ + (* GET_GetnColorTableARB(disp)) parameters +static INLINE _glptr_GetnColorTableARB GET_GetnColorTableARB(struct _glapi_table *disp) { + return (_glptr_GetnColorTableARB) (GET_by_offset(disp, _gloffset_GetnColorTableARB)); +} + +static INLINE void SET_GetnColorTableARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnColorTableARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnCompressedTexImageARB)(GLenum, GLint, GLsizei, GLvoid *); +#define CALL_GetnCompressedTexImageARB(disp, parameters) \ + (* GET_GetnCompressedTexImageARB(disp)) parameters +static INLINE _glptr_GetnCompressedTexImageARB GET_GetnCompressedTexImageARB(struct _glapi_table *disp) { + return (_glptr_GetnCompressedTexImageARB) (GET_by_offset(disp, _gloffset_GetnCompressedTexImageARB)); +} + +static INLINE void SET_GetnCompressedTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnCompressedTexImageARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnConvolutionFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_GetnConvolutionFilterARB(disp, parameters) \ + (* GET_GetnConvolutionFilterARB(disp)) parameters +static INLINE _glptr_GetnConvolutionFilterARB GET_GetnConvolutionFilterARB(struct _glapi_table *disp) { + return (_glptr_GetnConvolutionFilterARB) (GET_by_offset(disp, _gloffset_GetnConvolutionFilterARB)); +} + +static INLINE void SET_GetnConvolutionFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnConvolutionFilterARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnHistogramARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_GetnHistogramARB(disp, parameters) \ + (* GET_GetnHistogramARB(disp)) parameters +static INLINE _glptr_GetnHistogramARB GET_GetnHistogramARB(struct _glapi_table *disp) { + return (_glptr_GetnHistogramARB) (GET_by_offset(disp, _gloffset_GetnHistogramARB)); +} + +static INLINE void SET_GetnHistogramARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnHistogramARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnMapdvARB)(GLenum, GLenum, GLsizei, GLdouble *); +#define CALL_GetnMapdvARB(disp, parameters) \ + (* GET_GetnMapdvARB(disp)) parameters +static INLINE _glptr_GetnMapdvARB GET_GetnMapdvARB(struct _glapi_table *disp) { + return (_glptr_GetnMapdvARB) (GET_by_offset(disp, _gloffset_GetnMapdvARB)); +} + +static INLINE void SET_GetnMapdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetnMapdvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnMapfvARB)(GLenum, GLenum, GLsizei, GLfloat *); +#define CALL_GetnMapfvARB(disp, parameters) \ + (* GET_GetnMapfvARB(disp)) parameters +static INLINE _glptr_GetnMapfvARB GET_GetnMapfvARB(struct _glapi_table *disp) { + return (_glptr_GetnMapfvARB) (GET_by_offset(disp, _gloffset_GetnMapfvARB)); +} + +static INLINE void SET_GetnMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetnMapfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnMapivARB)(GLenum, GLenum, GLsizei, GLint *); +#define CALL_GetnMapivARB(disp, parameters) \ + (* GET_GetnMapivARB(disp)) parameters +static INLINE _glptr_GetnMapivARB GET_GetnMapivARB(struct _glapi_table *disp) { + return (_glptr_GetnMapivARB) (GET_by_offset(disp, _gloffset_GetnMapivARB)); +} + +static INLINE void SET_GetnMapivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLsizei, GLint *)) { + SET_by_offset(disp, _gloffset_GetnMapivARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnMinmaxARB)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_GetnMinmaxARB(disp, parameters) \ + (* GET_GetnMinmaxARB(disp)) parameters +static INLINE _glptr_GetnMinmaxARB GET_GetnMinmaxARB(struct _glapi_table *disp) { + return (_glptr_GetnMinmaxARB) (GET_by_offset(disp, _gloffset_GetnMinmaxARB)); +} + +static INLINE void SET_GetnMinmaxARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLboolean, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnMinmaxARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnPixelMapfvARB)(GLenum, GLsizei, GLfloat *); +#define CALL_GetnPixelMapfvARB(disp, parameters) \ + (* GET_GetnPixelMapfvARB(disp)) parameters +static INLINE _glptr_GetnPixelMapfvARB GET_GetnPixelMapfvARB(struct _glapi_table *disp) { + return (_glptr_GetnPixelMapfvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapfvARB)); +} + +static INLINE void SET_GetnPixelMapfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetnPixelMapfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnPixelMapuivARB)(GLenum, GLsizei, GLuint *); +#define CALL_GetnPixelMapuivARB(disp, parameters) \ + (* GET_GetnPixelMapuivARB(disp)) parameters +static INLINE _glptr_GetnPixelMapuivARB GET_GetnPixelMapuivARB(struct _glapi_table *disp) { + return (_glptr_GetnPixelMapuivARB) (GET_by_offset(disp, _gloffset_GetnPixelMapuivARB)); +} + +static INLINE void SET_GetnPixelMapuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GetnPixelMapuivARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnPixelMapusvARB)(GLenum, GLsizei, GLushort *); +#define CALL_GetnPixelMapusvARB(disp, parameters) \ + (* GET_GetnPixelMapusvARB(disp)) parameters +static INLINE _glptr_GetnPixelMapusvARB GET_GetnPixelMapusvARB(struct _glapi_table *disp) { + return (_glptr_GetnPixelMapusvARB) (GET_by_offset(disp, _gloffset_GetnPixelMapusvARB)); +} + +static INLINE void SET_GetnPixelMapusvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLushort *)) { + SET_by_offset(disp, _gloffset_GetnPixelMapusvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnPolygonStippleARB)(GLsizei, GLubyte *); +#define CALL_GetnPolygonStippleARB(disp, parameters) \ + (* GET_GetnPolygonStippleARB(disp)) parameters +static INLINE _glptr_GetnPolygonStippleARB GET_GetnPolygonStippleARB(struct _glapi_table *disp) { + return (_glptr_GetnPolygonStippleARB) (GET_by_offset(disp, _gloffset_GetnPolygonStippleARB)); +} + +static INLINE void SET_GetnPolygonStippleARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLubyte *)) { + SET_by_offset(disp, _gloffset_GetnPolygonStippleARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnSeparableFilterARB)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *); +#define CALL_GetnSeparableFilterARB(disp, parameters) \ + (* GET_GetnSeparableFilterARB(disp)) parameters +static INLINE _glptr_GetnSeparableFilterARB GET_GetnSeparableFilterARB(struct _glapi_table *disp) { + return (_glptr_GetnSeparableFilterARB) (GET_by_offset(disp, _gloffset_GetnSeparableFilterARB)); +} + +static INLINE void SET_GetnSeparableFilterARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLvoid *, GLsizei, GLvoid *, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnSeparableFilterARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnTexImageARB)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_GetnTexImageARB(disp, parameters) \ + (* GET_GetnTexImageARB(disp)) parameters +static INLINE _glptr_GetnTexImageARB GET_GetnTexImageARB(struct _glapi_table *disp) { + return (_glptr_GetnTexImageARB) (GET_by_offset(disp, _gloffset_GetnTexImageARB)); +} + +static INLINE void SET_GetnTexImageARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetnTexImageARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnUniformdvARB)(GLuint, GLint, GLsizei, GLdouble *); +#define CALL_GetnUniformdvARB(disp, parameters) \ + (* GET_GetnUniformdvARB(disp)) parameters +static INLINE _glptr_GetnUniformdvARB GET_GetnUniformdvARB(struct _glapi_table *disp) { + return (_glptr_GetnUniformdvARB) (GET_by_offset(disp, _gloffset_GetnUniformdvARB)); +} + +static INLINE void SET_GetnUniformdvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetnUniformdvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnUniformfvARB)(GLuint, GLint, GLsizei, GLfloat *); +#define CALL_GetnUniformfvARB(disp, parameters) \ + (* GET_GetnUniformfvARB(disp)) parameters +static INLINE _glptr_GetnUniformfvARB GET_GetnUniformfvARB(struct _glapi_table *disp) { + return (_glptr_GetnUniformfvARB) (GET_by_offset(disp, _gloffset_GetnUniformfvARB)); +} + +static INLINE void SET_GetnUniformfvARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetnUniformfvARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnUniformivARB)(GLuint, GLint, GLsizei, GLint *); +#define CALL_GetnUniformivARB(disp, parameters) \ + (* GET_GetnUniformivARB(disp)) parameters +static INLINE _glptr_GetnUniformivARB GET_GetnUniformivARB(struct _glapi_table *disp) { + return (_glptr_GetnUniformivARB) (GET_by_offset(disp, _gloffset_GetnUniformivARB)); +} + +static INLINE void SET_GetnUniformivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLint *)) { + SET_by_offset(disp, _gloffset_GetnUniformivARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetnUniformuivARB)(GLuint, GLint, GLsizei, GLuint *); +#define CALL_GetnUniformuivARB(disp, parameters) \ + (* GET_GetnUniformuivARB(disp)) parameters +static INLINE _glptr_GetnUniformuivARB GET_GetnUniformuivARB(struct _glapi_table *disp) { + return (_glptr_GetnUniformuivARB) (GET_by_offset(disp, _gloffset_GetnUniformuivARB)); +} + +static INLINE void SET_GetnUniformuivARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GetnUniformuivARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_ReadnPixelsARB)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *); +#define CALL_ReadnPixelsARB(disp, parameters) \ + (* GET_ReadnPixelsARB(disp)) parameters +static INLINE _glptr_ReadnPixelsARB GET_ReadnPixelsARB(struct _glapi_table *disp) { + return (_glptr_ReadnPixelsARB) (GET_by_offset(disp, _gloffset_ReadnPixelsARB)); +} + +static INLINE void SET_ReadnPixelsARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLsizei, GLvoid *)) { + SET_by_offset(disp, _gloffset_ReadnPixelsARB, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawArraysInstancedBaseInstance)(GLenum, GLint, GLsizei, GLsizei, GLuint); +#define CALL_DrawArraysInstancedBaseInstance(disp, parameters) \ + (* GET_DrawArraysInstancedBaseInstance(disp)) parameters +static INLINE _glptr_DrawArraysInstancedBaseInstance GET_DrawArraysInstancedBaseInstance(struct _glapi_table *disp) { + return (_glptr_DrawArraysInstancedBaseInstance) (GET_by_offset(disp, _gloffset_DrawArraysInstancedBaseInstance)); +} + +static INLINE void SET_DrawArraysInstancedBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint, GLsizei, GLsizei, GLuint)) { + SET_by_offset(disp, _gloffset_DrawArraysInstancedBaseInstance, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseInstance)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLuint); +#define CALL_DrawElementsInstancedBaseInstance(disp, parameters) \ + (* GET_DrawElementsInstancedBaseInstance(disp)) parameters +static INLINE _glptr_DrawElementsInstancedBaseInstance GET_DrawElementsInstancedBaseInstance(struct _glapi_table *disp) { + return (_glptr_DrawElementsInstancedBaseInstance) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseInstance)); +} + +static INLINE void SET_DrawElementsInstancedBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLuint)) { + SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseInstance, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawElementsInstancedBaseVertexBaseInstance)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint, GLuint); +#define CALL_DrawElementsInstancedBaseVertexBaseInstance(disp, parameters) \ + (* GET_DrawElementsInstancedBaseVertexBaseInstance(disp)) parameters +static INLINE _glptr_DrawElementsInstancedBaseVertexBaseInstance GET_DrawElementsInstancedBaseVertexBaseInstance(struct _glapi_table *disp) { + return (_glptr_DrawElementsInstancedBaseVertexBaseInstance) (GET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertexBaseInstance)); +} + +static INLINE void SET_DrawElementsInstancedBaseVertexBaseInstance(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei, GLint, GLuint)) { + SET_by_offset(disp, _gloffset_DrawElementsInstancedBaseVertexBaseInstance, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackInstanced)(GLenum, GLuint, GLsizei); +#define CALL_DrawTransformFeedbackInstanced(disp, parameters) \ + (* GET_DrawTransformFeedbackInstanced(disp)) parameters +static INLINE _glptr_DrawTransformFeedbackInstanced GET_DrawTransformFeedbackInstanced(struct _glapi_table *disp) { + return (_glptr_DrawTransformFeedbackInstanced) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackInstanced)); +} + +static INLINE void SET_DrawTransformFeedbackInstanced(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei)) { + SET_by_offset(disp, _gloffset_DrawTransformFeedbackInstanced, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTransformFeedbackStreamInstanced)(GLenum, GLuint, GLuint, GLsizei); +#define CALL_DrawTransformFeedbackStreamInstanced(disp, parameters) \ + (* GET_DrawTransformFeedbackStreamInstanced(disp)) parameters +static INLINE _glptr_DrawTransformFeedbackStreamInstanced GET_DrawTransformFeedbackStreamInstanced(struct _glapi_table *disp) { + return (_glptr_DrawTransformFeedbackStreamInstanced) (GET_by_offset(disp, _gloffset_DrawTransformFeedbackStreamInstanced)); +} + +static INLINE void SET_DrawTransformFeedbackStreamInstanced(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLsizei)) { + SET_by_offset(disp, _gloffset_DrawTransformFeedbackStreamInstanced, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetInternalformativ)(GLenum, GLenum, GLenum, GLsizei, GLint *); +#define CALL_GetInternalformativ(disp, parameters) \ + (* GET_GetInternalformativ(disp)) parameters +static INLINE _glptr_GetInternalformativ GET_GetInternalformativ(struct _glapi_table *disp) { + return (_glptr_GetInternalformativ) (GET_by_offset(disp, _gloffset_GetInternalformativ)); +} + +static INLINE void SET_GetInternalformativ(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, GLint *)) { + SET_by_offset(disp, _gloffset_GetInternalformativ, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetActiveAtomicCounterBufferiv)(GLuint, GLuint, GLenum, GLint *); +#define CALL_GetActiveAtomicCounterBufferiv(disp, parameters) \ + (* GET_GetActiveAtomicCounterBufferiv(disp)) parameters +static INLINE _glptr_GetActiveAtomicCounterBufferiv GET_GetActiveAtomicCounterBufferiv(struct _glapi_table *disp) { + return (_glptr_GetActiveAtomicCounterBufferiv) (GET_by_offset(disp, _gloffset_GetActiveAtomicCounterBufferiv)); +} + +static INLINE void SET_GetActiveAtomicCounterBufferiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetActiveAtomicCounterBufferiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindImageTexture)(GLuint, GLuint, GLint, GLboolean, GLint, GLenum, GLenum); +#define CALL_BindImageTexture(disp, parameters) \ + (* GET_BindImageTexture(disp)) parameters +static INLINE _glptr_BindImageTexture GET_BindImageTexture(struct _glapi_table *disp) { + return (_glptr_BindImageTexture) (GET_by_offset(disp, _gloffset_BindImageTexture)); +} + +static INLINE void SET_BindImageTexture(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLint, GLboolean, GLint, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_BindImageTexture, fn); +} + +typedef void (GLAPIENTRYP _glptr_MemoryBarrier)(GLbitfield); +#define CALL_MemoryBarrier(disp, parameters) \ + (* GET_MemoryBarrier(disp)) parameters +static INLINE _glptr_MemoryBarrier GET_MemoryBarrier(struct _glapi_table *disp) { + return (_glptr_MemoryBarrier) (GET_by_offset(disp, _gloffset_MemoryBarrier)); +} + +static INLINE void SET_MemoryBarrier(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLbitfield)) { + SET_by_offset(disp, _gloffset_MemoryBarrier, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexStorage1D)(GLenum, GLsizei, GLenum, GLsizei); +#define CALL_TexStorage1D(disp, parameters) \ + (* GET_TexStorage1D(disp)) parameters +static INLINE _glptr_TexStorage1D GET_TexStorage1D(struct _glapi_table *disp) { + return (_glptr_TexStorage1D) (GET_by_offset(disp, _gloffset_TexStorage1D)); +} + +static INLINE void SET_TexStorage1D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei)) { + SET_by_offset(disp, _gloffset_TexStorage1D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexStorage2D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei); +#define CALL_TexStorage2D(disp, parameters) \ + (* GET_TexStorage2D(disp)) parameters +static INLINE _glptr_TexStorage2D GET_TexStorage2D(struct _glapi_table *disp) { + return (_glptr_TexStorage2D) (GET_by_offset(disp, _gloffset_TexStorage2D)); +} + +static INLINE void SET_TexStorage2D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_TexStorage2D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexStorage3D)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei); +#define CALL_TexStorage3D(disp, parameters) \ + (* GET_TexStorage3D(disp)) parameters +static INLINE _glptr_TexStorage3D GET_TexStorage3D(struct _glapi_table *disp) { + return (_glptr_TexStorage3D) (GET_by_offset(disp, _gloffset_TexStorage3D)); +} + +static INLINE void SET_TexStorage3D(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_TexStorage3D, fn); +} + +typedef void (GLAPIENTRYP _glptr_TextureStorage1DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei); +#define CALL_TextureStorage1DEXT(disp, parameters) \ + (* GET_TextureStorage1DEXT(disp)) parameters +static INLINE _glptr_TextureStorage1DEXT GET_TextureStorage1DEXT(struct _glapi_table *disp) { + return (_glptr_TextureStorage1DEXT) (GET_by_offset(disp, _gloffset_TextureStorage1DEXT)); +} + +static INLINE void SET_TextureStorage1DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei)) { + SET_by_offset(disp, _gloffset_TextureStorage1DEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_TextureStorage2DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei); +#define CALL_TextureStorage2DEXT(disp, parameters) \ + (* GET_TextureStorage2DEXT(disp)) parameters +static INLINE _glptr_TextureStorage2DEXT GET_TextureStorage2DEXT(struct _glapi_table *disp) { + return (_glptr_TextureStorage2DEXT) (GET_by_offset(disp, _gloffset_TextureStorage2DEXT)); +} + +static INLINE void SET_TextureStorage2DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_TextureStorage2DEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_TextureStorage3DEXT)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei); +#define CALL_TextureStorage3DEXT(disp, parameters) \ + (* GET_TextureStorage3DEXT(disp)) parameters +static INLINE _glptr_TextureStorage3DEXT GET_TextureStorage3DEXT(struct _glapi_table *disp) { + return (_glptr_TextureStorage3DEXT) (GET_by_offset(disp, _gloffset_TextureStorage3DEXT)); +} + +static INLINE void SET_TextureStorage3DEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_TextureStorage3DEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferData)(GLenum, GLenum, GLenum, GLenum, const GLvoid *); +#define CALL_ClearBufferData(disp, parameters) \ + (* GET_ClearBufferData(disp)) parameters +static INLINE _glptr_ClearBufferData GET_ClearBufferData(struct _glapi_table *disp) { + return (_glptr_ClearBufferData) (GET_by_offset(disp, _gloffset_ClearBufferData)); +} + +static INLINE void SET_ClearBufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ClearBufferData, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearBufferSubData)(GLenum, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const GLvoid *); +#define CALL_ClearBufferSubData(disp, parameters) \ + (* GET_ClearBufferSubData(disp)) parameters +static INLINE _glptr_ClearBufferSubData GET_ClearBufferSubData(struct _glapi_table *disp) { + return (_glptr_ClearBufferSubData) (GET_by_offset(disp, _gloffset_ClearBufferSubData)); +} + +static INLINE void SET_ClearBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLintptr, GLsizeiptr, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ClearBufferSubData, fn); +} + +typedef void (GLAPIENTRYP _glptr_DispatchCompute)(GLuint, GLuint, GLuint); +#define CALL_DispatchCompute(disp, parameters) \ + (* GET_DispatchCompute(disp)) parameters +static INLINE _glptr_DispatchCompute GET_DispatchCompute(struct _glapi_table *disp) { + return (_glptr_DispatchCompute) (GET_by_offset(disp, _gloffset_DispatchCompute)); +} + +static INLINE void SET_DispatchCompute(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_DispatchCompute, fn); +} + +typedef void (GLAPIENTRYP _glptr_DispatchComputeIndirect)(GLintptr); +#define CALL_DispatchComputeIndirect(disp, parameters) \ + (* GET_DispatchComputeIndirect(disp)) parameters +static INLINE _glptr_DispatchComputeIndirect GET_DispatchComputeIndirect(struct _glapi_table *disp) { + return (_glptr_DispatchComputeIndirect) (GET_by_offset(disp, _gloffset_DispatchComputeIndirect)); +} + +static INLINE void SET_DispatchComputeIndirect(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLintptr)) { + SET_by_offset(disp, _gloffset_DispatchComputeIndirect, fn); +} + +typedef void (GLAPIENTRYP _glptr_CopyImageSubData)(GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei); +#define CALL_CopyImageSubData(disp, parameters) \ + (* GET_CopyImageSubData(disp)) parameters +static INLINE _glptr_CopyImageSubData GET_CopyImageSubData(struct _glapi_table *disp) { + return (_glptr_CopyImageSubData) (GET_by_offset(disp, _gloffset_CopyImageSubData)); +} + +static INLINE void SET_CopyImageSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint, GLint, GLint, GLint, GLuint, GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_CopyImageSubData, fn); +} + +typedef void (GLAPIENTRYP _glptr_TextureView)(GLuint, GLenum, GLuint, GLenum, GLuint, GLuint, GLuint, GLuint); +#define CALL_TextureView(disp, parameters) \ + (* GET_TextureView(disp)) parameters +static INLINE _glptr_TextureView GET_TextureView(struct _glapi_table *disp) { + return (_glptr_TextureView) (GET_by_offset(disp, _gloffset_TextureView)); +} + +static INLINE void SET_TextureView(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLuint, GLenum, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_TextureView, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindVertexBuffer)(GLuint, GLuint, GLintptr, GLsizei); +#define CALL_BindVertexBuffer(disp, parameters) \ + (* GET_BindVertexBuffer(disp)) parameters +static INLINE _glptr_BindVertexBuffer GET_BindVertexBuffer(struct _glapi_table *disp) { + return (_glptr_BindVertexBuffer) (GET_by_offset(disp, _gloffset_BindVertexBuffer)); +} + +static INLINE void SET_BindVertexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLintptr, GLsizei)) { + SET_by_offset(disp, _gloffset_BindVertexBuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribBinding)(GLuint, GLuint); +#define CALL_VertexAttribBinding(disp, parameters) \ + (* GET_VertexAttribBinding(disp)) parameters +static INLINE _glptr_VertexAttribBinding GET_VertexAttribBinding(struct _glapi_table *disp) { + return (_glptr_VertexAttribBinding) (GET_by_offset(disp, _gloffset_VertexAttribBinding)); +} + +static INLINE void SET_VertexAttribBinding(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribBinding, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribFormat)(GLuint, GLint, GLenum, GLboolean, GLuint); +#define CALL_VertexAttribFormat(disp, parameters) \ + (* GET_VertexAttribFormat(disp)) parameters +static INLINE _glptr_VertexAttribFormat GET_VertexAttribFormat(struct _glapi_table *disp) { + return (_glptr_VertexAttribFormat) (GET_by_offset(disp, _gloffset_VertexAttribFormat)); +} + +static INLINE void SET_VertexAttribFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLboolean, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribFormat, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribIFormat)(GLuint, GLint, GLenum, GLuint); +#define CALL_VertexAttribIFormat(disp, parameters) \ + (* GET_VertexAttribIFormat(disp)) parameters +static INLINE _glptr_VertexAttribIFormat GET_VertexAttribIFormat(struct _glapi_table *disp) { + return (_glptr_VertexAttribIFormat) (GET_by_offset(disp, _gloffset_VertexAttribIFormat)); +} + +static INLINE void SET_VertexAttribIFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribIFormat, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribLFormat)(GLuint, GLint, GLenum, GLuint); +#define CALL_VertexAttribLFormat(disp, parameters) \ + (* GET_VertexAttribLFormat(disp)) parameters +static INLINE _glptr_VertexAttribLFormat GET_VertexAttribLFormat(struct _glapi_table *disp) { + return (_glptr_VertexAttribLFormat) (GET_by_offset(disp, _gloffset_VertexAttribLFormat)); +} + +static INLINE void SET_VertexAttribLFormat(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribLFormat, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexBindingDivisor)(GLuint, GLuint); +#define CALL_VertexBindingDivisor(disp, parameters) \ + (* GET_VertexBindingDivisor(disp)) parameters +static INLINE _glptr_VertexBindingDivisor GET_VertexBindingDivisor(struct _glapi_table *disp) { + return (_glptr_VertexBindingDivisor) (GET_by_offset(disp, _gloffset_VertexBindingDivisor)); +} + +static INLINE void SET_VertexBindingDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexBindingDivisor, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiDrawArraysIndirect)(GLenum, const GLvoid *, GLsizei, GLsizei); +#define CALL_MultiDrawArraysIndirect(disp, parameters) \ + (* GET_MultiDrawArraysIndirect(disp)) parameters +static INLINE _glptr_MultiDrawArraysIndirect GET_MultiDrawArraysIndirect(struct _glapi_table *disp) { + return (_glptr_MultiDrawArraysIndirect) (GET_by_offset(disp, _gloffset_MultiDrawArraysIndirect)); +} + +static INLINE void SET_MultiDrawArraysIndirect(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLvoid *, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_MultiDrawArraysIndirect, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiDrawElementsIndirect)(GLenum, GLenum, const GLvoid *, GLsizei, GLsizei); +#define CALL_MultiDrawElementsIndirect(disp, parameters) \ + (* GET_MultiDrawElementsIndirect(disp)) parameters +static INLINE _glptr_MultiDrawElementsIndirect GET_MultiDrawElementsIndirect(struct _glapi_table *disp) { + return (_glptr_MultiDrawElementsIndirect) (GET_by_offset(disp, _gloffset_MultiDrawElementsIndirect)); +} + +static INLINE void SET_MultiDrawElementsIndirect(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLvoid *, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_MultiDrawElementsIndirect, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexBufferRange)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr); +#define CALL_TexBufferRange(disp, parameters) \ + (* GET_TexBufferRange(disp)) parameters +static INLINE _glptr_TexBufferRange GET_TexBufferRange(struct _glapi_table *disp) { + return (_glptr_TexBufferRange) (GET_by_offset(disp, _gloffset_TexBufferRange)); +} + +static INLINE void SET_TexBufferRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_TexBufferRange, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexStorage2DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean); +#define CALL_TexStorage2DMultisample(disp, parameters) \ + (* GET_TexStorage2DMultisample(disp)) parameters +static INLINE _glptr_TexStorage2DMultisample GET_TexStorage2DMultisample(struct _glapi_table *disp) { + return (_glptr_TexStorage2DMultisample) (GET_by_offset(disp, _gloffset_TexStorage2DMultisample)); +} + +static INLINE void SET_TexStorage2DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLboolean)) { + SET_by_offset(disp, _gloffset_TexStorage2DMultisample, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexStorage3DMultisample)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean); +#define CALL_TexStorage3DMultisample(disp, parameters) \ + (* GET_TexStorage3DMultisample(disp)) parameters +static INLINE _glptr_TexStorage3DMultisample GET_TexStorage3DMultisample(struct _glapi_table *disp) { + return (_glptr_TexStorage3DMultisample) (GET_by_offset(disp, _gloffset_TexStorage3DMultisample)); +} + +static INLINE void SET_TexStorage3DMultisample(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLenum, GLsizei, GLsizei, GLsizei, GLboolean)) { + SET_by_offset(disp, _gloffset_TexStorage3DMultisample, fn); +} + +typedef void (GLAPIENTRYP _glptr_BufferStorage)(GLenum, GLsizeiptr, const GLvoid *, GLbitfield); +#define CALL_BufferStorage(disp, parameters) \ + (* GET_BufferStorage(disp)) parameters +static INLINE _glptr_BufferStorage GET_BufferStorage(struct _glapi_table *disp) { + return (_glptr_BufferStorage) (GET_by_offset(disp, _gloffset_BufferStorage)); +} + +static INLINE void SET_BufferStorage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizeiptr, const GLvoid *, GLbitfield)) { + SET_by_offset(disp, _gloffset_BufferStorage, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearTexImage)(GLuint, GLint, GLenum, GLenum, const GLvoid *); +#define CALL_ClearTexImage(disp, parameters) \ + (* GET_ClearTexImage(disp)) parameters +static INLINE _glptr_ClearTexImage GET_ClearTexImage(struct _glapi_table *disp) { + return (_glptr_ClearTexImage) (GET_by_offset(disp, _gloffset_ClearTexImage)); +} + +static INLINE void SET_ClearTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ClearTexImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearTexSubImage)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); +#define CALL_ClearTexSubImage(disp, parameters) \ + (* GET_ClearTexSubImage(disp)) parameters +static INLINE _glptr_ClearTexSubImage GET_ClearTexSubImage(struct _glapi_table *disp) { + return (_glptr_ClearTexSubImage) (GET_by_offset(disp, _gloffset_ClearTexSubImage)); +} + +static INLINE void SET_ClearTexSubImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ClearTexSubImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBuffersBase)(GLenum, GLuint, GLsizei, const GLuint *); +#define CALL_BindBuffersBase(disp, parameters) \ + (* GET_BindBuffersBase(disp)) parameters +static INLINE _glptr_BindBuffersBase GET_BindBuffersBase(struct _glapi_table *disp) { + return (_glptr_BindBuffersBase) (GET_by_offset(disp, _gloffset_BindBuffersBase)); +} + +static INLINE void SET_BindBuffersBase(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_BindBuffersBase, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBuffersRange)(GLenum, GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizeiptr *); +#define CALL_BindBuffersRange(disp, parameters) \ + (* GET_BindBuffersRange(disp)) parameters +static INLINE _glptr_BindBuffersRange GET_BindBuffersRange(struct _glapi_table *disp) { + return (_glptr_BindBuffersRange) (GET_by_offset(disp, _gloffset_BindBuffersRange)); +} + +static INLINE void SET_BindBuffersRange(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizeiptr *)) { + SET_by_offset(disp, _gloffset_BindBuffersRange, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindImageTextures)(GLuint, GLsizei, const GLuint *); +#define CALL_BindImageTextures(disp, parameters) \ + (* GET_BindImageTextures(disp)) parameters +static INLINE _glptr_BindImageTextures GET_BindImageTextures(struct _glapi_table *disp) { + return (_glptr_BindImageTextures) (GET_by_offset(disp, _gloffset_BindImageTextures)); +} + +static INLINE void SET_BindImageTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_BindImageTextures, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindSamplers)(GLuint, GLsizei, const GLuint *); +#define CALL_BindSamplers(disp, parameters) \ + (* GET_BindSamplers(disp)) parameters +static INLINE _glptr_BindSamplers GET_BindSamplers(struct _glapi_table *disp) { + return (_glptr_BindSamplers) (GET_by_offset(disp, _gloffset_BindSamplers)); +} + +static INLINE void SET_BindSamplers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_BindSamplers, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindTextures)(GLuint, GLsizei, const GLuint *); +#define CALL_BindTextures(disp, parameters) \ + (* GET_BindTextures(disp)) parameters +static INLINE _glptr_BindTextures GET_BindTextures(struct _glapi_table *disp) { + return (_glptr_BindTextures) (GET_by_offset(disp, _gloffset_BindTextures)); +} + +static INLINE void SET_BindTextures(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_BindTextures, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindVertexBuffers)(GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizei *); +#define CALL_BindVertexBuffers(disp, parameters) \ + (* GET_BindVertexBuffers(disp)) parameters +static INLINE _glptr_BindVertexBuffers GET_BindVertexBuffers(struct _glapi_table *disp) { + return (_glptr_BindVertexBuffers) (GET_by_offset(disp, _gloffset_BindVertexBuffers)); +} + +static INLINE void SET_BindVertexBuffers(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLuint *, const GLintptr *, const GLsizei *)) { + 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 +static INLINE _glptr_InvalidateBufferData GET_InvalidateBufferData(struct _glapi_table *disp) { + return (_glptr_InvalidateBufferData) (GET_by_offset(disp, _gloffset_InvalidateBufferData)); +} + +static INLINE void SET_InvalidateBufferData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_InvalidateBufferData, fn); +} + +typedef void (GLAPIENTRYP _glptr_InvalidateBufferSubData)(GLuint, GLintptr, GLsizeiptr); +#define CALL_InvalidateBufferSubData(disp, parameters) \ + (* GET_InvalidateBufferSubData(disp)) parameters +static INLINE _glptr_InvalidateBufferSubData GET_InvalidateBufferSubData(struct _glapi_table *disp) { + return (_glptr_InvalidateBufferSubData) (GET_by_offset(disp, _gloffset_InvalidateBufferSubData)); +} + +static INLINE void SET_InvalidateBufferSubData(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_InvalidateBufferSubData, fn); +} + +typedef void (GLAPIENTRYP _glptr_InvalidateFramebuffer)(GLenum, GLsizei, const GLenum *); +#define CALL_InvalidateFramebuffer(disp, parameters) \ + (* GET_InvalidateFramebuffer(disp)) parameters +static INLINE _glptr_InvalidateFramebuffer GET_InvalidateFramebuffer(struct _glapi_table *disp) { + return (_glptr_InvalidateFramebuffer) (GET_by_offset(disp, _gloffset_InvalidateFramebuffer)); +} + +static INLINE void SET_InvalidateFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLenum *)) { + SET_by_offset(disp, _gloffset_InvalidateFramebuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_InvalidateSubFramebuffer)(GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei); +#define CALL_InvalidateSubFramebuffer(disp, parameters) \ + (* GET_InvalidateSubFramebuffer(disp)) parameters +static INLINE _glptr_InvalidateSubFramebuffer GET_InvalidateSubFramebuffer(struct _glapi_table *disp) { + return (_glptr_InvalidateSubFramebuffer) (GET_by_offset(disp, _gloffset_InvalidateSubFramebuffer)); +} + +static INLINE void SET_InvalidateSubFramebuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLenum *, GLint, GLint, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_InvalidateSubFramebuffer, fn); +} + +typedef void (GLAPIENTRYP _glptr_InvalidateTexImage)(GLuint, GLint); +#define CALL_InvalidateTexImage(disp, parameters) \ + (* GET_InvalidateTexImage(disp)) parameters +static INLINE _glptr_InvalidateTexImage GET_InvalidateTexImage(struct _glapi_table *disp) { + return (_glptr_InvalidateTexImage) (GET_by_offset(disp, _gloffset_InvalidateTexImage)); +} + +static INLINE void SET_InvalidateTexImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) { + SET_by_offset(disp, _gloffset_InvalidateTexImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_InvalidateTexSubImage)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei); +#define CALL_InvalidateTexSubImage(disp, parameters) \ + (* GET_InvalidateTexSubImage(disp)) parameters +static INLINE _glptr_InvalidateTexSubImage GET_InvalidateTexSubImage(struct _glapi_table *disp) { + return (_glptr_InvalidateTexSubImage) (GET_by_offset(disp, _gloffset_InvalidateTexSubImage)); +} + +static INLINE void SET_InvalidateTexSubImage(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei)) { + SET_by_offset(disp, _gloffset_InvalidateTexSubImage, fn); +} + +typedef void (GLAPIENTRYP _glptr_PolygonOffsetEXT)(GLfloat, GLfloat); +#define CALL_PolygonOffsetEXT(disp, parameters) \ + (* GET_PolygonOffsetEXT(disp)) parameters +static INLINE _glptr_PolygonOffsetEXT GET_PolygonOffsetEXT(struct _glapi_table *disp) { + return (_glptr_PolygonOffsetEXT) (GET_by_offset(disp, _gloffset_PolygonOffsetEXT)); +} + +static INLINE void SET_PolygonOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_PolygonOffsetEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexfOES)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_DrawTexfOES(disp, parameters) \ + (* GET_DrawTexfOES(disp)) parameters +static INLINE _glptr_DrawTexfOES GET_DrawTexfOES(struct _glapi_table *disp) { + return (_glptr_DrawTexfOES) (GET_by_offset(disp, _gloffset_DrawTexfOES)); +} + +static INLINE void SET_DrawTexfOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_DrawTexfOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexfvOES)(const GLfloat *); +#define CALL_DrawTexfvOES(disp, parameters) \ + (* GET_DrawTexfvOES(disp)) parameters +static INLINE _glptr_DrawTexfvOES GET_DrawTexfvOES(struct _glapi_table *disp) { + return (_glptr_DrawTexfvOES) (GET_by_offset(disp, _gloffset_DrawTexfvOES)); +} + +static INLINE void SET_DrawTexfvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_DrawTexfvOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexiOES)(GLint, GLint, GLint, GLint, GLint); +#define CALL_DrawTexiOES(disp, parameters) \ + (* GET_DrawTexiOES(disp)) parameters +static INLINE _glptr_DrawTexiOES GET_DrawTexiOES(struct _glapi_table *disp) { + return (_glptr_DrawTexiOES) (GET_by_offset(disp, _gloffset_DrawTexiOES)); +} + +static INLINE void SET_DrawTexiOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_DrawTexiOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexivOES)(const GLint *); +#define CALL_DrawTexivOES(disp, parameters) \ + (* GET_DrawTexivOES(disp)) parameters +static INLINE _glptr_DrawTexivOES GET_DrawTexivOES(struct _glapi_table *disp) { + return (_glptr_DrawTexivOES) (GET_by_offset(disp, _gloffset_DrawTexivOES)); +} + +static INLINE void SET_DrawTexivOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_DrawTexivOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexsOES)(GLshort, GLshort, GLshort, GLshort, GLshort); +#define CALL_DrawTexsOES(disp, parameters) \ + (* GET_DrawTexsOES(disp)) parameters +static INLINE _glptr_DrawTexsOES GET_DrawTexsOES(struct _glapi_table *disp) { + return (_glptr_DrawTexsOES) (GET_by_offset(disp, _gloffset_DrawTexsOES)); +} + +static INLINE void SET_DrawTexsOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_DrawTexsOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexsvOES)(const GLshort *); +#define CALL_DrawTexsvOES(disp, parameters) \ + (* GET_DrawTexsvOES(disp)) parameters +static INLINE _glptr_DrawTexsvOES GET_DrawTexsvOES(struct _glapi_table *disp) { + return (_glptr_DrawTexsvOES) (GET_by_offset(disp, _gloffset_DrawTexsvOES)); +} + +static INLINE void SET_DrawTexsvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_DrawTexsvOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexxOES)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_DrawTexxOES(disp, parameters) \ + (* GET_DrawTexxOES(disp)) parameters +static INLINE _glptr_DrawTexxOES GET_DrawTexxOES(struct _glapi_table *disp) { + return (_glptr_DrawTexxOES) (GET_by_offset(disp, _gloffset_DrawTexxOES)); +} + +static INLINE void SET_DrawTexxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_DrawTexxOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DrawTexxvOES)(const GLfixed *); +#define CALL_DrawTexxvOES(disp, parameters) \ + (* GET_DrawTexxvOES(disp)) parameters +static INLINE _glptr_DrawTexxvOES GET_DrawTexxvOES(struct _glapi_table *disp) { + return (_glptr_DrawTexxvOES) (GET_by_offset(disp, _gloffset_DrawTexxvOES)); +} + +static INLINE void SET_DrawTexxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) { + SET_by_offset(disp, _gloffset_DrawTexxvOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointSizePointerOES)(GLenum, GLsizei, const GLvoid *); +#define CALL_PointSizePointerOES(disp, parameters) \ + (* GET_PointSizePointerOES(disp)) parameters +static INLINE _glptr_PointSizePointerOES GET_PointSizePointerOES(struct _glapi_table *disp) { + return (_glptr_PointSizePointerOES) (GET_by_offset(disp, _gloffset_PointSizePointerOES)); +} + +static INLINE void SET_PointSizePointerOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_PointSizePointerOES, fn); +} + +typedef GLbitfield (GLAPIENTRYP _glptr_QueryMatrixxOES)(GLfixed *, GLint *); +#define CALL_QueryMatrixxOES(disp, parameters) \ + (* GET_QueryMatrixxOES(disp)) parameters +static INLINE _glptr_QueryMatrixxOES GET_QueryMatrixxOES(struct _glapi_table *disp) { + return (_glptr_QueryMatrixxOES) (GET_by_offset(disp, _gloffset_QueryMatrixxOES)); +} + +static INLINE void SET_QueryMatrixxOES(struct _glapi_table *disp, GLbitfield (GLAPIENTRYP fn)(GLfixed *, GLint *)) { + SET_by_offset(disp, _gloffset_QueryMatrixxOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_SampleMaskSGIS)(GLclampf, GLboolean); +#define CALL_SampleMaskSGIS(disp, parameters) \ + (* GET_SampleMaskSGIS(disp)) parameters +static INLINE _glptr_SampleMaskSGIS GET_SampleMaskSGIS(struct _glapi_table *disp) { + return (_glptr_SampleMaskSGIS) (GET_by_offset(disp, _gloffset_SampleMaskSGIS)); +} + +static INLINE void SET_SampleMaskSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampf, GLboolean)) { + SET_by_offset(disp, _gloffset_SampleMaskSGIS, fn); +} + +typedef void (GLAPIENTRYP _glptr_SamplePatternSGIS)(GLenum); +#define CALL_SamplePatternSGIS(disp, parameters) \ + (* GET_SamplePatternSGIS(disp)) parameters +static INLINE _glptr_SamplePatternSGIS GET_SamplePatternSGIS(struct _glapi_table *disp) { + return (_glptr_SamplePatternSGIS) (GET_by_offset(disp, _gloffset_SamplePatternSGIS)); +} + +static INLINE void SET_SamplePatternSGIS(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_SamplePatternSGIS, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +#define CALL_ColorPointerEXT(disp, parameters) \ + (* GET_ColorPointerEXT(disp)) parameters +static INLINE _glptr_ColorPointerEXT GET_ColorPointerEXT(struct _glapi_table *disp) { + return (_glptr_ColorPointerEXT) (GET_by_offset(disp, _gloffset_ColorPointerEXT)); +} + +static INLINE void SET_ColorPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_ColorPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_EdgeFlagPointerEXT)(GLsizei, GLsizei, const GLboolean *); +#define CALL_EdgeFlagPointerEXT(disp, parameters) \ + (* GET_EdgeFlagPointerEXT(disp)) parameters +static INLINE _glptr_EdgeFlagPointerEXT GET_EdgeFlagPointerEXT(struct _glapi_table *disp) { + return (_glptr_EdgeFlagPointerEXT) (GET_by_offset(disp, _gloffset_EdgeFlagPointerEXT)); +} + +static INLINE void SET_EdgeFlagPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLsizei, const GLboolean *)) { + SET_by_offset(disp, _gloffset_EdgeFlagPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_IndexPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *); +#define CALL_IndexPointerEXT(disp, parameters) \ + (* GET_IndexPointerEXT(disp)) parameters +static INLINE _glptr_IndexPointerEXT GET_IndexPointerEXT(struct _glapi_table *disp) { + return (_glptr_IndexPointerEXT) (GET_by_offset(disp, _gloffset_IndexPointerEXT)); +} + +static INLINE void SET_IndexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_IndexPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_NormalPointerEXT)(GLenum, GLsizei, GLsizei, const GLvoid *); +#define CALL_NormalPointerEXT(disp, parameters) \ + (* GET_NormalPointerEXT(disp)) parameters +static INLINE _glptr_NormalPointerEXT GET_NormalPointerEXT(struct _glapi_table *disp) { + return (_glptr_NormalPointerEXT) (GET_by_offset(disp, _gloffset_NormalPointerEXT)); +} + +static INLINE void SET_NormalPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_NormalPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexCoordPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +#define CALL_TexCoordPointerEXT(disp, parameters) \ + (* GET_TexCoordPointerEXT(disp)) parameters +static INLINE _glptr_TexCoordPointerEXT GET_TexCoordPointerEXT(struct _glapi_table *disp) { + return (_glptr_TexCoordPointerEXT) (GET_by_offset(disp, _gloffset_TexCoordPointerEXT)); +} + +static INLINE void SET_TexCoordPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_TexCoordPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexPointerEXT)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); +#define CALL_VertexPointerEXT(disp, parameters) \ + (* GET_VertexPointerEXT(disp)) parameters +static INLINE _glptr_VertexPointerEXT GET_VertexPointerEXT(struct _glapi_table *disp) { + return (_glptr_VertexPointerEXT) (GET_by_offset(disp, _gloffset_VertexPointerEXT)); +} + +static INLINE void SET_VertexPointerEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLenum, GLsizei, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VertexPointerEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_DiscardFramebufferEXT)(GLenum, GLsizei, const GLenum *); +#define CALL_DiscardFramebufferEXT(disp, parameters) \ + (* GET_DiscardFramebufferEXT(disp)) parameters +static INLINE _glptr_DiscardFramebufferEXT GET_DiscardFramebufferEXT(struct _glapi_table *disp) { + return (_glptr_DiscardFramebufferEXT) (GET_by_offset(disp, _gloffset_DiscardFramebufferEXT)); +} + +static INLINE void SET_DiscardFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLsizei, const GLenum *)) { + SET_by_offset(disp, _gloffset_DiscardFramebufferEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ActiveShaderProgram)(GLuint, GLuint); +#define CALL_ActiveShaderProgram(disp, parameters) \ + (* GET_ActiveShaderProgram(disp)) parameters +static INLINE _glptr_ActiveShaderProgram GET_ActiveShaderProgram(struct _glapi_table *disp) { + return (_glptr_ActiveShaderProgram) (GET_by_offset(disp, _gloffset_ActiveShaderProgram)); +} + +static INLINE void SET_ActiveShaderProgram(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ActiveShaderProgram, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindProgramPipeline)(GLuint); +#define CALL_BindProgramPipeline(disp, parameters) \ + (* GET_BindProgramPipeline(disp)) parameters +static INLINE _glptr_BindProgramPipeline GET_BindProgramPipeline(struct _glapi_table *disp) { + return (_glptr_BindProgramPipeline) (GET_by_offset(disp, _gloffset_BindProgramPipeline)); +} + +static INLINE void SET_BindProgramPipeline(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BindProgramPipeline, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_CreateShaderProgramv)(GLenum, GLsizei, const GLchar * const *); +#define CALL_CreateShaderProgramv(disp, parameters) \ + (* GET_CreateShaderProgramv(disp)) parameters +static INLINE _glptr_CreateShaderProgramv GET_CreateShaderProgramv(struct _glapi_table *disp) { + return (_glptr_CreateShaderProgramv) (GET_by_offset(disp, _gloffset_CreateShaderProgramv)); +} + +static INLINE void SET_CreateShaderProgramv(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum, GLsizei, const GLchar * const *)) { + SET_by_offset(disp, _gloffset_CreateShaderProgramv, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteProgramPipelines)(GLsizei, const GLuint *); +#define CALL_DeleteProgramPipelines(disp, parameters) \ + (* GET_DeleteProgramPipelines(disp)) parameters +static INLINE _glptr_DeleteProgramPipelines GET_DeleteProgramPipelines(struct _glapi_table *disp) { + return (_glptr_DeleteProgramPipelines) (GET_by_offset(disp, _gloffset_DeleteProgramPipelines)); +} + +static INLINE void SET_DeleteProgramPipelines(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_DeleteProgramPipelines, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenProgramPipelines)(GLsizei, GLuint *); +#define CALL_GenProgramPipelines(disp, parameters) \ + (* GET_GenProgramPipelines(disp)) parameters +static INLINE _glptr_GenProgramPipelines GET_GenProgramPipelines(struct _glapi_table *disp) { + return (_glptr_GenProgramPipelines) (GET_by_offset(disp, _gloffset_GenProgramPipelines)); +} + +static INLINE void SET_GenProgramPipelines(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenProgramPipelines, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramPipelineInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetProgramPipelineInfoLog(disp, parameters) \ + (* GET_GetProgramPipelineInfoLog(disp)) parameters +static INLINE _glptr_GetProgramPipelineInfoLog GET_GetProgramPipelineInfoLog(struct _glapi_table *disp) { + return (_glptr_GetProgramPipelineInfoLog) (GET_by_offset(disp, _gloffset_GetProgramPipelineInfoLog)); +} + +static INLINE void SET_GetProgramPipelineInfoLog(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetProgramPipelineInfoLog, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramPipelineiv)(GLuint, GLenum, GLint *); +#define CALL_GetProgramPipelineiv(disp, parameters) \ + (* GET_GetProgramPipelineiv(disp)) parameters +static INLINE _glptr_GetProgramPipelineiv GET_GetProgramPipelineiv(struct _glapi_table *disp) { + return (_glptr_GetProgramPipelineiv) (GET_by_offset(disp, _gloffset_GetProgramPipelineiv)); +} + +static INLINE void SET_GetProgramPipelineiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetProgramPipelineiv, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_IsProgramPipeline)(GLuint); +#define CALL_IsProgramPipeline(disp, parameters) \ + (* GET_IsProgramPipeline(disp)) parameters +static INLINE _glptr_IsProgramPipeline GET_IsProgramPipeline(struct _glapi_table *disp) { + return (_glptr_IsProgramPipeline) (GET_by_offset(disp, _gloffset_IsProgramPipeline)); +} + +static INLINE void SET_IsProgramPipeline(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_IsProgramPipeline, fn); +} + +typedef void (GLAPIENTRYP _glptr_LockArraysEXT)(GLint, GLsizei); +#define CALL_LockArraysEXT(disp, parameters) \ + (* GET_LockArraysEXT(disp)) parameters +static INLINE _glptr_LockArraysEXT GET_LockArraysEXT(struct _glapi_table *disp) { + return (_glptr_LockArraysEXT) (GET_by_offset(disp, _gloffset_LockArraysEXT)); +} + +static INLINE void SET_LockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLsizei)) { + SET_by_offset(disp, _gloffset_LockArraysEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1f)(GLuint, GLint, GLfloat); +#define CALL_ProgramUniform1f(disp, parameters) \ + (* GET_ProgramUniform1f(disp)) parameters +static INLINE _glptr_ProgramUniform1f GET_ProgramUniform1f(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1f) (GET_by_offset(disp, _gloffset_ProgramUniform1f)); +} + +static INLINE void SET_ProgramUniform1f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramUniform1f, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1fv)(GLuint, GLint, GLsizei, const GLfloat *); +#define CALL_ProgramUniform1fv(disp, parameters) \ + (* GET_ProgramUniform1fv(disp)) parameters +static INLINE _glptr_ProgramUniform1fv GET_ProgramUniform1fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1fv) (GET_by_offset(disp, _gloffset_ProgramUniform1fv)); +} + +static INLINE void SET_ProgramUniform1fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniform1fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1i)(GLuint, GLint, GLint); +#define CALL_ProgramUniform1i(disp, parameters) \ + (* GET_ProgramUniform1i(disp)) parameters +static INLINE _glptr_ProgramUniform1i GET_ProgramUniform1i(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1i) (GET_by_offset(disp, _gloffset_ProgramUniform1i)); +} + +static INLINE void SET_ProgramUniform1i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_ProgramUniform1i, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1iv)(GLuint, GLint, GLsizei, const GLint *); +#define CALL_ProgramUniform1iv(disp, parameters) \ + (* GET_ProgramUniform1iv(disp)) parameters +static INLINE _glptr_ProgramUniform1iv GET_ProgramUniform1iv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1iv) (GET_by_offset(disp, _gloffset_ProgramUniform1iv)); +} + +static INLINE void SET_ProgramUniform1iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform1iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1ui)(GLuint, GLint, GLuint); +#define CALL_ProgramUniform1ui(disp, parameters) \ + (* GET_ProgramUniform1ui(disp)) parameters +static INLINE _glptr_ProgramUniform1ui GET_ProgramUniform1ui(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1ui) (GET_by_offset(disp, _gloffset_ProgramUniform1ui)); +} + +static INLINE void SET_ProgramUniform1ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint)) { + SET_by_offset(disp, _gloffset_ProgramUniform1ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform1uiv)(GLuint, GLint, GLsizei, const GLuint *); +#define CALL_ProgramUniform1uiv(disp, parameters) \ + (* GET_ProgramUniform1uiv(disp)) parameters +static INLINE _glptr_ProgramUniform1uiv GET_ProgramUniform1uiv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform1uiv) (GET_by_offset(disp, _gloffset_ProgramUniform1uiv)); +} + +static INLINE void SET_ProgramUniform1uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform1uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2f)(GLuint, GLint, GLfloat, GLfloat); +#define CALL_ProgramUniform2f(disp, parameters) \ + (* GET_ProgramUniform2f(disp)) parameters +static INLINE _glptr_ProgramUniform2f GET_ProgramUniform2f(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2f) (GET_by_offset(disp, _gloffset_ProgramUniform2f)); +} + +static INLINE void SET_ProgramUniform2f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramUniform2f, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2fv)(GLuint, GLint, GLsizei, const GLfloat *); +#define CALL_ProgramUniform2fv(disp, parameters) \ + (* GET_ProgramUniform2fv(disp)) parameters +static INLINE _glptr_ProgramUniform2fv GET_ProgramUniform2fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2fv) (GET_by_offset(disp, _gloffset_ProgramUniform2fv)); +} + +static INLINE void SET_ProgramUniform2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniform2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2i)(GLuint, GLint, GLint, GLint); +#define CALL_ProgramUniform2i(disp, parameters) \ + (* GET_ProgramUniform2i(disp)) parameters +static INLINE _glptr_ProgramUniform2i GET_ProgramUniform2i(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2i) (GET_by_offset(disp, _gloffset_ProgramUniform2i)); +} + +static INLINE void SET_ProgramUniform2i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_ProgramUniform2i, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2iv)(GLuint, GLint, GLsizei, const GLint *); +#define CALL_ProgramUniform2iv(disp, parameters) \ + (* GET_ProgramUniform2iv(disp)) parameters +static INLINE _glptr_ProgramUniform2iv GET_ProgramUniform2iv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2iv) (GET_by_offset(disp, _gloffset_ProgramUniform2iv)); +} + +static INLINE void SET_ProgramUniform2iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform2iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2ui)(GLuint, GLint, GLuint, GLuint); +#define CALL_ProgramUniform2ui(disp, parameters) \ + (* GET_ProgramUniform2ui(disp)) parameters +static INLINE _glptr_ProgramUniform2ui GET_ProgramUniform2ui(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2ui) (GET_by_offset(disp, _gloffset_ProgramUniform2ui)); +} + +static INLINE void SET_ProgramUniform2ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ProgramUniform2ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform2uiv)(GLuint, GLint, GLsizei, const GLuint *); +#define CALL_ProgramUniform2uiv(disp, parameters) \ + (* GET_ProgramUniform2uiv(disp)) parameters +static INLINE _glptr_ProgramUniform2uiv GET_ProgramUniform2uiv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform2uiv) (GET_by_offset(disp, _gloffset_ProgramUniform2uiv)); +} + +static INLINE void SET_ProgramUniform2uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform2uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3f)(GLuint, GLint, GLfloat, GLfloat, GLfloat); +#define CALL_ProgramUniform3f(disp, parameters) \ + (* GET_ProgramUniform3f(disp)) parameters +static INLINE _glptr_ProgramUniform3f GET_ProgramUniform3f(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3f) (GET_by_offset(disp, _gloffset_ProgramUniform3f)); +} + +static INLINE void SET_ProgramUniform3f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramUniform3f, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3fv)(GLuint, GLint, GLsizei, const GLfloat *); +#define CALL_ProgramUniform3fv(disp, parameters) \ + (* GET_ProgramUniform3fv(disp)) parameters +static INLINE _glptr_ProgramUniform3fv GET_ProgramUniform3fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3fv) (GET_by_offset(disp, _gloffset_ProgramUniform3fv)); +} + +static INLINE void SET_ProgramUniform3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniform3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3i)(GLuint, GLint, GLint, GLint, GLint); +#define CALL_ProgramUniform3i(disp, parameters) \ + (* GET_ProgramUniform3i(disp)) parameters +static INLINE _glptr_ProgramUniform3i GET_ProgramUniform3i(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3i) (GET_by_offset(disp, _gloffset_ProgramUniform3i)); +} + +static INLINE void SET_ProgramUniform3i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_ProgramUniform3i, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3iv)(GLuint, GLint, GLsizei, const GLint *); +#define CALL_ProgramUniform3iv(disp, parameters) \ + (* GET_ProgramUniform3iv(disp)) parameters +static INLINE _glptr_ProgramUniform3iv GET_ProgramUniform3iv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3iv) (GET_by_offset(disp, _gloffset_ProgramUniform3iv)); +} + +static INLINE void SET_ProgramUniform3iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform3iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3ui)(GLuint, GLint, GLuint, GLuint, GLuint); +#define CALL_ProgramUniform3ui(disp, parameters) \ + (* GET_ProgramUniform3ui(disp)) parameters +static INLINE _glptr_ProgramUniform3ui GET_ProgramUniform3ui(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3ui) (GET_by_offset(disp, _gloffset_ProgramUniform3ui)); +} + +static INLINE void SET_ProgramUniform3ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ProgramUniform3ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform3uiv)(GLuint, GLint, GLsizei, const GLuint *); +#define CALL_ProgramUniform3uiv(disp, parameters) \ + (* GET_ProgramUniform3uiv(disp)) parameters +static INLINE _glptr_ProgramUniform3uiv GET_ProgramUniform3uiv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform3uiv) (GET_by_offset(disp, _gloffset_ProgramUniform3uiv)); +} + +static INLINE void SET_ProgramUniform3uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform3uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4f)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ProgramUniform4f(disp, parameters) \ + (* GET_ProgramUniform4f(disp)) parameters +static INLINE _glptr_ProgramUniform4f GET_ProgramUniform4f(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4f) (GET_by_offset(disp, _gloffset_ProgramUniform4f)); +} + +static INLINE void SET_ProgramUniform4f(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramUniform4f, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4fv)(GLuint, GLint, GLsizei, const GLfloat *); +#define CALL_ProgramUniform4fv(disp, parameters) \ + (* GET_ProgramUniform4fv(disp)) parameters +static INLINE _glptr_ProgramUniform4fv GET_ProgramUniform4fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4fv) (GET_by_offset(disp, _gloffset_ProgramUniform4fv)); +} + +static INLINE void SET_ProgramUniform4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniform4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4i)(GLuint, GLint, GLint, GLint, GLint, GLint); +#define CALL_ProgramUniform4i(disp, parameters) \ + (* GET_ProgramUniform4i(disp)) parameters +static INLINE _glptr_ProgramUniform4i GET_ProgramUniform4i(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4i) (GET_by_offset(disp, _gloffset_ProgramUniform4i)); +} + +static INLINE void SET_ProgramUniform4i(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_ProgramUniform4i, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4iv)(GLuint, GLint, GLsizei, const GLint *); +#define CALL_ProgramUniform4iv(disp, parameters) \ + (* GET_ProgramUniform4iv(disp)) parameters +static INLINE _glptr_ProgramUniform4iv GET_ProgramUniform4iv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4iv) (GET_by_offset(disp, _gloffset_ProgramUniform4iv)); +} + +static INLINE void SET_ProgramUniform4iv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform4iv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4ui)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint); +#define CALL_ProgramUniform4ui(disp, parameters) \ + (* GET_ProgramUniform4ui(disp)) parameters +static INLINE _glptr_ProgramUniform4ui GET_ProgramUniform4ui(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4ui) (GET_by_offset(disp, _gloffset_ProgramUniform4ui)); +} + +static INLINE void SET_ProgramUniform4ui(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ProgramUniform4ui, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniform4uiv)(GLuint, GLint, GLsizei, const GLuint *); +#define CALL_ProgramUniform4uiv(disp, parameters) \ + (* GET_ProgramUniform4uiv(disp)) parameters +static INLINE _glptr_ProgramUniform4uiv GET_ProgramUniform4uiv(struct _glapi_table *disp) { + return (_glptr_ProgramUniform4uiv) (GET_by_offset(disp, _gloffset_ProgramUniform4uiv)); +} + +static INLINE void SET_ProgramUniform4uiv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_ProgramUniform4uiv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix2fv(disp, parameters) \ + (* GET_ProgramUniformMatrix2fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix2fv GET_ProgramUniformMatrix2fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix2fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2fv)); +} + +static INLINE void SET_ProgramUniformMatrix2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix2x3fv(disp, parameters) \ + (* GET_ProgramUniformMatrix2x3fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix2x3fv GET_ProgramUniformMatrix2x3fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix2x3fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2x3fv)); +} + +static INLINE void SET_ProgramUniformMatrix2x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix2x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix2x4fv(disp, parameters) \ + (* GET_ProgramUniformMatrix2x4fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix2x4fv GET_ProgramUniformMatrix2x4fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix2x4fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix2x4fv)); +} + +static INLINE void SET_ProgramUniformMatrix2x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix2x4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix3fv(disp, parameters) \ + (* GET_ProgramUniformMatrix3fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix3fv GET_ProgramUniformMatrix3fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix3fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3fv)); +} + +static INLINE void SET_ProgramUniformMatrix3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix3x2fv(disp, parameters) \ + (* GET_ProgramUniformMatrix3x2fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix3x2fv GET_ProgramUniformMatrix3x2fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix3x2fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3x2fv)); +} + +static INLINE void SET_ProgramUniformMatrix3x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix3x4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix3x4fv(disp, parameters) \ + (* GET_ProgramUniformMatrix3x4fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix3x4fv GET_ProgramUniformMatrix3x4fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix3x4fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix3x4fv)); +} + +static INLINE void SET_ProgramUniformMatrix3x4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix3x4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix4fv(disp, parameters) \ + (* GET_ProgramUniformMatrix4fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix4fv GET_ProgramUniformMatrix4fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix4fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4fv)); +} + +static INLINE void SET_ProgramUniformMatrix4fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix4fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x2fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix4x2fv(disp, parameters) \ + (* GET_ProgramUniformMatrix4x2fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix4x2fv GET_ProgramUniformMatrix4x2fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix4x2fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4x2fv)); +} + +static INLINE void SET_ProgramUniformMatrix4x2fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix4x2fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramUniformMatrix4x3fv)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *); +#define CALL_ProgramUniformMatrix4x3fv(disp, parameters) \ + (* GET_ProgramUniformMatrix4x3fv(disp)) parameters +static INLINE _glptr_ProgramUniformMatrix4x3fv GET_ProgramUniformMatrix4x3fv(struct _glapi_table *disp) { + return (_glptr_ProgramUniformMatrix4x3fv) (GET_by_offset(disp, _gloffset_ProgramUniformMatrix4x3fv)); +} + +static INLINE void SET_ProgramUniformMatrix4x3fv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLsizei, GLboolean, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramUniformMatrix4x3fv, fn); +} + +typedef void (GLAPIENTRYP _glptr_UnlockArraysEXT)(void); +#define CALL_UnlockArraysEXT(disp, parameters) \ + (* GET_UnlockArraysEXT(disp)) parameters +static INLINE _glptr_UnlockArraysEXT GET_UnlockArraysEXT(struct _glapi_table *disp) { + return (_glptr_UnlockArraysEXT) (GET_by_offset(disp, _gloffset_UnlockArraysEXT)); +} + +static INLINE void SET_UnlockArraysEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_UnlockArraysEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_UseProgramStages)(GLuint, GLbitfield, GLuint); +#define CALL_UseProgramStages(disp, parameters) \ + (* GET_UseProgramStages(disp)) parameters +static INLINE _glptr_UseProgramStages GET_UseProgramStages(struct _glapi_table *disp) { + return (_glptr_UseProgramStages) (GET_by_offset(disp, _gloffset_UseProgramStages)); +} + +static INLINE void SET_UseProgramStages(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLbitfield, GLuint)) { + SET_by_offset(disp, _gloffset_UseProgramStages, fn); +} + +typedef void (GLAPIENTRYP _glptr_ValidateProgramPipeline)(GLuint); +#define CALL_ValidateProgramPipeline(disp, parameters) \ + (* GET_ValidateProgramPipeline(disp)) parameters +static INLINE _glptr_ValidateProgramPipeline GET_ValidateProgramPipeline(struct _glapi_table *disp) { + return (_glptr_ValidateProgramPipeline) (GET_by_offset(disp, _gloffset_ValidateProgramPipeline)); +} + +static INLINE void SET_ValidateProgramPipeline(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_ValidateProgramPipeline, fn); +} + +typedef void (GLAPIENTRYP _glptr_DebugMessageCallback)(GLDEBUGPROC, const GLvoid *); +#define CALL_DebugMessageCallback(disp, parameters) \ + (* GET_DebugMessageCallback(disp)) parameters +static INLINE _glptr_DebugMessageCallback GET_DebugMessageCallback(struct _glapi_table *disp) { + return (_glptr_DebugMessageCallback) (GET_by_offset(disp, _gloffset_DebugMessageCallback)); +} + +static INLINE void SET_DebugMessageCallback(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROC, const GLvoid *)) { + SET_by_offset(disp, _gloffset_DebugMessageCallback, fn); +} + +typedef void (GLAPIENTRYP _glptr_DebugMessageControl)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean); +#define CALL_DebugMessageControl(disp, parameters) \ + (* GET_DebugMessageControl(disp)) parameters +static INLINE _glptr_DebugMessageControl GET_DebugMessageControl(struct _glapi_table *disp) { + return (_glptr_DebugMessageControl) (GET_by_offset(disp, _gloffset_DebugMessageControl)); +} + +static INLINE void SET_DebugMessageControl(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)) { + SET_by_offset(disp, _gloffset_DebugMessageControl, fn); +} + +typedef void (GLAPIENTRYP _glptr_DebugMessageInsert)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *); +#define CALL_DebugMessageInsert(disp, parameters) \ + (* GET_DebugMessageInsert(disp)) parameters +static INLINE _glptr_DebugMessageInsert GET_DebugMessageInsert(struct _glapi_table *disp) { + return (_glptr_DebugMessageInsert) (GET_by_offset(disp, _gloffset_DebugMessageInsert)); +} + +static INLINE void SET_DebugMessageInsert(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar *)) { + SET_by_offset(disp, _gloffset_DebugMessageInsert, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_GetDebugMessageLog)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *); +#define CALL_GetDebugMessageLog(disp, parameters) \ + (* GET_GetDebugMessageLog(disp)) parameters +static INLINE _glptr_GetDebugMessageLog GET_GetDebugMessageLog(struct _glapi_table *disp) { + return (_glptr_GetDebugMessageLog) (GET_by_offset(disp, _gloffset_GetDebugMessageLog)); +} + +static INLINE void SET_GetDebugMessageLog(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetDebugMessageLog, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetObjectLabel)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetObjectLabel(disp, parameters) \ + (* GET_GetObjectLabel(disp)) parameters +static INLINE _glptr_GetObjectLabel GET_GetObjectLabel(struct _glapi_table *disp) { + return (_glptr_GetObjectLabel) (GET_by_offset(disp, _gloffset_GetObjectLabel)); +} + +static INLINE void SET_GetObjectLabel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetObjectLabel, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetObjectPtrLabel)(const GLvoid *, GLsizei, GLsizei *, GLchar *); +#define CALL_GetObjectPtrLabel(disp, parameters) \ + (* GET_GetObjectPtrLabel(disp)) parameters +static INLINE _glptr_GetObjectPtrLabel GET_GetObjectPtrLabel(struct _glapi_table *disp) { + return (_glptr_GetObjectPtrLabel) (GET_by_offset(disp, _gloffset_GetObjectPtrLabel)); +} + +static INLINE void SET_GetObjectPtrLabel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLvoid *, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetObjectPtrLabel, fn); +} + +typedef void (GLAPIENTRYP _glptr_ObjectLabel)(GLenum, GLuint, GLsizei, const GLchar *); +#define CALL_ObjectLabel(disp, parameters) \ + (* GET_ObjectLabel(disp)) parameters +static INLINE _glptr_ObjectLabel GET_ObjectLabel(struct _glapi_table *disp) { + return (_glptr_ObjectLabel) (GET_by_offset(disp, _gloffset_ObjectLabel)); +} + +static INLINE void SET_ObjectLabel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLchar *)) { + SET_by_offset(disp, _gloffset_ObjectLabel, fn); +} + +typedef void (GLAPIENTRYP _glptr_ObjectPtrLabel)(const GLvoid *, GLsizei, const GLchar *); +#define CALL_ObjectPtrLabel(disp, parameters) \ + (* GET_ObjectPtrLabel(disp)) parameters +static INLINE _glptr_ObjectPtrLabel GET_ObjectPtrLabel(struct _glapi_table *disp) { + return (_glptr_ObjectPtrLabel) (GET_by_offset(disp, _gloffset_ObjectPtrLabel)); +} + +static INLINE void SET_ObjectPtrLabel(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLvoid *, GLsizei, const GLchar *)) { + SET_by_offset(disp, _gloffset_ObjectPtrLabel, fn); +} + +typedef void (GLAPIENTRYP _glptr_PopDebugGroup)(void); +#define CALL_PopDebugGroup(disp, parameters) \ + (* GET_PopDebugGroup(disp)) parameters +static INLINE _glptr_PopDebugGroup GET_PopDebugGroup(struct _glapi_table *disp) { + return (_glptr_PopDebugGroup) (GET_by_offset(disp, _gloffset_PopDebugGroup)); +} + +static INLINE void SET_PopDebugGroup(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PopDebugGroup, fn); +} + +typedef void (GLAPIENTRYP _glptr_PushDebugGroup)(GLenum, GLuint, GLsizei, const GLchar *); +#define CALL_PushDebugGroup(disp, parameters) \ + (* GET_PushDebugGroup(disp)) parameters +static INLINE _glptr_PushDebugGroup GET_PushDebugGroup(struct _glapi_table *disp) { + return (_glptr_PushDebugGroup) (GET_by_offset(disp, _gloffset_PushDebugGroup)); +} + +static INLINE void SET_PushDebugGroup(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLchar *)) { + SET_by_offset(disp, _gloffset_PushDebugGroup, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3fEXT)(GLfloat, GLfloat, GLfloat); +#define CALL_SecondaryColor3fEXT(disp, parameters) \ + (* GET_SecondaryColor3fEXT(disp)) parameters +static INLINE _glptr_SecondaryColor3fEXT GET_SecondaryColor3fEXT(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3fEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fEXT)); +} + +static INLINE void SET_SecondaryColor3fEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_SecondaryColor3fEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_SecondaryColor3fvEXT)(const GLfloat *); +#define CALL_SecondaryColor3fvEXT(disp, parameters) \ + (* GET_SecondaryColor3fvEXT(disp)) parameters +static INLINE _glptr_SecondaryColor3fvEXT GET_SecondaryColor3fvEXT(struct _glapi_table *disp) { + return (_glptr_SecondaryColor3fvEXT) (GET_by_offset(disp, _gloffset_SecondaryColor3fvEXT)); +} + +static INLINE void SET_SecondaryColor3fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_SecondaryColor3fvEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiDrawElementsEXT)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei); +#define CALL_MultiDrawElementsEXT(disp, parameters) \ + (* GET_MultiDrawElementsEXT(disp)) parameters +static INLINE _glptr_MultiDrawElementsEXT GET_MultiDrawElementsEXT(struct _glapi_table *disp) { + return (_glptr_MultiDrawElementsEXT) (GET_by_offset(disp, _gloffset_MultiDrawElementsEXT)); +} + +static INLINE void SET_MultiDrawElementsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLsizei *, GLenum, const GLvoid * const *, GLsizei)) { + SET_by_offset(disp, _gloffset_MultiDrawElementsEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_FogCoordfEXT)(GLfloat); +#define CALL_FogCoordfEXT(disp, parameters) \ + (* GET_FogCoordfEXT(disp)) parameters +static INLINE _glptr_FogCoordfEXT GET_FogCoordfEXT(struct _glapi_table *disp) { + return (_glptr_FogCoordfEXT) (GET_by_offset(disp, _gloffset_FogCoordfEXT)); +} + +static INLINE void SET_FogCoordfEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat)) { + SET_by_offset(disp, _gloffset_FogCoordfEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_FogCoordfvEXT)(const GLfloat *); +#define CALL_FogCoordfvEXT(disp, parameters) \ + (* GET_FogCoordfvEXT(disp)) parameters +static INLINE _glptr_FogCoordfvEXT GET_FogCoordfvEXT(struct _glapi_table *disp) { + return (_glptr_FogCoordfvEXT) (GET_by_offset(disp, _gloffset_FogCoordfvEXT)); +} + +static INLINE void SET_FogCoordfvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_FogCoordfvEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ResizeBuffersMESA)(void); +#define CALL_ResizeBuffersMESA(disp, parameters) \ + (* GET_ResizeBuffersMESA(disp)) parameters +static INLINE _glptr_ResizeBuffersMESA GET_ResizeBuffersMESA(struct _glapi_table *disp) { + return (_glptr_ResizeBuffersMESA) (GET_by_offset(disp, _gloffset_ResizeBuffersMESA)); +} + +static INLINE void SET_ResizeBuffersMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_ResizeBuffersMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4dMESA)(GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_WindowPos4dMESA(disp, parameters) \ + (* GET_WindowPos4dMESA(disp)) parameters +static INLINE _glptr_WindowPos4dMESA GET_WindowPos4dMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4dMESA) (GET_by_offset(disp, _gloffset_WindowPos4dMESA)); +} + +static INLINE void SET_WindowPos4dMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_WindowPos4dMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4dvMESA)(const GLdouble *); +#define CALL_WindowPos4dvMESA(disp, parameters) \ + (* GET_WindowPos4dvMESA(disp)) parameters +static INLINE _glptr_WindowPos4dvMESA GET_WindowPos4dvMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4dvMESA) (GET_by_offset(disp, _gloffset_WindowPos4dvMESA)); +} + +static INLINE void SET_WindowPos4dvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLdouble *)) { + SET_by_offset(disp, _gloffset_WindowPos4dvMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4fMESA)(GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_WindowPos4fMESA(disp, parameters) \ + (* GET_WindowPos4fMESA(disp)) parameters +static INLINE _glptr_WindowPos4fMESA GET_WindowPos4fMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4fMESA) (GET_by_offset(disp, _gloffset_WindowPos4fMESA)); +} + +static INLINE void SET_WindowPos4fMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_WindowPos4fMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4fvMESA)(const GLfloat *); +#define CALL_WindowPos4fvMESA(disp, parameters) \ + (* GET_WindowPos4fvMESA(disp)) parameters +static INLINE _glptr_WindowPos4fvMESA GET_WindowPos4fvMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4fvMESA) (GET_by_offset(disp, _gloffset_WindowPos4fvMESA)); +} + +static INLINE void SET_WindowPos4fvMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfloat *)) { + SET_by_offset(disp, _gloffset_WindowPos4fvMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4iMESA)(GLint, GLint, GLint, GLint); +#define CALL_WindowPos4iMESA(disp, parameters) \ + (* GET_WindowPos4iMESA(disp)) parameters +static INLINE _glptr_WindowPos4iMESA GET_WindowPos4iMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4iMESA) (GET_by_offset(disp, _gloffset_WindowPos4iMESA)); +} + +static INLINE void SET_WindowPos4iMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_WindowPos4iMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4ivMESA)(const GLint *); +#define CALL_WindowPos4ivMESA(disp, parameters) \ + (* GET_WindowPos4ivMESA(disp)) parameters +static INLINE _glptr_WindowPos4ivMESA GET_WindowPos4ivMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4ivMESA) (GET_by_offset(disp, _gloffset_WindowPos4ivMESA)); +} + +static INLINE void SET_WindowPos4ivMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLint *)) { + SET_by_offset(disp, _gloffset_WindowPos4ivMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4sMESA)(GLshort, GLshort, GLshort, GLshort); +#define CALL_WindowPos4sMESA(disp, parameters) \ + (* GET_WindowPos4sMESA(disp)) parameters +static INLINE _glptr_WindowPos4sMESA GET_WindowPos4sMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4sMESA) (GET_by_offset(disp, _gloffset_WindowPos4sMESA)); +} + +static INLINE void SET_WindowPos4sMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_WindowPos4sMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_WindowPos4svMESA)(const GLshort *); +#define CALL_WindowPos4svMESA(disp, parameters) \ + (* GET_WindowPos4svMESA(disp)) parameters +static INLINE _glptr_WindowPos4svMESA GET_WindowPos4svMESA(struct _glapi_table *disp) { + return (_glptr_WindowPos4svMESA) (GET_by_offset(disp, _gloffset_WindowPos4svMESA)); +} + +static INLINE void SET_WindowPos4svMESA(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLshort *)) { + SET_by_offset(disp, _gloffset_WindowPos4svMESA, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiModeDrawArraysIBM)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint); +#define CALL_MultiModeDrawArraysIBM(disp, parameters) \ + (* GET_MultiModeDrawArraysIBM(disp)) parameters +static INLINE _glptr_MultiModeDrawArraysIBM GET_MultiModeDrawArraysIBM(struct _glapi_table *disp) { + return (_glptr_MultiModeDrawArraysIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM)); +} + +static INLINE void SET_MultiModeDrawArraysIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint)) { + SET_by_offset(disp, _gloffset_MultiModeDrawArraysIBM, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiModeDrawElementsIBM)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint); +#define CALL_MultiModeDrawElementsIBM(disp, parameters) \ + (* GET_MultiModeDrawElementsIBM(disp)) parameters +static INLINE _glptr_MultiModeDrawElementsIBM GET_MultiModeDrawElementsIBM(struct _glapi_table *disp) { + return (_glptr_MultiModeDrawElementsIBM) (GET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM)); +} + +static INLINE void SET_MultiModeDrawElementsIBM(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLenum *, const GLsizei *, GLenum, const GLvoid * const *, GLsizei, GLint)) { + SET_by_offset(disp, _gloffset_MultiModeDrawElementsIBM, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_AreProgramsResidentNV)(GLsizei, const GLuint *, GLboolean *); +#define CALL_AreProgramsResidentNV(disp, parameters) \ + (* GET_AreProgramsResidentNV(disp)) parameters +static INLINE _glptr_AreProgramsResidentNV GET_AreProgramsResidentNV(struct _glapi_table *disp) { + return (_glptr_AreProgramsResidentNV) (GET_by_offset(disp, _gloffset_AreProgramsResidentNV)); +} + +static INLINE void SET_AreProgramsResidentNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLsizei, const GLuint *, GLboolean *)) { + SET_by_offset(disp, _gloffset_AreProgramsResidentNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ExecuteProgramNV)(GLenum, GLuint, const GLfloat *); +#define CALL_ExecuteProgramNV(disp, parameters) \ + (* GET_ExecuteProgramNV(disp)) parameters +static INLINE _glptr_ExecuteProgramNV GET_ExecuteProgramNV(struct _glapi_table *disp) { + return (_glptr_ExecuteProgramNV) (GET_by_offset(disp, _gloffset_ExecuteProgramNV)); +} + +static INLINE void SET_ExecuteProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ExecuteProgramNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramParameterdvNV)(GLenum, GLuint, GLenum, GLdouble *); +#define CALL_GetProgramParameterdvNV(disp, parameters) \ + (* GET_GetProgramParameterdvNV(disp)) parameters +static INLINE _glptr_GetProgramParameterdvNV GET_GetProgramParameterdvNV(struct _glapi_table *disp) { + return (_glptr_GetProgramParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterdvNV)); +} + +static INLINE void SET_GetProgramParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetProgramParameterdvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramParameterfvNV)(GLenum, GLuint, GLenum, GLfloat *); +#define CALL_GetProgramParameterfvNV(disp, parameters) \ + (* GET_GetProgramParameterfvNV(disp)) parameters +static INLINE _glptr_GetProgramParameterfvNV GET_GetProgramParameterfvNV(struct _glapi_table *disp) { + return (_glptr_GetProgramParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramParameterfvNV)); +} + +static INLINE void SET_GetProgramParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetProgramParameterfvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramStringNV)(GLuint, GLenum, GLubyte *); +#define CALL_GetProgramStringNV(disp, parameters) \ + (* GET_GetProgramStringNV(disp)) parameters +static INLINE _glptr_GetProgramStringNV GET_GetProgramStringNV(struct _glapi_table *disp) { + return (_glptr_GetProgramStringNV) (GET_by_offset(disp, _gloffset_GetProgramStringNV)); +} + +static INLINE void SET_GetProgramStringNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLubyte *)) { + SET_by_offset(disp, _gloffset_GetProgramStringNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramivNV)(GLuint, GLenum, GLint *); +#define CALL_GetProgramivNV(disp, parameters) \ + (* GET_GetProgramivNV(disp)) parameters +static INLINE _glptr_GetProgramivNV GET_GetProgramivNV(struct _glapi_table *disp) { + return (_glptr_GetProgramivNV) (GET_by_offset(disp, _gloffset_GetProgramivNV)); +} + +static INLINE void SET_GetProgramivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetProgramivNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTrackMatrixivNV)(GLenum, GLuint, GLenum, GLint *); +#define CALL_GetTrackMatrixivNV(disp, parameters) \ + (* GET_GetTrackMatrixivNV(disp)) parameters +static INLINE _glptr_GetTrackMatrixivNV GET_GetTrackMatrixivNV(struct _glapi_table *disp) { + return (_glptr_GetTrackMatrixivNV) (GET_by_offset(disp, _gloffset_GetTrackMatrixivNV)); +} + +static INLINE void SET_GetTrackMatrixivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTrackMatrixivNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribdvNV)(GLuint, GLenum, GLdouble *); +#define CALL_GetVertexAttribdvNV(disp, parameters) \ + (* GET_GetVertexAttribdvNV(disp)) parameters +static INLINE _glptr_GetVertexAttribdvNV GET_GetVertexAttribdvNV(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribdvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribdvNV)); +} + +static INLINE void SET_GetVertexAttribdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribdvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribfvNV)(GLuint, GLenum, GLfloat *); +#define CALL_GetVertexAttribfvNV(disp, parameters) \ + (* GET_GetVertexAttribfvNV(disp)) parameters +static INLINE _glptr_GetVertexAttribfvNV GET_GetVertexAttribfvNV(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribfvNV) (GET_by_offset(disp, _gloffset_GetVertexAttribfvNV)); +} + +static INLINE void SET_GetVertexAttribfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribfvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetVertexAttribivNV)(GLuint, GLenum, GLint *); +#define CALL_GetVertexAttribivNV(disp, parameters) \ + (* GET_GetVertexAttribivNV(disp)) parameters +static INLINE _glptr_GetVertexAttribivNV GET_GetVertexAttribivNV(struct _glapi_table *disp) { + return (_glptr_GetVertexAttribivNV) (GET_by_offset(disp, _gloffset_GetVertexAttribivNV)); +} + +static INLINE void SET_GetVertexAttribivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetVertexAttribivNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadProgramNV)(GLenum, GLuint, GLsizei, const GLubyte *); +#define CALL_LoadProgramNV(disp, parameters) \ + (* GET_LoadProgramNV(disp)) parameters +static INLINE _glptr_LoadProgramNV GET_LoadProgramNV(struct _glapi_table *disp) { + return (_glptr_LoadProgramNV) (GET_by_offset(disp, _gloffset_LoadProgramNV)); +} + +static INLINE void SET_LoadProgramNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLubyte *)) { + SET_by_offset(disp, _gloffset_LoadProgramNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramParameters4dvNV)(GLenum, GLuint, GLsizei, const GLdouble *); +#define CALL_ProgramParameters4dvNV(disp, parameters) \ + (* GET_ProgramParameters4dvNV(disp)) parameters +static INLINE _glptr_ProgramParameters4dvNV GET_ProgramParameters4dvNV(struct _glapi_table *disp) { + return (_glptr_ProgramParameters4dvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4dvNV)); +} + +static INLINE void SET_ProgramParameters4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLdouble *)) { + SET_by_offset(disp, _gloffset_ProgramParameters4dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramParameters4fvNV)(GLenum, GLuint, GLsizei, const GLfloat *); +#define CALL_ProgramParameters4fvNV(disp, parameters) \ + (* GET_ProgramParameters4fvNV(disp)) parameters +static INLINE _glptr_ProgramParameters4fvNV GET_ProgramParameters4fvNV(struct _glapi_table *disp) { + return (_glptr_ProgramParameters4fvNV) (GET_by_offset(disp, _gloffset_ProgramParameters4fvNV)); +} + +static INLINE void SET_ProgramParameters4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramParameters4fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_RequestResidentProgramsNV)(GLsizei, const GLuint *); +#define CALL_RequestResidentProgramsNV(disp, parameters) \ + (* GET_RequestResidentProgramsNV(disp)) parameters +static INLINE _glptr_RequestResidentProgramsNV GET_RequestResidentProgramsNV(struct _glapi_table *disp) { + return (_glptr_RequestResidentProgramsNV) (GET_by_offset(disp, _gloffset_RequestResidentProgramsNV)); +} + +static INLINE void SET_RequestResidentProgramsNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_RequestResidentProgramsNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_TrackMatrixNV)(GLenum, GLuint, GLenum, GLenum); +#define CALL_TrackMatrixNV(disp, parameters) \ + (* GET_TrackMatrixNV(disp)) parameters +static INLINE _glptr_TrackMatrixNV GET_TrackMatrixNV(struct _glapi_table *disp) { + return (_glptr_TrackMatrixNV) (GET_by_offset(disp, _gloffset_TrackMatrixNV)); +} + +static INLINE void SET_TrackMatrixNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLenum)) { + SET_by_offset(disp, _gloffset_TrackMatrixNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1dNV)(GLuint, GLdouble); +#define CALL_VertexAttrib1dNV(disp, parameters) \ + (* GET_VertexAttrib1dNV(disp)) parameters +static INLINE _glptr_VertexAttrib1dNV GET_VertexAttrib1dNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1dNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dNV)); +} + +static INLINE void SET_VertexAttrib1dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib1dNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1dvNV)(GLuint, const GLdouble *); +#define CALL_VertexAttrib1dvNV(disp, parameters) \ + (* GET_VertexAttrib1dvNV(disp)) parameters +static INLINE _glptr_VertexAttrib1dvNV GET_VertexAttrib1dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1dvNV)); +} + +static INLINE void SET_VertexAttrib1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1fNV)(GLuint, GLfloat); +#define CALL_VertexAttrib1fNV(disp, parameters) \ + (* GET_VertexAttrib1fNV(disp)) parameters +static INLINE _glptr_VertexAttrib1fNV GET_VertexAttrib1fNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1fNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fNV)); +} + +static INLINE void SET_VertexAttrib1fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib1fNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1fvNV)(GLuint, const GLfloat *); +#define CALL_VertexAttrib1fvNV(disp, parameters) \ + (* GET_VertexAttrib1fvNV(disp)) parameters +static INLINE _glptr_VertexAttrib1fvNV GET_VertexAttrib1fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib1fvNV)); +} + +static INLINE void SET_VertexAttrib1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1sNV)(GLuint, GLshort); +#define CALL_VertexAttrib1sNV(disp, parameters) \ + (* GET_VertexAttrib1sNV(disp)) parameters +static INLINE _glptr_VertexAttrib1sNV GET_VertexAttrib1sNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1sNV) (GET_by_offset(disp, _gloffset_VertexAttrib1sNV)); +} + +static INLINE void SET_VertexAttrib1sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib1sNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib1svNV)(GLuint, const GLshort *); +#define CALL_VertexAttrib1svNV(disp, parameters) \ + (* GET_VertexAttrib1svNV(disp)) parameters +static INLINE _glptr_VertexAttrib1svNV GET_VertexAttrib1svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib1svNV) (GET_by_offset(disp, _gloffset_VertexAttrib1svNV)); +} + +static INLINE void SET_VertexAttrib1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib1svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2dNV)(GLuint, GLdouble, GLdouble); +#define CALL_VertexAttrib2dNV(disp, parameters) \ + (* GET_VertexAttrib2dNV(disp)) parameters +static INLINE _glptr_VertexAttrib2dNV GET_VertexAttrib2dNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2dNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dNV)); +} + +static INLINE void SET_VertexAttrib2dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib2dNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2dvNV)(GLuint, const GLdouble *); +#define CALL_VertexAttrib2dvNV(disp, parameters) \ + (* GET_VertexAttrib2dvNV(disp)) parameters +static INLINE _glptr_VertexAttrib2dvNV GET_VertexAttrib2dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2dvNV)); +} + +static INLINE void SET_VertexAttrib2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2fNV)(GLuint, GLfloat, GLfloat); +#define CALL_VertexAttrib2fNV(disp, parameters) \ + (* GET_VertexAttrib2fNV(disp)) parameters +static INLINE _glptr_VertexAttrib2fNV GET_VertexAttrib2fNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2fNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fNV)); +} + +static INLINE void SET_VertexAttrib2fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib2fNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2fvNV)(GLuint, const GLfloat *); +#define CALL_VertexAttrib2fvNV(disp, parameters) \ + (* GET_VertexAttrib2fvNV(disp)) parameters +static INLINE _glptr_VertexAttrib2fvNV GET_VertexAttrib2fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib2fvNV)); +} + +static INLINE void SET_VertexAttrib2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2sNV)(GLuint, GLshort, GLshort); +#define CALL_VertexAttrib2sNV(disp, parameters) \ + (* GET_VertexAttrib2sNV(disp)) parameters +static INLINE _glptr_VertexAttrib2sNV GET_VertexAttrib2sNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2sNV) (GET_by_offset(disp, _gloffset_VertexAttrib2sNV)); +} + +static INLINE void SET_VertexAttrib2sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib2sNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib2svNV)(GLuint, const GLshort *); +#define CALL_VertexAttrib2svNV(disp, parameters) \ + (* GET_VertexAttrib2svNV(disp)) parameters +static INLINE _glptr_VertexAttrib2svNV GET_VertexAttrib2svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib2svNV) (GET_by_offset(disp, _gloffset_VertexAttrib2svNV)); +} + +static INLINE void SET_VertexAttrib2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib2svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3dNV)(GLuint, GLdouble, GLdouble, GLdouble); +#define CALL_VertexAttrib3dNV(disp, parameters) \ + (* GET_VertexAttrib3dNV(disp)) parameters +static INLINE _glptr_VertexAttrib3dNV GET_VertexAttrib3dNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3dNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dNV)); +} + +static INLINE void SET_VertexAttrib3dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib3dNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3dvNV)(GLuint, const GLdouble *); +#define CALL_VertexAttrib3dvNV(disp, parameters) \ + (* GET_VertexAttrib3dvNV(disp)) parameters +static INLINE _glptr_VertexAttrib3dvNV GET_VertexAttrib3dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3dvNV)); +} + +static INLINE void SET_VertexAttrib3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3fNV)(GLuint, GLfloat, GLfloat, GLfloat); +#define CALL_VertexAttrib3fNV(disp, parameters) \ + (* GET_VertexAttrib3fNV(disp)) parameters +static INLINE _glptr_VertexAttrib3fNV GET_VertexAttrib3fNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3fNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fNV)); +} + +static INLINE void SET_VertexAttrib3fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib3fNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3fvNV)(GLuint, const GLfloat *); +#define CALL_VertexAttrib3fvNV(disp, parameters) \ + (* GET_VertexAttrib3fvNV(disp)) parameters +static INLINE _glptr_VertexAttrib3fvNV GET_VertexAttrib3fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib3fvNV)); +} + +static INLINE void SET_VertexAttrib3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3sNV)(GLuint, GLshort, GLshort, GLshort); +#define CALL_VertexAttrib3sNV(disp, parameters) \ + (* GET_VertexAttrib3sNV(disp)) parameters +static INLINE _glptr_VertexAttrib3sNV GET_VertexAttrib3sNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3sNV) (GET_by_offset(disp, _gloffset_VertexAttrib3sNV)); +} + +static INLINE void SET_VertexAttrib3sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib3sNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib3svNV)(GLuint, const GLshort *); +#define CALL_VertexAttrib3svNV(disp, parameters) \ + (* GET_VertexAttrib3svNV(disp)) parameters +static INLINE _glptr_VertexAttrib3svNV GET_VertexAttrib3svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib3svNV) (GET_by_offset(disp, _gloffset_VertexAttrib3svNV)); +} + +static INLINE void SET_VertexAttrib3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib3svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4dNV)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_VertexAttrib4dNV(disp, parameters) \ + (* GET_VertexAttrib4dNV(disp)) parameters +static INLINE _glptr_VertexAttrib4dNV GET_VertexAttrib4dNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4dNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dNV)); +} + +static INLINE void SET_VertexAttrib4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_VertexAttrib4dNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4dvNV)(GLuint, const GLdouble *); +#define CALL_VertexAttrib4dvNV(disp, parameters) \ + (* GET_VertexAttrib4dvNV(disp)) parameters +static INLINE _glptr_VertexAttrib4dvNV GET_VertexAttrib4dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4dvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4dvNV)); +} + +static INLINE void SET_VertexAttrib4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4fNV)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_VertexAttrib4fNV(disp, parameters) \ + (* GET_VertexAttrib4fNV(disp)) parameters +static INLINE _glptr_VertexAttrib4fNV GET_VertexAttrib4fNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4fNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fNV)); +} + +static INLINE void SET_VertexAttrib4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_VertexAttrib4fNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4fvNV)(GLuint, const GLfloat *); +#define CALL_VertexAttrib4fvNV(disp, parameters) \ + (* GET_VertexAttrib4fvNV(disp)) parameters +static INLINE _glptr_VertexAttrib4fvNV GET_VertexAttrib4fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4fvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4fvNV)); +} + +static INLINE void SET_VertexAttrib4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4sNV)(GLuint, GLshort, GLshort, GLshort, GLshort); +#define CALL_VertexAttrib4sNV(disp, parameters) \ + (* GET_VertexAttrib4sNV(disp)) parameters +static INLINE _glptr_VertexAttrib4sNV GET_VertexAttrib4sNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4sNV) (GET_by_offset(disp, _gloffset_VertexAttrib4sNV)); +} + +static INLINE void SET_VertexAttrib4sNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLshort, GLshort, GLshort, GLshort)) { + SET_by_offset(disp, _gloffset_VertexAttrib4sNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4svNV)(GLuint, const GLshort *); +#define CALL_VertexAttrib4svNV(disp, parameters) \ + (* GET_VertexAttrib4svNV(disp)) parameters +static INLINE _glptr_VertexAttrib4svNV GET_VertexAttrib4svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4svNV) (GET_by_offset(disp, _gloffset_VertexAttrib4svNV)); +} + +static INLINE void SET_VertexAttrib4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubNV)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte); +#define CALL_VertexAttrib4ubNV(disp, parameters) \ + (* GET_VertexAttrib4ubNV(disp)) parameters +static INLINE _glptr_VertexAttrib4ubNV GET_VertexAttrib4ubNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4ubNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubNV)); +} + +static INLINE void SET_VertexAttrib4ubNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLubyte, GLubyte, GLubyte, GLubyte)) { + SET_by_offset(disp, _gloffset_VertexAttrib4ubNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttrib4ubvNV)(GLuint, const GLubyte *); +#define CALL_VertexAttrib4ubvNV(disp, parameters) \ + (* GET_VertexAttrib4ubvNV(disp)) parameters +static INLINE _glptr_VertexAttrib4ubvNV GET_VertexAttrib4ubvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttrib4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttrib4ubvNV)); +} + +static INLINE void SET_VertexAttrib4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLubyte *)) { + SET_by_offset(disp, _gloffset_VertexAttrib4ubvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribPointerNV)(GLuint, GLint, GLenum, GLsizei, const GLvoid *); +#define CALL_VertexAttribPointerNV(disp, parameters) \ + (* GET_VertexAttribPointerNV(disp)) parameters +static INLINE _glptr_VertexAttribPointerNV GET_VertexAttribPointerNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribPointerNV) (GET_by_offset(disp, _gloffset_VertexAttribPointerNV)); +} + +static INLINE void SET_VertexAttribPointerNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLenum, GLsizei, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VertexAttribPointerNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs1dvNV)(GLuint, GLsizei, const GLdouble *); +#define CALL_VertexAttribs1dvNV(disp, parameters) \ + (* GET_VertexAttribs1dvNV(disp)) parameters +static INLINE _glptr_VertexAttribs1dvNV GET_VertexAttribs1dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs1dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1dvNV)); +} + +static INLINE void SET_VertexAttribs1dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttribs1dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs1fvNV)(GLuint, GLsizei, const GLfloat *); +#define CALL_VertexAttribs1fvNV(disp, parameters) \ + (* GET_VertexAttribs1fvNV(disp)) parameters +static INLINE _glptr_VertexAttribs1fvNV GET_VertexAttribs1fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs1fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs1fvNV)); +} + +static INLINE void SET_VertexAttribs1fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttribs1fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs1svNV)(GLuint, GLsizei, const GLshort *); +#define CALL_VertexAttribs1svNV(disp, parameters) \ + (* GET_VertexAttribs1svNV(disp)) parameters +static INLINE _glptr_VertexAttribs1svNV GET_VertexAttribs1svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs1svNV) (GET_by_offset(disp, _gloffset_VertexAttribs1svNV)); +} + +static INLINE void SET_VertexAttribs1svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttribs1svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs2dvNV)(GLuint, GLsizei, const GLdouble *); +#define CALL_VertexAttribs2dvNV(disp, parameters) \ + (* GET_VertexAttribs2dvNV(disp)) parameters +static INLINE _glptr_VertexAttribs2dvNV GET_VertexAttribs2dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs2dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2dvNV)); +} + +static INLINE void SET_VertexAttribs2dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttribs2dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs2fvNV)(GLuint, GLsizei, const GLfloat *); +#define CALL_VertexAttribs2fvNV(disp, parameters) \ + (* GET_VertexAttribs2fvNV(disp)) parameters +static INLINE _glptr_VertexAttribs2fvNV GET_VertexAttribs2fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs2fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs2fvNV)); +} + +static INLINE void SET_VertexAttribs2fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttribs2fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs2svNV)(GLuint, GLsizei, const GLshort *); +#define CALL_VertexAttribs2svNV(disp, parameters) \ + (* GET_VertexAttribs2svNV(disp)) parameters +static INLINE _glptr_VertexAttribs2svNV GET_VertexAttribs2svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs2svNV) (GET_by_offset(disp, _gloffset_VertexAttribs2svNV)); +} + +static INLINE void SET_VertexAttribs2svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttribs2svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs3dvNV)(GLuint, GLsizei, const GLdouble *); +#define CALL_VertexAttribs3dvNV(disp, parameters) \ + (* GET_VertexAttribs3dvNV(disp)) parameters +static INLINE _glptr_VertexAttribs3dvNV GET_VertexAttribs3dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs3dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3dvNV)); +} + +static INLINE void SET_VertexAttribs3dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttribs3dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs3fvNV)(GLuint, GLsizei, const GLfloat *); +#define CALL_VertexAttribs3fvNV(disp, parameters) \ + (* GET_VertexAttribs3fvNV(disp)) parameters +static INLINE _glptr_VertexAttribs3fvNV GET_VertexAttribs3fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs3fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs3fvNV)); +} + +static INLINE void SET_VertexAttribs3fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttribs3fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs3svNV)(GLuint, GLsizei, const GLshort *); +#define CALL_VertexAttribs3svNV(disp, parameters) \ + (* GET_VertexAttribs3svNV(disp)) parameters +static INLINE _glptr_VertexAttribs3svNV GET_VertexAttribs3svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs3svNV) (GET_by_offset(disp, _gloffset_VertexAttribs3svNV)); +} + +static INLINE void SET_VertexAttribs3svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttribs3svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs4dvNV)(GLuint, GLsizei, const GLdouble *); +#define CALL_VertexAttribs4dvNV(disp, parameters) \ + (* GET_VertexAttribs4dvNV(disp)) parameters +static INLINE _glptr_VertexAttribs4dvNV GET_VertexAttribs4dvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs4dvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4dvNV)); +} + +static INLINE void SET_VertexAttribs4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLdouble *)) { + SET_by_offset(disp, _gloffset_VertexAttribs4dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs4fvNV)(GLuint, GLsizei, const GLfloat *); +#define CALL_VertexAttribs4fvNV(disp, parameters) \ + (* GET_VertexAttribs4fvNV(disp)) parameters +static INLINE _glptr_VertexAttribs4fvNV GET_VertexAttribs4fvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs4fvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4fvNV)); +} + +static INLINE void SET_VertexAttribs4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_VertexAttribs4fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs4svNV)(GLuint, GLsizei, const GLshort *); +#define CALL_VertexAttribs4svNV(disp, parameters) \ + (* GET_VertexAttribs4svNV(disp)) parameters +static INLINE _glptr_VertexAttribs4svNV GET_VertexAttribs4svNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs4svNV) (GET_by_offset(disp, _gloffset_VertexAttribs4svNV)); +} + +static INLINE void SET_VertexAttribs4svNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLshort *)) { + SET_by_offset(disp, _gloffset_VertexAttribs4svNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribs4ubvNV)(GLuint, GLsizei, const GLubyte *); +#define CALL_VertexAttribs4ubvNV(disp, parameters) \ + (* GET_VertexAttribs4ubvNV(disp)) parameters +static INLINE _glptr_VertexAttribs4ubvNV GET_VertexAttribs4ubvNV(struct _glapi_table *disp) { + return (_glptr_VertexAttribs4ubvNV) (GET_by_offset(disp, _gloffset_VertexAttribs4ubvNV)); +} + +static INLINE void SET_VertexAttribs4ubvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *)) { + SET_by_offset(disp, _gloffset_VertexAttribs4ubvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterfvATI)(GLenum, GLfloat *); +#define CALL_GetTexBumpParameterfvATI(disp, parameters) \ + (* GET_GetTexBumpParameterfvATI(disp)) parameters +static INLINE _glptr_GetTexBumpParameterfvATI GET_GetTexBumpParameterfvATI(struct _glapi_table *disp) { + return (_glptr_GetTexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI)); +} + +static INLINE void SET_GetTexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetTexBumpParameterfvATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexBumpParameterivATI)(GLenum, GLint *); +#define CALL_GetTexBumpParameterivATI(disp, parameters) \ + (* GET_GetTexBumpParameterivATI(disp)) parameters +static INLINE _glptr_GetTexBumpParameterivATI GET_GetTexBumpParameterivATI(struct _glapi_table *disp) { + return (_glptr_GetTexBumpParameterivATI) (GET_by_offset(disp, _gloffset_GetTexBumpParameterivATI)); +} + +static INLINE void SET_GetTexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetTexBumpParameterivATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexBumpParameterfvATI)(GLenum, const GLfloat *); +#define CALL_TexBumpParameterfvATI(disp, parameters) \ + (* GET_TexBumpParameterfvATI(disp)) parameters +static INLINE _glptr_TexBumpParameterfvATI GET_TexBumpParameterfvATI(struct _glapi_table *disp) { + return (_glptr_TexBumpParameterfvATI) (GET_by_offset(disp, _gloffset_TexBumpParameterfvATI)); +} + +static INLINE void SET_TexBumpParameterfvATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_TexBumpParameterfvATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexBumpParameterivATI)(GLenum, const GLint *); +#define CALL_TexBumpParameterivATI(disp, parameters) \ + (* GET_TexBumpParameterivATI(disp)) parameters +static INLINE _glptr_TexBumpParameterivATI GET_TexBumpParameterivATI(struct _glapi_table *disp) { + return (_glptr_TexBumpParameterivATI) (GET_by_offset(disp, _gloffset_TexBumpParameterivATI)); +} + +static INLINE void SET_TexBumpParameterivATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLint *)) { + SET_by_offset(disp, _gloffset_TexBumpParameterivATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_AlphaFragmentOp1ATI(disp, parameters) \ + (* GET_AlphaFragmentOp1ATI(disp)) parameters +static INLINE _glptr_AlphaFragmentOp1ATI GET_AlphaFragmentOp1ATI(struct _glapi_table *disp) { + return (_glptr_AlphaFragmentOp1ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI)); +} + +static INLINE void SET_AlphaFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_AlphaFragmentOp1ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_AlphaFragmentOp2ATI(disp, parameters) \ + (* GET_AlphaFragmentOp2ATI(disp)) parameters +static INLINE _glptr_AlphaFragmentOp2ATI GET_AlphaFragmentOp2ATI(struct _glapi_table *disp) { + return (_glptr_AlphaFragmentOp2ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI)); +} + +static INLINE void SET_AlphaFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_AlphaFragmentOp2ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_AlphaFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_AlphaFragmentOp3ATI(disp, parameters) \ + (* GET_AlphaFragmentOp3ATI(disp)) parameters +static INLINE _glptr_AlphaFragmentOp3ATI GET_AlphaFragmentOp3ATI(struct _glapi_table *disp) { + return (_glptr_AlphaFragmentOp3ATI) (GET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI)); +} + +static INLINE void SET_AlphaFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_AlphaFragmentOp3ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginFragmentShaderATI)(void); +#define CALL_BeginFragmentShaderATI(disp, parameters) \ + (* GET_BeginFragmentShaderATI(disp)) parameters +static INLINE _glptr_BeginFragmentShaderATI GET_BeginFragmentShaderATI(struct _glapi_table *disp) { + return (_glptr_BeginFragmentShaderATI) (GET_by_offset(disp, _gloffset_BeginFragmentShaderATI)); +} + +static INLINE void SET_BeginFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_BeginFragmentShaderATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindFragmentShaderATI)(GLuint); +#define CALL_BindFragmentShaderATI(disp, parameters) \ + (* GET_BindFragmentShaderATI(disp)) parameters +static INLINE _glptr_BindFragmentShaderATI GET_BindFragmentShaderATI(struct _glapi_table *disp) { + return (_glptr_BindFragmentShaderATI) (GET_by_offset(disp, _gloffset_BindFragmentShaderATI)); +} + +static INLINE void SET_BindFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BindFragmentShaderATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorFragmentOp1ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_ColorFragmentOp1ATI(disp, parameters) \ + (* GET_ColorFragmentOp1ATI(disp)) parameters +static INLINE _glptr_ColorFragmentOp1ATI GET_ColorFragmentOp1ATI(struct _glapi_table *disp) { + return (_glptr_ColorFragmentOp1ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp1ATI)); +} + +static INLINE void SET_ColorFragmentOp1ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ColorFragmentOp1ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorFragmentOp2ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_ColorFragmentOp2ATI(disp, parameters) \ + (* GET_ColorFragmentOp2ATI(disp)) parameters +static INLINE _glptr_ColorFragmentOp2ATI GET_ColorFragmentOp2ATI(struct _glapi_table *disp) { + return (_glptr_ColorFragmentOp2ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp2ATI)); +} + +static INLINE void SET_ColorFragmentOp2ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ColorFragmentOp2ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_ColorFragmentOp3ATI)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_ColorFragmentOp3ATI(disp, parameters) \ + (* GET_ColorFragmentOp3ATI(disp)) parameters +static INLINE _glptr_ColorFragmentOp3ATI GET_ColorFragmentOp3ATI(struct _glapi_table *disp) { + return (_glptr_ColorFragmentOp3ATI) (GET_by_offset(disp, _gloffset_ColorFragmentOp3ATI)); +} + +static INLINE void SET_ColorFragmentOp3ATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ColorFragmentOp3ATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeleteFragmentShaderATI)(GLuint); +#define CALL_DeleteFragmentShaderATI(disp, parameters) \ + (* GET_DeleteFragmentShaderATI(disp)) parameters +static INLINE _glptr_DeleteFragmentShaderATI GET_DeleteFragmentShaderATI(struct _glapi_table *disp) { + return (_glptr_DeleteFragmentShaderATI) (GET_by_offset(disp, _gloffset_DeleteFragmentShaderATI)); +} + +static INLINE void SET_DeleteFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_DeleteFragmentShaderATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndFragmentShaderATI)(void); +#define CALL_EndFragmentShaderATI(disp, parameters) \ + (* GET_EndFragmentShaderATI(disp)) parameters +static INLINE _glptr_EndFragmentShaderATI GET_EndFragmentShaderATI(struct _glapi_table *disp) { + return (_glptr_EndFragmentShaderATI) (GET_by_offset(disp, _gloffset_EndFragmentShaderATI)); +} + +static INLINE void SET_EndFragmentShaderATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_EndFragmentShaderATI, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_GenFragmentShadersATI)(GLuint); +#define CALL_GenFragmentShadersATI(disp, parameters) \ + (* GET_GenFragmentShadersATI(disp)) parameters +static INLINE _glptr_GenFragmentShadersATI GET_GenFragmentShadersATI(struct _glapi_table *disp) { + return (_glptr_GenFragmentShadersATI) (GET_by_offset(disp, _gloffset_GenFragmentShadersATI)); +} + +static INLINE void SET_GenFragmentShadersATI(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_GenFragmentShadersATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_PassTexCoordATI)(GLuint, GLuint, GLenum); +#define CALL_PassTexCoordATI(disp, parameters) \ + (* GET_PassTexCoordATI(disp)) parameters +static INLINE _glptr_PassTexCoordATI GET_PassTexCoordATI(struct _glapi_table *disp) { + return (_glptr_PassTexCoordATI) (GET_by_offset(disp, _gloffset_PassTexCoordATI)); +} + +static INLINE void SET_PassTexCoordATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_PassTexCoordATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_SampleMapATI)(GLuint, GLuint, GLenum); +#define CALL_SampleMapATI(disp, parameters) \ + (* GET_SampleMapATI(disp)) parameters +static INLINE _glptr_SampleMapATI GET_SampleMapATI(struct _glapi_table *disp) { + return (_glptr_SampleMapATI) (GET_by_offset(disp, _gloffset_SampleMapATI)); +} + +static INLINE void SET_SampleMapATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_SampleMapATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_SetFragmentShaderConstantATI)(GLuint, const GLfloat *); +#define CALL_SetFragmentShaderConstantATI(disp, parameters) \ + (* GET_SetFragmentShaderConstantATI(disp)) parameters +static INLINE _glptr_SetFragmentShaderConstantATI GET_SetFragmentShaderConstantATI(struct _glapi_table *disp) { + return (_glptr_SetFragmentShaderConstantATI) (GET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI)); +} + +static INLINE void SET_SetFragmentShaderConstantATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLfloat *)) { + SET_by_offset(disp, _gloffset_SetFragmentShaderConstantATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_ActiveStencilFaceEXT)(GLenum); +#define CALL_ActiveStencilFaceEXT(disp, parameters) \ + (* GET_ActiveStencilFaceEXT(disp)) parameters +static INLINE _glptr_ActiveStencilFaceEXT GET_ActiveStencilFaceEXT(struct _glapi_table *disp) { + return (_glptr_ActiveStencilFaceEXT) (GET_by_offset(disp, _gloffset_ActiveStencilFaceEXT)); +} + +static INLINE void SET_ActiveStencilFaceEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum)) { + SET_by_offset(disp, _gloffset_ActiveStencilFaceEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindVertexArrayAPPLE)(GLuint); +#define CALL_BindVertexArrayAPPLE(disp, parameters) \ + (* GET_BindVertexArrayAPPLE(disp)) parameters +static INLINE _glptr_BindVertexArrayAPPLE GET_BindVertexArrayAPPLE(struct _glapi_table *disp) { + return (_glptr_BindVertexArrayAPPLE) (GET_by_offset(disp, _gloffset_BindVertexArrayAPPLE)); +} + +static INLINE void SET_BindVertexArrayAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BindVertexArrayAPPLE, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenVertexArraysAPPLE)(GLsizei, GLuint *); +#define CALL_GenVertexArraysAPPLE(disp, parameters) \ + (* GET_GenVertexArraysAPPLE(disp)) parameters +static INLINE _glptr_GenVertexArraysAPPLE GET_GenVertexArraysAPPLE(struct _glapi_table *disp) { + return (_glptr_GenVertexArraysAPPLE) (GET_by_offset(disp, _gloffset_GenVertexArraysAPPLE)); +} + +static INLINE void SET_GenVertexArraysAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenVertexArraysAPPLE, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterdvNV)(GLuint, GLsizei, const GLubyte *, GLdouble *); +#define CALL_GetProgramNamedParameterdvNV(disp, parameters) \ + (* GET_GetProgramNamedParameterdvNV(disp)) parameters +static INLINE _glptr_GetProgramNamedParameterdvNV GET_GetProgramNamedParameterdvNV(struct _glapi_table *disp) { + return (_glptr_GetProgramNamedParameterdvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV)); +} + +static INLINE void SET_GetProgramNamedParameterdvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble *)) { + SET_by_offset(disp, _gloffset_GetProgramNamedParameterdvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetProgramNamedParameterfvNV)(GLuint, GLsizei, const GLubyte *, GLfloat *); +#define CALL_GetProgramNamedParameterfvNV(disp, parameters) \ + (* GET_GetProgramNamedParameterfvNV(disp)) parameters +static INLINE _glptr_GetProgramNamedParameterfvNV GET_GetProgramNamedParameterfvNV(struct _glapi_table *disp) { + return (_glptr_GetProgramNamedParameterfvNV) (GET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV)); +} + +static INLINE void SET_GetProgramNamedParameterfvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetProgramNamedParameterfvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dNV)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble); +#define CALL_ProgramNamedParameter4dNV(disp, parameters) \ + (* GET_ProgramNamedParameter4dNV(disp)) parameters +static INLINE _glptr_ProgramNamedParameter4dNV GET_ProgramNamedParameter4dNV(struct _glapi_table *disp) { + return (_glptr_ProgramNamedParameter4dNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV)); +} + +static INLINE void SET_ProgramNamedParameter4dNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble)) { + SET_by_offset(disp, _gloffset_ProgramNamedParameter4dNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4dvNV)(GLuint, GLsizei, const GLubyte *, const GLdouble *); +#define CALL_ProgramNamedParameter4dvNV(disp, parameters) \ + (* GET_ProgramNamedParameter4dvNV(disp)) parameters +static INLINE _glptr_ProgramNamedParameter4dvNV GET_ProgramNamedParameter4dvNV(struct _glapi_table *disp) { + return (_glptr_ProgramNamedParameter4dvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV)); +} + +static INLINE void SET_ProgramNamedParameter4dvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLdouble *)) { + SET_by_offset(disp, _gloffset_ProgramNamedParameter4dvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fNV)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_ProgramNamedParameter4fNV(disp, parameters) \ + (* GET_ProgramNamedParameter4fNV(disp)) parameters +static INLINE _glptr_ProgramNamedParameter4fNV GET_ProgramNamedParameter4fNV(struct _glapi_table *disp) { + return (_glptr_ProgramNamedParameter4fNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV)); +} + +static INLINE void SET_ProgramNamedParameter4fNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_ProgramNamedParameter4fNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramNamedParameter4fvNV)(GLuint, GLsizei, const GLubyte *, const GLfloat *); +#define CALL_ProgramNamedParameter4fvNV(disp, parameters) \ + (* GET_ProgramNamedParameter4fvNV(disp)) parameters +static INLINE _glptr_ProgramNamedParameter4fvNV GET_ProgramNamedParameter4fvNV(struct _glapi_table *disp) { + return (_glptr_ProgramNamedParameter4fvNV) (GET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV)); +} + +static INLINE void SET_ProgramNamedParameter4fvNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, const GLubyte *, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramNamedParameter4fvNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_PrimitiveRestartNV)(void); +#define CALL_PrimitiveRestartNV(disp, parameters) \ + (* GET_PrimitiveRestartNV(disp)) parameters +static INLINE _glptr_PrimitiveRestartNV GET_PrimitiveRestartNV(struct _glapi_table *disp) { + return (_glptr_PrimitiveRestartNV) (GET_by_offset(disp, _gloffset_PrimitiveRestartNV)); +} + +static INLINE void SET_PrimitiveRestartNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_PrimitiveRestartNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexGenxvOES)(GLenum, GLenum, GLfixed *); +#define CALL_GetTexGenxvOES(disp, parameters) \ + (* GET_GetTexGenxvOES(disp)) parameters +static INLINE _glptr_GetTexGenxvOES GET_GetTexGenxvOES(struct _glapi_table *disp) { + return (_glptr_GetTexGenxvOES) (GET_by_offset(disp, _gloffset_GetTexGenxvOES)); +} + +static INLINE void SET_GetTexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetTexGenxvOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGenxOES)(GLenum, GLenum, GLint); +#define CALL_TexGenxOES(disp, parameters) \ + (* GET_TexGenxOES(disp)) parameters +static INLINE _glptr_TexGenxOES GET_TexGenxOES(struct _glapi_table *disp) { + return (_glptr_TexGenxOES) (GET_by_offset(disp, _gloffset_TexGenxOES)); +} + +static INLINE void SET_TexGenxOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_TexGenxOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexGenxvOES)(GLenum, GLenum, const GLfixed *); +#define CALL_TexGenxvOES(disp, parameters) \ + (* GET_TexGenxvOES(disp)) parameters +static INLINE _glptr_TexGenxvOES GET_TexGenxvOES(struct _glapi_table *disp) { + return (_glptr_TexGenxvOES) (GET_by_offset(disp, _gloffset_TexGenxvOES)); +} + +static INLINE void SET_TexGenxvOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_TexGenxvOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthBoundsEXT)(GLclampd, GLclampd); +#define CALL_DepthBoundsEXT(disp, parameters) \ + (* GET_DepthBoundsEXT(disp)) parameters +static INLINE _glptr_DepthBoundsEXT GET_DepthBoundsEXT(struct _glapi_table *disp) { + return (_glptr_DepthBoundsEXT) (GET_by_offset(disp, _gloffset_DepthBoundsEXT)); +} + +static INLINE void SET_DepthBoundsEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampd, GLclampd)) { + SET_by_offset(disp, _gloffset_DepthBoundsEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindFramebufferEXT)(GLenum, GLuint); +#define CALL_BindFramebufferEXT(disp, parameters) \ + (* GET_BindFramebufferEXT(disp)) parameters +static INLINE _glptr_BindFramebufferEXT GET_BindFramebufferEXT(struct _glapi_table *disp) { + return (_glptr_BindFramebufferEXT) (GET_by_offset(disp, _gloffset_BindFramebufferEXT)); +} + +static INLINE void SET_BindFramebufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindFramebufferEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindRenderbufferEXT)(GLenum, GLuint); +#define CALL_BindRenderbufferEXT(disp, parameters) \ + (* GET_BindRenderbufferEXT(disp)) parameters +static INLINE _glptr_BindRenderbufferEXT GET_BindRenderbufferEXT(struct _glapi_table *disp) { + return (_glptr_BindRenderbufferEXT) (GET_by_offset(disp, _gloffset_BindRenderbufferEXT)); +} + +static INLINE void SET_BindRenderbufferEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_BindRenderbufferEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BufferParameteriAPPLE)(GLenum, GLenum, GLint); +#define CALL_BufferParameteriAPPLE(disp, parameters) \ + (* GET_BufferParameteriAPPLE(disp)) parameters +static INLINE _glptr_BufferParameteriAPPLE GET_BufferParameteriAPPLE(struct _glapi_table *disp) { + return (_glptr_BufferParameteriAPPLE) (GET_by_offset(disp, _gloffset_BufferParameteriAPPLE)); +} + +static INLINE void SET_BufferParameteriAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint)) { + SET_by_offset(disp, _gloffset_BufferParameteriAPPLE, fn); +} + +typedef void (GLAPIENTRYP _glptr_FlushMappedBufferRangeAPPLE)(GLenum, GLintptr, GLsizeiptr); +#define CALL_FlushMappedBufferRangeAPPLE(disp, parameters) \ + (* GET_FlushMappedBufferRangeAPPLE(disp)) parameters +static INLINE _glptr_FlushMappedBufferRangeAPPLE GET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp) { + return (_glptr_FlushMappedBufferRangeAPPLE) (GET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE)); +} + +static INLINE void SET_FlushMappedBufferRangeAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLintptr, GLsizeiptr)) { + SET_by_offset(disp, _gloffset_FlushMappedBufferRangeAPPLE, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI1iEXT)(GLuint, GLint); +#define CALL_VertexAttribI1iEXT(disp, parameters) \ + (* GET_VertexAttribI1iEXT(disp)) parameters +static INLINE _glptr_VertexAttribI1iEXT GET_VertexAttribI1iEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI1iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1iEXT)); +} + +static INLINE void SET_VertexAttribI1iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint)) { + SET_by_offset(disp, _gloffset_VertexAttribI1iEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI1uiEXT)(GLuint, GLuint); +#define CALL_VertexAttribI1uiEXT(disp, parameters) \ + (* GET_VertexAttribI1uiEXT(disp)) parameters +static INLINE _glptr_VertexAttribI1uiEXT GET_VertexAttribI1uiEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI1uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI1uiEXT)); +} + +static INLINE void SET_VertexAttribI1uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribI1uiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI2iEXT)(GLuint, GLint, GLint); +#define CALL_VertexAttribI2iEXT(disp, parameters) \ + (* GET_VertexAttribI2iEXT(disp)) parameters +static INLINE _glptr_VertexAttribI2iEXT GET_VertexAttribI2iEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI2iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2iEXT)); +} + +static INLINE void SET_VertexAttribI2iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_VertexAttribI2iEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI2ivEXT)(GLuint, const GLint *); +#define CALL_VertexAttribI2ivEXT(disp, parameters) \ + (* GET_VertexAttribI2ivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI2ivEXT GET_VertexAttribI2ivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI2ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2ivEXT)); +} + +static INLINE void SET_VertexAttribI2ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI2ivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI2uiEXT)(GLuint, GLuint, GLuint); +#define CALL_VertexAttribI2uiEXT(disp, parameters) \ + (* GET_VertexAttribI2uiEXT(disp)) parameters +static INLINE _glptr_VertexAttribI2uiEXT GET_VertexAttribI2uiEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI2uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uiEXT)); +} + +static INLINE void SET_VertexAttribI2uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribI2uiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI2uivEXT)(GLuint, const GLuint *); +#define CALL_VertexAttribI2uivEXT(disp, parameters) \ + (* GET_VertexAttribI2uivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI2uivEXT GET_VertexAttribI2uivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI2uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI2uivEXT)); +} + +static INLINE void SET_VertexAttribI2uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI2uivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI3iEXT)(GLuint, GLint, GLint, GLint); +#define CALL_VertexAttribI3iEXT(disp, parameters) \ + (* GET_VertexAttribI3iEXT(disp)) parameters +static INLINE _glptr_VertexAttribI3iEXT GET_VertexAttribI3iEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI3iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3iEXT)); +} + +static INLINE void SET_VertexAttribI3iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_VertexAttribI3iEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI3ivEXT)(GLuint, const GLint *); +#define CALL_VertexAttribI3ivEXT(disp, parameters) \ + (* GET_VertexAttribI3ivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI3ivEXT GET_VertexAttribI3ivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI3ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3ivEXT)); +} + +static INLINE void SET_VertexAttribI3ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI3ivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI3uiEXT)(GLuint, GLuint, GLuint, GLuint); +#define CALL_VertexAttribI3uiEXT(disp, parameters) \ + (* GET_VertexAttribI3uiEXT(disp)) parameters +static INLINE _glptr_VertexAttribI3uiEXT GET_VertexAttribI3uiEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI3uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uiEXT)); +} + +static INLINE void SET_VertexAttribI3uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribI3uiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI3uivEXT)(GLuint, const GLuint *); +#define CALL_VertexAttribI3uivEXT(disp, parameters) \ + (* GET_VertexAttribI3uivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI3uivEXT GET_VertexAttribI3uivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI3uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI3uivEXT)); +} + +static INLINE void SET_VertexAttribI3uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI3uivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4iEXT)(GLuint, GLint, GLint, GLint, GLint); +#define CALL_VertexAttribI4iEXT(disp, parameters) \ + (* GET_VertexAttribI4iEXT(disp)) parameters +static INLINE _glptr_VertexAttribI4iEXT GET_VertexAttribI4iEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4iEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4iEXT)); +} + +static INLINE void SET_VertexAttribI4iEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_VertexAttribI4iEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4ivEXT)(GLuint, const GLint *); +#define CALL_VertexAttribI4ivEXT(disp, parameters) \ + (* GET_VertexAttribI4ivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI4ivEXT GET_VertexAttribI4ivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4ivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4ivEXT)); +} + +static INLINE void SET_VertexAttribI4ivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4ivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4uiEXT)(GLuint, GLuint, GLuint, GLuint, GLuint); +#define CALL_VertexAttribI4uiEXT(disp, parameters) \ + (* GET_VertexAttribI4uiEXT(disp)) parameters +static INLINE _glptr_VertexAttribI4uiEXT GET_VertexAttribI4uiEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4uiEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uiEXT)); +} + +static INLINE void SET_VertexAttribI4uiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_VertexAttribI4uiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_VertexAttribI4uivEXT)(GLuint, const GLuint *); +#define CALL_VertexAttribI4uivEXT(disp, parameters) \ + (* GET_VertexAttribI4uivEXT(disp)) parameters +static INLINE _glptr_VertexAttribI4uivEXT GET_VertexAttribI4uivEXT(struct _glapi_table *disp) { + return (_glptr_VertexAttribI4uivEXT) (GET_by_offset(disp, _gloffset_VertexAttribI4uivEXT)); +} + +static INLINE void SET_VertexAttribI4uivEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, const GLuint *)) { + SET_by_offset(disp, _gloffset_VertexAttribI4uivEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearColorIiEXT)(GLint, GLint, GLint, GLint); +#define CALL_ClearColorIiEXT(disp, parameters) \ + (* GET_ClearColorIiEXT(disp)) parameters +static INLINE _glptr_ClearColorIiEXT GET_ClearColorIiEXT(struct _glapi_table *disp) { + return (_glptr_ClearColorIiEXT) (GET_by_offset(disp, _gloffset_ClearColorIiEXT)); +} + +static INLINE void SET_ClearColorIiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint, GLint, GLint, GLint)) { + SET_by_offset(disp, _gloffset_ClearColorIiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearColorIuiEXT)(GLuint, GLuint, GLuint, GLuint); +#define CALL_ClearColorIuiEXT(disp, parameters) \ + (* GET_ClearColorIuiEXT(disp)) parameters +static INLINE _glptr_ClearColorIuiEXT GET_ClearColorIuiEXT(struct _glapi_table *disp) { + return (_glptr_ClearColorIuiEXT) (GET_by_offset(disp, _gloffset_ClearColorIuiEXT)); +} + +static INLINE void SET_ClearColorIuiEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLuint)) { + SET_by_offset(disp, _gloffset_ClearColorIuiEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BindBufferOffsetEXT)(GLenum, GLuint, GLuint, GLintptr); +#define CALL_BindBufferOffsetEXT(disp, parameters) \ + (* GET_BindBufferOffsetEXT(disp)) parameters +static INLINE _glptr_BindBufferOffsetEXT GET_BindBufferOffsetEXT(struct _glapi_table *disp) { + return (_glptr_BindBufferOffsetEXT) (GET_by_offset(disp, _gloffset_BindBufferOffsetEXT)); +} + +static INLINE void SET_BindBufferOffsetEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLuint, GLintptr)) { + SET_by_offset(disp, _gloffset_BindBufferOffsetEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginPerfMonitorAMD)(GLuint); +#define CALL_BeginPerfMonitorAMD(disp, parameters) \ + (* GET_BeginPerfMonitorAMD(disp)) parameters +static INLINE _glptr_BeginPerfMonitorAMD GET_BeginPerfMonitorAMD(struct _glapi_table *disp) { + return (_glptr_BeginPerfMonitorAMD) (GET_by_offset(disp, _gloffset_BeginPerfMonitorAMD)); +} + +static INLINE void SET_BeginPerfMonitorAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BeginPerfMonitorAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeletePerfMonitorsAMD)(GLsizei, GLuint *); +#define CALL_DeletePerfMonitorsAMD(disp, parameters) \ + (* GET_DeletePerfMonitorsAMD(disp)) parameters +static INLINE _glptr_DeletePerfMonitorsAMD GET_DeletePerfMonitorsAMD(struct _glapi_table *disp) { + return (_glptr_DeletePerfMonitorsAMD) (GET_by_offset(disp, _gloffset_DeletePerfMonitorsAMD)); +} + +static INLINE void SET_DeletePerfMonitorsAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_DeletePerfMonitorsAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndPerfMonitorAMD)(GLuint); +#define CALL_EndPerfMonitorAMD(disp, parameters) \ + (* GET_EndPerfMonitorAMD(disp)) parameters +static INLINE _glptr_EndPerfMonitorAMD GET_EndPerfMonitorAMD(struct _glapi_table *disp) { + return (_glptr_EndPerfMonitorAMD) (GET_by_offset(disp, _gloffset_EndPerfMonitorAMD)); +} + +static INLINE void SET_EndPerfMonitorAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_EndPerfMonitorAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GenPerfMonitorsAMD)(GLsizei, GLuint *); +#define CALL_GenPerfMonitorsAMD(disp, parameters) \ + (* GET_GenPerfMonitorsAMD(disp)) parameters +static INLINE _glptr_GenPerfMonitorsAMD GET_GenPerfMonitorsAMD(struct _glapi_table *disp) { + return (_glptr_GenPerfMonitorsAMD) (GET_by_offset(disp, _gloffset_GenPerfMonitorsAMD)); +} + +static INLINE void SET_GenPerfMonitorsAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GenPerfMonitorsAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorCounterDataAMD)(GLuint, GLenum, GLsizei, GLuint *, GLint *); +#define CALL_GetPerfMonitorCounterDataAMD(disp, parameters) \ + (* GET_GetPerfMonitorCounterDataAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorCounterDataAMD GET_GetPerfMonitorCounterDataAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorCounterDataAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorCounterDataAMD)); +} + +static INLINE void SET_GetPerfMonitorCounterDataAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLsizei, GLuint *, GLint *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorCounterDataAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorCounterInfoAMD)(GLuint, GLuint, GLenum, GLvoid *); +#define CALL_GetPerfMonitorCounterInfoAMD(disp, parameters) \ + (* GET_GetPerfMonitorCounterInfoAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorCounterInfoAMD GET_GetPerfMonitorCounterInfoAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorCounterInfoAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorCounterInfoAMD)); +} + +static INLINE void SET_GetPerfMonitorCounterInfoAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorCounterInfoAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorCounterStringAMD)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetPerfMonitorCounterStringAMD(disp, parameters) \ + (* GET_GetPerfMonitorCounterStringAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorCounterStringAMD GET_GetPerfMonitorCounterStringAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorCounterStringAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorCounterStringAMD)); +} + +static INLINE void SET_GetPerfMonitorCounterStringAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorCounterStringAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorCountersAMD)(GLuint, GLint *, GLint *, GLsizei, GLuint *); +#define CALL_GetPerfMonitorCountersAMD(disp, parameters) \ + (* GET_GetPerfMonitorCountersAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorCountersAMD GET_GetPerfMonitorCountersAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorCountersAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorCountersAMD)); +} + +static INLINE void SET_GetPerfMonitorCountersAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLint *, GLint *, GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorCountersAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorGroupStringAMD)(GLuint, GLsizei, GLsizei *, GLchar *); +#define CALL_GetPerfMonitorGroupStringAMD(disp, parameters) \ + (* GET_GetPerfMonitorGroupStringAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorGroupStringAMD GET_GetPerfMonitorGroupStringAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorGroupStringAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorGroupStringAMD)); +} + +static INLINE void SET_GetPerfMonitorGroupStringAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLchar *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorGroupStringAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfMonitorGroupsAMD)(GLint *, GLsizei, GLuint *); +#define CALL_GetPerfMonitorGroupsAMD(disp, parameters) \ + (* GET_GetPerfMonitorGroupsAMD(disp)) parameters +static INLINE _glptr_GetPerfMonitorGroupsAMD GET_GetPerfMonitorGroupsAMD(struct _glapi_table *disp) { + return (_glptr_GetPerfMonitorGroupsAMD) (GET_by_offset(disp, _gloffset_GetPerfMonitorGroupsAMD)); +} + +static INLINE void SET_GetPerfMonitorGroupsAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLint *, GLsizei, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPerfMonitorGroupsAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_SelectPerfMonitorCountersAMD)(GLuint, GLboolean, GLuint, GLint, GLuint *); +#define CALL_SelectPerfMonitorCountersAMD(disp, parameters) \ + (* GET_SelectPerfMonitorCountersAMD(disp)) parameters +static INLINE _glptr_SelectPerfMonitorCountersAMD GET_SelectPerfMonitorCountersAMD(struct _glapi_table *disp) { + return (_glptr_SelectPerfMonitorCountersAMD) (GET_by_offset(disp, _gloffset_SelectPerfMonitorCountersAMD)); +} + +static INLINE void SET_SelectPerfMonitorCountersAMD(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLboolean, GLuint, GLint, GLuint *)) { + SET_by_offset(disp, _gloffset_SelectPerfMonitorCountersAMD, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetObjectParameterivAPPLE)(GLenum, GLuint, GLenum, GLint *); +#define CALL_GetObjectParameterivAPPLE(disp, parameters) \ + (* GET_GetObjectParameterivAPPLE(disp)) parameters +static INLINE _glptr_GetObjectParameterivAPPLE GET_GetObjectParameterivAPPLE(struct _glapi_table *disp) { + return (_glptr_GetObjectParameterivAPPLE) (GET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE)); +} + +static INLINE void SET_GetObjectParameterivAPPLE(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLenum, GLint *)) { + SET_by_offset(disp, _gloffset_GetObjectParameterivAPPLE, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_ObjectPurgeableAPPLE)(GLenum, GLuint, GLenum); +#define CALL_ObjectPurgeableAPPLE(disp, parameters) \ + (* GET_ObjectPurgeableAPPLE(disp)) parameters +static INLINE _glptr_ObjectPurgeableAPPLE GET_ObjectPurgeableAPPLE(struct _glapi_table *disp) { + return (_glptr_ObjectPurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE)); +} + +static INLINE void SET_ObjectPurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_ObjectPurgeableAPPLE, fn); +} + +typedef GLenum (GLAPIENTRYP _glptr_ObjectUnpurgeableAPPLE)(GLenum, GLuint, GLenum); +#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) \ + (* GET_ObjectUnpurgeableAPPLE(disp)) parameters +static INLINE _glptr_ObjectUnpurgeableAPPLE GET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp) { + return (_glptr_ObjectUnpurgeableAPPLE) (GET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE)); +} + +static INLINE void SET_ObjectUnpurgeableAPPLE(struct _glapi_table *disp, GLenum (GLAPIENTRYP fn)(GLenum, GLuint, GLenum)) { + SET_by_offset(disp, _gloffset_ObjectUnpurgeableAPPLE, fn); +} + +typedef void (GLAPIENTRYP _glptr_ActiveProgramEXT)(GLuint); +#define CALL_ActiveProgramEXT(disp, parameters) \ + (* GET_ActiveProgramEXT(disp)) parameters +static INLINE _glptr_ActiveProgramEXT GET_ActiveProgramEXT(struct _glapi_table *disp) { + return (_glptr_ActiveProgramEXT) (GET_by_offset(disp, _gloffset_ActiveProgramEXT)); +} + +static INLINE void SET_ActiveProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_ActiveProgramEXT, fn); +} + +typedef GLuint (GLAPIENTRYP _glptr_CreateShaderProgramEXT)(GLenum, const GLchar *); +#define CALL_CreateShaderProgramEXT(disp, parameters) \ + (* GET_CreateShaderProgramEXT(disp)) parameters +static INLINE _glptr_CreateShaderProgramEXT GET_CreateShaderProgramEXT(struct _glapi_table *disp) { + return (_glptr_CreateShaderProgramEXT) (GET_by_offset(disp, _gloffset_CreateShaderProgramEXT)); +} + +static INLINE void SET_CreateShaderProgramEXT(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLenum, const GLchar *)) { + SET_by_offset(disp, _gloffset_CreateShaderProgramEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_UseShaderProgramEXT)(GLenum, GLuint); +#define CALL_UseShaderProgramEXT(disp, parameters) \ + (* GET_UseShaderProgramEXT(disp)) parameters +static INLINE _glptr_UseShaderProgramEXT GET_UseShaderProgramEXT(struct _glapi_table *disp) { + return (_glptr_UseShaderProgramEXT) (GET_by_offset(disp, _gloffset_UseShaderProgramEXT)); +} + +static INLINE void SET_UseShaderProgramEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint)) { + SET_by_offset(disp, _gloffset_UseShaderProgramEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_TextureBarrierNV)(void); +#define CALL_TextureBarrierNV(disp, parameters) \ + (* GET_TextureBarrierNV(disp)) parameters +static INLINE _glptr_TextureBarrierNV GET_TextureBarrierNV(struct _glapi_table *disp) { + return (_glptr_TextureBarrierNV) (GET_by_offset(disp, _gloffset_TextureBarrierNV)); +} + +static INLINE void SET_TextureBarrierNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_TextureBarrierNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUFiniNV)(void); +#define CALL_VDPAUFiniNV(disp, parameters) \ + (* GET_VDPAUFiniNV(disp)) parameters +static INLINE _glptr_VDPAUFiniNV GET_VDPAUFiniNV(struct _glapi_table *disp) { + return (_glptr_VDPAUFiniNV) (GET_by_offset(disp, _gloffset_VDPAUFiniNV)); +} + +static INLINE void SET_VDPAUFiniNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(void)) { + SET_by_offset(disp, _gloffset_VDPAUFiniNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUGetSurfaceivNV)(GLintptr, GLenum, GLsizei, GLsizei *, GLint *); +#define CALL_VDPAUGetSurfaceivNV(disp, parameters) \ + (* GET_VDPAUGetSurfaceivNV(disp)) parameters +static INLINE _glptr_VDPAUGetSurfaceivNV GET_VDPAUGetSurfaceivNV(struct _glapi_table *disp) { + return (_glptr_VDPAUGetSurfaceivNV) (GET_by_offset(disp, _gloffset_VDPAUGetSurfaceivNV)); +} + +static INLINE void SET_VDPAUGetSurfaceivNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLintptr, GLenum, GLsizei, GLsizei *, GLint *)) { + SET_by_offset(disp, _gloffset_VDPAUGetSurfaceivNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUInitNV)(const GLvoid *, const GLvoid *); +#define CALL_VDPAUInitNV(disp, parameters) \ + (* GET_VDPAUInitNV(disp)) parameters +static INLINE _glptr_VDPAUInitNV GET_VDPAUInitNV(struct _glapi_table *disp) { + return (_glptr_VDPAUInitNV) (GET_by_offset(disp, _gloffset_VDPAUInitNV)); +} + +static INLINE void SET_VDPAUInitNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLvoid *, const GLvoid *)) { + SET_by_offset(disp, _gloffset_VDPAUInitNV, fn); +} + +typedef GLboolean (GLAPIENTRYP _glptr_VDPAUIsSurfaceNV)(GLintptr); +#define CALL_VDPAUIsSurfaceNV(disp, parameters) \ + (* GET_VDPAUIsSurfaceNV(disp)) parameters +static INLINE _glptr_VDPAUIsSurfaceNV GET_VDPAUIsSurfaceNV(struct _glapi_table *disp) { + return (_glptr_VDPAUIsSurfaceNV) (GET_by_offset(disp, _gloffset_VDPAUIsSurfaceNV)); +} + +static INLINE void SET_VDPAUIsSurfaceNV(struct _glapi_table *disp, GLboolean (GLAPIENTRYP fn)(GLintptr)) { + SET_by_offset(disp, _gloffset_VDPAUIsSurfaceNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUMapSurfacesNV)(GLsizei, const GLintptr *); +#define CALL_VDPAUMapSurfacesNV(disp, parameters) \ + (* GET_VDPAUMapSurfacesNV(disp)) parameters +static INLINE _glptr_VDPAUMapSurfacesNV GET_VDPAUMapSurfacesNV(struct _glapi_table *disp) { + return (_glptr_VDPAUMapSurfacesNV) (GET_by_offset(disp, _gloffset_VDPAUMapSurfacesNV)); +} + +static INLINE void SET_VDPAUMapSurfacesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLintptr *)) { + SET_by_offset(disp, _gloffset_VDPAUMapSurfacesNV, fn); +} + +typedef GLintptr (GLAPIENTRYP _glptr_VDPAURegisterOutputSurfaceNV)(const GLvoid *, GLenum, GLsizei, const GLuint *); +#define CALL_VDPAURegisterOutputSurfaceNV(disp, parameters) \ + (* GET_VDPAURegisterOutputSurfaceNV(disp)) parameters +static INLINE _glptr_VDPAURegisterOutputSurfaceNV GET_VDPAURegisterOutputSurfaceNV(struct _glapi_table *disp) { + return (_glptr_VDPAURegisterOutputSurfaceNV) (GET_by_offset(disp, _gloffset_VDPAURegisterOutputSurfaceNV)); +} + +static INLINE void SET_VDPAURegisterOutputSurfaceNV(struct _glapi_table *disp, GLintptr (GLAPIENTRYP fn)(const GLvoid *, GLenum, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_VDPAURegisterOutputSurfaceNV, fn); +} + +typedef GLintptr (GLAPIENTRYP _glptr_VDPAURegisterVideoSurfaceNV)(const GLvoid *, GLenum, GLsizei, const GLuint *); +#define CALL_VDPAURegisterVideoSurfaceNV(disp, parameters) \ + (* GET_VDPAURegisterVideoSurfaceNV(disp)) parameters +static INLINE _glptr_VDPAURegisterVideoSurfaceNV GET_VDPAURegisterVideoSurfaceNV(struct _glapi_table *disp) { + return (_glptr_VDPAURegisterVideoSurfaceNV) (GET_by_offset(disp, _gloffset_VDPAURegisterVideoSurfaceNV)); +} + +static INLINE void SET_VDPAURegisterVideoSurfaceNV(struct _glapi_table *disp, GLintptr (GLAPIENTRYP fn)(const GLvoid *, GLenum, GLsizei, const GLuint *)) { + SET_by_offset(disp, _gloffset_VDPAURegisterVideoSurfaceNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUSurfaceAccessNV)(GLintptr, GLenum); +#define CALL_VDPAUSurfaceAccessNV(disp, parameters) \ + (* GET_VDPAUSurfaceAccessNV(disp)) parameters +static INLINE _glptr_VDPAUSurfaceAccessNV GET_VDPAUSurfaceAccessNV(struct _glapi_table *disp) { + return (_glptr_VDPAUSurfaceAccessNV) (GET_by_offset(disp, _gloffset_VDPAUSurfaceAccessNV)); +} + +static INLINE void SET_VDPAUSurfaceAccessNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLintptr, GLenum)) { + SET_by_offset(disp, _gloffset_VDPAUSurfaceAccessNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUUnmapSurfacesNV)(GLsizei, const GLintptr *); +#define CALL_VDPAUUnmapSurfacesNV(disp, parameters) \ + (* GET_VDPAUUnmapSurfacesNV(disp)) parameters +static INLINE _glptr_VDPAUUnmapSurfacesNV GET_VDPAUUnmapSurfacesNV(struct _glapi_table *disp) { + return (_glptr_VDPAUUnmapSurfacesNV) (GET_by_offset(disp, _gloffset_VDPAUUnmapSurfacesNV)); +} + +static INLINE void SET_VDPAUUnmapSurfacesNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLsizei, const GLintptr *)) { + SET_by_offset(disp, _gloffset_VDPAUUnmapSurfacesNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_VDPAUUnregisterSurfaceNV)(GLintptr); +#define CALL_VDPAUUnregisterSurfaceNV(disp, parameters) \ + (* GET_VDPAUUnregisterSurfaceNV(disp)) parameters +static INLINE _glptr_VDPAUUnregisterSurfaceNV GET_VDPAUUnregisterSurfaceNV(struct _glapi_table *disp) { + return (_glptr_VDPAUUnregisterSurfaceNV) (GET_by_offset(disp, _gloffset_VDPAUUnregisterSurfaceNV)); +} + +static INLINE void SET_VDPAUUnregisterSurfaceNV(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLintptr)) { + SET_by_offset(disp, _gloffset_VDPAUUnregisterSurfaceNV, fn); +} + +typedef void (GLAPIENTRYP _glptr_BeginPerfQueryINTEL)(GLuint); +#define CALL_BeginPerfQueryINTEL(disp, parameters) \ + (* GET_BeginPerfQueryINTEL(disp)) parameters +static INLINE _glptr_BeginPerfQueryINTEL GET_BeginPerfQueryINTEL(struct _glapi_table *disp) { + return (_glptr_BeginPerfQueryINTEL) (GET_by_offset(disp, _gloffset_BeginPerfQueryINTEL)); +} + +static INLINE void SET_BeginPerfQueryINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_BeginPerfQueryINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_CreatePerfQueryINTEL)(GLuint, GLuint *); +#define CALL_CreatePerfQueryINTEL(disp, parameters) \ + (* GET_CreatePerfQueryINTEL(disp)) parameters +static INLINE _glptr_CreatePerfQueryINTEL GET_CreatePerfQueryINTEL(struct _glapi_table *disp) { + return (_glptr_CreatePerfQueryINTEL) (GET_by_offset(disp, _gloffset_CreatePerfQueryINTEL)); +} + +static INLINE void SET_CreatePerfQueryINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint *)) { + SET_by_offset(disp, _gloffset_CreatePerfQueryINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_DeletePerfQueryINTEL)(GLuint); +#define CALL_DeletePerfQueryINTEL(disp, parameters) \ + (* GET_DeletePerfQueryINTEL(disp)) parameters +static INLINE _glptr_DeletePerfQueryINTEL GET_DeletePerfQueryINTEL(struct _glapi_table *disp) { + return (_glptr_DeletePerfQueryINTEL) (GET_by_offset(disp, _gloffset_DeletePerfQueryINTEL)); +} + +static INLINE void SET_DeletePerfQueryINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_DeletePerfQueryINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_EndPerfQueryINTEL)(GLuint); +#define CALL_EndPerfQueryINTEL(disp, parameters) \ + (* GET_EndPerfQueryINTEL(disp)) parameters +static INLINE _glptr_EndPerfQueryINTEL GET_EndPerfQueryINTEL(struct _glapi_table *disp) { + return (_glptr_EndPerfQueryINTEL) (GET_by_offset(disp, _gloffset_EndPerfQueryINTEL)); +} + +static INLINE void SET_EndPerfQueryINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint)) { + SET_by_offset(disp, _gloffset_EndPerfQueryINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetFirstPerfQueryIdINTEL)(GLuint *); +#define CALL_GetFirstPerfQueryIdINTEL(disp, parameters) \ + (* GET_GetFirstPerfQueryIdINTEL(disp)) parameters +static INLINE _glptr_GetFirstPerfQueryIdINTEL GET_GetFirstPerfQueryIdINTEL(struct _glapi_table *disp) { + return (_glptr_GetFirstPerfQueryIdINTEL) (GET_by_offset(disp, _gloffset_GetFirstPerfQueryIdINTEL)); +} + +static INLINE void SET_GetFirstPerfQueryIdINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint *)) { + SET_by_offset(disp, _gloffset_GetFirstPerfQueryIdINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetNextPerfQueryIdINTEL)(GLuint, GLuint *); +#define CALL_GetNextPerfQueryIdINTEL(disp, parameters) \ + (* GET_GetNextPerfQueryIdINTEL(disp)) parameters +static INLINE _glptr_GetNextPerfQueryIdINTEL GET_GetNextPerfQueryIdINTEL(struct _glapi_table *disp) { + return (_glptr_GetNextPerfQueryIdINTEL) (GET_by_offset(disp, _gloffset_GetNextPerfQueryIdINTEL)); +} + +static INLINE void SET_GetNextPerfQueryIdINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint *)) { + SET_by_offset(disp, _gloffset_GetNextPerfQueryIdINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfCounterInfoINTEL)(GLuint, GLuint, GLuint, GLchar *, GLuint, GLchar *, GLuint *, GLuint *, GLuint *, GLuint *, GLuint64 *); +#define CALL_GetPerfCounterInfoINTEL(disp, parameters) \ + (* GET_GetPerfCounterInfoINTEL(disp)) parameters +static INLINE _glptr_GetPerfCounterInfoINTEL GET_GetPerfCounterInfoINTEL(struct _glapi_table *disp) { + return (_glptr_GetPerfCounterInfoINTEL) (GET_by_offset(disp, _gloffset_GetPerfCounterInfoINTEL)); +} + +static INLINE void SET_GetPerfCounterInfoINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLuint, GLchar *, GLuint, GLchar *, GLuint *, GLuint *, GLuint *, GLuint *, GLuint64 *)) { + SET_by_offset(disp, _gloffset_GetPerfCounterInfoINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfQueryDataINTEL)(GLuint, GLuint, GLsizei, GLvoid *, GLuint *); +#define CALL_GetPerfQueryDataINTEL(disp, parameters) \ + (* GET_GetPerfQueryDataINTEL(disp)) parameters +static INLINE _glptr_GetPerfQueryDataINTEL GET_GetPerfQueryDataINTEL(struct _glapi_table *disp) { + return (_glptr_GetPerfQueryDataINTEL) (GET_by_offset(disp, _gloffset_GetPerfQueryDataINTEL)); +} + +static INLINE void SET_GetPerfQueryDataINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLsizei, GLvoid *, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPerfQueryDataINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfQueryIdByNameINTEL)(GLchar *, GLuint *); +#define CALL_GetPerfQueryIdByNameINTEL(disp, parameters) \ + (* GET_GetPerfQueryIdByNameINTEL(disp)) parameters +static INLINE _glptr_GetPerfQueryIdByNameINTEL GET_GetPerfQueryIdByNameINTEL(struct _glapi_table *disp) { + return (_glptr_GetPerfQueryIdByNameINTEL) (GET_by_offset(disp, _gloffset_GetPerfQueryIdByNameINTEL)); +} + +static INLINE void SET_GetPerfQueryIdByNameINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLchar *, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPerfQueryIdByNameINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetPerfQueryInfoINTEL)(GLuint, GLuint, GLchar *, GLuint *, GLuint *, GLuint *, GLuint *); +#define CALL_GetPerfQueryInfoINTEL(disp, parameters) \ + (* GET_GetPerfQueryInfoINTEL(disp)) parameters +static INLINE _glptr_GetPerfQueryInfoINTEL GET_GetPerfQueryInfoINTEL(struct _glapi_table *disp) { + return (_glptr_GetPerfQueryInfoINTEL) (GET_by_offset(disp, _gloffset_GetPerfQueryInfoINTEL)); +} + +static INLINE void SET_GetPerfQueryInfoINTEL(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint, GLchar *, GLuint *, GLuint *, GLuint *, GLuint *)) { + SET_by_offset(disp, _gloffset_GetPerfQueryInfoINTEL, fn); +} + +typedef void (GLAPIENTRYP _glptr_StencilFuncSeparateATI)(GLenum, GLenum, GLint, GLuint); +#define CALL_StencilFuncSeparateATI(disp, parameters) \ + (* GET_StencilFuncSeparateATI(disp)) parameters +static INLINE _glptr_StencilFuncSeparateATI GET_StencilFuncSeparateATI(struct _glapi_table *disp) { + return (_glptr_StencilFuncSeparateATI) (GET_by_offset(disp, _gloffset_StencilFuncSeparateATI)); +} + +static INLINE void SET_StencilFuncSeparateATI(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLint, GLuint)) { + SET_by_offset(disp, _gloffset_StencilFuncSeparateATI, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramEnvParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *); +#define CALL_ProgramEnvParameters4fvEXT(disp, parameters) \ + (* GET_ProgramEnvParameters4fvEXT(disp)) parameters +static INLINE _glptr_ProgramEnvParameters4fvEXT GET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp) { + return (_glptr_ProgramEnvParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT)); +} + +static INLINE void SET_ProgramEnvParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramEnvParameters4fvEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_ProgramLocalParameters4fvEXT)(GLenum, GLuint, GLsizei, const GLfloat *); +#define CALL_ProgramLocalParameters4fvEXT(disp, parameters) \ + (* GET_ProgramLocalParameters4fvEXT(disp)) parameters +static INLINE _glptr_ProgramLocalParameters4fvEXT GET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp) { + return (_glptr_ProgramLocalParameters4fvEXT) (GET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT)); +} + +static INLINE void SET_ProgramLocalParameters4fvEXT(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLuint, GLsizei, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ProgramLocalParameters4fvEXT, fn); +} + +typedef void (GLAPIENTRYP _glptr_EGLImageTargetRenderbufferStorageOES)(GLenum, GLvoid *); +#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) \ + (* GET_EGLImageTargetRenderbufferStorageOES(disp)) parameters +static INLINE _glptr_EGLImageTargetRenderbufferStorageOES GET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp) { + return (_glptr_EGLImageTargetRenderbufferStorageOES) (GET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES)); +} + +static INLINE void SET_EGLImageTargetRenderbufferStorageOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_EGLImageTargetRenderbufferStorageOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_EGLImageTargetTexture2DOES)(GLenum, GLvoid *); +#define CALL_EGLImageTargetTexture2DOES(disp, parameters) \ + (* GET_EGLImageTargetTexture2DOES(disp)) parameters +static INLINE _glptr_EGLImageTargetTexture2DOES GET_EGLImageTargetTexture2DOES(struct _glapi_table *disp) { + return (_glptr_EGLImageTargetTexture2DOES) (GET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES)); +} + +static INLINE void SET_EGLImageTargetTexture2DOES(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLvoid *)) { + SET_by_offset(disp, _gloffset_EGLImageTargetTexture2DOES, fn); +} + +typedef void (GLAPIENTRYP _glptr_AlphaFuncx)(GLenum, GLclampx); +#define CALL_AlphaFuncx(disp, parameters) \ + (* GET_AlphaFuncx(disp)) parameters +static INLINE _glptr_AlphaFuncx GET_AlphaFuncx(struct _glapi_table *disp) { + return (_glptr_AlphaFuncx) (GET_by_offset(disp, _gloffset_AlphaFuncx)); +} + +static INLINE void SET_AlphaFuncx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLclampx)) { + SET_by_offset(disp, _gloffset_AlphaFuncx, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearColorx)(GLclampx, GLclampx, GLclampx, GLclampx); +#define CALL_ClearColorx(disp, parameters) \ + (* GET_ClearColorx(disp)) parameters +static INLINE _glptr_ClearColorx GET_ClearColorx(struct _glapi_table *disp) { + return (_glptr_ClearColorx) (GET_by_offset(disp, _gloffset_ClearColorx)); +} + +static INLINE void SET_ClearColorx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx, GLclampx, GLclampx)) { + SET_by_offset(disp, _gloffset_ClearColorx, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClearDepthx)(GLclampx); +#define CALL_ClearDepthx(disp, parameters) \ + (* GET_ClearDepthx(disp)) parameters +static INLINE _glptr_ClearDepthx GET_ClearDepthx(struct _glapi_table *disp) { + return (_glptr_ClearDepthx) (GET_by_offset(disp, _gloffset_ClearDepthx)); +} + +static INLINE void SET_ClearDepthx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx)) { + SET_by_offset(disp, _gloffset_ClearDepthx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Color4x)(GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_Color4x(disp, parameters) \ + (* GET_Color4x(disp)) parameters +static INLINE _glptr_Color4x GET_Color4x(struct _glapi_table *disp) { + return (_glptr_Color4x) (GET_by_offset(disp, _gloffset_Color4x)); +} + +static INLINE void SET_Color4x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Color4x, fn); +} + +typedef void (GLAPIENTRYP _glptr_DepthRangex)(GLclampx, GLclampx); +#define CALL_DepthRangex(disp, parameters) \ + (* GET_DepthRangex(disp)) parameters +static INLINE _glptr_DepthRangex GET_DepthRangex(struct _glapi_table *disp) { + return (_glptr_DepthRangex) (GET_by_offset(disp, _gloffset_DepthRangex)); +} + +static INLINE void SET_DepthRangex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLclampx)) { + SET_by_offset(disp, _gloffset_DepthRangex, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogx)(GLenum, GLfixed); +#define CALL_Fogx(disp, parameters) \ + (* GET_Fogx(disp)) parameters +static INLINE _glptr_Fogx GET_Fogx(struct _glapi_table *disp) { + return (_glptr_Fogx) (GET_by_offset(disp, _gloffset_Fogx)); +} + +static INLINE void SET_Fogx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_Fogx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Fogxv)(GLenum, const GLfixed *); +#define CALL_Fogxv(disp, parameters) \ + (* GET_Fogxv(disp)) parameters +static INLINE _glptr_Fogxv GET_Fogxv(struct _glapi_table *disp) { + return (_glptr_Fogxv) (GET_by_offset(disp, _gloffset_Fogxv)); +} + +static INLINE void SET_Fogxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_Fogxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Frustumf)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Frustumf(disp, parameters) \ + (* GET_Frustumf(disp)) parameters +static INLINE _glptr_Frustumf GET_Frustumf(struct _glapi_table *disp) { + return (_glptr_Frustumf) (GET_by_offset(disp, _gloffset_Frustumf)); +} + +static INLINE void SET_Frustumf(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Frustumf, fn); +} + +typedef void (GLAPIENTRYP _glptr_Frustumx)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_Frustumx(disp, parameters) \ + (* GET_Frustumx(disp)) parameters +static INLINE _glptr_Frustumx GET_Frustumx(struct _glapi_table *disp) { + return (_glptr_Frustumx) (GET_by_offset(disp, _gloffset_Frustumx)); +} + +static INLINE void SET_Frustumx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Frustumx, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModelx)(GLenum, GLfixed); +#define CALL_LightModelx(disp, parameters) \ + (* GET_LightModelx(disp)) parameters +static INLINE _glptr_LightModelx GET_LightModelx(struct _glapi_table *disp) { + return (_glptr_LightModelx) (GET_by_offset(disp, _gloffset_LightModelx)); +} + +static INLINE void SET_LightModelx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_LightModelx, fn); +} + +typedef void (GLAPIENTRYP _glptr_LightModelxv)(GLenum, const GLfixed *); +#define CALL_LightModelxv(disp, parameters) \ + (* GET_LightModelxv(disp)) parameters +static INLINE _glptr_LightModelxv GET_LightModelxv(struct _glapi_table *disp) { + return (_glptr_LightModelxv) (GET_by_offset(disp, _gloffset_LightModelxv)); +} + +static INLINE void SET_LightModelxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_LightModelxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lightx)(GLenum, GLenum, GLfixed); +#define CALL_Lightx(disp, parameters) \ + (* GET_Lightx(disp)) parameters +static INLINE _glptr_Lightx GET_Lightx(struct _glapi_table *disp) { + return (_glptr_Lightx) (GET_by_offset(disp, _gloffset_Lightx)); +} + +static INLINE void SET_Lightx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_Lightx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Lightxv)(GLenum, GLenum, const GLfixed *); +#define CALL_Lightxv(disp, parameters) \ + (* GET_Lightxv(disp)) parameters +static INLINE _glptr_Lightxv GET_Lightxv(struct _glapi_table *disp) { + return (_glptr_Lightxv) (GET_by_offset(disp, _gloffset_Lightxv)); +} + +static INLINE void SET_Lightxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_Lightxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_LineWidthx)(GLfixed); +#define CALL_LineWidthx(disp, parameters) \ + (* GET_LineWidthx(disp)) parameters +static INLINE _glptr_LineWidthx GET_LineWidthx(struct _glapi_table *disp) { + return (_glptr_LineWidthx) (GET_by_offset(disp, _gloffset_LineWidthx)); +} + +static INLINE void SET_LineWidthx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) { + SET_by_offset(disp, _gloffset_LineWidthx, fn); +} + +typedef void (GLAPIENTRYP _glptr_LoadMatrixx)(const GLfixed *); +#define CALL_LoadMatrixx(disp, parameters) \ + (* GET_LoadMatrixx(disp)) parameters +static INLINE _glptr_LoadMatrixx GET_LoadMatrixx(struct _glapi_table *disp) { + return (_glptr_LoadMatrixx) (GET_by_offset(disp, _gloffset_LoadMatrixx)); +} + +static INLINE void SET_LoadMatrixx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) { + SET_by_offset(disp, _gloffset_LoadMatrixx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materialx)(GLenum, GLenum, GLfixed); +#define CALL_Materialx(disp, parameters) \ + (* GET_Materialx(disp)) parameters +static INLINE _glptr_Materialx GET_Materialx(struct _glapi_table *disp) { + return (_glptr_Materialx) (GET_by_offset(disp, _gloffset_Materialx)); +} + +static INLINE void SET_Materialx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_Materialx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Materialxv)(GLenum, GLenum, const GLfixed *); +#define CALL_Materialxv(disp, parameters) \ + (* GET_Materialxv(disp)) parameters +static INLINE _glptr_Materialxv GET_Materialxv(struct _glapi_table *disp) { + return (_glptr_Materialxv) (GET_by_offset(disp, _gloffset_Materialxv)); +} + +static INLINE void SET_Materialxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_Materialxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultMatrixx)(const GLfixed *); +#define CALL_MultMatrixx(disp, parameters) \ + (* GET_MultMatrixx(disp)) parameters +static INLINE _glptr_MultMatrixx GET_MultMatrixx(struct _glapi_table *disp) { + return (_glptr_MultMatrixx) (GET_by_offset(disp, _gloffset_MultMatrixx)); +} + +static INLINE void SET_MultMatrixx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(const GLfixed *)) { + SET_by_offset(disp, _gloffset_MultMatrixx, fn); +} + +typedef void (GLAPIENTRYP _glptr_MultiTexCoord4x)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_MultiTexCoord4x(disp, parameters) \ + (* GET_MultiTexCoord4x(disp)) parameters +static INLINE _glptr_MultiTexCoord4x GET_MultiTexCoord4x(struct _glapi_table *disp) { + return (_glptr_MultiTexCoord4x) (GET_by_offset(disp, _gloffset_MultiTexCoord4x)); +} + +static INLINE void SET_MultiTexCoord4x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_MultiTexCoord4x, fn); +} + +typedef void (GLAPIENTRYP _glptr_Normal3x)(GLfixed, GLfixed, GLfixed); +#define CALL_Normal3x(disp, parameters) \ + (* GET_Normal3x(disp)) parameters +static INLINE _glptr_Normal3x GET_Normal3x(struct _glapi_table *disp) { + return (_glptr_Normal3x) (GET_by_offset(disp, _gloffset_Normal3x)); +} + +static INLINE void SET_Normal3x(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Normal3x, fn); +} + +typedef void (GLAPIENTRYP _glptr_Orthof)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); +#define CALL_Orthof(disp, parameters) \ + (* GET_Orthof(disp)) parameters +static INLINE _glptr_Orthof GET_Orthof(struct _glapi_table *disp) { + return (_glptr_Orthof) (GET_by_offset(disp, _gloffset_Orthof)); +} + +static INLINE void SET_Orthof(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat)) { + SET_by_offset(disp, _gloffset_Orthof, fn); +} + +typedef void (GLAPIENTRYP _glptr_Orthox)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_Orthox(disp, parameters) \ + (* GET_Orthox(disp)) parameters +static INLINE _glptr_Orthox GET_Orthox(struct _glapi_table *disp) { + return (_glptr_Orthox) (GET_by_offset(disp, _gloffset_Orthox)); +} + +static INLINE void SET_Orthox(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Orthox, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointSizex)(GLfixed); +#define CALL_PointSizex(disp, parameters) \ + (* GET_PointSizex(disp)) parameters +static INLINE _glptr_PointSizex GET_PointSizex(struct _glapi_table *disp) { + return (_glptr_PointSizex) (GET_by_offset(disp, _gloffset_PointSizex)); +} + +static INLINE void SET_PointSizex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed)) { + SET_by_offset(disp, _gloffset_PointSizex, fn); +} + +typedef void (GLAPIENTRYP _glptr_PolygonOffsetx)(GLfixed, GLfixed); +#define CALL_PolygonOffsetx(disp, parameters) \ + (* GET_PolygonOffsetx(disp)) parameters +static INLINE _glptr_PolygonOffsetx GET_PolygonOffsetx(struct _glapi_table *disp) { + return (_glptr_PolygonOffsetx) (GET_by_offset(disp, _gloffset_PolygonOffsetx)); +} + +static INLINE void SET_PolygonOffsetx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_PolygonOffsetx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Rotatex)(GLfixed, GLfixed, GLfixed, GLfixed); +#define CALL_Rotatex(disp, parameters) \ + (* GET_Rotatex(disp)) parameters +static INLINE _glptr_Rotatex GET_Rotatex(struct _glapi_table *disp) { + return (_glptr_Rotatex) (GET_by_offset(disp, _gloffset_Rotatex)); +} + +static INLINE void SET_Rotatex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Rotatex, fn); +} + +typedef void (GLAPIENTRYP _glptr_SampleCoveragex)(GLclampx, GLboolean); +#define CALL_SampleCoveragex(disp, parameters) \ + (* GET_SampleCoveragex(disp)) parameters +static INLINE _glptr_SampleCoveragex GET_SampleCoveragex(struct _glapi_table *disp) { + return (_glptr_SampleCoveragex) (GET_by_offset(disp, _gloffset_SampleCoveragex)); +} + +static INLINE void SET_SampleCoveragex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLclampx, GLboolean)) { + SET_by_offset(disp, _gloffset_SampleCoveragex, fn); +} + +typedef void (GLAPIENTRYP _glptr_Scalex)(GLfixed, GLfixed, GLfixed); +#define CALL_Scalex(disp, parameters) \ + (* GET_Scalex(disp)) parameters +static INLINE _glptr_Scalex GET_Scalex(struct _glapi_table *disp) { + return (_glptr_Scalex) (GET_by_offset(disp, _gloffset_Scalex)); +} + +static INLINE void SET_Scalex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Scalex, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnvx)(GLenum, GLenum, GLfixed); +#define CALL_TexEnvx(disp, parameters) \ + (* GET_TexEnvx(disp)) parameters +static INLINE _glptr_TexEnvx GET_TexEnvx(struct _glapi_table *disp) { + return (_glptr_TexEnvx) (GET_by_offset(disp, _gloffset_TexEnvx)); +} + +static INLINE void SET_TexEnvx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_TexEnvx, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexEnvxv)(GLenum, GLenum, const GLfixed *); +#define CALL_TexEnvxv(disp, parameters) \ + (* GET_TexEnvxv(disp)) parameters +static INLINE _glptr_TexEnvxv GET_TexEnvxv(struct _glapi_table *disp) { + return (_glptr_TexEnvxv) (GET_by_offset(disp, _gloffset_TexEnvxv)); +} + +static INLINE void SET_TexEnvxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_TexEnvxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterx)(GLenum, GLenum, GLfixed); +#define CALL_TexParameterx(disp, parameters) \ + (* GET_TexParameterx(disp)) parameters +static INLINE _glptr_TexParameterx GET_TexParameterx(struct _glapi_table *disp) { + return (_glptr_TexParameterx) (GET_by_offset(disp, _gloffset_TexParameterx)); +} + +static INLINE void SET_TexParameterx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_TexParameterx, fn); +} + +typedef void (GLAPIENTRYP _glptr_Translatex)(GLfixed, GLfixed, GLfixed); +#define CALL_Translatex(disp, parameters) \ + (* GET_Translatex(disp)) parameters +static INLINE _glptr_Translatex GET_Translatex(struct _glapi_table *disp) { + return (_glptr_Translatex) (GET_by_offset(disp, _gloffset_Translatex)); +} + +static INLINE void SET_Translatex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLfixed, GLfixed, GLfixed)) { + SET_by_offset(disp, _gloffset_Translatex, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClipPlanef)(GLenum, const GLfloat *); +#define CALL_ClipPlanef(disp, parameters) \ + (* GET_ClipPlanef(disp)) parameters +static INLINE _glptr_ClipPlanef GET_ClipPlanef(struct _glapi_table *disp) { + return (_glptr_ClipPlanef) (GET_by_offset(disp, _gloffset_ClipPlanef)); +} + +static INLINE void SET_ClipPlanef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfloat *)) { + SET_by_offset(disp, _gloffset_ClipPlanef, fn); +} + +typedef void (GLAPIENTRYP _glptr_ClipPlanex)(GLenum, const GLfixed *); +#define CALL_ClipPlanex(disp, parameters) \ + (* GET_ClipPlanex(disp)) parameters +static INLINE _glptr_ClipPlanex GET_ClipPlanex(struct _glapi_table *disp) { + return (_glptr_ClipPlanex) (GET_by_offset(disp, _gloffset_ClipPlanex)); +} + +static INLINE void SET_ClipPlanex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_ClipPlanex, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetClipPlanef)(GLenum, GLfloat *); +#define CALL_GetClipPlanef(disp, parameters) \ + (* GET_GetClipPlanef(disp)) parameters +static INLINE _glptr_GetClipPlanef GET_GetClipPlanef(struct _glapi_table *disp) { + return (_glptr_GetClipPlanef) (GET_by_offset(disp, _gloffset_GetClipPlanef)); +} + +static INLINE void SET_GetClipPlanef(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfloat *)) { + SET_by_offset(disp, _gloffset_GetClipPlanef, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetClipPlanex)(GLenum, GLfixed *); +#define CALL_GetClipPlanex(disp, parameters) \ + (* GET_GetClipPlanex(disp)) parameters +static INLINE _glptr_GetClipPlanex GET_GetClipPlanex(struct _glapi_table *disp) { + return (_glptr_GetClipPlanex) (GET_by_offset(disp, _gloffset_GetClipPlanex)); +} + +static INLINE void SET_GetClipPlanex(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetClipPlanex, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetFixedv)(GLenum, GLfixed *); +#define CALL_GetFixedv(disp, parameters) \ + (* GET_GetFixedv(disp)) parameters +static INLINE _glptr_GetFixedv GET_GetFixedv(struct _glapi_table *disp) { + return (_glptr_GetFixedv) (GET_by_offset(disp, _gloffset_GetFixedv)); +} + +static INLINE void SET_GetFixedv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetFixedv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetLightxv)(GLenum, GLenum, GLfixed *); +#define CALL_GetLightxv(disp, parameters) \ + (* GET_GetLightxv(disp)) parameters +static INLINE _glptr_GetLightxv GET_GetLightxv(struct _glapi_table *disp) { + return (_glptr_GetLightxv) (GET_by_offset(disp, _gloffset_GetLightxv)); +} + +static INLINE void SET_GetLightxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetLightxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetMaterialxv)(GLenum, GLenum, GLfixed *); +#define CALL_GetMaterialxv(disp, parameters) \ + (* GET_GetMaterialxv(disp)) parameters +static INLINE _glptr_GetMaterialxv GET_GetMaterialxv(struct _glapi_table *disp) { + return (_glptr_GetMaterialxv) (GET_by_offset(disp, _gloffset_GetMaterialxv)); +} + +static INLINE void SET_GetMaterialxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetMaterialxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexEnvxv)(GLenum, GLenum, GLfixed *); +#define CALL_GetTexEnvxv(disp, parameters) \ + (* GET_GetTexEnvxv(disp)) parameters +static INLINE _glptr_GetTexEnvxv GET_GetTexEnvxv(struct _glapi_table *disp) { + return (_glptr_GetTexEnvxv) (GET_by_offset(disp, _gloffset_GetTexEnvxv)); +} + +static INLINE void SET_GetTexEnvxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetTexEnvxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_GetTexParameterxv)(GLenum, GLenum, GLfixed *); +#define CALL_GetTexParameterxv(disp, parameters) \ + (* GET_GetTexParameterxv(disp)) parameters +static INLINE _glptr_GetTexParameterxv GET_GetTexParameterxv(struct _glapi_table *disp) { + return (_glptr_GetTexParameterxv) (GET_by_offset(disp, _gloffset_GetTexParameterxv)); +} + +static INLINE void SET_GetTexParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLfixed *)) { + SET_by_offset(disp, _gloffset_GetTexParameterxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameterx)(GLenum, GLfixed); +#define CALL_PointParameterx(disp, parameters) \ + (* GET_PointParameterx(disp)) parameters +static INLINE _glptr_PointParameterx GET_PointParameterx(struct _glapi_table *disp) { + return (_glptr_PointParameterx) (GET_by_offset(disp, _gloffset_PointParameterx)); +} + +static INLINE void SET_PointParameterx(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLfixed)) { + SET_by_offset(disp, _gloffset_PointParameterx, fn); +} + +typedef void (GLAPIENTRYP _glptr_PointParameterxv)(GLenum, const GLfixed *); +#define CALL_PointParameterxv(disp, parameters) \ + (* GET_PointParameterxv(disp)) parameters +static INLINE _glptr_PointParameterxv GET_PointParameterxv(struct _glapi_table *disp) { + return (_glptr_PointParameterxv) (GET_by_offset(disp, _gloffset_PointParameterxv)); +} + +static INLINE void SET_PointParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_PointParameterxv, fn); +} + +typedef void (GLAPIENTRYP _glptr_TexParameterxv)(GLenum, GLenum, const GLfixed *); +#define CALL_TexParameterxv(disp, parameters) \ + (* GET_TexParameterxv(disp)) parameters +static INLINE _glptr_TexParameterxv GET_TexParameterxv(struct _glapi_table *disp) { + return (_glptr_TexParameterxv) (GET_by_offset(disp, _gloffset_TexParameterxv)); +} + +static INLINE void SET_TexParameterxv(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, const GLfixed *)) { + SET_by_offset(disp, _gloffset_TexParameterxv, fn); +} + + +#endif /* !defined( _DISPATCH_H_ ) */ diff --cc xorg-server/glx/glapitable.h index 8256ad9,0000000..d42b9ce mode 100644,000000..100644 --- a/xorg-server/glx/glapitable.h +++ b/xorg-server/glx/glapitable.h @@@ -1,1202 -1,0 +1,1203 @@@ +/* DO NOT EDIT - This file generated automatically by gl_table.py (from Mesa) script */ + +/* + * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. + * (C) Copyright IBM Corporation 2004 + * 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, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL, IBM, + * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#if !defined( _GLAPI_TABLE_H_ ) +# define _GLAPI_TABLE_H_ + +#ifndef GLAPIENTRYP +# ifndef GLAPIENTRY +# define GLAPIENTRY +# endif + +# define GLAPIENTRYP GLAPIENTRY * +#endif + + +struct _glapi_table +{ + void (GLAPIENTRYP NewList)(GLuint list, GLenum mode); /* 0 */ + void (GLAPIENTRYP EndList)(void); /* 1 */ + void (GLAPIENTRYP CallList)(GLuint list); /* 2 */ + void (GLAPIENTRYP CallLists)(GLsizei n, GLenum type, const GLvoid * lists); /* 3 */ + void (GLAPIENTRYP DeleteLists)(GLuint list, GLsizei range); /* 4 */ + GLuint (GLAPIENTRYP GenLists)(GLsizei range); /* 5 */ + void (GLAPIENTRYP ListBase)(GLuint base); /* 6 */ + void (GLAPIENTRYP Begin)(GLenum mode); /* 7 */ + void (GLAPIENTRYP Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap); /* 8 */ + void (GLAPIENTRYP Color3b)(GLbyte red, GLbyte green, GLbyte blue); /* 9 */ + void (GLAPIENTRYP Color3bv)(const GLbyte * v); /* 10 */ + void (GLAPIENTRYP Color3d)(GLdouble red, GLdouble green, GLdouble blue); /* 11 */ + void (GLAPIENTRYP Color3dv)(const GLdouble * v); /* 12 */ + void (GLAPIENTRYP Color3f)(GLfloat red, GLfloat green, GLfloat blue); /* 13 */ + void (GLAPIENTRYP Color3fv)(const GLfloat * v); /* 14 */ + void (GLAPIENTRYP Color3i)(GLint red, GLint green, GLint blue); /* 15 */ + void (GLAPIENTRYP Color3iv)(const GLint * v); /* 16 */ + void (GLAPIENTRYP Color3s)(GLshort red, GLshort green, GLshort blue); /* 17 */ + void (GLAPIENTRYP Color3sv)(const GLshort * v); /* 18 */ + void (GLAPIENTRYP Color3ub)(GLubyte red, GLubyte green, GLubyte blue); /* 19 */ + void (GLAPIENTRYP Color3ubv)(const GLubyte * v); /* 20 */ + void (GLAPIENTRYP Color3ui)(GLuint red, GLuint green, GLuint blue); /* 21 */ + void (GLAPIENTRYP Color3uiv)(const GLuint * v); /* 22 */ + void (GLAPIENTRYP Color3us)(GLushort red, GLushort green, GLushort blue); /* 23 */ + void (GLAPIENTRYP Color3usv)(const GLushort * v); /* 24 */ + void (GLAPIENTRYP Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); /* 25 */ + void (GLAPIENTRYP Color4bv)(const GLbyte * v); /* 26 */ + void (GLAPIENTRYP Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); /* 27 */ + void (GLAPIENTRYP Color4dv)(const GLdouble * v); /* 28 */ + void (GLAPIENTRYP Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 29 */ + void (GLAPIENTRYP Color4fv)(const GLfloat * v); /* 30 */ + void (GLAPIENTRYP Color4i)(GLint red, GLint green, GLint blue, GLint alpha); /* 31 */ + void (GLAPIENTRYP Color4iv)(const GLint * v); /* 32 */ + void (GLAPIENTRYP Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha); /* 33 */ + void (GLAPIENTRYP Color4sv)(const GLshort * v); /* 34 */ + void (GLAPIENTRYP Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); /* 35 */ + void (GLAPIENTRYP Color4ubv)(const GLubyte * v); /* 36 */ + void (GLAPIENTRYP Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha); /* 37 */ + void (GLAPIENTRYP Color4uiv)(const GLuint * v); /* 38 */ + void (GLAPIENTRYP Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha); /* 39 */ + void (GLAPIENTRYP Color4usv)(const GLushort * v); /* 40 */ + void (GLAPIENTRYP EdgeFlag)(GLboolean flag); /* 41 */ + void (GLAPIENTRYP EdgeFlagv)(const GLboolean * flag); /* 42 */ + void (GLAPIENTRYP End)(void); /* 43 */ + void (GLAPIENTRYP Indexd)(GLdouble c); /* 44 */ + void (GLAPIENTRYP Indexdv)(const GLdouble * c); /* 45 */ + void (GLAPIENTRYP Indexf)(GLfloat c); /* 46 */ + void (GLAPIENTRYP Indexfv)(const GLfloat * c); /* 47 */ + void (GLAPIENTRYP Indexi)(GLint c); /* 48 */ + void (GLAPIENTRYP Indexiv)(const GLint * c); /* 49 */ + void (GLAPIENTRYP Indexs)(GLshort c); /* 50 */ + void (GLAPIENTRYP Indexsv)(const GLshort * c); /* 51 */ + void (GLAPIENTRYP Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz); /* 52 */ + void (GLAPIENTRYP Normal3bv)(const GLbyte * v); /* 53 */ + void (GLAPIENTRYP Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz); /* 54 */ + void (GLAPIENTRYP Normal3dv)(const GLdouble * v); /* 55 */ + void (GLAPIENTRYP Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz); /* 56 */ + void (GLAPIENTRYP Normal3fv)(const GLfloat * v); /* 57 */ + void (GLAPIENTRYP Normal3i)(GLint nx, GLint ny, GLint nz); /* 58 */ + void (GLAPIENTRYP Normal3iv)(const GLint * v); /* 59 */ + void (GLAPIENTRYP Normal3s)(GLshort nx, GLshort ny, GLshort nz); /* 60 */ + void (GLAPIENTRYP Normal3sv)(const GLshort * v); /* 61 */ + void (GLAPIENTRYP RasterPos2d)(GLdouble x, GLdouble y); /* 62 */ + void (GLAPIENTRYP RasterPos2dv)(const GLdouble * v); /* 63 */ + void (GLAPIENTRYP RasterPos2f)(GLfloat x, GLfloat y); /* 64 */ + void (GLAPIENTRYP RasterPos2fv)(const GLfloat * v); /* 65 */ + void (GLAPIENTRYP RasterPos2i)(GLint x, GLint y); /* 66 */ + void (GLAPIENTRYP RasterPos2iv)(const GLint * v); /* 67 */ + void (GLAPIENTRYP RasterPos2s)(GLshort x, GLshort y); /* 68 */ + void (GLAPIENTRYP RasterPos2sv)(const GLshort * v); /* 69 */ + void (GLAPIENTRYP RasterPos3d)(GLdouble x, GLdouble y, GLdouble z); /* 70 */ + void (GLAPIENTRYP RasterPos3dv)(const GLdouble * v); /* 71 */ + void (GLAPIENTRYP RasterPos3f)(GLfloat x, GLfloat y, GLfloat z); /* 72 */ + void (GLAPIENTRYP RasterPos3fv)(const GLfloat * v); /* 73 */ + void (GLAPIENTRYP RasterPos3i)(GLint x, GLint y, GLint z); /* 74 */ + void (GLAPIENTRYP RasterPos3iv)(const GLint * v); /* 75 */ + void (GLAPIENTRYP RasterPos3s)(GLshort x, GLshort y, GLshort z); /* 76 */ + void (GLAPIENTRYP RasterPos3sv)(const GLshort * v); /* 77 */ + void (GLAPIENTRYP RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 78 */ + void (GLAPIENTRYP RasterPos4dv)(const GLdouble * v); /* 79 */ + void (GLAPIENTRYP RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 80 */ + void (GLAPIENTRYP RasterPos4fv)(const GLfloat * v); /* 81 */ + void (GLAPIENTRYP RasterPos4i)(GLint x, GLint y, GLint z, GLint w); /* 82 */ + void (GLAPIENTRYP RasterPos4iv)(const GLint * v); /* 83 */ + void (GLAPIENTRYP RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 84 */ + void (GLAPIENTRYP RasterPos4sv)(const GLshort * v); /* 85 */ + void (GLAPIENTRYP Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); /* 86 */ + void (GLAPIENTRYP Rectdv)(const GLdouble * v1, const GLdouble * v2); /* 87 */ + void (GLAPIENTRYP Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); /* 88 */ + void (GLAPIENTRYP Rectfv)(const GLfloat * v1, const GLfloat * v2); /* 89 */ + void (GLAPIENTRYP Recti)(GLint x1, GLint y1, GLint x2, GLint y2); /* 90 */ + void (GLAPIENTRYP Rectiv)(const GLint * v1, const GLint * v2); /* 91 */ + void (GLAPIENTRYP Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2); /* 92 */ + void (GLAPIENTRYP Rectsv)(const GLshort * v1, const GLshort * v2); /* 93 */ + void (GLAPIENTRYP TexCoord1d)(GLdouble s); /* 94 */ + void (GLAPIENTRYP TexCoord1dv)(const GLdouble * v); /* 95 */ + void (GLAPIENTRYP TexCoord1f)(GLfloat s); /* 96 */ + void (GLAPIENTRYP TexCoord1fv)(const GLfloat * v); /* 97 */ + void (GLAPIENTRYP TexCoord1i)(GLint s); /* 98 */ + void (GLAPIENTRYP TexCoord1iv)(const GLint * v); /* 99 */ + void (GLAPIENTRYP TexCoord1s)(GLshort s); /* 100 */ + void (GLAPIENTRYP TexCoord1sv)(const GLshort * v); /* 101 */ + void (GLAPIENTRYP TexCoord2d)(GLdouble s, GLdouble t); /* 102 */ + void (GLAPIENTRYP TexCoord2dv)(const GLdouble * v); /* 103 */ + void (GLAPIENTRYP TexCoord2f)(GLfloat s, GLfloat t); /* 104 */ + void (GLAPIENTRYP TexCoord2fv)(const GLfloat * v); /* 105 */ + void (GLAPIENTRYP TexCoord2i)(GLint s, GLint t); /* 106 */ + void (GLAPIENTRYP TexCoord2iv)(const GLint * v); /* 107 */ + void (GLAPIENTRYP TexCoord2s)(GLshort s, GLshort t); /* 108 */ + void (GLAPIENTRYP TexCoord2sv)(const GLshort * v); /* 109 */ + void (GLAPIENTRYP TexCoord3d)(GLdouble s, GLdouble t, GLdouble r); /* 110 */ + void (GLAPIENTRYP TexCoord3dv)(const GLdouble * v); /* 111 */ + void (GLAPIENTRYP TexCoord3f)(GLfloat s, GLfloat t, GLfloat r); /* 112 */ + void (GLAPIENTRYP TexCoord3fv)(const GLfloat * v); /* 113 */ + void (GLAPIENTRYP TexCoord3i)(GLint s, GLint t, GLint r); /* 114 */ + void (GLAPIENTRYP TexCoord3iv)(const GLint * v); /* 115 */ + void (GLAPIENTRYP TexCoord3s)(GLshort s, GLshort t, GLshort r); /* 116 */ + void (GLAPIENTRYP TexCoord3sv)(const GLshort * v); /* 117 */ + void (GLAPIENTRYP TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 118 */ + void (GLAPIENTRYP TexCoord4dv)(const GLdouble * v); /* 119 */ + void (GLAPIENTRYP TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 120 */ + void (GLAPIENTRYP TexCoord4fv)(const GLfloat * v); /* 121 */ + void (GLAPIENTRYP TexCoord4i)(GLint s, GLint t, GLint r, GLint q); /* 122 */ + void (GLAPIENTRYP TexCoord4iv)(const GLint * v); /* 123 */ + void (GLAPIENTRYP TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q); /* 124 */ + void (GLAPIENTRYP TexCoord4sv)(const GLshort * v); /* 125 */ + void (GLAPIENTRYP Vertex2d)(GLdouble x, GLdouble y); /* 126 */ + void (GLAPIENTRYP Vertex2dv)(const GLdouble * v); /* 127 */ + void (GLAPIENTRYP Vertex2f)(GLfloat x, GLfloat y); /* 128 */ + void (GLAPIENTRYP Vertex2fv)(const GLfloat * v); /* 129 */ + void (GLAPIENTRYP Vertex2i)(GLint x, GLint y); /* 130 */ + void (GLAPIENTRYP Vertex2iv)(const GLint * v); /* 131 */ + void (GLAPIENTRYP Vertex2s)(GLshort x, GLshort y); /* 132 */ + void (GLAPIENTRYP Vertex2sv)(const GLshort * v); /* 133 */ + void (GLAPIENTRYP Vertex3d)(GLdouble x, GLdouble y, GLdouble z); /* 134 */ + void (GLAPIENTRYP Vertex3dv)(const GLdouble * v); /* 135 */ + void (GLAPIENTRYP Vertex3f)(GLfloat x, GLfloat y, GLfloat z); /* 136 */ + void (GLAPIENTRYP Vertex3fv)(const GLfloat * v); /* 137 */ + void (GLAPIENTRYP Vertex3i)(GLint x, GLint y, GLint z); /* 138 */ + void (GLAPIENTRYP Vertex3iv)(const GLint * v); /* 139 */ + void (GLAPIENTRYP Vertex3s)(GLshort x, GLshort y, GLshort z); /* 140 */ + void (GLAPIENTRYP Vertex3sv)(const GLshort * v); /* 141 */ + void (GLAPIENTRYP Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 142 */ + void (GLAPIENTRYP Vertex4dv)(const GLdouble * v); /* 143 */ + void (GLAPIENTRYP Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 144 */ + void (GLAPIENTRYP Vertex4fv)(const GLfloat * v); /* 145 */ + void (GLAPIENTRYP Vertex4i)(GLint x, GLint y, GLint z, GLint w); /* 146 */ + void (GLAPIENTRYP Vertex4iv)(const GLint * v); /* 147 */ + void (GLAPIENTRYP Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w); /* 148 */ + void (GLAPIENTRYP Vertex4sv)(const GLshort * v); /* 149 */ + void (GLAPIENTRYP ClipPlane)(GLenum plane, const GLdouble * equation); /* 150 */ + void (GLAPIENTRYP ColorMaterial)(GLenum face, GLenum mode); /* 151 */ + void (GLAPIENTRYP CullFace)(GLenum mode); /* 152 */ + void (GLAPIENTRYP Fogf)(GLenum pname, GLfloat param); /* 153 */ + void (GLAPIENTRYP Fogfv)(GLenum pname, const GLfloat * params); /* 154 */ + void (GLAPIENTRYP Fogi)(GLenum pname, GLint param); /* 155 */ + void (GLAPIENTRYP Fogiv)(GLenum pname, const GLint * params); /* 156 */ + void (GLAPIENTRYP FrontFace)(GLenum mode); /* 157 */ + void (GLAPIENTRYP Hint)(GLenum target, GLenum mode); /* 158 */ + void (GLAPIENTRYP Lightf)(GLenum light, GLenum pname, GLfloat param); /* 159 */ + void (GLAPIENTRYP Lightfv)(GLenum light, GLenum pname, const GLfloat * params); /* 160 */ + void (GLAPIENTRYP Lighti)(GLenum light, GLenum pname, GLint param); /* 161 */ + void (GLAPIENTRYP Lightiv)(GLenum light, GLenum pname, const GLint * params); /* 162 */ + void (GLAPIENTRYP LightModelf)(GLenum pname, GLfloat param); /* 163 */ + void (GLAPIENTRYP LightModelfv)(GLenum pname, const GLfloat * params); /* 164 */ + void (GLAPIENTRYP LightModeli)(GLenum pname, GLint param); /* 165 */ + void (GLAPIENTRYP LightModeliv)(GLenum pname, const GLint * params); /* 166 */ + void (GLAPIENTRYP LineStipple)(GLint factor, GLushort pattern); /* 167 */ + void (GLAPIENTRYP LineWidth)(GLfloat width); /* 168 */ + void (GLAPIENTRYP Materialf)(GLenum face, GLenum pname, GLfloat param); /* 169 */ + void (GLAPIENTRYP Materialfv)(GLenum face, GLenum pname, const GLfloat * params); /* 170 */ + void (GLAPIENTRYP Materiali)(GLenum face, GLenum pname, GLint param); /* 171 */ + void (GLAPIENTRYP Materialiv)(GLenum face, GLenum pname, const GLint * params); /* 172 */ + void (GLAPIENTRYP PointSize)(GLfloat size); /* 173 */ + void (GLAPIENTRYP PolygonMode)(GLenum face, GLenum mode); /* 174 */ + void (GLAPIENTRYP PolygonStipple)(const GLubyte * mask); /* 175 */ + void (GLAPIENTRYP Scissor)(GLint x, GLint y, GLsizei width, GLsizei height); /* 176 */ + void (GLAPIENTRYP ShadeModel)(GLenum mode); /* 177 */ + void (GLAPIENTRYP TexParameterf)(GLenum target, GLenum pname, GLfloat param); /* 178 */ + void (GLAPIENTRYP TexParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 179 */ + void (GLAPIENTRYP TexParameteri)(GLenum target, GLenum pname, GLint param); /* 180 */ + void (GLAPIENTRYP TexParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 181 */ + void (GLAPIENTRYP TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 182 */ + void (GLAPIENTRYP TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 183 */ + void (GLAPIENTRYP TexEnvf)(GLenum target, GLenum pname, GLfloat param); /* 184 */ + void (GLAPIENTRYP TexEnvfv)(GLenum target, GLenum pname, const GLfloat * params); /* 185 */ + void (GLAPIENTRYP TexEnvi)(GLenum target, GLenum pname, GLint param); /* 186 */ + void (GLAPIENTRYP TexEnviv)(GLenum target, GLenum pname, const GLint * params); /* 187 */ + void (GLAPIENTRYP TexGend)(GLenum coord, GLenum pname, GLdouble param); /* 188 */ + void (GLAPIENTRYP TexGendv)(GLenum coord, GLenum pname, const GLdouble * params); /* 189 */ + void (GLAPIENTRYP TexGenf)(GLenum coord, GLenum pname, GLfloat param); /* 190 */ + void (GLAPIENTRYP TexGenfv)(GLenum coord, GLenum pname, const GLfloat * params); /* 191 */ + void (GLAPIENTRYP TexGeni)(GLenum coord, GLenum pname, GLint param); /* 192 */ + void (GLAPIENTRYP TexGeniv)(GLenum coord, GLenum pname, const GLint * params); /* 193 */ + void (GLAPIENTRYP FeedbackBuffer)(GLsizei size, GLenum type, GLfloat * buffer); /* 194 */ + void (GLAPIENTRYP SelectBuffer)(GLsizei size, GLuint * buffer); /* 195 */ + GLint (GLAPIENTRYP RenderMode)(GLenum mode); /* 196 */ + void (GLAPIENTRYP InitNames)(void); /* 197 */ + void (GLAPIENTRYP LoadName)(GLuint name); /* 198 */ + void (GLAPIENTRYP PassThrough)(GLfloat token); /* 199 */ + void (GLAPIENTRYP PopName)(void); /* 200 */ + void (GLAPIENTRYP PushName)(GLuint name); /* 201 */ + void (GLAPIENTRYP DrawBuffer)(GLenum mode); /* 202 */ + void (GLAPIENTRYP Clear)(GLbitfield mask); /* 203 */ + void (GLAPIENTRYP ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); /* 204 */ + void (GLAPIENTRYP ClearIndex)(GLfloat c); /* 205 */ + void (GLAPIENTRYP ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 206 */ + void (GLAPIENTRYP ClearStencil)(GLint s); /* 207 */ + void (GLAPIENTRYP ClearDepth)(GLclampd depth); /* 208 */ + void (GLAPIENTRYP StencilMask)(GLuint mask); /* 209 */ + void (GLAPIENTRYP ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); /* 210 */ + void (GLAPIENTRYP DepthMask)(GLboolean flag); /* 211 */ + void (GLAPIENTRYP IndexMask)(GLuint mask); /* 212 */ + void (GLAPIENTRYP Accum)(GLenum op, GLfloat value); /* 213 */ + void (GLAPIENTRYP Disable)(GLenum cap); /* 214 */ + void (GLAPIENTRYP Enable)(GLenum cap); /* 215 */ + void (GLAPIENTRYP Finish)(void); /* 216 */ + void (GLAPIENTRYP Flush)(void); /* 217 */ + void (GLAPIENTRYP PopAttrib)(void); /* 218 */ + void (GLAPIENTRYP PushAttrib)(GLbitfield mask); /* 219 */ + void (GLAPIENTRYP Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points); /* 220 */ + void (GLAPIENTRYP Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points); /* 221 */ + void (GLAPIENTRYP Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points); /* 222 */ + void (GLAPIENTRYP Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points); /* 223 */ + void (GLAPIENTRYP MapGrid1d)(GLint un, GLdouble u1, GLdouble u2); /* 224 */ + void (GLAPIENTRYP MapGrid1f)(GLint un, GLfloat u1, GLfloat u2); /* 225 */ + void (GLAPIENTRYP MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); /* 226 */ + void (GLAPIENTRYP MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); /* 227 */ + void (GLAPIENTRYP EvalCoord1d)(GLdouble u); /* 228 */ + void (GLAPIENTRYP EvalCoord1dv)(const GLdouble * u); /* 229 */ + void (GLAPIENTRYP EvalCoord1f)(GLfloat u); /* 230 */ + void (GLAPIENTRYP EvalCoord1fv)(const GLfloat * u); /* 231 */ + void (GLAPIENTRYP EvalCoord2d)(GLdouble u, GLdouble v); /* 232 */ + void (GLAPIENTRYP EvalCoord2dv)(const GLdouble * u); /* 233 */ + void (GLAPIENTRYP EvalCoord2f)(GLfloat u, GLfloat v); /* 234 */ + void (GLAPIENTRYP EvalCoord2fv)(const GLfloat * u); /* 235 */ + void (GLAPIENTRYP EvalMesh1)(GLenum mode, GLint i1, GLint i2); /* 236 */ + void (GLAPIENTRYP EvalPoint1)(GLint i); /* 237 */ + void (GLAPIENTRYP EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); /* 238 */ + void (GLAPIENTRYP EvalPoint2)(GLint i, GLint j); /* 239 */ + void (GLAPIENTRYP AlphaFunc)(GLenum func, GLclampf ref); /* 240 */ + void (GLAPIENTRYP BlendFunc)(GLenum sfactor, GLenum dfactor); /* 241 */ + void (GLAPIENTRYP LogicOp)(GLenum opcode); /* 242 */ + void (GLAPIENTRYP StencilFunc)(GLenum func, GLint ref, GLuint mask); /* 243 */ + void (GLAPIENTRYP StencilOp)(GLenum fail, GLenum zfail, GLenum zpass); /* 244 */ + void (GLAPIENTRYP DepthFunc)(GLenum func); /* 245 */ + void (GLAPIENTRYP PixelZoom)(GLfloat xfactor, GLfloat yfactor); /* 246 */ + void (GLAPIENTRYP PixelTransferf)(GLenum pname, GLfloat param); /* 247 */ + void (GLAPIENTRYP PixelTransferi)(GLenum pname, GLint param); /* 248 */ + void (GLAPIENTRYP PixelStoref)(GLenum pname, GLfloat param); /* 249 */ + void (GLAPIENTRYP PixelStorei)(GLenum pname, GLint param); /* 250 */ + void (GLAPIENTRYP PixelMapfv)(GLenum map, GLsizei mapsize, const GLfloat * values); /* 251 */ + void (GLAPIENTRYP PixelMapuiv)(GLenum map, GLsizei mapsize, const GLuint * values); /* 252 */ + void (GLAPIENTRYP PixelMapusv)(GLenum map, GLsizei mapsize, const GLushort * values); /* 253 */ + void (GLAPIENTRYP ReadBuffer)(GLenum mode); /* 254 */ + void (GLAPIENTRYP CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); /* 255 */ + void (GLAPIENTRYP ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels); /* 256 */ + void (GLAPIENTRYP DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 257 */ + void (GLAPIENTRYP GetBooleanv)(GLenum pname, GLboolean * params); /* 258 */ + void (GLAPIENTRYP GetClipPlane)(GLenum plane, GLdouble * equation); /* 259 */ + void (GLAPIENTRYP GetDoublev)(GLenum pname, GLdouble * params); /* 260 */ + GLenum (GLAPIENTRYP GetError)(void); /* 261 */ + void (GLAPIENTRYP GetFloatv)(GLenum pname, GLfloat * params); /* 262 */ + void (GLAPIENTRYP GetIntegerv)(GLenum pname, GLint * params); /* 263 */ + void (GLAPIENTRYP GetLightfv)(GLenum light, GLenum pname, GLfloat * params); /* 264 */ + void (GLAPIENTRYP GetLightiv)(GLenum light, GLenum pname, GLint * params); /* 265 */ + void (GLAPIENTRYP GetMapdv)(GLenum target, GLenum query, GLdouble * v); /* 266 */ + void (GLAPIENTRYP GetMapfv)(GLenum target, GLenum query, GLfloat * v); /* 267 */ + void (GLAPIENTRYP GetMapiv)(GLenum target, GLenum query, GLint * v); /* 268 */ + void (GLAPIENTRYP GetMaterialfv)(GLenum face, GLenum pname, GLfloat * params); /* 269 */ + void (GLAPIENTRYP GetMaterialiv)(GLenum face, GLenum pname, GLint * params); /* 270 */ + void (GLAPIENTRYP GetPixelMapfv)(GLenum map, GLfloat * values); /* 271 */ + void (GLAPIENTRYP GetPixelMapuiv)(GLenum map, GLuint * values); /* 272 */ + void (GLAPIENTRYP GetPixelMapusv)(GLenum map, GLushort * values); /* 273 */ + void (GLAPIENTRYP GetPolygonStipple)(GLubyte * mask); /* 274 */ + const GLubyte * (GLAPIENTRYP GetString)(GLenum name); /* 275 */ + void (GLAPIENTRYP GetTexEnvfv)(GLenum target, GLenum pname, GLfloat * params); /* 276 */ + void (GLAPIENTRYP GetTexEnviv)(GLenum target, GLenum pname, GLint * params); /* 277 */ + void (GLAPIENTRYP GetTexGendv)(GLenum coord, GLenum pname, GLdouble * params); /* 278 */ + void (GLAPIENTRYP GetTexGenfv)(GLenum coord, GLenum pname, GLfloat * params); /* 279 */ + void (GLAPIENTRYP GetTexGeniv)(GLenum coord, GLenum pname, GLint * params); /* 280 */ + void (GLAPIENTRYP GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels); /* 281 */ + void (GLAPIENTRYP GetTexParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 282 */ + void (GLAPIENTRYP GetTexParameteriv)(GLenum target, GLenum pname, GLint * params); /* 283 */ + void (GLAPIENTRYP GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat * params); /* 284 */ + void (GLAPIENTRYP GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint * params); /* 285 */ + GLboolean (GLAPIENTRYP IsEnabled)(GLenum cap); /* 286 */ + GLboolean (GLAPIENTRYP IsList)(GLuint list); /* 287 */ + void (GLAPIENTRYP DepthRange)(GLclampd zNear, GLclampd zFar); /* 288 */ + void (GLAPIENTRYP Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 289 */ + void (GLAPIENTRYP LoadIdentity)(void); /* 290 */ + void (GLAPIENTRYP LoadMatrixf)(const GLfloat * m); /* 291 */ + void (GLAPIENTRYP LoadMatrixd)(const GLdouble * m); /* 292 */ + void (GLAPIENTRYP MatrixMode)(GLenum mode); /* 293 */ + void (GLAPIENTRYP MultMatrixf)(const GLfloat * m); /* 294 */ + void (GLAPIENTRYP MultMatrixd)(const GLdouble * m); /* 295 */ + void (GLAPIENTRYP Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); /* 296 */ + void (GLAPIENTRYP PopMatrix)(void); /* 297 */ + void (GLAPIENTRYP PushMatrix)(void); /* 298 */ + void (GLAPIENTRYP Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z); /* 299 */ + void (GLAPIENTRYP Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z); /* 300 */ + void (GLAPIENTRYP Scaled)(GLdouble x, GLdouble y, GLdouble z); /* 301 */ + void (GLAPIENTRYP Scalef)(GLfloat x, GLfloat y, GLfloat z); /* 302 */ + void (GLAPIENTRYP Translated)(GLdouble x, GLdouble y, GLdouble z); /* 303 */ + void (GLAPIENTRYP Translatef)(GLfloat x, GLfloat y, GLfloat z); /* 304 */ + void (GLAPIENTRYP Viewport)(GLint x, GLint y, GLsizei width, GLsizei height); /* 305 */ + void (GLAPIENTRYP ArrayElement)(GLint i); /* 306 */ + void (GLAPIENTRYP BindTexture)(GLenum target, GLuint texture); /* 307 */ + void (GLAPIENTRYP ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 308 */ + void (GLAPIENTRYP DisableClientState)(GLenum array); /* 309 */ + void (GLAPIENTRYP DrawArrays)(GLenum mode, GLint first, GLsizei count); /* 310 */ + void (GLAPIENTRYP DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices); /* 311 */ + void (GLAPIENTRYP EdgeFlagPointer)(GLsizei stride, const GLvoid * pointer); /* 312 */ + void (GLAPIENTRYP EnableClientState)(GLenum array); /* 313 */ + void (GLAPIENTRYP IndexPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 314 */ + void (GLAPIENTRYP Indexub)(GLubyte c); /* 315 */ + void (GLAPIENTRYP Indexubv)(const GLubyte * c); /* 316 */ + void (GLAPIENTRYP InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid * pointer); /* 317 */ + void (GLAPIENTRYP NormalPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 318 */ + void (GLAPIENTRYP PolygonOffset)(GLfloat factor, GLfloat units); /* 319 */ + void (GLAPIENTRYP TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 320 */ + void (GLAPIENTRYP VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 321 */ + GLboolean (GLAPIENTRYP AreTexturesResident)(GLsizei n, const GLuint * textures, GLboolean * residences); /* 322 */ + void (GLAPIENTRYP CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); /* 323 */ + void (GLAPIENTRYP CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); /* 324 */ + void (GLAPIENTRYP CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); /* 325 */ + void (GLAPIENTRYP CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 326 */ + void (GLAPIENTRYP DeleteTextures)(GLsizei n, const GLuint * textures); /* 327 */ + void (GLAPIENTRYP GenTextures)(GLsizei n, GLuint * textures); /* 328 */ + void (GLAPIENTRYP GetPointerv)(GLenum pname, GLvoid ** params); /* 329 */ + GLboolean (GLAPIENTRYP IsTexture)(GLuint texture); /* 330 */ + void (GLAPIENTRYP PrioritizeTextures)(GLsizei n, const GLuint * textures, const GLclampf * priorities); /* 331 */ + void (GLAPIENTRYP TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels); /* 332 */ + void (GLAPIENTRYP TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels); /* 333 */ + void (GLAPIENTRYP PopClientAttrib)(void); /* 334 */ + void (GLAPIENTRYP PushClientAttrib)(GLbitfield mask); /* 335 */ + void (GLAPIENTRYP BlendColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); /* 336 */ + void (GLAPIENTRYP BlendEquation)(GLenum mode); /* 337 */ + void (GLAPIENTRYP DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices); /* 338 */ + void (GLAPIENTRYP ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * table); /* 339 */ + void (GLAPIENTRYP ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 340 */ + void (GLAPIENTRYP ColorTableParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 341 */ + void (GLAPIENTRYP CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 342 */ + void (GLAPIENTRYP GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid * table); /* 343 */ + void (GLAPIENTRYP GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 344 */ + void (GLAPIENTRYP GetColorTableParameteriv)(GLenum target, GLenum pname, GLint * params); /* 345 */ + void (GLAPIENTRYP ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid * data); /* 346 */ + void (GLAPIENTRYP CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); /* 347 */ + void (GLAPIENTRYP ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid * image); /* 348 */ + void (GLAPIENTRYP ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * image); /* 349 */ + void (GLAPIENTRYP ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params); /* 350 */ + void (GLAPIENTRYP ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat * params); /* 351 */ + void (GLAPIENTRYP ConvolutionParameteri)(GLenum target, GLenum pname, GLint params); /* 352 */ + void (GLAPIENTRYP ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint * params); /* 353 */ + void (GLAPIENTRYP CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); /* 354 */ + void (GLAPIENTRYP CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); /* 355 */ + void (GLAPIENTRYP GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid * image); /* 356 */ + void (GLAPIENTRYP GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 357 */ + void (GLAPIENTRYP GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint * params); /* 358 */ + void (GLAPIENTRYP GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); /* 359 */ + void (GLAPIENTRYP SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * row, const GLvoid * column); /* 360 */ + void (GLAPIENTRYP GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 361 */ + void (GLAPIENTRYP GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 362 */ + void (GLAPIENTRYP GetHistogramParameteriv)(GLenum target, GLenum pname, GLint * params); /* 363 */ + void (GLAPIENTRYP GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); /* 364 */ + void (GLAPIENTRYP GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat * params); /* 365 */ + void (GLAPIENTRYP GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint * params); /* 366 */ + void (GLAPIENTRYP Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); /* 367 */ + void (GLAPIENTRYP Minmax)(GLenum target, GLenum internalformat, GLboolean sink); /* 368 */ + void (GLAPIENTRYP ResetHistogram)(GLenum target); /* 369 */ + void (GLAPIENTRYP ResetMinmax)(GLenum target); /* 370 */ + void (GLAPIENTRYP TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid * pixels); /* 371 */ + void (GLAPIENTRYP TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * pixels); /* 372 */ + void (GLAPIENTRYP CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); /* 373 */ + void (GLAPIENTRYP ActiveTexture)(GLenum texture); /* 374 */ + void (GLAPIENTRYP ClientActiveTexture)(GLenum texture); /* 375 */ + void (GLAPIENTRYP MultiTexCoord1d)(GLenum target, GLdouble s); /* 376 */ + void (GLAPIENTRYP MultiTexCoord1dv)(GLenum target, const GLdouble * v); /* 377 */ + void (GLAPIENTRYP MultiTexCoord1fARB)(GLenum target, GLfloat s); /* 378 */ + void (GLAPIENTRYP MultiTexCoord1fvARB)(GLenum target, const GLfloat * v); /* 379 */ + void (GLAPIENTRYP MultiTexCoord1i)(GLenum target, GLint s); /* 380 */ + void (GLAPIENTRYP MultiTexCoord1iv)(GLenum target, const GLint * v); /* 381 */ + void (GLAPIENTRYP MultiTexCoord1s)(GLenum target, GLshort s); /* 382 */ + void (GLAPIENTRYP MultiTexCoord1sv)(GLenum target, const GLshort * v); /* 383 */ + void (GLAPIENTRYP MultiTexCoord2d)(GLenum target, GLdouble s, GLdouble t); /* 384 */ + void (GLAPIENTRYP MultiTexCoord2dv)(GLenum target, const GLdouble * v); /* 385 */ + void (GLAPIENTRYP MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t); /* 386 */ + void (GLAPIENTRYP MultiTexCoord2fvARB)(GLenum target, const GLfloat * v); /* 387 */ + void (GLAPIENTRYP MultiTexCoord2i)(GLenum target, GLint s, GLint t); /* 388 */ + void (GLAPIENTRYP MultiTexCoord2iv)(GLenum target, const GLint * v); /* 389 */ + void (GLAPIENTRYP MultiTexCoord2s)(GLenum target, GLshort s, GLshort t); /* 390 */ + void (GLAPIENTRYP MultiTexCoord2sv)(GLenum target, const GLshort * v); /* 391 */ + void (GLAPIENTRYP MultiTexCoord3d)(GLenum target, GLdouble s, GLdouble t, GLdouble r); /* 392 */ + void (GLAPIENTRYP MultiTexCoord3dv)(GLenum target, const GLdouble * v); /* 393 */ + void (GLAPIENTRYP MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r); /* 394 */ + void (GLAPIENTRYP MultiTexCoord3fvARB)(GLenum target, const GLfloat * v); /* 395 */ + void (GLAPIENTRYP MultiTexCoord3i)(GLenum target, GLint s, GLint t, GLint r); /* 396 */ + void (GLAPIENTRYP MultiTexCoord3iv)(GLenum target, const GLint * v); /* 397 */ + void (GLAPIENTRYP MultiTexCoord3s)(GLenum target, GLshort s, GLshort t, GLshort r); /* 398 */ + void (GLAPIENTRYP MultiTexCoord3sv)(GLenum target, const GLshort * v); /* 399 */ + void (GLAPIENTRYP MultiTexCoord4d)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); /* 400 */ + void (GLAPIENTRYP MultiTexCoord4dv)(GLenum target, const GLdouble * v); /* 401 */ + void (GLAPIENTRYP MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); /* 402 */ + void (GLAPIENTRYP MultiTexCoord4fvARB)(GLenum target, const GLfloat * v); /* 403 */ + void (GLAPIENTRYP MultiTexCoord4i)(GLenum target, GLint s, GLint t, GLint r, GLint q); /* 404 */ + void (GLAPIENTRYP MultiTexCoord4iv)(GLenum target, const GLint * v); /* 405 */ + void (GLAPIENTRYP MultiTexCoord4s)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); /* 406 */ + void (GLAPIENTRYP MultiTexCoord4sv)(GLenum target, const GLshort * v); /* 407 */ +#if !defined HAVE_SHARED_GLAPI + void (GLAPIENTRYP CompressedTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 408 */ + void (GLAPIENTRYP CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 409 */ + void (GLAPIENTRYP CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 410 */ + void (GLAPIENTRYP CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 411 */ + void (GLAPIENTRYP CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 412 */ + void (GLAPIENTRYP CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 413 */ + void (GLAPIENTRYP GetCompressedTexImage)(GLenum target, GLint level, GLvoid * img); /* 414 */ + void (GLAPIENTRYP LoadTransposeMatrixd)(const GLdouble * m); /* 415 */ + void (GLAPIENTRYP LoadTransposeMatrixf)(const GLfloat * m); /* 416 */ + void (GLAPIENTRYP MultTransposeMatrixd)(const GLdouble * m); /* 417 */ + void (GLAPIENTRYP MultTransposeMatrixf)(const GLfloat * m); /* 418 */ + void (GLAPIENTRYP SampleCoverage)(GLclampf value, GLboolean invert); /* 419 */ + void (GLAPIENTRYP BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 420 */ + void (GLAPIENTRYP FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 421 */ + void (GLAPIENTRYP FogCoordd)(GLdouble coord); /* 422 */ + void (GLAPIENTRYP FogCoorddv)(const GLdouble * coord); /* 423 */ + void (GLAPIENTRYP MultiDrawArrays)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 424 */ + void (GLAPIENTRYP PointParameterf)(GLenum pname, GLfloat param); /* 425 */ + void (GLAPIENTRYP PointParameterfv)(GLenum pname, const GLfloat * params); /* 426 */ + void (GLAPIENTRYP PointParameteri)(GLenum pname, GLint param); /* 427 */ + void (GLAPIENTRYP PointParameteriv)(GLenum pname, const GLint * params); /* 428 */ + void (GLAPIENTRYP SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue); /* 429 */ + void (GLAPIENTRYP SecondaryColor3bv)(const GLbyte * v); /* 430 */ + void (GLAPIENTRYP SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue); /* 431 */ + void (GLAPIENTRYP SecondaryColor3dv)(const GLdouble * v); /* 432 */ + void (GLAPIENTRYP SecondaryColor3i)(GLint red, GLint green, GLint blue); /* 433 */ + void (GLAPIENTRYP SecondaryColor3iv)(const GLint * v); /* 434 */ + void (GLAPIENTRYP SecondaryColor3s)(GLshort red, GLshort green, GLshort blue); /* 435 */ + void (GLAPIENTRYP SecondaryColor3sv)(const GLshort * v); /* 436 */ + void (GLAPIENTRYP SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue); /* 437 */ + void (GLAPIENTRYP SecondaryColor3ubv)(const GLubyte * v); /* 438 */ + void (GLAPIENTRYP SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue); /* 439 */ + void (GLAPIENTRYP SecondaryColor3uiv)(const GLuint * v); /* 440 */ + void (GLAPIENTRYP SecondaryColor3us)(GLushort red, GLushort green, GLushort blue); /* 441 */ + void (GLAPIENTRYP SecondaryColor3usv)(const GLushort * v); /* 442 */ + void (GLAPIENTRYP SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 443 */ + void (GLAPIENTRYP WindowPos2d)(GLdouble x, GLdouble y); /* 444 */ + void (GLAPIENTRYP WindowPos2dv)(const GLdouble * v); /* 445 */ + void (GLAPIENTRYP WindowPos2f)(GLfloat x, GLfloat y); /* 446 */ + void (GLAPIENTRYP WindowPos2fv)(const GLfloat * v); /* 447 */ + void (GLAPIENTRYP WindowPos2i)(GLint x, GLint y); /* 448 */ + void (GLAPIENTRYP WindowPos2iv)(const GLint * v); /* 449 */ + void (GLAPIENTRYP WindowPos2s)(GLshort x, GLshort y); /* 450 */ + void (GLAPIENTRYP WindowPos2sv)(const GLshort * v); /* 451 */ + void (GLAPIENTRYP WindowPos3d)(GLdouble x, GLdouble y, GLdouble z); /* 452 */ + void (GLAPIENTRYP WindowPos3dv)(const GLdouble * v); /* 453 */ + void (GLAPIENTRYP WindowPos3f)(GLfloat x, GLfloat y, GLfloat z); /* 454 */ + void (GLAPIENTRYP WindowPos3fv)(const GLfloat * v); /* 455 */ + void (GLAPIENTRYP WindowPos3i)(GLint x, GLint y, GLint z); /* 456 */ + void (GLAPIENTRYP WindowPos3iv)(const GLint * v); /* 457 */ + void (GLAPIENTRYP WindowPos3s)(GLshort x, GLshort y, GLshort z); /* 458 */ + void (GLAPIENTRYP WindowPos3sv)(const GLshort * v); /* 459 */ + void (GLAPIENTRYP BeginQuery)(GLenum target, GLuint id); /* 460 */ + void (GLAPIENTRYP BindBuffer)(GLenum target, GLuint buffer); /* 461 */ + void (GLAPIENTRYP BufferData)(GLenum target, GLsizeiptr size, const GLvoid * data, GLenum usage); /* 462 */ + void (GLAPIENTRYP BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid * data); /* 463 */ + void (GLAPIENTRYP DeleteBuffers)(GLsizei n, const GLuint * buffer); /* 464 */ + void (GLAPIENTRYP DeleteQueries)(GLsizei n, const GLuint * ids); /* 465 */ + void (GLAPIENTRYP EndQuery)(GLenum target); /* 466 */ + void (GLAPIENTRYP GenBuffers)(GLsizei n, GLuint * buffer); /* 467 */ + void (GLAPIENTRYP GenQueries)(GLsizei n, GLuint * ids); /* 468 */ + void (GLAPIENTRYP GetBufferParameteriv)(GLenum target, GLenum pname, GLint * params); /* 469 */ + void (GLAPIENTRYP GetBufferPointerv)(GLenum target, GLenum pname, GLvoid ** params); /* 470 */ + void (GLAPIENTRYP GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid * data); /* 471 */ + void (GLAPIENTRYP GetQueryObjectiv)(GLuint id, GLenum pname, GLint * params); /* 472 */ + void (GLAPIENTRYP GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint * params); /* 473 */ + void (GLAPIENTRYP GetQueryiv)(GLenum target, GLenum pname, GLint * params); /* 474 */ + GLboolean (GLAPIENTRYP IsBuffer)(GLuint buffer); /* 475 */ + GLboolean (GLAPIENTRYP IsQuery)(GLuint id); /* 476 */ + GLvoid * (GLAPIENTRYP MapBuffer)(GLenum target, GLenum access); /* 477 */ + GLboolean (GLAPIENTRYP UnmapBuffer)(GLenum target); /* 478 */ + void (GLAPIENTRYP AttachShader)(GLuint program, GLuint shader); /* 479 */ + void (GLAPIENTRYP BindAttribLocation)(GLuint program, GLuint index, const GLchar * name); /* 480 */ + void (GLAPIENTRYP BlendEquationSeparate)(GLenum modeRGB, GLenum modeA); /* 481 */ + void (GLAPIENTRYP CompileShader)(GLuint shader); /* 482 */ + GLuint (GLAPIENTRYP CreateProgram)(void); /* 483 */ + GLuint (GLAPIENTRYP CreateShader)(GLenum type); /* 484 */ + void (GLAPIENTRYP DeleteProgram)(GLuint program); /* 485 */ + void (GLAPIENTRYP DeleteShader)(GLuint program); /* 486 */ + void (GLAPIENTRYP DetachShader)(GLuint program, GLuint shader); /* 487 */ + void (GLAPIENTRYP DisableVertexAttribArray)(GLuint index); /* 488 */ + void (GLAPIENTRYP DrawBuffers)(GLsizei n, const GLenum * bufs); /* 489 */ + void (GLAPIENTRYP EnableVertexAttribArray)(GLuint index); /* 490 */ + void (GLAPIENTRYP GetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name); /* 491 */ + void (GLAPIENTRYP GetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLchar * name); /* 492 */ + void (GLAPIENTRYP GetAttachedShaders)(GLuint program, GLsizei maxCount, GLsizei * count, GLuint * obj); /* 493 */ + GLint (GLAPIENTRYP GetAttribLocation)(GLuint program, const GLchar * name); /* 494 */ + void (GLAPIENTRYP GetProgramInfoLog)(GLuint program, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 495 */ + void (GLAPIENTRYP GetProgramiv)(GLuint program, GLenum pname, GLint * params); /* 496 */ + void (GLAPIENTRYP GetShaderInfoLog)(GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 497 */ + void (GLAPIENTRYP GetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei * length, GLchar * source); /* 498 */ + void (GLAPIENTRYP GetShaderiv)(GLuint shader, GLenum pname, GLint * params); /* 499 */ + GLint (GLAPIENTRYP GetUniformLocation)(GLuint program, const GLchar * name); /* 500 */ + void (GLAPIENTRYP GetUniformfv)(GLuint program, GLint location, GLfloat * params); /* 501 */ + void (GLAPIENTRYP GetUniformiv)(GLuint program, GLint location, GLint * params); /* 502 */ + void (GLAPIENTRYP GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid ** pointer); /* 503 */ + void (GLAPIENTRYP GetVertexAttribdv)(GLuint index, GLenum pname, GLdouble * params); /* 504 */ + void (GLAPIENTRYP GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat * params); /* 505 */ + void (GLAPIENTRYP GetVertexAttribiv)(GLuint index, GLenum pname, GLint * params); /* 506 */ + GLboolean (GLAPIENTRYP IsProgram)(GLuint program); /* 507 */ + GLboolean (GLAPIENTRYP IsShader)(GLuint shader); /* 508 */ + void (GLAPIENTRYP LinkProgram)(GLuint program); /* 509 */ + void (GLAPIENTRYP ShaderSource)(GLuint shader, GLsizei count, const GLchar * const * string, const GLint * length); /* 510 */ + void (GLAPIENTRYP StencilFuncSeparate)(GLenum face, GLenum func, GLint ref, GLuint mask); /* 511 */ + void (GLAPIENTRYP StencilMaskSeparate)(GLenum face, GLuint mask); /* 512 */ + void (GLAPIENTRYP StencilOpSeparate)(GLenum face, GLenum sfail, GLenum zfail, GLenum zpass); /* 513 */ + void (GLAPIENTRYP Uniform1f)(GLint location, GLfloat v0); /* 514 */ + void (GLAPIENTRYP Uniform1fv)(GLint location, GLsizei count, const GLfloat * value); /* 515 */ + void (GLAPIENTRYP Uniform1i)(GLint location, GLint v0); /* 516 */ + void (GLAPIENTRYP Uniform1iv)(GLint location, GLsizei count, const GLint * value); /* 517 */ + void (GLAPIENTRYP Uniform2f)(GLint location, GLfloat v0, GLfloat v1); /* 518 */ + void (GLAPIENTRYP Uniform2fv)(GLint location, GLsizei count, const GLfloat * value); /* 519 */ + void (GLAPIENTRYP Uniform2i)(GLint location, GLint v0, GLint v1); /* 520 */ + void (GLAPIENTRYP Uniform2iv)(GLint location, GLsizei count, const GLint * value); /* 521 */ + void (GLAPIENTRYP Uniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 522 */ + void (GLAPIENTRYP Uniform3fv)(GLint location, GLsizei count, const GLfloat * value); /* 523 */ + void (GLAPIENTRYP Uniform3i)(GLint location, GLint v0, GLint v1, GLint v2); /* 524 */ + void (GLAPIENTRYP Uniform3iv)(GLint location, GLsizei count, const GLint * value); /* 525 */ + void (GLAPIENTRYP Uniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 526 */ + void (GLAPIENTRYP Uniform4fv)(GLint location, GLsizei count, const GLfloat * value); /* 527 */ + void (GLAPIENTRYP Uniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 528 */ + void (GLAPIENTRYP Uniform4iv)(GLint location, GLsizei count, const GLint * value); /* 529 */ + void (GLAPIENTRYP UniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 530 */ + void (GLAPIENTRYP UniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 531 */ + void (GLAPIENTRYP UniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 532 */ + void (GLAPIENTRYP UseProgram)(GLuint program); /* 533 */ + void (GLAPIENTRYP ValidateProgram)(GLuint program); /* 534 */ + void (GLAPIENTRYP VertexAttrib1d)(GLuint index, GLdouble x); /* 535 */ + void (GLAPIENTRYP VertexAttrib1dv)(GLuint index, const GLdouble * v); /* 536 */ + void (GLAPIENTRYP VertexAttrib1s)(GLuint index, GLshort x); /* 537 */ + void (GLAPIENTRYP VertexAttrib1sv)(GLuint index, const GLshort * v); /* 538 */ + void (GLAPIENTRYP VertexAttrib2d)(GLuint index, GLdouble x, GLdouble y); /* 539 */ + void (GLAPIENTRYP VertexAttrib2dv)(GLuint index, const GLdouble * v); /* 540 */ + void (GLAPIENTRYP VertexAttrib2s)(GLuint index, GLshort x, GLshort y); /* 541 */ + void (GLAPIENTRYP VertexAttrib2sv)(GLuint index, const GLshort * v); /* 542 */ + void (GLAPIENTRYP VertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 543 */ + void (GLAPIENTRYP VertexAttrib3dv)(GLuint index, const GLdouble * v); /* 544 */ + void (GLAPIENTRYP VertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z); /* 545 */ + void (GLAPIENTRYP VertexAttrib3sv)(GLuint index, const GLshort * v); /* 546 */ + void (GLAPIENTRYP VertexAttrib4Nbv)(GLuint index, const GLbyte * v); /* 547 */ + void (GLAPIENTRYP VertexAttrib4Niv)(GLuint index, const GLint * v); /* 548 */ + void (GLAPIENTRYP VertexAttrib4Nsv)(GLuint index, const GLshort * v); /* 549 */ + void (GLAPIENTRYP VertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 550 */ + void (GLAPIENTRYP VertexAttrib4Nubv)(GLuint index, const GLubyte * v); /* 551 */ + void (GLAPIENTRYP VertexAttrib4Nuiv)(GLuint index, const GLuint * v); /* 552 */ + void (GLAPIENTRYP VertexAttrib4Nusv)(GLuint index, const GLushort * v); /* 553 */ + void (GLAPIENTRYP VertexAttrib4bv)(GLuint index, const GLbyte * v); /* 554 */ + void (GLAPIENTRYP VertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 555 */ + void (GLAPIENTRYP VertexAttrib4dv)(GLuint index, const GLdouble * v); /* 556 */ + void (GLAPIENTRYP VertexAttrib4iv)(GLuint index, const GLint * v); /* 557 */ + void (GLAPIENTRYP VertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 558 */ + void (GLAPIENTRYP VertexAttrib4sv)(GLuint index, const GLshort * v); /* 559 */ + void (GLAPIENTRYP VertexAttrib4ubv)(GLuint index, const GLubyte * v); /* 560 */ + void (GLAPIENTRYP VertexAttrib4uiv)(GLuint index, const GLuint * v); /* 561 */ + void (GLAPIENTRYP VertexAttrib4usv)(GLuint index, const GLushort * v); /* 562 */ + void (GLAPIENTRYP VertexAttribPointer)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 563 */ + void (GLAPIENTRYP UniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */ + void (GLAPIENTRYP UniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */ + void (GLAPIENTRYP UniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 566 */ + void (GLAPIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 567 */ + void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 568 */ + void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 569 */ + void (GLAPIENTRYP BeginConditionalRender)(GLuint query, GLenum mode); /* 570 */ + void (GLAPIENTRYP BeginTransformFeedback)(GLenum mode); /* 571 */ + void (GLAPIENTRYP BindBufferBase)(GLenum target, GLuint index, GLuint buffer); /* 572 */ + void (GLAPIENTRYP BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 573 */ + void (GLAPIENTRYP BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar * name); /* 574 */ + void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 575 */ + void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 576 */ + void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 577 */ + void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 578 */ + void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 579 */ + void (GLAPIENTRYP ColorMaski)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 580 */ + void (GLAPIENTRYP Disablei)(GLenum target, GLuint index); /* 581 */ + void (GLAPIENTRYP Enablei)(GLenum target, GLuint index); /* 582 */ + void (GLAPIENTRYP EndConditionalRender)(void); /* 583 */ + void (GLAPIENTRYP EndTransformFeedback)(void); /* 584 */ + void (GLAPIENTRYP GetBooleani_v)(GLenum value, GLuint index, GLboolean * data); /* 585 */ + GLint (GLAPIENTRYP GetFragDataLocation)(GLuint program, const GLchar * name); /* 586 */ + void (GLAPIENTRYP GetIntegeri_v)(GLenum value, GLuint index, GLint * data); /* 587 */ + const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 588 */ + void (GLAPIENTRYP GetTexParameterIiv)(GLenum target, GLenum pname, GLint * params); /* 589 */ + void (GLAPIENTRYP GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint * params); /* 590 */ + void (GLAPIENTRYP GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 591 */ + void (GLAPIENTRYP GetUniformuiv)(GLuint program, GLint location, GLuint * params); /* 592 */ + void (GLAPIENTRYP GetVertexAttribIiv)(GLuint index, GLenum pname, GLint * params); /* 593 */ + void (GLAPIENTRYP GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint * params); /* 594 */ + GLboolean (GLAPIENTRYP IsEnabledi)(GLenum target, GLuint index); /* 595 */ + void (GLAPIENTRYP TexParameterIiv)(GLenum target, GLenum pname, const GLint * params); /* 596 */ + void (GLAPIENTRYP TexParameterIuiv)(GLenum target, GLenum pname, const GLuint * params); /* 597 */ + void (GLAPIENTRYP TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar * const * varyings, GLenum bufferMode); /* 598 */ + void (GLAPIENTRYP Uniform1ui)(GLint location, GLuint x); /* 599 */ + void (GLAPIENTRYP Uniform1uiv)(GLint location, GLsizei count, const GLuint * value); /* 600 */ + void (GLAPIENTRYP Uniform2ui)(GLint location, GLuint x, GLuint y); /* 601 */ + void (GLAPIENTRYP Uniform2uiv)(GLint location, GLsizei count, const GLuint * value); /* 602 */ + void (GLAPIENTRYP Uniform3ui)(GLint location, GLuint x, GLuint y, GLuint z); /* 603 */ + void (GLAPIENTRYP Uniform3uiv)(GLint location, GLsizei count, const GLuint * value); /* 604 */ + void (GLAPIENTRYP Uniform4ui)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 605 */ + void (GLAPIENTRYP Uniform4uiv)(GLint location, GLsizei count, const GLuint * value); /* 606 */ + void (GLAPIENTRYP VertexAttribI1iv)(GLuint index, const GLint * v); /* 607 */ + void (GLAPIENTRYP VertexAttribI1uiv)(GLuint index, const GLuint * v); /* 608 */ + void (GLAPIENTRYP VertexAttribI4bv)(GLuint index, const GLbyte * v); /* 609 */ + void (GLAPIENTRYP VertexAttribI4sv)(GLuint index, const GLshort * v); /* 610 */ + void (GLAPIENTRYP VertexAttribI4ubv)(GLuint index, const GLubyte * v); /* 611 */ + void (GLAPIENTRYP VertexAttribI4usv)(GLuint index, const GLushort * v); /* 612 */ + void (GLAPIENTRYP VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 613 */ + void (GLAPIENTRYP PrimitiveRestartIndex)(GLuint index); /* 614 */ + void (GLAPIENTRYP TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer); /* 615 */ + void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 616 */ + void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 617 */ + void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 618 */ + void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 619 */ + void (GLAPIENTRYP MinSampleShading)(GLfloat value); /* 620 */ + void (GLAPIENTRYP BindProgramARB)(GLenum target, GLuint program); /* 621 */ + void (GLAPIENTRYP DeleteProgramsARB)(GLsizei n, const GLuint * programs); /* 622 */ + void (GLAPIENTRYP GenProgramsARB)(GLsizei n, GLuint * programs); /* 623 */ + void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 624 */ + void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 625 */ + void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 626 */ + void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 627 */ + void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 628 */ + void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 629 */ + GLboolean (GLAPIENTRYP IsProgramARB)(GLuint program); /* 630 */ + void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 631 */ + void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 632 */ + void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 633 */ + void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 634 */ + void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 635 */ + void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 636 */ + void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 637 */ + void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 638 */ + void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 639 */ + void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 640 */ + void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 641 */ + void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 642 */ + void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 643 */ + void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 644 */ + void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 645 */ + void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 646 */ + void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 647 */ + void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 648 */ + GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 649 */ + GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 650 */ + void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 651 */ + void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 652 */ + void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 653 */ + GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 654 */ + void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 655 */ + void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 656 */ + void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 657 */ + void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 658 */ + void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 659 */ + void (GLAPIENTRYP BindFramebuffer)(GLenum target, GLuint framebuffer); /* 660 */ + void (GLAPIENTRYP BindRenderbuffer)(GLenum target, GLuint renderbuffer); /* 661 */ + void (GLAPIENTRYP BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 662 */ + GLenum (GLAPIENTRYP CheckFramebufferStatus)(GLenum target); /* 663 */ + void (GLAPIENTRYP DeleteFramebuffers)(GLsizei n, const GLuint * framebuffers); /* 664 */ + void (GLAPIENTRYP DeleteRenderbuffers)(GLsizei n, const GLuint * renderbuffers); /* 665 */ + void (GLAPIENTRYP FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 666 */ + void (GLAPIENTRYP FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 667 */ + void (GLAPIENTRYP FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 668 */ + void (GLAPIENTRYP FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 669 */ + void (GLAPIENTRYP FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 670 */ + void (GLAPIENTRYP GenFramebuffers)(GLsizei n, GLuint * framebuffers); /* 671 */ + void (GLAPIENTRYP GenRenderbuffers)(GLsizei n, GLuint * renderbuffers); /* 672 */ + void (GLAPIENTRYP GenerateMipmap)(GLenum target); /* 673 */ + void (GLAPIENTRYP GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 674 */ + void (GLAPIENTRYP GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint * params); /* 675 */ + GLboolean (GLAPIENTRYP IsFramebuffer)(GLuint framebuffer); /* 676 */ + GLboolean (GLAPIENTRYP IsRenderbuffer)(GLuint renderbuffer); /* 677 */ + void (GLAPIENTRYP RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 678 */ + void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 679 */ + void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 680 */ + void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 681 */ + GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 682 */ + void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 683 */ + void (GLAPIENTRYP DeleteVertexArrays)(GLsizei n, const GLuint * arrays); /* 684 */ + void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 685 */ + GLboolean (GLAPIENTRYP IsVertexArray)(GLuint array); /* 686 */ + void (GLAPIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformBlockName); /* 687 */ + void (GLAPIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint * params); /* 688 */ + void (GLAPIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName); /* 689 */ + void (GLAPIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params); /* 690 */ + GLuint (GLAPIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar * uniformBlockName); /* 691 */ + void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar * const * uniformNames, GLuint * uniformIndices); /* 692 */ + void (GLAPIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); /* 693 */ + void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 694 */ + GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 695 */ + void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 696 */ + GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 697 */ + void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 698 */ + void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 699 */ + GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 700 */ + void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 701 */ + void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 702 */ + void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 703 */ + void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 704 */ + void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, const GLint * basevertex); /* 705 */ + void (GLAPIENTRYP ProvokingVertex)(GLenum mode); /* 706 */ + void (GLAPIENTRYP GetMultisamplefv)(GLenum pname, GLuint index, GLfloat * val); /* 707 */ + void (GLAPIENTRYP SampleMaski)(GLuint index, GLbitfield mask); /* 708 */ + void (GLAPIENTRYP TexImage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 709 */ + void (GLAPIENTRYP TexImage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 710 */ + void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 711 */ + void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 712 */ + void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 713 */ + void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 714 */ + void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 715 */ + GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 716 */ + void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 717 */ + void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 718 */ + void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 719 */ + void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 720 */ + void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 721 */ + void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 722 */ + void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 723 */ + GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 724 */ + void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 725 */ + void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 726 */ + void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 727 */ + void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 728 */ + void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 729 */ + void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 730 */ + void (GLAPIENTRYP GetQueryObjecti64v)(GLuint id, GLenum pname, GLint64 * params); /* 731 */ + void (GLAPIENTRYP GetQueryObjectui64v)(GLuint id, GLenum pname, GLuint64 * params); /* 732 */ + void (GLAPIENTRYP QueryCounter)(GLuint id, GLenum target); /* 733 */ + void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 734 */ + void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 735 */ + void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 736 */ + void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 737 */ + void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 738 */ + void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 739 */ + void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 740 */ + void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 741 */ + void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 742 */ + void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 743 */ + void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 744 */ + void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 745 */ + void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 746 */ + void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 747 */ + void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 748 */ + void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 749 */ + void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 750 */ + void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 751 */ + void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 752 */ + void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 753 */ + void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 754 */ + void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 755 */ + void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 756 */ + void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 757 */ + void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 758 */ + void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 759 */ + void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 760 */ + void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 761 */ + void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 762 */ + void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 763 */ + void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 764 */ + void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 765 */ + void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 766 */ + void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 767 */ + void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 768 */ + void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 769 */ + void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 770 */ + void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 771 */ + void (GLAPIENTRYP DrawArraysIndirect)(GLenum mode, const GLvoid * indirect); /* 772 */ + void (GLAPIENTRYP DrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid * indirect); /* 773 */ + void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 774 */ + void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 775 */ + void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 776 */ + void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 777 */ + GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 778 */ + void (GLAPIENTRYP PauseTransformFeedback)(void); /* 779 */ + void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 780 */ + void (GLAPIENTRYP BeginQueryIndexed)(GLenum target, GLuint index, GLuint id); /* 781 */ + void (GLAPIENTRYP DrawTransformFeedbackStream)(GLenum mode, GLuint id, GLuint stream); /* 782 */ + void (GLAPIENTRYP EndQueryIndexed)(GLenum target, GLuint index); /* 783 */ + void (GLAPIENTRYP GetQueryIndexediv)(GLenum target, GLuint index, GLenum pname, GLint * params); /* 784 */ + void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 785 */ + void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 786 */ + void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 787 */ + void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 788 */ + void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 789 */ + void (GLAPIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary); /* 790 */ + void (GLAPIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length); /* 791 */ + void (GLAPIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value); /* 792 */ + void (GLAPIENTRYP DepthRangeArrayv)(GLuint first, GLsizei count, const GLclampd * v); /* 793 */ + void (GLAPIENTRYP DepthRangeIndexed)(GLuint index, GLclampd n, GLclampd f); /* 794 */ + void (GLAPIENTRYP GetDoublei_v)(GLenum target, GLuint index, GLdouble * data); /* 795 */ + void (GLAPIENTRYP GetFloati_v)(GLenum target, GLuint index, GLfloat * data); /* 796 */ + void (GLAPIENTRYP ScissorArrayv)(GLuint first, GLsizei count, const int * v); /* 797 */ + void (GLAPIENTRYP ScissorIndexed)(GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); /* 798 */ + void (GLAPIENTRYP ScissorIndexedv)(GLuint index, const GLint * v); /* 799 */ + void (GLAPIENTRYP ViewportArrayv)(GLuint first, GLsizei count, const GLfloat * v); /* 800 */ + void (GLAPIENTRYP ViewportIndexedf)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); /* 801 */ + void (GLAPIENTRYP ViewportIndexedfv)(GLuint index, const GLfloat * v); /* 802 */ + GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 803 */ + void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 804 */ + void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 805 */ + void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 806 */ + void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 807 */ + void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 808 */ + void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 809 */ + void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 810 */ + void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 811 */ + void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 812 */ + void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 813 */ + void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 814 */ + void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 815 */ + void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 816 */ + void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 817 */ + void (GLAPIENTRYP GetnUniformdvARB)(GLuint program, GLint location, GLsizei bufSize, GLdouble * params); /* 818 */ + void (GLAPIENTRYP GetnUniformfvARB)(GLuint program, GLint location, GLsizei bufSize, GLfloat * params); /* 819 */ + void (GLAPIENTRYP GetnUniformivARB)(GLuint program, GLint location, GLsizei bufSize, GLint * params); /* 820 */ + void (GLAPIENTRYP GetnUniformuivARB)(GLuint program, GLint location, GLsizei bufSize, GLuint * params); /* 821 */ + void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 822 */ + void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 823 */ + void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 824 */ + void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 825 */ + void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 826 */ + void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 827 */ + void (GLAPIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params); /* 828 */ + void (GLAPIENTRYP GetActiveAtomicCounterBufferiv)(GLuint program, GLuint bufferIndex, GLenum pname, GLint * params); /* 829 */ + void (GLAPIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); /* 830 */ + void (GLAPIENTRYP MemoryBarrier)(GLbitfield barriers); /* 831 */ + void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 832 */ + void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 833 */ + void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 834 */ + void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 835 */ + void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 836 */ + void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 837 */ + void (GLAPIENTRYP ClearBufferData)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 838 */ + void (GLAPIENTRYP ClearBufferSubData)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 839 */ + void (GLAPIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); /* 840 */ + void (GLAPIENTRYP DispatchComputeIndirect)(GLintptr indirect); /* 841 */ + void (GLAPIENTRYP CopyImageSubData)(GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); /* 842 */ + void (GLAPIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); /* 843 */ + void (GLAPIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); /* 844 */ + void (GLAPIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex); /* 845 */ + void (GLAPIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); /* 846 */ + void (GLAPIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 847 */ + void (GLAPIENTRYP VertexAttribLFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 848 */ + void (GLAPIENTRYP VertexBindingDivisor)(GLuint attribindex, GLuint divisor); /* 849 */ + void (GLAPIENTRYP MultiDrawArraysIndirect)(GLenum mode, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 850 */ + void (GLAPIENTRYP MultiDrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 851 */ + void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 852 */ + void (GLAPIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 853 */ + void (GLAPIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 854 */ + void (GLAPIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 855 */ + void (GLAPIENTRYP ClearTexImage)(GLuint texture, GLint level, GLenum format, GLenum type, const GLvoid * data); /* 856 */ + void (GLAPIENTRYP ClearTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid * data); /* 857 */ + void (GLAPIENTRYP BindBuffersBase)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers); /* 858 */ + void (GLAPIENTRYP BindBuffersRange)(GLenum target, GLuint first, GLsizei count, const GLuint * buffers, const GLintptr * offsets, const GLsizeiptr * sizes); /* 859 */ + void (GLAPIENTRYP BindImageTextures)(GLuint first, GLsizei count, const GLuint * textures); /* 860 */ + 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 */ +}; + +#endif /* !defined( _GLAPI_TABLE_H_ ) */ diff --cc xorg-server/glx/glfunctions.h index a600402,0000000..d060031 mode 100644,000000..100644 --- a/xorg-server/glx/glfunctions.h +++ b/xorg-server/glx/glfunctions.h @@@ -1,1193 -1,0 +1,1194 @@@ +/* DO NOT EDIT - This file generated automatically by gl_functions.py script */ + +/* + * (C) Copyright IBM Corporation 2005 + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * IBM, + * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#if !defined( __GLFUNCTIONS_H__ ) +# define __GLFUNCTIONS_H__ + + +#include "glapitable.h" +#include "glapi.h" +#include "u_thread.h" +#include "dispatch.h" + +#define glNewList(a1, a2) CALL_NewList(GET_DISPATCH(), (a1, a2)) +#define glEndList() CALL_EndList(GET_DISPATCH(), ()) +#define glCallList(a1) CALL_CallList(GET_DISPATCH(), (a1)) +#define glCallLists(a1, a2, a3) CALL_CallLists(GET_DISPATCH(), (a1, a2, a3)) +#define glDeleteLists(a1, a2) CALL_DeleteLists(GET_DISPATCH(), (a1, a2)) +#define glGenLists(a1) CALL_GenLists(GET_DISPATCH(), (a1)) +#define glListBase(a1) CALL_ListBase(GET_DISPATCH(), (a1)) +#define glBegin(a1) CALL_Begin(GET_DISPATCH(), (a1)) +#define glBitmap(a1, a2, a3, a4, a5, a6, a7) CALL_Bitmap(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glColor3b(a1, a2, a3) CALL_Color3b(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3bv(a1) CALL_Color3bv(GET_DISPATCH(), (a1)) +#define glColor3d(a1, a2, a3) CALL_Color3d(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3dv(a1) CALL_Color3dv(GET_DISPATCH(), (a1)) +#define glColor3f(a1, a2, a3) CALL_Color3f(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3fv(a1) CALL_Color3fv(GET_DISPATCH(), (a1)) +#define glColor3i(a1, a2, a3) CALL_Color3i(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3iv(a1) CALL_Color3iv(GET_DISPATCH(), (a1)) +#define glColor3s(a1, a2, a3) CALL_Color3s(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3sv(a1) CALL_Color3sv(GET_DISPATCH(), (a1)) +#define glColor3ub(a1, a2, a3) CALL_Color3ub(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3ubv(a1) CALL_Color3ubv(GET_DISPATCH(), (a1)) +#define glColor3ui(a1, a2, a3) CALL_Color3ui(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3uiv(a1) CALL_Color3uiv(GET_DISPATCH(), (a1)) +#define glColor3us(a1, a2, a3) CALL_Color3us(GET_DISPATCH(), (a1, a2, a3)) +#define glColor3usv(a1) CALL_Color3usv(GET_DISPATCH(), (a1)) +#define glColor4b(a1, a2, a3, a4) CALL_Color4b(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4bv(a1) CALL_Color4bv(GET_DISPATCH(), (a1)) +#define glColor4d(a1, a2, a3, a4) CALL_Color4d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4dv(a1) CALL_Color4dv(GET_DISPATCH(), (a1)) +#define glColor4f(a1, a2, a3, a4) CALL_Color4f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4fv(a1) CALL_Color4fv(GET_DISPATCH(), (a1)) +#define glColor4i(a1, a2, a3, a4) CALL_Color4i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4iv(a1) CALL_Color4iv(GET_DISPATCH(), (a1)) +#define glColor4s(a1, a2, a3, a4) CALL_Color4s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4sv(a1) CALL_Color4sv(GET_DISPATCH(), (a1)) +#define glColor4ub(a1, a2, a3, a4) CALL_Color4ub(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4ubv(a1) CALL_Color4ubv(GET_DISPATCH(), (a1)) +#define glColor4ui(a1, a2, a3, a4) CALL_Color4ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4uiv(a1) CALL_Color4uiv(GET_DISPATCH(), (a1)) +#define glColor4us(a1, a2, a3, a4) CALL_Color4us(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glColor4usv(a1) CALL_Color4usv(GET_DISPATCH(), (a1)) +#define glEdgeFlag(a1) CALL_EdgeFlag(GET_DISPATCH(), (a1)) +#define glEdgeFlagv(a1) CALL_EdgeFlagv(GET_DISPATCH(), (a1)) +#define glEnd() CALL_End(GET_DISPATCH(), ()) +#define glIndexd(a1) CALL_Indexd(GET_DISPATCH(), (a1)) +#define glIndexdv(a1) CALL_Indexdv(GET_DISPATCH(), (a1)) +#define glIndexf(a1) CALL_Indexf(GET_DISPATCH(), (a1)) +#define glIndexfv(a1) CALL_Indexfv(GET_DISPATCH(), (a1)) +#define glIndexi(a1) CALL_Indexi(GET_DISPATCH(), (a1)) +#define glIndexiv(a1) CALL_Indexiv(GET_DISPATCH(), (a1)) +#define glIndexs(a1) CALL_Indexs(GET_DISPATCH(), (a1)) +#define glIndexsv(a1) CALL_Indexsv(GET_DISPATCH(), (a1)) +#define glNormal3b(a1, a2, a3) CALL_Normal3b(GET_DISPATCH(), (a1, a2, a3)) +#define glNormal3bv(a1) CALL_Normal3bv(GET_DISPATCH(), (a1)) +#define glNormal3d(a1, a2, a3) CALL_Normal3d(GET_DISPATCH(), (a1, a2, a3)) +#define glNormal3dv(a1) CALL_Normal3dv(GET_DISPATCH(), (a1)) +#define glNormal3f(a1, a2, a3) CALL_Normal3f(GET_DISPATCH(), (a1, a2, a3)) +#define glNormal3fv(a1) CALL_Normal3fv(GET_DISPATCH(), (a1)) +#define glNormal3i(a1, a2, a3) CALL_Normal3i(GET_DISPATCH(), (a1, a2, a3)) +#define glNormal3iv(a1) CALL_Normal3iv(GET_DISPATCH(), (a1)) +#define glNormal3s(a1, a2, a3) CALL_Normal3s(GET_DISPATCH(), (a1, a2, a3)) +#define glNormal3sv(a1) CALL_Normal3sv(GET_DISPATCH(), (a1)) +#define glRasterPos2d(a1, a2) CALL_RasterPos2d(GET_DISPATCH(), (a1, a2)) +#define glRasterPos2dv(a1) CALL_RasterPos2dv(GET_DISPATCH(), (a1)) +#define glRasterPos2f(a1, a2) CALL_RasterPos2f(GET_DISPATCH(), (a1, a2)) +#define glRasterPos2fv(a1) CALL_RasterPos2fv(GET_DISPATCH(), (a1)) +#define glRasterPos2i(a1, a2) CALL_RasterPos2i(GET_DISPATCH(), (a1, a2)) +#define glRasterPos2iv(a1) CALL_RasterPos2iv(GET_DISPATCH(), (a1)) +#define glRasterPos2s(a1, a2) CALL_RasterPos2s(GET_DISPATCH(), (a1, a2)) +#define glRasterPos2sv(a1) CALL_RasterPos2sv(GET_DISPATCH(), (a1)) +#define glRasterPos3d(a1, a2, a3) CALL_RasterPos3d(GET_DISPATCH(), (a1, a2, a3)) +#define glRasterPos3dv(a1) CALL_RasterPos3dv(GET_DISPATCH(), (a1)) +#define glRasterPos3f(a1, a2, a3) CALL_RasterPos3f(GET_DISPATCH(), (a1, a2, a3)) +#define glRasterPos3fv(a1) CALL_RasterPos3fv(GET_DISPATCH(), (a1)) +#define glRasterPos3i(a1, a2, a3) CALL_RasterPos3i(GET_DISPATCH(), (a1, a2, a3)) +#define glRasterPos3iv(a1) CALL_RasterPos3iv(GET_DISPATCH(), (a1)) +#define glRasterPos3s(a1, a2, a3) CALL_RasterPos3s(GET_DISPATCH(), (a1, a2, a3)) +#define glRasterPos3sv(a1) CALL_RasterPos3sv(GET_DISPATCH(), (a1)) +#define glRasterPos4d(a1, a2, a3, a4) CALL_RasterPos4d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRasterPos4dv(a1) CALL_RasterPos4dv(GET_DISPATCH(), (a1)) +#define glRasterPos4f(a1, a2, a3, a4) CALL_RasterPos4f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRasterPos4fv(a1) CALL_RasterPos4fv(GET_DISPATCH(), (a1)) +#define glRasterPos4i(a1, a2, a3, a4) CALL_RasterPos4i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRasterPos4iv(a1) CALL_RasterPos4iv(GET_DISPATCH(), (a1)) +#define glRasterPos4s(a1, a2, a3, a4) CALL_RasterPos4s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRasterPos4sv(a1) CALL_RasterPos4sv(GET_DISPATCH(), (a1)) +#define glRectd(a1, a2, a3, a4) CALL_Rectd(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRectdv(a1, a2) CALL_Rectdv(GET_DISPATCH(), (a1, a2)) +#define glRectf(a1, a2, a3, a4) CALL_Rectf(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRectfv(a1, a2) CALL_Rectfv(GET_DISPATCH(), (a1, a2)) +#define glRecti(a1, a2, a3, a4) CALL_Recti(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRectiv(a1, a2) CALL_Rectiv(GET_DISPATCH(), (a1, a2)) +#define glRects(a1, a2, a3, a4) CALL_Rects(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRectsv(a1, a2) CALL_Rectsv(GET_DISPATCH(), (a1, a2)) +#define glTexCoord1d(a1) CALL_TexCoord1d(GET_DISPATCH(), (a1)) +#define glTexCoord1dv(a1) CALL_TexCoord1dv(GET_DISPATCH(), (a1)) +#define glTexCoord1f(a1) CALL_TexCoord1f(GET_DISPATCH(), (a1)) +#define glTexCoord1fv(a1) CALL_TexCoord1fv(GET_DISPATCH(), (a1)) +#define glTexCoord1i(a1) CALL_TexCoord1i(GET_DISPATCH(), (a1)) +#define glTexCoord1iv(a1) CALL_TexCoord1iv(GET_DISPATCH(), (a1)) +#define glTexCoord1s(a1) CALL_TexCoord1s(GET_DISPATCH(), (a1)) +#define glTexCoord1sv(a1) CALL_TexCoord1sv(GET_DISPATCH(), (a1)) +#define glTexCoord2d(a1, a2) CALL_TexCoord2d(GET_DISPATCH(), (a1, a2)) +#define glTexCoord2dv(a1) CALL_TexCoord2dv(GET_DISPATCH(), (a1)) +#define glTexCoord2f(a1, a2) CALL_TexCoord2f(GET_DISPATCH(), (a1, a2)) +#define glTexCoord2fv(a1) CALL_TexCoord2fv(GET_DISPATCH(), (a1)) +#define glTexCoord2i(a1, a2) CALL_TexCoord2i(GET_DISPATCH(), (a1, a2)) +#define glTexCoord2iv(a1) CALL_TexCoord2iv(GET_DISPATCH(), (a1)) +#define glTexCoord2s(a1, a2) CALL_TexCoord2s(GET_DISPATCH(), (a1, a2)) +#define glTexCoord2sv(a1) CALL_TexCoord2sv(GET_DISPATCH(), (a1)) +#define glTexCoord3d(a1, a2, a3) CALL_TexCoord3d(GET_DISPATCH(), (a1, a2, a3)) +#define glTexCoord3dv(a1) CALL_TexCoord3dv(GET_DISPATCH(), (a1)) +#define glTexCoord3f(a1, a2, a3) CALL_TexCoord3f(GET_DISPATCH(), (a1, a2, a3)) +#define glTexCoord3fv(a1) CALL_TexCoord3fv(GET_DISPATCH(), (a1)) +#define glTexCoord3i(a1, a2, a3) CALL_TexCoord3i(GET_DISPATCH(), (a1, a2, a3)) +#define glTexCoord3iv(a1) CALL_TexCoord3iv(GET_DISPATCH(), (a1)) +#define glTexCoord3s(a1, a2, a3) CALL_TexCoord3s(GET_DISPATCH(), (a1, a2, a3)) +#define glTexCoord3sv(a1) CALL_TexCoord3sv(GET_DISPATCH(), (a1)) +#define glTexCoord4d(a1, a2, a3, a4) CALL_TexCoord4d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexCoord4dv(a1) CALL_TexCoord4dv(GET_DISPATCH(), (a1)) +#define glTexCoord4f(a1, a2, a3, a4) CALL_TexCoord4f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexCoord4fv(a1) CALL_TexCoord4fv(GET_DISPATCH(), (a1)) +#define glTexCoord4i(a1, a2, a3, a4) CALL_TexCoord4i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexCoord4iv(a1) CALL_TexCoord4iv(GET_DISPATCH(), (a1)) +#define glTexCoord4s(a1, a2, a3, a4) CALL_TexCoord4s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexCoord4sv(a1) CALL_TexCoord4sv(GET_DISPATCH(), (a1)) +#define glVertex2d(a1, a2) CALL_Vertex2d(GET_DISPATCH(), (a1, a2)) +#define glVertex2dv(a1) CALL_Vertex2dv(GET_DISPATCH(), (a1)) +#define glVertex2f(a1, a2) CALL_Vertex2f(GET_DISPATCH(), (a1, a2)) +#define glVertex2fv(a1) CALL_Vertex2fv(GET_DISPATCH(), (a1)) +#define glVertex2i(a1, a2) CALL_Vertex2i(GET_DISPATCH(), (a1, a2)) +#define glVertex2iv(a1) CALL_Vertex2iv(GET_DISPATCH(), (a1)) +#define glVertex2s(a1, a2) CALL_Vertex2s(GET_DISPATCH(), (a1, a2)) +#define glVertex2sv(a1) CALL_Vertex2sv(GET_DISPATCH(), (a1)) +#define glVertex3d(a1, a2, a3) CALL_Vertex3d(GET_DISPATCH(), (a1, a2, a3)) +#define glVertex3dv(a1) CALL_Vertex3dv(GET_DISPATCH(), (a1)) +#define glVertex3f(a1, a2, a3) CALL_Vertex3f(GET_DISPATCH(), (a1, a2, a3)) +#define glVertex3fv(a1) CALL_Vertex3fv(GET_DISPATCH(), (a1)) +#define glVertex3i(a1, a2, a3) CALL_Vertex3i(GET_DISPATCH(), (a1, a2, a3)) +#define glVertex3iv(a1) CALL_Vertex3iv(GET_DISPATCH(), (a1)) +#define glVertex3s(a1, a2, a3) CALL_Vertex3s(GET_DISPATCH(), (a1, a2, a3)) +#define glVertex3sv(a1) CALL_Vertex3sv(GET_DISPATCH(), (a1)) +#define glVertex4d(a1, a2, a3, a4) CALL_Vertex4d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertex4dv(a1) CALL_Vertex4dv(GET_DISPATCH(), (a1)) +#define glVertex4f(a1, a2, a3, a4) CALL_Vertex4f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertex4fv(a1) CALL_Vertex4fv(GET_DISPATCH(), (a1)) +#define glVertex4i(a1, a2, a3, a4) CALL_Vertex4i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertex4iv(a1) CALL_Vertex4iv(GET_DISPATCH(), (a1)) +#define glVertex4s(a1, a2, a3, a4) CALL_Vertex4s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertex4sv(a1) CALL_Vertex4sv(GET_DISPATCH(), (a1)) +#define glClipPlane(a1, a2) CALL_ClipPlane(GET_DISPATCH(), (a1, a2)) +#define glColorMaterial(a1, a2) CALL_ColorMaterial(GET_DISPATCH(), (a1, a2)) +#define glCullFace(a1) CALL_CullFace(GET_DISPATCH(), (a1)) +#define glFogf(a1, a2) CALL_Fogf(GET_DISPATCH(), (a1, a2)) +#define glFogfv(a1, a2) CALL_Fogfv(GET_DISPATCH(), (a1, a2)) +#define glFogi(a1, a2) CALL_Fogi(GET_DISPATCH(), (a1, a2)) +#define glFogiv(a1, a2) CALL_Fogiv(GET_DISPATCH(), (a1, a2)) +#define glFrontFace(a1) CALL_FrontFace(GET_DISPATCH(), (a1)) +#define glHint(a1, a2) CALL_Hint(GET_DISPATCH(), (a1, a2)) +#define glLightf(a1, a2, a3) CALL_Lightf(GET_DISPATCH(), (a1, a2, a3)) +#define glLightfv(a1, a2, a3) CALL_Lightfv(GET_DISPATCH(), (a1, a2, a3)) +#define glLighti(a1, a2, a3) CALL_Lighti(GET_DISPATCH(), (a1, a2, a3)) +#define glLightiv(a1, a2, a3) CALL_Lightiv(GET_DISPATCH(), (a1, a2, a3)) +#define glLightModelf(a1, a2) CALL_LightModelf(GET_DISPATCH(), (a1, a2)) +#define glLightModelfv(a1, a2) CALL_LightModelfv(GET_DISPATCH(), (a1, a2)) +#define glLightModeli(a1, a2) CALL_LightModeli(GET_DISPATCH(), (a1, a2)) +#define glLightModeliv(a1, a2) CALL_LightModeliv(GET_DISPATCH(), (a1, a2)) +#define glLineStipple(a1, a2) CALL_LineStipple(GET_DISPATCH(), (a1, a2)) +#define glLineWidth(a1) CALL_LineWidth(GET_DISPATCH(), (a1)) +#define glMaterialf(a1, a2, a3) CALL_Materialf(GET_DISPATCH(), (a1, a2, a3)) +#define glMaterialfv(a1, a2, a3) CALL_Materialfv(GET_DISPATCH(), (a1, a2, a3)) +#define glMateriali(a1, a2, a3) CALL_Materiali(GET_DISPATCH(), (a1, a2, a3)) +#define glMaterialiv(a1, a2, a3) CALL_Materialiv(GET_DISPATCH(), (a1, a2, a3)) +#define glPointSize(a1) CALL_PointSize(GET_DISPATCH(), (a1)) +#define glPolygonMode(a1, a2) CALL_PolygonMode(GET_DISPATCH(), (a1, a2)) +#define glPolygonStipple(a1) CALL_PolygonStipple(GET_DISPATCH(), (a1)) +#define glScissor(a1, a2, a3, a4) CALL_Scissor(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glShadeModel(a1) CALL_ShadeModel(GET_DISPATCH(), (a1)) +#define glTexParameterf(a1, a2, a3) CALL_TexParameterf(GET_DISPATCH(), (a1, a2, a3)) +#define glTexParameterfv(a1, a2, a3) CALL_TexParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexParameteri(a1, a2, a3) CALL_TexParameteri(GET_DISPATCH(), (a1, a2, a3)) +#define glTexParameteriv(a1, a2, a3) CALL_TexParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexImage1D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_TexImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glTexImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TexImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glTexEnvf(a1, a2, a3) CALL_TexEnvf(GET_DISPATCH(), (a1, a2, a3)) +#define glTexEnvfv(a1, a2, a3) CALL_TexEnvfv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexEnvi(a1, a2, a3) CALL_TexEnvi(GET_DISPATCH(), (a1, a2, a3)) +#define glTexEnviv(a1, a2, a3) CALL_TexEnviv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGend(a1, a2, a3) CALL_TexGend(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGendv(a1, a2, a3) CALL_TexGendv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGenf(a1, a2, a3) CALL_TexGenf(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGenfv(a1, a2, a3) CALL_TexGenfv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGeni(a1, a2, a3) CALL_TexGeni(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGeniv(a1, a2, a3) CALL_TexGeniv(GET_DISPATCH(), (a1, a2, a3)) +#define glFeedbackBuffer(a1, a2, a3) CALL_FeedbackBuffer(GET_DISPATCH(), (a1, a2, a3)) +#define glSelectBuffer(a1, a2) CALL_SelectBuffer(GET_DISPATCH(), (a1, a2)) +#define glRenderMode(a1) CALL_RenderMode(GET_DISPATCH(), (a1)) +#define glInitNames() CALL_InitNames(GET_DISPATCH(), ()) +#define glLoadName(a1) CALL_LoadName(GET_DISPATCH(), (a1)) +#define glPassThrough(a1) CALL_PassThrough(GET_DISPATCH(), (a1)) +#define glPopName() CALL_PopName(GET_DISPATCH(), ()) +#define glPushName(a1) CALL_PushName(GET_DISPATCH(), (a1)) +#define glDrawBuffer(a1) CALL_DrawBuffer(GET_DISPATCH(), (a1)) +#define glClear(a1) CALL_Clear(GET_DISPATCH(), (a1)) +#define glClearAccum(a1, a2, a3, a4) CALL_ClearAccum(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearIndex(a1) CALL_ClearIndex(GET_DISPATCH(), (a1)) +#define glClearColor(a1, a2, a3, a4) CALL_ClearColor(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearStencil(a1) CALL_ClearStencil(GET_DISPATCH(), (a1)) +#define glClearDepth(a1) CALL_ClearDepth(GET_DISPATCH(), (a1)) +#define glStencilMask(a1) CALL_StencilMask(GET_DISPATCH(), (a1)) +#define glColorMask(a1, a2, a3, a4) CALL_ColorMask(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glDepthMask(a1) CALL_DepthMask(GET_DISPATCH(), (a1)) +#define glIndexMask(a1) CALL_IndexMask(GET_DISPATCH(), (a1)) +#define glAccum(a1, a2) CALL_Accum(GET_DISPATCH(), (a1, a2)) +#define glDisable(a1) CALL_Disable(GET_DISPATCH(), (a1)) +#define glEnable(a1) CALL_Enable(GET_DISPATCH(), (a1)) +#define glFinish() CALL_Finish(GET_DISPATCH(), ()) +#define glFlush() CALL_Flush(GET_DISPATCH(), ()) +#define glPopAttrib() CALL_PopAttrib(GET_DISPATCH(), ()) +#define glPushAttrib(a1) CALL_PushAttrib(GET_DISPATCH(), (a1)) +#define glMap1d(a1, a2, a3, a4, a5, a6) CALL_Map1d(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glMap1f(a1, a2, a3, a4, a5, a6) CALL_Map1f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glMap2d(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) CALL_Map2d(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)) +#define glMap2f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) CALL_Map2f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)) +#define glMapGrid1d(a1, a2, a3) CALL_MapGrid1d(GET_DISPATCH(), (a1, a2, a3)) +#define glMapGrid1f(a1, a2, a3) CALL_MapGrid1f(GET_DISPATCH(), (a1, a2, a3)) +#define glMapGrid2d(a1, a2, a3, a4, a5, a6) CALL_MapGrid2d(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glMapGrid2f(a1, a2, a3, a4, a5, a6) CALL_MapGrid2f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glEvalCoord1d(a1) CALL_EvalCoord1d(GET_DISPATCH(), (a1)) +#define glEvalCoord1dv(a1) CALL_EvalCoord1dv(GET_DISPATCH(), (a1)) +#define glEvalCoord1f(a1) CALL_EvalCoord1f(GET_DISPATCH(), (a1)) +#define glEvalCoord1fv(a1) CALL_EvalCoord1fv(GET_DISPATCH(), (a1)) +#define glEvalCoord2d(a1, a2) CALL_EvalCoord2d(GET_DISPATCH(), (a1, a2)) +#define glEvalCoord2dv(a1) CALL_EvalCoord2dv(GET_DISPATCH(), (a1)) +#define glEvalCoord2f(a1, a2) CALL_EvalCoord2f(GET_DISPATCH(), (a1, a2)) +#define glEvalCoord2fv(a1) CALL_EvalCoord2fv(GET_DISPATCH(), (a1)) +#define glEvalMesh1(a1, a2, a3) CALL_EvalMesh1(GET_DISPATCH(), (a1, a2, a3)) +#define glEvalPoint1(a1) CALL_EvalPoint1(GET_DISPATCH(), (a1)) +#define glEvalMesh2(a1, a2, a3, a4, a5) CALL_EvalMesh2(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glEvalPoint2(a1, a2) CALL_EvalPoint2(GET_DISPATCH(), (a1, a2)) +#define glAlphaFunc(a1, a2) CALL_AlphaFunc(GET_DISPATCH(), (a1, a2)) +#define glBlendFunc(a1, a2) CALL_BlendFunc(GET_DISPATCH(), (a1, a2)) +#define glLogicOp(a1) CALL_LogicOp(GET_DISPATCH(), (a1)) +#define glStencilFunc(a1, a2, a3) CALL_StencilFunc(GET_DISPATCH(), (a1, a2, a3)) +#define glStencilOp(a1, a2, a3) CALL_StencilOp(GET_DISPATCH(), (a1, a2, a3)) +#define glDepthFunc(a1) CALL_DepthFunc(GET_DISPATCH(), (a1)) +#define glPixelZoom(a1, a2) CALL_PixelZoom(GET_DISPATCH(), (a1, a2)) +#define glPixelTransferf(a1, a2) CALL_PixelTransferf(GET_DISPATCH(), (a1, a2)) +#define glPixelTransferi(a1, a2) CALL_PixelTransferi(GET_DISPATCH(), (a1, a2)) +#define glPixelStoref(a1, a2) CALL_PixelStoref(GET_DISPATCH(), (a1, a2)) +#define glPixelStorei(a1, a2) CALL_PixelStorei(GET_DISPATCH(), (a1, a2)) +#define glPixelMapfv(a1, a2, a3) CALL_PixelMapfv(GET_DISPATCH(), (a1, a2, a3)) +#define glPixelMapuiv(a1, a2, a3) CALL_PixelMapuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glPixelMapusv(a1, a2, a3) CALL_PixelMapusv(GET_DISPATCH(), (a1, a2, a3)) +#define glReadBuffer(a1) CALL_ReadBuffer(GET_DISPATCH(), (a1)) +#define glCopyPixels(a1, a2, a3, a4, a5) CALL_CopyPixels(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glReadPixels(a1, a2, a3, a4, a5, a6, a7) CALL_ReadPixels(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glDrawPixels(a1, a2, a3, a4, a5) CALL_DrawPixels(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetBooleanv(a1, a2) CALL_GetBooleanv(GET_DISPATCH(), (a1, a2)) +#define glGetClipPlane(a1, a2) CALL_GetClipPlane(GET_DISPATCH(), (a1, a2)) +#define glGetDoublev(a1, a2) CALL_GetDoublev(GET_DISPATCH(), (a1, a2)) +#define glGetError() CALL_GetError(GET_DISPATCH(), ()) +#define glGetFloatv(a1, a2) CALL_GetFloatv(GET_DISPATCH(), (a1, a2)) +#define glGetIntegerv(a1, a2) CALL_GetIntegerv(GET_DISPATCH(), (a1, a2)) +#define glGetLightfv(a1, a2, a3) CALL_GetLightfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetLightiv(a1, a2, a3) CALL_GetLightiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMapdv(a1, a2, a3) CALL_GetMapdv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMapfv(a1, a2, a3) CALL_GetMapfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMapiv(a1, a2, a3) CALL_GetMapiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMaterialfv(a1, a2, a3) CALL_GetMaterialfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMaterialiv(a1, a2, a3) CALL_GetMaterialiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetPixelMapfv(a1, a2) CALL_GetPixelMapfv(GET_DISPATCH(), (a1, a2)) +#define glGetPixelMapuiv(a1, a2) CALL_GetPixelMapuiv(GET_DISPATCH(), (a1, a2)) +#define glGetPixelMapusv(a1, a2) CALL_GetPixelMapusv(GET_DISPATCH(), (a1, a2)) +#define glGetPolygonStipple(a1) CALL_GetPolygonStipple(GET_DISPATCH(), (a1)) +#define glGetString(a1) CALL_GetString(GET_DISPATCH(), (a1)) +#define glGetTexEnvfv(a1, a2, a3) CALL_GetTexEnvfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexEnviv(a1, a2, a3) CALL_GetTexEnviv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexGendv(a1, a2, a3) CALL_GetTexGendv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexGenfv(a1, a2, a3) CALL_GetTexGenfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexGeniv(a1, a2, a3) CALL_GetTexGeniv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexImage(a1, a2, a3, a4, a5) CALL_GetTexImage(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetTexParameterfv(a1, a2, a3) CALL_GetTexParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexParameteriv(a1, a2, a3) CALL_GetTexParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexLevelParameterfv(a1, a2, a3, a4) CALL_GetTexLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetTexLevelParameteriv(a1, a2, a3, a4) CALL_GetTexLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glIsEnabled(a1) CALL_IsEnabled(GET_DISPATCH(), (a1)) +#define glIsList(a1) CALL_IsList(GET_DISPATCH(), (a1)) +#define glDepthRange(a1, a2) CALL_DepthRange(GET_DISPATCH(), (a1, a2)) +#define glFrustum(a1, a2, a3, a4, a5, a6) CALL_Frustum(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glLoadIdentity() CALL_LoadIdentity(GET_DISPATCH(), ()) +#define glLoadMatrixf(a1) CALL_LoadMatrixf(GET_DISPATCH(), (a1)) +#define glLoadMatrixd(a1) CALL_LoadMatrixd(GET_DISPATCH(), (a1)) +#define glMatrixMode(a1) CALL_MatrixMode(GET_DISPATCH(), (a1)) +#define glMultMatrixf(a1) CALL_MultMatrixf(GET_DISPATCH(), (a1)) +#define glMultMatrixd(a1) CALL_MultMatrixd(GET_DISPATCH(), (a1)) +#define glOrtho(a1, a2, a3, a4, a5, a6) CALL_Ortho(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glPopMatrix() CALL_PopMatrix(GET_DISPATCH(), ()) +#define glPushMatrix() CALL_PushMatrix(GET_DISPATCH(), ()) +#define glRotated(a1, a2, a3, a4) CALL_Rotated(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRotatef(a1, a2, a3, a4) CALL_Rotatef(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glScaled(a1, a2, a3) CALL_Scaled(GET_DISPATCH(), (a1, a2, a3)) +#define glScalef(a1, a2, a3) CALL_Scalef(GET_DISPATCH(), (a1, a2, a3)) +#define glTranslated(a1, a2, a3) CALL_Translated(GET_DISPATCH(), (a1, a2, a3)) +#define glTranslatef(a1, a2, a3) CALL_Translatef(GET_DISPATCH(), (a1, a2, a3)) +#define glViewport(a1, a2, a3, a4) CALL_Viewport(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glArrayElement(a1) CALL_ArrayElement(GET_DISPATCH(), (a1)) +#define glBindTexture(a1, a2) CALL_BindTexture(GET_DISPATCH(), (a1, a2)) +#define glColorPointer(a1, a2, a3, a4) CALL_ColorPointer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glDisableClientState(a1) CALL_DisableClientState(GET_DISPATCH(), (a1)) +#define glDrawArrays(a1, a2, a3) CALL_DrawArrays(GET_DISPATCH(), (a1, a2, a3)) +#define glDrawElements(a1, a2, a3, a4) CALL_DrawElements(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glEdgeFlagPointer(a1, a2) CALL_EdgeFlagPointer(GET_DISPATCH(), (a1, a2)) +#define glEnableClientState(a1) CALL_EnableClientState(GET_DISPATCH(), (a1)) +#define glIndexPointer(a1, a2, a3) CALL_IndexPointer(GET_DISPATCH(), (a1, a2, a3)) +#define glIndexub(a1) CALL_Indexub(GET_DISPATCH(), (a1)) +#define glIndexubv(a1) CALL_Indexubv(GET_DISPATCH(), (a1)) +#define glInterleavedArrays(a1, a2, a3) CALL_InterleavedArrays(GET_DISPATCH(), (a1, a2, a3)) +#define glNormalPointer(a1, a2, a3) CALL_NormalPointer(GET_DISPATCH(), (a1, a2, a3)) +#define glPolygonOffset(a1, a2) CALL_PolygonOffset(GET_DISPATCH(), (a1, a2)) +#define glTexCoordPointer(a1, a2, a3, a4) CALL_TexCoordPointer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexPointer(a1, a2, a3, a4) CALL_VertexPointer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glAreTexturesResident(a1, a2, a3) CALL_AreTexturesResident(GET_DISPATCH(), (a1, a2, a3)) +#define glCopyTexImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CopyTexImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glCopyTexImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTexImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glCopyTexSubImage1D(a1, a2, a3, a4, a5, a6) CALL_CopyTexSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glCopyTexSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTexSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glDeleteTextures(a1, a2) CALL_DeleteTextures(GET_DISPATCH(), (a1, a2)) +#define glGenTextures(a1, a2) CALL_GenTextures(GET_DISPATCH(), (a1, a2)) +#define glGetPointerv(a1, a2) CALL_GetPointerv(GET_DISPATCH(), (a1, a2)) +#define glIsTexture(a1) CALL_IsTexture(GET_DISPATCH(), (a1)) +#define glPrioritizeTextures(a1, a2, a3) CALL_PrioritizeTextures(GET_DISPATCH(), (a1, a2, a3)) +#define glTexSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TexSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glTexSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TexSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glPopClientAttrib() CALL_PopClientAttrib(GET_DISPATCH(), ()) +#define glPushClientAttrib(a1) CALL_PushClientAttrib(GET_DISPATCH(), (a1)) +#define glBlendColor(a1, a2, a3, a4) CALL_BlendColor(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBlendEquation(a1) CALL_BlendEquation(GET_DISPATCH(), (a1)) +#define glDrawRangeElements(a1, a2, a3, a4, a5, a6) CALL_DrawRangeElements(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glColorTable(a1, a2, a3, a4, a5, a6) CALL_ColorTable(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glColorTableParameterfv(a1, a2, a3) CALL_ColorTableParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glColorTableParameteriv(a1, a2, a3) CALL_ColorTableParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glCopyColorTable(a1, a2, a3, a4, a5) CALL_CopyColorTable(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetColorTable(a1, a2, a3, a4) CALL_GetColorTable(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetColorTableParameterfv(a1, a2, a3) CALL_GetColorTableParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetColorTableParameteriv(a1, a2, a3) CALL_GetColorTableParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glColorSubTable(a1, a2, a3, a4, a5, a6) CALL_ColorSubTable(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glCopyColorSubTable(a1, a2, a3, a4, a5) CALL_CopyColorSubTable(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glConvolutionFilter1D(a1, a2, a3, a4, a5, a6) CALL_ConvolutionFilter1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glConvolutionFilter2D(a1, a2, a3, a4, a5, a6, a7) CALL_ConvolutionFilter2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glConvolutionParameterf(a1, a2, a3) CALL_ConvolutionParameterf(GET_DISPATCH(), (a1, a2, a3)) +#define glConvolutionParameterfv(a1, a2, a3) CALL_ConvolutionParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glConvolutionParameteri(a1, a2, a3) CALL_ConvolutionParameteri(GET_DISPATCH(), (a1, a2, a3)) +#define glConvolutionParameteriv(a1, a2, a3) CALL_ConvolutionParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glCopyConvolutionFilter1D(a1, a2, a3, a4, a5) CALL_CopyConvolutionFilter1D(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glCopyConvolutionFilter2D(a1, a2, a3, a4, a5, a6) CALL_CopyConvolutionFilter2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glGetConvolutionFilter(a1, a2, a3, a4) CALL_GetConvolutionFilter(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetConvolutionParameterfv(a1, a2, a3) CALL_GetConvolutionParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetConvolutionParameteriv(a1, a2, a3) CALL_GetConvolutionParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetSeparableFilter(a1, a2, a3, a4, a5, a6) CALL_GetSeparableFilter(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glSeparableFilter2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_SeparableFilter2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glGetHistogram(a1, a2, a3, a4, a5) CALL_GetHistogram(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetHistogramParameterfv(a1, a2, a3) CALL_GetHistogramParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetHistogramParameteriv(a1, a2, a3) CALL_GetHistogramParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMinmax(a1, a2, a3, a4, a5) CALL_GetMinmax(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetMinmaxParameterfv(a1, a2, a3) CALL_GetMinmaxParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMinmaxParameteriv(a1, a2, a3) CALL_GetMinmaxParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glHistogram(a1, a2, a3, a4) CALL_Histogram(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMinmax(a1, a2, a3) CALL_Minmax(GET_DISPATCH(), (a1, a2, a3)) +#define glResetHistogram(a1) CALL_ResetHistogram(GET_DISPATCH(), (a1)) +#define glResetMinmax(a1) CALL_ResetMinmax(GET_DISPATCH(), (a1)) +#define glTexImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) CALL_TexImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)) +#define glTexSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TexSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)) +#define glCopyTexSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTexSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glActiveTexture(a1) CALL_ActiveTexture(GET_DISPATCH(), (a1)) +#define glClientActiveTexture(a1) CALL_ClientActiveTexture(GET_DISPATCH(), (a1)) +#define glMultiTexCoord1d(a1, a2) CALL_MultiTexCoord1d(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1dv(a1, a2) CALL_MultiTexCoord1dv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1fARB(a1, a2) CALL_MultiTexCoord1fARB(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1fvARB(a1, a2) CALL_MultiTexCoord1fvARB(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1i(a1, a2) CALL_MultiTexCoord1i(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1iv(a1, a2) CALL_MultiTexCoord1iv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1s(a1, a2) CALL_MultiTexCoord1s(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord1sv(a1, a2) CALL_MultiTexCoord1sv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord2d(a1, a2, a3) CALL_MultiTexCoord2d(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoord2dv(a1, a2) CALL_MultiTexCoord2dv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord2fARB(a1, a2, a3) CALL_MultiTexCoord2fARB(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoord2fvARB(a1, a2) CALL_MultiTexCoord2fvARB(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord2i(a1, a2, a3) CALL_MultiTexCoord2i(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoord2iv(a1, a2) CALL_MultiTexCoord2iv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord2s(a1, a2, a3) CALL_MultiTexCoord2s(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoord2sv(a1, a2) CALL_MultiTexCoord2sv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord3d(a1, a2, a3, a4) CALL_MultiTexCoord3d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMultiTexCoord3dv(a1, a2) CALL_MultiTexCoord3dv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord3fARB(a1, a2, a3, a4) CALL_MultiTexCoord3fARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMultiTexCoord3fvARB(a1, a2) CALL_MultiTexCoord3fvARB(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord3i(a1, a2, a3, a4) CALL_MultiTexCoord3i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMultiTexCoord3iv(a1, a2) CALL_MultiTexCoord3iv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord3s(a1, a2, a3, a4) CALL_MultiTexCoord3s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMultiTexCoord3sv(a1, a2) CALL_MultiTexCoord3sv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord4d(a1, a2, a3, a4, a5) CALL_MultiTexCoord4d(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glMultiTexCoord4dv(a1, a2) CALL_MultiTexCoord4dv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord4fARB(a1, a2, a3, a4, a5) CALL_MultiTexCoord4fARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glMultiTexCoord4fvARB(a1, a2) CALL_MultiTexCoord4fvARB(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord4i(a1, a2, a3, a4, a5) CALL_MultiTexCoord4i(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glMultiTexCoord4iv(a1, a2) CALL_MultiTexCoord4iv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoord4s(a1, a2, a3, a4, a5) CALL_MultiTexCoord4s(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glMultiTexCoord4sv(a1, a2) CALL_MultiTexCoord4sv(GET_DISPATCH(), (a1, a2)) +#define glCompressedTexImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTexImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glCompressedTexImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CompressedTexImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glCompressedTexImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTexImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glCompressedTexSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTexSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glCompressedTexSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTexSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glCompressedTexSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_CompressedTexSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)) +#define glGetCompressedTexImage(a1, a2, a3) CALL_GetCompressedTexImage(GET_DISPATCH(), (a1, a2, a3)) +#define glLoadTransposeMatrixd(a1) CALL_LoadTransposeMatrixd(GET_DISPATCH(), (a1)) +#define glLoadTransposeMatrixf(a1) CALL_LoadTransposeMatrixf(GET_DISPATCH(), (a1)) +#define glMultTransposeMatrixd(a1) CALL_MultTransposeMatrixd(GET_DISPATCH(), (a1)) +#define glMultTransposeMatrixf(a1) CALL_MultTransposeMatrixf(GET_DISPATCH(), (a1)) +#define glSampleCoverage(a1, a2) CALL_SampleCoverage(GET_DISPATCH(), (a1, a2)) +#define glBlendFuncSeparate(a1, a2, a3, a4) CALL_BlendFuncSeparate(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glFogCoordPointer(a1, a2, a3) CALL_FogCoordPointer(GET_DISPATCH(), (a1, a2, a3)) +#define glFogCoordd(a1) CALL_FogCoordd(GET_DISPATCH(), (a1)) +#define glFogCoorddv(a1) CALL_FogCoorddv(GET_DISPATCH(), (a1)) +#define glMultiDrawArrays(a1, a2, a3, a4) CALL_MultiDrawArrays(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glPointParameterf(a1, a2) CALL_PointParameterf(GET_DISPATCH(), (a1, a2)) +#define glPointParameterfv(a1, a2) CALL_PointParameterfv(GET_DISPATCH(), (a1, a2)) +#define glPointParameteri(a1, a2) CALL_PointParameteri(GET_DISPATCH(), (a1, a2)) +#define glPointParameteriv(a1, a2) CALL_PointParameteriv(GET_DISPATCH(), (a1, a2)) +#define glSecondaryColor3b(a1, a2, a3) CALL_SecondaryColor3b(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3bv(a1) CALL_SecondaryColor3bv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3d(a1, a2, a3) CALL_SecondaryColor3d(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3dv(a1) CALL_SecondaryColor3dv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3i(a1, a2, a3) CALL_SecondaryColor3i(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3iv(a1) CALL_SecondaryColor3iv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3s(a1, a2, a3) CALL_SecondaryColor3s(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3sv(a1) CALL_SecondaryColor3sv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3ub(a1, a2, a3) CALL_SecondaryColor3ub(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3ubv(a1) CALL_SecondaryColor3ubv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3ui(a1, a2, a3) CALL_SecondaryColor3ui(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3uiv(a1) CALL_SecondaryColor3uiv(GET_DISPATCH(), (a1)) +#define glSecondaryColor3us(a1, a2, a3) CALL_SecondaryColor3us(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3usv(a1) CALL_SecondaryColor3usv(GET_DISPATCH(), (a1)) +#define glSecondaryColorPointer(a1, a2, a3, a4) CALL_SecondaryColorPointer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glWindowPos2d(a1, a2) CALL_WindowPos2d(GET_DISPATCH(), (a1, a2)) +#define glWindowPos2dv(a1) CALL_WindowPos2dv(GET_DISPATCH(), (a1)) +#define glWindowPos2f(a1, a2) CALL_WindowPos2f(GET_DISPATCH(), (a1, a2)) +#define glWindowPos2fv(a1) CALL_WindowPos2fv(GET_DISPATCH(), (a1)) +#define glWindowPos2i(a1, a2) CALL_WindowPos2i(GET_DISPATCH(), (a1, a2)) +#define glWindowPos2iv(a1) CALL_WindowPos2iv(GET_DISPATCH(), (a1)) +#define glWindowPos2s(a1, a2) CALL_WindowPos2s(GET_DISPATCH(), (a1, a2)) +#define glWindowPos2sv(a1) CALL_WindowPos2sv(GET_DISPATCH(), (a1)) +#define glWindowPos3d(a1, a2, a3) CALL_WindowPos3d(GET_DISPATCH(), (a1, a2, a3)) +#define glWindowPos3dv(a1) CALL_WindowPos3dv(GET_DISPATCH(), (a1)) +#define glWindowPos3f(a1, a2, a3) CALL_WindowPos3f(GET_DISPATCH(), (a1, a2, a3)) +#define glWindowPos3fv(a1) CALL_WindowPos3fv(GET_DISPATCH(), (a1)) +#define glWindowPos3i(a1, a2, a3) CALL_WindowPos3i(GET_DISPATCH(), (a1, a2, a3)) +#define glWindowPos3iv(a1) CALL_WindowPos3iv(GET_DISPATCH(), (a1)) +#define glWindowPos3s(a1, a2, a3) CALL_WindowPos3s(GET_DISPATCH(), (a1, a2, a3)) +#define glWindowPos3sv(a1) CALL_WindowPos3sv(GET_DISPATCH(), (a1)) +#define glBeginQuery(a1, a2) CALL_BeginQuery(GET_DISPATCH(), (a1, a2)) +#define glBindBuffer(a1, a2) CALL_BindBuffer(GET_DISPATCH(), (a1, a2)) +#define glBufferData(a1, a2, a3, a4) CALL_BufferData(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBufferSubData(a1, a2, a3, a4) CALL_BufferSubData(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glDeleteBuffers(a1, a2) CALL_DeleteBuffers(GET_DISPATCH(), (a1, a2)) +#define glDeleteQueries(a1, a2) CALL_DeleteQueries(GET_DISPATCH(), (a1, a2)) +#define glEndQuery(a1) CALL_EndQuery(GET_DISPATCH(), (a1)) +#define glGenBuffers(a1, a2) CALL_GenBuffers(GET_DISPATCH(), (a1, a2)) +#define glGenQueries(a1, a2) CALL_GenQueries(GET_DISPATCH(), (a1, a2)) +#define glGetBufferParameteriv(a1, a2, a3) CALL_GetBufferParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetBufferPointerv(a1, a2, a3) CALL_GetBufferPointerv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetBufferSubData(a1, a2, a3, a4) CALL_GetBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetQueryObjectiv(a1, a2, a3) CALL_GetQueryObjectiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetQueryObjectuiv(a1, a2, a3) CALL_GetQueryObjectuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetQueryiv(a1, a2, a3) CALL_GetQueryiv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsBuffer(a1) CALL_IsBuffer(GET_DISPATCH(), (a1)) +#define glIsQuery(a1) CALL_IsQuery(GET_DISPATCH(), (a1)) +#define glMapBuffer(a1, a2) CALL_MapBuffer(GET_DISPATCH(), (a1, a2)) +#define glUnmapBuffer(a1) CALL_UnmapBuffer(GET_DISPATCH(), (a1)) +#define glAttachShader(a1, a2) CALL_AttachShader(GET_DISPATCH(), (a1, a2)) +#define glBindAttribLocation(a1, a2, a3) CALL_BindAttribLocation(GET_DISPATCH(), (a1, a2, a3)) +#define glBlendEquationSeparate(a1, a2) CALL_BlendEquationSeparate(GET_DISPATCH(), (a1, a2)) +#define glCompileShader(a1) CALL_CompileShader(GET_DISPATCH(), (a1)) +#define glCreateProgram() CALL_CreateProgram(GET_DISPATCH(), ()) +#define glCreateShader(a1) CALL_CreateShader(GET_DISPATCH(), (a1)) +#define glDeleteProgram(a1) CALL_DeleteProgram(GET_DISPATCH(), (a1)) +#define glDeleteShader(a1) CALL_DeleteShader(GET_DISPATCH(), (a1)) +#define glDetachShader(a1, a2) CALL_DetachShader(GET_DISPATCH(), (a1, a2)) +#define glDisableVertexAttribArray(a1) CALL_DisableVertexAttribArray(GET_DISPATCH(), (a1)) +#define glDrawBuffers(a1, a2) CALL_DrawBuffers(GET_DISPATCH(), (a1, a2)) +#define glEnableVertexAttribArray(a1) CALL_EnableVertexAttribArray(GET_DISPATCH(), (a1)) +#define glGetActiveAttrib(a1, a2, a3, a4, a5, a6, a7) CALL_GetActiveAttrib(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glGetActiveUniform(a1, a2, a3, a4, a5, a6, a7) CALL_GetActiveUniform(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glGetAttachedShaders(a1, a2, a3, a4) CALL_GetAttachedShaders(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetAttribLocation(a1, a2) CALL_GetAttribLocation(GET_DISPATCH(), (a1, a2)) +#define glGetProgramInfoLog(a1, a2, a3, a4) CALL_GetProgramInfoLog(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetProgramiv(a1, a2, a3) CALL_GetProgramiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetShaderInfoLog(a1, a2, a3, a4) CALL_GetShaderInfoLog(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetShaderSource(a1, a2, a3, a4) CALL_GetShaderSource(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetShaderiv(a1, a2, a3) CALL_GetShaderiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetUniformLocation(a1, a2) CALL_GetUniformLocation(GET_DISPATCH(), (a1, a2)) +#define glGetUniformfv(a1, a2, a3) CALL_GetUniformfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetUniformiv(a1, a2, a3) CALL_GetUniformiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribPointerv(a1, a2, a3) CALL_GetVertexAttribPointerv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribdv(a1, a2, a3) CALL_GetVertexAttribdv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribfv(a1, a2, a3) CALL_GetVertexAttribfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribiv(a1, a2, a3) CALL_GetVertexAttribiv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsProgram(a1) CALL_IsProgram(GET_DISPATCH(), (a1)) +#define glIsShader(a1) CALL_IsShader(GET_DISPATCH(), (a1)) +#define glLinkProgram(a1) CALL_LinkProgram(GET_DISPATCH(), (a1)) +#define glShaderSource(a1, a2, a3, a4) CALL_ShaderSource(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glStencilFuncSeparate(a1, a2, a3, a4) CALL_StencilFuncSeparate(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glStencilMaskSeparate(a1, a2) CALL_StencilMaskSeparate(GET_DISPATCH(), (a1, a2)) +#define glStencilOpSeparate(a1, a2, a3, a4) CALL_StencilOpSeparate(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniform1f(a1, a2) CALL_Uniform1f(GET_DISPATCH(), (a1, a2)) +#define glUniform1fv(a1, a2, a3) CALL_Uniform1fv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform1i(a1, a2) CALL_Uniform1i(GET_DISPATCH(), (a1, a2)) +#define glUniform1iv(a1, a2, a3) CALL_Uniform1iv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2f(a1, a2, a3) CALL_Uniform2f(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2fv(a1, a2, a3) CALL_Uniform2fv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2i(a1, a2, a3) CALL_Uniform2i(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2iv(a1, a2, a3) CALL_Uniform2iv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform3f(a1, a2, a3, a4) CALL_Uniform3f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniform3fv(a1, a2, a3) CALL_Uniform3fv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform3i(a1, a2, a3, a4) CALL_Uniform3i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniform3iv(a1, a2, a3) CALL_Uniform3iv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform4f(a1, a2, a3, a4, a5) CALL_Uniform4f(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glUniform4fv(a1, a2, a3) CALL_Uniform4fv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform4i(a1, a2, a3, a4, a5) CALL_Uniform4i(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glUniform4iv(a1, a2, a3) CALL_Uniform4iv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniformMatrix2fv(a1, a2, a3, a4) CALL_UniformMatrix2fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix3fv(a1, a2, a3, a4) CALL_UniformMatrix3fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix4fv(a1, a2, a3, a4) CALL_UniformMatrix4fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUseProgram(a1) CALL_UseProgram(GET_DISPATCH(), (a1)) +#define glValidateProgram(a1) CALL_ValidateProgram(GET_DISPATCH(), (a1)) +#define glVertexAttrib1d(a1, a2) CALL_VertexAttrib1d(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1dv(a1, a2) CALL_VertexAttrib1dv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1s(a1, a2) CALL_VertexAttrib1s(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1sv(a1, a2) CALL_VertexAttrib1sv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2d(a1, a2, a3) CALL_VertexAttrib2d(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2dv(a1, a2) CALL_VertexAttrib2dv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2s(a1, a2, a3) CALL_VertexAttrib2s(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2sv(a1, a2) CALL_VertexAttrib2sv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3d(a1, a2, a3, a4) CALL_VertexAttrib3d(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3dv(a1, a2) CALL_VertexAttrib3dv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3s(a1, a2, a3, a4) CALL_VertexAttrib3s(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3sv(a1, a2) CALL_VertexAttrib3sv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Nbv(a1, a2) CALL_VertexAttrib4Nbv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Niv(a1, a2) CALL_VertexAttrib4Niv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Nsv(a1, a2) CALL_VertexAttrib4Nsv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Nub(a1, a2, a3, a4, a5) CALL_VertexAttrib4Nub(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4Nubv(a1, a2) CALL_VertexAttrib4Nubv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Nuiv(a1, a2) CALL_VertexAttrib4Nuiv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4Nusv(a1, a2) CALL_VertexAttrib4Nusv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4bv(a1, a2) CALL_VertexAttrib4bv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4d(a1, a2, a3, a4, a5) CALL_VertexAttrib4d(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4dv(a1, a2) CALL_VertexAttrib4dv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4iv(a1, a2) CALL_VertexAttrib4iv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4s(a1, a2, a3, a4, a5) CALL_VertexAttrib4s(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4sv(a1, a2) CALL_VertexAttrib4sv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4ubv(a1, a2) CALL_VertexAttrib4ubv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4uiv(a1, a2) CALL_VertexAttrib4uiv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4usv(a1, a2) CALL_VertexAttrib4usv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribPointer(a1, a2, a3, a4, a5, a6) CALL_VertexAttribPointer(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glUniformMatrix2x3fv(a1, a2, a3, a4) CALL_UniformMatrix2x3fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix2x4fv(a1, a2, a3, a4) CALL_UniformMatrix2x4fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix3x2fv(a1, a2, a3, a4) CALL_UniformMatrix3x2fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix3x4fv(a1, a2, a3, a4) CALL_UniformMatrix3x4fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix4x2fv(a1, a2, a3, a4) CALL_UniformMatrix4x2fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformMatrix4x3fv(a1, a2, a3, a4) CALL_UniformMatrix4x3fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBeginConditionalRender(a1, a2) CALL_BeginConditionalRender(GET_DISPATCH(), (a1, a2)) +#define glBeginTransformFeedback(a1) CALL_BeginTransformFeedback(GET_DISPATCH(), (a1)) +#define glBindBufferBase(a1, a2, a3) CALL_BindBufferBase(GET_DISPATCH(), (a1, a2, a3)) +#define glBindBufferRange(a1, a2, a3, a4, a5) CALL_BindBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glBindFragDataLocation(a1, a2, a3) CALL_BindFragDataLocation(GET_DISPATCH(), (a1, a2, a3)) +#define glClampColor(a1, a2) CALL_ClampColor(GET_DISPATCH(), (a1, a2)) +#define glClearBufferfi(a1, a2, a3, a4) CALL_ClearBufferfi(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearBufferfv(a1, a2, a3) CALL_ClearBufferfv(GET_DISPATCH(), (a1, a2, a3)) +#define glClearBufferiv(a1, a2, a3) CALL_ClearBufferiv(GET_DISPATCH(), (a1, a2, a3)) +#define glClearBufferuiv(a1, a2, a3) CALL_ClearBufferuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glColorMaski(a1, a2, a3, a4, a5) CALL_ColorMaski(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDisablei(a1, a2) CALL_Disablei(GET_DISPATCH(), (a1, a2)) +#define glEnablei(a1, a2) CALL_Enablei(GET_DISPATCH(), (a1, a2)) +#define glEndConditionalRender() CALL_EndConditionalRender(GET_DISPATCH(), ()) +#define glEndTransformFeedback() CALL_EndTransformFeedback(GET_DISPATCH(), ()) +#define glGetBooleani_v(a1, a2, a3) CALL_GetBooleani_v(GET_DISPATCH(), (a1, a2, a3)) +#define glGetFragDataLocation(a1, a2) CALL_GetFragDataLocation(GET_DISPATCH(), (a1, a2)) +#define glGetIntegeri_v(a1, a2, a3) CALL_GetIntegeri_v(GET_DISPATCH(), (a1, a2, a3)) +#define glGetStringi(a1, a2) CALL_GetStringi(GET_DISPATCH(), (a1, a2)) +#define glGetTexParameterIiv(a1, a2, a3) CALL_GetTexParameterIiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexParameterIuiv(a1, a2, a3) CALL_GetTexParameterIuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTransformFeedbackVarying(a1, a2, a3, a4, a5, a6, a7) CALL_GetTransformFeedbackVarying(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glGetUniformuiv(a1, a2, a3) CALL_GetUniformuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribIiv(a1, a2, a3) CALL_GetVertexAttribIiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribIuiv(a1, a2, a3) CALL_GetVertexAttribIuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsEnabledi(a1, a2) CALL_IsEnabledi(GET_DISPATCH(), (a1, a2)) +#define glTexParameterIiv(a1, a2, a3) CALL_TexParameterIiv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexParameterIuiv(a1, a2, a3) CALL_TexParameterIuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glTransformFeedbackVaryings(a1, a2, a3, a4) CALL_TransformFeedbackVaryings(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniform1ui(a1, a2) CALL_Uniform1ui(GET_DISPATCH(), (a1, a2)) +#define glUniform1uiv(a1, a2, a3) CALL_Uniform1uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2ui(a1, a2, a3) CALL_Uniform2ui(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform2uiv(a1, a2, a3) CALL_Uniform2uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform3ui(a1, a2, a3, a4) CALL_Uniform3ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniform3uiv(a1, a2, a3) CALL_Uniform3uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glUniform4ui(a1, a2, a3, a4, a5) CALL_Uniform4ui(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glUniform4uiv(a1, a2, a3) CALL_Uniform4uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribI1iv(a1, a2) CALL_VertexAttribI1iv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI1uiv(a1, a2) CALL_VertexAttribI1uiv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4bv(a1, a2) CALL_VertexAttribI4bv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4sv(a1, a2) CALL_VertexAttribI4sv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4ubv(a1, a2) CALL_VertexAttribI4ubv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4usv(a1, a2) CALL_VertexAttribI4usv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribIPointer(a1, a2, a3, a4, a5) CALL_VertexAttribIPointer(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glPrimitiveRestartIndex(a1) CALL_PrimitiveRestartIndex(GET_DISPATCH(), (a1)) +#define glTexBuffer(a1, a2, a3) CALL_TexBuffer(GET_DISPATCH(), (a1, a2, a3)) +#define glFramebufferTexture(a1, a2, a3, a4) CALL_FramebufferTexture(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetBufferParameteri64v(a1, a2, a3) CALL_GetBufferParameteri64v(GET_DISPATCH(), (a1, a2, a3)) +#define glGetInteger64i_v(a1, a2, a3) CALL_GetInteger64i_v(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribDivisor(a1, a2) CALL_VertexAttribDivisor(GET_DISPATCH(), (a1, a2)) +#define glMinSampleShading(a1) CALL_MinSampleShading(GET_DISPATCH(), (a1)) +#define glBindProgramARB(a1, a2) CALL_BindProgramARB(GET_DISPATCH(), (a1, a2)) +#define glDeleteProgramsARB(a1, a2) CALL_DeleteProgramsARB(GET_DISPATCH(), (a1, a2)) +#define glGenProgramsARB(a1, a2) CALL_GenProgramsARB(GET_DISPATCH(), (a1, a2)) +#define glGetProgramEnvParameterdvARB(a1, a2, a3) CALL_GetProgramEnvParameterdvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramEnvParameterfvARB(a1, a2, a3) CALL_GetProgramEnvParameterfvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramLocalParameterdvARB(a1, a2, a3) CALL_GetProgramLocalParameterdvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramLocalParameterfvARB(a1, a2, a3) CALL_GetProgramLocalParameterfvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramStringARB(a1, a2, a3) CALL_GetProgramStringARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramivARB(a1, a2, a3) CALL_GetProgramivARB(GET_DISPATCH(), (a1, a2, a3)) +#define glIsProgramARB(a1) CALL_IsProgramARB(GET_DISPATCH(), (a1)) +#define glProgramEnvParameter4dARB(a1, a2, a3, a4, a5, a6) CALL_ProgramEnvParameter4dARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramEnvParameter4dvARB(a1, a2, a3) CALL_ProgramEnvParameter4dvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramEnvParameter4fARB(a1, a2, a3, a4, a5, a6) CALL_ProgramEnvParameter4fARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramEnvParameter4fvARB(a1, a2, a3) CALL_ProgramEnvParameter4fvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramLocalParameter4dARB(a1, a2, a3, a4, a5, a6) CALL_ProgramLocalParameter4dARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramLocalParameter4dvARB(a1, a2, a3) CALL_ProgramLocalParameter4dvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramLocalParameter4fARB(a1, a2, a3, a4, a5, a6) CALL_ProgramLocalParameter4fARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramLocalParameter4fvARB(a1, a2, a3) CALL_ProgramLocalParameter4fvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramStringARB(a1, a2, a3, a4) CALL_ProgramStringARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib1fARB(a1, a2) CALL_VertexAttrib1fARB(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1fvARB(a1, a2) CALL_VertexAttrib1fvARB(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2fARB(a1, a2, a3) CALL_VertexAttrib2fARB(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2fvARB(a1, a2) CALL_VertexAttrib2fvARB(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3fARB(a1, a2, a3, a4) CALL_VertexAttrib3fARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3fvARB(a1, a2) CALL_VertexAttrib3fvARB(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4fARB(a1, a2, a3, a4, a5) CALL_VertexAttrib4fARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4fvARB(a1, a2) CALL_VertexAttrib4fvARB(GET_DISPATCH(), (a1, a2)) +#define glAttachObjectARB(a1, a2) CALL_AttachObjectARB(GET_DISPATCH(), (a1, a2)) +#define glCreateProgramObjectARB() CALL_CreateProgramObjectARB(GET_DISPATCH(), ()) +#define glCreateShaderObjectARB(a1) CALL_CreateShaderObjectARB(GET_DISPATCH(), (a1)) +#define glDeleteObjectARB(a1) CALL_DeleteObjectARB(GET_DISPATCH(), (a1)) +#define glDetachObjectARB(a1, a2) CALL_DetachObjectARB(GET_DISPATCH(), (a1, a2)) +#define glGetAttachedObjectsARB(a1, a2, a3, a4) CALL_GetAttachedObjectsARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetHandleARB(a1) CALL_GetHandleARB(GET_DISPATCH(), (a1)) +#define glGetInfoLogARB(a1, a2, a3, a4) CALL_GetInfoLogARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetObjectParameterfvARB(a1, a2, a3) CALL_GetObjectParameterfvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetObjectParameterivARB(a1, a2, a3) CALL_GetObjectParameterivARB(GET_DISPATCH(), (a1, a2, a3)) +#define glDrawArraysInstancedARB(a1, a2, a3, a4) CALL_DrawArraysInstancedARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glDrawElementsInstancedARB(a1, a2, a3, a4, a5) CALL_DrawElementsInstancedARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glBindFramebuffer(a1, a2) CALL_BindFramebuffer(GET_DISPATCH(), (a1, a2)) +#define glBindRenderbuffer(a1, a2) CALL_BindRenderbuffer(GET_DISPATCH(), (a1, a2)) +#define glBlitFramebuffer(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) CALL_BlitFramebuffer(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)) +#define glCheckFramebufferStatus(a1) CALL_CheckFramebufferStatus(GET_DISPATCH(), (a1)) +#define glDeleteFramebuffers(a1, a2) CALL_DeleteFramebuffers(GET_DISPATCH(), (a1, a2)) +#define glDeleteRenderbuffers(a1, a2) CALL_DeleteRenderbuffers(GET_DISPATCH(), (a1, a2)) +#define glFramebufferRenderbuffer(a1, a2, a3, a4) CALL_FramebufferRenderbuffer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glFramebufferTexture1D(a1, a2, a3, a4, a5) CALL_FramebufferTexture1D(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glFramebufferTexture2D(a1, a2, a3, a4, a5) CALL_FramebufferTexture2D(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glFramebufferTexture3D(a1, a2, a3, a4, a5, a6) CALL_FramebufferTexture3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glFramebufferTextureLayer(a1, a2, a3, a4, a5) CALL_FramebufferTextureLayer(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGenFramebuffers(a1, a2) CALL_GenFramebuffers(GET_DISPATCH(), (a1, a2)) +#define glGenRenderbuffers(a1, a2) CALL_GenRenderbuffers(GET_DISPATCH(), (a1, a2)) +#define glGenerateMipmap(a1) CALL_GenerateMipmap(GET_DISPATCH(), (a1)) +#define glGetFramebufferAttachmentParameteriv(a1, a2, a3, a4) CALL_GetFramebufferAttachmentParameteriv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetRenderbufferParameteriv(a1, a2, a3) CALL_GetRenderbufferParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsFramebuffer(a1) CALL_IsFramebuffer(GET_DISPATCH(), (a1)) +#define glIsRenderbuffer(a1) CALL_IsRenderbuffer(GET_DISPATCH(), (a1)) +#define glRenderbufferStorage(a1, a2, a3, a4) CALL_RenderbufferStorage(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRenderbufferStorageMultisample(a1, a2, a3, a4, a5) CALL_RenderbufferStorageMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glFramebufferTextureFaceARB(a1, a2, a3, a4, a5) CALL_FramebufferTextureFaceARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glFlushMappedBufferRange(a1, a2, a3) CALL_FlushMappedBufferRange(GET_DISPATCH(), (a1, a2, a3)) +#define glMapBufferRange(a1, a2, a3, a4) CALL_MapBufferRange(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBindVertexArray(a1) CALL_BindVertexArray(GET_DISPATCH(), (a1)) +#define glDeleteVertexArrays(a1, a2) CALL_DeleteVertexArrays(GET_DISPATCH(), (a1, a2)) +#define glGenVertexArrays(a1, a2) CALL_GenVertexArrays(GET_DISPATCH(), (a1, a2)) +#define glIsVertexArray(a1) CALL_IsVertexArray(GET_DISPATCH(), (a1)) +#define glGetActiveUniformBlockName(a1, a2, a3, a4, a5) CALL_GetActiveUniformBlockName(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetActiveUniformBlockiv(a1, a2, a3, a4) CALL_GetActiveUniformBlockiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetActiveUniformName(a1, a2, a3, a4, a5) CALL_GetActiveUniformName(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetActiveUniformsiv(a1, a2, a3, a4, a5) CALL_GetActiveUniformsiv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetUniformBlockIndex(a1, a2) CALL_GetUniformBlockIndex(GET_DISPATCH(), (a1, a2)) +#define glGetUniformIndices(a1, a2, a3, a4) CALL_GetUniformIndices(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glUniformBlockBinding(a1, a2, a3) CALL_UniformBlockBinding(GET_DISPATCH(), (a1, a2, a3)) +#define glCopyBufferSubData(a1, a2, a3, a4, a5) CALL_CopyBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glClientWaitSync(a1, a2, a3) CALL_ClientWaitSync(GET_DISPATCH(), (a1, a2, a3)) +#define glDeleteSync(a1) CALL_DeleteSync(GET_DISPATCH(), (a1)) +#define glFenceSync(a1, a2) CALL_FenceSync(GET_DISPATCH(), (a1, a2)) +#define glGetInteger64v(a1, a2) CALL_GetInteger64v(GET_DISPATCH(), (a1, a2)) +#define glGetSynciv(a1, a2, a3, a4, a5) CALL_GetSynciv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glIsSync(a1) CALL_IsSync(GET_DISPATCH(), (a1)) +#define glWaitSync(a1, a2, a3) CALL_WaitSync(GET_DISPATCH(), (a1, a2, a3)) +#define glDrawElementsBaseVertex(a1, a2, a3, a4, a5) CALL_DrawElementsBaseVertex(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawElementsInstancedBaseVertex(a1, a2, a3, a4, a5, a6) CALL_DrawElementsInstancedBaseVertex(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glDrawRangeElementsBaseVertex(a1, a2, a3, a4, a5, a6, a7) CALL_DrawRangeElementsBaseVertex(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glMultiDrawElementsBaseVertex(a1, a2, a3, a4, a5, a6) CALL_MultiDrawElementsBaseVertex(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProvokingVertex(a1) CALL_ProvokingVertex(GET_DISPATCH(), (a1)) +#define glGetMultisamplefv(a1, a2, a3) CALL_GetMultisamplefv(GET_DISPATCH(), (a1, a2, a3)) +#define glSampleMaski(a1, a2) CALL_SampleMaski(GET_DISPATCH(), (a1, a2)) +#define glTexImage2DMultisample(a1, a2, a3, a4, a5, a6) CALL_TexImage2DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glTexImage3DMultisample(a1, a2, a3, a4, a5, a6, a7) CALL_TexImage3DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glBlendEquationSeparateiARB(a1, a2, a3) CALL_BlendEquationSeparateiARB(GET_DISPATCH(), (a1, a2, a3)) +#define glBlendEquationiARB(a1, a2) CALL_BlendEquationiARB(GET_DISPATCH(), (a1, a2)) +#define glBlendFuncSeparateiARB(a1, a2, a3, a4, a5) CALL_BlendFuncSeparateiARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glBlendFunciARB(a1, a2, a3) CALL_BlendFunciARB(GET_DISPATCH(), (a1, a2, a3)) +#define glBindFragDataLocationIndexed(a1, a2, a3, a4) CALL_BindFragDataLocationIndexed(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetFragDataIndex(a1, a2) CALL_GetFragDataIndex(GET_DISPATCH(), (a1, a2)) +#define glBindSampler(a1, a2) CALL_BindSampler(GET_DISPATCH(), (a1, a2)) +#define glDeleteSamplers(a1, a2) CALL_DeleteSamplers(GET_DISPATCH(), (a1, a2)) +#define glGenSamplers(a1, a2) CALL_GenSamplers(GET_DISPATCH(), (a1, a2)) +#define glGetSamplerParameterIiv(a1, a2, a3) CALL_GetSamplerParameterIiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetSamplerParameterIuiv(a1, a2, a3) CALL_GetSamplerParameterIuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetSamplerParameterfv(a1, a2, a3) CALL_GetSamplerParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetSamplerParameteriv(a1, a2, a3) CALL_GetSamplerParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsSampler(a1) CALL_IsSampler(GET_DISPATCH(), (a1)) +#define glSamplerParameterIiv(a1, a2, a3) CALL_SamplerParameterIiv(GET_DISPATCH(), (a1, a2, a3)) +#define glSamplerParameterIuiv(a1, a2, a3) CALL_SamplerParameterIuiv(GET_DISPATCH(), (a1, a2, a3)) +#define glSamplerParameterf(a1, a2, a3) CALL_SamplerParameterf(GET_DISPATCH(), (a1, a2, a3)) +#define glSamplerParameterfv(a1, a2, a3) CALL_SamplerParameterfv(GET_DISPATCH(), (a1, a2, a3)) +#define glSamplerParameteri(a1, a2, a3) CALL_SamplerParameteri(GET_DISPATCH(), (a1, a2, a3)) +#define glSamplerParameteriv(a1, a2, a3) CALL_SamplerParameteriv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetQueryObjecti64v(a1, a2, a3) CALL_GetQueryObjecti64v(GET_DISPATCH(), (a1, a2, a3)) +#define glGetQueryObjectui64v(a1, a2, a3) CALL_GetQueryObjectui64v(GET_DISPATCH(), (a1, a2, a3)) +#define glQueryCounter(a1, a2) CALL_QueryCounter(GET_DISPATCH(), (a1, a2)) +#define glColorP3ui(a1, a2) CALL_ColorP3ui(GET_DISPATCH(), (a1, a2)) +#define glColorP3uiv(a1, a2) CALL_ColorP3uiv(GET_DISPATCH(), (a1, a2)) +#define glColorP4ui(a1, a2) CALL_ColorP4ui(GET_DISPATCH(), (a1, a2)) +#define glColorP4uiv(a1, a2) CALL_ColorP4uiv(GET_DISPATCH(), (a1, a2)) +#define glMultiTexCoordP1ui(a1, a2, a3) CALL_MultiTexCoordP1ui(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP1uiv(a1, a2, a3) CALL_MultiTexCoordP1uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP2ui(a1, a2, a3) CALL_MultiTexCoordP2ui(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP2uiv(a1, a2, a3) CALL_MultiTexCoordP2uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP3ui(a1, a2, a3) CALL_MultiTexCoordP3ui(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP3uiv(a1, a2, a3) CALL_MultiTexCoordP3uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP4ui(a1, a2, a3) CALL_MultiTexCoordP4ui(GET_DISPATCH(), (a1, a2, a3)) +#define glMultiTexCoordP4uiv(a1, a2, a3) CALL_MultiTexCoordP4uiv(GET_DISPATCH(), (a1, a2, a3)) +#define glNormalP3ui(a1, a2) CALL_NormalP3ui(GET_DISPATCH(), (a1, a2)) +#define glNormalP3uiv(a1, a2) CALL_NormalP3uiv(GET_DISPATCH(), (a1, a2)) +#define glSecondaryColorP3ui(a1, a2) CALL_SecondaryColorP3ui(GET_DISPATCH(), (a1, a2)) +#define glSecondaryColorP3uiv(a1, a2) CALL_SecondaryColorP3uiv(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP1ui(a1, a2) CALL_TexCoordP1ui(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP1uiv(a1, a2) CALL_TexCoordP1uiv(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP2ui(a1, a2) CALL_TexCoordP2ui(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP2uiv(a1, a2) CALL_TexCoordP2uiv(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP3ui(a1, a2) CALL_TexCoordP3ui(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP3uiv(a1, a2) CALL_TexCoordP3uiv(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP4ui(a1, a2) CALL_TexCoordP4ui(GET_DISPATCH(), (a1, a2)) +#define glTexCoordP4uiv(a1, a2) CALL_TexCoordP4uiv(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribP1ui(a1, a2, a3, a4) CALL_VertexAttribP1ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP1uiv(a1, a2, a3, a4) CALL_VertexAttribP1uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP2ui(a1, a2, a3, a4) CALL_VertexAttribP2ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP2uiv(a1, a2, a3, a4) CALL_VertexAttribP2uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP3ui(a1, a2, a3, a4) CALL_VertexAttribP3ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP3uiv(a1, a2, a3, a4) CALL_VertexAttribP3uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP4ui(a1, a2, a3, a4) CALL_VertexAttribP4ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribP4uiv(a1, a2, a3, a4) CALL_VertexAttribP4uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexP2ui(a1, a2) CALL_VertexP2ui(GET_DISPATCH(), (a1, a2)) +#define glVertexP2uiv(a1, a2) CALL_VertexP2uiv(GET_DISPATCH(), (a1, a2)) +#define glVertexP3ui(a1, a2) CALL_VertexP3ui(GET_DISPATCH(), (a1, a2)) +#define glVertexP3uiv(a1, a2) CALL_VertexP3uiv(GET_DISPATCH(), (a1, a2)) +#define glVertexP4ui(a1, a2) CALL_VertexP4ui(GET_DISPATCH(), (a1, a2)) +#define glVertexP4uiv(a1, a2) CALL_VertexP4uiv(GET_DISPATCH(), (a1, a2)) +#define glDrawArraysIndirect(a1, a2) CALL_DrawArraysIndirect(GET_DISPATCH(), (a1, a2)) +#define glDrawElementsIndirect(a1, a2, a3) CALL_DrawElementsIndirect(GET_DISPATCH(), (a1, a2, a3)) +#define glBindTransformFeedback(a1, a2) CALL_BindTransformFeedback(GET_DISPATCH(), (a1, a2)) +#define glDeleteTransformFeedbacks(a1, a2) CALL_DeleteTransformFeedbacks(GET_DISPATCH(), (a1, a2)) +#define glDrawTransformFeedback(a1, a2) CALL_DrawTransformFeedback(GET_DISPATCH(), (a1, a2)) +#define glGenTransformFeedbacks(a1, a2) CALL_GenTransformFeedbacks(GET_DISPATCH(), (a1, a2)) +#define glIsTransformFeedback(a1) CALL_IsTransformFeedback(GET_DISPATCH(), (a1)) +#define glPauseTransformFeedback() CALL_PauseTransformFeedback(GET_DISPATCH(), ()) +#define glResumeTransformFeedback() CALL_ResumeTransformFeedback(GET_DISPATCH(), ()) +#define glBeginQueryIndexed(a1, a2, a3) CALL_BeginQueryIndexed(GET_DISPATCH(), (a1, a2, a3)) +#define glDrawTransformFeedbackStream(a1, a2, a3) CALL_DrawTransformFeedbackStream(GET_DISPATCH(), (a1, a2, a3)) +#define glEndQueryIndexed(a1, a2) CALL_EndQueryIndexed(GET_DISPATCH(), (a1, a2)) +#define glGetQueryIndexediv(a1, a2, a3, a4) CALL_GetQueryIndexediv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearDepthf(a1) CALL_ClearDepthf(GET_DISPATCH(), (a1)) +#define glDepthRangef(a1, a2) CALL_DepthRangef(GET_DISPATCH(), (a1, a2)) +#define glGetShaderPrecisionFormat(a1, a2, a3, a4) CALL_GetShaderPrecisionFormat(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glReleaseShaderCompiler() CALL_ReleaseShaderCompiler(GET_DISPATCH(), ()) +#define glShaderBinary(a1, a2, a3, a4, a5) CALL_ShaderBinary(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetProgramBinary(a1, a2, a3, a4, a5) CALL_GetProgramBinary(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramBinary(a1, a2, a3, a4) CALL_ProgramBinary(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramParameteri(a1, a2, a3) CALL_ProgramParameteri(GET_DISPATCH(), (a1, a2, a3)) +#define glDepthRangeArrayv(a1, a2, a3) CALL_DepthRangeArrayv(GET_DISPATCH(), (a1, a2, a3)) +#define glDepthRangeIndexed(a1, a2, a3) CALL_DepthRangeIndexed(GET_DISPATCH(), (a1, a2, a3)) +#define glGetDoublei_v(a1, a2, a3) CALL_GetDoublei_v(GET_DISPATCH(), (a1, a2, a3)) +#define glGetFloati_v(a1, a2, a3) CALL_GetFloati_v(GET_DISPATCH(), (a1, a2, a3)) +#define glScissorArrayv(a1, a2, a3) CALL_ScissorArrayv(GET_DISPATCH(), (a1, a2, a3)) +#define glScissorIndexed(a1, a2, a3, a4, a5) CALL_ScissorIndexed(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glScissorIndexedv(a1, a2) CALL_ScissorIndexedv(GET_DISPATCH(), (a1, a2)) +#define glViewportArrayv(a1, a2, a3) CALL_ViewportArrayv(GET_DISPATCH(), (a1, a2, a3)) +#define glViewportIndexedf(a1, a2, a3, a4, a5) CALL_ViewportIndexedf(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glViewportIndexedfv(a1, a2) CALL_ViewportIndexedfv(GET_DISPATCH(), (a1, a2)) +#define glGetGraphicsResetStatusARB() CALL_GetGraphicsResetStatusARB(GET_DISPATCH(), ()) +#define glGetnColorTableARB(a1, a2, a3, a4, a5) CALL_GetnColorTableARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetnCompressedTexImageARB(a1, a2, a3, a4) CALL_GetnCompressedTexImageARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnConvolutionFilterARB(a1, a2, a3, a4, a5) CALL_GetnConvolutionFilterARB(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetnHistogramARB(a1, a2, a3, a4, a5, a6) CALL_GetnHistogramARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glGetnMapdvARB(a1, a2, a3, a4) CALL_GetnMapdvARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnMapfvARB(a1, a2, a3, a4) CALL_GetnMapfvARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnMapivARB(a1, a2, a3, a4) CALL_GetnMapivARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnMinmaxARB(a1, a2, a3, a4, a5, a6) CALL_GetnMinmaxARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glGetnPixelMapfvARB(a1, a2, a3) CALL_GetnPixelMapfvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetnPixelMapuivARB(a1, a2, a3) CALL_GetnPixelMapuivARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetnPixelMapusvARB(a1, a2, a3) CALL_GetnPixelMapusvARB(GET_DISPATCH(), (a1, a2, a3)) +#define glGetnPolygonStippleARB(a1, a2) CALL_GetnPolygonStippleARB(GET_DISPATCH(), (a1, a2)) +#define glGetnSeparableFilterARB(a1, a2, a3, a4, a5, a6, a7, a8) CALL_GetnSeparableFilterARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glGetnTexImageARB(a1, a2, a3, a4, a5, a6) CALL_GetnTexImageARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glGetnUniformdvARB(a1, a2, a3, a4) CALL_GetnUniformdvARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnUniformfvARB(a1, a2, a3, a4) CALL_GetnUniformfvARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnUniformivARB(a1, a2, a3, a4) CALL_GetnUniformivARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetnUniformuivARB(a1, a2, a3, a4) CALL_GetnUniformuivARB(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glReadnPixelsARB(a1, a2, a3, a4, a5, a6, a7, a8) CALL_ReadnPixelsARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glDrawArraysInstancedBaseInstance(a1, a2, a3, a4, a5) CALL_DrawArraysInstancedBaseInstance(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawElementsInstancedBaseInstance(a1, a2, a3, a4, a5, a6) CALL_DrawElementsInstancedBaseInstance(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glDrawElementsInstancedBaseVertexBaseInstance(a1, a2, a3, a4, a5, a6, a7) CALL_DrawElementsInstancedBaseVertexBaseInstance(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glDrawTransformFeedbackInstanced(a1, a2, a3) CALL_DrawTransformFeedbackInstanced(GET_DISPATCH(), (a1, a2, a3)) +#define glDrawTransformFeedbackStreamInstanced(a1, a2, a3, a4) CALL_DrawTransformFeedbackStreamInstanced(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetInternalformativ(a1, a2, a3, a4, a5) CALL_GetInternalformativ(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetActiveAtomicCounterBufferiv(a1, a2, a3, a4) CALL_GetActiveAtomicCounterBufferiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBindImageTexture(a1, a2, a3, a4, a5, a6, a7) CALL_BindImageTexture(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glMemoryBarrier(a1) CALL_MemoryBarrier(GET_DISPATCH(), (a1)) +#define glTexStorage1D(a1, a2, a3, a4) CALL_TexStorage1D(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexStorage2D(a1, a2, a3, a4, a5) CALL_TexStorage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glTexStorage3D(a1, a2, a3, a4, a5, a6) CALL_TexStorage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glTextureStorage1DEXT(a1, a2, a3, a4, a5) CALL_TextureStorage1DEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glTextureStorage2DEXT(a1, a2, a3, a4, a5, a6) CALL_TextureStorage2DEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glTextureStorage3DEXT(a1, a2, a3, a4, a5, a6, a7) CALL_TextureStorage3DEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glClearBufferData(a1, a2, a3, a4, a5) CALL_ClearBufferData(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glClearBufferSubData(a1, a2, a3, a4, a5, a6, a7) CALL_ClearBufferSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glDispatchCompute(a1, a2, a3) CALL_DispatchCompute(GET_DISPATCH(), (a1, a2, a3)) +#define glDispatchComputeIndirect(a1) CALL_DispatchComputeIndirect(GET_DISPATCH(), (a1)) +#define glCopyImageSubData(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15) CALL_CopyImageSubData(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15)) +#define glTextureView(a1, a2, a3, a4, a5, a6, a7, a8) CALL_TextureView(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glBindVertexBuffer(a1, a2, a3, a4) CALL_BindVertexBuffer(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribBinding(a1, a2) CALL_VertexAttribBinding(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribFormat(a1, a2, a3, a4, a5) CALL_VertexAttribFormat(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttribIFormat(a1, a2, a3, a4) CALL_VertexAttribIFormat(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribLFormat(a1, a2, a3, a4) CALL_VertexAttribLFormat(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexBindingDivisor(a1, a2) CALL_VertexBindingDivisor(GET_DISPATCH(), (a1, a2)) +#define glMultiDrawArraysIndirect(a1, a2, a3, a4) CALL_MultiDrawArraysIndirect(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glMultiDrawElementsIndirect(a1, a2, a3, a4, a5) CALL_MultiDrawElementsIndirect(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glTexBufferRange(a1, a2, a3, a4, a5) CALL_TexBufferRange(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glTexStorage2DMultisample(a1, a2, a3, a4, a5, a6) CALL_TexStorage2DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glTexStorage3DMultisample(a1, a2, a3, a4, a5, a6, a7) CALL_TexStorage3DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glBufferStorage(a1, a2, a3, a4) CALL_BufferStorage(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearTexImage(a1, a2, a3, a4, a5) CALL_ClearTexImage(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glClearTexSubImage(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_ClearTexSubImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)) +#define glBindBuffersBase(a1, a2, a3, a4) CALL_BindBuffersBase(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBindBuffersRange(a1, a2, a3, a4, a5, a6) CALL_BindBuffersRange(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glBindImageTextures(a1, a2, a3) CALL_BindImageTextures(GET_DISPATCH(), (a1, a2, a3)) +#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)) +#define glInvalidateSubFramebuffer(a1, a2, a3, a4, a5, a6, a7) CALL_InvalidateSubFramebuffer(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glInvalidateTexImage(a1, a2) CALL_InvalidateTexImage(GET_DISPATCH(), (a1, a2)) +#define glInvalidateTexSubImage(a1, a2, a3, a4, a5, a6, a7, a8) CALL_InvalidateTexSubImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glPolygonOffsetEXT(a1, a2) CALL_PolygonOffsetEXT(GET_DISPATCH(), (a1, a2)) +#define glDrawTexfOES(a1, a2, a3, a4, a5) CALL_DrawTexfOES(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawTexfvOES(a1) CALL_DrawTexfvOES(GET_DISPATCH(), (a1)) +#define glDrawTexiOES(a1, a2, a3, a4, a5) CALL_DrawTexiOES(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawTexivOES(a1) CALL_DrawTexivOES(GET_DISPATCH(), (a1)) +#define glDrawTexsOES(a1, a2, a3, a4, a5) CALL_DrawTexsOES(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawTexsvOES(a1) CALL_DrawTexsvOES(GET_DISPATCH(), (a1)) +#define glDrawTexxOES(a1, a2, a3, a4, a5) CALL_DrawTexxOES(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDrawTexxvOES(a1) CALL_DrawTexxvOES(GET_DISPATCH(), (a1)) +#define glPointSizePointerOES(a1, a2, a3) CALL_PointSizePointerOES(GET_DISPATCH(), (a1, a2, a3)) +#define glQueryMatrixxOES(a1, a2) CALL_QueryMatrixxOES(GET_DISPATCH(), (a1, a2)) +#define glSampleMaskSGIS(a1, a2) CALL_SampleMaskSGIS(GET_DISPATCH(), (a1, a2)) +#define glSamplePatternSGIS(a1) CALL_SamplePatternSGIS(GET_DISPATCH(), (a1)) +#define glColorPointerEXT(a1, a2, a3, a4, a5) CALL_ColorPointerEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glEdgeFlagPointerEXT(a1, a2, a3) CALL_EdgeFlagPointerEXT(GET_DISPATCH(), (a1, a2, a3)) +#define glIndexPointerEXT(a1, a2, a3, a4) CALL_IndexPointerEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glNormalPointerEXT(a1, a2, a3, a4) CALL_NormalPointerEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glTexCoordPointerEXT(a1, a2, a3, a4, a5) CALL_TexCoordPointerEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexPointerEXT(a1, a2, a3, a4, a5) CALL_VertexPointerEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glDiscardFramebufferEXT(a1, a2, a3) CALL_DiscardFramebufferEXT(GET_DISPATCH(), (a1, a2, a3)) +#define glActiveShaderProgram(a1, a2) CALL_ActiveShaderProgram(GET_DISPATCH(), (a1, a2)) +#define glBindProgramPipeline(a1) CALL_BindProgramPipeline(GET_DISPATCH(), (a1)) +#define glCreateShaderProgramv(a1, a2, a3) CALL_CreateShaderProgramv(GET_DISPATCH(), (a1, a2, a3)) +#define glDeleteProgramPipelines(a1, a2) CALL_DeleteProgramPipelines(GET_DISPATCH(), (a1, a2)) +#define glGenProgramPipelines(a1, a2) CALL_GenProgramPipelines(GET_DISPATCH(), (a1, a2)) +#define glGetProgramPipelineInfoLog(a1, a2, a3, a4) CALL_GetProgramPipelineInfoLog(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetProgramPipelineiv(a1, a2, a3) CALL_GetProgramPipelineiv(GET_DISPATCH(), (a1, a2, a3)) +#define glIsProgramPipeline(a1) CALL_IsProgramPipeline(GET_DISPATCH(), (a1)) +#define glLockArraysEXT(a1, a2) CALL_LockArraysEXT(GET_DISPATCH(), (a1, a2)) +#define glProgramUniform1f(a1, a2, a3) CALL_ProgramUniform1f(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramUniform1fv(a1, a2, a3, a4) CALL_ProgramUniform1fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform1i(a1, a2, a3) CALL_ProgramUniform1i(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramUniform1iv(a1, a2, a3, a4) CALL_ProgramUniform1iv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform1ui(a1, a2, a3) CALL_ProgramUniform1ui(GET_DISPATCH(), (a1, a2, a3)) +#define glProgramUniform1uiv(a1, a2, a3, a4) CALL_ProgramUniform1uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2f(a1, a2, a3, a4) CALL_ProgramUniform2f(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2fv(a1, a2, a3, a4) CALL_ProgramUniform2fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2i(a1, a2, a3, a4) CALL_ProgramUniform2i(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2iv(a1, a2, a3, a4) CALL_ProgramUniform2iv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2ui(a1, a2, a3, a4) CALL_ProgramUniform2ui(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform2uiv(a1, a2, a3, a4) CALL_ProgramUniform2uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform3f(a1, a2, a3, a4, a5) CALL_ProgramUniform3f(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniform3fv(a1, a2, a3, a4) CALL_ProgramUniform3fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform3i(a1, a2, a3, a4, a5) CALL_ProgramUniform3i(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniform3iv(a1, a2, a3, a4) CALL_ProgramUniform3iv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform3ui(a1, a2, a3, a4, a5) CALL_ProgramUniform3ui(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniform3uiv(a1, a2, a3, a4) CALL_ProgramUniform3uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform4f(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramUniform4fv(a1, a2, a3, a4) CALL_ProgramUniform4fv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform4i(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4i(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramUniform4iv(a1, a2, a3, a4) CALL_ProgramUniform4iv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniform4ui(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4ui(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glProgramUniform4uiv(a1, a2, a3, a4) CALL_ProgramUniform4uiv(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramUniformMatrix2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix2x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix2x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix3x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix3x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix4x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glProgramUniformMatrix4x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glUnlockArraysEXT() CALL_UnlockArraysEXT(GET_DISPATCH(), ()) +#define glUseProgramStages(a1, a2, a3) CALL_UseProgramStages(GET_DISPATCH(), (a1, a2, a3)) +#define glValidateProgramPipeline(a1) CALL_ValidateProgramPipeline(GET_DISPATCH(), (a1)) +#define glDebugMessageCallback(a1, a2) CALL_DebugMessageCallback(GET_DISPATCH(), (a1, a2)) +#define glDebugMessageControl(a1, a2, a3, a4, a5, a6) CALL_DebugMessageControl(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glDebugMessageInsert(a1, a2, a3, a4, a5, a6) CALL_DebugMessageInsert(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glGetDebugMessageLog(a1, a2, a3, a4, a5, a6, a7, a8) CALL_GetDebugMessageLog(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8)) +#define glGetObjectLabel(a1, a2, a3, a4, a5) CALL_GetObjectLabel(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetObjectPtrLabel(a1, a2, a3, a4) CALL_GetObjectPtrLabel(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glObjectLabel(a1, a2, a3, a4) CALL_ObjectLabel(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glObjectPtrLabel(a1, a2, a3) CALL_ObjectPtrLabel(GET_DISPATCH(), (a1, a2, a3)) +#define glPopDebugGroup() CALL_PopDebugGroup(GET_DISPATCH(), ()) +#define glPushDebugGroup(a1, a2, a3, a4) CALL_PushDebugGroup(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glSecondaryColor3fEXT(a1, a2, a3) CALL_SecondaryColor3fEXT(GET_DISPATCH(), (a1, a2, a3)) +#define glSecondaryColor3fvEXT(a1) CALL_SecondaryColor3fvEXT(GET_DISPATCH(), (a1)) +#define glMultiDrawElementsEXT(a1, a2, a3, a4, a5) CALL_MultiDrawElementsEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glFogCoordfEXT(a1) CALL_FogCoordfEXT(GET_DISPATCH(), (a1)) +#define glFogCoordfvEXT(a1) CALL_FogCoordfvEXT(GET_DISPATCH(), (a1)) +#define glResizeBuffersMESA() CALL_ResizeBuffersMESA(GET_DISPATCH(), ()) +#define glWindowPos4dMESA(a1, a2, a3, a4) CALL_WindowPos4dMESA(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glWindowPos4dvMESA(a1) CALL_WindowPos4dvMESA(GET_DISPATCH(), (a1)) +#define glWindowPos4fMESA(a1, a2, a3, a4) CALL_WindowPos4fMESA(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glWindowPos4fvMESA(a1) CALL_WindowPos4fvMESA(GET_DISPATCH(), (a1)) +#define glWindowPos4iMESA(a1, a2, a3, a4) CALL_WindowPos4iMESA(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glWindowPos4ivMESA(a1) CALL_WindowPos4ivMESA(GET_DISPATCH(), (a1)) +#define glWindowPos4sMESA(a1, a2, a3, a4) CALL_WindowPos4sMESA(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glWindowPos4svMESA(a1) CALL_WindowPos4svMESA(GET_DISPATCH(), (a1)) +#define glMultiModeDrawArraysIBM(a1, a2, a3, a4, a5) CALL_MultiModeDrawArraysIBM(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glMultiModeDrawElementsIBM(a1, a2, a3, a4, a5, a6) CALL_MultiModeDrawElementsIBM(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glAreProgramsResidentNV(a1, a2, a3) CALL_AreProgramsResidentNV(GET_DISPATCH(), (a1, a2, a3)) +#define glExecuteProgramNV(a1, a2, a3) CALL_ExecuteProgramNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramParameterdvNV(a1, a2, a3, a4) CALL_GetProgramParameterdvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetProgramParameterfvNV(a1, a2, a3, a4) CALL_GetProgramParameterfvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetProgramStringNV(a1, a2, a3) CALL_GetProgramStringNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetProgramivNV(a1, a2, a3) CALL_GetProgramivNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTrackMatrixivNV(a1, a2, a3, a4) CALL_GetTrackMatrixivNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetVertexAttribdvNV(a1, a2, a3) CALL_GetVertexAttribdvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribfvNV(a1, a2, a3) CALL_GetVertexAttribfvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetVertexAttribivNV(a1, a2, a3) CALL_GetVertexAttribivNV(GET_DISPATCH(), (a1, a2, a3)) +#define glLoadProgramNV(a1, a2, a3, a4) CALL_LoadProgramNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramParameters4dvNV(a1, a2, a3, a4) CALL_ProgramParameters4dvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramParameters4fvNV(a1, a2, a3, a4) CALL_ProgramParameters4fvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glRequestResidentProgramsNV(a1, a2) CALL_RequestResidentProgramsNV(GET_DISPATCH(), (a1, a2)) +#define glTrackMatrixNV(a1, a2, a3, a4) CALL_TrackMatrixNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib1dNV(a1, a2) CALL_VertexAttrib1dNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1dvNV(a1, a2) CALL_VertexAttrib1dvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1fNV(a1, a2) CALL_VertexAttrib1fNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1fvNV(a1, a2) CALL_VertexAttrib1fvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1sNV(a1, a2) CALL_VertexAttrib1sNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib1svNV(a1, a2) CALL_VertexAttrib1svNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2dNV(a1, a2, a3) CALL_VertexAttrib2dNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2dvNV(a1, a2) CALL_VertexAttrib2dvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2fNV(a1, a2, a3) CALL_VertexAttrib2fNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2fvNV(a1, a2) CALL_VertexAttrib2fvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib2sNV(a1, a2, a3) CALL_VertexAttrib2sNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttrib2svNV(a1, a2) CALL_VertexAttrib2svNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3dNV(a1, a2, a3, a4) CALL_VertexAttrib3dNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3dvNV(a1, a2) CALL_VertexAttrib3dvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3fNV(a1, a2, a3, a4) CALL_VertexAttrib3fNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3fvNV(a1, a2) CALL_VertexAttrib3fvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib3sNV(a1, a2, a3, a4) CALL_VertexAttrib3sNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttrib3svNV(a1, a2) CALL_VertexAttrib3svNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4dNV(a1, a2, a3, a4, a5) CALL_VertexAttrib4dNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4dvNV(a1, a2) CALL_VertexAttrib4dvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4fNV(a1, a2, a3, a4, a5) CALL_VertexAttrib4fNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4fvNV(a1, a2) CALL_VertexAttrib4fvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4sNV(a1, a2, a3, a4, a5) CALL_VertexAttrib4sNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4svNV(a1, a2) CALL_VertexAttrib4svNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttrib4ubNV(a1, a2, a3, a4, a5) CALL_VertexAttrib4ubNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttrib4ubvNV(a1, a2) CALL_VertexAttrib4ubvNV(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribPointerNV(a1, a2, a3, a4, a5) CALL_VertexAttribPointerNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttribs1dvNV(a1, a2, a3) CALL_VertexAttribs1dvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs1fvNV(a1, a2, a3) CALL_VertexAttribs1fvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs1svNV(a1, a2, a3) CALL_VertexAttribs1svNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs2dvNV(a1, a2, a3) CALL_VertexAttribs2dvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs2fvNV(a1, a2, a3) CALL_VertexAttribs2fvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs2svNV(a1, a2, a3) CALL_VertexAttribs2svNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs3dvNV(a1, a2, a3) CALL_VertexAttribs3dvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs3fvNV(a1, a2, a3) CALL_VertexAttribs3fvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs3svNV(a1, a2, a3) CALL_VertexAttribs3svNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs4dvNV(a1, a2, a3) CALL_VertexAttribs4dvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs4fvNV(a1, a2, a3) CALL_VertexAttribs4fvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs4svNV(a1, a2, a3) CALL_VertexAttribs4svNV(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribs4ubvNV(a1, a2, a3) CALL_VertexAttribs4ubvNV(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexBumpParameterfvATI(a1, a2) CALL_GetTexBumpParameterfvATI(GET_DISPATCH(), (a1, a2)) +#define glGetTexBumpParameterivATI(a1, a2) CALL_GetTexBumpParameterivATI(GET_DISPATCH(), (a1, a2)) +#define glTexBumpParameterfvATI(a1, a2) CALL_TexBumpParameterfvATI(GET_DISPATCH(), (a1, a2)) +#define glTexBumpParameterivATI(a1, a2) CALL_TexBumpParameterivATI(GET_DISPATCH(), (a1, a2)) +#define glAlphaFragmentOp1ATI(a1, a2, a3, a4, a5, a6) CALL_AlphaFragmentOp1ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glAlphaFragmentOp2ATI(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_AlphaFragmentOp2ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9)) +#define glAlphaFragmentOp3ATI(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12) CALL_AlphaFragmentOp3ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12)) +#define glBeginFragmentShaderATI() CALL_BeginFragmentShaderATI(GET_DISPATCH(), ()) +#define glBindFragmentShaderATI(a1) CALL_BindFragmentShaderATI(GET_DISPATCH(), (a1)) +#define glColorFragmentOp1ATI(a1, a2, a3, a4, a5, a6, a7) CALL_ColorFragmentOp1ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glColorFragmentOp2ATI(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) CALL_ColorFragmentOp2ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10)) +#define glColorFragmentOp3ATI(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13) CALL_ColorFragmentOp3ATI(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13)) +#define glDeleteFragmentShaderATI(a1) CALL_DeleteFragmentShaderATI(GET_DISPATCH(), (a1)) +#define glEndFragmentShaderATI() CALL_EndFragmentShaderATI(GET_DISPATCH(), ()) +#define glGenFragmentShadersATI(a1) CALL_GenFragmentShadersATI(GET_DISPATCH(), (a1)) +#define glPassTexCoordATI(a1, a2, a3) CALL_PassTexCoordATI(GET_DISPATCH(), (a1, a2, a3)) +#define glSampleMapATI(a1, a2, a3) CALL_SampleMapATI(GET_DISPATCH(), (a1, a2, a3)) +#define glSetFragmentShaderConstantATI(a1, a2) CALL_SetFragmentShaderConstantATI(GET_DISPATCH(), (a1, a2)) +#define glActiveStencilFaceEXT(a1) CALL_ActiveStencilFaceEXT(GET_DISPATCH(), (a1)) +#define glBindVertexArrayAPPLE(a1) CALL_BindVertexArrayAPPLE(GET_DISPATCH(), (a1)) +#define glGenVertexArraysAPPLE(a1, a2) CALL_GenVertexArraysAPPLE(GET_DISPATCH(), (a1, a2)) +#define glGetProgramNamedParameterdvNV(a1, a2, a3, a4) CALL_GetProgramNamedParameterdvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetProgramNamedParameterfvNV(a1, a2, a3, a4) CALL_GetProgramNamedParameterfvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramNamedParameter4dNV(a1, a2, a3, a4, a5, a6, a7) CALL_ProgramNamedParameter4dNV(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glProgramNamedParameter4dvNV(a1, a2, a3, a4) CALL_ProgramNamedParameter4dvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramNamedParameter4fNV(a1, a2, a3, a4, a5, a6, a7) CALL_ProgramNamedParameter4fNV(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glProgramNamedParameter4fvNV(a1, a2, a3, a4) CALL_ProgramNamedParameter4fvNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glPrimitiveRestartNV() CALL_PrimitiveRestartNV(GET_DISPATCH(), ()) +#define glGetTexGenxvOES(a1, a2, a3) CALL_GetTexGenxvOES(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGenxOES(a1, a2, a3) CALL_TexGenxOES(GET_DISPATCH(), (a1, a2, a3)) +#define glTexGenxvOES(a1, a2, a3) CALL_TexGenxvOES(GET_DISPATCH(), (a1, a2, a3)) +#define glDepthBoundsEXT(a1, a2) CALL_DepthBoundsEXT(GET_DISPATCH(), (a1, a2)) +#define glBindFramebufferEXT(a1, a2) CALL_BindFramebufferEXT(GET_DISPATCH(), (a1, a2)) +#define glBindRenderbufferEXT(a1, a2) CALL_BindRenderbufferEXT(GET_DISPATCH(), (a1, a2)) +#define glBufferParameteriAPPLE(a1, a2, a3) CALL_BufferParameteriAPPLE(GET_DISPATCH(), (a1, a2, a3)) +#define glFlushMappedBufferRangeAPPLE(a1, a2, a3) CALL_FlushMappedBufferRangeAPPLE(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribI1iEXT(a1, a2) CALL_VertexAttribI1iEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI1uiEXT(a1, a2) CALL_VertexAttribI1uiEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI2iEXT(a1, a2, a3) CALL_VertexAttribI2iEXT(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribI2ivEXT(a1, a2) CALL_VertexAttribI2ivEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI2uiEXT(a1, a2, a3) CALL_VertexAttribI2uiEXT(GET_DISPATCH(), (a1, a2, a3)) +#define glVertexAttribI2uivEXT(a1, a2) CALL_VertexAttribI2uivEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI3iEXT(a1, a2, a3, a4) CALL_VertexAttribI3iEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribI3ivEXT(a1, a2) CALL_VertexAttribI3ivEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI3uiEXT(a1, a2, a3, a4) CALL_VertexAttribI3uiEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVertexAttribI3uivEXT(a1, a2) CALL_VertexAttribI3uivEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4iEXT(a1, a2, a3, a4, a5) CALL_VertexAttribI4iEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttribI4ivEXT(a1, a2) CALL_VertexAttribI4ivEXT(GET_DISPATCH(), (a1, a2)) +#define glVertexAttribI4uiEXT(a1, a2, a3, a4, a5) CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVertexAttribI4uivEXT(a1, a2) CALL_VertexAttribI4uivEXT(GET_DISPATCH(), (a1, a2)) +#define glClearColorIiEXT(a1, a2, a3, a4) CALL_ClearColorIiEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearColorIuiEXT(a1, a2, a3, a4) CALL_ClearColorIuiEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBindBufferOffsetEXT(a1, a2, a3, a4) CALL_BindBufferOffsetEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glBeginPerfMonitorAMD(a1) CALL_BeginPerfMonitorAMD(GET_DISPATCH(), (a1)) +#define glDeletePerfMonitorsAMD(a1, a2) CALL_DeletePerfMonitorsAMD(GET_DISPATCH(), (a1, a2)) +#define glEndPerfMonitorAMD(a1) CALL_EndPerfMonitorAMD(GET_DISPATCH(), (a1)) +#define glGenPerfMonitorsAMD(a1, a2) CALL_GenPerfMonitorsAMD(GET_DISPATCH(), (a1, a2)) +#define glGetPerfMonitorCounterDataAMD(a1, a2, a3, a4, a5) CALL_GetPerfMonitorCounterDataAMD(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetPerfMonitorCounterInfoAMD(a1, a2, a3, a4) CALL_GetPerfMonitorCounterInfoAMD(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetPerfMonitorCounterStringAMD(a1, a2, a3, a4, a5) CALL_GetPerfMonitorCounterStringAMD(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetPerfMonitorCountersAMD(a1, a2, a3, a4, a5) CALL_GetPerfMonitorCountersAMD(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetPerfMonitorGroupStringAMD(a1, a2, a3, a4) CALL_GetPerfMonitorGroupStringAMD(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glGetPerfMonitorGroupsAMD(a1, a2, a3) CALL_GetPerfMonitorGroupsAMD(GET_DISPATCH(), (a1, a2, a3)) +#define glSelectPerfMonitorCountersAMD(a1, a2, a3, a4, a5) CALL_SelectPerfMonitorCountersAMD(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetObjectParameterivAPPLE(a1, a2, a3, a4) CALL_GetObjectParameterivAPPLE(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glObjectPurgeableAPPLE(a1, a2, a3) CALL_ObjectPurgeableAPPLE(GET_DISPATCH(), (a1, a2, a3)) +#define glObjectUnpurgeableAPPLE(a1, a2, a3) CALL_ObjectUnpurgeableAPPLE(GET_DISPATCH(), (a1, a2, a3)) +#define glActiveProgramEXT(a1) CALL_ActiveProgramEXT(GET_DISPATCH(), (a1)) +#define glCreateShaderProgramEXT(a1, a2) CALL_CreateShaderProgramEXT(GET_DISPATCH(), (a1, a2)) +#define glUseShaderProgramEXT(a1, a2) CALL_UseShaderProgramEXT(GET_DISPATCH(), (a1, a2)) +#define glTextureBarrierNV() CALL_TextureBarrierNV(GET_DISPATCH(), ()) +#define glVDPAUFiniNV() CALL_VDPAUFiniNV(GET_DISPATCH(), ()) +#define glVDPAUGetSurfaceivNV(a1, a2, a3, a4, a5) CALL_VDPAUGetSurfaceivNV(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glVDPAUInitNV(a1, a2) CALL_VDPAUInitNV(GET_DISPATCH(), (a1, a2)) +#define glVDPAUIsSurfaceNV(a1) CALL_VDPAUIsSurfaceNV(GET_DISPATCH(), (a1)) +#define glVDPAUMapSurfacesNV(a1, a2) CALL_VDPAUMapSurfacesNV(GET_DISPATCH(), (a1, a2)) +#define glVDPAURegisterOutputSurfaceNV(a1, a2, a3, a4) CALL_VDPAURegisterOutputSurfaceNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVDPAURegisterVideoSurfaceNV(a1, a2, a3, a4) CALL_VDPAURegisterVideoSurfaceNV(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glVDPAUSurfaceAccessNV(a1, a2) CALL_VDPAUSurfaceAccessNV(GET_DISPATCH(), (a1, a2)) +#define glVDPAUUnmapSurfacesNV(a1, a2) CALL_VDPAUUnmapSurfacesNV(GET_DISPATCH(), (a1, a2)) +#define glVDPAUUnregisterSurfaceNV(a1) CALL_VDPAUUnregisterSurfaceNV(GET_DISPATCH(), (a1)) +#define glBeginPerfQueryINTEL(a1) CALL_BeginPerfQueryINTEL(GET_DISPATCH(), (a1)) +#define glCreatePerfQueryINTEL(a1, a2) CALL_CreatePerfQueryINTEL(GET_DISPATCH(), (a1, a2)) +#define glDeletePerfQueryINTEL(a1) CALL_DeletePerfQueryINTEL(GET_DISPATCH(), (a1)) +#define glEndPerfQueryINTEL(a1) CALL_EndPerfQueryINTEL(GET_DISPATCH(), (a1)) +#define glGetFirstPerfQueryIdINTEL(a1) CALL_GetFirstPerfQueryIdINTEL(GET_DISPATCH(), (a1)) +#define glGetNextPerfQueryIdINTEL(a1, a2) CALL_GetNextPerfQueryIdINTEL(GET_DISPATCH(), (a1, a2)) +#define glGetPerfCounterInfoINTEL(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_GetPerfCounterInfoINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11)) +#define glGetPerfQueryDataINTEL(a1, a2, a3, a4, a5) CALL_GetPerfQueryDataINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glGetPerfQueryIdByNameINTEL(a1, a2) CALL_GetPerfQueryIdByNameINTEL(GET_DISPATCH(), (a1, a2)) +#define glGetPerfQueryInfoINTEL(a1, a2, a3, a4, a5, a6, a7) CALL_GetPerfQueryInfoINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7)) +#define glStencilFuncSeparateATI(a1, a2, a3, a4) CALL_StencilFuncSeparateATI(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramEnvParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramEnvParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glProgramLocalParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramLocalParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glEGLImageTargetRenderbufferStorageOES(a1, a2) CALL_EGLImageTargetRenderbufferStorageOES(GET_DISPATCH(), (a1, a2)) +#define glEGLImageTargetTexture2DOES(a1, a2) CALL_EGLImageTargetTexture2DOES(GET_DISPATCH(), (a1, a2)) +#define glAlphaFuncx(a1, a2) CALL_AlphaFuncx(GET_DISPATCH(), (a1, a2)) +#define glClearColorx(a1, a2, a3, a4) CALL_ClearColorx(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glClearDepthx(a1) CALL_ClearDepthx(GET_DISPATCH(), (a1)) +#define glColor4x(a1, a2, a3, a4) CALL_Color4x(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glDepthRangex(a1, a2) CALL_DepthRangex(GET_DISPATCH(), (a1, a2)) +#define glFogx(a1, a2) CALL_Fogx(GET_DISPATCH(), (a1, a2)) +#define glFogxv(a1, a2) CALL_Fogxv(GET_DISPATCH(), (a1, a2)) +#define glFrustumf(a1, a2, a3, a4, a5, a6) CALL_Frustumf(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glFrustumx(a1, a2, a3, a4, a5, a6) CALL_Frustumx(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glLightModelx(a1, a2) CALL_LightModelx(GET_DISPATCH(), (a1, a2)) +#define glLightModelxv(a1, a2) CALL_LightModelxv(GET_DISPATCH(), (a1, a2)) +#define glLightx(a1, a2, a3) CALL_Lightx(GET_DISPATCH(), (a1, a2, a3)) +#define glLightxv(a1, a2, a3) CALL_Lightxv(GET_DISPATCH(), (a1, a2, a3)) +#define glLineWidthx(a1) CALL_LineWidthx(GET_DISPATCH(), (a1)) +#define glLoadMatrixx(a1) CALL_LoadMatrixx(GET_DISPATCH(), (a1)) +#define glMaterialx(a1, a2, a3) CALL_Materialx(GET_DISPATCH(), (a1, a2, a3)) +#define glMaterialxv(a1, a2, a3) CALL_Materialxv(GET_DISPATCH(), (a1, a2, a3)) +#define glMultMatrixx(a1) CALL_MultMatrixx(GET_DISPATCH(), (a1)) +#define glMultiTexCoord4x(a1, a2, a3, a4, a5) CALL_MultiTexCoord4x(GET_DISPATCH(), (a1, a2, a3, a4, a5)) +#define glNormal3x(a1, a2, a3) CALL_Normal3x(GET_DISPATCH(), (a1, a2, a3)) +#define glOrthof(a1, a2, a3, a4, a5, a6) CALL_Orthof(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glOrthox(a1, a2, a3, a4, a5, a6) CALL_Orthox(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6)) +#define glPointSizex(a1) CALL_PointSizex(GET_DISPATCH(), (a1)) +#define glPolygonOffsetx(a1, a2) CALL_PolygonOffsetx(GET_DISPATCH(), (a1, a2)) +#define glRotatex(a1, a2, a3, a4) CALL_Rotatex(GET_DISPATCH(), (a1, a2, a3, a4)) +#define glSampleCoveragex(a1, a2) CALL_SampleCoveragex(GET_DISPATCH(), (a1, a2)) +#define glScalex(a1, a2, a3) CALL_Scalex(GET_DISPATCH(), (a1, a2, a3)) +#define glTexEnvx(a1, a2, a3) CALL_TexEnvx(GET_DISPATCH(), (a1, a2, a3)) +#define glTexEnvxv(a1, a2, a3) CALL_TexEnvxv(GET_DISPATCH(), (a1, a2, a3)) +#define glTexParameterx(a1, a2, a3) CALL_TexParameterx(GET_DISPATCH(), (a1, a2, a3)) +#define glTranslatex(a1, a2, a3) CALL_Translatex(GET_DISPATCH(), (a1, a2, a3)) +#define glClipPlanef(a1, a2) CALL_ClipPlanef(GET_DISPATCH(), (a1, a2)) +#define glClipPlanex(a1, a2) CALL_ClipPlanex(GET_DISPATCH(), (a1, a2)) +#define glGetClipPlanef(a1, a2) CALL_GetClipPlanef(GET_DISPATCH(), (a1, a2)) +#define glGetClipPlanex(a1, a2) CALL_GetClipPlanex(GET_DISPATCH(), (a1, a2)) +#define glGetFixedv(a1, a2) CALL_GetFixedv(GET_DISPATCH(), (a1, a2)) +#define glGetLightxv(a1, a2, a3) CALL_GetLightxv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetMaterialxv(a1, a2, a3) CALL_GetMaterialxv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexEnvxv(a1, a2, a3) CALL_GetTexEnvxv(GET_DISPATCH(), (a1, a2, a3)) +#define glGetTexParameterxv(a1, a2, a3) CALL_GetTexParameterxv(GET_DISPATCH(), (a1, a2, a3)) +#define glPointParameterx(a1, a2) CALL_PointParameterx(GET_DISPATCH(), (a1, a2)) +#define glPointParameterxv(a1, a2) CALL_PointParameterxv(GET_DISPATCH(), (a1, a2)) +#define glTexParameterxv(a1, a2, a3) CALL_TexParameterxv(GET_DISPATCH(), (a1, a2, a3)) + +#endif /* !defined( __GLFUNCTIONS_H__ ) */ diff --cc xorg-server/glx/glprocs.h index f3380a2,0000000..756f9a6 mode 100644,000000..100644 --- a/xorg-server/glx/glprocs.h +++ b/xorg-server/glx/glprocs.h @@@ -1,3593 -1,0 +1,3595 @@@ +/* DO NOT EDIT - This file generated automatically by gl_procs.py (from Mesa) script */ + +/* + * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * (C) Copyright IBM Corporation 2004, 2006 + * 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, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL, IBM, + * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + + +/* This file is only included by glapi.c and is used for + * the GetProcAddress() function + */ + +typedef struct { + GLint Name_offset; +#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) + _glapi_proc Address; +#endif + GLuint Offset; +} glprocs_table_t; + +#if !defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING) +# define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , o } +#elif defined(NEED_FUNCTION_POINTER) && !defined(GLX_INDIRECT_RENDERING) +# define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f1 , o } +#elif defined(NEED_FUNCTION_POINTER) && defined(GLX_INDIRECT_RENDERING) +# define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f2 , o } +#elif !defined(NEED_FUNCTION_POINTER) && defined(GLX_INDIRECT_RENDERING) +# define NAME_FUNC_OFFSET(n,f1,f2,f3,o) { n , (_glapi_proc) f3 , o } +#endif + + + +static const char gl_string_table[] = + "glNewList\0" + "glEndList\0" + "glCallList\0" + "glCallLists\0" + "glDeleteLists\0" + "glGenLists\0" + "glListBase\0" + "glBegin\0" + "glBitmap\0" + "glColor3b\0" + "glColor3bv\0" + "glColor3d\0" + "glColor3dv\0" + "glColor3f\0" + "glColor3fv\0" + "glColor3i\0" + "glColor3iv\0" + "glColor3s\0" + "glColor3sv\0" + "glColor3ub\0" + "glColor3ubv\0" + "glColor3ui\0" + "glColor3uiv\0" + "glColor3us\0" + "glColor3usv\0" + "glColor4b\0" + "glColor4bv\0" + "glColor4d\0" + "glColor4dv\0" + "glColor4f\0" + "glColor4fv\0" + "glColor4i\0" + "glColor4iv\0" + "glColor4s\0" + "glColor4sv\0" + "glColor4ub\0" + "glColor4ubv\0" + "glColor4ui\0" + "glColor4uiv\0" + "glColor4us\0" + "glColor4usv\0" + "glEdgeFlag\0" + "glEdgeFlagv\0" + "glEnd\0" + "glIndexd\0" + "glIndexdv\0" + "glIndexf\0" + "glIndexfv\0" + "glIndexi\0" + "glIndexiv\0" + "glIndexs\0" + "glIndexsv\0" + "glNormal3b\0" + "glNormal3bv\0" + "glNormal3d\0" + "glNormal3dv\0" + "glNormal3f\0" + "glNormal3fv\0" + "glNormal3i\0" + "glNormal3iv\0" + "glNormal3s\0" + "glNormal3sv\0" + "glRasterPos2d\0" + "glRasterPos2dv\0" + "glRasterPos2f\0" + "glRasterPos2fv\0" + "glRasterPos2i\0" + "glRasterPos2iv\0" + "glRasterPos2s\0" + "glRasterPos2sv\0" + "glRasterPos3d\0" + "glRasterPos3dv\0" + "glRasterPos3f\0" + "glRasterPos3fv\0" + "glRasterPos3i\0" + "glRasterPos3iv\0" + "glRasterPos3s\0" + "glRasterPos3sv\0" + "glRasterPos4d\0" + "glRasterPos4dv\0" + "glRasterPos4f\0" + "glRasterPos4fv\0" + "glRasterPos4i\0" + "glRasterPos4iv\0" + "glRasterPos4s\0" + "glRasterPos4sv\0" + "glRectd\0" + "glRectdv\0" + "glRectf\0" + "glRectfv\0" + "glRecti\0" + "glRectiv\0" + "glRects\0" + "glRectsv\0" + "glTexCoord1d\0" + "glTexCoord1dv\0" + "glTexCoord1f\0" + "glTexCoord1fv\0" + "glTexCoord1i\0" + "glTexCoord1iv\0" + "glTexCoord1s\0" + "glTexCoord1sv\0" + "glTexCoord2d\0" + "glTexCoord2dv\0" + "glTexCoord2f\0" + "glTexCoord2fv\0" + "glTexCoord2i\0" + "glTexCoord2iv\0" + "glTexCoord2s\0" + "glTexCoord2sv\0" + "glTexCoord3d\0" + "glTexCoord3dv\0" + "glTexCoord3f\0" + "glTexCoord3fv\0" + "glTexCoord3i\0" + "glTexCoord3iv\0" + "glTexCoord3s\0" + "glTexCoord3sv\0" + "glTexCoord4d\0" + "glTexCoord4dv\0" + "glTexCoord4f\0" + "glTexCoord4fv\0" + "glTexCoord4i\0" + "glTexCoord4iv\0" + "glTexCoord4s\0" + "glTexCoord4sv\0" + "glVertex2d\0" + "glVertex2dv\0" + "glVertex2f\0" + "glVertex2fv\0" + "glVertex2i\0" + "glVertex2iv\0" + "glVertex2s\0" + "glVertex2sv\0" + "glVertex3d\0" + "glVertex3dv\0" + "glVertex3f\0" + "glVertex3fv\0" + "glVertex3i\0" + "glVertex3iv\0" + "glVertex3s\0" + "glVertex3sv\0" + "glVertex4d\0" + "glVertex4dv\0" + "glVertex4f\0" + "glVertex4fv\0" + "glVertex4i\0" + "glVertex4iv\0" + "glVertex4s\0" + "glVertex4sv\0" + "glClipPlane\0" + "glColorMaterial\0" + "glCullFace\0" + "glFogf\0" + "glFogfv\0" + "glFogi\0" + "glFogiv\0" + "glFrontFace\0" + "glHint\0" + "glLightf\0" + "glLightfv\0" + "glLighti\0" + "glLightiv\0" + "glLightModelf\0" + "glLightModelfv\0" + "glLightModeli\0" + "glLightModeliv\0" + "glLineStipple\0" + "glLineWidth\0" + "glMaterialf\0" + "glMaterialfv\0" + "glMateriali\0" + "glMaterialiv\0" + "glPointSize\0" + "glPolygonMode\0" + "glPolygonStipple\0" + "glScissor\0" + "glShadeModel\0" + "glTexParameterf\0" + "glTexParameterfv\0" + "glTexParameteri\0" + "glTexParameteriv\0" + "glTexImage1D\0" + "glTexImage2D\0" + "glTexEnvf\0" + "glTexEnvfv\0" + "glTexEnvi\0" + "glTexEnviv\0" + "glTexGend\0" + "glTexGendv\0" + "glTexGenf\0" + "glTexGenfv\0" + "glTexGeni\0" + "glTexGeniv\0" + "glFeedbackBuffer\0" + "glSelectBuffer\0" + "glRenderMode\0" + "glInitNames\0" + "glLoadName\0" + "glPassThrough\0" + "glPopName\0" + "glPushName\0" + "glDrawBuffer\0" + "glClear\0" + "glClearAccum\0" + "glClearIndex\0" + "glClearColor\0" + "glClearStencil\0" + "glClearDepth\0" + "glStencilMask\0" + "glColorMask\0" + "glDepthMask\0" + "glIndexMask\0" + "glAccum\0" + "glDisable\0" + "glEnable\0" + "glFinish\0" + "glFlush\0" + "glPopAttrib\0" + "glPushAttrib\0" + "glMap1d\0" + "glMap1f\0" + "glMap2d\0" + "glMap2f\0" + "glMapGrid1d\0" + "glMapGrid1f\0" + "glMapGrid2d\0" + "glMapGrid2f\0" + "glEvalCoord1d\0" + "glEvalCoord1dv\0" + "glEvalCoord1f\0" + "glEvalCoord1fv\0" + "glEvalCoord2d\0" + "glEvalCoord2dv\0" + "glEvalCoord2f\0" + "glEvalCoord2fv\0" + "glEvalMesh1\0" + "glEvalPoint1\0" + "glEvalMesh2\0" + "glEvalPoint2\0" + "glAlphaFunc\0" + "glBlendFunc\0" + "glLogicOp\0" + "glStencilFunc\0" + "glStencilOp\0" + "glDepthFunc\0" + "glPixelZoom\0" + "glPixelTransferf\0" + "glPixelTransferi\0" + "glPixelStoref\0" + "glPixelStorei\0" + "glPixelMapfv\0" + "glPixelMapuiv\0" + "glPixelMapusv\0" + "glReadBuffer\0" + "glCopyPixels\0" + "glReadPixels\0" + "glDrawPixels\0" + "glGetBooleanv\0" + "glGetClipPlane\0" + "glGetDoublev\0" + "glGetError\0" + "glGetFloatv\0" + "glGetIntegerv\0" + "glGetLightfv\0" + "glGetLightiv\0" + "glGetMapdv\0" + "glGetMapfv\0" + "glGetMapiv\0" + "glGetMaterialfv\0" + "glGetMaterialiv\0" + "glGetPixelMapfv\0" + "glGetPixelMapuiv\0" + "glGetPixelMapusv\0" + "glGetPolygonStipple\0" + "glGetString\0" + "glGetTexEnvfv\0" + "glGetTexEnviv\0" + "glGetTexGendv\0" + "glGetTexGenfv\0" + "glGetTexGeniv\0" + "glGetTexImage\0" + "glGetTexParameterfv\0" + "glGetTexParameteriv\0" + "glGetTexLevelParameterfv\0" + "glGetTexLevelParameteriv\0" + "glIsEnabled\0" + "glIsList\0" + "glDepthRange\0" + "glFrustum\0" + "glLoadIdentity\0" + "glLoadMatrixf\0" + "glLoadMatrixd\0" + "glMatrixMode\0" + "glMultMatrixf\0" + "glMultMatrixd\0" + "glOrtho\0" + "glPopMatrix\0" + "glPushMatrix\0" + "glRotated\0" + "glRotatef\0" + "glScaled\0" + "glScalef\0" + "glTranslated\0" + "glTranslatef\0" + "glViewport\0" + "glArrayElement\0" + "glBindTexture\0" + "glColorPointer\0" + "glDisableClientState\0" + "glDrawArrays\0" + "glDrawElements\0" + "glEdgeFlagPointer\0" + "glEnableClientState\0" + "glIndexPointer\0" + "glIndexub\0" + "glIndexubv\0" + "glInterleavedArrays\0" + "glNormalPointer\0" + "glPolygonOffset\0" + "glTexCoordPointer\0" + "glVertexPointer\0" + "glAreTexturesResident\0" + "glCopyTexImage1D\0" + "glCopyTexImage2D\0" + "glCopyTexSubImage1D\0" + "glCopyTexSubImage2D\0" + "glDeleteTextures\0" + "glGenTextures\0" + "glGetPointerv\0" + "glIsTexture\0" + "glPrioritizeTextures\0" + "glTexSubImage1D\0" + "glTexSubImage2D\0" + "glPopClientAttrib\0" + "glPushClientAttrib\0" + "glBlendColor\0" + "glBlendEquation\0" + "glDrawRangeElements\0" + "glColorTable\0" + "glColorTableParameterfv\0" + "glColorTableParameteriv\0" + "glCopyColorTable\0" + "glGetColorTable\0" + "glGetColorTableParameterfv\0" + "glGetColorTableParameteriv\0" + "glColorSubTable\0" + "glCopyColorSubTable\0" + "glConvolutionFilter1D\0" + "glConvolutionFilter2D\0" + "glConvolutionParameterf\0" + "glConvolutionParameterfv\0" + "glConvolutionParameteri\0" + "glConvolutionParameteriv\0" + "glCopyConvolutionFilter1D\0" + "glCopyConvolutionFilter2D\0" + "glGetConvolutionFilter\0" + "glGetConvolutionParameterfv\0" + "glGetConvolutionParameteriv\0" + "glGetSeparableFilter\0" + "glSeparableFilter2D\0" + "glGetHistogram\0" + "glGetHistogramParameterfv\0" + "glGetHistogramParameteriv\0" + "glGetMinmax\0" + "glGetMinmaxParameterfv\0" + "glGetMinmaxParameteriv\0" + "glHistogram\0" + "glMinmax\0" + "glResetHistogram\0" + "glResetMinmax\0" + "glTexImage3D\0" + "glTexSubImage3D\0" + "glCopyTexSubImage3D\0" + "glActiveTexture\0" + "glClientActiveTexture\0" + "glMultiTexCoord1d\0" + "glMultiTexCoord1dv\0" + "glMultiTexCoord1fARB\0" + "glMultiTexCoord1fvARB\0" + "glMultiTexCoord1i\0" + "glMultiTexCoord1iv\0" + "glMultiTexCoord1s\0" + "glMultiTexCoord1sv\0" + "glMultiTexCoord2d\0" + "glMultiTexCoord2dv\0" + "glMultiTexCoord2fARB\0" + "glMultiTexCoord2fvARB\0" + "glMultiTexCoord2i\0" + "glMultiTexCoord2iv\0" + "glMultiTexCoord2s\0" + "glMultiTexCoord2sv\0" + "glMultiTexCoord3d\0" + "glMultiTexCoord3dv\0" + "glMultiTexCoord3fARB\0" + "glMultiTexCoord3fvARB\0" + "glMultiTexCoord3i\0" + "glMultiTexCoord3iv\0" + "glMultiTexCoord3s\0" + "glMultiTexCoord3sv\0" + "glMultiTexCoord4d\0" + "glMultiTexCoord4dv\0" + "glMultiTexCoord4fARB\0" + "glMultiTexCoord4fvARB\0" + "glMultiTexCoord4i\0" + "glMultiTexCoord4iv\0" + "glMultiTexCoord4s\0" + "glMultiTexCoord4sv\0" + "glCompressedTexImage1D\0" + "glCompressedTexImage2D\0" + "glCompressedTexImage3D\0" + "glCompressedTexSubImage1D\0" + "glCompressedTexSubImage2D\0" + "glCompressedTexSubImage3D\0" + "glGetCompressedTexImage\0" + "glLoadTransposeMatrixd\0" + "glLoadTransposeMatrixf\0" + "glMultTransposeMatrixd\0" + "glMultTransposeMatrixf\0" + "glSampleCoverage\0" + "glBlendFuncSeparate\0" + "glFogCoordPointer\0" + "glFogCoordd\0" + "glFogCoorddv\0" + "glMultiDrawArrays\0" + "glPointParameterf\0" + "glPointParameterfv\0" + "glPointParameteri\0" + "glPointParameteriv\0" + "glSecondaryColor3b\0" + "glSecondaryColor3bv\0" + "glSecondaryColor3d\0" + "glSecondaryColor3dv\0" + "glSecondaryColor3i\0" + "glSecondaryColor3iv\0" + "glSecondaryColor3s\0" + "glSecondaryColor3sv\0" + "glSecondaryColor3ub\0" + "glSecondaryColor3ubv\0" + "glSecondaryColor3ui\0" + "glSecondaryColor3uiv\0" + "glSecondaryColor3us\0" + "glSecondaryColor3usv\0" + "glSecondaryColorPointer\0" + "glWindowPos2d\0" + "glWindowPos2dv\0" + "glWindowPos2f\0" + "glWindowPos2fv\0" + "glWindowPos2i\0" + "glWindowPos2iv\0" + "glWindowPos2s\0" + "glWindowPos2sv\0" + "glWindowPos3d\0" + "glWindowPos3dv\0" + "glWindowPos3f\0" + "glWindowPos3fv\0" + "glWindowPos3i\0" + "glWindowPos3iv\0" + "glWindowPos3s\0" + "glWindowPos3sv\0" + "glBeginQuery\0" + "glBindBuffer\0" + "glBufferData\0" + "glBufferSubData\0" + "glDeleteBuffers\0" + "glDeleteQueries\0" + "glEndQuery\0" + "glGenBuffers\0" + "glGenQueries\0" + "glGetBufferParameteriv\0" + "glGetBufferPointerv\0" + "glGetBufferSubData\0" + "glGetQueryObjectiv\0" + "glGetQueryObjectuiv\0" + "glGetQueryiv\0" + "glIsBuffer\0" + "glIsQuery\0" + "glMapBuffer\0" + "glUnmapBuffer\0" + "glAttachShader\0" + "glBindAttribLocation\0" + "glBlendEquationSeparate\0" + "glCompileShader\0" + "glCreateProgram\0" + "glCreateShader\0" + "glDeleteProgram\0" + "glDeleteShader\0" + "glDetachShader\0" + "glDisableVertexAttribArray\0" + "glDrawBuffers\0" + "glEnableVertexAttribArray\0" + "glGetActiveAttrib\0" + "glGetActiveUniform\0" + "glGetAttachedShaders\0" + "glGetAttribLocation\0" + "glGetProgramInfoLog\0" + "glGetProgramiv\0" + "glGetShaderInfoLog\0" + "glGetShaderSource\0" + "glGetShaderiv\0" + "glGetUniformLocation\0" + "glGetUniformfv\0" + "glGetUniformiv\0" + "glGetVertexAttribPointerv\0" + "glGetVertexAttribdv\0" + "glGetVertexAttribfv\0" + "glGetVertexAttribiv\0" + "glIsProgram\0" + "glIsShader\0" + "glLinkProgram\0" + "glShaderSource\0" + "glStencilFuncSeparate\0" + "glStencilMaskSeparate\0" + "glStencilOpSeparate\0" + "glUniform1f\0" + "glUniform1fv\0" + "glUniform1i\0" + "glUniform1iv\0" + "glUniform2f\0" + "glUniform2fv\0" + "glUniform2i\0" + "glUniform2iv\0" + "glUniform3f\0" + "glUniform3fv\0" + "glUniform3i\0" + "glUniform3iv\0" + "glUniform4f\0" + "glUniform4fv\0" + "glUniform4i\0" + "glUniform4iv\0" + "glUniformMatrix2fv\0" + "glUniformMatrix3fv\0" + "glUniformMatrix4fv\0" + "glUseProgram\0" + "glValidateProgram\0" + "glVertexAttrib1d\0" + "glVertexAttrib1dv\0" + "glVertexAttrib1s\0" + "glVertexAttrib1sv\0" + "glVertexAttrib2d\0" + "glVertexAttrib2dv\0" + "glVertexAttrib2s\0" + "glVertexAttrib2sv\0" + "glVertexAttrib3d\0" + "glVertexAttrib3dv\0" + "glVertexAttrib3s\0" + "glVertexAttrib3sv\0" + "glVertexAttrib4Nbv\0" + "glVertexAttrib4Niv\0" + "glVertexAttrib4Nsv\0" + "glVertexAttrib4Nub\0" + "glVertexAttrib4Nubv\0" + "glVertexAttrib4Nuiv\0" + "glVertexAttrib4Nusv\0" + "glVertexAttrib4bv\0" + "glVertexAttrib4d\0" + "glVertexAttrib4dv\0" + "glVertexAttrib4iv\0" + "glVertexAttrib4s\0" + "glVertexAttrib4sv\0" + "glVertexAttrib4ubv\0" + "glVertexAttrib4uiv\0" + "glVertexAttrib4usv\0" + "glVertexAttribPointer\0" + "glUniformMatrix2x3fv\0" + "glUniformMatrix2x4fv\0" + "glUniformMatrix3x2fv\0" + "glUniformMatrix3x4fv\0" + "glUniformMatrix4x2fv\0" + "glUniformMatrix4x3fv\0" + "glBeginConditionalRender\0" + "glBeginTransformFeedback\0" + "glBindBufferBase\0" + "glBindBufferRange\0" + "glBindFragDataLocation\0" + "glClampColor\0" + "glClearBufferfi\0" + "glClearBufferfv\0" + "glClearBufferiv\0" + "glClearBufferuiv\0" + "glColorMaski\0" + "glDisablei\0" + "glEnablei\0" + "glEndConditionalRender\0" + "glEndTransformFeedback\0" + "glGetBooleani_v\0" + "glGetFragDataLocation\0" + "glGetIntegeri_v\0" + "glGetStringi\0" + "glGetTexParameterIiv\0" + "glGetTexParameterIuiv\0" + "glGetTransformFeedbackVarying\0" + "glGetUniformuiv\0" + "glGetVertexAttribIiv\0" + "glGetVertexAttribIuiv\0" + "glIsEnabledi\0" + "glTexParameterIiv\0" + "glTexParameterIuiv\0" + "glTransformFeedbackVaryings\0" + "glUniform1ui\0" + "glUniform1uiv\0" + "glUniform2ui\0" + "glUniform2uiv\0" + "glUniform3ui\0" + "glUniform3uiv\0" + "glUniform4ui\0" + "glUniform4uiv\0" + "glVertexAttribI1iv\0" + "glVertexAttribI1uiv\0" + "glVertexAttribI4bv\0" + "glVertexAttribI4sv\0" + "glVertexAttribI4ubv\0" + "glVertexAttribI4usv\0" + "glVertexAttribIPointer\0" + "glPrimitiveRestartIndex\0" + "glTexBuffer\0" + "glFramebufferTexture\0" + "glGetBufferParameteri64v\0" + "glGetInteger64i_v\0" + "glVertexAttribDivisor\0" + "glMinSampleShading\0" + "glBindProgramARB\0" + "glDeleteProgramsARB\0" + "glGenProgramsARB\0" + "glGetProgramEnvParameterdvARB\0" + "glGetProgramEnvParameterfvARB\0" + "glGetProgramLocalParameterdvARB\0" + "glGetProgramLocalParameterfvARB\0" + "glGetProgramStringARB\0" + "glGetProgramivARB\0" + "glIsProgramARB\0" + "glProgramEnvParameter4dARB\0" + "glProgramEnvParameter4dvARB\0" + "glProgramEnvParameter4fARB\0" + "glProgramEnvParameter4fvARB\0" + "glProgramLocalParameter4dARB\0" + "glProgramLocalParameter4dvARB\0" + "glProgramLocalParameter4fARB\0" + "glProgramLocalParameter4fvARB\0" + "glProgramStringARB\0" + "glVertexAttrib1fARB\0" + "glVertexAttrib1fvARB\0" + "glVertexAttrib2fARB\0" + "glVertexAttrib2fvARB\0" + "glVertexAttrib3fARB\0" + "glVertexAttrib3fvARB\0" + "glVertexAttrib4fARB\0" + "glVertexAttrib4fvARB\0" + "glAttachObjectARB\0" + "glCreateProgramObjectARB\0" + "glCreateShaderObjectARB\0" + "glDeleteObjectARB\0" + "glDetachObjectARB\0" + "glGetAttachedObjectsARB\0" + "glGetHandleARB\0" + "glGetInfoLogARB\0" + "glGetObjectParameterfvARB\0" + "glGetObjectParameterivARB\0" + "glDrawArraysInstancedARB\0" + "glDrawElementsInstancedARB\0" + "glBindFramebuffer\0" + "glBindRenderbuffer\0" + "glBlitFramebuffer\0" + "glCheckFramebufferStatus\0" + "glDeleteFramebuffers\0" + "glDeleteRenderbuffers\0" + "glFramebufferRenderbuffer\0" + "glFramebufferTexture1D\0" + "glFramebufferTexture2D\0" + "glFramebufferTexture3D\0" + "glFramebufferTextureLayer\0" + "glGenFramebuffers\0" + "glGenRenderbuffers\0" + "glGenerateMipmap\0" + "glGetFramebufferAttachmentParameteriv\0" + "glGetRenderbufferParameteriv\0" + "glIsFramebuffer\0" + "glIsRenderbuffer\0" + "glRenderbufferStorage\0" + "glRenderbufferStorageMultisample\0" + "glFramebufferTextureFaceARB\0" + "glFlushMappedBufferRange\0" + "glMapBufferRange\0" + "glBindVertexArray\0" + "glDeleteVertexArrays\0" + "glGenVertexArrays\0" + "glIsVertexArray\0" + "glGetActiveUniformBlockName\0" + "glGetActiveUniformBlockiv\0" + "glGetActiveUniformName\0" + "glGetActiveUniformsiv\0" + "glGetUniformBlockIndex\0" + "glGetUniformIndices\0" + "glUniformBlockBinding\0" + "glCopyBufferSubData\0" + "glClientWaitSync\0" + "glDeleteSync\0" + "glFenceSync\0" + "glGetInteger64v\0" + "glGetSynciv\0" + "glIsSync\0" + "glWaitSync\0" + "glDrawElementsBaseVertex\0" + "glDrawElementsInstancedBaseVertex\0" + "glDrawRangeElementsBaseVertex\0" + "glMultiDrawElementsBaseVertex\0" + "glProvokingVertex\0" + "glGetMultisamplefv\0" + "glSampleMaski\0" + "glTexImage2DMultisample\0" + "glTexImage3DMultisample\0" + "glBlendEquationSeparateiARB\0" + "glBlendEquationiARB\0" + "glBlendFuncSeparateiARB\0" + "glBlendFunciARB\0" + "glBindFragDataLocationIndexed\0" + "glGetFragDataIndex\0" + "glBindSampler\0" + "glDeleteSamplers\0" + "glGenSamplers\0" + "glGetSamplerParameterIiv\0" + "glGetSamplerParameterIuiv\0" + "glGetSamplerParameterfv\0" + "glGetSamplerParameteriv\0" + "glIsSampler\0" + "glSamplerParameterIiv\0" + "glSamplerParameterIuiv\0" + "glSamplerParameterf\0" + "glSamplerParameterfv\0" + "glSamplerParameteri\0" + "glSamplerParameteriv\0" + "glGetQueryObjecti64v\0" + "glGetQueryObjectui64v\0" + "glQueryCounter\0" + "glColorP3ui\0" + "glColorP3uiv\0" + "glColorP4ui\0" + "glColorP4uiv\0" + "glMultiTexCoordP1ui\0" + "glMultiTexCoordP1uiv\0" + "glMultiTexCoordP2ui\0" + "glMultiTexCoordP2uiv\0" + "glMultiTexCoordP3ui\0" + "glMultiTexCoordP3uiv\0" + "glMultiTexCoordP4ui\0" + "glMultiTexCoordP4uiv\0" + "glNormalP3ui\0" + "glNormalP3uiv\0" + "glSecondaryColorP3ui\0" + "glSecondaryColorP3uiv\0" + "glTexCoordP1ui\0" + "glTexCoordP1uiv\0" + "glTexCoordP2ui\0" + "glTexCoordP2uiv\0" + "glTexCoordP3ui\0" + "glTexCoordP3uiv\0" + "glTexCoordP4ui\0" + "glTexCoordP4uiv\0" + "glVertexAttribP1ui\0" + "glVertexAttribP1uiv\0" + "glVertexAttribP2ui\0" + "glVertexAttribP2uiv\0" + "glVertexAttribP3ui\0" + "glVertexAttribP3uiv\0" + "glVertexAttribP4ui\0" + "glVertexAttribP4uiv\0" + "glVertexP2ui\0" + "glVertexP2uiv\0" + "glVertexP3ui\0" + "glVertexP3uiv\0" + "glVertexP4ui\0" + "glVertexP4uiv\0" + "glDrawArraysIndirect\0" + "glDrawElementsIndirect\0" + "glBindTransformFeedback\0" + "glDeleteTransformFeedbacks\0" + "glDrawTransformFeedback\0" + "glGenTransformFeedbacks\0" + "glIsTransformFeedback\0" + "glPauseTransformFeedback\0" + "glResumeTransformFeedback\0" + "glBeginQueryIndexed\0" + "glDrawTransformFeedbackStream\0" + "glEndQueryIndexed\0" + "glGetQueryIndexediv\0" + "glClearDepthf\0" + "glDepthRangef\0" + "glGetShaderPrecisionFormat\0" + "glReleaseShaderCompiler\0" + "glShaderBinary\0" + "glGetProgramBinary\0" + "glProgramBinary\0" + "glProgramParameteri\0" + "glDepthRangeArrayv\0" + "glDepthRangeIndexed\0" + "glGetDoublei_v\0" + "glGetFloati_v\0" + "glScissorArrayv\0" + "glScissorIndexed\0" + "glScissorIndexedv\0" + "glViewportArrayv\0" + "glViewportIndexedf\0" + "glViewportIndexedfv\0" + "glGetGraphicsResetStatusARB\0" + "glGetnColorTableARB\0" + "glGetnCompressedTexImageARB\0" + "glGetnConvolutionFilterARB\0" + "glGetnHistogramARB\0" + "glGetnMapdvARB\0" + "glGetnMapfvARB\0" + "glGetnMapivARB\0" + "glGetnMinmaxARB\0" + "glGetnPixelMapfvARB\0" + "glGetnPixelMapuivARB\0" + "glGetnPixelMapusvARB\0" + "glGetnPolygonStippleARB\0" + "glGetnSeparableFilterARB\0" + "glGetnTexImageARB\0" + "glGetnUniformdvARB\0" + "glGetnUniformfvARB\0" + "glGetnUniformivARB\0" + "glGetnUniformuivARB\0" + "glReadnPixelsARB\0" + "glDrawArraysInstancedBaseInstance\0" + "glDrawElementsInstancedBaseInstance\0" + "glDrawElementsInstancedBaseVertexBaseInstance\0" + "glDrawTransformFeedbackInstanced\0" + "glDrawTransformFeedbackStreamInstanced\0" + "glGetInternalformativ\0" + "glGetActiveAtomicCounterBufferiv\0" + "glBindImageTexture\0" + "glMemoryBarrier\0" + "glTexStorage1D\0" + "glTexStorage2D\0" + "glTexStorage3D\0" + "glTextureStorage1DEXT\0" + "glTextureStorage2DEXT\0" + "glTextureStorage3DEXT\0" + "glClearBufferData\0" + "glClearBufferSubData\0" + "glDispatchCompute\0" + "glDispatchComputeIndirect\0" + "glCopyImageSubData\0" + "glTextureView\0" + "glBindVertexBuffer\0" + "glVertexAttribBinding\0" + "glVertexAttribFormat\0" + "glVertexAttribIFormat\0" + "glVertexAttribLFormat\0" + "glVertexBindingDivisor\0" + "glMultiDrawArraysIndirect\0" + "glMultiDrawElementsIndirect\0" + "glTexBufferRange\0" + "glTexStorage2DMultisample\0" + "glTexStorage3DMultisample\0" + "glBufferStorage\0" + "glClearTexImage\0" + "glClearTexSubImage\0" + "glBindBuffersBase\0" + "glBindBuffersRange\0" + "glBindImageTextures\0" + "glBindSamplers\0" + "glBindTextures\0" + "glBindVertexBuffers\0" ++ "glClipControl\0" + "glInvalidateBufferData\0" + "glInvalidateBufferSubData\0" + "glInvalidateFramebuffer\0" + "glInvalidateSubFramebuffer\0" + "glInvalidateTexImage\0" + "glInvalidateTexSubImage\0" + "glPolygonOffsetEXT\0" + "glDrawTexfOES\0" + "glDrawTexfvOES\0" + "glDrawTexiOES\0" + "glDrawTexivOES\0" + "glDrawTexsOES\0" + "glDrawTexsvOES\0" + "glDrawTexxOES\0" + "glDrawTexxvOES\0" + "glPointSizePointerOES\0" + "glQueryMatrixxOES\0" + "glSampleMaskSGIS\0" + "glSamplePatternSGIS\0" + "glColorPointerEXT\0" + "glEdgeFlagPointerEXT\0" + "glIndexPointerEXT\0" + "glNormalPointerEXT\0" + "glTexCoordPointerEXT\0" + "glVertexPointerEXT\0" + "glDiscardFramebufferEXT\0" + "glActiveShaderProgram\0" + "glBindProgramPipeline\0" + "glCreateShaderProgramv\0" + "glDeleteProgramPipelines\0" + "glGenProgramPipelines\0" + "glGetProgramPipelineInfoLog\0" + "glGetProgramPipelineiv\0" + "glIsProgramPipeline\0" + "glLockArraysEXT\0" + "glProgramUniform1f\0" + "glProgramUniform1fv\0" + "glProgramUniform1i\0" + "glProgramUniform1iv\0" + "glProgramUniform1ui\0" + "glProgramUniform1uiv\0" + "glProgramUniform2f\0" + "glProgramUniform2fv\0" + "glProgramUniform2i\0" + "glProgramUniform2iv\0" + "glProgramUniform2ui\0" + "glProgramUniform2uiv\0" + "glProgramUniform3f\0" + "glProgramUniform3fv\0" + "glProgramUniform3i\0" + "glProgramUniform3iv\0" + "glProgramUniform3ui\0" + "glProgramUniform3uiv\0" + "glProgramUniform4f\0" + "glProgramUniform4fv\0" + "glProgramUniform4i\0" + "glProgramUniform4iv\0" + "glProgramUniform4ui\0" + "glProgramUniform4uiv\0" + "glProgramUniformMatrix2fv\0" + "glProgramUniformMatrix2x3fv\0" + "glProgramUniformMatrix2x4fv\0" + "glProgramUniformMatrix3fv\0" + "glProgramUniformMatrix3x2fv\0" + "glProgramUniformMatrix3x4fv\0" + "glProgramUniformMatrix4fv\0" + "glProgramUniformMatrix4x2fv\0" + "glProgramUniformMatrix4x3fv\0" + "glUnlockArraysEXT\0" + "glUseProgramStages\0" + "glValidateProgramPipeline\0" + "glDebugMessageCallback\0" + "glDebugMessageControl\0" + "glDebugMessageInsert\0" + "glGetDebugMessageLog\0" + "glGetObjectLabel\0" + "glGetObjectPtrLabel\0" + "glObjectLabel\0" + "glObjectPtrLabel\0" + "glPopDebugGroup\0" + "glPushDebugGroup\0" + "glSecondaryColor3fEXT\0" + "glSecondaryColor3fvEXT\0" + "glMultiDrawElementsEXT\0" + "glFogCoordfEXT\0" + "glFogCoordfvEXT\0" + "glResizeBuffersMESA\0" + "glWindowPos4dMESA\0" + "glWindowPos4dvMESA\0" + "glWindowPos4fMESA\0" + "glWindowPos4fvMESA\0" + "glWindowPos4iMESA\0" + "glWindowPos4ivMESA\0" + "glWindowPos4sMESA\0" + "glWindowPos4svMESA\0" + "glMultiModeDrawArraysIBM\0" + "glMultiModeDrawElementsIBM\0" + "glAreProgramsResidentNV\0" + "glExecuteProgramNV\0" + "glGetProgramParameterdvNV\0" + "glGetProgramParameterfvNV\0" + "glGetProgramStringNV\0" + "glGetProgramivNV\0" + "glGetTrackMatrixivNV\0" + "glGetVertexAttribdvNV\0" + "glGetVertexAttribfvNV\0" + "glGetVertexAttribivNV\0" + "glLoadProgramNV\0" + "glProgramParameters4dvNV\0" + "glProgramParameters4fvNV\0" + "glRequestResidentProgramsNV\0" + "glTrackMatrixNV\0" + "glVertexAttrib1dNV\0" + "glVertexAttrib1dvNV\0" + "glVertexAttrib1fNV\0" + "glVertexAttrib1fvNV\0" + "glVertexAttrib1sNV\0" + "glVertexAttrib1svNV\0" + "glVertexAttrib2dNV\0" + "glVertexAttrib2dvNV\0" + "glVertexAttrib2fNV\0" + "glVertexAttrib2fvNV\0" + "glVertexAttrib2sNV\0" + "glVertexAttrib2svNV\0" + "glVertexAttrib3dNV\0" + "glVertexAttrib3dvNV\0" + "glVertexAttrib3fNV\0" + "glVertexAttrib3fvNV\0" + "glVertexAttrib3sNV\0" + "glVertexAttrib3svNV\0" + "glVertexAttrib4dNV\0" + "glVertexAttrib4dvNV\0" + "glVertexAttrib4fNV\0" + "glVertexAttrib4fvNV\0" + "glVertexAttrib4sNV\0" + "glVertexAttrib4svNV\0" + "glVertexAttrib4ubNV\0" + "glVertexAttrib4ubvNV\0" + "glVertexAttribPointerNV\0" + "glVertexAttribs1dvNV\0" + "glVertexAttribs1fvNV\0" + "glVertexAttribs1svNV\0" + "glVertexAttribs2dvNV\0" + "glVertexAttribs2fvNV\0" + "glVertexAttribs2svNV\0" + "glVertexAttribs3dvNV\0" + "glVertexAttribs3fvNV\0" + "glVertexAttribs3svNV\0" + "glVertexAttribs4dvNV\0" + "glVertexAttribs4fvNV\0" + "glVertexAttribs4svNV\0" + "glVertexAttribs4ubvNV\0" + "glGetTexBumpParameterfvATI\0" + "glGetTexBumpParameterivATI\0" + "glTexBumpParameterfvATI\0" + "glTexBumpParameterivATI\0" + "glAlphaFragmentOp1ATI\0" + "glAlphaFragmentOp2ATI\0" + "glAlphaFragmentOp3ATI\0" + "glBeginFragmentShaderATI\0" + "glBindFragmentShaderATI\0" + "glColorFragmentOp1ATI\0" + "glColorFragmentOp2ATI\0" + "glColorFragmentOp3ATI\0" + "glDeleteFragmentShaderATI\0" + "glEndFragmentShaderATI\0" + "glGenFragmentShadersATI\0" + "glPassTexCoordATI\0" + "glSampleMapATI\0" + "glSetFragmentShaderConstantATI\0" + "glActiveStencilFaceEXT\0" + "glBindVertexArrayAPPLE\0" + "glGenVertexArraysAPPLE\0" + "glGetProgramNamedParameterdvNV\0" + "glGetProgramNamedParameterfvNV\0" + "glProgramNamedParameter4dNV\0" + "glProgramNamedParameter4dvNV\0" + "glProgramNamedParameter4fNV\0" + "glProgramNamedParameter4fvNV\0" + "glPrimitiveRestartNV\0" + "glGetTexGenxvOES\0" + "glTexGenxOES\0" + "glTexGenxvOES\0" + "glDepthBoundsEXT\0" + "glBindFramebufferEXT\0" + "glBindRenderbufferEXT\0" + "glBufferParameteriAPPLE\0" + "glFlushMappedBufferRangeAPPLE\0" + "glVertexAttribI1iEXT\0" + "glVertexAttribI1uiEXT\0" + "glVertexAttribI2iEXT\0" + "glVertexAttribI2ivEXT\0" + "glVertexAttribI2uiEXT\0" + "glVertexAttribI2uivEXT\0" + "glVertexAttribI3iEXT\0" + "glVertexAttribI3ivEXT\0" + "glVertexAttribI3uiEXT\0" + "glVertexAttribI3uivEXT\0" + "glVertexAttribI4iEXT\0" + "glVertexAttribI4ivEXT\0" + "glVertexAttribI4uiEXT\0" + "glVertexAttribI4uivEXT\0" + "glClearColorIiEXT\0" + "glClearColorIuiEXT\0" + "glBindBufferOffsetEXT\0" + "glBeginPerfMonitorAMD\0" + "glDeletePerfMonitorsAMD\0" + "glEndPerfMonitorAMD\0" + "glGenPerfMonitorsAMD\0" + "glGetPerfMonitorCounterDataAMD\0" + "glGetPerfMonitorCounterInfoAMD\0" + "glGetPerfMonitorCounterStringAMD\0" + "glGetPerfMonitorCountersAMD\0" + "glGetPerfMonitorGroupStringAMD\0" + "glGetPerfMonitorGroupsAMD\0" + "glSelectPerfMonitorCountersAMD\0" + "glGetObjectParameterivAPPLE\0" + "glObjectPurgeableAPPLE\0" + "glObjectUnpurgeableAPPLE\0" + "glActiveProgramEXT\0" + "glCreateShaderProgramEXT\0" + "glUseShaderProgramEXT\0" + "glTextureBarrierNV\0" + "glVDPAUFiniNV\0" + "glVDPAUGetSurfaceivNV\0" + "glVDPAUInitNV\0" + "glVDPAUIsSurfaceNV\0" + "glVDPAUMapSurfacesNV\0" + "glVDPAURegisterOutputSurfaceNV\0" + "glVDPAURegisterVideoSurfaceNV\0" + "glVDPAUSurfaceAccessNV\0" + "glVDPAUUnmapSurfacesNV\0" + "glVDPAUUnregisterSurfaceNV\0" + "glBeginPerfQueryINTEL\0" + "glCreatePerfQueryINTEL\0" + "glDeletePerfQueryINTEL\0" + "glEndPerfQueryINTEL\0" + "glGetFirstPerfQueryIdINTEL\0" + "glGetNextPerfQueryIdINTEL\0" + "glGetPerfCounterInfoINTEL\0" + "glGetPerfQueryDataINTEL\0" + "glGetPerfQueryIdByNameINTEL\0" + "glGetPerfQueryInfoINTEL\0" + "glStencilFuncSeparateATI\0" + "glProgramEnvParameters4fvEXT\0" + "glProgramLocalParameters4fvEXT\0" + "glEGLImageTargetRenderbufferStorageOES\0" + "glEGLImageTargetTexture2DOES\0" + "glAlphaFuncx\0" + "glClearColorx\0" + "glClearDepthx\0" + "glColor4x\0" + "glDepthRangex\0" + "glFogx\0" + "glFogxv\0" + "glFrustumf\0" + "glFrustumx\0" + "glLightModelx\0" + "glLightModelxv\0" + "glLightx\0" + "glLightxv\0" + "glLineWidthx\0" + "glLoadMatrixx\0" + "glMaterialx\0" + "glMaterialxv\0" + "glMultMatrixx\0" + "glMultiTexCoord4x\0" + "glNormal3x\0" + "glOrthof\0" + "glOrthox\0" + "glPointSizex\0" + "glPolygonOffsetx\0" + "glRotatex\0" + "glSampleCoveragex\0" + "glScalex\0" + "glTexEnvx\0" + "glTexEnvxv\0" + "glTexParameterx\0" + "glTranslatex\0" + "glClipPlanef\0" + "glClipPlanex\0" + "glGetClipPlanef\0" + "glGetClipPlanex\0" + "glGetFixedv\0" + "glGetLightxv\0" + "glGetMaterialxv\0" + "glGetTexEnvxv\0" + "glGetTexParameterxv\0" + "glPointParameterx\0" + "glPointParameterxv\0" + "glTexParameterxv\0" + "glTexGenfOES\0" + "glTexGenfvOES\0" + "glTexGeniOES\0" + "glTexGenivOES\0" + "glReadBufferNV\0" + "glGetTexGenfvOES\0" + "glGetTexGenivOES\0" + "glArrayElementEXT\0" + "glBindTextureEXT\0" + "glDrawArraysEXT\0" + "glAreTexturesResidentEXT\0" + "glCopyTexImage1DEXT\0" + "glCopyTexImage2DEXT\0" + "glCopyTexSubImage1DEXT\0" + "glCopyTexSubImage2DEXT\0" + "glDeleteTexturesEXT\0" + "glGenTexturesEXT\0" + "glGetPointervEXT\0" + "glIsTextureEXT\0" + "glPrioritizeTexturesEXT\0" + "glTexSubImage1DEXT\0" + "glTexSubImage2DEXT\0" + "glBlendColorEXT\0" + "glBlendEquationEXT\0" + "glBlendEquationOES\0" + "glDrawRangeElementsEXT\0" + "glColorTableSGI\0" + "glColorTableEXT\0" + "glColorTableParameterfvSGI\0" + "glColorTableParameterivSGI\0" + "glCopyColorTableSGI\0" + "glGetColorTableSGI\0" + "glGetColorTableEXT\0" + "glGetColorTableParameterfvSGI\0" + "glGetColorTableParameterfvEXT\0" + "glGetColorTableParameterivSGI\0" + "glGetColorTableParameterivEXT\0" + "glColorSubTableEXT\0" + "glCopyColorSubTableEXT\0" + "glConvolutionFilter1DEXT\0" + "glConvolutionFilter2DEXT\0" + "glConvolutionParameterfEXT\0" + "glConvolutionParameterfvEXT\0" + "glConvolutionParameteriEXT\0" + "glConvolutionParameterivEXT\0" + "glCopyConvolutionFilter1DEXT\0" + "glCopyConvolutionFilter2DEXT\0" + "glGetConvolutionFilterEXT\0" + "glGetConvolutionParameterfvEXT\0" + "glGetConvolutionParameterivEXT\0" + "glGetSeparableFilterEXT\0" + "glSeparableFilter2DEXT\0" + "glGetHistogramEXT\0" + "glGetHistogramParameterfvEXT\0" + "glGetHistogramParameterivEXT\0" + "glGetMinmaxEXT\0" + "glGetMinmaxParameterfvEXT\0" + "glGetMinmaxParameterivEXT\0" + "glHistogramEXT\0" + "glMinmaxEXT\0" + "glResetHistogramEXT\0" + "glResetMinmaxEXT\0" + "glTexImage3DEXT\0" + "glTexImage3DOES\0" + "glTexSubImage3DEXT\0" + "glTexSubImage3DOES\0" + "glCopyTexSubImage3DEXT\0" + "glCopyTexSubImage3DOES\0" + "glActiveTextureARB\0" + "glClientActiveTextureARB\0" + "glMultiTexCoord1dARB\0" + "glMultiTexCoord1dvARB\0" + "glMultiTexCoord1f\0" + "glMultiTexCoord1fv\0" + "glMultiTexCoord1iARB\0" + "glMultiTexCoord1ivARB\0" + "glMultiTexCoord1sARB\0" + "glMultiTexCoord1svARB\0" + "glMultiTexCoord2dARB\0" + "glMultiTexCoord2dvARB\0" + "glMultiTexCoord2f\0" + "glMultiTexCoord2fv\0" + "glMultiTexCoord2iARB\0" + "glMultiTexCoord2ivARB\0" + "glMultiTexCoord2sARB\0" + "glMultiTexCoord2svARB\0" + "glMultiTexCoord3dARB\0" + "glMultiTexCoord3dvARB\0" + "glMultiTexCoord3f\0" + "glMultiTexCoord3fv\0" + "glMultiTexCoord3iARB\0" + "glMultiTexCoord3ivARB\0" + "glMultiTexCoord3sARB\0" + "glMultiTexCoord3svARB\0" + "glMultiTexCoord4dARB\0" + "glMultiTexCoord4dvARB\0" + "glMultiTexCoord4f\0" + "glMultiTexCoord4fv\0" + "glMultiTexCoord4iARB\0" + "glMultiTexCoord4ivARB\0" + "glMultiTexCoord4sARB\0" + "glMultiTexCoord4svARB\0" + "glCompressedTexImage1DARB\0" + "glCompressedTexImage2DARB\0" + "glCompressedTexImage3DARB\0" + "glCompressedTexImage3DOES\0" + "glCompressedTexSubImage1DARB\0" + "glCompressedTexSubImage2DARB\0" + "glCompressedTexSubImage3DARB\0" + "glCompressedTexSubImage3DOES\0" + "glGetCompressedTexImageARB\0" + "glLoadTransposeMatrixdARB\0" + "glLoadTransposeMatrixfARB\0" + "glMultTransposeMatrixdARB\0" + "glMultTransposeMatrixfARB\0" + "glSampleCoverageARB\0" + "glBlendFuncSeparateEXT\0" + "glBlendFuncSeparateINGR\0" + "glBlendFuncSeparateOES\0" + "glFogCoordPointerEXT\0" + "glFogCoorddEXT\0" + "glFogCoorddvEXT\0" + "glMultiDrawArraysEXT\0" + "glPointParameterfARB\0" + "glPointParameterfEXT\0" + "glPointParameterfSGIS\0" + "glPointParameterfvARB\0" + "glPointParameterfvEXT\0" + "glPointParameterfvSGIS\0" + "glPointParameteriNV\0" + "glPointParameterivNV\0" + "glSecondaryColor3bEXT\0" + "glSecondaryColor3bvEXT\0" + "glSecondaryColor3dEXT\0" + "glSecondaryColor3dvEXT\0" + "glSecondaryColor3iEXT\0" + "glSecondaryColor3ivEXT\0" + "glSecondaryColor3sEXT\0" + "glSecondaryColor3svEXT\0" + "glSecondaryColor3ubEXT\0" + "glSecondaryColor3ubvEXT\0" + "glSecondaryColor3uiEXT\0" + "glSecondaryColor3uivEXT\0" + "glSecondaryColor3usEXT\0" + "glSecondaryColor3usvEXT\0" + "glSecondaryColorPointerEXT\0" + "glWindowPos2dARB\0" + "glWindowPos2dMESA\0" + "glWindowPos2dvARB\0" + "glWindowPos2dvMESA\0" + "glWindowPos2fARB\0" + "glWindowPos2fMESA\0" + "glWindowPos2fvARB\0" + "glWindowPos2fvMESA\0" + "glWindowPos2iARB\0" + "glWindowPos2iMESA\0" + "glWindowPos2ivARB\0" + "glWindowPos2ivMESA\0" + "glWindowPos2sARB\0" + "glWindowPos2sMESA\0" + "glWindowPos2svARB\0" + "glWindowPos2svMESA\0" + "glWindowPos3dARB\0" + "glWindowPos3dMESA\0" + "glWindowPos3dvARB\0" + "glWindowPos3dvMESA\0" + "glWindowPos3fARB\0" + "glWindowPos3fMESA\0" + "glWindowPos3fvARB\0" + "glWindowPos3fvMESA\0" + "glWindowPos3iARB\0" + "glWindowPos3iMESA\0" + "glWindowPos3ivARB\0" + "glWindowPos3ivMESA\0" + "glWindowPos3sARB\0" + "glWindowPos3sMESA\0" + "glWindowPos3svARB\0" + "glWindowPos3svMESA\0" + "glBeginQueryARB\0" + "glBindBufferARB\0" + "glBufferDataARB\0" + "glBufferSubDataARB\0" + "glDeleteBuffersARB\0" + "glDeleteQueriesARB\0" + "glEndQueryARB\0" + "glGenBuffersARB\0" + "glGenQueriesARB\0" + "glGetBufferParameterivARB\0" + "glGetBufferPointervARB\0" + "glGetBufferPointervOES\0" + "glGetBufferSubDataARB\0" + "glGetQueryObjectivARB\0" + "glGetQueryObjectuivARB\0" + "glGetQueryivARB\0" + "glIsBufferARB\0" + "glIsQueryARB\0" + "glMapBufferARB\0" + "glMapBufferOES\0" + "glUnmapBufferARB\0" + "glUnmapBufferOES\0" + "glBindAttribLocationARB\0" + "glBlendEquationSeparateEXT\0" + "glBlendEquationSeparateATI\0" + "glBlendEquationSeparateOES\0" + "glCompileShaderARB\0" + "glDisableVertexAttribArrayARB\0" + "glDrawBuffersARB\0" + "glDrawBuffersATI\0" + "glDrawBuffersNV\0" + "glEnableVertexAttribArrayARB\0" + "glGetActiveAttribARB\0" + "glGetActiveUniformARB\0" + "glGetAttribLocationARB\0" + "glGetShaderSourceARB\0" + "glGetUniformLocationARB\0" + "glGetUniformfvARB\0" + "glGetUniformivARB\0" + "glGetVertexAttribPointervARB\0" + "glGetVertexAttribPointervNV\0" + "glGetVertexAttribdvARB\0" + "glGetVertexAttribfvARB\0" + "glGetVertexAttribivARB\0" + "glLinkProgramARB\0" + "glShaderSourceARB\0" + "glStencilOpSeparateATI\0" + "glUniform1fARB\0" + "glUniform1fvARB\0" + "glUniform1iARB\0" + "glUniform1ivARB\0" + "glUniform2fARB\0" + "glUniform2fvARB\0" + "glUniform2iARB\0" + "glUniform2ivARB\0" + "glUniform3fARB\0" + "glUniform3fvARB\0" + "glUniform3iARB\0" + "glUniform3ivARB\0" + "glUniform4fARB\0" + "glUniform4fvARB\0" + "glUniform4iARB\0" + "glUniform4ivARB\0" + "glUniformMatrix2fvARB\0" + "glUniformMatrix3fvARB\0" + "glUniformMatrix4fvARB\0" + "glUseProgramObjectARB\0" + "glValidateProgramARB\0" + "glVertexAttrib1dARB\0" + "glVertexAttrib1dvARB\0" + "glVertexAttrib1sARB\0" + "glVertexAttrib1svARB\0" + "glVertexAttrib2dARB\0" + "glVertexAttrib2dvARB\0" + "glVertexAttrib2sARB\0" + "glVertexAttrib2svARB\0" + "glVertexAttrib3dARB\0" + "glVertexAttrib3dvARB\0" + "glVertexAttrib3sARB\0" + "glVertexAttrib3svARB\0" + "glVertexAttrib4NbvARB\0" + "glVertexAttrib4NivARB\0" + "glVertexAttrib4NsvARB\0" + "glVertexAttrib4NubARB\0" + "glVertexAttrib4NubvARB\0" + "glVertexAttrib4NuivARB\0" + "glVertexAttrib4NusvARB\0" + "glVertexAttrib4bvARB\0" + "glVertexAttrib4dARB\0" + "glVertexAttrib4dvARB\0" + "glVertexAttrib4ivARB\0" + "glVertexAttrib4sARB\0" + "glVertexAttrib4svARB\0" + "glVertexAttrib4ubvARB\0" + "glVertexAttrib4uivARB\0" + "glVertexAttrib4usvARB\0" + "glVertexAttribPointerARB\0" + "glBeginConditionalRenderNV\0" + "glBeginTransformFeedbackEXT\0" + "glBindBufferBaseEXT\0" + "glBindBufferRangeEXT\0" + "glBindFragDataLocationEXT\0" + "glClampColorARB\0" + "glColorMaskIndexedEXT\0" + "glDisableIndexedEXT\0" + "glEnableIndexedEXT\0" + "glEndConditionalRenderNV\0" + "glEndTransformFeedbackEXT\0" + "glGetBooleanIndexedvEXT\0" + "glGetFragDataLocationEXT\0" + "glGetIntegerIndexedvEXT\0" + "glGetTexParameterIivEXT\0" + "glGetTexParameterIuivEXT\0" + "glGetTransformFeedbackVaryingEXT\0" + "glGetUniformuivEXT\0" + "glGetVertexAttribIivEXT\0" + "glGetVertexAttribIuivEXT\0" + "glIsEnabledIndexedEXT\0" + "glTexParameterIivEXT\0" + "glTexParameterIuivEXT\0" + "glTransformFeedbackVaryingsEXT\0" + "glUniform1uiEXT\0" + "glUniform1uivEXT\0" + "glUniform2uiEXT\0" + "glUniform2uivEXT\0" + "glUniform3uiEXT\0" + "glUniform3uivEXT\0" + "glUniform4uiEXT\0" + "glUniform4uivEXT\0" + "glVertexAttribI1ivEXT\0" + "glVertexAttribI1uivEXT\0" + "glVertexAttribI4bvEXT\0" + "glVertexAttribI4svEXT\0" + "glVertexAttribI4ubvEXT\0" + "glVertexAttribI4usvEXT\0" + "glVertexAttribIPointerEXT\0" + "glPrimitiveRestartIndexNV\0" + "glTexBufferARB\0" + "glFramebufferTextureARB\0" + "glVertexAttribDivisorARB\0" + "glMinSampleShadingARB\0" + "glBindProgramNV\0" + "glDeleteProgramsNV\0" + "glGenProgramsNV\0" + "glIsProgramNV\0" + "glProgramParameter4dNV\0" + "glProgramParameter4dvNV\0" + "glProgramParameter4fNV\0" + "glProgramParameter4fvNV\0" + "glVertexAttrib1f\0" + "glVertexAttrib1fv\0" + "glVertexAttrib2f\0" + "glVertexAttrib2fv\0" + "glVertexAttrib3f\0" + "glVertexAttrib3fv\0" + "glVertexAttrib4f\0" + "glVertexAttrib4fv\0" + "glDrawArraysInstancedEXT\0" + "glDrawArraysInstanced\0" + "glDrawElementsInstancedEXT\0" + "glDrawElementsInstanced\0" + "glBindFramebufferOES\0" + "glBindRenderbufferOES\0" + "glBlitFramebufferEXT\0" + "glCheckFramebufferStatusEXT\0" + "glCheckFramebufferStatusOES\0" + "glDeleteFramebuffersEXT\0" + "glDeleteFramebuffersOES\0" + "glDeleteRenderbuffersEXT\0" + "glDeleteRenderbuffersOES\0" + "glFramebufferRenderbufferEXT\0" + "glFramebufferRenderbufferOES\0" + "glFramebufferTexture1DEXT\0" + "glFramebufferTexture2DEXT\0" + "glFramebufferTexture2DOES\0" + "glFramebufferTexture3DEXT\0" + "glFramebufferTexture3DOES\0" + "glFramebufferTextureLayerARB\0" + "glFramebufferTextureLayerEXT\0" + "glGenFramebuffersEXT\0" + "glGenFramebuffersOES\0" + "glGenRenderbuffersEXT\0" + "glGenRenderbuffersOES\0" + "glGenerateMipmapEXT\0" + "glGenerateMipmapOES\0" + "glGetFramebufferAttachmentParameterivEXT\0" + "glGetFramebufferAttachmentParameterivOES\0" + "glGetRenderbufferParameterivEXT\0" + "glGetRenderbufferParameterivOES\0" + "glIsFramebufferEXT\0" + "glIsFramebufferOES\0" + "glIsRenderbufferEXT\0" + "glIsRenderbufferOES\0" + "glRenderbufferStorageEXT\0" + "glRenderbufferStorageOES\0" + "glRenderbufferStorageMultisampleEXT\0" + "glFlushMappedBufferRangeEXT\0" + "glMapBufferRangeEXT\0" + "glBindVertexArrayOES\0" + "glDeleteVertexArraysAPPLE\0" + "glDeleteVertexArraysOES\0" + "glGenVertexArraysOES\0" + "glIsVertexArrayAPPLE\0" + "glIsVertexArrayOES\0" + "glProvokingVertexEXT\0" + "glBlendEquationSeparateIndexedAMD\0" + "glBlendEquationSeparatei\0" + "glBlendEquationIndexedAMD\0" + "glBlendEquationi\0" + "glBlendFuncSeparateIndexedAMD\0" + "glBlendFuncSeparatei\0" + "glBlendFuncIndexedAMD\0" + "glBlendFunci\0" + "glGetQueryObjecti64vEXT\0" + "glGetQueryObjectui64vEXT\0" + "glClearDepthfOES\0" + "glDepthRangefOES\0" + "glGetProgramBinaryOES\0" + "glProgramBinaryOES\0" + "glProgramParameteriARB\0" + "glProgramParameteriEXT\0" + "glSampleMaskEXT\0" + "glSamplePatternEXT\0" + "glActiveShaderProgramEXT\0" + "glBindProgramPipelineEXT\0" + "glCreateShaderProgramvEXT\0" + "glDeleteProgramPipelinesEXT\0" + "glGenProgramPipelinesEXT\0" + "glGetProgramPipelineInfoLogEXT\0" + "glGetProgramPipelineivEXT\0" + "glIsProgramPipelineEXT\0" + "glProgramUniform1fEXT\0" + "glProgramUniform1fvEXT\0" + "glProgramUniform1iEXT\0" + "glProgramUniform1ivEXT\0" + "glProgramUniform1uiEXT\0" + "glProgramUniform1uivEXT\0" + "glProgramUniform2fEXT\0" + "glProgramUniform2fvEXT\0" + "glProgramUniform2iEXT\0" + "glProgramUniform2ivEXT\0" + "glProgramUniform2uiEXT\0" + "glProgramUniform2uivEXT\0" + "glProgramUniform3fEXT\0" + "glProgramUniform3fvEXT\0" + "glProgramUniform3iEXT\0" + "glProgramUniform3ivEXT\0" + "glProgramUniform3uiEXT\0" + "glProgramUniform3uivEXT\0" + "glProgramUniform4fEXT\0" + "glProgramUniform4fvEXT\0" + "glProgramUniform4iEXT\0" + "glProgramUniform4ivEXT\0" + "glProgramUniform4uiEXT\0" + "glProgramUniform4uivEXT\0" + "glProgramUniformMatrix2fvEXT\0" + "glProgramUniformMatrix2x3fvEXT\0" + "glProgramUniformMatrix2x4fvEXT\0" + "glProgramUniformMatrix3fvEXT\0" + "glProgramUniformMatrix3x2fvEXT\0" + "glProgramUniformMatrix3x4fvEXT\0" + "glProgramUniformMatrix4fvEXT\0" + "glProgramUniformMatrix4x2fvEXT\0" + "glProgramUniformMatrix4x3fvEXT\0" + "glUseProgramStagesEXT\0" + "glValidateProgramPipelineEXT\0" + "glDebugMessageCallbackARB\0" + "glDebugMessageControlARB\0" + "glDebugMessageInsertARB\0" + "glGetDebugMessageLogARB\0" + "glSecondaryColor3f\0" + "glSecondaryColor3fv\0" + "glMultiDrawElements\0" + "glFogCoordf\0" + "glFogCoordfv\0" + "glVertexAttribI1i\0" + "glVertexAttribI1ui\0" + "glVertexAttribI2i\0" + "glVertexAttribI2iv\0" + "glVertexAttribI2ui\0" + "glVertexAttribI2uiv\0" + "glVertexAttribI3i\0" + "glVertexAttribI3iv\0" + "glVertexAttribI3ui\0" + "glVertexAttribI3uiv\0" + "glVertexAttribI4i\0" + "glVertexAttribI4iv\0" + "glVertexAttribI4ui\0" + "glVertexAttribI4uiv\0" + "glTextureBarrier\0" + "glAlphaFuncxOES\0" + "glClearColorxOES\0" + "glClearDepthxOES\0" + "glColor4xOES\0" + "glDepthRangexOES\0" + "glFogxOES\0" + "glFogxvOES\0" + "glFrustumfOES\0" + "glFrustumxOES\0" + "glLightModelxOES\0" + "glLightModelxvOES\0" + "glLightxOES\0" + "glLightxvOES\0" + "glLineWidthxOES\0" + "glLoadMatrixxOES\0" + "glMaterialxOES\0" + "glMaterialxvOES\0" + "glMultMatrixxOES\0" + "glMultiTexCoord4xOES\0" + "glNormal3xOES\0" + "glOrthofOES\0" + "glOrthoxOES\0" + "glPointSizexOES\0" + "glPolygonOffsetxOES\0" + "glRotatexOES\0" + "glSampleCoveragexOES\0" + "glScalexOES\0" + "glTexEnvxOES\0" + "glTexEnvxvOES\0" + "glTexParameterxOES\0" + "glTranslatexOES\0" + "glClipPlanefOES\0" + "glClipPlanexOES\0" + "glGetClipPlanefOES\0" + "glGetClipPlanexOES\0" + "glGetFixedvOES\0" + "glGetLightxvOES\0" + "glGetMaterialxvOES\0" + "glGetTexEnvxvOES\0" + "glGetTexParameterxvOES\0" + "glPointParameterxOES\0" + "glPointParameterxvOES\0" + "glTexParameterxvOES\0" + ; + + +#ifdef USE_MGL_NAMESPACE +#define gl_dispatch_stub_343 mgl_dispatch_stub_343 +#define gl_dispatch_stub_344 mgl_dispatch_stub_344 +#define gl_dispatch_stub_345 mgl_dispatch_stub_345 +#define gl_dispatch_stub_356 mgl_dispatch_stub_356 +#define gl_dispatch_stub_357 mgl_dispatch_stub_357 +#define gl_dispatch_stub_358 mgl_dispatch_stub_358 +#define gl_dispatch_stub_359 mgl_dispatch_stub_359 +#define gl_dispatch_stub_361 mgl_dispatch_stub_361 +#define gl_dispatch_stub_362 mgl_dispatch_stub_362 +#define gl_dispatch_stub_363 mgl_dispatch_stub_363 +#define gl_dispatch_stub_364 mgl_dispatch_stub_364 +#define gl_dispatch_stub_365 mgl_dispatch_stub_365 +#define gl_dispatch_stub_366 mgl_dispatch_stub_366 +#define gl_dispatch_stub_731 mgl_dispatch_stub_731 +#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 +#define gl_dispatch_stub_875 mgl_dispatch_stub_875 +#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 +#define gl_dispatch_stub_893 mgl_dispatch_stub_893 +#define gl_dispatch_stub_894 mgl_dispatch_stub_894 +#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 +#define gl_dispatch_stub_903 mgl_dispatch_stub_903 +#define gl_dispatch_stub_904 mgl_dispatch_stub_904 +#define gl_dispatch_stub_905 mgl_dispatch_stub_905 +#define gl_dispatch_stub_906 mgl_dispatch_stub_906 +#define gl_dispatch_stub_907 mgl_dispatch_stub_907 +#define gl_dispatch_stub_908 mgl_dispatch_stub_908 +#define gl_dispatch_stub_909 mgl_dispatch_stub_909 +#define gl_dispatch_stub_910 mgl_dispatch_stub_910 +#define gl_dispatch_stub_911 mgl_dispatch_stub_911 +#define gl_dispatch_stub_912 mgl_dispatch_stub_912 +#define gl_dispatch_stub_913 mgl_dispatch_stub_913 +#define gl_dispatch_stub_914 mgl_dispatch_stub_914 +#define gl_dispatch_stub_915 mgl_dispatch_stub_915 +#define gl_dispatch_stub_916 mgl_dispatch_stub_916 +#define gl_dispatch_stub_917 mgl_dispatch_stub_917 +#define gl_dispatch_stub_918 mgl_dispatch_stub_918 +#define gl_dispatch_stub_919 mgl_dispatch_stub_919 +#define gl_dispatch_stub_920 mgl_dispatch_stub_920 +#define gl_dispatch_stub_921 mgl_dispatch_stub_921 +#define gl_dispatch_stub_922 mgl_dispatch_stub_922 +#define gl_dispatch_stub_923 mgl_dispatch_stub_923 +#define gl_dispatch_stub_924 mgl_dispatch_stub_924 +#define gl_dispatch_stub_925 mgl_dispatch_stub_925 +#define gl_dispatch_stub_926 mgl_dispatch_stub_926 +#define gl_dispatch_stub_927 mgl_dispatch_stub_927 +#define gl_dispatch_stub_928 mgl_dispatch_stub_928 +#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 +#define gl_dispatch_stub_1101 mgl_dispatch_stub_1101 +#define gl_dispatch_stub_1102 mgl_dispatch_stub_1102 +#define gl_dispatch_stub_1103 mgl_dispatch_stub_1103 +#define gl_dispatch_stub_1104 mgl_dispatch_stub_1104 +#define gl_dispatch_stub_1105 mgl_dispatch_stub_1105 +#define gl_dispatch_stub_1106 mgl_dispatch_stub_1106 +#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 */ + + +#if defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) +void GLAPIENTRY gl_dispatch_stub_343(GLenum target, GLenum format, GLenum type, GLvoid * table); +void GLAPIENTRY gl_dispatch_stub_344(GLenum target, GLenum pname, GLfloat * params); +void GLAPIENTRY gl_dispatch_stub_345(GLenum target, GLenum pname, GLint * params); +void GLAPIENTRY gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type, GLvoid * image); +void GLAPIENTRY gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params); +void GLAPIENTRY gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params); +void GLAPIENTRY gl_dispatch_stub_359(GLenum target, GLenum format, GLenum type, GLvoid * row, GLvoid * column, GLvoid * span); +void GLAPIENTRY gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); +void GLAPIENTRY gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params); +void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params); +void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values); +void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params); +void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params); +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); +void GLAPIENTRY gl_dispatch_stub_927(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); +void GLAPIENTRY gl_dispatch_stub_928(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); +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[] = { + NAME_FUNC_OFFSET( 0, glNewList, glNewList, NULL, 0), + NAME_FUNC_OFFSET( 10, glEndList, glEndList, NULL, 1), + NAME_FUNC_OFFSET( 20, glCallList, glCallList, NULL, 2), + NAME_FUNC_OFFSET( 31, glCallLists, glCallLists, NULL, 3), + NAME_FUNC_OFFSET( 43, glDeleteLists, glDeleteLists, NULL, 4), + NAME_FUNC_OFFSET( 57, glGenLists, glGenLists, NULL, 5), + NAME_FUNC_OFFSET( 68, glListBase, glListBase, NULL, 6), + NAME_FUNC_OFFSET( 79, glBegin, glBegin, NULL, 7), + NAME_FUNC_OFFSET( 87, glBitmap, glBitmap, NULL, 8), + NAME_FUNC_OFFSET( 96, glColor3b, glColor3b, NULL, 9), + NAME_FUNC_OFFSET( 106, glColor3bv, glColor3bv, NULL, 10), + NAME_FUNC_OFFSET( 117, glColor3d, glColor3d, NULL, 11), + NAME_FUNC_OFFSET( 127, glColor3dv, glColor3dv, NULL, 12), + NAME_FUNC_OFFSET( 138, glColor3f, glColor3f, NULL, 13), + NAME_FUNC_OFFSET( 148, glColor3fv, glColor3fv, NULL, 14), + NAME_FUNC_OFFSET( 159, glColor3i, glColor3i, NULL, 15), + NAME_FUNC_OFFSET( 169, glColor3iv, glColor3iv, NULL, 16), + NAME_FUNC_OFFSET( 180, glColor3s, glColor3s, NULL, 17), + NAME_FUNC_OFFSET( 190, glColor3sv, glColor3sv, NULL, 18), + NAME_FUNC_OFFSET( 201, glColor3ub, glColor3ub, NULL, 19), + NAME_FUNC_OFFSET( 212, glColor3ubv, glColor3ubv, NULL, 20), + NAME_FUNC_OFFSET( 224, glColor3ui, glColor3ui, NULL, 21), + NAME_FUNC_OFFSET( 235, glColor3uiv, glColor3uiv, NULL, 22), + NAME_FUNC_OFFSET( 247, glColor3us, glColor3us, NULL, 23), + NAME_FUNC_OFFSET( 258, glColor3usv, glColor3usv, NULL, 24), + NAME_FUNC_OFFSET( 270, glColor4b, glColor4b, NULL, 25), + NAME_FUNC_OFFSET( 280, glColor4bv, glColor4bv, NULL, 26), + NAME_FUNC_OFFSET( 291, glColor4d, glColor4d, NULL, 27), + NAME_FUNC_OFFSET( 301, glColor4dv, glColor4dv, NULL, 28), + NAME_FUNC_OFFSET( 312, glColor4f, glColor4f, NULL, 29), + NAME_FUNC_OFFSET( 322, glColor4fv, glColor4fv, NULL, 30), + NAME_FUNC_OFFSET( 333, glColor4i, glColor4i, NULL, 31), + NAME_FUNC_OFFSET( 343, glColor4iv, glColor4iv, NULL, 32), + NAME_FUNC_OFFSET( 354, glColor4s, glColor4s, NULL, 33), + NAME_FUNC_OFFSET( 364, glColor4sv, glColor4sv, NULL, 34), + NAME_FUNC_OFFSET( 375, glColor4ub, glColor4ub, NULL, 35), + NAME_FUNC_OFFSET( 386, glColor4ubv, glColor4ubv, NULL, 36), + NAME_FUNC_OFFSET( 398, glColor4ui, glColor4ui, NULL, 37), + NAME_FUNC_OFFSET( 409, glColor4uiv, glColor4uiv, NULL, 38), + NAME_FUNC_OFFSET( 421, glColor4us, glColor4us, NULL, 39), + NAME_FUNC_OFFSET( 432, glColor4usv, glColor4usv, NULL, 40), + NAME_FUNC_OFFSET( 444, glEdgeFlag, glEdgeFlag, NULL, 41), + NAME_FUNC_OFFSET( 455, glEdgeFlagv, glEdgeFlagv, NULL, 42), + NAME_FUNC_OFFSET( 467, glEnd, glEnd, NULL, 43), + NAME_FUNC_OFFSET( 473, glIndexd, glIndexd, NULL, 44), + NAME_FUNC_OFFSET( 482, glIndexdv, glIndexdv, NULL, 45), + NAME_FUNC_OFFSET( 492, glIndexf, glIndexf, NULL, 46), + NAME_FUNC_OFFSET( 501, glIndexfv, glIndexfv, NULL, 47), + NAME_FUNC_OFFSET( 511, glIndexi, glIndexi, NULL, 48), + NAME_FUNC_OFFSET( 520, glIndexiv, glIndexiv, NULL, 49), + NAME_FUNC_OFFSET( 530, glIndexs, glIndexs, NULL, 50), + NAME_FUNC_OFFSET( 539, glIndexsv, glIndexsv, NULL, 51), + NAME_FUNC_OFFSET( 549, glNormal3b, glNormal3b, NULL, 52), + NAME_FUNC_OFFSET( 560, glNormal3bv, glNormal3bv, NULL, 53), + NAME_FUNC_OFFSET( 572, glNormal3d, glNormal3d, NULL, 54), + NAME_FUNC_OFFSET( 583, glNormal3dv, glNormal3dv, NULL, 55), + NAME_FUNC_OFFSET( 595, glNormal3f, glNormal3f, NULL, 56), + NAME_FUNC_OFFSET( 606, glNormal3fv, glNormal3fv, NULL, 57), + NAME_FUNC_OFFSET( 618, glNormal3i, glNormal3i, NULL, 58), + NAME_FUNC_OFFSET( 629, glNormal3iv, glNormal3iv, NULL, 59), + NAME_FUNC_OFFSET( 641, glNormal3s, glNormal3s, NULL, 60), + NAME_FUNC_OFFSET( 652, glNormal3sv, glNormal3sv, NULL, 61), + NAME_FUNC_OFFSET( 664, glRasterPos2d, glRasterPos2d, NULL, 62), + NAME_FUNC_OFFSET( 678, glRasterPos2dv, glRasterPos2dv, NULL, 63), + NAME_FUNC_OFFSET( 693, glRasterPos2f, glRasterPos2f, NULL, 64), + NAME_FUNC_OFFSET( 707, glRasterPos2fv, glRasterPos2fv, NULL, 65), + NAME_FUNC_OFFSET( 722, glRasterPos2i, glRasterPos2i, NULL, 66), + NAME_FUNC_OFFSET( 736, glRasterPos2iv, glRasterPos2iv, NULL, 67), + NAME_FUNC_OFFSET( 751, glRasterPos2s, glRasterPos2s, NULL, 68), + NAME_FUNC_OFFSET( 765, glRasterPos2sv, glRasterPos2sv, NULL, 69), + NAME_FUNC_OFFSET( 780, glRasterPos3d, glRasterPos3d, NULL, 70), + NAME_FUNC_OFFSET( 794, glRasterPos3dv, glRasterPos3dv, NULL, 71), + NAME_FUNC_OFFSET( 809, glRasterPos3f, glRasterPos3f, NULL, 72), + NAME_FUNC_OFFSET( 823, glRasterPos3fv, glRasterPos3fv, NULL, 73), + NAME_FUNC_OFFSET( 838, glRasterPos3i, glRasterPos3i, NULL, 74), + NAME_FUNC_OFFSET( 852, glRasterPos3iv, glRasterPos3iv, NULL, 75), + NAME_FUNC_OFFSET( 867, glRasterPos3s, glRasterPos3s, NULL, 76), + NAME_FUNC_OFFSET( 881, glRasterPos3sv, glRasterPos3sv, NULL, 77), + NAME_FUNC_OFFSET( 896, glRasterPos4d, glRasterPos4d, NULL, 78), + NAME_FUNC_OFFSET( 910, glRasterPos4dv, glRasterPos4dv, NULL, 79), + NAME_FUNC_OFFSET( 925, glRasterPos4f, glRasterPos4f, NULL, 80), + NAME_FUNC_OFFSET( 939, glRasterPos4fv, glRasterPos4fv, NULL, 81), + NAME_FUNC_OFFSET( 954, glRasterPos4i, glRasterPos4i, NULL, 82), + NAME_FUNC_OFFSET( 968, glRasterPos4iv, glRasterPos4iv, NULL, 83), + NAME_FUNC_OFFSET( 983, glRasterPos4s, glRasterPos4s, NULL, 84), + NAME_FUNC_OFFSET( 997, glRasterPos4sv, glRasterPos4sv, NULL, 85), + NAME_FUNC_OFFSET( 1012, glRectd, glRectd, NULL, 86), + NAME_FUNC_OFFSET( 1020, glRectdv, glRectdv, NULL, 87), + NAME_FUNC_OFFSET( 1029, glRectf, glRectf, NULL, 88), + NAME_FUNC_OFFSET( 1037, glRectfv, glRectfv, NULL, 89), + NAME_FUNC_OFFSET( 1046, glRecti, glRecti, NULL, 90), + NAME_FUNC_OFFSET( 1054, glRectiv, glRectiv, NULL, 91), + NAME_FUNC_OFFSET( 1063, glRects, glRects, NULL, 92), + NAME_FUNC_OFFSET( 1071, glRectsv, glRectsv, NULL, 93), + NAME_FUNC_OFFSET( 1080, glTexCoord1d, glTexCoord1d, NULL, 94), + NAME_FUNC_OFFSET( 1093, glTexCoord1dv, glTexCoord1dv, NULL, 95), + NAME_FUNC_OFFSET( 1107, glTexCoord1f, glTexCoord1f, NULL, 96), + NAME_FUNC_OFFSET( 1120, glTexCoord1fv, glTexCoord1fv, NULL, 97), + NAME_FUNC_OFFSET( 1134, glTexCoord1i, glTexCoord1i, NULL, 98), + NAME_FUNC_OFFSET( 1147, glTexCoord1iv, glTexCoord1iv, NULL, 99), + NAME_FUNC_OFFSET( 1161, glTexCoord1s, glTexCoord1s, NULL, 100), + NAME_FUNC_OFFSET( 1174, glTexCoord1sv, glTexCoord1sv, NULL, 101), + NAME_FUNC_OFFSET( 1188, glTexCoord2d, glTexCoord2d, NULL, 102), + NAME_FUNC_OFFSET( 1201, glTexCoord2dv, glTexCoord2dv, NULL, 103), + NAME_FUNC_OFFSET( 1215, glTexCoord2f, glTexCoord2f, NULL, 104), + NAME_FUNC_OFFSET( 1228, glTexCoord2fv, glTexCoord2fv, NULL, 105), + NAME_FUNC_OFFSET( 1242, glTexCoord2i, glTexCoord2i, NULL, 106), + NAME_FUNC_OFFSET( 1255, glTexCoord2iv, glTexCoord2iv, NULL, 107), + NAME_FUNC_OFFSET( 1269, glTexCoord2s, glTexCoord2s, NULL, 108), + NAME_FUNC_OFFSET( 1282, glTexCoord2sv, glTexCoord2sv, NULL, 109), + NAME_FUNC_OFFSET( 1296, glTexCoord3d, glTexCoord3d, NULL, 110), + NAME_FUNC_OFFSET( 1309, glTexCoord3dv, glTexCoord3dv, NULL, 111), + NAME_FUNC_OFFSET( 1323, glTexCoord3f, glTexCoord3f, NULL, 112), + NAME_FUNC_OFFSET( 1336, glTexCoord3fv, glTexCoord3fv, NULL, 113), + NAME_FUNC_OFFSET( 1350, glTexCoord3i, glTexCoord3i, NULL, 114), + NAME_FUNC_OFFSET( 1363, glTexCoord3iv, glTexCoord3iv, NULL, 115), + NAME_FUNC_OFFSET( 1377, glTexCoord3s, glTexCoord3s, NULL, 116), + NAME_FUNC_OFFSET( 1390, glTexCoord3sv, glTexCoord3sv, NULL, 117), + NAME_FUNC_OFFSET( 1404, glTexCoord4d, glTexCoord4d, NULL, 118), + NAME_FUNC_OFFSET( 1417, glTexCoord4dv, glTexCoord4dv, NULL, 119), + NAME_FUNC_OFFSET( 1431, glTexCoord4f, glTexCoord4f, NULL, 120), + NAME_FUNC_OFFSET( 1444, glTexCoord4fv, glTexCoord4fv, NULL, 121), + NAME_FUNC_OFFSET( 1458, glTexCoord4i, glTexCoord4i, NULL, 122), + NAME_FUNC_OFFSET( 1471, glTexCoord4iv, glTexCoord4iv, NULL, 123), + NAME_FUNC_OFFSET( 1485, glTexCoord4s, glTexCoord4s, NULL, 124), + NAME_FUNC_OFFSET( 1498, glTexCoord4sv, glTexCoord4sv, NULL, 125), + NAME_FUNC_OFFSET( 1512, glVertex2d, glVertex2d, NULL, 126), + NAME_FUNC_OFFSET( 1523, glVertex2dv, glVertex2dv, NULL, 127), + NAME_FUNC_OFFSET( 1535, glVertex2f, glVertex2f, NULL, 128), + NAME_FUNC_OFFSET( 1546, glVertex2fv, glVertex2fv, NULL, 129), + NAME_FUNC_OFFSET( 1558, glVertex2i, glVertex2i, NULL, 130), + NAME_FUNC_OFFSET( 1569, glVertex2iv, glVertex2iv, NULL, 131), + NAME_FUNC_OFFSET( 1581, glVertex2s, glVertex2s, NULL, 132), + NAME_FUNC_OFFSET( 1592, glVertex2sv, glVertex2sv, NULL, 133), + NAME_FUNC_OFFSET( 1604, glVertex3d, glVertex3d, NULL, 134), + NAME_FUNC_OFFSET( 1615, glVertex3dv, glVertex3dv, NULL, 135), + NAME_FUNC_OFFSET( 1627, glVertex3f, glVertex3f, NULL, 136), + NAME_FUNC_OFFSET( 1638, glVertex3fv, glVertex3fv, NULL, 137), + NAME_FUNC_OFFSET( 1650, glVertex3i, glVertex3i, NULL, 138), + NAME_FUNC_OFFSET( 1661, glVertex3iv, glVertex3iv, NULL, 139), + NAME_FUNC_OFFSET( 1673, glVertex3s, glVertex3s, NULL, 140), + NAME_FUNC_OFFSET( 1684, glVertex3sv, glVertex3sv, NULL, 141), + NAME_FUNC_OFFSET( 1696, glVertex4d, glVertex4d, NULL, 142), + NAME_FUNC_OFFSET( 1707, glVertex4dv, glVertex4dv, NULL, 143), + NAME_FUNC_OFFSET( 1719, glVertex4f, glVertex4f, NULL, 144), + NAME_FUNC_OFFSET( 1730, glVertex4fv, glVertex4fv, NULL, 145), + NAME_FUNC_OFFSET( 1742, glVertex4i, glVertex4i, NULL, 146), + NAME_FUNC_OFFSET( 1753, glVertex4iv, glVertex4iv, NULL, 147), + NAME_FUNC_OFFSET( 1765, glVertex4s, glVertex4s, NULL, 148), + NAME_FUNC_OFFSET( 1776, glVertex4sv, glVertex4sv, NULL, 149), + NAME_FUNC_OFFSET( 1788, glClipPlane, glClipPlane, NULL, 150), + NAME_FUNC_OFFSET( 1800, glColorMaterial, glColorMaterial, NULL, 151), + NAME_FUNC_OFFSET( 1816, glCullFace, glCullFace, NULL, 152), + NAME_FUNC_OFFSET( 1827, glFogf, glFogf, NULL, 153), + NAME_FUNC_OFFSET( 1834, glFogfv, glFogfv, NULL, 154), + NAME_FUNC_OFFSET( 1842, glFogi, glFogi, NULL, 155), + NAME_FUNC_OFFSET( 1849, glFogiv, glFogiv, NULL, 156), + NAME_FUNC_OFFSET( 1857, glFrontFace, glFrontFace, NULL, 157), + NAME_FUNC_OFFSET( 1869, glHint, glHint, NULL, 158), + NAME_FUNC_OFFSET( 1876, glLightf, glLightf, NULL, 159), + NAME_FUNC_OFFSET( 1885, glLightfv, glLightfv, NULL, 160), + NAME_FUNC_OFFSET( 1895, glLighti, glLighti, NULL, 161), + NAME_FUNC_OFFSET( 1904, glLightiv, glLightiv, NULL, 162), + NAME_FUNC_OFFSET( 1914, glLightModelf, glLightModelf, NULL, 163), + NAME_FUNC_OFFSET( 1928, glLightModelfv, glLightModelfv, NULL, 164), + NAME_FUNC_OFFSET( 1943, glLightModeli, glLightModeli, NULL, 165), + NAME_FUNC_OFFSET( 1957, glLightModeliv, glLightModeliv, NULL, 166), + NAME_FUNC_OFFSET( 1972, glLineStipple, glLineStipple, NULL, 167), + NAME_FUNC_OFFSET( 1986, glLineWidth, glLineWidth, NULL, 168), + NAME_FUNC_OFFSET( 1998, glMaterialf, glMaterialf, NULL, 169), + NAME_FUNC_OFFSET( 2010, glMaterialfv, glMaterialfv, NULL, 170), + NAME_FUNC_OFFSET( 2023, glMateriali, glMateriali, NULL, 171), + NAME_FUNC_OFFSET( 2035, glMaterialiv, glMaterialiv, NULL, 172), + NAME_FUNC_OFFSET( 2048, glPointSize, glPointSize, NULL, 173), + NAME_FUNC_OFFSET( 2060, glPolygonMode, glPolygonMode, NULL, 174), + NAME_FUNC_OFFSET( 2074, glPolygonStipple, glPolygonStipple, NULL, 175), + NAME_FUNC_OFFSET( 2091, glScissor, glScissor, NULL, 176), + NAME_FUNC_OFFSET( 2101, glShadeModel, glShadeModel, NULL, 177), + NAME_FUNC_OFFSET( 2114, glTexParameterf, glTexParameterf, NULL, 178), + NAME_FUNC_OFFSET( 2130, glTexParameterfv, glTexParameterfv, NULL, 179), + NAME_FUNC_OFFSET( 2147, glTexParameteri, glTexParameteri, NULL, 180), + NAME_FUNC_OFFSET( 2163, glTexParameteriv, glTexParameteriv, NULL, 181), + NAME_FUNC_OFFSET( 2180, glTexImage1D, glTexImage1D, NULL, 182), + NAME_FUNC_OFFSET( 2193, glTexImage2D, glTexImage2D, NULL, 183), + NAME_FUNC_OFFSET( 2206, glTexEnvf, glTexEnvf, NULL, 184), + NAME_FUNC_OFFSET( 2216, glTexEnvfv, glTexEnvfv, NULL, 185), + NAME_FUNC_OFFSET( 2227, glTexEnvi, glTexEnvi, NULL, 186), + NAME_FUNC_OFFSET( 2237, glTexEnviv, glTexEnviv, NULL, 187), + NAME_FUNC_OFFSET( 2248, glTexGend, glTexGend, NULL, 188), + NAME_FUNC_OFFSET( 2258, glTexGendv, glTexGendv, NULL, 189), + NAME_FUNC_OFFSET( 2269, glTexGenf, glTexGenf, NULL, 190), + NAME_FUNC_OFFSET( 2279, glTexGenfv, glTexGenfv, NULL, 191), + NAME_FUNC_OFFSET( 2290, glTexGeni, glTexGeni, NULL, 192), + NAME_FUNC_OFFSET( 2300, glTexGeniv, glTexGeniv, NULL, 193), + NAME_FUNC_OFFSET( 2311, glFeedbackBuffer, glFeedbackBuffer, NULL, 194), + NAME_FUNC_OFFSET( 2328, glSelectBuffer, glSelectBuffer, NULL, 195), + NAME_FUNC_OFFSET( 2343, glRenderMode, glRenderMode, NULL, 196), + NAME_FUNC_OFFSET( 2356, glInitNames, glInitNames, NULL, 197), + NAME_FUNC_OFFSET( 2368, glLoadName, glLoadName, NULL, 198), + NAME_FUNC_OFFSET( 2379, glPassThrough, glPassThrough, NULL, 199), + NAME_FUNC_OFFSET( 2393, glPopName, glPopName, NULL, 200), + NAME_FUNC_OFFSET( 2403, glPushName, glPushName, NULL, 201), + NAME_FUNC_OFFSET( 2414, glDrawBuffer, glDrawBuffer, NULL, 202), + NAME_FUNC_OFFSET( 2427, glClear, glClear, NULL, 203), + NAME_FUNC_OFFSET( 2435, glClearAccum, glClearAccum, NULL, 204), + NAME_FUNC_OFFSET( 2448, glClearIndex, glClearIndex, NULL, 205), + NAME_FUNC_OFFSET( 2461, glClearColor, glClearColor, NULL, 206), + NAME_FUNC_OFFSET( 2474, glClearStencil, glClearStencil, NULL, 207), + NAME_FUNC_OFFSET( 2489, glClearDepth, glClearDepth, NULL, 208), + NAME_FUNC_OFFSET( 2502, glStencilMask, glStencilMask, NULL, 209), + NAME_FUNC_OFFSET( 2516, glColorMask, glColorMask, NULL, 210), + NAME_FUNC_OFFSET( 2528, glDepthMask, glDepthMask, NULL, 211), + NAME_FUNC_OFFSET( 2540, glIndexMask, glIndexMask, NULL, 212), + NAME_FUNC_OFFSET( 2552, glAccum, glAccum, NULL, 213), + NAME_FUNC_OFFSET( 2560, glDisable, glDisable, NULL, 214), + NAME_FUNC_OFFSET( 2570, glEnable, glEnable, NULL, 215), + NAME_FUNC_OFFSET( 2579, glFinish, glFinish, NULL, 216), + NAME_FUNC_OFFSET( 2588, glFlush, glFlush, NULL, 217), + NAME_FUNC_OFFSET( 2596, glPopAttrib, glPopAttrib, NULL, 218), + NAME_FUNC_OFFSET( 2608, glPushAttrib, glPushAttrib, NULL, 219), + NAME_FUNC_OFFSET( 2621, glMap1d, glMap1d, NULL, 220), + NAME_FUNC_OFFSET( 2629, glMap1f, glMap1f, NULL, 221), + NAME_FUNC_OFFSET( 2637, glMap2d, glMap2d, NULL, 222), + NAME_FUNC_OFFSET( 2645, glMap2f, glMap2f, NULL, 223), + NAME_FUNC_OFFSET( 2653, glMapGrid1d, glMapGrid1d, NULL, 224), + NAME_FUNC_OFFSET( 2665, glMapGrid1f, glMapGrid1f, NULL, 225), + NAME_FUNC_OFFSET( 2677, glMapGrid2d, glMapGrid2d, NULL, 226), + NAME_FUNC_OFFSET( 2689, glMapGrid2f, glMapGrid2f, NULL, 227), + NAME_FUNC_OFFSET( 2701, glEvalCoord1d, glEvalCoord1d, NULL, 228), + NAME_FUNC_OFFSET( 2715, glEvalCoord1dv, glEvalCoord1dv, NULL, 229), + NAME_FUNC_OFFSET( 2730, glEvalCoord1f, glEvalCoord1f, NULL, 230), + NAME_FUNC_OFFSET( 2744, glEvalCoord1fv, glEvalCoord1fv, NULL, 231), + NAME_FUNC_OFFSET( 2759, glEvalCoord2d, glEvalCoord2d, NULL, 232), + NAME_FUNC_OFFSET( 2773, glEvalCoord2dv, glEvalCoord2dv, NULL, 233), + NAME_FUNC_OFFSET( 2788, glEvalCoord2f, glEvalCoord2f, NULL, 234), + NAME_FUNC_OFFSET( 2802, glEvalCoord2fv, glEvalCoord2fv, NULL, 235), + NAME_FUNC_OFFSET( 2817, glEvalMesh1, glEvalMesh1, NULL, 236), + NAME_FUNC_OFFSET( 2829, glEvalPoint1, glEvalPoint1, NULL, 237), + NAME_FUNC_OFFSET( 2842, glEvalMesh2, glEvalMesh2, NULL, 238), + NAME_FUNC_OFFSET( 2854, glEvalPoint2, glEvalPoint2, NULL, 239), + NAME_FUNC_OFFSET( 2867, glAlphaFunc, glAlphaFunc, NULL, 240), + NAME_FUNC_OFFSET( 2879, glBlendFunc, glBlendFunc, NULL, 241), + NAME_FUNC_OFFSET( 2891, glLogicOp, glLogicOp, NULL, 242), + NAME_FUNC_OFFSET( 2901, glStencilFunc, glStencilFunc, NULL, 243), + NAME_FUNC_OFFSET( 2915, glStencilOp, glStencilOp, NULL, 244), + NAME_FUNC_OFFSET( 2927, glDepthFunc, glDepthFunc, NULL, 245), + NAME_FUNC_OFFSET( 2939, glPixelZoom, glPixelZoom, NULL, 246), + NAME_FUNC_OFFSET( 2951, glPixelTransferf, glPixelTransferf, NULL, 247), + NAME_FUNC_OFFSET( 2968, glPixelTransferi, glPixelTransferi, NULL, 248), + NAME_FUNC_OFFSET( 2985, glPixelStoref, glPixelStoref, NULL, 249), + NAME_FUNC_OFFSET( 2999, glPixelStorei, glPixelStorei, NULL, 250), + NAME_FUNC_OFFSET( 3013, glPixelMapfv, glPixelMapfv, NULL, 251), + NAME_FUNC_OFFSET( 3026, glPixelMapuiv, glPixelMapuiv, NULL, 252), + NAME_FUNC_OFFSET( 3040, glPixelMapusv, glPixelMapusv, NULL, 253), + NAME_FUNC_OFFSET( 3054, glReadBuffer, glReadBuffer, NULL, 254), + NAME_FUNC_OFFSET( 3067, glCopyPixels, glCopyPixels, NULL, 255), + NAME_FUNC_OFFSET( 3080, glReadPixels, glReadPixels, NULL, 256), + NAME_FUNC_OFFSET( 3093, glDrawPixels, glDrawPixels, NULL, 257), + NAME_FUNC_OFFSET( 3106, glGetBooleanv, glGetBooleanv, NULL, 258), + NAME_FUNC_OFFSET( 3120, glGetClipPlane, glGetClipPlane, NULL, 259), + NAME_FUNC_OFFSET( 3135, glGetDoublev, glGetDoublev, NULL, 260), + NAME_FUNC_OFFSET( 3148, glGetError, glGetError, NULL, 261), + NAME_FUNC_OFFSET( 3159, glGetFloatv, glGetFloatv, NULL, 262), + NAME_FUNC_OFFSET( 3171, glGetIntegerv, glGetIntegerv, NULL, 263), + NAME_FUNC_OFFSET( 3185, glGetLightfv, glGetLightfv, NULL, 264), + NAME_FUNC_OFFSET( 3198, glGetLightiv, glGetLightiv, NULL, 265), + NAME_FUNC_OFFSET( 3211, glGetMapdv, glGetMapdv, NULL, 266), + NAME_FUNC_OFFSET( 3222, glGetMapfv, glGetMapfv, NULL, 267), + NAME_FUNC_OFFSET( 3233, glGetMapiv, glGetMapiv, NULL, 268), + NAME_FUNC_OFFSET( 3244, glGetMaterialfv, glGetMaterialfv, NULL, 269), + NAME_FUNC_OFFSET( 3260, glGetMaterialiv, glGetMaterialiv, NULL, 270), + NAME_FUNC_OFFSET( 3276, glGetPixelMapfv, glGetPixelMapfv, NULL, 271), + NAME_FUNC_OFFSET( 3292, glGetPixelMapuiv, glGetPixelMapuiv, NULL, 272), + NAME_FUNC_OFFSET( 3309, glGetPixelMapusv, glGetPixelMapusv, NULL, 273), + NAME_FUNC_OFFSET( 3326, glGetPolygonStipple, glGetPolygonStipple, NULL, 274), + NAME_FUNC_OFFSET( 3346, glGetString, glGetString, NULL, 275), + NAME_FUNC_OFFSET( 3358, glGetTexEnvfv, glGetTexEnvfv, NULL, 276), + NAME_FUNC_OFFSET( 3372, glGetTexEnviv, glGetTexEnviv, NULL, 277), + NAME_FUNC_OFFSET( 3386, glGetTexGendv, glGetTexGendv, NULL, 278), + NAME_FUNC_OFFSET( 3400, glGetTexGenfv, glGetTexGenfv, NULL, 279), + NAME_FUNC_OFFSET( 3414, glGetTexGeniv, glGetTexGeniv, NULL, 280), + NAME_FUNC_OFFSET( 3428, glGetTexImage, glGetTexImage, NULL, 281), + NAME_FUNC_OFFSET( 3442, glGetTexParameterfv, glGetTexParameterfv, NULL, 282), + NAME_FUNC_OFFSET( 3462, glGetTexParameteriv, glGetTexParameteriv, NULL, 283), + NAME_FUNC_OFFSET( 3482, glGetTexLevelParameterfv, glGetTexLevelParameterfv, NULL, 284), + NAME_FUNC_OFFSET( 3507, glGetTexLevelParameteriv, glGetTexLevelParameteriv, NULL, 285), + NAME_FUNC_OFFSET( 3532, glIsEnabled, glIsEnabled, NULL, 286), + NAME_FUNC_OFFSET( 3544, glIsList, glIsList, NULL, 287), + NAME_FUNC_OFFSET( 3553, glDepthRange, glDepthRange, NULL, 288), + NAME_FUNC_OFFSET( 3566, glFrustum, glFrustum, NULL, 289), + NAME_FUNC_OFFSET( 3576, glLoadIdentity, glLoadIdentity, NULL, 290), + NAME_FUNC_OFFSET( 3591, glLoadMatrixf, glLoadMatrixf, NULL, 291), + NAME_FUNC_OFFSET( 3605, glLoadMatrixd, glLoadMatrixd, NULL, 292), + NAME_FUNC_OFFSET( 3619, glMatrixMode, glMatrixMode, NULL, 293), + NAME_FUNC_OFFSET( 3632, glMultMatrixf, glMultMatrixf, NULL, 294), + NAME_FUNC_OFFSET( 3646, glMultMatrixd, glMultMatrixd, NULL, 295), + NAME_FUNC_OFFSET( 3660, glOrtho, glOrtho, NULL, 296), + NAME_FUNC_OFFSET( 3668, glPopMatrix, glPopMatrix, NULL, 297), + NAME_FUNC_OFFSET( 3680, glPushMatrix, glPushMatrix, NULL, 298), + NAME_FUNC_OFFSET( 3693, glRotated, glRotated, NULL, 299), + NAME_FUNC_OFFSET( 3703, glRotatef, glRotatef, NULL, 300), + NAME_FUNC_OFFSET( 3713, glScaled, glScaled, NULL, 301), + NAME_FUNC_OFFSET( 3722, glScalef, glScalef, NULL, 302), + NAME_FUNC_OFFSET( 3731, glTranslated, glTranslated, NULL, 303), + NAME_FUNC_OFFSET( 3744, glTranslatef, glTranslatef, NULL, 304), + NAME_FUNC_OFFSET( 3757, glViewport, glViewport, NULL, 305), + NAME_FUNC_OFFSET( 3768, glArrayElement, glArrayElement, NULL, 306), + NAME_FUNC_OFFSET( 3783, glBindTexture, glBindTexture, NULL, 307), + NAME_FUNC_OFFSET( 3797, glColorPointer, glColorPointer, NULL, 308), + NAME_FUNC_OFFSET( 3812, glDisableClientState, glDisableClientState, NULL, 309), + NAME_FUNC_OFFSET( 3833, glDrawArrays, glDrawArrays, NULL, 310), + NAME_FUNC_OFFSET( 3846, glDrawElements, glDrawElements, NULL, 311), + NAME_FUNC_OFFSET( 3861, glEdgeFlagPointer, glEdgeFlagPointer, NULL, 312), + NAME_FUNC_OFFSET( 3879, glEnableClientState, glEnableClientState, NULL, 313), + NAME_FUNC_OFFSET( 3899, glIndexPointer, glIndexPointer, NULL, 314), + NAME_FUNC_OFFSET( 3914, glIndexub, glIndexub, NULL, 315), + NAME_FUNC_OFFSET( 3924, glIndexubv, glIndexubv, NULL, 316), + NAME_FUNC_OFFSET( 3935, glInterleavedArrays, glInterleavedArrays, NULL, 317), + NAME_FUNC_OFFSET( 3955, glNormalPointer, glNormalPointer, NULL, 318), + NAME_FUNC_OFFSET( 3971, glPolygonOffset, glPolygonOffset, NULL, 319), + NAME_FUNC_OFFSET( 3987, glTexCoordPointer, glTexCoordPointer, NULL, 320), + NAME_FUNC_OFFSET( 4005, glVertexPointer, glVertexPointer, NULL, 321), + NAME_FUNC_OFFSET( 4021, glAreTexturesResident, glAreTexturesResident, NULL, 322), + NAME_FUNC_OFFSET( 4043, glCopyTexImage1D, glCopyTexImage1D, NULL, 323), + NAME_FUNC_OFFSET( 4060, glCopyTexImage2D, glCopyTexImage2D, NULL, 324), + NAME_FUNC_OFFSET( 4077, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325), + NAME_FUNC_OFFSET( 4097, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326), + NAME_FUNC_OFFSET( 4117, glDeleteTextures, glDeleteTextures, NULL, 327), + NAME_FUNC_OFFSET( 4134, glGenTextures, glGenTextures, NULL, 328), + NAME_FUNC_OFFSET( 4148, glGetPointerv, glGetPointerv, NULL, 329), + NAME_FUNC_OFFSET( 4162, glIsTexture, glIsTexture, NULL, 330), + NAME_FUNC_OFFSET( 4174, glPrioritizeTextures, glPrioritizeTextures, NULL, 331), + NAME_FUNC_OFFSET( 4195, glTexSubImage1D, glTexSubImage1D, NULL, 332), + NAME_FUNC_OFFSET( 4211, glTexSubImage2D, glTexSubImage2D, NULL, 333), + NAME_FUNC_OFFSET( 4227, glPopClientAttrib, glPopClientAttrib, NULL, 334), + NAME_FUNC_OFFSET( 4245, glPushClientAttrib, glPushClientAttrib, NULL, 335), + NAME_FUNC_OFFSET( 4264, glBlendColor, glBlendColor, NULL, 336), + NAME_FUNC_OFFSET( 4277, glBlendEquation, glBlendEquation, NULL, 337), + NAME_FUNC_OFFSET( 4293, glDrawRangeElements, glDrawRangeElements, NULL, 338), + NAME_FUNC_OFFSET( 4313, glColorTable, glColorTable, NULL, 339), + NAME_FUNC_OFFSET( 4326, glColorTableParameterfv, glColorTableParameterfv, NULL, 340), + NAME_FUNC_OFFSET( 4350, glColorTableParameteriv, glColorTableParameteriv, NULL, 341), + NAME_FUNC_OFFSET( 4374, glCopyColorTable, glCopyColorTable, NULL, 342), + NAME_FUNC_OFFSET( 4391, glGetColorTable, glGetColorTable, NULL, 343), + NAME_FUNC_OFFSET( 4407, glGetColorTableParameterfv, glGetColorTableParameterfv, NULL, 344), + NAME_FUNC_OFFSET( 4434, glGetColorTableParameteriv, glGetColorTableParameteriv, NULL, 345), + NAME_FUNC_OFFSET( 4461, glColorSubTable, glColorSubTable, NULL, 346), + NAME_FUNC_OFFSET( 4477, glCopyColorSubTable, glCopyColorSubTable, NULL, 347), + NAME_FUNC_OFFSET( 4497, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348), + NAME_FUNC_OFFSET( 4519, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349), + NAME_FUNC_OFFSET( 4541, glConvolutionParameterf, glConvolutionParameterf, NULL, 350), + NAME_FUNC_OFFSET( 4565, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351), + NAME_FUNC_OFFSET( 4590, glConvolutionParameteri, glConvolutionParameteri, NULL, 352), + NAME_FUNC_OFFSET( 4614, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353), + NAME_FUNC_OFFSET( 4639, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354), + NAME_FUNC_OFFSET( 4665, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355), + NAME_FUNC_OFFSET( 4691, glGetConvolutionFilter, glGetConvolutionFilter, NULL, 356), + NAME_FUNC_OFFSET( 4714, glGetConvolutionParameterfv, glGetConvolutionParameterfv, NULL, 357), + NAME_FUNC_OFFSET( 4742, glGetConvolutionParameteriv, glGetConvolutionParameteriv, NULL, 358), + NAME_FUNC_OFFSET( 4770, glGetSeparableFilter, glGetSeparableFilter, NULL, 359), + NAME_FUNC_OFFSET( 4791, glSeparableFilter2D, glSeparableFilter2D, NULL, 360), + NAME_FUNC_OFFSET( 4811, glGetHistogram, glGetHistogram, NULL, 361), + NAME_FUNC_OFFSET( 4826, glGetHistogramParameterfv, glGetHistogramParameterfv, NULL, 362), + NAME_FUNC_OFFSET( 4852, glGetHistogramParameteriv, glGetHistogramParameteriv, NULL, 363), + NAME_FUNC_OFFSET( 4878, glGetMinmax, glGetMinmax, NULL, 364), + NAME_FUNC_OFFSET( 4890, glGetMinmaxParameterfv, glGetMinmaxParameterfv, NULL, 365), + NAME_FUNC_OFFSET( 4913, glGetMinmaxParameteriv, glGetMinmaxParameteriv, NULL, 366), + NAME_FUNC_OFFSET( 4936, glHistogram, glHistogram, NULL, 367), + NAME_FUNC_OFFSET( 4948, glMinmax, glMinmax, NULL, 368), + NAME_FUNC_OFFSET( 4957, glResetHistogram, glResetHistogram, NULL, 369), + NAME_FUNC_OFFSET( 4974, glResetMinmax, glResetMinmax, NULL, 370), + NAME_FUNC_OFFSET( 4988, glTexImage3D, glTexImage3D, NULL, 371), + NAME_FUNC_OFFSET( 5001, glTexSubImage3D, glTexSubImage3D, NULL, 372), + NAME_FUNC_OFFSET( 5017, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373), + NAME_FUNC_OFFSET( 5037, glActiveTexture, glActiveTexture, NULL, 374), + NAME_FUNC_OFFSET( 5053, glClientActiveTexture, glClientActiveTexture, NULL, 375), + NAME_FUNC_OFFSET( 5075, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376), + NAME_FUNC_OFFSET( 5093, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377), + NAME_FUNC_OFFSET( 5112, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378), + NAME_FUNC_OFFSET( 5133, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379), + NAME_FUNC_OFFSET( 5155, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380), + NAME_FUNC_OFFSET( 5173, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381), + NAME_FUNC_OFFSET( 5192, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382), + NAME_FUNC_OFFSET( 5210, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383), + NAME_FUNC_OFFSET( 5229, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384), + NAME_FUNC_OFFSET( 5247, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385), + NAME_FUNC_OFFSET( 5266, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386), + NAME_FUNC_OFFSET( 5287, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387), + NAME_FUNC_OFFSET( 5309, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388), + NAME_FUNC_OFFSET( 5327, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389), + NAME_FUNC_OFFSET( 5346, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390), + NAME_FUNC_OFFSET( 5364, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391), + NAME_FUNC_OFFSET( 5383, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392), + NAME_FUNC_OFFSET( 5401, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393), + NAME_FUNC_OFFSET( 5420, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394), + NAME_FUNC_OFFSET( 5441, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395), + NAME_FUNC_OFFSET( 5463, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396), + NAME_FUNC_OFFSET( 5481, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397), + NAME_FUNC_OFFSET( 5500, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398), + NAME_FUNC_OFFSET( 5518, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399), + NAME_FUNC_OFFSET( 5537, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400), + NAME_FUNC_OFFSET( 5555, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401), + NAME_FUNC_OFFSET( 5574, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402), + NAME_FUNC_OFFSET( 5595, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403), + NAME_FUNC_OFFSET( 5617, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404), + NAME_FUNC_OFFSET( 5635, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405), + NAME_FUNC_OFFSET( 5654, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406), + NAME_FUNC_OFFSET( 5672, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407), + NAME_FUNC_OFFSET( 5691, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408), + NAME_FUNC_OFFSET( 5714, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409), + NAME_FUNC_OFFSET( 5737, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410), + NAME_FUNC_OFFSET( 5760, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411), + NAME_FUNC_OFFSET( 5786, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412), + NAME_FUNC_OFFSET( 5812, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413), + NAME_FUNC_OFFSET( 5838, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414), + NAME_FUNC_OFFSET( 5862, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415), + NAME_FUNC_OFFSET( 5885, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416), + NAME_FUNC_OFFSET( 5908, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417), + NAME_FUNC_OFFSET( 5931, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418), + NAME_FUNC_OFFSET( 5954, glSampleCoverage, glSampleCoverage, NULL, 419), + NAME_FUNC_OFFSET( 5971, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420), + NAME_FUNC_OFFSET( 5991, glFogCoordPointer, glFogCoordPointer, NULL, 421), + NAME_FUNC_OFFSET( 6009, glFogCoordd, glFogCoordd, NULL, 422), + NAME_FUNC_OFFSET( 6021, glFogCoorddv, glFogCoorddv, NULL, 423), + NAME_FUNC_OFFSET( 6034, glMultiDrawArrays, glMultiDrawArrays, NULL, 424), + NAME_FUNC_OFFSET( 6052, glPointParameterf, glPointParameterf, NULL, 425), + NAME_FUNC_OFFSET( 6070, glPointParameterfv, glPointParameterfv, NULL, 426), + NAME_FUNC_OFFSET( 6089, glPointParameteri, glPointParameteri, NULL, 427), + NAME_FUNC_OFFSET( 6107, glPointParameteriv, glPointParameteriv, NULL, 428), + NAME_FUNC_OFFSET( 6126, glSecondaryColor3b, glSecondaryColor3b, NULL, 429), + NAME_FUNC_OFFSET( 6145, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430), + NAME_FUNC_OFFSET( 6165, glSecondaryColor3d, glSecondaryColor3d, NULL, 431), + NAME_FUNC_OFFSET( 6184, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432), + NAME_FUNC_OFFSET( 6204, glSecondaryColor3i, glSecondaryColor3i, NULL, 433), + NAME_FUNC_OFFSET( 6223, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434), + NAME_FUNC_OFFSET( 6243, glSecondaryColor3s, glSecondaryColor3s, NULL, 435), + NAME_FUNC_OFFSET( 6262, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436), + NAME_FUNC_OFFSET( 6282, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437), + NAME_FUNC_OFFSET( 6302, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438), + NAME_FUNC_OFFSET( 6323, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439), + NAME_FUNC_OFFSET( 6343, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440), + NAME_FUNC_OFFSET( 6364, glSecondaryColor3us, glSecondaryColor3us, NULL, 441), + NAME_FUNC_OFFSET( 6384, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442), + NAME_FUNC_OFFSET( 6405, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443), + NAME_FUNC_OFFSET( 6429, glWindowPos2d, glWindowPos2d, NULL, 444), + NAME_FUNC_OFFSET( 6443, glWindowPos2dv, glWindowPos2dv, NULL, 445), + NAME_FUNC_OFFSET( 6458, glWindowPos2f, glWindowPos2f, NULL, 446), + NAME_FUNC_OFFSET( 6472, glWindowPos2fv, glWindowPos2fv, NULL, 447), + NAME_FUNC_OFFSET( 6487, glWindowPos2i, glWindowPos2i, NULL, 448), + NAME_FUNC_OFFSET( 6501, glWindowPos2iv, glWindowPos2iv, NULL, 449), + NAME_FUNC_OFFSET( 6516, glWindowPos2s, glWindowPos2s, NULL, 450), + NAME_FUNC_OFFSET( 6530, glWindowPos2sv, glWindowPos2sv, NULL, 451), + NAME_FUNC_OFFSET( 6545, glWindowPos3d, glWindowPos3d, NULL, 452), + NAME_FUNC_OFFSET( 6559, glWindowPos3dv, glWindowPos3dv, NULL, 453), + NAME_FUNC_OFFSET( 6574, glWindowPos3f, glWindowPos3f, NULL, 454), + NAME_FUNC_OFFSET( 6588, glWindowPos3fv, glWindowPos3fv, NULL, 455), + NAME_FUNC_OFFSET( 6603, glWindowPos3i, glWindowPos3i, NULL, 456), + NAME_FUNC_OFFSET( 6617, glWindowPos3iv, glWindowPos3iv, NULL, 457), + NAME_FUNC_OFFSET( 6632, glWindowPos3s, glWindowPos3s, NULL, 458), + NAME_FUNC_OFFSET( 6646, glWindowPos3sv, glWindowPos3sv, NULL, 459), + NAME_FUNC_OFFSET( 6661, glBeginQuery, glBeginQuery, NULL, 460), + NAME_FUNC_OFFSET( 6674, glBindBuffer, glBindBuffer, NULL, 461), + NAME_FUNC_OFFSET( 6687, glBufferData, glBufferData, NULL, 462), + NAME_FUNC_OFFSET( 6700, glBufferSubData, glBufferSubData, NULL, 463), + NAME_FUNC_OFFSET( 6716, glDeleteBuffers, glDeleteBuffers, NULL, 464), + NAME_FUNC_OFFSET( 6732, glDeleteQueries, glDeleteQueries, NULL, 465), + NAME_FUNC_OFFSET( 6748, glEndQuery, glEndQuery, NULL, 466), + NAME_FUNC_OFFSET( 6759, glGenBuffers, glGenBuffers, NULL, 467), + NAME_FUNC_OFFSET( 6772, glGenQueries, glGenQueries, NULL, 468), + NAME_FUNC_OFFSET( 6785, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469), + NAME_FUNC_OFFSET( 6808, glGetBufferPointerv, glGetBufferPointerv, NULL, 470), + NAME_FUNC_OFFSET( 6828, glGetBufferSubData, glGetBufferSubData, NULL, 471), + NAME_FUNC_OFFSET( 6847, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472), + NAME_FUNC_OFFSET( 6866, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473), + NAME_FUNC_OFFSET( 6886, glGetQueryiv, glGetQueryiv, NULL, 474), + NAME_FUNC_OFFSET( 6899, glIsBuffer, glIsBuffer, NULL, 475), + NAME_FUNC_OFFSET( 6910, glIsQuery, glIsQuery, NULL, 476), + NAME_FUNC_OFFSET( 6920, glMapBuffer, glMapBuffer, NULL, 477), + NAME_FUNC_OFFSET( 6932, glUnmapBuffer, glUnmapBuffer, NULL, 478), + NAME_FUNC_OFFSET( 6946, glAttachShader, glAttachShader, NULL, 479), + NAME_FUNC_OFFSET( 6961, glBindAttribLocation, glBindAttribLocation, NULL, 480), + NAME_FUNC_OFFSET( 6982, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481), + NAME_FUNC_OFFSET( 7006, glCompileShader, glCompileShader, NULL, 482), + NAME_FUNC_OFFSET( 7022, glCreateProgram, glCreateProgram, NULL, 483), + NAME_FUNC_OFFSET( 7038, glCreateShader, glCreateShader, NULL, 484), + NAME_FUNC_OFFSET( 7053, glDeleteProgram, glDeleteProgram, NULL, 485), + NAME_FUNC_OFFSET( 7069, glDeleteShader, glDeleteShader, NULL, 486), + NAME_FUNC_OFFSET( 7084, glDetachShader, glDetachShader, NULL, 487), + NAME_FUNC_OFFSET( 7099, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488), + NAME_FUNC_OFFSET( 7126, glDrawBuffers, glDrawBuffers, NULL, 489), + NAME_FUNC_OFFSET( 7140, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490), + NAME_FUNC_OFFSET( 7166, glGetActiveAttrib, glGetActiveAttrib, NULL, 491), + NAME_FUNC_OFFSET( 7184, glGetActiveUniform, glGetActiveUniform, NULL, 492), + NAME_FUNC_OFFSET( 7203, glGetAttachedShaders, glGetAttachedShaders, NULL, 493), + NAME_FUNC_OFFSET( 7224, glGetAttribLocation, glGetAttribLocation, NULL, 494), + NAME_FUNC_OFFSET( 7244, glGetProgramInfoLog, glGetProgramInfoLog, NULL, 495), + NAME_FUNC_OFFSET( 7264, glGetProgramiv, glGetProgramiv, NULL, 496), + NAME_FUNC_OFFSET( 7279, glGetShaderInfoLog, glGetShaderInfoLog, NULL, 497), + NAME_FUNC_OFFSET( 7298, glGetShaderSource, glGetShaderSource, NULL, 498), + NAME_FUNC_OFFSET( 7316, glGetShaderiv, glGetShaderiv, NULL, 499), + NAME_FUNC_OFFSET( 7330, glGetUniformLocation, glGetUniformLocation, NULL, 500), + NAME_FUNC_OFFSET( 7351, glGetUniformfv, glGetUniformfv, NULL, 501), + NAME_FUNC_OFFSET( 7366, glGetUniformiv, glGetUniformiv, NULL, 502), + NAME_FUNC_OFFSET( 7381, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503), + NAME_FUNC_OFFSET( 7407, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504), + NAME_FUNC_OFFSET( 7427, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505), + NAME_FUNC_OFFSET( 7447, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506), + NAME_FUNC_OFFSET( 7467, glIsProgram, glIsProgram, NULL, 507), + NAME_FUNC_OFFSET( 7479, glIsShader, glIsShader, NULL, 508), + NAME_FUNC_OFFSET( 7490, glLinkProgram, glLinkProgram, NULL, 509), + NAME_FUNC_OFFSET( 7504, glShaderSource, glShaderSource, NULL, 510), + NAME_FUNC_OFFSET( 7519, glStencilFuncSeparate, glStencilFuncSeparate, NULL, 511), + NAME_FUNC_OFFSET( 7541, glStencilMaskSeparate, glStencilMaskSeparate, NULL, 512), + NAME_FUNC_OFFSET( 7563, glStencilOpSeparate, glStencilOpSeparate, NULL, 513), + NAME_FUNC_OFFSET( 7583, glUniform1f, glUniform1f, NULL, 514), + NAME_FUNC_OFFSET( 7595, glUniform1fv, glUniform1fv, NULL, 515), + NAME_FUNC_OFFSET( 7608, glUniform1i, glUniform1i, NULL, 516), + NAME_FUNC_OFFSET( 7620, glUniform1iv, glUniform1iv, NULL, 517), + NAME_FUNC_OFFSET( 7633, glUniform2f, glUniform2f, NULL, 518), + NAME_FUNC_OFFSET( 7645, glUniform2fv, glUniform2fv, NULL, 519), + NAME_FUNC_OFFSET( 7658, glUniform2i, glUniform2i, NULL, 520), + NAME_FUNC_OFFSET( 7670, glUniform2iv, glUniform2iv, NULL, 521), + NAME_FUNC_OFFSET( 7683, glUniform3f, glUniform3f, NULL, 522), + NAME_FUNC_OFFSET( 7695, glUniform3fv, glUniform3fv, NULL, 523), + NAME_FUNC_OFFSET( 7708, glUniform3i, glUniform3i, NULL, 524), + NAME_FUNC_OFFSET( 7720, glUniform3iv, glUniform3iv, NULL, 525), + NAME_FUNC_OFFSET( 7733, glUniform4f, glUniform4f, NULL, 526), + NAME_FUNC_OFFSET( 7745, glUniform4fv, glUniform4fv, NULL, 527), + NAME_FUNC_OFFSET( 7758, glUniform4i, glUniform4i, NULL, 528), + NAME_FUNC_OFFSET( 7770, glUniform4iv, glUniform4iv, NULL, 529), + NAME_FUNC_OFFSET( 7783, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530), + NAME_FUNC_OFFSET( 7802, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531), + NAME_FUNC_OFFSET( 7821, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532), + NAME_FUNC_OFFSET( 7840, glUseProgram, glUseProgram, NULL, 533), + NAME_FUNC_OFFSET( 7853, glValidateProgram, glValidateProgram, NULL, 534), + NAME_FUNC_OFFSET( 7871, glVertexAttrib1d, glVertexAttrib1d, NULL, 535), + NAME_FUNC_OFFSET( 7888, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536), + NAME_FUNC_OFFSET( 7906, glVertexAttrib1s, glVertexAttrib1s, NULL, 537), + NAME_FUNC_OFFSET( 7923, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538), + NAME_FUNC_OFFSET( 7941, glVertexAttrib2d, glVertexAttrib2d, NULL, 539), + NAME_FUNC_OFFSET( 7958, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540), + NAME_FUNC_OFFSET( 7976, glVertexAttrib2s, glVertexAttrib2s, NULL, 541), + NAME_FUNC_OFFSET( 7993, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542), + NAME_FUNC_OFFSET( 8011, glVertexAttrib3d, glVertexAttrib3d, NULL, 543), + NAME_FUNC_OFFSET( 8028, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544), + NAME_FUNC_OFFSET( 8046, glVertexAttrib3s, glVertexAttrib3s, NULL, 545), + NAME_FUNC_OFFSET( 8063, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546), + NAME_FUNC_OFFSET( 8081, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547), + NAME_FUNC_OFFSET( 8100, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548), + NAME_FUNC_OFFSET( 8119, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549), + NAME_FUNC_OFFSET( 8138, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550), + NAME_FUNC_OFFSET( 8157, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551), + NAME_FUNC_OFFSET( 8177, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552), + NAME_FUNC_OFFSET( 8197, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553), + NAME_FUNC_OFFSET( 8217, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554), + NAME_FUNC_OFFSET( 8235, glVertexAttrib4d, glVertexAttrib4d, NULL, 555), + NAME_FUNC_OFFSET( 8252, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556), + NAME_FUNC_OFFSET( 8270, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557), + NAME_FUNC_OFFSET( 8288, glVertexAttrib4s, glVertexAttrib4s, NULL, 558), + NAME_FUNC_OFFSET( 8305, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559), + NAME_FUNC_OFFSET( 8323, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560), + NAME_FUNC_OFFSET( 8342, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561), + NAME_FUNC_OFFSET( 8361, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562), + NAME_FUNC_OFFSET( 8380, glVertexAttribPointer, glVertexAttribPointer, NULL, 563), + NAME_FUNC_OFFSET( 8402, glUniformMatrix2x3fv, glUniformMatrix2x3fv, NULL, 564), + NAME_FUNC_OFFSET( 8423, glUniformMatrix2x4fv, glUniformMatrix2x4fv, NULL, 565), + NAME_FUNC_OFFSET( 8444, glUniformMatrix3x2fv, glUniformMatrix3x2fv, NULL, 566), + NAME_FUNC_OFFSET( 8465, glUniformMatrix3x4fv, glUniformMatrix3x4fv, NULL, 567), + NAME_FUNC_OFFSET( 8486, glUniformMatrix4x2fv, glUniformMatrix4x2fv, NULL, 568), + NAME_FUNC_OFFSET( 8507, glUniformMatrix4x3fv, glUniformMatrix4x3fv, NULL, 569), + NAME_FUNC_OFFSET( 8528, glBeginConditionalRender, glBeginConditionalRender, NULL, 570), + NAME_FUNC_OFFSET( 8553, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571), + NAME_FUNC_OFFSET( 8578, glBindBufferBase, glBindBufferBase, NULL, 572), + NAME_FUNC_OFFSET( 8595, glBindBufferRange, glBindBufferRange, NULL, 573), + NAME_FUNC_OFFSET( 8613, glBindFragDataLocation, glBindFragDataLocation, NULL, 574), + NAME_FUNC_OFFSET( 8636, glClampColor, glClampColor, NULL, 575), + NAME_FUNC_OFFSET( 8649, glClearBufferfi, glClearBufferfi, NULL, 576), + NAME_FUNC_OFFSET( 8665, glClearBufferfv, glClearBufferfv, NULL, 577), + NAME_FUNC_OFFSET( 8681, glClearBufferiv, glClearBufferiv, NULL, 578), + NAME_FUNC_OFFSET( 8697, glClearBufferuiv, glClearBufferuiv, NULL, 579), + NAME_FUNC_OFFSET( 8714, glColorMaski, glColorMaski, NULL, 580), + NAME_FUNC_OFFSET( 8727, glDisablei, glDisablei, NULL, 581), + NAME_FUNC_OFFSET( 8738, glEnablei, glEnablei, NULL, 582), + NAME_FUNC_OFFSET( 8748, glEndConditionalRender, glEndConditionalRender, NULL, 583), + NAME_FUNC_OFFSET( 8771, glEndTransformFeedback, glEndTransformFeedback, NULL, 584), + NAME_FUNC_OFFSET( 8794, glGetBooleani_v, glGetBooleani_v, NULL, 585), + NAME_FUNC_OFFSET( 8810, glGetFragDataLocation, glGetFragDataLocation, NULL, 586), + NAME_FUNC_OFFSET( 8832, glGetIntegeri_v, glGetIntegeri_v, NULL, 587), + NAME_FUNC_OFFSET( 8848, glGetStringi, glGetStringi, NULL, 588), + NAME_FUNC_OFFSET( 8861, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589), + NAME_FUNC_OFFSET( 8882, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590), + NAME_FUNC_OFFSET( 8904, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591), + NAME_FUNC_OFFSET( 8934, glGetUniformuiv, glGetUniformuiv, NULL, 592), + NAME_FUNC_OFFSET( 8950, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593), + NAME_FUNC_OFFSET( 8971, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594), + NAME_FUNC_OFFSET( 8993, glIsEnabledi, glIsEnabledi, NULL, 595), + NAME_FUNC_OFFSET( 9006, glTexParameterIiv, glTexParameterIiv, NULL, 596), + NAME_FUNC_OFFSET( 9024, glTexParameterIuiv, glTexParameterIuiv, NULL, 597), + NAME_FUNC_OFFSET( 9043, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598), + NAME_FUNC_OFFSET( 9071, glUniform1ui, glUniform1ui, NULL, 599), + NAME_FUNC_OFFSET( 9084, glUniform1uiv, glUniform1uiv, NULL, 600), + NAME_FUNC_OFFSET( 9098, glUniform2ui, glUniform2ui, NULL, 601), + NAME_FUNC_OFFSET( 9111, glUniform2uiv, glUniform2uiv, NULL, 602), + NAME_FUNC_OFFSET( 9125, glUniform3ui, glUniform3ui, NULL, 603), + NAME_FUNC_OFFSET( 9138, glUniform3uiv, glUniform3uiv, NULL, 604), + NAME_FUNC_OFFSET( 9152, glUniform4ui, glUniform4ui, NULL, 605), + NAME_FUNC_OFFSET( 9165, glUniform4uiv, glUniform4uiv, NULL, 606), + NAME_FUNC_OFFSET( 9179, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607), + NAME_FUNC_OFFSET( 9198, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608), + NAME_FUNC_OFFSET( 9218, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609), + NAME_FUNC_OFFSET( 9237, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610), + NAME_FUNC_OFFSET( 9256, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611), + NAME_FUNC_OFFSET( 9276, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612), + NAME_FUNC_OFFSET( 9296, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613), + NAME_FUNC_OFFSET( 9319, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614), + NAME_FUNC_OFFSET( 9343, glTexBuffer, glTexBuffer, NULL, 615), + NAME_FUNC_OFFSET( 9355, glFramebufferTexture, glFramebufferTexture, NULL, 616), + NAME_FUNC_OFFSET( 9376, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 617), + NAME_FUNC_OFFSET( 9401, glGetInteger64i_v, glGetInteger64i_v, NULL, 618), + NAME_FUNC_OFFSET( 9419, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619), + NAME_FUNC_OFFSET( 9441, glMinSampleShading, glMinSampleShading, NULL, 620), + NAME_FUNC_OFFSET( 9460, glBindProgramARB, glBindProgramARB, NULL, 621), + NAME_FUNC_OFFSET( 9477, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622), + NAME_FUNC_OFFSET( 9497, glGenProgramsARB, glGenProgramsARB, NULL, 623), + NAME_FUNC_OFFSET( 9514, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 624), + NAME_FUNC_OFFSET( 9544, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 625), + NAME_FUNC_OFFSET( 9574, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 626), + NAME_FUNC_OFFSET( 9606, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 627), + NAME_FUNC_OFFSET( 9638, glGetProgramStringARB, glGetProgramStringARB, NULL, 628), + NAME_FUNC_OFFSET( 9660, glGetProgramivARB, glGetProgramivARB, NULL, 629), + NAME_FUNC_OFFSET( 9678, glIsProgramARB, glIsProgramARB, NULL, 630), + NAME_FUNC_OFFSET( 9693, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631), + NAME_FUNC_OFFSET( 9720, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632), + NAME_FUNC_OFFSET( 9748, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633), + NAME_FUNC_OFFSET( 9775, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634), + NAME_FUNC_OFFSET( 9803, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 635), + NAME_FUNC_OFFSET( 9832, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 636), + NAME_FUNC_OFFSET( 9862, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 637), + NAME_FUNC_OFFSET( 9891, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 638), + NAME_FUNC_OFFSET( 9921, glProgramStringARB, glProgramStringARB, NULL, 639), + NAME_FUNC_OFFSET( 9940, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640), + NAME_FUNC_OFFSET( 9960, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641), + NAME_FUNC_OFFSET( 9981, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642), + NAME_FUNC_OFFSET(10001, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643), + NAME_FUNC_OFFSET(10022, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644), + NAME_FUNC_OFFSET(10042, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645), + NAME_FUNC_OFFSET(10063, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646), + NAME_FUNC_OFFSET(10083, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647), + NAME_FUNC_OFFSET(10104, glAttachObjectARB, glAttachObjectARB, NULL, 648), + NAME_FUNC_OFFSET(10122, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 649), + NAME_FUNC_OFFSET(10147, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 650), + NAME_FUNC_OFFSET(10171, glDeleteObjectARB, glDeleteObjectARB, NULL, 651), + NAME_FUNC_OFFSET(10189, glDetachObjectARB, glDetachObjectARB, NULL, 652), + NAME_FUNC_OFFSET(10207, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 653), + NAME_FUNC_OFFSET(10231, glGetHandleARB, glGetHandleARB, NULL, 654), + NAME_FUNC_OFFSET(10246, glGetInfoLogARB, glGetInfoLogARB, NULL, 655), + NAME_FUNC_OFFSET(10262, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 656), + NAME_FUNC_OFFSET(10288, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 657), + NAME_FUNC_OFFSET(10314, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658), + NAME_FUNC_OFFSET(10339, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659), + NAME_FUNC_OFFSET(10366, glBindFramebuffer, glBindFramebuffer, NULL, 660), + NAME_FUNC_OFFSET(10384, glBindRenderbuffer, glBindRenderbuffer, NULL, 661), + NAME_FUNC_OFFSET(10403, glBlitFramebuffer, glBlitFramebuffer, NULL, 662), + NAME_FUNC_OFFSET(10421, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663), + NAME_FUNC_OFFSET(10446, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664), + NAME_FUNC_OFFSET(10467, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665), + NAME_FUNC_OFFSET(10489, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666), + NAME_FUNC_OFFSET(10515, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667), + NAME_FUNC_OFFSET(10538, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668), + NAME_FUNC_OFFSET(10561, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669), + NAME_FUNC_OFFSET(10584, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670), + NAME_FUNC_OFFSET(10610, glGenFramebuffers, glGenFramebuffers, NULL, 671), + NAME_FUNC_OFFSET(10628, glGenRenderbuffers, glGenRenderbuffers, NULL, 672), + NAME_FUNC_OFFSET(10647, glGenerateMipmap, glGenerateMipmap, NULL, 673), + NAME_FUNC_OFFSET(10664, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674), + NAME_FUNC_OFFSET(10702, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675), + NAME_FUNC_OFFSET(10731, glIsFramebuffer, glIsFramebuffer, NULL, 676), + NAME_FUNC_OFFSET(10747, glIsRenderbuffer, glIsRenderbuffer, NULL, 677), + NAME_FUNC_OFFSET(10764, glRenderbufferStorage, glRenderbufferStorage, NULL, 678), + NAME_FUNC_OFFSET(10786, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679), + NAME_FUNC_OFFSET(10819, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 680), + NAME_FUNC_OFFSET(10847, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681), + NAME_FUNC_OFFSET(10872, glMapBufferRange, glMapBufferRange, NULL, 682), + NAME_FUNC_OFFSET(10889, glBindVertexArray, glBindVertexArray, NULL, 683), + NAME_FUNC_OFFSET(10907, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684), + NAME_FUNC_OFFSET(10928, glGenVertexArrays, glGenVertexArrays, NULL, 685), + NAME_FUNC_OFFSET(10946, glIsVertexArray, glIsVertexArray, NULL, 686), + NAME_FUNC_OFFSET(10962, glGetActiveUniformBlockName, glGetActiveUniformBlockName, NULL, 687), + NAME_FUNC_OFFSET(10990, glGetActiveUniformBlockiv, glGetActiveUniformBlockiv, NULL, 688), + NAME_FUNC_OFFSET(11016, glGetActiveUniformName, glGetActiveUniformName, NULL, 689), + NAME_FUNC_OFFSET(11039, glGetActiveUniformsiv, glGetActiveUniformsiv, NULL, 690), + NAME_FUNC_OFFSET(11061, glGetUniformBlockIndex, glGetUniformBlockIndex, NULL, 691), + NAME_FUNC_OFFSET(11084, glGetUniformIndices, glGetUniformIndices, NULL, 692), + NAME_FUNC_OFFSET(11104, glUniformBlockBinding, glUniformBlockBinding, NULL, 693), + NAME_FUNC_OFFSET(11126, glCopyBufferSubData, glCopyBufferSubData, NULL, 694), + NAME_FUNC_OFFSET(11146, glClientWaitSync, glClientWaitSync, NULL, 695), + NAME_FUNC_OFFSET(11163, glDeleteSync, glDeleteSync, NULL, 696), + NAME_FUNC_OFFSET(11176, glFenceSync, glFenceSync, NULL, 697), + NAME_FUNC_OFFSET(11188, glGetInteger64v, glGetInteger64v, NULL, 698), + NAME_FUNC_OFFSET(11204, glGetSynciv, glGetSynciv, NULL, 699), + NAME_FUNC_OFFSET(11216, glIsSync, glIsSync, NULL, 700), + NAME_FUNC_OFFSET(11225, glWaitSync, glWaitSync, NULL, 701), + NAME_FUNC_OFFSET(11236, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 702), + NAME_FUNC_OFFSET(11261, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 703), + NAME_FUNC_OFFSET(11295, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 704), + NAME_FUNC_OFFSET(11325, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 705), + NAME_FUNC_OFFSET(11355, glProvokingVertex, glProvokingVertex, NULL, 706), + NAME_FUNC_OFFSET(11373, glGetMultisamplefv, glGetMultisamplefv, NULL, 707), + NAME_FUNC_OFFSET(11392, glSampleMaski, glSampleMaski, NULL, 708), + NAME_FUNC_OFFSET(11406, glTexImage2DMultisample, glTexImage2DMultisample, NULL, 709), + NAME_FUNC_OFFSET(11430, glTexImage3DMultisample, glTexImage3DMultisample, NULL, 710), + NAME_FUNC_OFFSET(11454, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711), + NAME_FUNC_OFFSET(11482, glBlendEquationiARB, glBlendEquationiARB, NULL, 712), + NAME_FUNC_OFFSET(11502, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713), + NAME_FUNC_OFFSET(11526, glBlendFunciARB, glBlendFunciARB, NULL, 714), + NAME_FUNC_OFFSET(11542, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 715), + NAME_FUNC_OFFSET(11572, glGetFragDataIndex, glGetFragDataIndex, NULL, 716), + NAME_FUNC_OFFSET(11591, glBindSampler, glBindSampler, NULL, 717), + NAME_FUNC_OFFSET(11605, glDeleteSamplers, glDeleteSamplers, NULL, 718), + NAME_FUNC_OFFSET(11622, glGenSamplers, glGenSamplers, NULL, 719), + NAME_FUNC_OFFSET(11636, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 720), + NAME_FUNC_OFFSET(11661, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 721), + NAME_FUNC_OFFSET(11687, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 722), + NAME_FUNC_OFFSET(11711, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 723), + NAME_FUNC_OFFSET(11735, glIsSampler, glIsSampler, NULL, 724), + NAME_FUNC_OFFSET(11747, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 725), + NAME_FUNC_OFFSET(11769, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 726), + NAME_FUNC_OFFSET(11792, glSamplerParameterf, glSamplerParameterf, NULL, 727), + NAME_FUNC_OFFSET(11812, glSamplerParameterfv, glSamplerParameterfv, NULL, 728), + NAME_FUNC_OFFSET(11833, glSamplerParameteri, glSamplerParameteri, NULL, 729), + NAME_FUNC_OFFSET(11853, glSamplerParameteriv, glSamplerParameteriv, NULL, 730), + NAME_FUNC_OFFSET(11874, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731), + NAME_FUNC_OFFSET(11895, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732), + NAME_FUNC_OFFSET(11917, gl_dispatch_stub_733, gl_dispatch_stub_733, NULL, 733), + NAME_FUNC_OFFSET(11932, glColorP3ui, glColorP3ui, NULL, 734), + NAME_FUNC_OFFSET(11944, glColorP3uiv, glColorP3uiv, NULL, 735), + NAME_FUNC_OFFSET(11957, glColorP4ui, glColorP4ui, NULL, 736), + NAME_FUNC_OFFSET(11969, glColorP4uiv, glColorP4uiv, NULL, 737), + NAME_FUNC_OFFSET(11982, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 738), + NAME_FUNC_OFFSET(12002, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 739), + NAME_FUNC_OFFSET(12023, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 740), + NAME_FUNC_OFFSET(12043, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 741), + NAME_FUNC_OFFSET(12064, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 742), + NAME_FUNC_OFFSET(12084, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 743), + NAME_FUNC_OFFSET(12105, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 744), + NAME_FUNC_OFFSET(12125, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 745), + NAME_FUNC_OFFSET(12146, glNormalP3ui, glNormalP3ui, NULL, 746), + NAME_FUNC_OFFSET(12159, glNormalP3uiv, glNormalP3uiv, NULL, 747), + NAME_FUNC_OFFSET(12173, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 748), + NAME_FUNC_OFFSET(12194, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 749), + NAME_FUNC_OFFSET(12216, glTexCoordP1ui, glTexCoordP1ui, NULL, 750), + NAME_FUNC_OFFSET(12231, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 751), + NAME_FUNC_OFFSET(12247, glTexCoordP2ui, glTexCoordP2ui, NULL, 752), + NAME_FUNC_OFFSET(12262, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 753), + NAME_FUNC_OFFSET(12278, glTexCoordP3ui, glTexCoordP3ui, NULL, 754), + NAME_FUNC_OFFSET(12293, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 755), + NAME_FUNC_OFFSET(12309, glTexCoordP4ui, glTexCoordP4ui, NULL, 756), + NAME_FUNC_OFFSET(12324, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 757), + NAME_FUNC_OFFSET(12340, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 758), + NAME_FUNC_OFFSET(12359, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 759), + NAME_FUNC_OFFSET(12379, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 760), + NAME_FUNC_OFFSET(12398, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 761), + NAME_FUNC_OFFSET(12418, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 762), + NAME_FUNC_OFFSET(12437, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 763), + NAME_FUNC_OFFSET(12457, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 764), + NAME_FUNC_OFFSET(12476, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 765), + NAME_FUNC_OFFSET(12496, glVertexP2ui, glVertexP2ui, NULL, 766), + NAME_FUNC_OFFSET(12509, glVertexP2uiv, glVertexP2uiv, NULL, 767), + NAME_FUNC_OFFSET(12523, glVertexP3ui, glVertexP3ui, NULL, 768), + NAME_FUNC_OFFSET(12536, glVertexP3uiv, glVertexP3uiv, NULL, 769), + NAME_FUNC_OFFSET(12550, glVertexP4ui, glVertexP4ui, NULL, 770), + NAME_FUNC_OFFSET(12563, glVertexP4uiv, glVertexP4uiv, NULL, 771), + NAME_FUNC_OFFSET(12577, glDrawArraysIndirect, glDrawArraysIndirect, NULL, 772), + NAME_FUNC_OFFSET(12598, glDrawElementsIndirect, glDrawElementsIndirect, NULL, 773), + NAME_FUNC_OFFSET(12621, glBindTransformFeedback, glBindTransformFeedback, NULL, 774), + NAME_FUNC_OFFSET(12645, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 775), + NAME_FUNC_OFFSET(12672, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 776), + NAME_FUNC_OFFSET(12696, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 777), + NAME_FUNC_OFFSET(12720, glIsTransformFeedback, glIsTransformFeedback, NULL, 778), + NAME_FUNC_OFFSET(12742, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 779), + NAME_FUNC_OFFSET(12767, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 780), + NAME_FUNC_OFFSET(12793, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 781), + NAME_FUNC_OFFSET(12813, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 782), + NAME_FUNC_OFFSET(12843, glEndQueryIndexed, glEndQueryIndexed, NULL, 783), + NAME_FUNC_OFFSET(12861, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 784), + NAME_FUNC_OFFSET(12881, glClearDepthf, glClearDepthf, NULL, 785), + NAME_FUNC_OFFSET(12895, glDepthRangef, glDepthRangef, NULL, 786), + NAME_FUNC_OFFSET(12909, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 787), + NAME_FUNC_OFFSET(12936, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 788), + NAME_FUNC_OFFSET(12960, glShaderBinary, glShaderBinary, NULL, 789), + NAME_FUNC_OFFSET(12975, glGetProgramBinary, glGetProgramBinary, NULL, 790), + NAME_FUNC_OFFSET(12994, glProgramBinary, glProgramBinary, NULL, 791), + NAME_FUNC_OFFSET(13010, glProgramParameteri, glProgramParameteri, NULL, 792), + NAME_FUNC_OFFSET(13030, glDepthRangeArrayv, glDepthRangeArrayv, NULL, 793), + NAME_FUNC_OFFSET(13049, glDepthRangeIndexed, glDepthRangeIndexed, NULL, 794), + NAME_FUNC_OFFSET(13069, glGetDoublei_v, glGetDoublei_v, NULL, 795), + NAME_FUNC_OFFSET(13084, glGetFloati_v, glGetFloati_v, NULL, 796), + NAME_FUNC_OFFSET(13098, glScissorArrayv, glScissorArrayv, NULL, 797), + NAME_FUNC_OFFSET(13114, glScissorIndexed, glScissorIndexed, NULL, 798), + NAME_FUNC_OFFSET(13131, glScissorIndexedv, glScissorIndexedv, NULL, 799), + NAME_FUNC_OFFSET(13149, glViewportArrayv, glViewportArrayv, NULL, 800), + NAME_FUNC_OFFSET(13166, glViewportIndexedf, glViewportIndexedf, NULL, 801), + NAME_FUNC_OFFSET(13185, glViewportIndexedfv, glViewportIndexedfv, NULL, 802), + NAME_FUNC_OFFSET(13205, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 803), + NAME_FUNC_OFFSET(13233, glGetnColorTableARB, glGetnColorTableARB, NULL, 804), + NAME_FUNC_OFFSET(13253, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 805), + NAME_FUNC_OFFSET(13281, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 806), + NAME_FUNC_OFFSET(13308, glGetnHistogramARB, glGetnHistogramARB, NULL, 807), + NAME_FUNC_OFFSET(13327, glGetnMapdvARB, glGetnMapdvARB, NULL, 808), + NAME_FUNC_OFFSET(13342, glGetnMapfvARB, glGetnMapfvARB, NULL, 809), + NAME_FUNC_OFFSET(13357, glGetnMapivARB, glGetnMapivARB, NULL, 810), + NAME_FUNC_OFFSET(13372, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 811), + NAME_FUNC_OFFSET(13388, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 812), + NAME_FUNC_OFFSET(13408, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 813), + NAME_FUNC_OFFSET(13429, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 814), + NAME_FUNC_OFFSET(13450, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 815), + NAME_FUNC_OFFSET(13474, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 816), + NAME_FUNC_OFFSET(13499, glGetnTexImageARB, glGetnTexImageARB, NULL, 817), + NAME_FUNC_OFFSET(13517, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 818), + NAME_FUNC_OFFSET(13536, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 819), + NAME_FUNC_OFFSET(13555, glGetnUniformivARB, glGetnUniformivARB, NULL, 820), + NAME_FUNC_OFFSET(13574, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 821), + NAME_FUNC_OFFSET(13594, glReadnPixelsARB, glReadnPixelsARB, NULL, 822), + NAME_FUNC_OFFSET(13611, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 823), + NAME_FUNC_OFFSET(13645, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 824), + NAME_FUNC_OFFSET(13681, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 825), + NAME_FUNC_OFFSET(13727, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 826), + NAME_FUNC_OFFSET(13760, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 827), + NAME_FUNC_OFFSET(13799, gl_dispatch_stub_828, gl_dispatch_stub_828, NULL, 828), + NAME_FUNC_OFFSET(13821, glGetActiveAtomicCounterBufferiv, glGetActiveAtomicCounterBufferiv, NULL, 829), + NAME_FUNC_OFFSET(13854, glBindImageTexture, glBindImageTexture, NULL, 830), + NAME_FUNC_OFFSET(13873, glMemoryBarrier, glMemoryBarrier, NULL, 831), + NAME_FUNC_OFFSET(13889, glTexStorage1D, glTexStorage1D, NULL, 832), + NAME_FUNC_OFFSET(13904, glTexStorage2D, glTexStorage2D, NULL, 833), + NAME_FUNC_OFFSET(13919, glTexStorage3D, glTexStorage3D, NULL, 834), + NAME_FUNC_OFFSET(13934, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 835), + NAME_FUNC_OFFSET(13956, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 836), + NAME_FUNC_OFFSET(13978, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 837), + NAME_FUNC_OFFSET(14000, glClearBufferData, glClearBufferData, NULL, 838), + NAME_FUNC_OFFSET(14018, glClearBufferSubData, glClearBufferSubData, NULL, 839), + NAME_FUNC_OFFSET(14039, glDispatchCompute, glDispatchCompute, NULL, 840), + NAME_FUNC_OFFSET(14057, glDispatchComputeIndirect, glDispatchComputeIndirect, NULL, 841), + NAME_FUNC_OFFSET(14083, glCopyImageSubData, glCopyImageSubData, NULL, 842), + NAME_FUNC_OFFSET(14102, glTextureView, glTextureView, NULL, 843), + NAME_FUNC_OFFSET(14116, glBindVertexBuffer, glBindVertexBuffer, NULL, 844), + NAME_FUNC_OFFSET(14135, glVertexAttribBinding, glVertexAttribBinding, NULL, 845), + NAME_FUNC_OFFSET(14157, glVertexAttribFormat, glVertexAttribFormat, NULL, 846), + NAME_FUNC_OFFSET(14178, glVertexAttribIFormat, glVertexAttribIFormat, NULL, 847), + NAME_FUNC_OFFSET(14200, glVertexAttribLFormat, glVertexAttribLFormat, NULL, 848), + NAME_FUNC_OFFSET(14222, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 849), + NAME_FUNC_OFFSET(14245, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 850), + NAME_FUNC_OFFSET(14271, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 851), + NAME_FUNC_OFFSET(14299, glTexBufferRange, glTexBufferRange, NULL, 852), + NAME_FUNC_OFFSET(14316, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 853), + NAME_FUNC_OFFSET(14342, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 854), + NAME_FUNC_OFFSET(14368, glBufferStorage, glBufferStorage, NULL, 855), + NAME_FUNC_OFFSET(14384, glClearTexImage, glClearTexImage, NULL, 856), + NAME_FUNC_OFFSET(14400, glClearTexSubImage, glClearTexSubImage, NULL, 857), + NAME_FUNC_OFFSET(14419, glBindBuffersBase, glBindBuffersBase, NULL, 858), + NAME_FUNC_OFFSET(14437, glBindBuffersRange, glBindBuffersRange, NULL, 859), + NAME_FUNC_OFFSET(14456, glBindImageTextures, glBindImageTextures, NULL, 860), + 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) +}; + +#undef NAME_FUNC_OFFSET diff --cc xorg-server/glx/remap_helper.h index 52ff12f,0000000..fdbb66d mode 100644,000000..100644 --- a/xorg-server/glx/remap_helper.h +++ b/xorg-server/glx/remap_helper.h @@@ -1,6943 -1,0 +1,6948 @@@ +/* DO NOT EDIT - This file generated automatically by remap_helper.py (from Mesa) script */ + +/* + * Copyright (C) 2009 Chia-I Wu <olv(a)0xlab.org> + * 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, sub license, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * Chia-I Wu, + * AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF + * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "dispatch.h" +#include "remap.h" + +/* this is internal to remap.c */ +#ifndef need_MESA_remap_table +#error Only remap.c should include this file! +#endif /* need_MESA_remap_table */ + + +static const char _mesa_function_pool[] = + /* _mesa_function_pool[0]: MapGrid1d (offset 224) */ + "idd\0" + "glMapGrid1d\0" + "\0" + /* _mesa_function_pool[17]: MapGrid1f (offset 225) */ + "iff\0" + "glMapGrid1f\0" + "\0" + /* _mesa_function_pool[34]: ReplacementCodeuiVertex3fvSUN (dynamic) */ + "pp\0" + "glReplacementCodeuiVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[70]: PolygonOffsetx (will be remapped) */ + "ii\0" + "glPolygonOffsetxOES\0" + "glPolygonOffsetx\0" + "\0" + /* _mesa_function_pool[111]: FramebufferTexture (will be remapped) */ + "iiii\0" + "glFramebufferTextureARB\0" + "glFramebufferTexture\0" + "\0" + /* _mesa_function_pool[162]: TexCoordP1ui (will be remapped) */ + "ii\0" + "glTexCoordP1ui\0" + "\0" + /* _mesa_function_pool[181]: PolygonStipple (offset 175) */ + "p\0" + "glPolygonStipple\0" + "\0" + /* _mesa_function_pool[201]: ListParameterfSGIX (dynamic) */ + "iif\0" + "glListParameterfSGIX\0" + "\0" + /* _mesa_function_pool[227]: MultiTexCoord1dv (offset 377) */ + "ip\0" + "glMultiTexCoord1dv\0" + "glMultiTexCoord1dvARB\0" + "\0" + /* _mesa_function_pool[272]: IsEnabled (offset 286) */ + "i\0" + "glIsEnabled\0" + "\0" + /* _mesa_function_pool[287]: GetTexFilterFuncSGIS (dynamic) */ + "iip\0" + "glGetTexFilterFuncSGIS\0" + "\0" + /* _mesa_function_pool[315]: AttachShader (will be remapped) */ + "ii\0" + "glAttachShader\0" + "\0" + /* _mesa_function_pool[334]: VertexAttrib3fARB (will be remapped) */ + "ifff\0" + "glVertexAttrib3f\0" + "glVertexAttrib3fARB\0" + "\0" + /* _mesa_function_pool[377]: Indexubv (offset 316) */ + "p\0" + "glIndexubv\0" + "\0" + /* _mesa_function_pool[391]: MultiTexCoordP3uiv (will be remapped) */ + "iip\0" + "glMultiTexCoordP3uiv\0" + "\0" + /* _mesa_function_pool[417]: Color4fNormal3fVertex3fSUN (dynamic) */ + "ffffffffff\0" + "glColor4fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[458]: Color3ubv (offset 20) */ + "p\0" + "glColor3ubv\0" + "\0" + /* _mesa_function_pool[473]: GetCombinerOutputParameterfvNV (dynamic) */ + "iiip\0" + "glGetCombinerOutputParameterfvNV\0" + "\0" + /* _mesa_function_pool[512]: Binormal3ivEXT (dynamic) */ + "p\0" + "glBinormal3ivEXT\0" + "\0" + /* _mesa_function_pool[532]: GetImageTransformParameterfvHP (dynamic) */ + "iip\0" + "glGetImageTransformParameterfvHP\0" + "\0" + /* _mesa_function_pool[570]: GetClipPlanex (will be remapped) */ + "ip\0" + "glGetClipPlanexOES\0" + "glGetClipPlanex\0" + "\0" + /* _mesa_function_pool[609]: TexCoordP1uiv (will be remapped) */ + "ip\0" + "glTexCoordP1uiv\0" + "\0" + /* _mesa_function_pool[629]: RenderbufferStorage (will be remapped) */ + "iiii\0" + "glRenderbufferStorage\0" + "glRenderbufferStorageEXT\0" + "glRenderbufferStorageOES\0" + "\0" + /* _mesa_function_pool[707]: GetClipPlanef (will be remapped) */ + "ip\0" + "glGetClipPlanefOES\0" + "glGetClipPlanef\0" + "\0" + /* _mesa_function_pool[746]: GetPerfQueryDataINTEL (will be remapped) */ + "iiipp\0" + "glGetPerfQueryDataINTEL\0" + "\0" + /* _mesa_function_pool[777]: DrawArraysIndirect (will be remapped) */ + "ip\0" + "glDrawArraysIndirect\0" + "\0" + /* _mesa_function_pool[802]: Uniform3i (will be remapped) */ + "iiii\0" + "glUniform3i\0" + "glUniform3iARB\0" + "\0" + /* _mesa_function_pool[835]: VDPAUGetSurfaceivNV (will be remapped) */ + "iiipp\0" + "glVDPAUGetSurfaceivNV\0" + "\0" + /* _mesa_function_pool[864]: ReadInstrumentsSGIX (dynamic) */ + "i\0" + "glReadInstrumentsSGIX\0" + "\0" + /* _mesa_function_pool[889]: Uniform3f (will be remapped) */ + "ifff\0" + "glUniform3f\0" + "glUniform3fARB\0" + "\0" + /* _mesa_function_pool[922]: UniformMatrix2x4fv (will be remapped) */ + "iiip\0" + "glUniformMatrix2x4fv\0" + "\0" + /* _mesa_function_pool[949]: QueryMatrixxOES (will be remapped) */ + "pp\0" + "glQueryMatrixxOES\0" + "\0" + /* _mesa_function_pool[971]: Normal3iv (offset 59) */ + "p\0" + "glNormal3iv\0" + "\0" + /* _mesa_function_pool[986]: DrawTexiOES (will be remapped) */ + "iiiii\0" + "glDrawTexiOES\0" + "\0" + /* _mesa_function_pool[1007]: Viewport (offset 305) */ + "iiii\0" + "glViewport\0" + "\0" + /* _mesa_function_pool[1024]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */ + "pppp\0" + "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[1080]: WindowPos4svMESA (will be remapped) */ + "p\0" + "glWindowPos4svMESA\0" + "\0" + /* _mesa_function_pool[1102]: FragmentLightModelivSGIX (dynamic) */ + "ip\0" + "glFragmentLightModelivSGIX\0" + "\0" + /* _mesa_function_pool[1133]: DeleteVertexArrays (will be remapped) */ + "ip\0" + "glDeleteVertexArrays\0" + "glDeleteVertexArraysAPPLE\0" + "glDeleteVertexArraysOES\0" + "\0" + /* _mesa_function_pool[1208]: ClearColorIuiEXT (will be remapped) */ + "iiii\0" + "glClearColorIuiEXT\0" + "\0" + /* _mesa_function_pool[1233]: GetnConvolutionFilterARB (will be remapped) */ + "iiiip\0" + "glGetnConvolutionFilterARB\0" + "\0" + /* _mesa_function_pool[1267]: GetLightxv (will be remapped) */ + "iip\0" + "glGetLightxvOES\0" + "glGetLightxv\0" + "\0" + /* _mesa_function_pool[1301]: GetConvolutionParameteriv (offset 358) */ + "iip\0" + "glGetConvolutionParameteriv\0" + "glGetConvolutionParameterivEXT\0" + "\0" + /* _mesa_function_pool[1365]: VertexAttrib4usv (will be remapped) */ + "ip\0" + "glVertexAttrib4usv\0" + "glVertexAttrib4usvARB\0" + "\0" + /* _mesa_function_pool[1410]: TextureStorage1DEXT (will be remapped) */ + "iiiii\0" + "glTextureStorage1DEXT\0" + "\0" + /* _mesa_function_pool[1439]: VertexAttrib4Nub (will be remapped) */ + "iiiii\0" + "glVertexAttrib4Nub\0" + "glVertexAttrib4NubARB\0" + "\0" + /* _mesa_function_pool[1487]: VertexAttribP3ui (will be remapped) */ + "iiii\0" + "glVertexAttribP3ui\0" + "\0" + /* _mesa_function_pool[1512]: Color4ubVertex3fSUN (dynamic) */ + "iiiifff\0" + "glColor4ubVertex3fSUN\0" + "\0" + /* _mesa_function_pool[1543]: PointSize (offset 173) */ + "f\0" + "glPointSize\0" + "\0" + /* _mesa_function_pool[1558]: TexCoord2fVertex3fSUN (dynamic) */ + "fffff\0" + "glTexCoord2fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[1589]: PopName (offset 200) */ + "\0" + "glPopName\0" + "\0" + /* _mesa_function_pool[1601]: VertexAttrib4ubNV (will be remapped) */ + "iiiii\0" + "glVertexAttrib4ubNV\0" + "\0" + /* _mesa_function_pool[1628]: ValidateProgramPipeline (will be remapped) */ + "i\0" + "glValidateProgramPipeline\0" + "glValidateProgramPipelineEXT\0" + "\0" + /* _mesa_function_pool[1686]: BindFragDataLocationIndexed (will be remapped) */ + "iiip\0" + "glBindFragDataLocationIndexed\0" + "\0" + /* _mesa_function_pool[1722]: GetClipPlane (offset 259) */ + "ip\0" + "glGetClipPlane\0" + "\0" + /* _mesa_function_pool[1741]: CombinerParameterfvNV (dynamic) */ + "ip\0" + "glCombinerParameterfvNV\0" + "\0" + /* _mesa_function_pool[1769]: TexCoordP4uiv (will be remapped) */ + "ip\0" + "glTexCoordP4uiv\0" + "\0" + /* _mesa_function_pool[1789]: VertexAttribs3dvNV (will be remapped) */ + "iip\0" + "glVertexAttribs3dvNV\0" + "\0" + /* _mesa_function_pool[1815]: GenQueries (will be remapped) */ + "ip\0" + "glGenQueries\0" + "glGenQueriesARB\0" + "\0" + /* _mesa_function_pool[1848]: ProgramUniform4iv (will be remapped) */ + "iiip\0" + "glProgramUniform4iv\0" + "glProgramUniform4ivEXT\0" + "\0" + /* _mesa_function_pool[1897]: ObjectUnpurgeableAPPLE (will be remapped) */ + "iii\0" + "glObjectUnpurgeableAPPLE\0" + "\0" + /* _mesa_function_pool[1927]: TexCoord2iv (offset 107) */ + "p\0" + "glTexCoord2iv\0" + "\0" + /* _mesa_function_pool[1944]: TexImage2DMultisample (will be remapped) */ + "iiiiii\0" + "glTexImage2DMultisample\0" + "\0" + /* _mesa_function_pool[1976]: TexParameterx (will be remapped) */ + "iii\0" + "glTexParameterxOES\0" + "glTexParameterx\0" + "\0" + /* _mesa_function_pool[2016]: Rotatef (offset 300) */ + "ffff\0" + "glRotatef\0" + "\0" + /* _mesa_function_pool[2032]: TexParameterf (offset 178) */ + "iif\0" + "glTexParameterf\0" + "\0" + /* _mesa_function_pool[2053]: TexParameteri (offset 180) */ + "iii\0" + "glTexParameteri\0" + "\0" + /* _mesa_function_pool[2074]: GetUniformiv (will be remapped) */ + "iip\0" + "glGetUniformiv\0" + "glGetUniformivARB\0" + "\0" + /* _mesa_function_pool[2112]: ClearBufferSubData (will be remapped) */ + "iiiiiip\0" + "glClearBufferSubData\0" + "\0" + /* _mesa_function_pool[2142]: VDPAUFiniNV (will be remapped) */ + "\0" + "glVDPAUFiniNV\0" + "\0" + /* _mesa_function_pool[2158]: GlobalAlphaFactordSUN (dynamic) */ + "d\0" + "glGlobalAlphaFactordSUN\0" + "\0" + /* _mesa_function_pool[2185]: ProgramUniformMatrix4x2fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix4x2fv\0" + "glProgramUniformMatrix4x2fvEXT\0" + "\0" + /* _mesa_function_pool[2251]: ProgramUniform2f (will be remapped) */ + "iiff\0" + "glProgramUniform2f\0" + "glProgramUniform2fEXT\0" + "\0" + /* _mesa_function_pool[2298]: PixelTransformParameterfvEXT (dynamic) */ + "iip\0" + "glPixelTransformParameterfvEXT\0" + "\0" + /* _mesa_function_pool[2334]: ProgramUniform2i (will be remapped) */ + "iiii\0" + "glProgramUniform2i\0" + "glProgramUniform2iEXT\0" + "\0" + /* _mesa_function_pool[2381]: Fogx (will be remapped) */ + "ii\0" + "glFogxOES\0" + "glFogx\0" + "\0" + /* _mesa_function_pool[2402]: Fogf (offset 153) */ + "if\0" + "glFogf\0" + "\0" + /* _mesa_function_pool[2413]: TexSubImage1D (offset 332) */ + "iiiiiip\0" + "glTexSubImage1D\0" + "glTexSubImage1DEXT\0" + "\0" + /* _mesa_function_pool[2457]: Color4usv (offset 40) */ + "p\0" + "glColor4usv\0" + "\0" + /* _mesa_function_pool[2472]: Fogi (offset 155) */ + "ii\0" + "glFogi\0" + "\0" + /* _mesa_function_pool[2483]: FinalCombinerInputNV (dynamic) */ + "iiii\0" + "glFinalCombinerInputNV\0" + "\0" + /* _mesa_function_pool[2512]: DepthFunc (offset 245) */ + "i\0" + "glDepthFunc\0" + "\0" + /* _mesa_function_pool[2527]: GetSamplerParameterIiv (will be remapped) */ + "iip\0" + "glGetSamplerParameterIiv\0" + "\0" + /* _mesa_function_pool[2557]: VertexAttribI4uiEXT (will be remapped) */ + "iiiii\0" + "glVertexAttribI4uiEXT\0" + "glVertexAttribI4ui\0" + "\0" + /* _mesa_function_pool[2605]: DrawElementsInstancedBaseVertexBaseInstance (will be remapped) */ + "iiipiii\0" + "glDrawElementsInstancedBaseVertexBaseInstance\0" + "\0" + /* _mesa_function_pool[2660]: ProgramEnvParameter4dvARB (will be remapped) */ + "iip\0" + "glProgramEnvParameter4dvARB\0" + "glProgramParameter4dvNV\0" + "\0" + /* _mesa_function_pool[2717]: ColorTableParameteriv (offset 341) */ + "iip\0" + "glColorTableParameteriv\0" + "glColorTableParameterivSGI\0" + "\0" + /* _mesa_function_pool[2773]: BindSamplers (will be remapped) */ + "iip\0" + "glBindSamplers\0" + "\0" + /* _mesa_function_pool[2793]: GetnCompressedTexImageARB (will be remapped) */ + "iiip\0" + "glGetnCompressedTexImageARB\0" + "\0" + /* _mesa_function_pool[2827]: BindSampler (will be remapped) */ + "ii\0" + "glBindSampler\0" + "\0" + /* _mesa_function_pool[2845]: MultiTexCoord2fARB (offset 386) */ + "iff\0" + "glMultiTexCoord2f\0" + "glMultiTexCoord2fARB\0" + "\0" + /* _mesa_function_pool[2889]: IndexPointer (offset 314) */ + "iip\0" + "glIndexPointer\0" + "\0" + /* _mesa_function_pool[2909]: MultiTexCoord3iv (offset 397) */ + "ip\0" + "glMultiTexCoord3iv\0" + "glMultiTexCoord3ivARB\0" + "\0" + /* _mesa_function_pool[2954]: Finish (offset 216) */ + "\0" + "glFinish\0" + "\0" + /* _mesa_function_pool[2965]: ClearStencil (offset 207) */ + "i\0" + "glClearStencil\0" + "\0" + /* _mesa_function_pool[2983]: ClearColorIiEXT (will be remapped) */ + "iiii\0" + "glClearColorIiEXT\0" + "\0" + /* _mesa_function_pool[3007]: LoadMatrixd (offset 292) */ + "p\0" + "glLoadMatrixd\0" + "\0" + /* _mesa_function_pool[3024]: VDPAURegisterOutputSurfaceNV (will be remapped) */ + "piip\0" + "glVDPAURegisterOutputSurfaceNV\0" + "\0" + /* _mesa_function_pool[3061]: VertexP4ui (will be remapped) */ + "ii\0" + "glVertexP4ui\0" + "\0" + /* _mesa_function_pool[3078]: SpriteParameterfvSGIX (dynamic) */ + "ip\0" + "glSpriteParameterfvSGIX\0" + "\0" + /* _mesa_function_pool[3106]: GetActiveUniformName (will be remapped) */ + "iiipp\0" + "glGetActiveUniformName\0" + "\0" + /* _mesa_function_pool[3136]: GetnUniformivARB (will be remapped) */ + "iiip\0" + "glGetnUniformivARB\0" + "\0" + /* _mesa_function_pool[3161]: ReleaseShaderCompiler (will be remapped) */ + "\0" + "glReleaseShaderCompiler\0" + "\0" + /* _mesa_function_pool[3187]: BlendFuncSeparate (will be remapped) */ + "iiii\0" + "glBlendFuncSeparate\0" + "glBlendFuncSeparateEXT\0" + "glBlendFuncSeparateINGR\0" + "glBlendFuncSeparateOES\0" + "\0" + /* _mesa_function_pool[3283]: Color3us (offset 23) */ + "iii\0" + "glColor3us\0" + "\0" + /* _mesa_function_pool[3299]: MultiDrawArraysIndirect (will be remapped) */ + "ipii\0" + "glMultiDrawArraysIndirect\0" + "\0" + /* _mesa_function_pool[3331]: BufferStorage (will be remapped) */ + "iipi\0" + "glBufferStorage\0" + "\0" + /* _mesa_function_pool[3353]: Color3ub (offset 19) */ + "iii\0" + "glColor3ub\0" + "\0" + /* _mesa_function_pool[3369]: GetInstrumentsSGIX (dynamic) */ + "\0" + "glGetInstrumentsSGIX\0" + "\0" + /* _mesa_function_pool[3392]: Color3ui (offset 21) */ + "iii\0" + "glColor3ui\0" + "\0" + /* _mesa_function_pool[3408]: VertexAttrib4dvNV (will be remapped) */ + "ip\0" + "glVertexAttrib4dvNV\0" + "\0" + /* _mesa_function_pool[3432]: AlphaFragmentOp2ATI (will be remapped) */ + "iiiiiiiii\0" + "glAlphaFragmentOp2ATI\0" + "\0" + /* _mesa_function_pool[3465]: RasterPos4dv (offset 79) */ + "p\0" + "glRasterPos4dv\0" + "\0" + /* _mesa_function_pool[3483]: DeleteProgramPipelines (will be remapped) */ + "ip\0" + "glDeleteProgramPipelines\0" + "glDeleteProgramPipelinesEXT\0" + "\0" + /* _mesa_function_pool[3540]: LineWidthx (will be remapped) */ + "i\0" + "glLineWidthxOES\0" + "glLineWidthx\0" + "\0" + /* _mesa_function_pool[3572]: Indexdv (offset 45) */ + "p\0" + "glIndexdv\0" + "\0" + /* _mesa_function_pool[3585]: GetnPixelMapfvARB (will be remapped) */ + "iip\0" + "glGetnPixelMapfvARB\0" + "\0" + /* _mesa_function_pool[3610]: EGLImageTargetTexture2DOES (will be remapped) */ + "ip\0" + "glEGLImageTargetTexture2DOES\0" + "\0" + /* _mesa_function_pool[3643]: DepthMask (offset 211) */ + "i\0" + "glDepthMask\0" + "\0" + /* _mesa_function_pool[3658]: WindowPos4ivMESA (will be remapped) */ + "p\0" + "glWindowPos4ivMESA\0" + "\0" + /* _mesa_function_pool[3680]: GetShaderInfoLog (will be remapped) */ + "iipp\0" + "glGetShaderInfoLog\0" + "\0" + /* _mesa_function_pool[3705]: BindFragmentShaderATI (will be remapped) */ + "i\0" + "glBindFragmentShaderATI\0" + "\0" + /* _mesa_function_pool[3732]: BlendFuncSeparateiARB (will be remapped) */ + "iiiii\0" + "glBlendFuncSeparateiARB\0" + "glBlendFuncSeparateIndexedAMD\0" + "glBlendFuncSeparatei\0" + "\0" + /* _mesa_function_pool[3814]: PixelTexGenParameteriSGIS (dynamic) */ + "ii\0" + "glPixelTexGenParameteriSGIS\0" + "\0" + /* _mesa_function_pool[3846]: EGLImageTargetRenderbufferStorageOES (will be remapped) */ + "ip\0" + "glEGLImageTargetRenderbufferStorageOES\0" + "\0" + /* _mesa_function_pool[3889]: GenTransformFeedbacks (will be remapped) */ + "ip\0" + "glGenTransformFeedbacks\0" + "\0" + /* _mesa_function_pool[3917]: VertexPointer (offset 321) */ + "iiip\0" + "glVertexPointer\0" + "\0" + /* _mesa_function_pool[3939]: GetCompressedTexImage (will be remapped) */ + "iip\0" + "glGetCompressedTexImage\0" + "glGetCompressedTexImageARB\0" + "\0" + /* _mesa_function_pool[3995]: ProgramLocalParameter4dvARB (will be remapped) */ + "iip\0" + "glProgramLocalParameter4dvARB\0" + "\0" + /* _mesa_function_pool[4030]: TexCoord4fv (offset 121) */ + "p\0" + "glTexCoord4fv\0" + "\0" + /* _mesa_function_pool[4047]: GetQueryObjectui64v (will be remapped) */ + "iip\0" + "glGetQueryObjectui64v\0" + "glGetQueryObjectui64vEXT\0" + "\0" + /* _mesa_function_pool[4099]: VertexAttribP1uiv (will be remapped) */ + "iiip\0" + "glVertexAttribP1uiv\0" + "\0" + /* _mesa_function_pool[4125]: IsProgram (will be remapped) */ + "i\0" + "glIsProgram\0" + "\0" + /* _mesa_function_pool[4140]: TexCoordPointerListIBM (dynamic) */ + "iiipi\0" + "glTexCoordPointerListIBM\0" + "\0" + /* _mesa_function_pool[4172]: ResizeBuffersMESA (will be remapped) */ + "\0" + "glResizeBuffersMESA\0" + "\0" + /* _mesa_function_pool[4194]: BindBuffersBase (will be remapped) */ + "iiip\0" + "glBindBuffersBase\0" + "\0" + /* _mesa_function_pool[4218]: GenTextures (offset 328) */ + "ip\0" + "glGenTextures\0" + "glGenTexturesEXT\0" + "\0" + /* _mesa_function_pool[4253]: IndexPointerListIBM (dynamic) */ + "iipi\0" + "glIndexPointerListIBM\0" + "\0" + /* _mesa_function_pool[4281]: WindowPos4fMESA (will be remapped) */ + "ffff\0" + "glWindowPos4fMESA\0" + "\0" + /* _mesa_function_pool[4305]: VertexAttribs2fvNV (will be remapped) */ + "iip\0" + "glVertexAttribs2fvNV\0" + "\0" + /* _mesa_function_pool[4331]: VertexAttribP4ui (will be remapped) */ + "iiii\0" + "glVertexAttribP4ui\0" + "\0" + /* _mesa_function_pool[4356]: Uniform4i (will be remapped) */ + "iiiii\0" + "glUniform4i\0" + "glUniform4iARB\0" + "\0" + /* _mesa_function_pool[4390]: BufferParameteriAPPLE (will be remapped) */ + "iii\0" + "glBufferParameteriAPPLE\0" + "\0" + /* _mesa_function_pool[4419]: Uniform4f (will be remapped) */ + "iffff\0" + "glUniform4f\0" + "glUniform4fARB\0" + "\0" + /* _mesa_function_pool[4453]: ProgramUniform3f (will be remapped) */ + "iifff\0" + "glProgramUniform3f\0" + "glProgramUniform3fEXT\0" + "\0" + /* _mesa_function_pool[4501]: ProgramUniform3i (will be remapped) */ + "iiiii\0" + "glProgramUniform3i\0" + "glProgramUniform3iEXT\0" + "\0" + /* _mesa_function_pool[4549]: PointParameterfv (will be remapped) */ + "ip\0" + "glPointParameterfv\0" + "glPointParameterfvARB\0" + "glPointParameterfvEXT\0" + "glPointParameterfvSGIS\0" + "\0" + /* _mesa_function_pool[4639]: GetHistogramParameterfv (offset 362) */ + "iip\0" + "glGetHistogramParameterfv\0" + "glGetHistogramParameterfvEXT\0" + "\0" + /* _mesa_function_pool[4699]: GetString (offset 275) */ + "i\0" + "glGetString\0" + "\0" + /* _mesa_function_pool[4714]: ColorPointervINTEL (dynamic) */ + "iip\0" + "glColorPointervINTEL\0" + "\0" + /* _mesa_function_pool[4740]: VDPAUUnmapSurfacesNV (will be remapped) */ + "ip\0" + "glVDPAUUnmapSurfacesNV\0" + "\0" + /* _mesa_function_pool[4767]: GetnHistogramARB (will be remapped) */ + "iiiiip\0" + "glGetnHistogramARB\0" + "\0" + /* _mesa_function_pool[4794]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */ + "pppp\0" + "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[4847]: SecondaryColor3s (will be remapped) */ + "iii\0" + "glSecondaryColor3s\0" + "glSecondaryColor3sEXT\0" + "\0" + /* _mesa_function_pool[4893]: VertexAttribP2uiv (will be remapped) */ + "iiip\0" + "glVertexAttribP2uiv\0" + "\0" + /* _mesa_function_pool[4919]: GetDetailTexFuncSGIS (dynamic) */ + "ip\0" + "glGetDetailTexFuncSGIS\0" + "\0" + /* _mesa_function_pool[4946]: VertexAttrib3fNV (will be remapped) */ + "ifff\0" + "glVertexAttrib3fNV\0" + "\0" + /* _mesa_function_pool[4971]: SecondaryColor3b (will be remapped) */ + "iii\0" + "glSecondaryColor3b\0" + "glSecondaryColor3bEXT\0" + "\0" + /* _mesa_function_pool[5017]: EnableClientState (offset 313) */ + "i\0" + "glEnableClientState\0" + "\0" + /* _mesa_function_pool[5040]: Color4ubVertex2fvSUN (dynamic) */ + "pp\0" + "glColor4ubVertex2fvSUN\0" + "\0" + /* _mesa_function_pool[5067]: SecondaryColor3i (will be remapped) */ + "iii\0" + "glSecondaryColor3i\0" + "glSecondaryColor3iEXT\0" + "\0" + /* _mesa_function_pool[5113]: TexFilterFuncSGIS (dynamic) */ + "iiip\0" + "glTexFilterFuncSGIS\0" + "\0" + /* _mesa_function_pool[5139]: GetFragmentMaterialfvSGIX (dynamic) */ + "iip\0" + "glGetFragmentMaterialfvSGIX\0" + "\0" + /* _mesa_function_pool[5172]: DetailTexFuncSGIS (dynamic) */ + "iip\0" + "glDetailTexFuncSGIS\0" + "\0" + /* _mesa_function_pool[5197]: FlushMappedBufferRange (will be remapped) */ + "iii\0" + "glFlushMappedBufferRange\0" + "glFlushMappedBufferRangeEXT\0" + "\0" + /* _mesa_function_pool[5255]: Lightfv (offset 160) */ + "iip\0" + "glLightfv\0" + "\0" + /* _mesa_function_pool[5270]: GetFramebufferAttachmentParameteriv (will be remapped) */ + "iiip\0" + "glGetFramebufferAttachmentParameteriv\0" + "glGetFramebufferAttachmentParameterivEXT\0" + "glGetFramebufferAttachmentParameterivOES\0" + "\0" + /* _mesa_function_pool[5396]: ColorSubTable (offset 346) */ + "iiiiip\0" + "glColorSubTable\0" + "glColorSubTableEXT\0" + "\0" + /* _mesa_function_pool[5439]: EndPerfMonitorAMD (will be remapped) */ + "i\0" + "glEndPerfMonitorAMD\0" + "\0" + /* _mesa_function_pool[5462]: Uniform1ui (will be remapped) */ + "ii\0" + "glUniform1uiEXT\0" + "glUniform1ui\0" + "\0" + /* _mesa_function_pool[5495]: MapParameterivNV (dynamic) */ + "iip\0" + "glMapParameterivNV\0" + "\0" + /* _mesa_function_pool[5519]: GetMultisamplefv (will be remapped) */ + "iip\0" + "glGetMultisamplefv\0" + "\0" + /* _mesa_function_pool[5543]: WeightbvARB (dynamic) */ + "ip\0" + "glWeightbvARB\0" + "\0" + /* _mesa_function_pool[5561]: Rectdv (offset 87) */ + "pp\0" + "glRectdv\0" + "\0" + /* _mesa_function_pool[5574]: DrawArraysInstancedARB (will be remapped) */ + "iiii\0" + "glDrawArraysInstancedARB\0" + "glDrawArraysInstancedEXT\0" + "glDrawArraysInstanced\0" + "\0" + /* _mesa_function_pool[5652]: ProgramEnvParameters4fvEXT (will be remapped) */ + "iiip\0" + "glProgramEnvParameters4fvEXT\0" + "\0" + /* _mesa_function_pool[5687]: VertexAttrib2svNV (will be remapped) */ + "ip\0" + "glVertexAttrib2svNV\0" + "\0" + /* _mesa_function_pool[5711]: SecondaryColorP3uiv (will be remapped) */ + "ip\0" + "glSecondaryColorP3uiv\0" + "\0" + /* _mesa_function_pool[5737]: GetnPixelMapuivARB (will be remapped) */ + "iip\0" + "glGetnPixelMapuivARB\0" + "\0" + /* _mesa_function_pool[5763]: GetSamplerParameterIuiv (will be remapped) */ + "iip\0" + "glGetSamplerParameterIuiv\0" + "\0" + /* _mesa_function_pool[5794]: Disablei (will be remapped) */ + "ii\0" + "glDisableIndexedEXT\0" + "glDisablei\0" + "\0" + /* _mesa_function_pool[5829]: CompressedTexSubImage3D (will be remapped) */ + "iiiiiiiiiip\0" + "glCompressedTexSubImage3D\0" + "glCompressedTexSubImage3DARB\0" + "glCompressedTexSubImage3DOES\0" + "\0" + /* _mesa_function_pool[5926]: BindFramebufferEXT (will be remapped) */ + "ii\0" + "glBindFramebufferEXT\0" + "\0" + /* _mesa_function_pool[5951]: Color3dv (offset 12) */ + "p\0" + "glColor3dv\0" + "\0" + /* _mesa_function_pool[5965]: BeginQuery (will be remapped) */ + "ii\0" + "glBeginQuery\0" + "glBeginQueryARB\0" + "\0" + /* _mesa_function_pool[5998]: VertexP3uiv (will be remapped) */ + "ip\0" + "glVertexP3uiv\0" + "\0" + /* _mesa_function_pool[6016]: GetUniformLocation (will be remapped) */ + "ip\0" + "glGetUniformLocation\0" + "glGetUniformLocationARB\0" + "\0" + /* _mesa_function_pool[6065]: PixelStoref (offset 249) */ + "if\0" + "glPixelStoref\0" + "\0" + /* _mesa_function_pool[6083]: WindowPos2iv (will be remapped) */ + "p\0" + "glWindowPos2iv\0" + "glWindowPos2ivARB\0" + "glWindowPos2ivMESA\0" + "\0" + /* _mesa_function_pool[6138]: PixelStorei (offset 250) */ + "ii\0" + "glPixelStorei\0" + "\0" + /* _mesa_function_pool[6156]: VertexAttribs1svNV (will be remapped) */ + "iip\0" + "glVertexAttribs1svNV\0" + "\0" + /* _mesa_function_pool[6182]: RequestResidentProgramsNV (will be remapped) */ + "ip\0" + "glRequestResidentProgramsNV\0" + "\0" + /* _mesa_function_pool[6214]: ListParameterivSGIX (dynamic) */ + "iip\0" + "glListParameterivSGIX\0" + "\0" + /* _mesa_function_pool[6241]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */ + "pppp\0" + "glTexCoord2fColor4fNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[6287]: CheckFramebufferStatus (will be remapped) */ + "i\0" + "glCheckFramebufferStatus\0" + "glCheckFramebufferStatusEXT\0" + "glCheckFramebufferStatusOES\0" + "\0" + /* _mesa_function_pool[6371]: DispatchComputeIndirect (will be remapped) */ + "i\0" + "glDispatchComputeIndirect\0" + "\0" + /* _mesa_function_pool[6400]: InvalidateBufferData (will be remapped) */ + "i\0" + "glInvalidateBufferData\0" + "\0" + /* _mesa_function_pool[6426]: VDPAUMapSurfacesNV (will be remapped) */ + "ip\0" + "glVDPAUMapSurfacesNV\0" + "\0" + /* _mesa_function_pool[6451]: IsFramebuffer (will be remapped) */ + "i\0" + "glIsFramebuffer\0" + "glIsFramebufferEXT\0" + "glIsFramebufferOES\0" + "\0" + /* _mesa_function_pool[6508]: GetPixelTexGenParameterfvSGIS (dynamic) */ + "ip\0" + "glGetPixelTexGenParameterfvSGIS\0" + "\0" + /* _mesa_function_pool[6544]: GetDoublev (offset 260) */ + "ip\0" + "glGetDoublev\0" + "\0" + /* _mesa_function_pool[6561]: GetObjectLabel (will be remapped) */ + "iiipp\0" + "glGetObjectLabel\0" + "\0" + /* _mesa_function_pool[6585]: TextureLightEXT (dynamic) */ + "i\0" + "glTextureLightEXT\0" + "\0" + /* _mesa_function_pool[6606]: ColorP3uiv (will be remapped) */ + "ip\0" + "glColorP3uiv\0" + "\0" + /* _mesa_function_pool[6623]: CombinerParameteriNV (dynamic) */ + "ii\0" + "glCombinerParameteriNV\0" + "\0" + /* _mesa_function_pool[6650]: Normal3fVertex3fvSUN (dynamic) */ + "pp\0" + "glNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[6677]: VertexAttribI4ivEXT (will be remapped) */ + "ip\0" + "glVertexAttribI4ivEXT\0" + "glVertexAttribI4iv\0" + "\0" + /* _mesa_function_pool[6722]: SecondaryColor3ubv (will be remapped) */ + "p\0" + "glSecondaryColor3ubv\0" + "glSecondaryColor3ubvEXT\0" + "\0" + /* _mesa_function_pool[6770]: GetDebugMessageLog (will be remapped) */ + "iipppppp\0" + "glGetDebugMessageLogARB\0" + "glGetDebugMessageLog\0" + "\0" + /* _mesa_function_pool[6825]: DeformationMap3fSGIX (dynamic) */ + "iffiiffiiffiip\0" + "glDeformationMap3fSGIX\0" + "\0" + /* _mesa_function_pool[6864]: MatrixIndexubvARB (dynamic) */ + "ip\0" + "glMatrixIndexubvARB\0" + "\0" + /* _mesa_function_pool[6888]: VertexAttribI4usv (will be remapped) */ + "ip\0" + "glVertexAttribI4usvEXT\0" + "glVertexAttribI4usv\0" + "\0" + /* _mesa_function_pool[6935]: PixelTexGenParameterfSGIS (dynamic) */ + "if\0" + "glPixelTexGenParameterfSGIS\0" + "\0" + /* _mesa_function_pool[6967]: ProgramUniform2ui (will be remapped) */ + "iiii\0" + "glProgramUniform2ui\0" + "glProgramUniform2uiEXT\0" + "\0" + /* _mesa_function_pool[7016]: TexCoord2fVertex3fvSUN (dynamic) */ + "pp\0" + "glTexCoord2fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[7045]: Color4ubVertex3fvSUN (dynamic) */ + "pp\0" + "glColor4ubVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[7072]: GetShaderSource (will be remapped) */ + "iipp\0" + "glGetShaderSource\0" + "glGetShaderSourceARB\0" + "\0" + /* _mesa_function_pool[7117]: BindProgramARB (will be remapped) */ + "ii\0" + "glBindProgramARB\0" + "glBindProgramNV\0" + "\0" + /* _mesa_function_pool[7154]: VertexAttrib3sNV (will be remapped) */ + "iiii\0" + "glVertexAttrib3sNV\0" + "\0" + /* _mesa_function_pool[7179]: ColorFragmentOp1ATI (will be remapped) */ + "iiiiiii\0" + "glColorFragmentOp1ATI\0" + "\0" + /* _mesa_function_pool[7210]: ProgramUniformMatrix4x3fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix4x3fv\0" + "glProgramUniformMatrix4x3fvEXT\0" + "\0" + /* _mesa_function_pool[7276]: PopClientAttrib (offset 334) */ + "\0" + "glPopClientAttrib\0" + "\0" + /* _mesa_function_pool[7296]: DrawElementsInstancedARB (will be remapped) */ + "iiipi\0" + "glDrawElementsInstancedARB\0" + "glDrawElementsInstancedEXT\0" + "glDrawElementsInstanced\0" + "\0" + /* _mesa_function_pool[7381]: GetQueryObjectuiv (will be remapped) */ + "iip\0" + "glGetQueryObjectuiv\0" + "glGetQueryObjectuivARB\0" + "\0" + /* _mesa_function_pool[7429]: VertexAttribI4bv (will be remapped) */ + "ip\0" + "glVertexAttribI4bvEXT\0" + "glVertexAttribI4bv\0" + "\0" + /* _mesa_function_pool[7474]: FogCoordPointerListIBM (dynamic) */ + "iipi\0" + "glFogCoordPointerListIBM\0" + "\0" + /* _mesa_function_pool[7505]: Binormal3sEXT (dynamic) */ + "iii\0" + "glBinormal3sEXT\0" + "\0" + /* _mesa_function_pool[7526]: ListBase (offset 6) */ + "i\0" + "glListBase\0" + "\0" + /* _mesa_function_pool[7540]: GenerateMipmap (will be remapped) */ + "i\0" + "glGenerateMipmap\0" + "glGenerateMipmapEXT\0" + "glGenerateMipmapOES\0" + "\0" + /* _mesa_function_pool[7600]: BindBufferRange (will be remapped) */ + "iiiii\0" + "glBindBufferRange\0" + "glBindBufferRangeEXT\0" + "\0" + /* _mesa_function_pool[7646]: ProgramUniformMatrix2x4fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix2x4fv\0" + "glProgramUniformMatrix2x4fvEXT\0" + "\0" + /* _mesa_function_pool[7712]: GetQueryObjectiv (will be remapped) */ + "iip\0" + "glGetQueryObjectiv\0" + "glGetQueryObjectivARB\0" + "\0" + /* _mesa_function_pool[7758]: VertexAttrib2s (will be remapped) */ + "iii\0" + "glVertexAttrib2s\0" + "glVertexAttrib2sARB\0" + "\0" + /* _mesa_function_pool[7800]: SecondaryColor3fvEXT (will be remapped) */ + "p\0" + "glSecondaryColor3fv\0" + "glSecondaryColor3fvEXT\0" + "\0" + /* _mesa_function_pool[7846]: VertexAttrib2d (will be remapped) */ + "idd\0" + "glVertexAttrib2d\0" + "glVertexAttrib2dARB\0" + "\0" + /* _mesa_function_pool[7888]: Uniform1fv (will be remapped) */ + "iip\0" + "glUniform1fv\0" + "glUniform1fvARB\0" + "\0" + /* _mesa_function_pool[7922]: GetProgramPipelineInfoLog (will be remapped) */ + "iipp\0" + "glGetProgramPipelineInfoLog\0" + "glGetProgramPipelineInfoLogEXT\0" + "\0" + /* _mesa_function_pool[7987]: TextureMaterialEXT (dynamic) */ + "ii\0" + "glTextureMaterialEXT\0" + "\0" + /* _mesa_function_pool[8012]: DepthBoundsEXT (will be remapped) */ + "dd\0" + "glDepthBoundsEXT\0" + "\0" + /* _mesa_function_pool[8033]: WindowPos3fv (will be remapped) */ + "p\0" + "glWindowPos3fv\0" + "glWindowPos3fvARB\0" + "glWindowPos3fvMESA\0" + "\0" + /* _mesa_function_pool[8088]: BindVertexArrayAPPLE (will be remapped) */ + "i\0" + "glBindVertexArrayAPPLE\0" + "\0" + /* _mesa_function_pool[8114]: GetHistogramParameteriv (offset 363) */ + "iip\0" + "glGetHistogramParameteriv\0" + "glGetHistogramParameterivEXT\0" + "\0" + /* _mesa_function_pool[8174]: PointParameteriv (will be remapped) */ + "ip\0" + "glPointParameteriv\0" + "glPointParameterivNV\0" + "\0" + /* _mesa_function_pool[8218]: GetProgramivARB (will be remapped) */ + "iip\0" + "glGetProgramivARB\0" + "\0" + /* _mesa_function_pool[8241]: BindRenderbuffer (will be remapped) */ + "ii\0" + "glBindRenderbuffer\0" + "glBindRenderbufferOES\0" + "\0" + /* _mesa_function_pool[8286]: SecondaryColor3fEXT (will be remapped) */ + "fff\0" + "glSecondaryColor3f\0" + "glSecondaryColor3fEXT\0" + "\0" + /* _mesa_function_pool[8332]: PrimitiveRestartIndex (will be remapped) */ + "i\0" + "glPrimitiveRestartIndex\0" + "glPrimitiveRestartIndexNV\0" + "\0" + /* _mesa_function_pool[8385]: VertexAttribI4ubv (will be remapped) */ + "ip\0" + "glVertexAttribI4ubvEXT\0" + "glVertexAttribI4ubv\0" + "\0" + /* _mesa_function_pool[8432]: GetGraphicsResetStatusARB (will be remapped) */ + "\0" + "glGetGraphicsResetStatusARB\0" + "\0" + /* _mesa_function_pool[8462]: ActiveStencilFaceEXT (will be remapped) */ + "i\0" + "glActiveStencilFaceEXT\0" + "\0" + /* _mesa_function_pool[8488]: VertexAttrib4dNV (will be remapped) */ + "idddd\0" + "glVertexAttrib4dNV\0" + "\0" + /* _mesa_function_pool[8514]: DepthRange (offset 288) */ + "dd\0" + "glDepthRange\0" + "\0" + /* _mesa_function_pool[8531]: TexBumpParameterivATI (will be remapped) */ + "ip\0" + "glTexBumpParameterivATI\0" + "\0" + /* _mesa_function_pool[8559]: VertexAttrib4fNV (will be remapped) */ + "iffff\0" + "glVertexAttrib4fNV\0" + "\0" + /* _mesa_function_pool[8585]: Uniform4fv (will be remapped) */ + "iip\0" + "glUniform4fv\0" + "glUniform4fvARB\0" + "\0" + /* _mesa_function_pool[8619]: DrawMeshArraysSUN (dynamic) */ + "iiii\0" + "glDrawMeshArraysSUN\0" + "\0" + /* _mesa_function_pool[8645]: SamplerParameterIiv (will be remapped) */ + "iip\0" + "glSamplerParameterIiv\0" + "\0" + /* _mesa_function_pool[8672]: GetMapControlPointsNV (dynamic) */ + "iiiiiip\0" + "glGetMapControlPointsNV\0" + "\0" + /* _mesa_function_pool[8705]: SpriteParameterivSGIX (dynamic) */ + "ip\0" + "glSpriteParameterivSGIX\0" + "\0" + /* _mesa_function_pool[8733]: Frustumf (will be remapped) */ + "ffffff\0" + "glFrustumfOES\0" + "glFrustumf\0" + "\0" + /* _mesa_function_pool[8766]: ProgramUniform2uiv (will be remapped) */ + "iiip\0" + "glProgramUniform2uiv\0" + "glProgramUniform2uivEXT\0" + "\0" + /* _mesa_function_pool[8817]: Rectsv (offset 93) */ + "pp\0" + "glRectsv\0" + "\0" + /* _mesa_function_pool[8830]: Frustumx (will be remapped) */ + "iiiiii\0" + "glFrustumxOES\0" + "glFrustumx\0" + "\0" + /* _mesa_function_pool[8863]: CullFace (offset 152) */ + "i\0" + "glCullFace\0" + "\0" + /* _mesa_function_pool[8877]: BindTexture (offset 307) */ + "ii\0" + "glBindTexture\0" + "glBindTextureEXT\0" + "\0" + /* _mesa_function_pool[8912]: MultiTexCoord4fARB (offset 402) */ + "iffff\0" + "glMultiTexCoord4f\0" + "glMultiTexCoord4fARB\0" + "\0" + /* _mesa_function_pool[8958]: MultiTexCoordP2uiv (will be remapped) */ + "iip\0" + "glMultiTexCoordP2uiv\0" + "\0" + /* _mesa_function_pool[8984]: NormalPointervINTEL (dynamic) */ + "ip\0" + "glNormalPointervINTEL\0" + "\0" + /* _mesa_function_pool[9010]: NormalPointer (offset 318) */ + "iip\0" + "glNormalPointer\0" + "\0" + /* _mesa_function_pool[9031]: TangentPointerEXT (dynamic) */ + "iip\0" + "glTangentPointerEXT\0" + "\0" + /* _mesa_function_pool[9056]: WindowPos4iMESA (will be remapped) */ + "iiii\0" + "glWindowPos4iMESA\0" + "\0" + /* _mesa_function_pool[9080]: ReferencePlaneSGIX (dynamic) */ + "p\0" + "glReferencePlaneSGIX\0" + "\0" + /* _mesa_function_pool[9104]: VertexAttrib4bv (will be remapped) */ + "ip\0" + "glVertexAttrib4bv\0" + "glVertexAttrib4bvARB\0" + "\0" + /* _mesa_function_pool[9147]: ReplacementCodeuivSUN (dynamic) */ + "p\0" + "glReplacementCodeuivSUN\0" + "\0" + /* _mesa_function_pool[9174]: SecondaryColor3usv (will be remapped) */ + "p\0" + "glSecondaryColor3usv\0" + "glSecondaryColor3usvEXT\0" + "\0" + /* _mesa_function_pool[9222]: GetPixelMapuiv (offset 272) */ + "ip\0" + "glGetPixelMapuiv\0" + "\0" + /* _mesa_function_pool[9243]: Indexfv (offset 47) */ + "p\0" + "glIndexfv\0" + "\0" + /* _mesa_function_pool[9256]: AlphaFragmentOp1ATI (will be remapped) */ + "iiiiii\0" + "glAlphaFragmentOp1ATI\0" + "\0" + /* _mesa_function_pool[9286]: ListParameteriSGIX (dynamic) */ + "iii\0" + "glListParameteriSGIX\0" + "\0" + /* _mesa_function_pool[9312]: GetFloatv (offset 262) */ + "ip\0" + "glGetFloatv\0" + "\0" + /* _mesa_function_pool[9328]: MultiTexCoord3i (offset 396) */ + "iiii\0" + "glMultiTexCoord3i\0" + "glMultiTexCoord3iARB\0" + "\0" + /* _mesa_function_pool[9373]: ProgramUniform1fv (will be remapped) */ + "iiip\0" + "glProgramUniform1fv\0" + "glProgramUniform1fvEXT\0" + "\0" + /* _mesa_function_pool[9422]: MultiTexCoord3d (offset 392) */ + "iddd\0" + "glMultiTexCoord3d\0" + "glMultiTexCoord3dARB\0" + "\0" + /* _mesa_function_pool[9467]: TexCoord3sv (offset 117) */ + "p\0" + "glTexCoord3sv\0" + "\0" + /* _mesa_function_pool[9484]: Fogfv (offset 154) */ + "ip\0" + "glFogfv\0" + "\0" + /* _mesa_function_pool[9496]: Minmax (offset 368) */ + "iii\0" + "glMinmax\0" + "glMinmaxEXT\0" + "\0" + /* _mesa_function_pool[9522]: MultiTexCoord3s (offset 398) */ + "iiii\0" + "glMultiTexCoord3s\0" + "glMultiTexCoord3sARB\0" + "\0" + /* _mesa_function_pool[9567]: FinishTextureSUNX (dynamic) */ + "\0" + "glFinishTextureSUNX\0" + "\0" + /* _mesa_function_pool[9589]: GetFinalCombinerInputParameterfvNV (dynamic) */ + "iip\0" + "glGetFinalCombinerInputParameterfvNV\0" + "\0" + /* _mesa_function_pool[9631]: PollInstrumentsSGIX (dynamic) */ + "p\0" + "glPollInstrumentsSGIX\0" + "\0" + /* _mesa_function_pool[9656]: Vertex4iv (offset 147) */ + "p\0" + "glVertex4iv\0" + "\0" + /* _mesa_function_pool[9671]: BufferSubData (will be remapped) */ + "iiip\0" + "glBufferSubData\0" + "glBufferSubDataARB\0" + "\0" + /* _mesa_function_pool[9712]: AlphaFragmentOp3ATI (will be remapped) */ + "iiiiiiiiiiii\0" + "glAlphaFragmentOp3ATI\0" + "\0" + /* _mesa_function_pool[9748]: Begin (offset 7) */ + "i\0" + "glBegin\0" + "\0" + /* _mesa_function_pool[9759]: LightModeli (offset 165) */ + "ii\0" + "glLightModeli\0" + "\0" + /* _mesa_function_pool[9777]: UniformMatrix2fv (will be remapped) */ + "iiip\0" + "glUniformMatrix2fv\0" + "glUniformMatrix2fvARB\0" + "\0" + /* _mesa_function_pool[9824]: LightModelf (offset 163) */ + "if\0" + "glLightModelf\0" + "\0" + /* _mesa_function_pool[9842]: GetTexParameterfv (offset 282) */ + "iip\0" + "glGetTexParameterfv\0" + "\0" + /* _mesa_function_pool[9867]: BinormalPointerEXT (dynamic) */ + "iip\0" + "glBinormalPointerEXT\0" + "\0" + /* _mesa_function_pool[9893]: GetCombinerInputParameterivNV (dynamic) */ + "iiiip\0" + "glGetCombinerInputParameterivNV\0" + "\0" + /* _mesa_function_pool[9932]: DeleteAsyncMarkersSGIX (dynamic) */ + "ii\0" + "glDeleteAsyncMarkersSGIX\0" + "\0" + /* _mesa_function_pool[9961]: MultiTexCoord2fvARB (offset 387) */ + "ip\0" + "glMultiTexCoord2fv\0" + "glMultiTexCoord2fvARB\0" + "\0" + /* _mesa_function_pool[10006]: VertexAttrib4ubv (will be remapped) */ + "ip\0" + "glVertexAttrib4ubv\0" + "glVertexAttrib4ubvARB\0" + "\0" + /* _mesa_function_pool[10051]: GetnTexImageARB (will be remapped) */ + "iiiiip\0" + "glGetnTexImageARB\0" + "\0" + /* _mesa_function_pool[10077]: ColorMask (offset 210) */ + "iiii\0" + "glColorMask\0" + "\0" + /* _mesa_function_pool[10095]: GenAsyncMarkersSGIX (dynamic) */ + "i\0" + "glGenAsyncMarkersSGIX\0" + "\0" + /* _mesa_function_pool[10120]: ReplacementCodeuiVertex3fSUN (dynamic) */ + "ifff\0" + "glReplacementCodeuiVertex3fSUN\0" + "\0" + /* _mesa_function_pool[10157]: VertexAttribI4sv (will be remapped) */ + "ip\0" + "glVertexAttribI4svEXT\0" + "glVertexAttribI4sv\0" + "\0" + /* _mesa_function_pool[10202]: DrawElementsInstancedBaseInstance (will be remapped) */ + "iiipii\0" + "glDrawElementsInstancedBaseInstance\0" + "\0" + /* _mesa_function_pool[10246]: UniformMatrix4fv (will be remapped) */ + "iiip\0" + "glUniformMatrix4fv\0" + "glUniformMatrix4fvARB\0" + "\0" + /* _mesa_function_pool[10293]: UniformMatrix3x2fv (will be remapped) */ + "iiip\0" + "glUniformMatrix3x2fv\0" + "\0" + /* _mesa_function_pool[10320]: VertexAttrib4Nuiv (will be remapped) */ + "ip\0" + "glVertexAttrib4Nuiv\0" + "glVertexAttrib4NuivARB\0" + "\0" + /* _mesa_function_pool[10367]: ClientActiveTexture (offset 375) */ + "i\0" + "glClientActiveTexture\0" + "glClientActiveTextureARB\0" + "\0" + /* _mesa_function_pool[10417]: GetUniformIndices (will be remapped) */ + "iipp\0" + "glGetUniformIndices\0" + "\0" + /* _mesa_function_pool[10443]: GetTexBumpParameterivATI (will be remapped) */ + "ip\0" + "glGetTexBumpParameterivATI\0" + "\0" + /* _mesa_function_pool[10474]: Binormal3bEXT (dynamic) */ + "iii\0" + "glBinormal3bEXT\0" + "\0" + /* _mesa_function_pool[10495]: CombinerParameterivNV (dynamic) */ + "ip\0" + "glCombinerParameterivNV\0" + "\0" + /* _mesa_function_pool[10523]: MultiTexCoord2sv (offset 391) */ + "ip\0" + "glMultiTexCoord2sv\0" + "glMultiTexCoord2svARB\0" + "\0" + /* _mesa_function_pool[10568]: LoadIdentity (offset 290) */ + "\0" + "glLoadIdentity\0" + "\0" + /* _mesa_function_pool[10585]: ActiveShaderProgram (will be remapped) */ + "ii\0" + "glActiveShaderProgram\0" + "glActiveShaderProgramEXT\0" + "\0" + /* _mesa_function_pool[10636]: BindImageTextures (will be remapped) */ + "iip\0" + "glBindImageTextures\0" + "\0" + /* _mesa_function_pool[10661]: DeleteTransformFeedbacks (will be remapped) */ + "ip\0" + "glDeleteTransformFeedbacks\0" + "\0" + /* _mesa_function_pool[10692]: VertexAttrib4ubvNV (will be remapped) */ + "ip\0" + "glVertexAttrib4ubvNV\0" + "\0" + /* _mesa_function_pool[10717]: FogCoordfEXT (will be remapped) */ + "f\0" + "glFogCoordf\0" + "glFogCoordfEXT\0" + "\0" + /* _mesa_function_pool[10747]: GetMapfv (offset 267) */ + "iip\0" + "glGetMapfv\0" + "\0" + /* _mesa_function_pool[10763]: GetProgramInfoLog (will be remapped) */ + "iipp\0" + "glGetProgramInfoLog\0" + "\0" + /* _mesa_function_pool[10789]: BindTransformFeedback (will be remapped) */ + "ii\0" + "glBindTransformFeedback\0" + "\0" + /* _mesa_function_pool[10817]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */ + "pppp\0" + "glTexCoord4fColor4fNormal3fVertex4fvSUN\0" + "\0" + /* _mesa_function_pool[10863]: GetPixelMapfv (offset 271) */ + "ip\0" + "glGetPixelMapfv\0" + "\0" + /* _mesa_function_pool[10883]: WeightivARB (dynamic) */ + "ip\0" + "glWeightivARB\0" + "\0" + /* _mesa_function_pool[10901]: VertexAttrib4svNV (will be remapped) */ + "ip\0" + "glVertexAttrib4svNV\0" + "\0" + /* _mesa_function_pool[10925]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */ + "ifffff\0" + "glReplacementCodeuiTexCoord2fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[10974]: VDPAUSurfaceAccessNV (will be remapped) */ + "ii\0" + "glVDPAUSurfaceAccessNV\0" + "\0" + /* _mesa_function_pool[11001]: EdgeFlagPointer (offset 312) */ + "ip\0" + "glEdgeFlagPointer\0" + "\0" + /* _mesa_function_pool[11023]: WindowPos2f (will be remapped) */ + "ff\0" + "glWindowPos2f\0" + "glWindowPos2fARB\0" + "glWindowPos2fMESA\0" + "\0" + /* _mesa_function_pool[11076]: WindowPos2d (will be remapped) */ + "dd\0" + "glWindowPos2d\0" + "glWindowPos2dARB\0" + "glWindowPos2dMESA\0" + "\0" + /* _mesa_function_pool[11129]: WindowPos2i (will be remapped) */ + "ii\0" + "glWindowPos2i\0" + "glWindowPos2iARB\0" + "glWindowPos2iMESA\0" + "\0" + /* _mesa_function_pool[11182]: WindowPos2s (will be remapped) */ + "ii\0" + "glWindowPos2s\0" + "glWindowPos2sARB\0" + "glWindowPos2sMESA\0" + "\0" + /* _mesa_function_pool[11235]: VertexAttribI1uiEXT (will be remapped) */ + "ii\0" + "glVertexAttribI1uiEXT\0" + "glVertexAttribI1ui\0" + "\0" + /* _mesa_function_pool[11280]: DeleteSync (will be remapped) */ + "i\0" + "glDeleteSync\0" + "\0" + /* _mesa_function_pool[11296]: WindowPos4fvMESA (will be remapped) */ + "p\0" + "glWindowPos4fvMESA\0" + "\0" + /* _mesa_function_pool[11318]: CompressedTexImage3D (will be remapped) */ + "iiiiiiiip\0" + "glCompressedTexImage3D\0" + "glCompressedTexImage3DARB\0" + "glCompressedTexImage3DOES\0" + "\0" + /* _mesa_function_pool[11404]: VertexAttribI1uiv (will be remapped) */ + "ip\0" + "glVertexAttribI1uivEXT\0" + "glVertexAttribI1uiv\0" + "\0" + /* _mesa_function_pool[11451]: SecondaryColor3dv (will be remapped) */ + "p\0" + "glSecondaryColor3dv\0" + "glSecondaryColor3dvEXT\0" + "\0" + /* _mesa_function_pool[11497]: GetListParameterivSGIX (dynamic) */ + "iip\0" + "glGetListParameterivSGIX\0" + "\0" + /* _mesa_function_pool[11527]: GetnPixelMapusvARB (will be remapped) */ + "iip\0" + "glGetnPixelMapusvARB\0" + "\0" + /* _mesa_function_pool[11553]: VertexAttrib3s (will be remapped) */ + "iiii\0" + "glVertexAttrib3s\0" + "glVertexAttrib3sARB\0" + "\0" + /* _mesa_function_pool[11596]: UniformMatrix4x3fv (will be remapped) */ + "iiip\0" + "glUniformMatrix4x3fv\0" + "\0" + /* _mesa_function_pool[11623]: Binormal3dEXT (dynamic) */ + "ddd\0" + "glBinormal3dEXT\0" + "\0" + /* _mesa_function_pool[11644]: GetQueryiv (will be remapped) */ + "iip\0" + "glGetQueryiv\0" + "glGetQueryivARB\0" + "\0" + /* _mesa_function_pool[11678]: VertexAttrib3d (will be remapped) */ + "iddd\0" + "glVertexAttrib3d\0" + "glVertexAttrib3dARB\0" + "\0" + /* _mesa_function_pool[11721]: ImageTransformParameterfHP (dynamic) */ + "iif\0" + "glImageTransformParameterfHP\0" + "\0" + /* _mesa_function_pool[11755]: MapBuffer (will be remapped) */ + "ii\0" + "glMapBuffer\0" + "glMapBufferARB\0" + "glMapBufferOES\0" + "\0" + /* _mesa_function_pool[11801]: VertexAttrib4Nbv (will be remapped) */ + "ip\0" + "glVertexAttrib4Nbv\0" + "glVertexAttrib4NbvARB\0" + "\0" + /* _mesa_function_pool[11846]: ProgramBinary (will be remapped) */ + "iipi\0" + "glProgramBinary\0" + "glProgramBinaryOES\0" + "\0" + /* _mesa_function_pool[11887]: InvalidateTexImage (will be remapped) */ + "ii\0" + "glInvalidateTexImage\0" + "\0" + /* _mesa_function_pool[11912]: Uniform4ui (will be remapped) */ + "iiiii\0" + "glUniform4uiEXT\0" + "glUniform4ui\0" + "\0" + /* _mesa_function_pool[11948]: VertexAttrib1fARB (will be remapped) */ + "if\0" + "glVertexAttrib1f\0" + "glVertexAttrib1fARB\0" + "\0" + /* _mesa_function_pool[11989]: GetBooleani_v (will be remapped) */ + "iip\0" + "glGetBooleanIndexedvEXT\0" + "glGetBooleani_v\0" + "\0" + /* _mesa_function_pool[12034]: DrawTexsOES (will be remapped) */ + "iiiii\0" + "glDrawTexsOES\0" + "\0" + /* _mesa_function_pool[12055]: GetObjectPtrLabel (will be remapped) */ + "pipp\0" + "glGetObjectPtrLabel\0" + "\0" + /* _mesa_function_pool[12081]: ProgramParameteri (will be remapped) */ + "iii\0" + "glProgramParameteriARB\0" + "glProgramParameteri\0" + "glProgramParameteriEXT\0" + "\0" + /* _mesa_function_pool[12152]: SecondaryColorPointerListIBM (dynamic) */ + "iiipi\0" + "glSecondaryColorPointerListIBM\0" + "\0" + /* _mesa_function_pool[12190]: Color3fv (offset 14) */ + "p\0" + "glColor3fv\0" + "\0" + /* _mesa_function_pool[12204]: ReplacementCodeubSUN (dynamic) */ + "i\0" + "glReplacementCodeubSUN\0" + "\0" + /* _mesa_function_pool[12230]: GetnMapfvARB (will be remapped) */ + "iiip\0" + "glGetnMapfvARB\0" + "\0" + /* _mesa_function_pool[12251]: MultiTexCoord2i (offset 388) */ + "iii\0" + "glMultiTexCoord2i\0" + "glMultiTexCoord2iARB\0" + "\0" + /* _mesa_function_pool[12295]: MultiTexCoord2d (offset 384) */ + "idd\0" + "glMultiTexCoord2d\0" + "glMultiTexCoord2dARB\0" + "\0" + /* _mesa_function_pool[12339]: SamplerParameterIuiv (will be remapped) */ + "iip\0" + "glSamplerParameterIuiv\0" + "\0" + /* _mesa_function_pool[12367]: MultiTexCoord2s (offset 390) */ + "iii\0" + "glMultiTexCoord2s\0" + "glMultiTexCoord2sARB\0" + "\0" + /* _mesa_function_pool[12411]: VDPAURegisterVideoSurfaceNV (will be remapped) */ + "piip\0" + "glVDPAURegisterVideoSurfaceNV\0" + "\0" + /* _mesa_function_pool[12447]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */ + "ffffffffffff\0" + "glTexCoord2fColor4fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[12500]: BindBufferBase (will be remapped) */ + "iii\0" + "glBindBufferBase\0" + "glBindBufferBaseEXT\0" + "\0" + /* _mesa_function_pool[12542]: GetPerfMonitorCounterDataAMD (will be remapped) */ + "iiipp\0" + "glGetPerfMonitorCounterDataAMD\0" + "\0" + /* _mesa_function_pool[12580]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */ + "ppp\0" + "glReplacementCodeuiNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[12625]: MultTransposeMatrixf (will be remapped) */ + "p\0" + "glMultTransposeMatrixf\0" + "glMultTransposeMatrixfARB\0" + "\0" + /* _mesa_function_pool[12677]: PolygonOffsetEXT (will be remapped) */ + "ff\0" + "glPolygonOffsetEXT\0" + "\0" + /* _mesa_function_pool[12700]: Scalex (will be remapped) */ + "iii\0" + "glScalexOES\0" + "glScalex\0" + "\0" + /* _mesa_function_pool[12726]: Scaled (offset 301) */ + "ddd\0" + "glScaled\0" + "\0" + /* _mesa_function_pool[12740]: Scalef (offset 302) */ + "fff\0" + "glScalef\0" + "\0" + /* _mesa_function_pool[12754]: IndexPointerEXT (will be remapped) */ + "iiip\0" + "glIndexPointerEXT\0" + "\0" + /* _mesa_function_pool[12778]: GetUniformfv (will be remapped) */ + "iip\0" + "glGetUniformfv\0" + "glGetUniformfvARB\0" + "\0" + /* _mesa_function_pool[12816]: ColorFragmentOp2ATI (will be remapped) */ + "iiiiiiiiii\0" + "glColorFragmentOp2ATI\0" + "\0" + /* _mesa_function_pool[12850]: VertexAttrib2sNV (will be remapped) */ + "iii\0" + "glVertexAttrib2sNV\0" + "\0" + /* _mesa_function_pool[12874]: ReadPixels (offset 256) */ + "iiiiiip\0" + "glReadPixels\0" + "\0" + /* _mesa_function_pool[12896]: NormalPointerListIBM (dynamic) */ + "iipi\0" + "glNormalPointerListIBM\0" + "\0" + /* _mesa_function_pool[12925]: QueryCounter (will be remapped) */ + "ii\0" + "glQueryCounter\0" + "\0" + /* _mesa_function_pool[12944]: NormalPointerEXT (will be remapped) */ + "iiip\0" + "glNormalPointerEXT\0" + "\0" + /* _mesa_function_pool[12969]: ProgramUniform3iv (will be remapped) */ + "iiip\0" + "glProgramUniform3iv\0" + "glProgramUniform3ivEXT\0" + "\0" + /* _mesa_function_pool[13018]: ClearTexSubImage (will be remapped) */ + "iiiiiiiiiip\0" + "glClearTexSubImage\0" + "\0" + /* _mesa_function_pool[13050]: GetActiveUniformBlockName (will be remapped) */ + "iiipp\0" + "glGetActiveUniformBlockName\0" + "\0" + /* _mesa_function_pool[13085]: DrawElementsBaseVertex (will be remapped) */ + "iiipi\0" + "glDrawElementsBaseVertex\0" + "\0" + /* _mesa_function_pool[13117]: RasterPos3iv (offset 75) */ + "p\0" + "glRasterPos3iv\0" + "\0" + /* _mesa_function_pool[13135]: ColorMaski (will be remapped) */ + "iiiii\0" + "glColorMaskIndexedEXT\0" + "glColorMaski\0" + "\0" + /* _mesa_function_pool[13177]: Uniform2uiv (will be remapped) */ + "iip\0" + "glUniform2uivEXT\0" + "glUniform2uiv\0" + "\0" + /* _mesa_function_pool[13213]: RasterPos3s (offset 76) */ + "iii\0" + "glRasterPos3s\0" + "\0" + /* _mesa_function_pool[13232]: RasterPos3d (offset 70) */ + "ddd\0" + "glRasterPos3d\0" + "\0" + /* _mesa_function_pool[13251]: RasterPos3f (offset 72) */ + "fff\0" + "glRasterPos3f\0" + "\0" + /* _mesa_function_pool[13270]: BindVertexArray (will be remapped) */ + "i\0" + "glBindVertexArray\0" + "glBindVertexArrayOES\0" + "\0" + /* _mesa_function_pool[13312]: RasterPos3i (offset 74) */ + "iii\0" + "glRasterPos3i\0" + "\0" + /* _mesa_function_pool[13331]: GetTexParameterIuiv (will be remapped) */ + "iip\0" + "glGetTexParameterIuivEXT\0" + "glGetTexParameterIuiv\0" + "\0" + /* _mesa_function_pool[13383]: DrawTransformFeedbackStreamInstanced (will be remapped) */ + "iiii\0" + "glDrawTransformFeedbackStreamInstanced\0" + "\0" + /* _mesa_function_pool[13428]: VertexAttrib2fvARB (will be remapped) */ + "ip\0" + "glVertexAttrib2fv\0" + "glVertexAttrib2fvARB\0" + "\0" + /* _mesa_function_pool[13471]: VertexPointerListIBM (dynamic) */ + "iiipi\0" + "glVertexPointerListIBM\0" + "\0" + /* _mesa_function_pool[13501]: TexCoord2fNormal3fVertex3fSUN (dynamic) */ + "ffffffff\0" + "glTexCoord2fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[13543]: IsFenceNV (dynamic) */ + "i\0" + "glIsFenceNV\0" + "\0" + /* _mesa_function_pool[13558]: ColorTable (offset 339) */ + "iiiiip\0" + "glColorTable\0" + "glColorTableSGI\0" + "glColorTableEXT\0" + "\0" + /* _mesa_function_pool[13611]: LoadName (offset 198) */ + "i\0" + "glLoadName\0" + "\0" + /* _mesa_function_pool[13625]: Color3fVertex3fSUN (dynamic) */ + "ffffff\0" + "glColor3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[13654]: GetnUniformuivARB (will be remapped) */ + "iiip\0" + "glGetnUniformuivARB\0" + "\0" + /* _mesa_function_pool[13680]: ClearIndex (offset 205) */ + "f\0" + "glClearIndex\0" + "\0" + /* _mesa_function_pool[13696]: ConvolutionParameterfv (offset 351) */ + "iip\0" + "glConvolutionParameterfv\0" + "glConvolutionParameterfvEXT\0" + "\0" + /* _mesa_function_pool[13754]: TbufferMask3DFX (dynamic) */ + "i\0" + "glTbufferMask3DFX\0" + "\0" + /* _mesa_function_pool[13775]: GetTexGendv (offset 278) */ + "iip\0" + "glGetTexGendv\0" + "\0" + /* _mesa_function_pool[13794]: MultiTexCoordP1ui (will be remapped) */ + "iii\0" + "glMultiTexCoordP1ui\0" + "\0" + /* _mesa_function_pool[13819]: EvalMesh2 (offset 238) */ + "iiiii\0" + "glEvalMesh2\0" + "\0" + /* _mesa_function_pool[13838]: Vertex4fv (offset 145) */ + "p\0" + "glVertex4fv\0" + "\0" + /* _mesa_function_pool[13853]: SelectPerfMonitorCountersAMD (will be remapped) */ + "iiiip\0" + "glSelectPerfMonitorCountersAMD\0" + "\0" + /* _mesa_function_pool[13891]: BindFramebuffer (will be remapped) */ + "ii\0" + "glBindFramebuffer\0" + "glBindFramebufferOES\0" + "\0" + /* _mesa_function_pool[13934]: CreateProgram (will be remapped) */ + "\0" + "glCreateProgram\0" + "\0" + /* _mesa_function_pool[13952]: GetMinmax (offset 364) */ + "iiiip\0" + "glGetMinmax\0" + "glGetMinmaxEXT\0" + "\0" + /* _mesa_function_pool[13986]: Color3fVertex3fvSUN (dynamic) */ + "pp\0" + "glColor3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[14012]: VertexAttribs3svNV (will be remapped) */ + "iip\0" + "glVertexAttribs3svNV\0" + "\0" + /* _mesa_function_pool[14038]: GetActiveUniformsiv (will be remapped) */ + "iipip\0" + "glGetActiveUniformsiv\0" + "\0" + /* _mesa_function_pool[14067]: VertexAttrib2sv (will be remapped) */ + "ip\0" + "glVertexAttrib2sv\0" + "glVertexAttrib2svARB\0" + "\0" + /* _mesa_function_pool[14110]: GetProgramEnvParameterdvARB (will be remapped) */ + "iip\0" + "glGetProgramEnvParameterdvARB\0" + "\0" + /* _mesa_function_pool[14145]: VertexAttrib1dNV (will be remapped) */ + "id\0" + "glVertexAttrib1dNV\0" + "\0" + /* _mesa_function_pool[14168]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */ + "iffffff\0" + "glReplacementCodeuiNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[14216]: GetPerfMonitorGroupStringAMD (will be remapped) */ + "iipp\0" + "glGetPerfMonitorGroupStringAMD\0" + "\0" + /* _mesa_function_pool[14253]: GetError (offset 261) */ + "\0" + "glGetError\0" + "\0" + /* _mesa_function_pool[14266]: PassThrough (offset 199) */ + "f\0" + "glPassThrough\0" + "\0" + /* _mesa_function_pool[14283]: GetListParameterfvSGIX (dynamic) */ + "iip\0" + "glGetListParameterfvSGIX\0" + "\0" + /* _mesa_function_pool[14313]: GetObjectParameterivAPPLE (will be remapped) */ + "iiip\0" + "glGetObjectParameterivAPPLE\0" + "\0" + /* _mesa_function_pool[14347]: GlobalAlphaFactorubSUN (dynamic) */ + "i\0" + "glGlobalAlphaFactorubSUN\0" + "\0" + /* _mesa_function_pool[14375]: BindBuffersRange (will be remapped) */ + "iiippp\0" + "glBindBuffersRange\0" + "\0" + /* _mesa_function_pool[14402]: VertexAttrib4fvARB (will be remapped) */ + "ip\0" + "glVertexAttrib4fv\0" + "glVertexAttrib4fvARB\0" + "\0" + /* _mesa_function_pool[14445]: WindowPos3dv (will be remapped) */ + "p\0" + "glWindowPos3dv\0" + "glWindowPos3dvARB\0" + "glWindowPos3dvMESA\0" + "\0" + /* _mesa_function_pool[14500]: TexGenxOES (will be remapped) */ + "iii\0" + "glTexGenxOES\0" + "\0" + /* _mesa_function_pool[14518]: DeleteFencesNV (dynamic) */ + "ip\0" + "glDeleteFencesNV\0" + "\0" + /* _mesa_function_pool[14539]: GetImageTransformParameterivHP (dynamic) */ + "iip\0" + "glGetImageTransformParameterivHP\0" + "\0" + /* _mesa_function_pool[14577]: StencilOp (offset 244) */ + "iii\0" + "glStencilOp\0" + "\0" + /* _mesa_function_pool[14594]: Binormal3fEXT (dynamic) */ + "fff\0" + "glBinormal3fEXT\0" + "\0" + /* _mesa_function_pool[14615]: ProgramUniform1iv (will be remapped) */ + "iiip\0" + "glProgramUniform1iv\0" + "glProgramUniform1ivEXT\0" + "\0" + /* _mesa_function_pool[14664]: ProgramUniform3ui (will be remapped) */ + "iiiii\0" + "glProgramUniform3ui\0" + "glProgramUniform3uiEXT\0" + "\0" + /* _mesa_function_pool[14714]: SecondaryColor3sv (will be remapped) */ + "p\0" + "glSecondaryColor3sv\0" + "glSecondaryColor3svEXT\0" + "\0" + /* _mesa_function_pool[14760]: TexCoordP3ui (will be remapped) */ + "ii\0" + "glTexCoordP3ui\0" + "\0" + /* _mesa_function_pool[14779]: Fogxv (will be remapped) */ + "ip\0" + "glFogxvOES\0" + "glFogxv\0" + "\0" + /* _mesa_function_pool[14802]: VertexPointervINTEL (dynamic) */ + "iip\0" + "glVertexPointervINTEL\0" + "\0" + /* _mesa_function_pool[14829]: VertexAttribP1ui (will be remapped) */ + "iiii\0" + "glVertexAttribP1ui\0" + "\0" + /* _mesa_function_pool[14854]: DeleteLists (offset 4) */ + "ii\0" + "glDeleteLists\0" + "\0" + /* _mesa_function_pool[14872]: LogicOp (offset 242) */ + "i\0" + "glLogicOp\0" + "\0" + /* _mesa_function_pool[14885]: RenderbufferStorageMultisample (will be remapped) */ + "iiiii\0" + "glRenderbufferStorageMultisample\0" + "glRenderbufferStorageMultisampleEXT\0" + "\0" + /* _mesa_function_pool[14961]: WindowPos3d (will be remapped) */ + "ddd\0" + "glWindowPos3d\0" + "glWindowPos3dARB\0" + "glWindowPos3dMESA\0" + "\0" + /* _mesa_function_pool[15015]: Enablei (will be remapped) */ + "ii\0" + "glEnableIndexedEXT\0" + "glEnablei\0" + "\0" + /* _mesa_function_pool[15048]: WindowPos3f (will be remapped) */ + "fff\0" + "glWindowPos3f\0" + "glWindowPos3fARB\0" + "glWindowPos3fMESA\0" + "\0" + /* _mesa_function_pool[15102]: GenProgramsARB (will be remapped) */ + "ip\0" + "glGenProgramsARB\0" + "glGenProgramsNV\0" + "\0" + /* _mesa_function_pool[15139]: RasterPos2sv (offset 69) */ + "p\0" + "glRasterPos2sv\0" + "\0" + /* _mesa_function_pool[15157]: WindowPos3i (will be remapped) */ + "iii\0" + "glWindowPos3i\0" + "glWindowPos3iARB\0" + "glWindowPos3iMESA\0" + "\0" + /* _mesa_function_pool[15211]: MultiTexCoord4iv (offset 405) */ + "ip\0" + "glMultiTexCoord4iv\0" + "glMultiTexCoord4ivARB\0" + "\0" + /* _mesa_function_pool[15256]: TexCoord1sv (offset 101) */ + "p\0" + "glTexCoord1sv\0" + "\0" + /* _mesa_function_pool[15273]: WindowPos3s (will be remapped) */ + "iii\0" + "glWindowPos3s\0" + "glWindowPos3sARB\0" + "glWindowPos3sMESA\0" + "\0" + /* _mesa_function_pool[15327]: PixelMapusv (offset 253) */ + "iip\0" + "glPixelMapusv\0" + "\0" + /* _mesa_function_pool[15346]: DebugMessageInsert (will be remapped) */ + "iiiiip\0" + "glDebugMessageInsertARB\0" + "glDebugMessageInsert\0" + "\0" + /* _mesa_function_pool[15399]: Orthof (will be remapped) */ + "ffffff\0" + "glOrthofOES\0" + "glOrthof\0" + "\0" + /* _mesa_function_pool[15428]: CompressedTexImage2D (will be remapped) */ + "iiiiiiip\0" + "glCompressedTexImage2D\0" + "glCompressedTexImage2DARB\0" + "\0" + /* _mesa_function_pool[15487]: DeleteObjectARB (will be remapped) */ + "i\0" + "glDeleteObjectARB\0" + "\0" + /* _mesa_function_pool[15508]: IsSync (will be remapped) */ + "i\0" + "glIsSync\0" + "\0" + /* _mesa_function_pool[15520]: Color4uiv (offset 38) */ + "p\0" + "glColor4uiv\0" + "\0" + /* _mesa_function_pool[15535]: MultiTexCoord1sv (offset 383) */ + "ip\0" + "glMultiTexCoord1sv\0" + "glMultiTexCoord1svARB\0" + "\0" + /* _mesa_function_pool[15580]: Orthox (will be remapped) */ + "iiiiii\0" + "glOrthoxOES\0" + "glOrthox\0" + "\0" + /* _mesa_function_pool[15609]: PushAttrib (offset 219) */ + "i\0" + "glPushAttrib\0" + "\0" + /* _mesa_function_pool[15625]: RasterPos2i (offset 66) */ + "ii\0" + "glRasterPos2i\0" + "\0" + /* _mesa_function_pool[15643]: ClipPlane (offset 150) */ + "ip\0" + "glClipPlane\0" + "\0" + /* _mesa_function_pool[15659]: TexCoord2fColor3fVertex3fSUN (dynamic) */ + "ffffffff\0" + "glTexCoord2fColor3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[15700]: GetProgramivNV (will be remapped) */ + "iip\0" + "glGetProgramivNV\0" + "\0" + /* _mesa_function_pool[15722]: RasterPos2f (offset 64) */ + "ff\0" + "glRasterPos2f\0" + "\0" + /* _mesa_function_pool[15740]: RasterPos2d (offset 62) */ + "dd\0" + "glRasterPos2d\0" + "\0" + /* _mesa_function_pool[15758]: RasterPos3fv (offset 73) */ + "p\0" + "glRasterPos3fv\0" + "\0" + /* _mesa_function_pool[15776]: InvalidateSubFramebuffer (will be remapped) */ + "iipiiii\0" + "glInvalidateSubFramebuffer\0" + "\0" + /* _mesa_function_pool[15812]: Color4ub (offset 35) */ + "iiii\0" + "glColor4ub\0" + "\0" + /* _mesa_function_pool[15829]: RasterPos2s (offset 68) */ + "ii\0" + "glRasterPos2s\0" + "\0" + /* _mesa_function_pool[15847]: Color4fNormal3fVertex3fvSUN (dynamic) */ + "ppp\0" + "glColor4fNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[15882]: GetVertexAttribivNV (will be remapped) */ + "iip\0" + "glGetVertexAttribivNV\0" + "\0" + /* _mesa_function_pool[15909]: TexSubImage4DSGIS (dynamic) */ + "iiiiiiiiiiiip\0" + "glTexSubImage4DSGIS\0" + "\0" + /* _mesa_function_pool[15944]: MultiTexCoord3dv (offset 393) */ + "ip\0" + "glMultiTexCoord3dv\0" + "glMultiTexCoord3dvARB\0" + "\0" + /* _mesa_function_pool[15989]: BindProgramPipeline (will be remapped) */ + "i\0" + "glBindProgramPipeline\0" + "glBindProgramPipelineEXT\0" + "\0" + /* _mesa_function_pool[16039]: VertexAttribP4uiv (will be remapped) */ + "iiip\0" + "glVertexAttribP4uiv\0" + "\0" + /* _mesa_function_pool[16065]: DebugMessageCallback (will be remapped) */ + "pp\0" + "glDebugMessageCallbackARB\0" + "glDebugMessageCallback\0" + "\0" + /* _mesa_function_pool[16118]: MultiTexCoord1i (offset 380) */ + "ii\0" + "glMultiTexCoord1i\0" + "glMultiTexCoord1iARB\0" + "\0" + /* _mesa_function_pool[16161]: WindowPos2dv (will be remapped) */ + "p\0" + "glWindowPos2dv\0" + "glWindowPos2dvARB\0" + "glWindowPos2dvMESA\0" + "\0" + /* _mesa_function_pool[16216]: TexParameterIuiv (will be remapped) */ + "iip\0" + "glTexParameterIuivEXT\0" + "glTexParameterIuiv\0" + "\0" + /* _mesa_function_pool[16262]: DeletePerfQueryINTEL (will be remapped) */ + "i\0" + "glDeletePerfQueryINTEL\0" + "\0" + /* _mesa_function_pool[16288]: MultiTexCoord1d (offset 376) */ + "id\0" + "glMultiTexCoord1d\0" + "glMultiTexCoord1dARB\0" + "\0" + /* _mesa_function_pool[16331]: GenVertexArraysAPPLE (will be remapped) */ + "ip\0" + "glGenVertexArraysAPPLE\0" + "\0" + /* _mesa_function_pool[16358]: MultiTexCoord1s (offset 382) */ + "ii\0" + "glMultiTexCoord1s\0" + "glMultiTexCoord1sARB\0" + "\0" + /* _mesa_function_pool[16401]: BeginConditionalRender (will be remapped) */ + "ii\0" + "glBeginConditionalRender\0" + "glBeginConditionalRenderNV\0" + "\0" + /* _mesa_function_pool[16457]: LoadPaletteFromModelViewMatrixOES (dynamic) */ + "\0" + "glLoadPaletteFromModelViewMatrixOES\0" + "\0" + /* _mesa_function_pool[16495]: GetShaderiv (will be remapped) */ + "iip\0" + "glGetShaderiv\0" + "\0" + /* _mesa_function_pool[16514]: GetMapAttribParameterfvNV (dynamic) */ + "iiip\0" + "glGetMapAttribParameterfvNV\0" + "\0" + /* _mesa_function_pool[16548]: CopyConvolutionFilter1D (offset 354) */ + "iiiii\0" + "glCopyConvolutionFilter1D\0" + "glCopyConvolutionFilter1DEXT\0" + "\0" + /* _mesa_function_pool[16610]: ClearBufferfv (will be remapped) */ + "iip\0" + "glClearBufferfv\0" + "\0" + /* _mesa_function_pool[16631]: InstrumentsBufferSGIX (dynamic) */ + "ip\0" + "glInstrumentsBufferSGIX\0" + "\0" + /* _mesa_function_pool[16659]: CreateShaderObjectARB (will be remapped) */ + "i\0" + "glCreateShaderObjectARB\0" + "\0" + /* _mesa_function_pool[16686]: GetTexParameterxv (will be remapped) */ + "iip\0" + "glGetTexParameterxvOES\0" + "glGetTexParameterxv\0" + "\0" + /* _mesa_function_pool[16734]: GetAttachedShaders (will be remapped) */ + "iipp\0" + "glGetAttachedShaders\0" + "\0" + /* _mesa_function_pool[16761]: ClearBufferfi (will be remapped) */ + "iifi\0" + "glClearBufferfi\0" + "\0" + /* _mesa_function_pool[16783]: Materialiv (offset 172) */ + "iip\0" + "glMaterialiv\0" + "\0" + /* _mesa_function_pool[16801]: DeleteFragmentShaderATI (will be remapped) */ + "i\0" + "glDeleteFragmentShaderATI\0" + "\0" + /* _mesa_function_pool[16830]: Tangent3dvEXT (dynamic) */ + "p\0" + "glTangent3dvEXT\0" + "\0" + /* _mesa_function_pool[16849]: DrawElementsInstancedBaseVertex (will be remapped) */ + "iiipii\0" + "glDrawElementsInstancedBaseVertex\0" + "\0" + /* _mesa_function_pool[16891]: DisableClientState (offset 309) */ + "i\0" + "glDisableClientState\0" + "\0" + /* _mesa_function_pool[16915]: TexGeni (offset 192) */ + "iii\0" + "glTexGeni\0" + "glTexGeniOES\0" + "\0" + /* _mesa_function_pool[16943]: TexGenf (offset 190) */ + "iif\0" + "glTexGenf\0" + "glTexGenfOES\0" + "\0" + /* _mesa_function_pool[16971]: TexGend (offset 188) */ + "iid\0" + "glTexGend\0" + "\0" + /* _mesa_function_pool[16986]: GetVertexAttribfvNV (will be remapped) */ + "iip\0" + "glGetVertexAttribfvNV\0" + "\0" + /* _mesa_function_pool[17013]: ColorPointerListIBM (dynamic) */ + "iiipi\0" + "glColorPointerListIBM\0" + "\0" + /* _mesa_function_pool[17042]: Color4sv (offset 34) */ + "p\0" + "glColor4sv\0" + "\0" + /* _mesa_function_pool[17056]: GetCombinerInputParameterfvNV (dynamic) */ + "iiiip\0" + "glGetCombinerInputParameterfvNV\0" + "\0" + /* _mesa_function_pool[17095]: LoadTransposeMatrixf (will be remapped) */ + "p\0" + "glLoadTransposeMatrixf\0" + "glLoadTransposeMatrixfARB\0" + "\0" + /* _mesa_function_pool[17147]: LoadTransposeMatrixd (will be remapped) */ + "p\0" + "glLoadTransposeMatrixd\0" + "glLoadTransposeMatrixdARB\0" + "\0" + /* _mesa_function_pool[17199]: PixelZoom (offset 246) */ + "ff\0" + "glPixelZoom\0" + "\0" + /* _mesa_function_pool[17215]: ProgramEnvParameter4dARB (will be remapped) */ + "iidddd\0" + "glProgramEnvParameter4dARB\0" + "glProgramParameter4dNV\0" + "\0" + /* _mesa_function_pool[17273]: ColorTableParameterfv (offset 340) */ + "iip\0" + "glColorTableParameterfv\0" + "glColorTableParameterfvSGI\0" + "\0" + /* _mesa_function_pool[17329]: IsTexture (offset 330) */ + "i\0" + "glIsTexture\0" + "glIsTextureEXT\0" + "\0" + /* _mesa_function_pool[17359]: ProgramUniform3uiv (will be remapped) */ + "iiip\0" + "glProgramUniform3uiv\0" + "glProgramUniform3uivEXT\0" + "\0" + /* _mesa_function_pool[17410]: ProgramUniform2fv (will be remapped) */ + "iiip\0" + "glProgramUniform2fv\0" + "glProgramUniform2fvEXT\0" + "\0" + /* _mesa_function_pool[17459]: ImageTransformParameterivHP (dynamic) */ + "iip\0" + "glImageTransformParameterivHP\0" + "\0" + /* _mesa_function_pool[17494]: VertexAttrib4sNV (will be remapped) */ + "iiiii\0" + "glVertexAttrib4sNV\0" + "\0" + /* _mesa_function_pool[17520]: GetMapdv (offset 266) */ + "iip\0" + "glGetMapdv\0" + "\0" + /* _mesa_function_pool[17536]: GenVertexArrays (will be remapped) */ + "ip\0" + "glGenVertexArrays\0" + "glGenVertexArraysOES\0" + "\0" + /* _mesa_function_pool[17579]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */ + "iiiiifff\0" + "glReplacementCodeuiColor4ubVertex3fSUN\0" + "\0" + /* _mesa_function_pool[17628]: IsBuffer (will be remapped) */ + "i\0" + "glIsBuffer\0" + "glIsBufferARB\0" + "\0" + /* _mesa_function_pool[17656]: ColorP4ui (will be remapped) */ + "ii\0" + "glColorP4ui\0" + "\0" + /* _mesa_function_pool[17672]: SpriteParameteriSGIX (dynamic) */ + "ii\0" + "glSpriteParameteriSGIX\0" + "\0" + /* _mesa_function_pool[17699]: TexCoordP3uiv (will be remapped) */ + "ip\0" + "glTexCoordP3uiv\0" + "\0" + /* _mesa_function_pool[17719]: WeightusvARB (dynamic) */ + "ip\0" + "glWeightusvARB\0" + "\0" + /* _mesa_function_pool[17738]: EvalMapsNV (dynamic) */ + "ii\0" + "glEvalMapsNV\0" + "\0" + /* _mesa_function_pool[17755]: ReplacementCodeuiSUN (dynamic) */ + "i\0" + "glReplacementCodeuiSUN\0" + "\0" + /* _mesa_function_pool[17781]: GlobalAlphaFactoruiSUN (dynamic) */ + "i\0" + "glGlobalAlphaFactoruiSUN\0" + "\0" + /* _mesa_function_pool[17809]: Uniform1iv (will be remapped) */ + "iip\0" + "glUniform1iv\0" + "glUniform1ivARB\0" + "\0" + /* _mesa_function_pool[17843]: Uniform4uiv (will be remapped) */ + "iip\0" + "glUniform4uivEXT\0" + "glUniform4uiv\0" + "\0" + /* _mesa_function_pool[17879]: PopDebugGroup (will be remapped) */ + "\0" + "glPopDebugGroup\0" + "\0" + /* _mesa_function_pool[17897]: VertexAttrib1d (will be remapped) */ + "id\0" + "glVertexAttrib1d\0" + "glVertexAttrib1dARB\0" + "\0" + /* _mesa_function_pool[17938]: CompressedTexImage1D (will be remapped) */ + "iiiiiip\0" + "glCompressedTexImage1D\0" + "glCompressedTexImage1DARB\0" + "\0" + /* _mesa_function_pool[17996]: TexBufferRange (will be remapped) */ + "iiiii\0" + "glTexBufferRange\0" + "\0" + /* _mesa_function_pool[18020]: VertexAttrib1s (will be remapped) */ + "ii\0" + "glVertexAttrib1s\0" + "glVertexAttrib1sARB\0" + "\0" + /* _mesa_function_pool[18061]: MultiDrawElementsIndirect (will be remapped) */ + "iipii\0" + "glMultiDrawElementsIndirect\0" + "\0" + /* _mesa_function_pool[18096]: FogCoordfvEXT (will be remapped) */ + "p\0" + "glFogCoordfv\0" + "glFogCoordfvEXT\0" + "\0" + /* _mesa_function_pool[18128]: BeginPerfMonitorAMD (will be remapped) */ + "i\0" + "glBeginPerfMonitorAMD\0" + "\0" + /* _mesa_function_pool[18153]: GetColorTableParameterfv (offset 344) */ + "iip\0" + "glGetColorTableParameterfv\0" + "glGetColorTableParameterfvSGI\0" + "glGetColorTableParameterfvEXT\0" + "\0" + /* _mesa_function_pool[18245]: MultiTexCoord3fARB (offset 394) */ + "ifff\0" + "glMultiTexCoord3f\0" + "glMultiTexCoord3fARB\0" + "\0" + /* _mesa_function_pool[18290]: GetTexLevelParameterfv (offset 284) */ + "iiip\0" + "glGetTexLevelParameterfv\0" + "\0" + /* _mesa_function_pool[18321]: Vertex2sv (offset 133) */ + "p\0" + "glVertex2sv\0" + "\0" + /* _mesa_function_pool[18336]: GetnMapdvARB (will be remapped) */ + "iiip\0" + "glGetnMapdvARB\0" + "\0" + /* _mesa_function_pool[18357]: VertexAttrib2dNV (will be remapped) */ + "idd\0" + "glVertexAttrib2dNV\0" + "\0" + /* _mesa_function_pool[18381]: GetTrackMatrixivNV (will be remapped) */ + "iiip\0" + "glGetTrackMatrixivNV\0" + "\0" + /* _mesa_function_pool[18408]: VertexAttrib3svNV (will be remapped) */ + "ip\0" + "glVertexAttrib3svNV\0" + "\0" + /* _mesa_function_pool[18432]: GetTexEnviv (offset 277) */ + "iip\0" + "glGetTexEnviv\0" + "\0" + /* _mesa_function_pool[18451]: ViewportArrayv (will be remapped) */ + "iip\0" + "glViewportArrayv\0" + "\0" + /* _mesa_function_pool[18473]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */ + "iffffffffffff\0" + "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[18544]: SeparableFilter2D (offset 360) */ + "iiiiiipp\0" + "glSeparableFilter2D\0" + "glSeparableFilter2DEXT\0" + "\0" + /* _mesa_function_pool[18597]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */ + "ppp\0" + "glReplacementCodeuiColor4ubVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[18642]: ArrayElement (offset 306) */ + "i\0" + "glArrayElement\0" + "glArrayElementEXT\0" + "\0" + /* _mesa_function_pool[18678]: TexImage2D (offset 183) */ + "iiiiiiiip\0" + "glTexImage2D\0" + "\0" + /* _mesa_function_pool[18702]: FragmentMaterialiSGIX (dynamic) */ + "iii\0" + "glFragmentMaterialiSGIX\0" + "\0" + /* _mesa_function_pool[18731]: RasterPos2dv (offset 63) */ + "p\0" + "glRasterPos2dv\0" + "\0" + /* _mesa_function_pool[18749]: Fogiv (offset 156) */ + "ip\0" + "glFogiv\0" + "\0" + /* _mesa_function_pool[18761]: EndQuery (will be remapped) */ + "i\0" + "glEndQuery\0" + "glEndQueryARB\0" + "\0" + /* _mesa_function_pool[18789]: TexCoord1dv (offset 95) */ + "p\0" + "glTexCoord1dv\0" + "\0" + /* _mesa_function_pool[18806]: TexCoord4dv (offset 119) */ + "p\0" + "glTexCoord4dv\0" + "\0" + /* _mesa_function_pool[18823]: GetVertexAttribdvNV (will be remapped) */ + "iip\0" + "glGetVertexAttribdvNV\0" + "\0" + /* _mesa_function_pool[18850]: Clear (offset 203) */ + "i\0" + "glClear\0" + "\0" + /* _mesa_function_pool[18861]: VertexAttrib4sv (will be remapped) */ + "ip\0" + "glVertexAttrib4sv\0" + "glVertexAttrib4svARB\0" + "\0" + /* _mesa_function_pool[18904]: Ortho (offset 296) */ + "dddddd\0" + "glOrtho\0" + "\0" + /* _mesa_function_pool[18920]: Uniform3uiv (will be remapped) */ + "iip\0" + "glUniform3uivEXT\0" + "glUniform3uiv\0" + "\0" + /* _mesa_function_pool[18956]: MatrixIndexPointerARB (dynamic) */ + "iiip\0" + "glMatrixIndexPointerARB\0" + "glMatrixIndexPointerOES\0" + "\0" + /* _mesa_function_pool[19010]: EndQueryIndexed (will be remapped) */ + "ii\0" + "glEndQueryIndexed\0" + "\0" + /* _mesa_function_pool[19032]: TexParameterxv (will be remapped) */ + "iip\0" + "glTexParameterxvOES\0" + "glTexParameterxv\0" + "\0" + /* _mesa_function_pool[19074]: SampleMaskSGIS (will be remapped) */ + "fi\0" + "glSampleMaskSGIS\0" + "glSampleMaskEXT\0" + "\0" + /* _mesa_function_pool[19111]: FramebufferTextureFaceARB (will be remapped) */ + "iiiii\0" + "glFramebufferTextureFaceARB\0" + "\0" + /* _mesa_function_pool[19146]: ProgramUniformMatrix2fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix2fv\0" + "glProgramUniformMatrix2fvEXT\0" + "\0" + /* _mesa_function_pool[19208]: ProgramLocalParameter4fvARB (will be remapped) */ + "iip\0" + "glProgramLocalParameter4fvARB\0" + "\0" + /* _mesa_function_pool[19243]: GetProgramStringNV (will be remapped) */ + "iip\0" + "glGetProgramStringNV\0" + "\0" + /* _mesa_function_pool[19269]: Binormal3svEXT (dynamic) */ + "p\0" + "glBinormal3svEXT\0" + "\0" + /* _mesa_function_pool[19289]: LightModelx (will be remapped) */ + "ii\0" + "glLightModelxOES\0" + "glLightModelx\0" + "\0" + /* _mesa_function_pool[19324]: VertexAttribI3iEXT (will be remapped) */ + "iiii\0" + "glVertexAttribI3iEXT\0" + "glVertexAttribI3i\0" + "\0" + /* _mesa_function_pool[19369]: ClearColorx (will be remapped) */ + "iiii\0" + "glClearColorxOES\0" + "glClearColorx\0" + "\0" + /* _mesa_function_pool[19406]: EndTransformFeedback (will be remapped) */ + "\0" + "glEndTransformFeedback\0" + "glEndTransformFeedbackEXT\0" + "\0" + /* _mesa_function_pool[19457]: VertexAttribs4dvNV (will be remapped) */ + "iip\0" + "glVertexAttribs4dvNV\0" + "\0" + /* _mesa_function_pool[19483]: GetProgramBinary (will be remapped) */ + "iippp\0" + "glGetProgramBinary\0" + "glGetProgramBinaryOES\0" + "\0" + /* _mesa_function_pool[19531]: ViewportIndexedfv (will be remapped) */ + "ip\0" + "glViewportIndexedfv\0" + "\0" + /* _mesa_function_pool[19555]: CallList (offset 2) */ + "i\0" + "glCallList\0" + "\0" + /* _mesa_function_pool[19569]: Materialfv (offset 170) */ + "iip\0" + "glMaterialfv\0" + "\0" + /* _mesa_function_pool[19587]: DeleteProgram (will be remapped) */ + "i\0" + "glDeleteProgram\0" + "\0" + /* _mesa_function_pool[19606]: GetActiveAtomicCounterBufferiv (will be remapped) */ + "iiip\0" + "glGetActiveAtomicCounterBufferiv\0" + "\0" + /* _mesa_function_pool[19645]: TexParameterIiv (will be remapped) */ + "iip\0" + "glTexParameterIivEXT\0" + "glTexParameterIiv\0" + "\0" + /* _mesa_function_pool[19689]: VertexWeightfEXT (dynamic) */ + "f\0" + "glVertexWeightfEXT\0" + "\0" + /* _mesa_function_pool[19711]: FlushVertexArrayRangeNV (dynamic) */ + "\0" + "glFlushVertexArrayRangeNV\0" + "\0" + /* _mesa_function_pool[19739]: GetConvolutionFilter (offset 356) */ + "iiip\0" + "glGetConvolutionFilter\0" + "glGetConvolutionFilterEXT\0" + "\0" + /* _mesa_function_pool[19794]: MultiModeDrawElementsIBM (will be remapped) */ + "ppipii\0" + "glMultiModeDrawElementsIBM\0" + "\0" + /* _mesa_function_pool[19829]: Uniform2iv (will be remapped) */ + "iip\0" + "glUniform2iv\0" + "glUniform2ivARB\0" + "\0" + /* _mesa_function_pool[19863]: GetFixedv (will be remapped) */ + "ip\0" + "glGetFixedvOES\0" + "glGetFixedv\0" + "\0" + /* _mesa_function_pool[19894]: ProgramParameters4dvNV (will be remapped) */ + "iiip\0" + "glProgramParameters4dvNV\0" + "\0" + /* _mesa_function_pool[19925]: Binormal3dvEXT (dynamic) */ + "p\0" + "glBinormal3dvEXT\0" + "\0" + /* _mesa_function_pool[19945]: SampleCoveragex (will be remapped) */ + "ii\0" + "glSampleCoveragexOES\0" + "glSampleCoveragex\0" + "\0" + /* _mesa_function_pool[19988]: GetPerfQueryInfoINTEL (will be remapped) */ + "iippppp\0" + "glGetPerfQueryInfoINTEL\0" + "\0" + /* _mesa_function_pool[20021]: DeleteFramebuffers (will be remapped) */ + "ip\0" + "glDeleteFramebuffers\0" + "glDeleteFramebuffersEXT\0" + "glDeleteFramebuffersOES\0" + "\0" + /* _mesa_function_pool[20094]: CombinerInputNV (dynamic) */ + "iiiiii\0" + "glCombinerInputNV\0" + "\0" + /* _mesa_function_pool[20120]: VertexAttrib4uiv (will be remapped) */ + "ip\0" + "glVertexAttrib4uiv\0" + "glVertexAttrib4uivARB\0" + "\0" + /* _mesa_function_pool[20165]: VertexAttrib4Nsv (will be remapped) */ + "ip\0" + "glVertexAttrib4Nsv\0" + "glVertexAttrib4NsvARB\0" + "\0" + /* _mesa_function_pool[20210]: Vertex4s (offset 148) */ + "iiii\0" + "glVertex4s\0" + "\0" + /* _mesa_function_pool[20227]: VertexAttribI2iEXT (will be remapped) */ + "iii\0" + "glVertexAttribI2iEXT\0" + "glVertexAttribI2i\0" + "\0" + /* _mesa_function_pool[20271]: Vertex4f (offset 144) */ + "ffff\0" + "glVertex4f\0" + "\0" + /* _mesa_function_pool[20288]: Vertex4d (offset 142) */ + "dddd\0" + "glVertex4d\0" + "\0" + /* _mesa_function_pool[20305]: GetTexGenfv (offset 279) */ + "iip\0" + "glGetTexGenfv\0" + "glGetTexGenfvOES\0" + "\0" + /* _mesa_function_pool[20341]: Vertex4i (offset 146) */ + "iiii\0" + "glVertex4i\0" + "\0" + /* _mesa_function_pool[20358]: VertexWeightPointerEXT (dynamic) */ + "iiip\0" + "glVertexWeightPointerEXT\0" + "\0" + /* _mesa_function_pool[20389]: StencilFuncSeparateATI (will be remapped) */ + "iiii\0" + "glStencilFuncSeparateATI\0" + "\0" + /* _mesa_function_pool[20420]: GetVertexAttribIuiv (will be remapped) */ + "iip\0" + "glGetVertexAttribIuivEXT\0" + "glGetVertexAttribIuiv\0" + "\0" + /* _mesa_function_pool[20472]: LightModelfv (offset 164) */ + "ip\0" + "glLightModelfv\0" + "\0" + /* _mesa_function_pool[20491]: Vertex4dv (offset 143) */ + "p\0" + "glVertex4dv\0" + "\0" + /* _mesa_function_pool[20506]: ProgramParameters4fvNV (will be remapped) */ + "iiip\0" + "glProgramParameters4fvNV\0" + "\0" + /* _mesa_function_pool[20537]: GetInfoLogARB (will be remapped) */ + "iipp\0" + "glGetInfoLogARB\0" + "\0" + /* _mesa_function_pool[20559]: StencilMask (offset 209) */ + "i\0" + "glStencilMask\0" + "\0" + /* _mesa_function_pool[20576]: IsList (offset 287) */ + "i\0" + "glIsList\0" + "\0" + /* _mesa_function_pool[20588]: ClearBufferiv (will be remapped) */ + "iip\0" + "glClearBufferiv\0" + "\0" + /* _mesa_function_pool[20609]: GetIntegeri_v (will be remapped) */ + "iip\0" + "glGetIntegerIndexedvEXT\0" + "glGetIntegeri_v\0" + "\0" + /* _mesa_function_pool[20654]: ProgramUniform2iv (will be remapped) */ + "iiip\0" + "glProgramUniform2iv\0" + "glProgramUniform2ivEXT\0" + "\0" + /* _mesa_function_pool[20703]: VertexAttribs4svNV (will be remapped) */ + "iip\0" + "glVertexAttribs4svNV\0" + "\0" + /* _mesa_function_pool[20729]: FogCoordPointer (will be remapped) */ + "iip\0" + "glFogCoordPointer\0" + "glFogCoordPointerEXT\0" + "\0" + /* _mesa_function_pool[20773]: SecondaryColor3us (will be remapped) */ + "iii\0" + "glSecondaryColor3us\0" + "glSecondaryColor3usEXT\0" + "\0" + /* _mesa_function_pool[20821]: DeformationMap3dSGIX (dynamic) */ + "iddiiddiiddiip\0" + "glDeformationMap3dSGIX\0" + "\0" + /* _mesa_function_pool[20860]: TextureNormalEXT (dynamic) */ + "i\0" + "glTextureNormalEXT\0" + "\0" + /* _mesa_function_pool[20882]: SecondaryColor3ub (will be remapped) */ + "iii\0" + "glSecondaryColor3ub\0" + "glSecondaryColor3ubEXT\0" + "\0" + /* _mesa_function_pool[20930]: SecondaryColor3ui (will be remapped) */ + "iii\0" + "glSecondaryColor3ui\0" + "glSecondaryColor3uiEXT\0" + "\0" + /* _mesa_function_pool[20978]: VertexAttribI3uivEXT (will be remapped) */ + "ip\0" + "glVertexAttribI3uivEXT\0" + "glVertexAttribI3uiv\0" + "\0" + /* _mesa_function_pool[21025]: Binormal3fvEXT (dynamic) */ + "p\0" + "glBinormal3fvEXT\0" + "\0" + /* _mesa_function_pool[21045]: TexCoordPointervINTEL (dynamic) */ + "iip\0" + "glTexCoordPointervINTEL\0" + "\0" + /* _mesa_function_pool[21074]: VertexAttrib1sNV (will be remapped) */ + "ii\0" + "glVertexAttrib1sNV\0" + "\0" + /* _mesa_function_pool[21097]: Tangent3bEXT (dynamic) */ + "iii\0" + "glTangent3bEXT\0" + "\0" + /* _mesa_function_pool[21117]: FragmentLightModelfSGIX (dynamic) */ + "if\0" + "glFragmentLightModelfSGIX\0" + "\0" + /* _mesa_function_pool[21147]: InitNames (offset 197) */ + "\0" + "glInitNames\0" + "\0" + /* _mesa_function_pool[21161]: Normal3sv (offset 61) */ + "p\0" + "glNormal3sv\0" + "\0" + /* _mesa_function_pool[21176]: DeleteQueries (will be remapped) */ + "ip\0" + "glDeleteQueries\0" + "glDeleteQueriesARB\0" + "\0" + /* _mesa_function_pool[21215]: InvalidateFramebuffer (will be remapped) */ + "iip\0" + "glInvalidateFramebuffer\0" + "\0" + /* _mesa_function_pool[21244]: Hint (offset 158) */ + "ii\0" + "glHint\0" + "\0" + /* _mesa_function_pool[21255]: MemoryBarrier (will be remapped) */ + "i\0" + "glMemoryBarrier\0" + "\0" + /* _mesa_function_pool[21274]: CopyColorSubTable (offset 347) */ + "iiiii\0" + "glCopyColorSubTable\0" + "glCopyColorSubTableEXT\0" + "\0" + /* _mesa_function_pool[21324]: WeightdvARB (dynamic) */ + "ip\0" + "glWeightdvARB\0" + "\0" + /* _mesa_function_pool[21342]: GetObjectParameterfvARB (will be remapped) */ + "iip\0" + "glGetObjectParameterfvARB\0" + "\0" + /* _mesa_function_pool[21373]: GetTexEnvxv (will be remapped) */ + "iip\0" + "glGetTexEnvxvOES\0" + "glGetTexEnvxv\0" + "\0" + /* _mesa_function_pool[21409]: DrawTexsvOES (will be remapped) */ + "p\0" + "glDrawTexsvOES\0" + "\0" + /* _mesa_function_pool[21427]: Disable (offset 214) */ + "i\0" + "glDisable\0" + "\0" + /* _mesa_function_pool[21440]: ClearColor (offset 206) */ + "ffff\0" + "glClearColor\0" + "\0" + /* _mesa_function_pool[21459]: WeightuivARB (dynamic) */ + "ip\0" + "glWeightuivARB\0" + "\0" + /* _mesa_function_pool[21478]: RasterPos4iv (offset 83) */ + "p\0" + "glRasterPos4iv\0" + "\0" + /* _mesa_function_pool[21496]: VDPAUIsSurfaceNV (will be remapped) */ + "i\0" + "glVDPAUIsSurfaceNV\0" + "\0" + /* _mesa_function_pool[21518]: ProgramUniformMatrix2x3fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix2x3fv\0" + "glProgramUniformMatrix2x3fvEXT\0" + "\0" + /* _mesa_function_pool[21584]: BindVertexBuffer (will be remapped) */ + "iiii\0" + "glBindVertexBuffer\0" + "\0" + /* _mesa_function_pool[21609]: Binormal3iEXT (dynamic) */ + "iii\0" + "glBinormal3iEXT\0" + "\0" + /* _mesa_function_pool[21630]: RasterPos4i (offset 82) */ + "iiii\0" + "glRasterPos4i\0" + "\0" + /* _mesa_function_pool[21650]: RasterPos4d (offset 78) */ + "dddd\0" + "glRasterPos4d\0" + "\0" + /* _mesa_function_pool[21670]: RasterPos4f (offset 80) */ + "ffff\0" + "glRasterPos4f\0" + "\0" + /* _mesa_function_pool[21690]: GetQueryIndexediv (will be remapped) */ + "iiip\0" + "glGetQueryIndexediv\0" + "\0" + /* _mesa_function_pool[21716]: RasterPos3dv (offset 71) */ + "p\0" + "glRasterPos3dv\0" + "\0" + /* _mesa_function_pool[21734]: GetProgramiv (will be remapped) */ + "iip\0" + "glGetProgramiv\0" + "\0" + /* _mesa_function_pool[21754]: TexCoord1iv (offset 99) */ + "p\0" + "glTexCoord1iv\0" + "\0" + /* _mesa_function_pool[21771]: RasterPos4s (offset 84) */ + "iiii\0" + "glRasterPos4s\0" + "\0" + /* _mesa_function_pool[21791]: PixelTexGenParameterfvSGIS (dynamic) */ + "ip\0" + "glPixelTexGenParameterfvSGIS\0" + "\0" + /* _mesa_function_pool[21824]: VertexAttrib3dv (will be remapped) */ + "ip\0" + "glVertexAttrib3dv\0" + "glVertexAttrib3dvARB\0" + "\0" + /* _mesa_function_pool[21867]: Histogram (offset 367) */ + "iiii\0" + "glHistogram\0" + "glHistogramEXT\0" + "\0" + /* _mesa_function_pool[21900]: Uniform2fv (will be remapped) */ + "iip\0" + "glUniform2fv\0" + "glUniform2fvARB\0" + "\0" + /* _mesa_function_pool[21934]: TexImage4DSGIS (dynamic) */ + "iiiiiiiiiip\0" + "glTexImage4DSGIS\0" + "\0" + /* _mesa_function_pool[21964]: DrawBuffers (will be remapped) */ + "ip\0" + "glDrawBuffers\0" + "glDrawBuffersARB\0" + "glDrawBuffersATI\0" + "glDrawBuffersNV\0" + "\0" + /* _mesa_function_pool[22032]: GetnPolygonStippleARB (will be remapped) */ + "ip\0" + "glGetnPolygonStippleARB\0" + "\0" + /* _mesa_function_pool[22060]: Color3uiv (offset 22) */ + "p\0" + "glColor3uiv\0" + "\0" + /* _mesa_function_pool[22075]: EvalCoord2fv (offset 235) */ + "p\0" + "glEvalCoord2fv\0" + "\0" + /* _mesa_function_pool[22093]: TextureStorage3DEXT (will be remapped) */ + "iiiiiii\0" + "glTextureStorage3DEXT\0" + "\0" + /* _mesa_function_pool[22124]: VertexAttrib2fARB (will be remapped) */ + "iff\0" + "glVertexAttrib2f\0" + "glVertexAttrib2fARB\0" + "\0" + /* _mesa_function_pool[22166]: WindowPos2fv (will be remapped) */ + "p\0" + "glWindowPos2fv\0" + "glWindowPos2fvARB\0" + "glWindowPos2fvMESA\0" + "\0" + /* _mesa_function_pool[22221]: Tangent3fEXT (dynamic) */ + "fff\0" + "glTangent3fEXT\0" + "\0" + /* _mesa_function_pool[22241]: TexImage3D (offset 371) */ + "iiiiiiiiip\0" + "glTexImage3D\0" + "glTexImage3DEXT\0" + "glTexImage3DOES\0" + "\0" + /* _mesa_function_pool[22298]: GetPerfQueryIdByNameINTEL (will be remapped) */ + "pp\0" + "glGetPerfQueryIdByNameINTEL\0" + "\0" + /* _mesa_function_pool[22330]: BindFragDataLocation (will be remapped) */ + "iip\0" + "glBindFragDataLocationEXT\0" + "glBindFragDataLocation\0" + "\0" + /* _mesa_function_pool[22384]: LightModeliv (offset 166) */ + "ip\0" + "glLightModeliv\0" + "\0" + /* _mesa_function_pool[22403]: Normal3bv (offset 53) */ + "p\0" + "glNormal3bv\0" + "\0" + /* _mesa_function_pool[22418]: BeginQueryIndexed (will be remapped) */ + "iii\0" + "glBeginQueryIndexed\0" + "\0" + /* _mesa_function_pool[22443]: Vertex3iv (offset 139) */ + "p\0" + "glVertex3iv\0" + "\0" + /* _mesa_function_pool[22458]: TexCoord3dv (offset 111) */ + "p\0" + "glTexCoord3dv\0" + "\0" + /* _mesa_function_pool[22475]: GetProgramStringARB (will be remapped) */ + "iip\0" + "glGetProgramStringARB\0" + "\0" + /* _mesa_function_pool[22502]: VertexP3ui (will be remapped) */ + "ii\0" + "glVertexP3ui\0" + "\0" + /* _mesa_function_pool[22519]: CreateProgramObjectARB (will be remapped) */ + "\0" + "glCreateProgramObjectARB\0" + "\0" + /* _mesa_function_pool[22546]: UniformMatrix3fv (will be remapped) */ + "iiip\0" + "glUniformMatrix3fv\0" + "glUniformMatrix3fvARB\0" + "\0" + /* _mesa_function_pool[22593]: PrioritizeTextures (offset 331) */ + "ipp\0" + "glPrioritizeTextures\0" + "glPrioritizeTexturesEXT\0" + "\0" + /* _mesa_function_pool[22643]: VertexAttribI3uiEXT (will be remapped) */ + "iiii\0" + "glVertexAttribI3uiEXT\0" + "glVertexAttribI3ui\0" + "\0" + /* _mesa_function_pool[22690]: AsyncMarkerSGIX (dynamic) */ + "i\0" + "glAsyncMarkerSGIX\0" + "\0" + /* _mesa_function_pool[22711]: GetProgramNamedParameterfvNV (will be remapped) */ + "iipp\0" + "glGetProgramNamedParameterfvNV\0" + "\0" + /* _mesa_function_pool[22748]: GetMaterialxv (will be remapped) */ + "iip\0" + "glGetMaterialxvOES\0" + "glGetMaterialxv\0" + "\0" + /* _mesa_function_pool[22788]: MatrixIndexusvARB (dynamic) */ + "ip\0" + "glMatrixIndexusvARB\0" + "\0" + /* _mesa_function_pool[22812]: SecondaryColor3uiv (will be remapped) */ + "p\0" + "glSecondaryColor3uiv\0" + "glSecondaryColor3uivEXT\0" + "\0" + /* _mesa_function_pool[22860]: EndConditionalRender (will be remapped) */ + "\0" + "glEndConditionalRender\0" + "glEndConditionalRenderNV\0" + "\0" + /* _mesa_function_pool[22910]: ProgramLocalParameter4dARB (will be remapped) */ + "iidddd\0" + "glProgramLocalParameter4dARB\0" + "\0" + /* _mesa_function_pool[22947]: Color3sv (offset 18) */ + "p\0" + "glColor3sv\0" + "\0" + /* _mesa_function_pool[22961]: GenFragmentShadersATI (will be remapped) */ + "i\0" + "glGenFragmentShadersATI\0" + "\0" + /* _mesa_function_pool[22988]: BlendEquationSeparateiARB (will be remapped) */ + "iii\0" + "glBlendEquationSeparateiARB\0" + "glBlendEquationSeparateIndexedAMD\0" + "glBlendEquationSeparatei\0" + "\0" + /* _mesa_function_pool[23080]: TestFenceNV (dynamic) */ + "i\0" + "glTestFenceNV\0" + "\0" + /* _mesa_function_pool[23097]: MultiTexCoord1fvARB (offset 379) */ + "ip\0" + "glMultiTexCoord1fv\0" + "glMultiTexCoord1fvARB\0" + "\0" + /* _mesa_function_pool[23142]: TexStorage2D (will be remapped) */ + "iiiii\0" + "glTexStorage2D\0" + "\0" + /* _mesa_function_pool[23164]: GetPixelTexGenParameterivSGIS (dynamic) */ + "ip\0" + "glGetPixelTexGenParameterivSGIS\0" + "\0" + /* _mesa_function_pool[23200]: FramebufferTexture2D (will be remapped) */ + "iiiii\0" + "glFramebufferTexture2D\0" + "glFramebufferTexture2DEXT\0" + "glFramebufferTexture2DOES\0" + "\0" + /* _mesa_function_pool[23282]: GetSamplerParameterfv (will be remapped) */ + "iip\0" + "glGetSamplerParameterfv\0" + "\0" + /* _mesa_function_pool[23311]: VertexAttrib2dv (will be remapped) */ + "ip\0" + "glVertexAttrib2dv\0" + "glVertexAttrib2dvARB\0" + "\0" + /* _mesa_function_pool[23354]: Vertex4sv (offset 149) */ + "p\0" + "glVertex4sv\0" + "\0" + /* _mesa_function_pool[23369]: GetQueryObjecti64v (will be remapped) */ + "iip\0" + "glGetQueryObjecti64v\0" + "glGetQueryObjecti64vEXT\0" + "\0" + /* _mesa_function_pool[23419]: ClampColor (will be remapped) */ + "ii\0" + "glClampColorARB\0" + "glClampColor\0" + "\0" + /* _mesa_function_pool[23452]: TextureRangeAPPLE (dynamic) */ + "iip\0" + "glTextureRangeAPPLE\0" + "\0" + /* _mesa_function_pool[23477]: ConvolutionFilter1D (offset 348) */ + "iiiiip\0" + "glConvolutionFilter1D\0" + "glConvolutionFilter1DEXT\0" + "\0" + /* _mesa_function_pool[23532]: DrawElementsIndirect (will be remapped) */ + "iip\0" + "glDrawElementsIndirect\0" + "\0" + /* _mesa_function_pool[23560]: WindowPos3sv (will be remapped) */ + "p\0" + "glWindowPos3sv\0" + "glWindowPos3svARB\0" + "glWindowPos3svMESA\0" + "\0" + /* _mesa_function_pool[23615]: FragmentMaterialfvSGIX (dynamic) */ + "iip\0" + "glFragmentMaterialfvSGIX\0" + "\0" + /* _mesa_function_pool[23645]: CallLists (offset 3) */ + "iip\0" + "glCallLists\0" + "\0" + /* _mesa_function_pool[23662]: AlphaFunc (offset 240) */ + "if\0" + "glAlphaFunc\0" + "\0" + /* _mesa_function_pool[23678]: EdgeFlag (offset 41) */ + "i\0" + "glEdgeFlag\0" + "\0" + /* _mesa_function_pool[23692]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */ + "ppp\0" + "glTexCoord2fNormal3fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[23730]: EdgeFlagv (offset 42) */ + "p\0" + "glEdgeFlagv\0" + "\0" + /* _mesa_function_pool[23745]: DepthRangex (will be remapped) */ + "ii\0" + "glDepthRangexOES\0" + "glDepthRangex\0" + "\0" + /* _mesa_function_pool[23780]: ReplacementCodeubvSUN (dynamic) */ + "p\0" + "glReplacementCodeubvSUN\0" + "\0" + /* _mesa_function_pool[23807]: VDPAUInitNV (will be remapped) */ + "pp\0" + "glVDPAUInitNV\0" + "\0" + /* _mesa_function_pool[23825]: GetBufferParameteri64v (will be remapped) */ + "iip\0" + "glGetBufferParameteri64v\0" + "\0" + /* _mesa_function_pool[23855]: LoadIdentityDeformationMapSGIX (dynamic) */ + "i\0" + "glLoadIdentityDeformationMapSGIX\0" + "\0" + /* _mesa_function_pool[23891]: DepthRangef (will be remapped) */ + "ff\0" + "glDepthRangef\0" + "glDepthRangefOES\0" + "\0" + /* _mesa_function_pool[23926]: GetSharpenTexFuncSGIS (dynamic) */ + "ip\0" + "glGetSharpenTexFuncSGIS\0" + "\0" + /* _mesa_function_pool[23954]: ColorFragmentOp3ATI (will be remapped) */ + "iiiiiiiiiiiii\0" + "glColorFragmentOp3ATI\0" + "\0" + /* _mesa_function_pool[23991]: ValidateProgram (will be remapped) */ + "i\0" + "glValidateProgram\0" + "glValidateProgramARB\0" + "\0" + /* _mesa_function_pool[24033]: VertexPointerEXT (will be remapped) */ + "iiiip\0" + "glVertexPointerEXT\0" + "\0" + /* _mesa_function_pool[24059]: Scissor (offset 176) */ + "iiii\0" + "glScissor\0" + "\0" + /* _mesa_function_pool[24075]: BeginTransformFeedback (will be remapped) */ + "i\0" + "glBeginTransformFeedback\0" + "glBeginTransformFeedbackEXT\0" + "\0" + /* _mesa_function_pool[24131]: TexCoord2i (offset 106) */ + "ii\0" + "glTexCoord2i\0" + "\0" + /* _mesa_function_pool[24148]: Color4ui (offset 37) */ + "iiii\0" + "glColor4ui\0" + "\0" + /* _mesa_function_pool[24165]: TexCoord2f (offset 104) */ + "ff\0" + "glTexCoord2f\0" + "\0" + /* _mesa_function_pool[24182]: TexCoord2d (offset 102) */ + "dd\0" + "glTexCoord2d\0" + "\0" + /* _mesa_function_pool[24199]: TexCoord2s (offset 108) */ + "ii\0" + "glTexCoord2s\0" + "\0" + /* _mesa_function_pool[24216]: PointSizePointerOES (will be remapped) */ + "iip\0" + "glPointSizePointerOES\0" + "\0" + /* _mesa_function_pool[24243]: Color4us (offset 39) */ + "iiii\0" + "glColor4us\0" + "\0" + /* _mesa_function_pool[24260]: Color3bv (offset 10) */ + "p\0" + "glColor3bv\0" + "\0" + /* _mesa_function_pool[24274]: PrimitiveRestartNV (will be remapped) */ + "\0" + "glPrimitiveRestartNV\0" + "\0" + /* _mesa_function_pool[24297]: BindBufferOffsetEXT (will be remapped) */ + "iiii\0" + "glBindBufferOffsetEXT\0" + "\0" + /* _mesa_function_pool[24325]: ProvokingVertex (will be remapped) */ + "i\0" + "glProvokingVertexEXT\0" + "glProvokingVertex\0" + "\0" + /* _mesa_function_pool[24367]: VertexAttribs4fvNV (will be remapped) */ + "iip\0" + "glVertexAttribs4fvNV\0" + "\0" + /* _mesa_function_pool[24393]: MapControlPointsNV (dynamic) */ + "iiiiiiiip\0" + "glMapControlPointsNV\0" + "\0" + /* _mesa_function_pool[24425]: Vertex2i (offset 130) */ + "ii\0" + "glVertex2i\0" + "\0" + /* _mesa_function_pool[24440]: HintPGI (dynamic) */ + "ii\0" + "glHintPGI\0" + "\0" + /* _mesa_function_pool[24454]: InterleavedArrays (offset 317) */ + "iip\0" + "glInterleavedArrays\0" + "\0" + /* _mesa_function_pool[24479]: RasterPos2fv (offset 65) */ + "p\0" + "glRasterPos2fv\0" + "\0" + /* _mesa_function_pool[24497]: TexCoord1fv (offset 97) */ + "p\0" + "glTexCoord1fv\0" + "\0" + /* _mesa_function_pool[24514]: PixelTransferf (offset 247) */ + "if\0" + "glPixelTransferf\0" + "\0" + /* _mesa_function_pool[24535]: MultiTexCoord4dv (offset 401) */ + "ip\0" + "glMultiTexCoord4dv\0" + "glMultiTexCoord4dvARB\0" + "\0" + /* _mesa_function_pool[24580]: ProgramEnvParameter4fvARB (will be remapped) */ + "iip\0" + "glProgramEnvParameter4fvARB\0" + "glProgramParameter4fvNV\0" + "\0" + /* _mesa_function_pool[24637]: RasterPos4fv (offset 81) */ + "p\0" + "glRasterPos4fv\0" + "\0" + /* _mesa_function_pool[24655]: FragmentLightModeliSGIX (dynamic) */ + "ii\0" + "glFragmentLightModeliSGIX\0" + "\0" + /* _mesa_function_pool[24685]: PushMatrix (offset 298) */ + "\0" + "glPushMatrix\0" + "\0" + /* _mesa_function_pool[24700]: EndList (offset 1) */ + "\0" + "glEndList\0" + "\0" + /* _mesa_function_pool[24712]: DrawRangeElements (offset 338) */ + "iiiiip\0" + "glDrawRangeElements\0" + "glDrawRangeElementsEXT\0" + "\0" + /* _mesa_function_pool[24763]: GetTexGenxvOES (will be remapped) */ + "iip\0" + "glGetTexGenxvOES\0" + "\0" + /* _mesa_function_pool[24785]: GetHandleARB (will be remapped) */ + "i\0" + "glGetHandleARB\0" + "\0" + /* _mesa_function_pool[24803]: DrawTexfvOES (will be remapped) */ + "p\0" + "glDrawTexfvOES\0" + "\0" + /* _mesa_function_pool[24821]: BlendFunciARB (will be remapped) */ + "iii\0" + "glBlendFunciARB\0" + "glBlendFuncIndexedAMD\0" + "glBlendFunci\0" + "\0" + /* _mesa_function_pool[24877]: GlobalAlphaFactorbSUN (dynamic) */ + "i\0" + "glGlobalAlphaFactorbSUN\0" + "\0" + /* _mesa_function_pool[24904]: Uniform2ui (will be remapped) */ + "iii\0" + "glUniform2uiEXT\0" + "glUniform2ui\0" + "\0" + /* _mesa_function_pool[24938]: ScissorIndexed (will be remapped) */ + "iiiii\0" + "glScissorIndexed\0" + "\0" + /* _mesa_function_pool[24962]: End (offset 43) */ + "\0" + "glEnd\0" + "\0" + /* _mesa_function_pool[24970]: BindVertexBuffers (will be remapped) */ + "iippp\0" + "glBindVertexBuffers\0" + "\0" + /* _mesa_function_pool[24997]: GetSamplerParameteriv (will be remapped) */ + "iip\0" + "glGetSamplerParameteriv\0" + "\0" + /* _mesa_function_pool[25026]: GenProgramPipelines (will be remapped) */ + "ip\0" + "glGenProgramPipelines\0" + "glGenProgramPipelinesEXT\0" + "\0" + /* _mesa_function_pool[25077]: Enable (offset 215) */ + "i\0" + "glEnable\0" + "\0" + /* _mesa_function_pool[25089]: IsProgramPipeline (will be remapped) */ + "i\0" + "glIsProgramPipeline\0" + "glIsProgramPipelineEXT\0" + "\0" + /* _mesa_function_pool[25135]: ShaderBinary (will be remapped) */ + "ipipi\0" + "glShaderBinary\0" + "\0" + /* _mesa_function_pool[25157]: GetFragmentMaterialivSGIX (dynamic) */ + "iip\0" + "glGetFragmentMaterialivSGIX\0" + "\0" + /* _mesa_function_pool[25190]: WeightPointerARB (dynamic) */ + "iiip\0" + "glWeightPointerARB\0" + "glWeightPointerOES\0" + "\0" + /* _mesa_function_pool[25234]: Normal3x (will be remapped) */ + "iii\0" + "glNormal3xOES\0" + "glNormal3x\0" + "\0" + /* _mesa_function_pool[25264]: VertexAttrib4fARB (will be remapped) */ + "iffff\0" + "glVertexAttrib4f\0" + "glVertexAttrib4fARB\0" + "\0" + /* _mesa_function_pool[25308]: ReadnPixelsARB (will be remapped) */ + "iiiiiiip\0" + "glReadnPixelsARB\0" + "\0" + /* _mesa_function_pool[25335]: InvalidateTexSubImage (will be remapped) */ + "iiiiiiii\0" + "glInvalidateTexSubImage\0" + "\0" + /* _mesa_function_pool[25369]: Normal3s (offset 60) */ + "iii\0" + "glNormal3s\0" + "\0" + /* _mesa_function_pool[25385]: Materialxv (will be remapped) */ + "iip\0" + "glMaterialxvOES\0" + "glMaterialxv\0" + "\0" + /* _mesa_function_pool[25419]: Normal3i (offset 58) */ + "iii\0" + "glNormal3i\0" + "\0" + /* _mesa_function_pool[25435]: ProgramNamedParameter4fvNV (will be remapped) */ + "iipp\0" + "glProgramNamedParameter4fvNV\0" + "\0" + /* _mesa_function_pool[25470]: Normal3b (offset 52) */ + "iii\0" + "glNormal3b\0" + "\0" + /* _mesa_function_pool[25486]: Normal3d (offset 54) */ + "ddd\0" + "glNormal3d\0" + "\0" + /* _mesa_function_pool[25502]: Normal3f (offset 56) */ + "fff\0" + "glNormal3f\0" + "\0" + /* _mesa_function_pool[25518]: Indexi (offset 48) */ + "i\0" + "glIndexi\0" + "\0" + /* _mesa_function_pool[25530]: Uniform1uiv (will be remapped) */ + "iip\0" + "glUniform1uivEXT\0" + "glUniform1uiv\0" + "\0" + /* _mesa_function_pool[25566]: VertexAttribI2uiEXT (will be remapped) */ + "iii\0" + "glVertexAttribI2uiEXT\0" + "glVertexAttribI2ui\0" + "\0" + /* _mesa_function_pool[25612]: IsRenderbuffer (will be remapped) */ + "i\0" + "glIsRenderbuffer\0" + "glIsRenderbufferEXT\0" + "glIsRenderbufferOES\0" + "\0" + /* _mesa_function_pool[25672]: NormalP3uiv (will be remapped) */ + "ip\0" + "glNormalP3uiv\0" + "\0" + /* _mesa_function_pool[25690]: Indexf (offset 46) */ + "f\0" + "glIndexf\0" + "\0" + /* _mesa_function_pool[25702]: Indexd (offset 44) */ + "d\0" + "glIndexd\0" + "\0" + /* _mesa_function_pool[25714]: GetMaterialiv (offset 270) */ + "iip\0" + "glGetMaterialiv\0" + "\0" + /* _mesa_function_pool[25735]: Indexs (offset 50) */ + "i\0" + "glIndexs\0" + "\0" + /* _mesa_function_pool[25747]: MultiTexCoordP1uiv (will be remapped) */ + "iip\0" + "glMultiTexCoordP1uiv\0" + "\0" + /* _mesa_function_pool[25773]: ConvolutionFilter2D (offset 349) */ + "iiiiiip\0" + "glConvolutionFilter2D\0" + "glConvolutionFilter2DEXT\0" + "\0" + /* _mesa_function_pool[25829]: Vertex2d (offset 126) */ + "dd\0" + "glVertex2d\0" + "\0" + /* _mesa_function_pool[25844]: Vertex2f (offset 128) */ + "ff\0" + "glVertex2f\0" + "\0" + /* _mesa_function_pool[25859]: Color4bv (offset 26) */ + "p\0" + "glColor4bv\0" + "\0" + /* _mesa_function_pool[25873]: VertexAttrib2fvNV (will be remapped) */ + "ip\0" + "glVertexAttrib2fvNV\0" + "\0" + /* _mesa_function_pool[25897]: Vertex2s (offset 132) */ + "ii\0" + "glVertex2s\0" + "\0" + /* _mesa_function_pool[25912]: ActiveTexture (offset 374) */ + "i\0" + "glActiveTexture\0" + "glActiveTextureARB\0" + "\0" + /* _mesa_function_pool[25950]: GlobalAlphaFactorfSUN (dynamic) */ + "f\0" + "glGlobalAlphaFactorfSUN\0" + "\0" + /* _mesa_function_pool[25977]: ColorP4uiv (will be remapped) */ + "ip\0" + "glColorP4uiv\0" + "\0" + /* _mesa_function_pool[25994]: DrawTexxOES (will be remapped) */ + "iiiii\0" + "glDrawTexxOES\0" + "\0" + /* _mesa_function_pool[26015]: SetFenceNV (dynamic) */ + "ii\0" + "glSetFenceNV\0" + "\0" + /* _mesa_function_pool[26032]: PixelTexGenParameterivSGIS (dynamic) */ + "ip\0" + "glPixelTexGenParameterivSGIS\0" + "\0" + /* _mesa_function_pool[26065]: MultiTexCoordP3ui (will be remapped) */ + "iii\0" + "glMultiTexCoordP3ui\0" + "\0" + /* _mesa_function_pool[26090]: GetAttribLocation (will be remapped) */ + "ip\0" + "glGetAttribLocation\0" + "glGetAttribLocationARB\0" + "\0" + /* _mesa_function_pool[26137]: GetCombinerStageParameterfvNV (dynamic) */ + "iip\0" + "glGetCombinerStageParameterfvNV\0" + "\0" + /* _mesa_function_pool[26174]: DrawBuffer (offset 202) */ + "i\0" + "glDrawBuffer\0" + "\0" + /* _mesa_function_pool[26190]: MultiTexCoord2dv (offset 385) */ + "ip\0" + "glMultiTexCoord2dv\0" + "glMultiTexCoord2dvARB\0" + "\0" + /* _mesa_function_pool[26235]: IsSampler (will be remapped) */ + "i\0" + "glIsSampler\0" + "\0" + /* _mesa_function_pool[26250]: BlendFunc (offset 241) */ + "ii\0" + "glBlendFunc\0" + "\0" + /* _mesa_function_pool[26266]: LineStipple (offset 167) */ + "ii\0" + "glLineStipple\0" + "\0" + /* _mesa_function_pool[26284]: Tangent3fvEXT (dynamic) */ + "p\0" + "glTangent3fvEXT\0" + "\0" + /* _mesa_function_pool[26303]: ColorMaterial (offset 151) */ + "ii\0" + "glColorMaterial\0" + "\0" + /* _mesa_function_pool[26323]: RasterPos3sv (offset 77) */ + "p\0" + "glRasterPos3sv\0" + "\0" + /* _mesa_function_pool[26341]: TexCoordP2ui (will be remapped) */ + "ii\0" + "glTexCoordP2ui\0" + "\0" + /* _mesa_function_pool[26360]: TexParameteriv (offset 181) */ + "iip\0" + "glTexParameteriv\0" + "\0" + /* _mesa_function_pool[26382]: VertexAttrib3fvARB (will be remapped) */ + "ip\0" + "glVertexAttrib3fv\0" + "glVertexAttrib3fvARB\0" + "\0" + /* _mesa_function_pool[26425]: ProgramUniformMatrix3x4fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix3x4fv\0" + "glProgramUniformMatrix3x4fvEXT\0" + "\0" + /* _mesa_function_pool[26491]: PixelTransformParameterfEXT (dynamic) */ + "iif\0" + "glPixelTransformParameterfEXT\0" + "\0" + /* _mesa_function_pool[26526]: TextureColorMaskSGIS (dynamic) */ + "iiii\0" + "glTextureColorMaskSGIS\0" + "\0" + /* _mesa_function_pool[26555]: GetColorTable (offset 343) */ + "iiip\0" + "glGetColorTable\0" + "glGetColorTableSGI\0" + "glGetColorTableEXT\0" + "\0" + /* _mesa_function_pool[26615]: TexCoord3i (offset 114) */ + "iii\0" + "glTexCoord3i\0" + "\0" + /* _mesa_function_pool[26633]: CopyColorTable (offset 342) */ + "iiiii\0" + "glCopyColorTable\0" + "glCopyColorTableSGI\0" + "\0" + /* _mesa_function_pool[26677]: Frustum (offset 289) */ + "dddddd\0" + "glFrustum\0" + "\0" + /* _mesa_function_pool[26695]: TexCoord3d (offset 110) */ + "ddd\0" + "glTexCoord3d\0" + "\0" + /* _mesa_function_pool[26713]: TexCoord3f (offset 112) */ + "fff\0" + "glTexCoord3f\0" + "\0" + /* _mesa_function_pool[26731]: DepthRangeArrayv (will be remapped) */ + "iip\0" + "glDepthRangeArrayv\0" + "\0" + /* _mesa_function_pool[26755]: DeleteTextures (offset 327) */ + "ip\0" + "glDeleteTextures\0" + "glDeleteTexturesEXT\0" + "\0" + /* _mesa_function_pool[26796]: TexCoordPointerEXT (will be remapped) */ + "iiiip\0" + "glTexCoordPointerEXT\0" + "\0" + /* _mesa_function_pool[26824]: TexCoord3s (offset 116) */ + "iii\0" + "glTexCoord3s\0" + "\0" + /* _mesa_function_pool[26842]: TexCoord4fVertex4fSUN (dynamic) */ + "ffffffff\0" + "glTexCoord4fVertex4fSUN\0" + "\0" + /* _mesa_function_pool[26876]: CombinerStageParameterfvNV (dynamic) */ + "iip\0" + "glCombinerStageParameterfvNV\0" + "\0" + /* _mesa_function_pool[26910]: GenPerfMonitorsAMD (will be remapped) */ + "ip\0" + "glGenPerfMonitorsAMD\0" + "\0" + /* _mesa_function_pool[26935]: ClearAccum (offset 204) */ + "ffff\0" + "glClearAccum\0" + "\0" + /* _mesa_function_pool[26954]: DeformSGIX (dynamic) */ + "i\0" + "glDeformSGIX\0" + "\0" + /* _mesa_function_pool[26970]: TexCoord4iv (offset 123) */ + "p\0" + "glTexCoord4iv\0" + "\0" + /* _mesa_function_pool[26987]: TexStorage3D (will be remapped) */ + "iiiiii\0" + "glTexStorage3D\0" + "\0" + /* _mesa_function_pool[27010]: FramebufferTexture3D (will be remapped) */ + "iiiiii\0" + "glFramebufferTexture3D\0" + "glFramebufferTexture3DEXT\0" + "glFramebufferTexture3DOES\0" + "\0" + /* _mesa_function_pool[27093]: FragmentLightModelfvSGIX (dynamic) */ + "ip\0" + "glFragmentLightModelfvSGIX\0" + "\0" + /* _mesa_function_pool[27124]: GetBufferParameteriv (will be remapped) */ + "iip\0" + "glGetBufferParameteriv\0" + "glGetBufferParameterivARB\0" + "\0" + /* _mesa_function_pool[27178]: VertexAttrib2fNV (will be remapped) */ + "iff\0" + "glVertexAttrib2fNV\0" + "\0" + /* _mesa_function_pool[27202]: GetFragmentLightfvSGIX (dynamic) */ + "iip\0" + "glGetFragmentLightfvSGIX\0" + "\0" + /* _mesa_function_pool[27232]: CopyTexImage2D (offset 324) */ + "iiiiiiii\0" + "glCopyTexImage2D\0" + "glCopyTexImage2DEXT\0" + "\0" + /* _mesa_function_pool[27279]: Vertex3fv (offset 137) */ + "p\0" + "glVertex3fv\0" + "\0" + /* _mesa_function_pool[27294]: WindowPos4dvMESA (will be remapped) */ + "p\0" + "glWindowPos4dvMESA\0" + "\0" + /* _mesa_function_pool[27316]: CreateShaderProgramEXT (will be remapped) */ + "ip\0" + "glCreateShaderProgramEXT\0" + "\0" + /* _mesa_function_pool[27345]: VertexAttribs1dvNV (will be remapped) */ + "iip\0" + "glVertexAttribs1dvNV\0" + "\0" + /* _mesa_function_pool[27371]: IsQuery (will be remapped) */ + "i\0" + "glIsQuery\0" + "glIsQueryARB\0" + "\0" + /* _mesa_function_pool[27397]: EdgeFlagPointerEXT (will be remapped) */ + "iip\0" + "glEdgeFlagPointerEXT\0" + "\0" + /* _mesa_function_pool[27423]: VertexAttribs2svNV (will be remapped) */ + "iip\0" + "glVertexAttribs2svNV\0" + "\0" + /* _mesa_function_pool[27449]: CreateShaderProgramv (will be remapped) */ + "iip\0" + "glCreateShaderProgramv\0" + "glCreateShaderProgramvEXT\0" + "\0" + /* _mesa_function_pool[27503]: BlendEquationiARB (will be remapped) */ + "ii\0" + "glBlendEquationiARB\0" + "glBlendEquationIndexedAMD\0" + "glBlendEquationi\0" + "\0" + /* _mesa_function_pool[27570]: VertexAttribI4uivEXT (will be remapped) */ + "ip\0" + "glVertexAttribI4uivEXT\0" + "glVertexAttribI4uiv\0" + "\0" + /* _mesa_function_pool[27617]: PointSizex (will be remapped) */ + "i\0" + "glPointSizexOES\0" + "glPointSizex\0" + "\0" + /* _mesa_function_pool[27649]: PolygonMode (offset 174) */ + "ii\0" + "glPolygonMode\0" + "\0" + /* _mesa_function_pool[27667]: SecondaryColor3iv (will be remapped) */ + "p\0" + "glSecondaryColor3iv\0" + "glSecondaryColor3ivEXT\0" + "\0" + /* _mesa_function_pool[27713]: VertexAttribI1iEXT (will be remapped) */ + "ii\0" + "glVertexAttribI1iEXT\0" + "glVertexAttribI1i\0" + "\0" + /* _mesa_function_pool[27756]: VertexAttrib4Niv (will be remapped) */ + "ip\0" + "glVertexAttrib4Niv\0" + "glVertexAttrib4NivARB\0" + "\0" + /* _mesa_function_pool[27801]: GetMapAttribParameterivNV (dynamic) */ + "iiip\0" + "glGetMapAttribParameterivNV\0" + "\0" + /* _mesa_function_pool[27835]: GetnUniformdvARB (will be remapped) */ + "iiip\0" + "glGetnUniformdvARB\0" + "\0" + /* _mesa_function_pool[27860]: LinkProgram (will be remapped) */ + "i\0" + "glLinkProgram\0" + "glLinkProgramARB\0" + "\0" + /* _mesa_function_pool[27894]: ProgramUniform4f (will be remapped) */ + "iiffff\0" + "glProgramUniform4f\0" + "glProgramUniform4fEXT\0" + "\0" + /* _mesa_function_pool[27943]: ProgramUniform4i (will be remapped) */ + "iiiiii\0" + "glProgramUniform4i\0" + "glProgramUniform4iEXT\0" + "\0" + /* _mesa_function_pool[27992]: ListParameterfvSGIX (dynamic) */ + "iip\0" + "glListParameterfvSGIX\0" + "\0" + /* _mesa_function_pool[28019]: VertexAttrib4d (will be remapped) */ + "idddd\0" + "glVertexAttrib4d\0" + "glVertexAttrib4dARB\0" + "\0" + /* _mesa_function_pool[28063]: WindowPos4sMESA (will be remapped) */ + "iiii\0" + "glWindowPos4sMESA\0" + "\0" + /* _mesa_function_pool[28087]: VertexAttrib4s (will be remapped) */ + "iiiii\0" + "glVertexAttrib4s\0" + "glVertexAttrib4sARB\0" + "\0" + /* _mesa_function_pool[28131]: VertexAttrib1dvNV (will be remapped) */ + "ip\0" + "glVertexAttrib1dvNV\0" + "\0" + /* _mesa_function_pool[28155]: ReplacementCodePointerSUN (dynamic) */ + "iip\0" + "glReplacementCodePointerSUN\0" + "\0" + /* _mesa_function_pool[28188]: TexStorage3DMultisample (will be remapped) */ + "iiiiiii\0" + "glTexStorage3DMultisample\0" + "\0" + /* _mesa_function_pool[28223]: Binormal3bvEXT (dynamic) */ + "p\0" + "glBinormal3bvEXT\0" + "\0" + /* _mesa_function_pool[28243]: SamplerParameteriv (will be remapped) */ + "iip\0" + "glSamplerParameteriv\0" + "\0" + /* _mesa_function_pool[28269]: VertexAttribP3uiv (will be remapped) */ + "iiip\0" + "glVertexAttribP3uiv\0" + "\0" + /* _mesa_function_pool[28295]: ScissorIndexedv (will be remapped) */ + "ip\0" + "glScissorIndexedv\0" + "\0" + /* _mesa_function_pool[28317]: Color4ubVertex2fSUN (dynamic) */ + "iiiiff\0" + "glColor4ubVertex2fSUN\0" + "\0" + /* _mesa_function_pool[28347]: FragmentColorMaterialSGIX (dynamic) */ + "ii\0" + "glFragmentColorMaterialSGIX\0" + "\0" + /* _mesa_function_pool[28379]: GetStringi (will be remapped) */ + "ii\0" + "glGetStringi\0" + "\0" + /* _mesa_function_pool[28396]: VertexAttrib4dv (will be remapped) */ + "ip\0" + "glVertexAttrib4dv\0" + "glVertexAttrib4dvARB\0" + "\0" + /* _mesa_function_pool[28439]: EvalCoord2dv (offset 233) */ + "p\0" + "glEvalCoord2dv\0" + "\0" + /* _mesa_function_pool[28457]: VertexAttrib1fNV (will be remapped) */ + "if\0" + "glVertexAttrib1fNV\0" + "\0" + /* _mesa_function_pool[28480]: CompressedTexSubImage1D (will be remapped) */ + "iiiiiip\0" + "glCompressedTexSubImage1D\0" + "glCompressedTexSubImage1DARB\0" + "\0" + /* _mesa_function_pool[28544]: GetSeparableFilter (offset 359) */ + "iiippp\0" + "glGetSeparableFilter\0" + "glGetSeparableFilterEXT\0" + "\0" + /* _mesa_function_pool[28597]: ReplacementCodeusSUN (dynamic) */ + "i\0" + "glReplacementCodeusSUN\0" + "\0" + /* _mesa_function_pool[28623]: FeedbackBuffer (offset 194) */ + "iip\0" + "glFeedbackBuffer\0" + "\0" + /* _mesa_function_pool[28645]: RasterPos2iv (offset 67) */ + "p\0" + "glRasterPos2iv\0" + "\0" + /* _mesa_function_pool[28663]: TexImage1D (offset 182) */ + "iiiiiiip\0" + "glTexImage1D\0" + "\0" + /* _mesa_function_pool[28686]: MultiDrawElementsEXT (will be remapped) */ + "ipipi\0" + "glMultiDrawElements\0" + "glMultiDrawElementsEXT\0" + "\0" + /* _mesa_function_pool[28736]: GetnSeparableFilterARB (will be remapped) */ + "iiiipipp\0" + "glGetnSeparableFilterARB\0" + "\0" + /* _mesa_function_pool[28771]: FrontFace (offset 157) */ + "i\0" + "glFrontFace\0" + "\0" + /* _mesa_function_pool[28786]: MultiModeDrawArraysIBM (will be remapped) */ + "pppii\0" + "glMultiModeDrawArraysIBM\0" + "\0" + /* _mesa_function_pool[28818]: Tangent3ivEXT (dynamic) */ + "p\0" + "glTangent3ivEXT\0" + "\0" + /* _mesa_function_pool[28837]: LightEnviSGIX (dynamic) */ + "ii\0" + "glLightEnviSGIX\0" + "\0" + /* _mesa_function_pool[28857]: Normal3dv (offset 55) */ + "p\0" + "glNormal3dv\0" + "\0" + /* _mesa_function_pool[28872]: Lightf (offset 159) */ + "iif\0" + "glLightf\0" + "\0" + /* _mesa_function_pool[28886]: MatrixMode (offset 293) */ + "i\0" + "glMatrixMode\0" + "\0" + /* _mesa_function_pool[28902]: GetPixelMapusv (offset 273) */ + "ip\0" + "glGetPixelMapusv\0" + "\0" + /* _mesa_function_pool[28923]: Lighti (offset 161) */ + "iii\0" + "glLighti\0" + "\0" + /* _mesa_function_pool[28937]: VertexAttribPointerNV (will be remapped) */ + "iiiip\0" + "glVertexAttribPointerNV\0" + "\0" + /* _mesa_function_pool[28968]: GetFragDataIndex (will be remapped) */ + "ip\0" + "glGetFragDataIndex\0" + "\0" + /* _mesa_function_pool[28991]: Lightx (will be remapped) */ + "iii\0" + "glLightxOES\0" + "glLightx\0" + "\0" + /* _mesa_function_pool[29017]: ProgramUniform3fv (will be remapped) */ + "iiip\0" + "glProgramUniform3fv\0" + "glProgramUniform3fvEXT\0" + "\0" + /* _mesa_function_pool[29066]: MultMatrixd (offset 295) */ + "p\0" + "glMultMatrixd\0" + "\0" + /* _mesa_function_pool[29083]: MultMatrixf (offset 294) */ + "p\0" + "glMultMatrixf\0" + "\0" + /* _mesa_function_pool[29100]: MultiTexCoord4fvARB (offset 403) */ + "ip\0" + "glMultiTexCoord4fv\0" + "glMultiTexCoord4fvARB\0" + "\0" + /* _mesa_function_pool[29145]: UniformMatrix2x3fv (will be remapped) */ + "iiip\0" + "glUniformMatrix2x3fv\0" + "\0" + /* _mesa_function_pool[29172]: TrackMatrixNV (will be remapped) */ + "iiii\0" + "glTrackMatrixNV\0" + "\0" + /* _mesa_function_pool[29194]: MultMatrixx (will be remapped) */ + "p\0" + "glMultMatrixxOES\0" + "glMultMatrixx\0" + "\0" + /* _mesa_function_pool[29228]: PointParameterx (will be remapped) */ + "ii\0" + "glPointParameterxOES\0" + "glPointParameterx\0" + "\0" + /* _mesa_function_pool[29271]: DrawArrays (offset 310) */ + "iii\0" + "glDrawArrays\0" + "glDrawArraysEXT\0" + "\0" + /* _mesa_function_pool[29305]: PointParameteri (will be remapped) */ + "ii\0" + "glPointParameteri\0" + "glPointParameteriNV\0" + "\0" + /* _mesa_function_pool[29347]: PointParameterf (will be remapped) */ + "if\0" + "glPointParameterf\0" + "glPointParameterfARB\0" + "glPointParameterfEXT\0" + "glPointParameterfSGIS\0" + "\0" + /* _mesa_function_pool[29433]: GlobalAlphaFactorsSUN (dynamic) */ + "i\0" + "glGlobalAlphaFactorsSUN\0" + "\0" + /* _mesa_function_pool[29460]: VertexAttribBinding (will be remapped) */ + "ii\0" + "glVertexAttribBinding\0" + "\0" + /* _mesa_function_pool[29486]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */ + "ppp\0" + "glReplacementCodeuiTexCoord2fVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[29533]: CreateShader (will be remapped) */ + "i\0" + "glCreateShader\0" + "\0" + /* _mesa_function_pool[29551]: GetProgramParameterdvNV (will be remapped) */ + "iiip\0" + "glGetProgramParameterdvNV\0" + "\0" + /* _mesa_function_pool[29583]: GetProgramEnvParameterfvARB (will be remapped) */ + "iip\0" + "glGetProgramEnvParameterfvARB\0" + "\0" + /* _mesa_function_pool[29618]: DeleteBuffers (will be remapped) */ + "ip\0" + "glDeleteBuffers\0" + "glDeleteBuffersARB\0" + "\0" + /* _mesa_function_pool[29657]: GetBufferSubData (will be remapped) */ + "iiip\0" + "glGetBufferSubData\0" + "glGetBufferSubDataARB\0" + "\0" + /* _mesa_function_pool[29704]: GetPerfMonitorGroupsAMD (will be remapped) */ + "pip\0" + "glGetPerfMonitorGroupsAMD\0" + "\0" + /* _mesa_function_pool[29735]: FlushRasterSGIX (dynamic) */ + "\0" + "glFlushRasterSGIX\0" + "\0" + /* _mesa_function_pool[29755]: VertexAttribP2ui (will be remapped) */ + "iiii\0" + "glVertexAttribP2ui\0" + "\0" + /* _mesa_function_pool[29780]: GetMinmaxParameteriv (offset 366) */ + "iip\0" + "glGetMinmaxParameteriv\0" + "glGetMinmaxParameterivEXT\0" + "\0" + /* _mesa_function_pool[29834]: DrawTexivOES (will be remapped) */ + "p\0" + "glDrawTexivOES\0" + "\0" + /* _mesa_function_pool[29852]: CopyTexImage1D (offset 323) */ + "iiiiiii\0" + "glCopyTexImage1D\0" + "glCopyTexImage1DEXT\0" + "\0" + /* _mesa_function_pool[29898]: GetnColorTableARB (will be remapped) */ + "iiiip\0" + "glGetnColorTableARB\0" + "\0" + /* _mesa_function_pool[29925]: VertexAttribFormat (will be remapped) */ + "iiiii\0" + "glVertexAttribFormat\0" + "\0" + /* _mesa_function_pool[29953]: Vertex3i (offset 138) */ + "iii\0" + "glVertex3i\0" + "\0" + /* _mesa_function_pool[29969]: Vertex3f (offset 136) */ + "fff\0" + "glVertex3f\0" + "\0" + /* _mesa_function_pool[29985]: Vertex3d (offset 134) */ + "ddd\0" + "glVertex3d\0" + "\0" + /* _mesa_function_pool[30001]: GetProgramPipelineiv (will be remapped) */ + "iip\0" + "glGetProgramPipelineiv\0" + "glGetProgramPipelineivEXT\0" + "\0" + /* _mesa_function_pool[30055]: ReadBuffer (offset 254) */ + "i\0" + "glReadBuffer\0" + "glReadBufferNV\0" + "\0" + /* _mesa_function_pool[30086]: ConvolutionParameteri (offset 352) */ + "iii\0" + "glConvolutionParameteri\0" + "glConvolutionParameteriEXT\0" + "\0" + /* _mesa_function_pool[30142]: GetTexParameterIiv (will be remapped) */ + "iip\0" + "glGetTexParameterIivEXT\0" + "glGetTexParameterIiv\0" + "\0" + /* _mesa_function_pool[30192]: Vertex3s (offset 140) */ + "iii\0" + "glVertex3s\0" + "\0" + /* _mesa_function_pool[30208]: ConvolutionParameterf (offset 350) */ + "iif\0" + "glConvolutionParameterf\0" + "glConvolutionParameterfEXT\0" + "\0" + /* _mesa_function_pool[30264]: GetColorTableParameteriv (offset 345) */ + "iip\0" + "glGetColorTableParameteriv\0" + "glGetColorTableParameterivSGI\0" + "glGetColorTableParameterivEXT\0" + "\0" + /* _mesa_function_pool[30356]: GetTransformFeedbackVarying (will be remapped) */ + "iiipppp\0" + "glGetTransformFeedbackVarying\0" + "glGetTransformFeedbackVaryingEXT\0" + "\0" + /* _mesa_function_pool[30428]: GetNextPerfQueryIdINTEL (will be remapped) */ + "ip\0" + "glGetNextPerfQueryIdINTEL\0" + "\0" + /* _mesa_function_pool[30458]: TexCoord3fv (offset 113) */ + "p\0" + "glTexCoord3fv\0" + "\0" + /* _mesa_function_pool[30475]: TextureBarrierNV (will be remapped) */ + "\0" + "glTextureBarrier\0" + "glTextureBarrierNV\0" + "\0" + /* _mesa_function_pool[30513]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */ + "iffffffffff\0" + "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[30572]: ProgramLocalParameter4fARB (will be remapped) */ + "iiffff\0" + "glProgramLocalParameter4fARB\0" + "\0" + /* _mesa_function_pool[30609]: ObjectLabel (will be remapped) */ + "iiip\0" + "glObjectLabel\0" + "\0" + /* _mesa_function_pool[30629]: PauseTransformFeedback (will be remapped) */ + "\0" + "glPauseTransformFeedback\0" + "\0" + /* _mesa_function_pool[30656]: DeleteShader (will be remapped) */ + "i\0" + "glDeleteShader\0" + "\0" + /* _mesa_function_pool[30674]: CompileShader (will be remapped) */ + "i\0" + "glCompileShader\0" + "glCompileShaderARB\0" + "\0" + /* _mesa_function_pool[30712]: Vertex2iv (offset 131) */ + "p\0" + "glVertex2iv\0" + "\0" + /* _mesa_function_pool[30727]: TexGendv (offset 189) */ + "iip\0" + "glTexGendv\0" + "\0" + /* _mesa_function_pool[30743]: ProgramLocalParameters4fvEXT (will be remapped) */ + "iiip\0" + "glProgramLocalParameters4fvEXT\0" + "\0" + /* _mesa_function_pool[30780]: ResetMinmax (offset 370) */ + "i\0" + "glResetMinmax\0" + "glResetMinmaxEXT\0" + "\0" + /* _mesa_function_pool[30814]: SpriteParameterfSGIX (dynamic) */ + "if\0" + "glSpriteParameterfSGIX\0" + "\0" + /* _mesa_function_pool[30841]: DeleteProgramsARB (will be remapped) */ + "ip\0" + "glDeleteProgramsARB\0" + "glDeleteProgramsNV\0" + "\0" + /* _mesa_function_pool[30884]: ShadeModel (offset 177) */ + "i\0" + "glShadeModel\0" + "\0" + /* _mesa_function_pool[30900]: VertexAttribs1fvNV (will be remapped) */ + "iip\0" + "glVertexAttribs1fvNV\0" + "\0" + /* _mesa_function_pool[30926]: FogFuncSGIS (dynamic) */ + "ip\0" + "glFogFuncSGIS\0" + "\0" + /* _mesa_function_pool[30944]: GetTexLevelParameteriv (offset 285) */ + "iiip\0" + "glGetTexLevelParameteriv\0" + "\0" + /* _mesa_function_pool[30975]: MultiDrawArrays (will be remapped) */ + "ippi\0" + "glMultiDrawArrays\0" + "glMultiDrawArraysEXT\0" + "\0" + /* _mesa_function_pool[31020]: GetProgramLocalParameterdvARB (will be remapped) */ + "iip\0" + "glGetProgramLocalParameterdvARB\0" + "\0" + /* _mesa_function_pool[31057]: MapBufferRange (will be remapped) */ + "iiii\0" + "glMapBufferRange\0" + "glMapBufferRangeEXT\0" + "\0" + /* _mesa_function_pool[31100]: DispatchCompute (will be remapped) */ + "iii\0" + "glDispatchCompute\0" + "\0" + /* _mesa_function_pool[31123]: UseProgramStages (will be remapped) */ + "iii\0" + "glUseProgramStages\0" + "glUseProgramStagesEXT\0" + "\0" + /* _mesa_function_pool[31169]: ProgramUniformMatrix4fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix4fv\0" + "glProgramUniformMatrix4fvEXT\0" + "\0" + /* _mesa_function_pool[31231]: FinishAsyncSGIX (dynamic) */ + "p\0" + "glFinishAsyncSGIX\0" + "\0" + /* _mesa_function_pool[31252]: FramebufferRenderbuffer (will be remapped) */ + "iiii\0" + "glFramebufferRenderbuffer\0" + "glFramebufferRenderbufferEXT\0" + "glFramebufferRenderbufferOES\0" + "\0" + /* _mesa_function_pool[31342]: IsProgramARB (will be remapped) */ + "i\0" + "glIsProgramARB\0" + "glIsProgramNV\0" + "\0" + /* _mesa_function_pool[31374]: Map2d (offset 222) */ + "iddiiddiip\0" + "glMap2d\0" + "\0" + /* _mesa_function_pool[31394]: Map2f (offset 223) */ + "iffiiffiip\0" + "glMap2f\0" + "\0" + /* _mesa_function_pool[31414]: ProgramStringARB (will be remapped) */ + "iiip\0" + "glProgramStringARB\0" + "\0" + /* _mesa_function_pool[31439]: MultiTexCoord4x (will be remapped) */ + "iiiii\0" + "glMultiTexCoord4xOES\0" + "glMultiTexCoord4x\0" + "\0" + /* _mesa_function_pool[31485]: MultiTexCoord4s (offset 406) */ + "iiiii\0" + "glMultiTexCoord4s\0" + "glMultiTexCoord4sARB\0" + "\0" + /* _mesa_function_pool[31531]: ViewportIndexedf (will be remapped) */ + "iffff\0" + "glViewportIndexedf\0" + "\0" + /* _mesa_function_pool[31557]: MultiTexCoord4i (offset 404) */ + "iiiii\0" + "glMultiTexCoord4i\0" + "glMultiTexCoord4iARB\0" + "\0" + /* _mesa_function_pool[31603]: ApplyTextureEXT (dynamic) */ + "i\0" + "glApplyTextureEXT\0" + "\0" + /* _mesa_function_pool[31624]: DebugMessageControl (will be remapped) */ + "iiiipi\0" + "glDebugMessageControlARB\0" + "glDebugMessageControl\0" + "\0" + /* _mesa_function_pool[31679]: MultiTexCoord4d (offset 400) */ + "idddd\0" + "glMultiTexCoord4d\0" + "glMultiTexCoord4dARB\0" + "\0" + /* _mesa_function_pool[31725]: GetHistogram (offset 361) */ + "iiiip\0" + "glGetHistogram\0" + "glGetHistogramEXT\0" + "\0" + /* _mesa_function_pool[31765]: Translatex (will be remapped) */ + "iii\0" + "glTranslatexOES\0" + "glTranslatex\0" + "\0" + /* _mesa_function_pool[31799]: IglooInterfaceSGIX (dynamic) */ + "ip\0" + "glIglooInterfaceSGIX\0" + "\0" + /* _mesa_function_pool[31824]: Indexsv (offset 51) */ + "p\0" + "glIndexsv\0" + "\0" + /* _mesa_function_pool[31837]: VertexAttrib1fvARB (will be remapped) */ + "ip\0" + "glVertexAttrib1fv\0" + "glVertexAttrib1fvARB\0" + "\0" + /* _mesa_function_pool[31880]: TexCoord2dv (offset 103) */ + "p\0" + "glTexCoord2dv\0" + "\0" + /* _mesa_function_pool[31897]: Translated (offset 303) */ + "ddd\0" + "glTranslated\0" + "\0" + /* _mesa_function_pool[31915]: Translatef (offset 304) */ + "fff\0" + "glTranslatef\0" + "\0" + /* _mesa_function_pool[31933]: MultTransposeMatrixd (will be remapped) */ + "p\0" + "glMultTransposeMatrixd\0" + "glMultTransposeMatrixdARB\0" + "\0" + /* _mesa_function_pool[31985]: ProgramUniform4uiv (will be remapped) */ + "iiip\0" + "glProgramUniform4uiv\0" + "glProgramUniform4uivEXT\0" + "\0" + /* _mesa_function_pool[32036]: GetPerfCounterInfoINTEL (will be remapped) */ + "iiipipppppp\0" + "glGetPerfCounterInfoINTEL\0" + "\0" + /* _mesa_function_pool[32075]: RenderMode (offset 196) */ + "i\0" + "glRenderMode\0" + "\0" + /* _mesa_function_pool[32091]: MultiTexCoord1fARB (offset 378) */ + "if\0" + "glMultiTexCoord1f\0" + "glMultiTexCoord1fARB\0" + "\0" + /* _mesa_function_pool[32134]: SecondaryColor3d (will be remapped) */ + "ddd\0" + "glSecondaryColor3d\0" + "glSecondaryColor3dEXT\0" + "\0" + /* _mesa_function_pool[32180]: VertexAttribs4ubvNV (will be remapped) */ + "iip\0" + "glVertexAttribs4ubvNV\0" + "\0" + /* _mesa_function_pool[32207]: WeightsvARB (dynamic) */ + "ip\0" + "glWeightsvARB\0" + "\0" + /* _mesa_function_pool[32225]: ProgramUniform4fv (will be remapped) */ + "iiip\0" + "glProgramUniform4fv\0" + "glProgramUniform4fvEXT\0" + "\0" + /* _mesa_function_pool[32274]: LightModelxv (will be remapped) */ + "ip\0" + "glLightModelxvOES\0" + "glLightModelxv\0" + "\0" + /* _mesa_function_pool[32311]: CopyTexSubImage1D (offset 325) */ + "iiiiii\0" + "glCopyTexSubImage1D\0" + "glCopyTexSubImage1DEXT\0" + "\0" + /* _mesa_function_pool[32362]: PushDebugGroup (will be remapped) */ + "iiip\0" + "glPushDebugGroup\0" + "\0" + /* _mesa_function_pool[32385]: StencilFunc (offset 243) */ + "iii\0" + "glStencilFunc\0" + "\0" + /* _mesa_function_pool[32404]: CopyPixels (offset 255) */ + "iiiii\0" + "glCopyPixels\0" + "\0" + /* _mesa_function_pool[32424]: TexGenxvOES (will be remapped) */ + "iip\0" + "glTexGenxvOES\0" + "\0" + /* _mesa_function_pool[32443]: VertexAttrib4Nubv (will be remapped) */ + "ip\0" + "glVertexAttrib4Nubv\0" + "glVertexAttrib4NubvARB\0" + "\0" + /* _mesa_function_pool[32490]: GetFogFuncSGIS (dynamic) */ + "p\0" + "glGetFogFuncSGIS\0" + "\0" + /* _mesa_function_pool[32510]: VertexP2uiv (will be remapped) */ + "ip\0" + "glVertexP2uiv\0" + "\0" + /* _mesa_function_pool[32528]: VertexAttribPointer (will be remapped) */ + "iiiiip\0" + "glVertexAttribPointer\0" + "glVertexAttribPointerARB\0" + "\0" + /* _mesa_function_pool[32583]: IndexMask (offset 212) */ + "i\0" + "glIndexMask\0" + "\0" + /* _mesa_function_pool[32598]: SharpenTexFuncSGIS (dynamic) */ + "iip\0" + "glSharpenTexFuncSGIS\0" + "\0" + /* _mesa_function_pool[32624]: VertexAttribIFormat (will be remapped) */ + "iiii\0" + "glVertexAttribIFormat\0" + "\0" + /* _mesa_function_pool[32652]: CombinerOutputNV (dynamic) */ + "iiiiiiiiii\0" + "glCombinerOutputNV\0" + "\0" + /* _mesa_function_pool[32683]: DrawArraysInstancedBaseInstance (will be remapped) */ + "iiiii\0" + "glDrawArraysInstancedBaseInstance\0" + "\0" + /* _mesa_function_pool[32724]: PopAttrib (offset 218) */ + "\0" + "glPopAttrib\0" + "\0" + /* _mesa_function_pool[32738]: SamplePatternSGIS (will be remapped) */ + "i\0" + "glSamplePatternSGIS\0" + "glSamplePatternEXT\0" + "\0" + /* _mesa_function_pool[32780]: Uniform3ui (will be remapped) */ + "iiii\0" + "glUniform3uiEXT\0" + "glUniform3ui\0" + "\0" + /* _mesa_function_pool[32815]: DeletePerfMonitorsAMD (will be remapped) */ + "ip\0" + "glDeletePerfMonitorsAMD\0" + "\0" + /* _mesa_function_pool[32843]: Color4dv (offset 28) */ + "p\0" + "glColor4dv\0" + "\0" + /* _mesa_function_pool[32857]: AreProgramsResidentNV (will be remapped) */ + "ipp\0" + "glAreProgramsResidentNV\0" + "\0" + /* _mesa_function_pool[32886]: DisableVertexAttribArray (will be remapped) */ + "i\0" + "glDisableVertexAttribArray\0" + "glDisableVertexAttribArrayARB\0" + "\0" + /* _mesa_function_pool[32946]: ProgramUniformMatrix3x2fv (will be remapped) */ + "iiiip\0" + "glProgramUniformMatrix3x2fv\0" + "glProgramUniformMatrix3x2fvEXT\0" + "\0" + /* _mesa_function_pool[33012]: GetDoublei_v (will be remapped) */ + "iip\0" + "glGetDoublei_v\0" + "\0" + /* _mesa_function_pool[33032]: IsTransformFeedback (will be remapped) */ + "i\0" + "glIsTransformFeedback\0" + "\0" + /* _mesa_function_pool[33057]: ClipPlanex (will be remapped) */ + "ip\0" + "glClipPlanexOES\0" + "glClipPlanex\0" + "\0" + /* _mesa_function_pool[33090]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */ + "iffffff\0" + "glReplacementCodeuiColor3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[33137]: GetLightfv (offset 264) */ + "iip\0" + "glGetLightfv\0" + "\0" + /* _mesa_function_pool[33155]: ClipPlanef (will be remapped) */ + "ip\0" + "glClipPlanefOES\0" + "glClipPlanef\0" + "\0" + /* _mesa_function_pool[33188]: ProgramUniform1ui (will be remapped) */ + "iii\0" + "glProgramUniform1ui\0" + "glProgramUniform1uiEXT\0" + "\0" + /* _mesa_function_pool[33236]: SecondaryColorPointer (will be remapped) */ + "iiip\0" + "glSecondaryColorPointer\0" + "glSecondaryColorPointerEXT\0" + "\0" + /* _mesa_function_pool[33293]: Tangent3svEXT (dynamic) */ + "p\0" + "glTangent3svEXT\0" + "\0" + /* _mesa_function_pool[33312]: Tangent3iEXT (dynamic) */ + "iii\0" + "glTangent3iEXT\0" + "\0" + /* _mesa_function_pool[33332]: Indexub (offset 315) */ + "i\0" + "glIndexub\0" + "\0" + /* _mesa_function_pool[33345]: FragmentLightfSGIX (dynamic) */ + "iif\0" + "glFragmentLightfSGIX\0" + "\0" + /* _mesa_function_pool[33371]: BeginFragmentShaderATI (will be remapped) */ + "\0" + "glBeginFragmentShaderATI\0" + "\0" + /* _mesa_function_pool[33398]: GenRenderbuffers (will be remapped) */ + "ip\0" + "glGenRenderbuffers\0" + "glGenRenderbuffersEXT\0" + "glGenRenderbuffersOES\0" + "\0" + /* _mesa_function_pool[33465]: GetMinmaxParameterfv (offset 365) */ + "iip\0" + "glGetMinmaxParameterfv\0" + "glGetMinmaxParameterfvEXT\0" + "\0" + /* _mesa_function_pool[33519]: IsEnabledi (will be remapped) */ + "ii\0" + "glIsEnabledIndexedEXT\0" + "glIsEnabledi\0" + "\0" + /* _mesa_function_pool[33558]: FragmentMaterialivSGIX (dynamic) */ + "iip\0" + "glFragmentMaterialivSGIX\0" + "\0" + /* _mesa_function_pool[33588]: WaitSync (will be remapped) */ + "iii\0" + "glWaitSync\0" + "\0" + /* _mesa_function_pool[33604]: GetVertexAttribPointerv (will be remapped) */ + "iip\0" + "glGetVertexAttribPointerv\0" + "glGetVertexAttribPointervARB\0" + "glGetVertexAttribPointervNV\0" + "\0" + /* _mesa_function_pool[33692]: CreatePerfQueryINTEL (will be remapped) */ + "ip\0" + "glCreatePerfQueryINTEL\0" + "\0" + /* _mesa_function_pool[33719]: NewList (dynamic) */ + "ii\0" + "glNewList\0" + "\0" + /* _mesa_function_pool[33733]: TexBuffer (will be remapped) */ + "iii\0" + "glTexBufferARB\0" + "glTexBuffer\0" + "\0" + /* _mesa_function_pool[33765]: TexCoord4sv (offset 125) */ + "p\0" + "glTexCoord4sv\0" + "\0" + /* _mesa_function_pool[33782]: TexCoord1f (offset 96) */ + "f\0" + "glTexCoord1f\0" + "\0" + /* _mesa_function_pool[33798]: TexCoord1d (offset 94) */ + "d\0" + "glTexCoord1d\0" + "\0" + /* _mesa_function_pool[33814]: TexCoord1i (offset 98) */ + "i\0" + "glTexCoord1i\0" + "\0" + /* _mesa_function_pool[33830]: GetnUniformfvARB (will be remapped) */ + "iiip\0" + "glGetnUniformfvARB\0" + "\0" + /* _mesa_function_pool[33855]: TexCoord1s (offset 100) */ + "i\0" + "glTexCoord1s\0" + "\0" + /* _mesa_function_pool[33871]: GlobalAlphaFactoriSUN (dynamic) */ + "i\0" + "glGlobalAlphaFactoriSUN\0" + "\0" + /* _mesa_function_pool[33898]: TexStorage1D (will be remapped) */ + "iiii\0" + "glTexStorage1D\0" + "\0" + /* _mesa_function_pool[33919]: BlitFramebuffer (will be remapped) */ + "iiiiiiiiii\0" + "glBlitFramebuffer\0" + "glBlitFramebufferEXT\0" + "\0" + /* _mesa_function_pool[33970]: FramebufferTexture1D (will be remapped) */ + "iiiii\0" + "glFramebufferTexture1D\0" + "glFramebufferTexture1DEXT\0" + "\0" + /* _mesa_function_pool[34026]: GetMapiv (offset 268) */ + "iip\0" + "glGetMapiv\0" + "\0" + /* _mesa_function_pool[34042]: TexCoordP4ui (will be remapped) */ + "ii\0" + "glTexCoordP4ui\0" + "\0" + /* _mesa_function_pool[34061]: VertexAttrib1sv (will be remapped) */ + "ip\0" + "glVertexAttrib1sv\0" + "glVertexAttrib1svARB\0" + "\0" + /* _mesa_function_pool[34104]: WindowPos4dMESA (will be remapped) */ + "dddd\0" + "glWindowPos4dMESA\0" + "\0" + /* _mesa_function_pool[34128]: Vertex3dv (offset 135) */ + "p\0" + "glVertex3dv\0" + "\0" + /* _mesa_function_pool[34143]: MultiTexCoordP2ui (will be remapped) */ + "iii\0" + "glMultiTexCoordP2ui\0" + "\0" + /* _mesa_function_pool[34168]: GetnMapivARB (will be remapped) */ + "iiip\0" + "glGetnMapivARB\0" + "\0" + /* _mesa_function_pool[34189]: MapParameterfvNV (dynamic) */ + "iip\0" + "glMapParameterfvNV\0" + "\0" + /* _mesa_function_pool[34213]: GetVertexAttribfv (will be remapped) */ + "iip\0" + "glGetVertexAttribfv\0" + "glGetVertexAttribfvARB\0" + "\0" + /* _mesa_function_pool[34261]: MultiTexCoordP4uiv (will be remapped) */ + "iip\0" + "glMultiTexCoordP4uiv\0" + "\0" + /* _mesa_function_pool[34287]: TexGeniv (offset 193) */ + "iip\0" + "glTexGeniv\0" + "glTexGenivOES\0" + "\0" + /* _mesa_function_pool[34317]: WeightubvARB (dynamic) */ + "ip\0" + "glWeightubvARB\0" + "\0" + /* _mesa_function_pool[34336]: BlendColor (offset 336) */ + "ffff\0" + "glBlendColor\0" + "glBlendColorEXT\0" + "\0" + /* _mesa_function_pool[34371]: Materiali (offset 171) */ + "iii\0" + "glMateriali\0" + "\0" + /* _mesa_function_pool[34388]: VertexAttrib2dvNV (will be remapped) */ + "ip\0" + "glVertexAttrib2dvNV\0" + "\0" + /* _mesa_function_pool[34412]: ResetHistogram (offset 369) */ + "i\0" + "glResetHistogram\0" + "glResetHistogramEXT\0" + "\0" + /* _mesa_function_pool[34452]: CompressedTexSubImage2D (will be remapped) */ + "iiiiiiiip\0" + "glCompressedTexSubImage2D\0" + "glCompressedTexSubImage2DARB\0" + "\0" + /* _mesa_function_pool[34518]: TexCoord2sv (offset 109) */ + "p\0" + "glTexCoord2sv\0" + "\0" + /* _mesa_function_pool[34535]: StencilMaskSeparate (will be remapped) */ + "ii\0" + "glStencilMaskSeparate\0" + "\0" + /* _mesa_function_pool[34561]: MultiTexCoord3sv (offset 399) */ + "ip\0" + "glMultiTexCoord3sv\0" + "glMultiTexCoord3svARB\0" + "\0" + /* _mesa_function_pool[34606]: GetMapParameterfvNV (dynamic) */ + "iip\0" + "glGetMapParameterfvNV\0" + "\0" + /* _mesa_function_pool[34633]: TexCoord3iv (offset 115) */ + "p\0" + "glTexCoord3iv\0" + "\0" + /* _mesa_function_pool[34650]: MultiTexCoord4sv (offset 407) */ + "ip\0" + "glMultiTexCoord4sv\0" + "glMultiTexCoord4svARB\0" + "\0" + /* _mesa_function_pool[34695]: VertexBindingDivisor (will be remapped) */ + "ii\0" + "glVertexBindingDivisor\0" + "\0" + /* _mesa_function_pool[34722]: GetPerfMonitorCounterInfoAMD (will be remapped) */ + "iiip\0" + "glGetPerfMonitorCounterInfoAMD\0" + "\0" + /* _mesa_function_pool[34759]: UniformBlockBinding (will be remapped) */ + "iii\0" + "glUniformBlockBinding\0" + "\0" + /* _mesa_function_pool[34786]: FenceSync (will be remapped) */ + "ii\0" + "glFenceSync\0" + "\0" + /* _mesa_function_pool[34802]: VertexAttrib4Nusv (will be remapped) */ + "ip\0" + "glVertexAttrib4Nusv\0" + "glVertexAttrib4NusvARB\0" + "\0" + /* _mesa_function_pool[34849]: SetFragmentShaderConstantATI (will be remapped) */ + "ip\0" + "glSetFragmentShaderConstantATI\0" + "\0" + /* _mesa_function_pool[34884]: VertexP2ui (will be remapped) */ + "ii\0" + "glVertexP2ui\0" + "\0" + /* _mesa_function_pool[34901]: GetTexEnvfv (offset 276) */ + "iip\0" + "glGetTexEnvfv\0" + "\0" + /* _mesa_function_pool[34920]: BindAttribLocation (will be remapped) */ + "iip\0" + "glBindAttribLocation\0" + "glBindAttribLocationARB\0" + "\0" + /* _mesa_function_pool[34970]: TextureStorage2DEXT (will be remapped) */ + "iiiiii\0" + "glTextureStorage2DEXT\0" + "\0" + /* _mesa_function_pool[35000]: FragmentLightiSGIX (dynamic) */ + "iii\0" + "glFragmentLightiSGIX\0" + "\0" + /* _mesa_function_pool[35026]: DrawTransformFeedbackInstanced (will be remapped) */ + "iii\0" + "glDrawTransformFeedbackInstanced\0" + "\0" + /* _mesa_function_pool[35064]: PollAsyncSGIX (dynamic) */ + "p\0" + "glPollAsyncSGIX\0" + "\0" + /* _mesa_function_pool[35083]: ResumeTransformFeedback (will be remapped) */ + "\0" + "glResumeTransformFeedback\0" + "\0" + /* _mesa_function_pool[35111]: GetProgramNamedParameterdvNV (will be remapped) */ + "iipp\0" + "glGetProgramNamedParameterdvNV\0" + "\0" + /* _mesa_function_pool[35148]: VertexAttribI1iv (will be remapped) */ + "ip\0" + "glVertexAttribI1ivEXT\0" + "glVertexAttribI1iv\0" + "\0" + /* _mesa_function_pool[35193]: Vertex2dv (offset 127) */ + "p\0" + "glVertex2dv\0" + "\0" + /* _mesa_function_pool[35208]: VertexAttribI2uivEXT (will be remapped) */ + "ip\0" + "glVertexAttribI2uivEXT\0" + "glVertexAttribI2uiv\0" + "\0" + /* _mesa_function_pool[35255]: SampleMaski (will be remapped) */ + "ii\0" + "glSampleMaski\0" + "\0" + /* _mesa_function_pool[35273]: GetFloati_v (will be remapped) */ + "iip\0" + "glGetFloati_v\0" + "\0" + /* _mesa_function_pool[35292]: MultiTexCoord2iv (offset 389) */ + "ip\0" + "glMultiTexCoord2iv\0" + "glMultiTexCoord2ivARB\0" + "\0" + /* _mesa_function_pool[35337]: DrawPixels (offset 257) */ + "iiiip\0" + "glDrawPixels\0" + "\0" + /* _mesa_function_pool[35357]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */ + "iffffffff\0" + "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0" + "\0" + /* _mesa_function_pool[35417]: DrawTransformFeedback (will be remapped) */ + "ii\0" + "glDrawTransformFeedback\0" + "\0" + /* _mesa_function_pool[35445]: VertexAttribs3fvNV (will be remapped) */ + "iip\0" + "glVertexAttribs3fvNV\0" + "\0" + /* _mesa_function_pool[35471]: GenLists (offset 5) */ + "i\0" + "glGenLists\0" + "\0" + /* _mesa_function_pool[35485]: MapGrid2d (offset 226) */ + "iddidd\0" + "glMapGrid2d\0" + "\0" + /* _mesa_function_pool[35505]: MapGrid2f (offset 227) */ + "iffiff\0" + "glMapGrid2f\0" + "\0" + /* _mesa_function_pool[35525]: SampleMapATI (will be remapped) */ + "iii\0" + "glSampleMapATI\0" + "\0" + /* _mesa_function_pool[35545]: TexBumpParameterfvATI (will be remapped) */ + "ip\0" + "glTexBumpParameterfvATI\0" + "\0" + /* _mesa_function_pool[35573]: GetActiveAttrib (will be remapped) */ + "iiipppp\0" + "glGetActiveAttrib\0" + "glGetActiveAttribARB\0" + "\0" + /* _mesa_function_pool[35621]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */ + "ppp\0" + "glTexCoord2fColor4ubVertex3fvSUN\0" + "\0" + /* _mesa_function_pool[35659]: PixelMapfv (offset 251) */ + "iip\0" + "glPixelMapfv\0" + "\0" + /* _mesa_function_pool[35677]: ClearBufferData (will be remapped) */ + "iiiip\0" + "glClearBufferData\0" + "\0" + /* _mesa_function_pool[35702]: Color3usv (offset 24) */ + "p\0" + "glColor3usv\0" + "\0" + /* _mesa_function_pool[35717]: CopyImageSubData (will be remapped) */ + "iiiiiiiiiiiiiii\0" + "glCopyImageSubData\0" + "\0" + /* _mesa_function_pool[35753]: StencilOpSeparate (will be remapped) */ + "iiii\0" + "glStencilOpSeparate\0" + "glStencilOpSeparateATI\0" + "\0" + /* _mesa_function_pool[35802]: GenSamplers (will be remapped) */ + "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" + "\0" + ; + +/* these functions need to be remapped */ +static const struct gl_function_pool_remap MESA_remap_table_functions[] = { + { 17938, CompressedTexImage1D_remap_index }, + { 15428, CompressedTexImage2D_remap_index }, + { 11318, CompressedTexImage3D_remap_index }, + { 28480, CompressedTexSubImage1D_remap_index }, + { 34452, CompressedTexSubImage2D_remap_index }, + { 5829, CompressedTexSubImage3D_remap_index }, + { 3939, GetCompressedTexImage_remap_index }, + { 17147, LoadTransposeMatrixd_remap_index }, + { 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 }, + { 27667, SecondaryColor3iv_remap_index }, + { 4847, SecondaryColor3s_remap_index }, + { 14714, SecondaryColor3sv_remap_index }, + { 20882, SecondaryColor3ub_remap_index }, + { 6722, SecondaryColor3ubv_remap_index }, + { 20930, SecondaryColor3ui_remap_index }, + { 22812, SecondaryColor3uiv_remap_index }, + { 20773, SecondaryColor3us_remap_index }, + { 9174, SecondaryColor3usv_remap_index }, + { 33236, SecondaryColorPointer_remap_index }, + { 11076, WindowPos2d_remap_index }, + { 16161, WindowPos2dv_remap_index }, + { 11023, WindowPos2f_remap_index }, + { 22166, WindowPos2fv_remap_index }, + { 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 }, + { 11644, GetQueryiv_remap_index }, + { 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 }, + { 21734, GetProgramiv_remap_index }, + { 3680, GetShaderInfoLog_remap_index }, + { 7072, GetShaderSource_remap_index }, + { 16495, GetShaderiv_remap_index }, + { 6016, GetUniformLocation_remap_index }, + { 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 }, + { 23311, VertexAttrib2dv_remap_index }, + { 7758, VertexAttrib2s_remap_index }, + { 14067, VertexAttrib2sv_remap_index }, + { 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 }, + { 1439, VertexAttrib4Nub_remap_index }, + { 32443, VertexAttrib4Nubv_remap_index }, + { 10320, VertexAttrib4Nuiv_remap_index }, + { 34802, VertexAttrib4Nusv_remap_index }, + { 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 }, + { 20120, VertexAttrib4uiv_remap_index }, + { 1365, VertexAttrib4usv_remap_index }, + { 32528, VertexAttribPointer_remap_index }, + { 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 }, + { 12500, BindBufferBase_remap_index }, + { 7600, BindBufferRange_remap_index }, + { 22330, BindFragDataLocation_remap_index }, + { 23419, ClampColor_remap_index }, + { 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 }, + { 13177, Uniform2uiv_remap_index }, + { 32780, Uniform3ui_remap_index }, + { 18920, Uniform3uiv_remap_index }, + { 11912, Uniform4ui_remap_index }, + { 17843, Uniform4uiv_remap_index }, + { 35148, VertexAttribI1iv_remap_index }, + { 11404, VertexAttribI1uiv_remap_index }, + { 7429, VertexAttribI4bv_remap_index }, + { 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 }, + { 30572, ProgramLocalParameter4fARB_remap_index }, + { 19208, ProgramLocalParameter4fvARB_remap_index }, + { 31414, ProgramStringARB_remap_index }, + { 11948, VertexAttrib1fARB_remap_index }, + { 31837, VertexAttrib1fvARB_remap_index }, + { 22124, VertexAttrib2fARB_remap_index }, + { 13428, VertexAttrib2fvARB_remap_index }, + { 334, VertexAttrib3fARB_remap_index }, + { 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 }, + { 8241, BindRenderbuffer_remap_index }, + { 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 }, + { 14885, RenderbufferStorageMultisample_remap_index }, + { 19111, FramebufferTextureFaceARB_remap_index }, + { 5197, FlushMappedBufferRange_remap_index }, + { 31057, MapBufferRange_remap_index }, + { 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 }, + { 24821, BlendFunciARB_remap_index }, + { 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 }, + { 23282, GetSamplerParameterfv_remap_index }, + { 24997, GetSamplerParameteriv_remap_index }, + { 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 }, + { 13794, MultiTexCoordP1ui_remap_index }, + { 25747, MultiTexCoordP1uiv_remap_index }, + { 34143, MultiTexCoordP2ui_remap_index }, + { 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 }, + { 1769, TexCoordP4uiv_remap_index }, + { 14829, VertexAttribP1ui_remap_index }, + { 4099, VertexAttribP1uiv_remap_index }, + { 29755, VertexAttribP2ui_remap_index }, + { 4893, VertexAttribP2uiv_remap_index }, + { 1487, VertexAttribP3ui_remap_index }, + { 28269, VertexAttribP3uiv_remap_index }, + { 4331, VertexAttribP4ui_remap_index }, + { 16039, VertexAttribP4uiv_remap_index }, + { 34884, VertexP2ui_remap_index }, + { 32510, VertexP2uiv_remap_index }, + { 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 }, + { 10661, DeleteTransformFeedbacks_remap_index }, + { 35417, DrawTransformFeedback_remap_index }, + { 3889, GenTransformFeedbacks_remap_index }, + { 33032, IsTransformFeedback_remap_index }, + { 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 }, + { 31531, ViewportIndexedf_remap_index }, + { 19531, ViewportIndexedfv_remap_index }, + { 8432, GetGraphicsResetStatusARB_remap_index }, + { 29898, GetnColorTableARB_remap_index }, + { 2793, GetnCompressedTexImageARB_remap_index }, + { 1233, GetnConvolutionFilterARB_remap_index }, + { 4767, GetnHistogramARB_remap_index }, + { 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 }, + { 22032, GetnPolygonStippleARB_remap_index }, + { 28736, GetnSeparableFilterARB_remap_index }, + { 10051, GetnTexImageARB_remap_index }, + { 27835, GetnUniformdvARB_remap_index }, + { 33830, GetnUniformfvARB_remap_index }, + { 3136, GetnUniformivARB_remap_index }, + { 13654, GetnUniformuivARB_remap_index }, + { 25308, ReadnPixelsARB_remap_index }, + { 32683, DrawArraysInstancedBaseInstance_remap_index }, + { 10202, DrawElementsInstancedBaseInstance_remap_index }, + { 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 }, + { 26987, TexStorage3D_remap_index }, + { 1410, TextureStorage1DEXT_remap_index }, + { 34970, TextureStorage2DEXT_remap_index }, + { 22093, TextureStorage3DEXT_remap_index }, + { 35677, ClearBufferData_remap_index }, + { 2112, ClearBufferSubData_remap_index }, + { 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 }, + { 3483, DeleteProgramPipelines_remap_index }, + { 25026, GenProgramPipelines_remap_index }, + { 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 }, + { 20654, ProgramUniform2iv_remap_index }, + { 6967, ProgramUniform2ui_remap_index }, + { 8766, ProgramUniform2uiv_remap_index }, + { 4453, ProgramUniform3f_remap_index }, + { 29017, ProgramUniform3fv_remap_index }, + { 4501, ProgramUniform3i_remap_index }, + { 12969, ProgramUniform3iv_remap_index }, + { 14664, ProgramUniform3ui_remap_index }, + { 17359, ProgramUniform3uiv_remap_index }, + { 27894, ProgramUniform4f_remap_index }, + { 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 }, + { 31624, DebugMessageControl_remap_index }, + { 15346, DebugMessageInsert_remap_index }, + { 6770, GetDebugMessageLog_remap_index }, + { 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 }, + { 7800, SecondaryColor3fvEXT_remap_index }, + { 28686, MultiDrawElementsEXT_remap_index }, + { 10717, FogCoordfEXT_remap_index }, + { 18096, FogCoordfvEXT_remap_index }, + { 4172, ResizeBuffersMESA_remap_index }, + { 34104, WindowPos4dMESA_remap_index }, + { 27294, WindowPos4dvMESA_remap_index }, + { 4281, WindowPos4fMESA_remap_index }, + { 11296, WindowPos4fvMESA_remap_index }, + { 9056, WindowPos4iMESA_remap_index }, + { 3658, WindowPos4ivMESA_remap_index }, + { 28063, WindowPos4sMESA_remap_index }, + { 1080, WindowPos4svMESA_remap_index }, + { 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 }, + { 29172, TrackMatrixNV_remap_index }, + { 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 }, + { 10692, VertexAttrib4ubvNV_remap_index }, + { 28937, VertexAttribPointerNV_remap_index }, + { 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 }, + { 35445, VertexAttribs3fvNV_remap_index }, + { 14012, VertexAttribs3svNV_remap_index }, + { 19457, VertexAttribs4dvNV_remap_index }, + { 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 }, + { 9256, AlphaFragmentOp1ATI_remap_index }, + { 3432, AlphaFragmentOp2ATI_remap_index }, + { 9712, AlphaFragmentOp3ATI_remap_index }, + { 33371, BeginFragmentShaderATI_remap_index }, + { 3705, BindFragmentShaderATI_remap_index }, + { 7179, ColorFragmentOp1ATI_remap_index }, + { 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 }, + { 8088, BindVertexArrayAPPLE_remap_index }, + { 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 }, + { 14500, TexGenxOES_remap_index }, + { 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 }, + { 2983, ClearColorIiEXT_remap_index }, + { 1208, ClearColorIuiEXT_remap_index }, + { 24297, BindBufferOffsetEXT_remap_index }, + { 18128, BeginPerfMonitorAMD_remap_index }, + { 32815, DeletePerfMonitorsAMD_remap_index }, + { 5439, EndPerfMonitorAMD_remap_index }, + { 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 }, + { 23807, VDPAUInitNV_remap_index }, + { 21496, VDPAUIsSurfaceNV_remap_index }, + { 6426, VDPAUMapSurfacesNV_remap_index }, + { 3024, VDPAURegisterOutputSurfaceNV_remap_index }, + { 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 }, + { 22298, GetPerfQueryIdByNameINTEL_remap_index }, + { 19988, GetPerfQueryInfoINTEL_remap_index }, + { 20389, StencilFuncSeparateATI_remap_index }, + { 5652, ProgramEnvParameters4fvEXT_remap_index }, + { 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 }, + { 8733, Frustumf_remap_index }, + { 8830, Frustumx_remap_index }, + { 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 }, + { 25234, Normal3x_remap_index }, + { 15399, Orthof_remap_index }, + { 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 }, + { 33057, ClipPlanex_remap_index }, + { 707, GetClipPlanef_remap_index }, + { 570, GetClipPlanex_remap_index }, + { 19863, GetFixedv_remap_index }, + { 1267, GetLightxv_remap_index }, + { 22748, GetMaterialxv_remap_index }, + { 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 } +}; + +/* these functions are in the ABI, but have alternative names */ +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 }, + /* from GL_EXT_convolution */ + { 1301, _gloffset_GetConvolutionParameteriv }, + { 13696, _gloffset_ConvolutionParameterfv }, + { 16548, _gloffset_CopyConvolutionFilter1D }, + { 18544, _gloffset_SeparableFilter2D }, + { 19739, _gloffset_GetConvolutionFilter }, + { 23477, _gloffset_ConvolutionFilter1D }, + { 25773, _gloffset_ConvolutionFilter2D }, + { 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 */ + { 4639, _gloffset_GetHistogramParameterfv }, + { 8114, _gloffset_GetHistogramParameteriv }, + { 9496, _gloffset_Minmax }, + { 13952, _gloffset_GetMinmax }, + { 21867, _gloffset_Histogram }, + { 29780, _gloffset_GetMinmaxParameteriv }, + { 30780, _gloffset_ResetMinmax }, + { 31725, _gloffset_GetHistogram }, + { 33465, _gloffset_GetMinmaxParameterfv }, + { 34412, _gloffset_ResetHistogram }, + /* from GL_EXT_paletted_texture */ + { 13558, _gloffset_ColorTable }, + { 18153, _gloffset_GetColorTableParameterfv }, + { 26555, _gloffset_GetColorTable }, + { 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 }, + { 17273, _gloffset_ColorTableParameterfv }, + { 18153, _gloffset_GetColorTableParameterfv }, + { 26555, _gloffset_GetColorTable }, + { 26633, _gloffset_CopyColorTable }, + { 30264, _gloffset_GetColorTableParameteriv }, + { -1, -1 } +}; + diff --cc xorg-server/hw/kdrive/ephyr/ephyrinit.c index c7358b5,bcfb750..8311a5f mode 100755,100644..100755 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c @@@ -154,9 -154,9 +155,10 @@@ 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 void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id) diff --cc xorg-server/hw/xwin/InitOutput.c index 9622db5,e867119..9e9491d mode 100755,100644..100755 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c diff --cc xorg-server/hw/xwin/Makefile.am index 2c7fde3,0ea8ba7..0ea8ba7 mode 100755,100644..100755 --- a/xorg-server/hw/xwin/Makefile.am +++ b/xorg-server/hw/xwin/Makefile.am diff --cc xorg-server/hw/xwin/makefile index cc8aeb5,0000000..530e02c mode 100644,000000..100755 --- a/xorg-server/hw/xwin/makefile +++ b/xorg-server/hw/xwin/makefile @@@ -1,162 -1,0 +1,165 @@@ +LIBRARY = libXWin + +XWIN_MULTIWINDOW=1 +XWIN_CLIPBOARD=1 +XWIN_MULTIWINDOWEXTWM=0 # currently not working correctly +XWIN_MULTIWINDOWINTWM=0 # currently not working correctly +XWIN_RANDR=1 +XWIN_NATIVEGDI=0 # currently not working correctly +XWIN_PRIMARYFB=0 # currently not working correctly +XWIN_GLX_WINDOWS=1 # everything is in the glx makefile + +if XWIN_CLIPBOARD +SRCS_CLIPBOARD = \ + winclipboardinit.c \ + winclipboardwrappers.c +DEFS_CLIPBOARD = -DXWIN_CLIPBOARD +INCLUDES_CLIPBOARD = winclipboard +endif + +if XWIN_GLX_WINDOWS +GLX_DIR = glx +DEFS_GLX_WINDOWS = -DXWIN_GLX_WINDOWS +XWIN_GLX_LIBS = $(top_builddir)/hw/xwin/glx/libXwinGLX.la +XWIN_GLX_LINK_FLAGS = -lopengl32 +endif + +if XWIN_MULTIWINDOW +SRCS_MULTIWINDOW = \ + winmultiwindowshape.c \ + winmultiwindowwindow.c \ + winmultiwindowwm.c \ + winmultiwindowwndproc.c \ + winSetAppUserModelID.c +DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW +endif + +if XWIN_MULTIWINDOWEXTWM +SRCS_MULTIWINDOWEXTWM = \ + winwin32rootless.c \ + winwin32rootlesswindow.c \ + winwin32rootlesswndproc.c \ + winwindowswm.c +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 +DEFS_RANDR = -DXWIN_RANDR +endif + +if XWIN_XV +SRCS_XV = \ + winvideo.c +DEFS_XV = -DXWIN_XV +endif + +SRCS = InitInput.c \ + InitOutput.c \ + winallpriv.c \ + winauth.c \ + winblock.c \ + wincmap.c \ + winconfig.c \ + wincreatewnd.c \ + wincursor.c \ + windialogs.c \ + winengine.c \ + winerror.c \ + winglobals.c \ + winkeybd.c \ + winkeyhook.c \ + winmisc.c \ + winmonitors.c \ + winmouse.c \ + winmsg.c \ + winmsgwindow.c \ + winmultiwindowclass.c \ + winmultiwindowicons.c \ + winprefs.c \ + winprefsyacc.y \ + winprefslex.l \ + winprocarg.c \ + winscrinit.c \ + winshaddd.c \ + winshadddnl.c \ + winshadgdi.c \ + wintaskbar.c \ + wintrayicon.c \ + winvalargs.c \ + winwakeup.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) \ + $(SRCS_MULTIWINDOWEXTWM) \ + $(SRCS_NATIVEGDI) \ + $(SRCS_PRIMARYFB) \ + $(SRCS_RANDR) \ + $(SRCS_XV) \ + xdmcphostselect.c + +CSRCS=$(filter %.c,$(SRCS)) $(filter %.y,$(SRCS)) $(filter %.l,$(SRCS)) +CSRCS := $(CSRCS:%.y=%.c) +CSRCS := $(CSRCS:%.l=%.c) + + DEFS = $(DEFS_CLIPBOARD) \ + $(DEFS_GLX_WINDOWS) \ + $(DEFS_MULTIWINDOW) \ + $(DEFS_MULTIWINDOWEXTWM) \ + $(DEFS_NATIVEGDI) \ + $(DEFS_PRIMARYFB) \ + $(DEFS_RANDR) \ + $(DEFS_XV) + +DEFINES += $(DEFS:-D%=%) HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB RELOCATE_PROJECTROOT + +INCLUDES += $(INCLUDES_CLIPBOARD) ..\.. ..\..\miext\rootless + +INCLUDES += $(OBJDIR) + +$(OBJDIR)\winprefslex.c $(OBJDIR)\winprefsyacc.c $(OBJDIR)\winprefsyacc.h: winprefslex.l winprefsyacc.y + doflexbison.bat $(subst \,/,$(OBJDIR)) + diff --cc xorg-server/hw/xwin/winengine.c index e597e2c,b473b3a..dc6ec7e mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winengine.c +++ b/xorg-server/hw/xwin/winengine.c @@@ -91,18 -87,9 +87,9 @@@ winDetectSupportedEngines(void } else { /* We have DirectDraw */ - winErrorFVerb(2, + 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 +98,8 @@@ (LPVOID *) &lpdd4); if (SUCCEEDED(ddrval)) { /* We have DirectDraw4 */ - winDebug ( - "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n"); - winErrorFVerb(2, - "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n"); ++ winDebug ( ++ "winDetectSupportedEngines - DirectDraw4 installed, allowing ShadowDDNL\n"); g_dwEnginesSupported |= WIN_SERVER_SHADOW_DDNL; } @@@ -206,18 -193,8 +193,8 @@@ 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\n"); + FatalError ("winSetEngine - Invalid engine type %d\n",pScreenInfo->dwEngine); } return TRUE; } diff --cc xorg-server/hw/xwin/winmisc.c index f810ed0,bea6290..bea6290 mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winmisc.c +++ b/xorg-server/hw/xwin/winmisc.c diff --cc xorg-server/hw/xwin/winscrinit.c index ae52f8a,ed1773c..952e7eb mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c diff --cc xorg-server/hw/xwin/winwindow.c index d00a312,934f6d8..0ec17bb mode 100644,100644..100755 --- a/xorg-server/hw/xwin/winwindow.c +++ b/xorg-server/hw/xwin/winwindow.c diff --cc xorg-server/hw/xwin/winwndproc.c index f2b3f4e,1b09921..37d5ef6 --- a/xorg-server/hw/xwin/winwndproc.c +++ b/xorg-server/hw/xwin/winwndproc.c @@@ -191,13 -187,9 +187,9 @@@ winWindowProc(HWND hwnd, UINT message, 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 */ - ErrorF("winWindowProc - Disruptive change in depth\n"); + winDebug ("winWindowProc - Disruptive change in depth\n"); /* Display depth change dialog */ winDisplayDepthChangeDialog(s_pScreenPriv); diff --cc xorg-server/mi/mi.h index 5a455c9,5a455c9..b7e791d mode 100755,100644..100755 --- a/xorg-server/mi/mi.h +++ b/xorg-server/mi/mi.h @@@ -65,6 -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, -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 08/13: fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit a1011d63ffb5cc4f41bf0f4622ee3f1493d419d9 Author: marha <marha(a)users.sourceforge.net> Date: Sat Nov 29 12:40:08 2014 +0100 fontconfig libX11 libxcb libxcb/xcb-proto mesa xserver xkbcomp xkeyboard-config git update 29 Nov 2014 xserver commit c52a2b1ebad56820af932dfbc871701a8b04fd9c libxcb commit bbca7b82f803fa13fd30a2891ec06f2a213a28c2 libxcb/xcb-proto commit 691d2b97e5989d6d7006304d81bd8fa128477ca1 xkeyboard-config commit b664d7fb8aab9b0f834dd9c81d273c7809561b34 libX11 commit f3831dde6972e4da9e018c6a5f4013d8756a5e78 xkbcomp commit 1e8ee9d0aad072f04186df84752f5636340574e0 fontconfig commit b732bf057f4b3ec3bac539803005e9c42d056b2a mesa commit 67c498086d0858a94d53ebb6921cfda847250368 --- fontconfig/conf.d/30-metric-aliases.conf | 94 +- fontconfig/conf.d/45-latin.conf | 12 + fontconfig/conf.d/60-latin.conf | 3 + libX11/nls/compose.dir.pre | 21 +- libX11/nls/en_US.UTF-8/Compose.pre | 41 +- libxcb/src/c_client.py | 52 +- libxcb/xcb-proto/src/xinput.xml | 37 +- mesalib/VERSION | 2 +- mesalib/configure.ac | 166 +- mesalib/docs/GL3.txt | 18 +- mesalib/docs/egl.html | 7 - mesalib/docs/index.html | 12 + mesalib/docs/llvmpipe.html | 2 +- mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.3.3.html | 209 +++ mesalib/docs/relnotes/10.3.4.html | 106 ++ mesalib/docs/relnotes/10.4.html | 4 +- mesalib/docs/relnotes/{10.4.html => 10.5.0.html} | 11 +- mesalib/include/D3D9/d3d9.h | 1858 ++++++++++++++++++++ mesalib/include/D3D9/d3d9caps.h | 387 ++++ mesalib/include/D3D9/d3d9types.h | 1797 +++++++++++++++++++ mesalib/include/GLES2/gl2ext.h | 313 +++- mesalib/include/d3dadapter/d3dadapter9.h | 101 ++ mesalib/include/d3dadapter/drm.h | 44 + mesalib/include/d3dadapter/present.h | 136 ++ mesalib/scons/gallium.py | 15 +- mesalib/src/gallium/Automake.inc | 3 +- mesalib/src/gallium/Makefile.am | 13 +- mesalib/src/gallium/auxiliary/Android.mk | 4 +- mesalib/src/gallium/auxiliary/Makefile.am | 42 +- mesalib/src/gallium/auxiliary/Makefile.sources | 336 +++- mesalib/src/gallium/auxiliary/SConscript | 2 +- mesalib/src/gallium/auxiliary/hud/hud_context.c | 2 - mesalib/src/gallium/auxiliary/util/u_atomic.h | 56 +- mesalib/src/gallium/auxiliary/util/u_blit.c | 4 +- mesalib/src/gallium/auxiliary/util/u_blitter.c | 7 +- mesalib/src/gallium/auxiliary/util/u_box.h | 118 ++ .../src/gallium/auxiliary/util/u_format_pack.py | 35 +- mesalib/src/gallium/auxiliary/util/u_pstipple.c | 228 +-- mesalib/src/gallium/auxiliary/util/u_pstipple.h | 5 +- mesalib/src/gallium/auxiliary/util/u_rect.h | 18 + .../src/gallium/auxiliary/util/u_simple_shaders.c | 80 +- .../src/gallium/auxiliary/util/u_simple_shaders.h | 10 +- mesalib/src/gallium/auxiliary/util/u_snprintf.c | 2 +- mesalib/src/gallium/auxiliary/util/u_tests.c | 268 +++ .../strtod.h => gallium/auxiliary/util/u_tests.h} | 31 +- mesalib/src/glsl/Makefile.sources | 4 +- mesalib/src/glsl/ast.h | 29 - mesalib/src/glsl/glsl_lexer.ll | 23 +- mesalib/src/glsl/glsl_parser_extras.cpp | 10 +- mesalib/src/glsl/glsl_types.cpp | 59 +- mesalib/src/glsl/glsl_types.h | 33 +- mesalib/src/glsl/ir.cpp | 48 - mesalib/src/glsl/ir.h | 30 +- mesalib/src/glsl/ir_optimization.h | 1 + mesalib/src/glsl/ir_reader.cpp | 2 +- mesalib/src/glsl/ir_uniform.h | 6 + mesalib/src/glsl/link_uniforms.cpp | 50 + mesalib/src/glsl/linker.cpp | 44 +- mesalib/src/glsl/list.h | 21 + mesalib/src/glsl/loop_unroll.cpp | 13 +- .../src/glsl/lower_const_arrays_to_uniforms.cpp | 111 ++ mesalib/src/glsl/main.cpp | 10 + mesalib/src/glsl/opt_algebraic.cpp | 49 +- mesalib/src/glsl/opt_cse.cpp | 9 +- mesalib/src/glsl/s_expression.cpp | 2 +- mesalib/src/glsl/s_expression.h | 2 +- mesalib/src/mapi/glapi/SConscript | 1 + .../mapi/glapi/gen/KHR_context_flush_control.xml | 11 + mesalib/src/mapi/glapi/gen/Makefile.am | 3 - mesalib/src/mapi/glapi/gen/extension_helper.py | 324 ---- mesalib/src/mapi/glapi/gen/gl_API.xml | 2 + mesalib/src/mapi/glapi/gen/gl_offsets.py | 120 -- mesalib/src/mapi/glapi/gen/mesadef.py | 215 --- mesalib/src/mesa/Android.libmesa_dricore.mk | 8 +- mesalib/src/mesa/Android.libmesa_st_mesa.mk | 5 + mesalib/src/mesa/Makefile.am | 3 +- mesalib/src/mesa/drivers/dri/common/dri_util.c | 22 +- .../mesa/drivers/dri/common/xmlpool/t_options.h | 18 + mesalib/src/mesa/drivers/windows/gdi/mesa.def | 839 ++------- mesalib/src/mesa/main/api_validate.c | 56 +- mesalib/src/mesa/main/api_validate.h | 6 - mesalib/src/mesa/main/attrib.c | 3 +- mesalib/src/mesa/main/context.c | 11 +- mesalib/src/mesa/main/errors.c | 172 +- mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/get_hash_params.py | 5 +- mesalib/src/mesa/main/imports.c | 19 - mesalib/src/mesa/main/imports.h | 3 - mesalib/src/mesa/main/mtypes.h | 5 + mesalib/src/mesa/main/shaderapi.c | 6 +- mesalib/src/mesa/main/sse_minmax.c | 97 + .../src/mesa/main/sse_minmax.h | 44 +- mesalib/src/mesa/main/streaming-load-memcpy.c | 3 - mesalib/src/mesa/main/texformat.c | 3 + mesalib/src/mesa/main/texstore.c | 4 +- mesalib/src/mesa/main/uniform_query.cpp | 260 +-- mesalib/src/mesa/main/uniforms.c | 98 +- mesalib/src/mesa/main/uniforms.h | 4 +- mesalib/src/mesa/main/viewport.c | 8 +- mesalib/src/mesa/program/prog_execute.c | 156 -- mesalib/src/mesa/program/prog_instruction.c | 12 - mesalib/src/mesa/program/prog_instruction.h | 12 - mesalib/src/mesa/program/program_lexer.l | 14 +- .../src/mesa/state_tracker/st_atom_rasterizer.c | 11 +- mesalib/src/mesa/state_tracker/st_atom_viewport.c | 2 - mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 5 +- mesalib/src/mesa/state_tracker/st_cb_clear.c | 30 +- mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 2 - mesalib/src/mesa/state_tracker/st_cb_drawtex.c | 4 +- mesalib/src/mesa/state_tracker/st_context.h | 1 + mesalib/src/mesa/state_tracker/st_extensions.c | 3 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 19 +- mesalib/src/mesa/state_tracker/st_manager.c | 3 +- mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c | 12 +- mesalib/src/mesa/state_tracker/st_program.c | 23 +- mesalib/src/mesa/vbo/vbo_exec_array.c | 14 +- mesalib/src/mesa/x86/common_x86_features.h | 26 + mesalib/src/util/Makefile.sources | 3 +- mesalib/src/util/hash_table.c | 10 +- mesalib/src/util/macros.h | 18 +- mesalib/src/{glsl/strtod.c => util/strtod.cpp} | 32 +- mesalib/src/{glsl => util}/strtod.h | 4 +- xkbcomp/configure.ac | 2 +- xkbcomp/xkbcomp.c | 32 +- xorg-server/Xext/dpms.c | 10 +- xorg-server/Xext/dpmsstubs.c | 10 +- xorg-server/Xext/panoramiX.c | 2 +- xorg-server/Xext/panoramiX.h | 2 +- xorg-server/Xext/panoramiXprocs.c | 4 +- xorg-server/Xext/security.c | 4 +- xorg-server/Xext/shm.c | 21 +- xorg-server/Xext/sync.c | 2 +- xorg-server/Xext/syncsrv.h | 8 +- xorg-server/Xext/xres.c | 12 +- xorg-server/Xext/xvdisp.c | 8 +- xorg-server/Xext/xvdix.h | 14 +- xorg-server/Xext/xvmain.c | 20 +- xorg-server/composite/compalloc.c | 8 +- xorg-server/composite/compext.c | 4 +- xorg-server/composite/compinit.c | 21 +- xorg-server/composite/compint.h | 3 +- xorg-server/composite/compoverlay.c | 4 +- xorg-server/composite/compwindow.c | 7 +- xorg-server/configure.ac | 14 +- xorg-server/dbe/dbe.c | 16 +- xorg-server/dbe/dbestruct.h | 12 +- xorg-server/dbe/midbe.c | 14 +- xorg-server/dbe/midbe.h | 8 +- xorg-server/dix/atom.c | 8 +- xorg-server/dix/colormap.c | 34 +- xorg-server/dix/cursor.c | 8 +- xorg-server/dix/devices.c | 2 +- xorg-server/dix/dispatch.c | 16 +- xorg-server/dix/dispatch.h | 2 +- xorg-server/dix/dixfonts.c | 6 +- xorg-server/dix/dixutils.c | 12 +- xorg-server/dix/extension.c | 8 +- xorg-server/dix/gc.c | 25 +- xorg-server/dix/getevents.c | 22 +- xorg-server/dix/globals.c | 8 +- xorg-server/dix/glyphcurs.c | 8 +- xorg-server/dix/grabs.c | 16 +- xorg-server/dix/inpututils.c | 2 + xorg-server/dix/main.c | 8 +- xorg-server/dix/property.c | 8 +- xorg-server/dix/region.c | 22 +- xorg-server/dix/resource.c | 16 +- xorg-server/dix/selection.c | 10 +- xorg-server/dix/swaprep.c | 8 +- xorg-server/dix/swapreq.c | 8 +- xorg-server/dix/tables.c | 8 +- xorg-server/dix/window.c | 38 +- xorg-server/exa/exa.c | 2 +- xorg-server/exa/exa.h | 8 +- xorg-server/exa/exa_accel.c | 20 +- xorg-server/exa/exa_glyphs.c | 8 +- xorg-server/exa/exa_priv.h | 7 +- xorg-server/exa/exa_render.c | 4 +- xorg-server/exa/exa_unaccel.c | 11 +- xorg-server/fb/Makefile.am | 2 - xorg-server/fb/fb.h | 338 +--- xorg-server/fb/fb24_32.c | 2 +- xorg-server/fb/fb24_32.h | 2 +- xorg-server/fb/fbbits.c | 12 - xorg-server/fb/fbblt.c | 271 +-- xorg-server/fb/fbbltone.c | 320 ++-- xorg-server/fb/fbfill.c | 84 +- xorg-server/fb/fbfillrect.c | 2 +- xorg-server/fb/fbgc.c | 85 +- xorg-server/fb/fbglyph.c | 10 +- xorg-server/fb/fbline.c | 4 +- xorg-server/fb/fboverlay.c | 2 +- xorg-server/fb/fboverlay.h | 2 +- xorg-server/fb/fbpict.c | 16 +- xorg-server/fb/fbpict.h | 4 - xorg-server/fb/fbpixmap.c | 6 +- xorg-server/fb/fbpoint.c | 2 +- xorg-server/fb/fbpush.c | 4 +- xorg-server/fb/fbrop.h | 12 +- xorg-server/fb/fbseg.c | 42 +- xorg-server/fb/fbstipple.c | 264 --- xorg-server/fb/fbtile.c | 163 -- xorg-server/fb/fbutil.c | 308 ---- xorg-server/fb/wfbrename.h | 23 - xorg-server/glamor/glamor.c | 1 + xorg-server/glamor/glamor_fbo.c | 3 +- xorg-server/glamor/glamor_picture.c | 2 +- xorg-server/glamor/glamor_pixmap.c | 75 +- xorg-server/glamor/glamor_priv.h | 2 + xorg-server/glx/glxbyteorder.h | 8 +- xorg-server/glx/glxcmds.c | 22 +- xorg-server/glx/glxdri2.c | 2 +- xorg-server/glx/glxscreens.c | 2 +- xorg-server/glx/glxscreens.h | 2 +- xorg-server/glx/indirect_dispatch.c | 6 +- xorg-server/glx/indirect_dispatch.h | 6 +- xorg-server/glx/indirect_dispatch_swap.c | 6 +- xorg-server/glx/indirect_program.c | 6 +- xorg-server/glx/indirect_reqsize.c | 6 +- xorg-server/glx/indirect_reqsize.h | 6 +- xorg-server/glx/indirect_size.h | 6 +- xorg-server/glx/indirect_size_get.c | 6 +- xorg-server/glx/indirect_size_get.h | 6 +- xorg-server/glx/indirect_table.c | 6 +- xorg-server/glx/indirect_table.h | 6 +- xorg-server/glx/indirect_texture_compression.c | 6 +- xorg-server/glx/indirect_util.c | 8 +- xorg-server/glx/indirect_util.h | 6 +- xorg-server/glx/rensize.c | 4 +- xorg-server/hw/dmx/config/Canvas.c | 2 +- xorg-server/hw/dmx/config/dmxprint.c | 2 +- xorg-server/hw/dmx/dmxgc.c | 12 +- xorg-server/hw/dmx/dmxpict.h | 2 +- xorg-server/hw/dmx/glxProxy/glxcmds.c | 16 +- xorg-server/hw/dmx/glxProxy/glxsingle.c | 4 +- xorg-server/hw/dmx/glxProxy/glxvendor.c | 4 +- xorg-server/hw/dmx/input/ChkNotMaskEv.c | 2 +- xorg-server/hw/dmx/input/lnx-keyboard.c | 20 +- xorg-server/hw/dmx/input/lnx-ms.c | 2 +- xorg-server/hw/kdrive/ephyr/ephyr.c | 14 +- xorg-server/hw/kdrive/ephyr/ephyr.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdri.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdri.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrdriext.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrglxext.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrglxext.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrhostglx.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrhostglx.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrinit.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyrlog.h | 4 +- xorg-server/hw/kdrive/ephyr/ephyrvideo.c | 4 +- xorg-server/hw/kdrive/ephyr/hostx.c | 12 +- xorg-server/hw/kdrive/ephyr/hostx.h | 4 +- xorg-server/hw/kdrive/ephyr/os.c | 4 +- xorg-server/hw/kdrive/src/kxv.c | 2 +- xorg-server/hw/xfree86/Makefile.am | 2 +- xorg-server/hw/xfree86/common/Makefile.am | 4 + xorg-server/hw/xfree86/common/compiler.h | 4 +- xorg-server/hw/xfree86/common/xf86AutoConfig.c | 8 +- xorg-server/hw/xfree86/common/xf86Bus.c | 2 +- xorg-server/hw/xfree86/common/xf86Config.c | 4 +- xorg-server/hw/xfree86/common/xf86Configure.c | 4 +- xorg-server/hw/xfree86/common/xf86Mode.c | 8 +- xorg-server/hw/xfree86/common/xf86Module.h | 4 +- xorg-server/hw/xfree86/common/xf86PciInfo.h | 2 +- xorg-server/hw/xfree86/common/xf86Xinput.c | 16 +- xorg-server/hw/xfree86/common/xf86Xinput.h | 6 +- xorg-server/hw/xfree86/common/xf86cmap.c | 4 +- xorg-server/hw/xfree86/common/xf86fbman.c | 6 +- xorg-server/hw/xfree86/common/xf86platformBus.c | 2 +- xorg-server/hw/xfree86/common/xf86str.h | 2 +- xorg-server/hw/xfree86/common/xf86vmode.c | 8 +- xorg-server/hw/xfree86/common/xf86xv.c | 2 +- xorg-server/hw/xfree86/common/xf86xvmc.h | 10 +- xorg-server/hw/xfree86/ddc/ddc.c | 10 +- xorg-server/hw/xfree86/ddc/edid.h | 8 +- xorg-server/hw/xfree86/ddc/print_edid.c | 2 +- xorg-server/hw/xfree86/ddc/xf86DDC.h | 6 +- xorg-server/hw/xfree86/dixmods/xkbKillSrv.c | 16 +- xorg-server/hw/xfree86/dixmods/xkbVT.c | 16 +- xorg-server/hw/xfree86/dri/dri.c | 4 +- xorg-server/hw/xfree86/dri/sarea.h | 10 +- xorg-server/hw/xfree86/dri2/Makefile.am | 2 + xorg-server/hw/xfree86/dri2/dri2.c | 62 +- xorg-server/hw/xfree86/dri2/pci_ids/Makefile.am | 11 + xorg-server/hw/xfree86/dri2/pci_ids/i810_pci_ids.h | 4 + xorg-server/hw/xfree86/dri2/pci_ids/i915_pci_ids.h | 15 + xorg-server/hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 115 ++ .../hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 80 + xorg-server/hw/xfree86/dri2/pci_ids/r200_pci_ids.h | 24 + xorg-server/hw/xfree86/dri2/pci_ids/r300_pci_ids.h | 227 +++ xorg-server/hw/xfree86/dri2/pci_ids/r600_pci_ids.h | 327 ++++ .../hw/xfree86/dri2/pci_ids/radeon_pci_ids.h | 23 + .../hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 157 ++ .../hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h | 1 + .../hw/xfree86/drivers/modesetting/Makefile.am | 6 +- xorg-server/hw/xfree86/drivers/modesetting/dri2.c | 863 +++++++++ .../hw/xfree86/drivers/modesetting/driver.c | 29 +- .../hw/xfree86/drivers/modesetting/driver.h | 44 + .../xfree86/drivers/modesetting/drmmode_display.c | 25 +- .../xfree86/drivers/modesetting/drmmode_display.h | 31 +- .../hw/xfree86/drivers/modesetting/vblank.c | 383 ++++ xorg-server/hw/xfree86/fbdevhw/fbdevhw.c | 2 +- xorg-server/hw/xfree86/i2c/xf86i2c.c | 40 +- xorg-server/hw/xfree86/i2c/xf86i2c.h | 2 +- xorg-server/hw/xfree86/loader/loadmod.c | 4 +- xorg-server/hw/xfree86/modes/xf86Crtc.c | 4 +- xorg-server/hw/xfree86/modes/xf86Crtc.h | 10 +- xorg-server/hw/xfree86/modes/xf86RandR12.c | 4 +- xorg-server/hw/xfree86/modes/xf86cvt.c | 4 +- xorg-server/hw/xfree86/modes/xf86gtf.c | 10 +- .../hw/xfree86/os-support/bsd/alpha_video.c | 20 +- xorg-server/hw/xfree86/os-support/bsd/arm_video.c | 28 +- xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c | 2 +- xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c | 20 +- xorg-server/hw/xfree86/os-support/bsd/bsd_init.c | 24 +- .../hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 16 +- xorg-server/hw/xfree86/os-support/bsd/i386_video.c | 22 +- xorg-server/hw/xfree86/os-support/bsd/ppc_video.c | 20 +- .../hw/xfree86/os-support/bsd/sparc64_video.c | 20 +- .../hw/xfree86/os-support/hurd/hurd_video.c | 4 +- xorg-server/hw/xfree86/os-support/linux/lnx_agp.c | 4 +- xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c | 2 +- .../hw/xfree86/os-support/linux/systemd-logind.c | 2 +- xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c | 8 +- .../hw/xfree86/os-support/shared/ioperm_noop.c | 2 +- xorg-server/hw/xfree86/os-support/shared/sigio.c | 6 +- .../hw/xfree86/os-support/solaris/sun_apm.c | 2 +- xorg-server/hw/xfree86/os-support/xf86_OSlib.h | 30 +- xorg-server/hw/xfree86/os-support/xf86_OSproc.h | 28 +- xorg-server/hw/xfree86/parser/Configint.h | 18 +- xorg-server/hw/xfree86/parser/DRI.c | 8 +- xorg-server/hw/xfree86/parser/Device.c | 16 +- xorg-server/hw/xfree86/parser/Files.c | 14 +- xorg-server/hw/xfree86/parser/Flags.c | 16 +- xorg-server/hw/xfree86/parser/Input.c | 16 +- xorg-server/hw/xfree86/parser/Layout.c | 16 +- xorg-server/hw/xfree86/parser/Module.c | 16 +- xorg-server/hw/xfree86/parser/Monitor.c | 18 +- xorg-server/hw/xfree86/parser/Pointer.c | 16 +- xorg-server/hw/xfree86/parser/Screen.c | 16 +- xorg-server/hw/xfree86/parser/Vendor.c | 16 +- xorg-server/hw/xfree86/parser/Video.c | 16 +- xorg-server/hw/xfree86/parser/read.c | 22 +- xorg-server/hw/xfree86/parser/scan.c | 36 +- xorg-server/hw/xfree86/parser/write.c | 14 +- xorg-server/hw/xfree86/parser/xf86Optrec.h | 18 +- xorg-server/hw/xfree86/parser/xf86Parser.h | 18 +- xorg-server/hw/xfree86/parser/xf86tokens.h | 18 +- xorg-server/hw/xfree86/ramdac/IBM.c | 4 +- xorg-server/hw/xfree86/ramdac/TI.c | 2 +- xorg-server/hw/xfree86/ramdac/xf86Cursor.c | 6 +- xorg-server/hw/xfree86/ramdac/xf86HWCurs.c | 2 +- xorg-server/hw/xfree86/ramdac/xf86RamDac.h | 4 +- xorg-server/hw/xfree86/sdksyms.sh | 3 - xorg-server/hw/xfree86/shadowfb/shadowfb.h | 2 +- xorg-server/hw/xfree86/utils/gtf/gtf.c | 26 +- xorg-server/hw/xfree86/vbe/vbe.c | 4 +- xorg-server/hw/xfree86/vbe/vbe.h | 4 +- xorg-server/hw/xfree86/vgahw/vgaHW.c | 8 +- xorg-server/hw/xfree86/vgahw/vgaHW.h | 2 +- xorg-server/hw/xfree86/x86emu/debug.c | 4 +- xorg-server/hw/xfree86/x86emu/ops.c | 22 +- xorg-server/hw/xfree86/x86emu/prim_ops.c | 70 +- xorg-server/hw/xfree86/x86emu/sys.c | 6 +- xorg-server/hw/xfree86/x86emu/x86emu/regs.h | 10 +- xorg-server/hw/xnest/Color.c | 2 +- xorg-server/hw/xnest/GC.c | 56 +- xorg-server/hw/xnest/XNGC.h | 1 - xorg-server/hw/xnest/Xnest.h | 2 +- xorg-server/hw/xquartz/darwin.c | 8 +- xorg-server/hw/xquartz/darwinEvents.c | 4 +- xorg-server/hw/xwayland/xwayland.c | 1 + xorg-server/hw/xwin/InitInput.c | 2 +- xorg-server/hw/xwin/InitOutput.c | 10 +- xorg-server/hw/xwin/ddraw.h | 6 +- xorg-server/hw/xwin/glx/glshim.c | 3 + xorg-server/hw/xwin/win.h | 2 +- xorg-server/hw/xwin/winSetAppUserModelID.c | 2 +- xorg-server/hw/xwin/winclipboard/xevents.c | 3 +- xorg-server/hw/xwin/wincmap.c | 2 +- xorg-server/hw/xwin/winconfig.c | 10 +- xorg-server/hw/xwin/wincreatewnd.c | 4 +- xorg-server/hw/xwin/wincursor.c | 10 +- xorg-server/hw/xwin/windialogs.c | 12 +- xorg-server/hw/xwin/winlayouts.h | 2 +- xorg-server/hw/xwin/winmsgwindow.c | 5 +- xorg-server/hw/xwin/winmultiwindowicons.c | 4 +- xorg-server/hw/xwin/winmultiwindowshape.c | 2 +- xorg-server/hw/xwin/winmultiwindowwindow.c | 20 +- xorg-server/hw/xwin/winmultiwindowwm.c | 2 +- xorg-server/hw/xwin/winmultiwindowwndproc.c | 4 +- xorg-server/hw/xwin/winprefs.c | 2 +- xorg-server/hw/xwin/winprefslex.l | 2 - xorg-server/hw/xwin/winprefsyacc.y | 11 +- xorg-server/hw/xwin/winscrinit.c | 4 +- xorg-server/hw/xwin/winshaddd.c | 8 +- xorg-server/hw/xwin/winshadddnl.c | 8 +- xorg-server/hw/xwin/winshadgdi.c | 10 +- xorg-server/hw/xwin/winwin32rootlesswndproc.c | 2 +- xorg-server/hw/xwin/winwindowswm.c | 2 +- xorg-server/hw/xwin/winwndproc.c | 8 +- xorg-server/include/closure.h | 8 +- xorg-server/include/colormap.h | 8 +- xorg-server/include/colormapst.h | 8 +- xorg-server/include/cursor.h | 8 +- xorg-server/include/cursorstr.h | 10 +- xorg-server/include/dbus-core.h | 2 +- xorg-server/include/dix.h | 8 +- xorg-server/include/extension.h | 8 +- xorg-server/include/extnsionst.h | 10 +- xorg-server/include/gc.h | 8 +- xorg-server/include/gcstruct.h | 25 +- xorg-server/include/input.h | 8 +- xorg-server/include/inputstr.h | 14 +- xorg-server/include/list.h | 2 +- xorg-server/include/misc.h | 18 +- xorg-server/include/miscstruct.h | 8 +- xorg-server/include/os.h | 8 +- xorg-server/include/pixmap.h | 8 +- xorg-server/include/pixmapstr.h | 10 +- xorg-server/include/property.h | 8 +- xorg-server/include/propertyst.h | 10 +- xorg-server/include/region.h | 8 +- xorg-server/include/regionstr.h | 2 +- xorg-server/include/resource.h | 10 +- xorg-server/include/rgb.h | 8 +- xorg-server/include/screenint.h | 8 +- xorg-server/include/scrnintstr.h | 8 +- xorg-server/include/selection.h | 10 +- xorg-server/include/servermd.h | 10 +- xorg-server/include/site.h | 14 +- xorg-server/include/window.h | 8 +- xorg-server/include/windowstr.h | 8 +- xorg-server/include/xkbfile.h | 18 +- xorg-server/include/xkbsrv.h | 16 +- xorg-server/include/xkbstr.h | 24 +- xorg-server/include/xsha1.h | 2 +- xorg-server/mi/Makefile.am | 11 +- xorg-server/mi/mi.h | 24 +- xorg-server/mi/miarc.c | 244 ++- xorg-server/mi/mibitblt.c | 30 +- xorg-server/mi/micopy.c | 5 +- xorg-server/mi/micursor.c | 68 - xorg-server/mi/midash.c | 9 +- xorg-server/mi/midispcur.c | 4 +- xorg-server/mi/miexpose.c | 18 +- xorg-server/mi/mifillarc.c | 5 +- xorg-server/mi/mifillarc.h | 9 - xorg-server/mi/mifillrct.c | 8 +- xorg-server/mi/mifpoly.h | 50 +- xorg-server/mi/mifpolycon.c | 249 --- xorg-server/mi/migc.c | 45 +- xorg-server/mi/miglblt.c | 8 +- xorg-server/mi/miinitext.c | 8 +- xorg-server/mi/mioverlay.c | 2 +- xorg-server/mi/mipointer.c | 19 + xorg-server/mi/mipoly.c | 627 ++++++- xorg-server/mi/mipoly.h | 22 +- xorg-server/mi/mipolycon.c | 235 --- xorg-server/mi/mipolygen.c | 213 --- xorg-server/mi/mipolypnt.c | 8 +- xorg-server/mi/mipolyrect.c | 8 +- xorg-server/mi/mipolyseg.c | 10 +- xorg-server/mi/mipolytext.c | 8 +- xorg-server/mi/mipolyutil.c | 369 ---- xorg-server/mi/mipushpxl.c | 8 +- xorg-server/mi/miscrinit.c | 2 +- xorg-server/mi/mispans.c | 526 ------ xorg-server/mi/mispans.h | 87 - xorg-server/mi/mistruct.h | 8 +- xorg-server/mi/mivaltree.c | 20 +- xorg-server/mi/miwideline.c | 526 +++++- xorg-server/mi/miwideline.h | 26 - xorg-server/mi/miwindow.c | 8 +- xorg-server/mi/mizerclip.c | 8 +- xorg-server/mi/mizerline.c | 12 +- xorg-server/miext/damage/damage.c | 2 +- xorg-server/miext/rootless/rootless.h | 2 +- xorg-server/miext/rootless/rootlessGC.c | 2 +- xorg-server/miext/rootless/rootlessValTree.c | 32 +- xorg-server/miext/rootless/rootlessWindow.c | 6 +- xorg-server/miext/shadow/shrotate.c | 2 +- xorg-server/miext/sync/misyncfd.c | 4 +- xorg-server/os/WaitFor.c | 18 +- xorg-server/os/access.c | 58 +- xorg-server/os/busfault.c | 2 +- xorg-server/os/connection.c | 18 +- xorg-server/os/io.c | 10 +- xorg-server/os/log.c | 2 +- xorg-server/os/oscolor.c | 8 +- xorg-server/os/osdep.h | 8 +- xorg-server/os/osinit.c | 14 +- xorg-server/os/xdmcp.c | 2 +- xorg-server/present/present.c | 8 +- xorg-server/randr/randrstr.h | 20 +- xorg-server/randr/rrprovider.c | 2 +- xorg-server/randr/rrtransform.c | 2 +- xorg-server/randr/rrtransform.h | 2 +- xorg-server/randr/rrxinerama.c | 2 +- xorg-server/record/record.c | 20 +- xorg-server/render/animcur.c | 2 +- xorg-server/render/glyph.c | 2 +- xorg-server/render/glyphstr.h | 2 +- xorg-server/render/mipict.h | 2 +- xorg-server/render/picture.c | 2 +- xorg-server/render/picture.h | 8 +- xorg-server/render/render.c | 4 +- xorg-server/xfixes/cursor.c | 22 +- xorg-server/xfixes/region.c | 13 +- xorg-server/xkb/XKBAlloc.c | 16 +- xorg-server/xkb/XKBGAlloc.c | 16 +- xorg-server/xkb/XKBMAlloc.c | 18 +- xorg-server/xkb/XKBMisc.c | 16 +- xorg-server/xkb/ddxBeep.c | 16 +- xorg-server/xkb/ddxCtrls.c | 16 +- xorg-server/xkb/ddxKillSrv.c | 16 +- xorg-server/xkb/ddxLEDs.c | 16 +- xorg-server/xkb/ddxLoad.c | 16 +- xorg-server/xkb/ddxVT.c | 16 +- xorg-server/xkb/maprules.c | 18 +- xorg-server/xkb/xkb.c | 18 +- xorg-server/xkb/xkbAccessX.c | 18 +- xorg-server/xkb/xkbActions.c | 16 +- xorg-server/xkb/xkbEvents.c | 16 +- xorg-server/xkb/xkbInit.c | 22 +- xorg-server/xkb/xkbLEDs.c | 44 +- xorg-server/xkb/xkbPrKeyEv.c | 16 +- xorg-server/xkb/xkbSwap.c | 16 +- xorg-server/xkb/xkbUtils.c | 16 +- xorg-server/xkb/xkbfmisc.c | 18 +- xorg-server/xkb/xkbgeom.h | 16 +- xorg-server/xkb/xkbout.c | 18 +- xorg-server/xkb/xkbtext.c | 18 +- xorg-server/xkb/xkmread.c | 18 +- xorg-server/xkeyboard-config/README | 54 +- 538 files changed, 13331 insertions(+), 8085 deletions(-) diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf index 49a9602..cd1e924 100644 --- a/fontconfig/conf.d/30-metric-aliases.conf +++ b/fontconfig/conf.d/30-metric-aliases.conf @@ -6,17 +6,17 @@ Alias similar/metric-compatible families from various sources: -PostScript fonts: URW fonts: GUST fonts: Windows fonts: -====================== ==================== ================= ================== -Helvetica Nimbus Sans L TeX Gyre Heros -Helvetica Condensed TeX Gyre Heros Cn -Times Nimbus Roman No9 L TeX Gyre Termes -Courier Nimbus Mono L TeX Gyre Cursor -ITC Avant Garde Gothic URW Gothic L TeX Gyre Adventor -ITC Bookman URW Bookman L TeX Gyre Bonum Bookman Old Style -ITC Zapf Chancery URW Chancery L TeX Gyre Chorus -Palatino URW Palladio L TeX Gyre Pagella Palatino Linotype -New Century Schoolbook Century Schoolbook L TeX Gyre Schola Century Schoolbook +PostScript fonts: URW fonts: GUST fonts: Windows fonts: +====================== ====================== ================= ================== +Helvetica Nimbus Sans TeX Gyre Heros +Helvetica Condensed Nimbus Sans Narrow TeX Gyre Heros Cn +Times Nimbus Roman TeX Gyre Termes +Courier Nimbus Mono TeX Gyre Cursor +ITC Avant Garde Gothic URW Gothic TeX Gyre Adventor +ITC Bookman Bookman URW TeX Gyre Bonum Bookman Old Style +ITC Zapf Chancery Chancery URW TeX Gyre Chorus +Palatino Palladio URW TeX Gyre Pagella Palatino Linotype +New Century Schoolbook Century SchoolBook URW TeX Gyre Schola Century Schoolbook Microsoft fonts: Liberation fonts: Google CrOS core fonts: StarOffice fonts: AMT fonts: ================ ====================== ======================= ================= ============== @@ -57,6 +57,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Nimbus Sans</family> + <default> + <family>Helvetica</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Heros</family> <default> <family>Helvetica</family> @@ -64,6 +71,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Nimbus Sans Narrow</family> + <default> + <family>Helvetica Condensed</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Heros Cn</family> <default> <family>Helvetica Condensed</family> @@ -78,6 +92,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Nimbus Roman</family> + <default> + <family>Times</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Termes</family> <default> <family>Times</family> @@ -92,6 +113,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Nimbus Mono</family> + <default> + <family>Courier</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Cursor</family> <default> <family>Courier</family> @@ -113,6 +141,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>URW Gothic</family> + <default> + <family>ITC Avant Garde Gothic</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Adventor</family> <default> <family>ITC Avant Garde Gothic</family> @@ -134,6 +169,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Bookman URW</family> + <default> + <family>ITC Bookman</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Bonum</family> <default> <family>ITC Bookman</family> @@ -162,6 +204,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Chancery URW</family> + <default> + <family>ITC Zapf Chancery</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Chorus</family> <default> <family>ITC Zapf Chancery</family> @@ -176,6 +225,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Palladio URW</family> + <default> + <family>Palatino</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Pagella</family> <default> <family>Palatino</family> @@ -197,6 +253,13 @@ but in an order preferring similar designs first. We do this in three steps: </alias> <alias binding="same"> + <family>Century SchoolBook URW</family> + <default> + <family>New Century Schoolbook</family> + </default> + </alias> + + <alias binding="same"> <family>TeX Gyre Schola</family> <default> <family>New Century Schoolbook</family> @@ -401,6 +464,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>Helvetica</family> <accept> <family>TeX Gyre Heros</family> + <family>Nimbus Sans</family> <family>Nimbus Sans L</family> </accept> </alias> @@ -409,6 +473,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>Helvetica Condensed</family> <accept> <family>TeX Gyre Heros Cn</family> + <family>Nimbus Sans Narrow</family> </accept> </alias> @@ -416,6 +481,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>Times</family> <accept> <family>TeX Gyre Termes</family> + <family>Nimbus Roman</family> <family>Nimbus Roman No9 L</family> </accept> </alias> @@ -424,6 +490,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>Courier</family> <accept> <family>TeX Gyre Cursor</family> + <family>Nimbus Mono</family> <family>Nimbus Mono L</family> </accept> </alias> @@ -432,6 +499,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>ITC Avant Garde Gothic</family> <accept> <family>TeX Gyre Adventor</family> + <family>URW Gothic</family> <family>URW Gothic L</family> </accept> </alias> @@ -441,6 +509,7 @@ but in an order preferring similar designs first. We do this in three steps: <accept> <family>Bookman Old Style</family> <family>TeX Gyre Bonum</family> + <family>Bookman URW</family> <family>URW Bookman L</family> </accept> </alias> @@ -449,6 +518,7 @@ but in an order preferring similar designs first. We do this in three steps: <family>ITC Zapf Chancery</family> <accept> <family>TeX Gyre Chorus</family> + <family>Chancery URW</family> <family>URW Chancery L</family> </accept> </alias> @@ -458,6 +528,7 @@ but in an order preferring similar designs first. We do this in three steps: <accept> <family>Palatino Linotype</family> <family>TeX Gyre Pagella</family> + <family>Palladio URW</family> <family>URW Palladio L</family> </accept> </alias> @@ -467,6 +538,7 @@ but in an order preferring similar designs first. We do this in three steps: <accept> <family>Century Schoolbook</family> <family>TeX Gyre Schola</family> + <family>Century SchoolBook URW</family> <family>Century Schoolbook L</family> </accept> </alias> diff --git a/fontconfig/conf.d/45-latin.conf b/fontconfig/conf.d/45-latin.conf index 996fb81..72490f3 100644 --- a/fontconfig/conf.d/45-latin.conf +++ b/fontconfig/conf.d/45-latin.conf @@ -34,6 +34,10 @@ <default><family>serif</family></default> </alias> <alias> + <family>Nimbus Roman</family> + <default><family>serif</family></default> + </alias> + <alias> <family>Luxi Serif</family> <default><family>serif</family></default> </alias> @@ -97,6 +101,10 @@ <default><family>sans-serif</family></default> </alias> <alias> + <family>Nimbus Sans</family> + <default><family>sans-serif</family></default> + </alias> + <alias> <family>Luxi Sans</family> <default><family>sans-serif</family></default> </alias> @@ -151,6 +159,10 @@ <family>Nimbus Mono L</family> <default><family>monospace</family></default> </alias> + <alias> + <family>Nimbus Mono</family> + <default><family>monospace</family></default> + </alias>  diff --git a/fontconfig/conf.d/60-latin.conf b/fontconfig/conf.d/60-latin.conf index 2107e31..35600ea 100644 --- a/fontconfig/conf.d/60-latin.conf +++ b/fontconfig/conf.d/60-latin.conf @@ -10,6 +10,7 @@ <family>Thorndale AMT</family> <family>Luxi Serif</family> <family>Nimbus Roman No9 L</family> + <family>Nimbus Roman</family> <family>Times</family> </prefer> </alias> @@ -23,6 +24,7 @@ <family>Albany AMT</family> <family>Luxi Sans</family> <family>Nimbus Sans L</family> + <family>Nimbus Sans</family> <family>Helvetica</family> <family>Lucida Sans Unicode</family> <family>BPG Glaho International</family>  @@ -40,6 +42,7 @@ <family>Cumberland AMT</family> <family>Luxi Mono</family> <family>Nimbus Mono L</family> + <family>Nimbus Mono</family> <family>Courier</family> </prefer> </alias> diff --git a/libX11/nls/compose.dir.pre b/libX11/nls/compose.dir.pre index 455070f..e52a5c5 100644 --- a/libX11/nls/compose.dir.pre +++ b/libX11/nls/compose.dir.pre @@ -1,7 +1,7 @@ XCOMM -XCOMM This file contains compose table file name. -XCOMM The first word is the compose table file name and -XCOMM the second word is full locale name. +XCOMM This file contains compose table file names. +XCOMM The first word is the compose table file name +XCOMM and the second word is the full locale name. XCOMM XCOMM iso8859-1/Compose: C @@ -289,13 +289,12 @@ en_US.UTF-8/Compose: ar_SY.UTF-8 en_US.UTF-8/Compose: ar_TN.UTF-8 en_US.UTF-8/Compose: ar_YE.UTF-8 en_US.UTF-8/Compose: as_IN.UTF-8 -en_US.UTF-8/Compose: bo_IN.UTF-8 -en_US.UTF-8/Compose: bs_BA.UTF-8 en_US.UTF-8/Compose: az_AZ.UTF-8 en_US.UTF-8/Compose: be_BY.UTF-8 en_US.UTF-8/Compose: bg_BG.UTF-8 -en_US.UTF-8/Compose: bn_IN.UTF-8 en_US.UTF-8/Compose: bn_BD.UTF-8 +en_US.UTF-8/Compose: bn_IN.UTF-8 +en_US.UTF-8/Compose: bo_IN.UTF-8 en_US.UTF-8/Compose: br_FR.UTF-8 en_US.UTF-8/Compose: bs_BA.UTF-8 en_US.UTF-8/Compose: ca_AD.UTF-8 @@ -317,10 +316,10 @@ en_US.UTF-8/Compose: en_AU.UTF-8 en_US.UTF-8/Compose: en_BE.UTF-8 en_US.UTF-8/Compose: en_BW.UTF-8 en_US.UTF-8/Compose: en_BZ.UTF-8 -en_US.UTF-8/Compose: en_DK.UTF-8 en_US.UTF-8/Compose: en_CA.UTF-8 -en_US.UTF-8/Compose: en_GB.UTF-8 +en_US.UTF-8/Compose: en_DK.UTF-8 en_US.UTF-8/Compose: en_EN.UTF-8 +en_US.UTF-8/Compose: en_GB.UTF-8 en_US.UTF-8/Compose: en_HK.UTF-8 en_US.UTF-8/Compose: en_IE.UTF-8 en_US.UTF-8/Compose: en_IN.UTF-8 @@ -458,16 +457,16 @@ en_US.UTF-8/Compose: tr_TR.UTF-8 en_US.UTF-8/Compose: ts_ZA.UTF-8 en_US.UTF-8/Compose: tt_RU.UTF-8 en_US.UTF-8/Compose: uk_UA.UTF-8 -en_US.UTF-8/Compose: ur_PK.UTF-8 en_US.UTF-8/Compose: ur_IN.UTF-8 +en_US.UTF-8/Compose: ur_PK.UTF-8 en_US.UTF-8/Compose: uz_UZ.UTF-8 en_US.UTF-8/Compose: ve_ZA.UTF-8 en_US.UTF-8/Compose: vi_VN.UTF-8 en_US.UTF-8/Compose: wa_BE.UTF-8 -en_US.UTF-8/Compose: yi_US.UTF-8 en_US.UTF-8/Compose: xh_ZA.UTF-8 +en_US.UTF-8/Compose: yi_US.UTF-8 zh_CN.UTF-8/Compose: zh_CN.UTF-8 zh_HK.UTF-8/Compose: zh_HK.UTF-8 +en_US.UTF-8/Compose: zh_SG.UTF-8 zh_TW.UTF-8/Compose: zh_TW.UTF-8 en_US.UTF-8/Compose: zu_ZA.UTF-8 -en_US.UTF-8/Compose: zh_SG.UTF-8 diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index 4a96570..972e111 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -103,6 +103,7 @@ XCOMM Spaces <Multi_key> <o> <R> : "®" registered # REGISTERED SIGN <Multi_key> <O> <r> : "®" registered # REGISTERED SIGN <Multi_key> <O> <R> : "®" registered # REGISTERED SIGN +<Multi_key> <R> <o> : "®" registered # REGISTERED SIGN <Multi_key> <R> <O> : "®" registered # REGISTERED SIGN <Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK @@ -119,8 +120,6 @@ XCOMM Spaces <Multi_key> <plus> <minus> : "±" plusminus # PLUS-MINUS SIGN <Multi_key> <minus> <plus> : "±" plusminus # PLUS-MINUS SIGN <Multi_key> <question> <question> : "¿" questiondown # INVERTED QUESTION MARK -<Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE -<Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE <Multi_key> <s> <s> : "ß" ssharp # LATIN SMALL LETTER SHARP S <Multi_key> <S> <S> : "ẞ" U1e9e # LATIN CAPITAL LETTER SHARP S @@ -200,21 +199,24 @@ XCOMM "₲" U20b2 GUARANI SIGN XCOMM "₳" U20b3 AUSTRAL SIGN XCOMM "₴" U20b4 HRYVNIA SIGN XCOMM "₵" U20b5 CEDI SIGN +<Multi_key> <R> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN +<Multi_key> <equal> <R> : "₹" U20b9 # INDIAN RUPEE SIGN +<Multi_key> <r> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN +<Multi_key> <equal> <r> : "₹" U20b9 # INDIAN RUPEE SIGN - -<Multi_key> <bar> <C> : "¢" cent # CENT SIGN -<Multi_key> <bar> <c> : "¢" cent # CENT SIGN <Multi_key> <C> <bar> : "¢" cent # CENT SIGN +<Multi_key> <bar> <C> : "¢" cent # CENT SIGN <Multi_key> <c> <bar> : "¢" cent # CENT SIGN +<Multi_key> <bar> <c> : "¢" cent # CENT SIGN <Multi_key> <c> <slash> : "¢" cent # CENT SIGN <Multi_key> <slash> <c> : "¢" cent # CENT SIGN <Multi_key> <L> <minus> : "£" sterling # POUND SIGN -<Multi_key> <l> <minus> : "£" sterling # POUND SIGN <Multi_key> <minus> <L> : "£" sterling # POUND SIGN +<Multi_key> <l> <minus> : "£" sterling # POUND SIGN <Multi_key> <minus> <l> : "£" sterling # POUND SIGN <Multi_key> <Y> <equal> : "¥" yen # YEN SIGN -<Multi_key> <y> <equal> : "¥" yen # YEN SIGN <Multi_key> <equal> <Y> : "¥" yen # YEN SIGN +<Multi_key> <y> <equal> : "¥" yen # YEN SIGN <Multi_key> <equal> <y> : "¥" yen # YEN SIGN <Multi_key> <Y> <minus> : "¥" yen # YEN SIGN <Multi_key> <minus> <Y> : "¥" yen # YEN SIGN @@ -878,12 +880,14 @@ XCOMM Part 3 <Multi_key> <less> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON <Multi_key> <d> <less> : "ď" U010F # LATIN SMALL LETTER D WITH CARON <dead_stroke> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE +<Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE +<Multi_key> <D> <minus> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE <Multi_key> <slash> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE <Multi_key> <KP_Divide> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE -<Multi_key> <D> <minus> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE <dead_stroke> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE -<Multi_key> <slash> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE +<Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE <Multi_key> <d> <minus> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE +<Multi_key> <slash> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE <Multi_key> <KP_Divide> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE <dead_macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON <Multi_key> <macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON @@ -4425,7 +4429,8 @@ XCOMM Part 3 <Multi_key> <asciicircum> <plus> : "⁺" U207A # SUPERSCRIPT PLUS SIGN <dead_circumflex> <KP_Add> : "⁺" U207A # SUPERSCRIPT PLUS SIGN <Multi_key> <asciicircum> <KP_Add> : "⁺" U207A # SUPERSCRIPT PLUS SIGN -<dead_circumflex> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS +<dead_circumflex> <minus> : "⁻" U207B # SUPERSCRIPT MINUS +<dead_circumflex> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS <Multi_key> <asciicircum> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS <dead_circumflex> <equal> : "⁼" U207C # SUPERSCRIPT EQUALS SIGN <Multi_key> <asciicircum> <equal> : "⁼" U207C # SUPERSCRIPT EQUALS SIGN @@ -5069,13 +5074,18 @@ XCOMM Part 3 <Multi_key> <parenleft> <U30F0> <parenright> : "㋼" U32FC # CIRCLED KATAKANA WI <Multi_key> <parenleft> <U30F1> <parenright> : "㋽" U32FD # CIRCLED KATAKANA WE <Multi_key> <parenleft> <kana_WO> <parenright> : "㋾" U32FE # CIRCLED KATAKANA WO + +XCOMM +XCOMM Hebrew letters with accents +XCOMM + <Multi_key> <U05B4> <hebrew_yod> : "יִ" UFB1D # HEBREW LETTER YOD WITH HIRIQ -<Multi_key> <U05B7> <U05F2> : "ײַ" UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH +<Multi_key> <U05B7> <U05F2> : "ײַ" UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH <Multi_key> <U05C1> <hebrew_shin> : "שׁ" UFB2A # HEBREW LETTER SHIN WITH SHIN DOT <Multi_key> <U05C2> <hebrew_shin> : "שׂ" UFB2B # HEBREW LETTER SHIN WITH SIN DOT -<Multi_key> <U05C1> <UFB49> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT +<Multi_key> <U05C1> <UFB49> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT <Multi_key> <U05C1> <U05BC> <hebrew_shin> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT -<Multi_key> <U05C2> <UFB49> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT +<Multi_key> <U05C2> <UFB49> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT <Multi_key> <U05C2> <U05BC> <hebrew_shin> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT <Multi_key> <U05B7> <hebrew_aleph> : "אַ" UFB2E # HEBREW LETTER ALEF WITH PATAH <Multi_key> <U05B8> <hebrew_aleph> : "אָ" UFB2F # HEBREW LETTER ALEF WITH QAMATS @@ -5216,7 +5226,6 @@ XCOMM <dead_cedilla> <U0114> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE <dead_cedilla> <U0115> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE <dead_cedilla> <nobreakspace> : "̧" U0327 # COMBINING CEDILLA -<dead_circumflex> <minus> : "⁻" U207B # SUPERSCRIPT MINUS <dead_circumflex> <Aacute> : "Ấ" Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE <dead_circumflex> <Agrave> : "Ầ" Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE <dead_circumflex> <Ahook> : "Ẩ" Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE @@ -5867,8 +5876,8 @@ XCOMM Characters from "Mathematical Operators" <Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND OPERATOR <Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND OPERATOR <Multi_key> <U2228> <U2227> : "⋄" U22c4 # ∨ ∧ DIAMOND OPERATOR -<Multi_key> <colon> <period> : "∴" therefore # THEREFORE -<Multi_key> <period> <colon> : "∵" because # BECAUSE +<Multi_key> <colon> <period> : "∴" therefore # : . THEREFORE +<Multi_key> <period> <colon> : "∵" because # . : BECAUSE XCOMM Characters from "Miscellaneous Technical" diff --git a/libxcb/src/c_client.py b/libxcb/src/c_client.py index 87f268b..56a1766 100644 --- a/libxcb/src/c_client.py +++ b/libxcb/src/c_client.py @@ -358,7 +358,8 @@ def _c_type_setup(self, name, postfix): field.c_pointer = '*' field.c_field_const_type = 'const ' + field.c_field_type self.c_need_aux = True - elif not field.type.fixed_size() and not field.type.is_case_or_bitcase: + + if not field.type.fixed_size() and not field.type.is_case_or_bitcase: self.c_need_sizeof = True field.c_iterator_type = _t(field.field_type + ('iterator',)) # xcb_fieldtype_iterator_t @@ -656,9 +657,15 @@ def get_serialize_params(context, self, buffer_var='_buffer', aux_var='_aux'): return (param_fields, wire_fields, params) # get_serialize_params() -def _c_serialize_helper_insert_padding(context, code_lines, space, postpone): +def _c_serialize_helper_insert_padding(context, code_lines, space, postpone, is_case_or_bitcase): code_lines.append('%s /* insert padding */' % space) - code_lines.append('%s xcb_pad = -xcb_block_len & (xcb_align_to - 1);' % space) + if is_case_or_bitcase: + code_lines.append( + '%s xcb_pad = -(xcb_block_len + xcb_padding_offset) & (xcb_align_to - 1);' + % space) + else: + code_lines.append( + '%s xcb_pad = -xcb_block_len & (xcb_align_to - 1);' % space) # code_lines.append('%s printf("automatically inserting padding: %%%%d\\n", xcb_pad);' % space) code_lines.append('%s xcb_buffer_len += xcb_block_len + xcb_pad;' % space) @@ -676,6 +683,8 @@ def _c_serialize_helper_insert_padding(context, code_lines, space, postpone): code_lines.append('%s }' % space) code_lines.append('%s xcb_block_len = 0;' % space) + if is_case_or_bitcase: + code_lines.append('%s xcb_padding_offset = 0;' % space) # keep tracking of xcb_parts entries for serialize return 1 @@ -770,6 +779,10 @@ def _c_serialize_helper_switch_field(context, self, field, c_switch_variable, pr elif context in ('unserialize', 'unpack'): length = "%s(xcb_tmp, %s&%s%s)" % (field.type.c_unpack_name, c_field_names, prefix_str, field.c_field_name) + elif 'sizeof' == context: + # remove trailing ", " from c_field_names because it will be used at end of arglist + my_c_field_names = c_field_names[:-2] + length = "%s(xcb_tmp, %s)" % (field.type.c_sizeof_name, my_c_field_names) return length # _c_serialize_helper_switch_field() @@ -869,9 +882,13 @@ def _c_serialize_helper_fields_fixed_size(context, self, field, # total padding = sizeof(pad0) * nmemb length += " * %d" % field.type.nmemb - if field.type.is_list: - # no such case in the protocol, cannot be tested and therefore ignored for now - raise Exception('list with fixed number of elemens unhandled in _unserialize()') + elif field.type.is_list: + # list with fixed number of elements + # length of array = sizeof(arrayElementType) * nmemb + length += " * %d" % field.type.nmemb + # use memcpy because C cannot assign whole arrays with operator= + value = ' memcpy(%s, xcb_tmp, %s);' % (abs_field_name, length) + elif 'serialize' == context: value = ' xcb_parts[xcb_parts_idx].iov_base = (char *) ' @@ -996,13 +1013,15 @@ def _c_serialize_helper_fields(context, self, # Variable length pad is <pad align= /> code_lines.append('%s xcb_align_to = %d;' % (space, field.type.align)) count += _c_serialize_helper_insert_padding(context, code_lines, space, - self.c_var_followed_by_fixed_fields) + self.c_var_followed_by_fixed_fields, + is_case_or_bitcase) continue else: # switch/bitcase: always calculate padding before and after variable sized fields if need_padding or is_case_or_bitcase: count += _c_serialize_helper_insert_padding(context, code_lines, space, - self.c_var_followed_by_fixed_fields) + self.c_var_followed_by_fixed_fields, + is_case_or_bitcase) value, length = _c_serialize_helper_fields_variable_size(context, self, field, code_lines, temp_vars, @@ -1042,7 +1061,12 @@ def _c_serialize_helper_fields(context, self, code_lines.append('%s xcb_parts_idx++;' % space) count += 1 - code_lines.append('%s xcb_align_to = ALIGNOF(%s);' % (space, 'char' if field.c_field_type == 'void' else field.c_field_type)) + code_lines.append( + '%s xcb_align_to = ALIGNOF(%s);' + % (space, + 'char' + if field.c_field_type == 'void' or field.type.is_switch + else field.c_field_type)) need_padding = True if self.c_var_followed_by_fixed_fields: @@ -1086,7 +1110,7 @@ def _c_serialize_helper(context, complex_type, code_lines, temp_vars, space, prefix, False) # "final padding" - count += _c_serialize_helper_insert_padding(context, code_lines, space, False) + count += _c_serialize_helper_insert_padding(context, code_lines, space, False, self.is_switch) return count # _c_serialize_helper() @@ -1156,6 +1180,8 @@ def _c_serialize(context, self): _c(' char *xcb_out = *_buffer;') _c(' unsigned int xcb_buffer_len = 0;') _c(' unsigned int xcb_align_to = 0;') + if self.is_switch: + _c(' unsigned int xcb_padding_offset = ((size_t)xcb_out) & 7;') prefix = [('_aux', '->', self)] aux_ptr = 'xcb_out' @@ -1179,6 +1205,8 @@ def _c_serialize(context, self): _c(' unsigned int xcb_block_len = 0;') _c(' unsigned int xcb_pad = 0;') _c(' unsigned int xcb_align_to = 0;') + if self.is_switch: + _c(' unsigned int xcb_padding_offset = ((size_t)_buffer) & 7;') elif 'sizeof' == context: param_names = [p[2] for p in params] @@ -1196,6 +1224,8 @@ def _c_serialize(context, self): else: _c(' char *xcb_tmp = (char *)_buffer;') prefix = [('_aux', '->', self)] + if self.is_switch: + _c(' unsigned int xcb_padding_offset = 0;') count = _c_serialize_helper(context, self, code_lines, temp_vars, prefix=prefix) # update variable size fields (only important for context=='serialize' @@ -1774,7 +1804,7 @@ def _c_complex(self, force_packed = False): for b in self.bitcases: space = '' if b.type.has_name: - _h(' struct _%s {', b.c_field_name) + _h(' struct {') space = ' ' for field in b.type.fields: _c_complex_field(self, field, space) diff --git a/libxcb/xcb-proto/src/xinput.xml b/libxcb/xcb-proto/src/xinput.xml index dc87e78..7f7b0a6 100644 --- a/libxcb/xcb-proto/src/xinput.xml +++ b/libxcb/xcb-proto/src/xinput.xml @@ -862,7 +862,7 @@ in struct DeviceTimeCoord. <field type="CARD8" name="len" /> <field type="CARD8" name="num_valuators" /> <field type="CARD8" name="mode" mask="ValuatorStateModeMask" /> - <list type="CARD32" name="valuators"> + <list type="INT32" name="valuators"> <fieldref>num_valuators</fieldref> </list> </struct> @@ -870,14 +870,33 @@ in struct DeviceTimeCoord. <struct name="InputState"> <field type="CARD8" name="class_id" enum="InputClass" /> <field type="CARD8" name="len" /> - <field type="CARD8" name="num_items" /> - <pad bytes="1" /> - <list type="CARD8" name="uninterpreted_data"> - <op op="-"> - <fieldref>len</fieldref> - <value>4</value> - </op> - </list> + <switch name="data"> + <fieldref>class_id</fieldref> + <case name="key"> + <enumref ref="InputClass">Key</enumref> + <field type="CARD8" name="num_keys" /> + <pad bytes="1" /> + <list type="CARD8" name="keys"> + <value>32</value> + </list> + </case> + <case name="button"> + <enumref ref="InputClass">Button</enumref> + <field type="CARD8" name="num_buttons" /> + <pad bytes="1" /> + <list type="CARD8" name="buttons"> + <value>32</value> + </list> + </case> + <case name="valuator"> + <enumref ref="InputClass">Valuator</enumref> + <field type="CARD8" name="num_valuators" /> + <field type="CARD8" name="mode" mask="ValuatorStateModeMask" /> + <list type="INT32" name="valuators"> + <fieldref>num_valuators</fieldref> + </list> + </case> + </switch> </struct> <request name="QueryDeviceState" opcode="30"> diff --git a/mesalib/VERSION b/mesalib/VERSION index d43f97a..093d8ba 100644 --- a/mesalib/VERSION +++ b/mesalib/VERSION @@ -1 +1 @@ -10.4.0-devel +10.5.0-devel diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 03f1bca..1d9d015 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -39,6 +39,7 @@ PRESENTPROTO_REQUIRED=1.0 LIBUDEV_REQUIRED=151 GLPROTO_REQUIRED=1.4.14 LIBOMXIL_BELLAGIO_REQUIRED=0.0 +LIBVA_REQUIRED=0.35.0 VDPAU_REQUIRED=0.4.1 WAYLAND_REQUIRED=1.2.0 XCB_REQUIRED=1.9.3 @@ -252,7 +253,16 @@ AC_SUBST([VISIBILITY_CXXFLAGS]) dnl dnl Optional flags, check for compiler support dnl -AX_CHECK_COMPILE_FLAG([-msse4.1], [SSE41_SUPPORTED=1], [SSE41_SUPPORTED=0]) +save_CFLAGS="$CFLAGS" +CFLAGS="-msse4.1 $CFLAGS" +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#include <smmintrin.h> +int main () { + __m128i a = _mm_set1_epi32 (0), b = _mm_set1_epi32 (0), c; + c = _mm_max_epu32(a, b); + return 0; +}]])], SSE41_SUPPORTED=1) +CFLAGS="$save_CFLAGS" if test "x$SSE41_SUPPORTED" = x1; then DEFINES="$DEFINES -DUSE_SSE41" fi @@ -527,6 +537,9 @@ if test "x$enable_asm" = xyes; then esac fi +AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"]) +AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) + dnl Check to see if dlopen is in default libraries (like Solaris, which dnl has it in libc), or if libdl is needed to get it. AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"], @@ -657,6 +670,11 @@ AC_ARG_ENABLE([gbm], [enable gbm library @<:@default=auto@:>@])], [enable_gbm="$enableval"], [enable_gbm=auto]) +AC_ARG_ENABLE([nine], + [AS_HELP_STRING([--enable-nine], + [enable build of the nine Direct3D9 API @<:@default=no@:>@])], + [enable_nine="$enableval"], + [enable_nine=no]) AC_ARG_ENABLE([xvmc], [AS_HELP_STRING([--enable-xvmc], @@ -694,20 +712,6 @@ AC_ARG_ENABLE([xlib-glx], [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])], [enable_xlib_glx="$enableval"], [enable_xlib_glx=no]) -AC_ARG_ENABLE([gallium-egl], - [AS_HELP_STRING([--enable-gallium-egl], - [enable optional EGL state tracker (not required - for EGL support in Gallium with OpenGL and OpenGL ES) - @<:@default=disabled@:>@])], - [enable_gallium_egl="$enableval"], - [enable_gallium_egl=no]) -AC_ARG_ENABLE([gallium-gbm], - [AS_HELP_STRING([--enable-gallium-gbm], - [enable optional gbm state tracker (not required for - gbm support in Gallium) - @<:@default=auto@:>@])], - [enable_gallium_gbm="$enableval"], - [enable_gallium_gbm=auto]) AC_ARG_ENABLE([r600-llvm-compiler], [AS_HELP_STRING([--enable-r600-llvm-compiler], @@ -744,6 +748,7 @@ esac if test "x$enable_opengl" = xno -a \ "x$enable_gles1" = xno -a \ "x$enable_gles2" = xno -a \ + "x$enable_nine" = xno -a \ "x$enable_openvg" = xno -a \ "x$enable_xa" = xno -a \ "x$enable_xvmc" = xno -a \ @@ -1311,51 +1316,6 @@ AM_CONDITIONAL(HAVE_EGL, test "x$enable_egl" = xyes) AC_SUBST([EGL_LIB_DEPS]) dnl -dnl EGL Gallium configuration -dnl -if test "x$enable_gallium_egl" = xyes; then - if test -z "$with_gallium_drivers"; then - AC_MSG_ERROR([cannot enable egl_gallium without Gallium]) - fi - if test "x$enable_egl" = xno; then - AC_MSG_ERROR([cannot enable egl_gallium without EGL]) - fi - if test "x$have_libdrm" != xyes; then - AC_MSG_ERROR([egl_gallium requires libdrm >= $LIBDRM_REQUIRED]) - fi -# XXX: Uncomment once converted to use static/shared pipe-drivers -# enable_gallium_loader=$enable_shared_pipe_drivers -fi -AM_CONDITIONAL(HAVE_GALLIUM_EGL, test "x$enable_gallium_egl" = xyes) - -dnl -dnl gbm Gallium configuration -dnl -if test "x$enable_gallium_gbm" = xauto; then - case "$enable_gbm$enable_gallium_egl$enable_dri$with_egl_platforms" in - yesyesyes*drm*) - enable_gallium_gbm=yes ;; - *) - enable_gallium_gbm=no ;; - esac -fi -if test "x$enable_gallium_gbm" = xyes; then - if test -z "$with_gallium_drivers"; then - AC_MSG_ERROR([cannot enable gbm_gallium without Gallium]) - fi - if test "x$enable_gbm" = xno; then - AC_MSG_ERROR([cannot enable gbm_gallium without gbm]) - fi - - if test "x$enable_gallium_egl" != xyes; then - AC_MSG_ERROR([gbm_gallium is only used by egl_gallium]) - fi - - enable_gallium_loader=$enable_shared_pipe_drivers -fi -AM_CONDITIONAL(HAVE_GALLIUM_GBM, test "x$enable_gallium_gbm" = xyes) - -dnl dnl XA configuration dnl if test "x$enable_xa" = xyes; then @@ -1383,9 +1343,9 @@ if test "x$enable_openvg" = xyes; then if test -z "$with_gallium_drivers"; then AC_MSG_ERROR([cannot enable OpenVG without Gallium]) fi - if test "x$enable_gallium_egl" = xno; then - AC_MSG_ERROR([cannot enable OpenVG without egl_gallium]) - fi + + AC_MSG_ERROR([Cannot enable OpenVG, because egl_gallium has been removed and + OpenVG hasn't been integrated into standard libEGL yet]) EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(VG_LIB)' VG_LIB_DEPS="$VG_LIB_DEPS $SELINUX_LIBS $PTHREAD_LIBS" @@ -1399,49 +1359,74 @@ dnl Gallium G3DVL configuration dnl if test -n "$with_gallium_drivers" -a "x$with_gallium_drivers" != xswrast; then if test "x$enable_xvmc" = xauto; then - PKG_CHECK_EXISTS([xvmc], [enable_xvmc=yes], [enable_xvmc=no]) + PKG_CHECK_EXISTS([xvmc >= $XVMC_REQUIRED], [enable_xvmc=yes], [enable_xvmc=no]) fi if test "x$enable_vdpau" = xauto; then - PKG_CHECK_EXISTS([vdpau], [enable_vdpau=yes], [enable_vdpau=no]) + PKG_CHECK_EXISTS([vdpau >= $VDPAU_REQUIRED], [enable_vdpau=yes], [enable_vdpau=no]) fi if test "x$enable_omx" = xauto; then - PKG_CHECK_EXISTS([libomxil-bellagio], [enable_omx=yes], [enable_omx=no]) + PKG_CHECK_EXISTS([libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED], [enable_omx=yes], [enable_omx=no]) fi if test "x$enable_va" = xauto; then - PKG_CHECK_EXISTS([libva], [enable_va=yes], [enable_va=no]) + PKG_CHECK_EXISTS([libva >= $LIBVA_REQUIRED], [enable_va=yes], [enable_va=no]) fi fi +if test "x$enable_xvmc" = xyes -o \ + "x$enable_vdpau" = xyes -o \ + "x$enable_omx" = xyes -o \ + "x$enable_va" = xyes; then + PKG_CHECK_MODULES([VL], [x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + need_gallium_vl=yes +fi +AM_CONDITIONAL(NEED_GALLIUM_VL, test "x$need_gallium_vl" = xyes) + if test "x$enable_xvmc" = xyes; then - PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + PKG_CHECK_MODULES([XVMC], [xvmc >= $XVMC_REQUIRED]) enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_XVMC, test "x$enable_xvmc" = xyes) if test "x$enable_vdpau" = xyes; then - PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED], - [VDPAU_LIBS="`$PKG_CONFIG --libs x11-xcb xcb xcb-dri2`"]) + PKG_CHECK_MODULES([VDPAU], [vdpau >= $VDPAU_REQUIRED]) enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VDPAU, test "x$enable_vdpau" = xyes) if test "x$enable_omx" = xyes; then - PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED x11-xcb xcb xcb-dri2 >= $XCBDRI2_REQUIRED]) + PKG_CHECK_MODULES([OMX], [libomxil-bellagio >= $LIBOMXIL_BELLAGIO_REQUIRED]) enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) if test "x$enable_va" = xyes; then - PKG_CHECK_MODULES([VA], [libva >= 0.35.0 x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED], - [VA_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) + PKG_CHECK_MODULES([VA], [libva >= $LIBVA_REQUIRED]) enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VA, test "x$enable_va" = xyes) dnl +dnl Nine Direct3D9 configuration +dnl +if test "x$enable_nine" = xyes; then + if ! echo "$with_gallium_drivers" | grep -q 'swrast'; then + AC_MSG_ERROR([nine requires the gallium swrast driver]) + fi + if test "x$with_gallium_drivers" == xswrast; then + AC_MSG_ERROR([nine requires at least one non-swrast gallium driver]) + fi + if test "x$enable_dri3" = xno; then + AC_MSG_WARN([using nine together with wine requires DRI3 enabled system]) + fi + + enable_gallium_loader=$enable_shared_pipe_drivers +fi +AM_CONDITIONAL(HAVE_ST_NINE, test "x$enable_nine" = xyes) + +dnl dnl OpenCL configuration dnl @@ -1815,6 +1800,13 @@ AC_ARG_WITH([va-libdir], [VA_LIB_INSTALL_DIR="${libdir}/dri"]) AC_SUBST([VA_LIB_INSTALL_DIR]) +AC_ARG_WITH([d3d-libdir], + [AS_HELP_STRING([--with-d3d-libdir=DIR], + [directory for the D3D modules @<:@${libdir}/d3d@:>@])], + [D3D_DRIVER_INSTALL_DIR="$withval"], + [D3D_DRIVER_INSTALL_DIR="${libdir}/d3d"]) +AC_SUBST([D3D_DRIVER_INSTALL_DIR]) + dnl dnl Gallium helper functions dnl @@ -1970,7 +1962,7 @@ if test -n "$with_gallium_drivers"; then fi dnl Set LLVM_LIBS - This is done after the driver configuration so -dnl that drivers can add additonal components to LLVM_COMPONENTS. +dnl that drivers can add additional components to LLVM_COMPONENTS. dnl Previously, gallium drivers were updating LLVM_LIBS directly dnl by calling llvm-config --libs ${DRIVER_LLVM_COMPONENTS}, but dnl this was causing the same libraries to be appear multiple times @@ -2003,11 +1995,16 @@ if test "x$MESA_LLVM" != x0; then invocation and rebuild.])]) dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each compoenent and we have + dnl install uses a shared object for each component and we have dnl already added all of these objects to LLVM_LIBS. fi else - AC_MSG_WARN([Building mesa with staticly linked LLVM may cause compilation issues]) + AC_MSG_WARN([Building mesa with statically linked LLVM may cause compilation issues]) + dnl We need to link to llvm system libs when using static libs + dnl However, only llvm 3.5+ provides --system-libs + if test $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -ge 5; then + LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`" + fi fi fi @@ -2094,6 +2091,11 @@ AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64) AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64) AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc) +AC_SUBST([NINE_MAJOR], 1) +AC_SUBST([NINE_MINOR], 0) +AC_SUBST([NINE_TINY], 0) +AC_SUBST([NINE_VERSION], "$NINE_MAJOR.$NINE_MINOR.$NINE_TINY") + AC_SUBST([VDPAU_MAJOR], 1) AC_SUBST([VDPAU_MINOR], 0) @@ -2162,9 +2164,8 @@ AC_CONFIG_FILES([Makefile src/gallium/drivers/vc4/kernel/Makefile src/gallium/state_trackers/clover/Makefile src/gallium/state_trackers/dri/Makefile - src/gallium/state_trackers/egl/Makefile - src/gallium/state_trackers/gbm/Makefile src/gallium/state_trackers/glx/xlib/Makefile + src/gallium/state_trackers/nine/Makefile src/gallium/state_trackers/omx/Makefile src/gallium/state_trackers/osmesa/Makefile src/gallium/state_trackers/va/Makefile @@ -2172,6 +2173,8 @@ AC_CONFIG_FILES([Makefile src/gallium/state_trackers/vega/Makefile src/gallium/state_trackers/xa/Makefile src/gallium/state_trackers/xvmc/Makefile + src/gallium/targets/d3dadapter9/Makefile + src/gallium/targets/d3dadapter9/d3d.pc src/gallium/targets/dri/Makefile src/gallium/targets/egl-static/Makefile src/gallium/targets/gbm/Makefile @@ -2299,12 +2302,7 @@ if test "$enable_egl" = yes; then egl_drivers="$egl_drivers builtin:egl_dri2" fi - if test "x$enable_gallium_egl" = xyes; then - echo " EGL drivers: ${egl_drivers} egl_gallium" - echo " EGL Gallium STs:$EGL_CLIENT_APIS" - else - echo " EGL drivers: $egl_drivers" - fi + echo " EGL drivers: $egl_drivers" fi echo "" diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 6a988d5..648f5ac 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -18,7 +18,7 @@ are exposed in the 3.0 context as extensions. Feature Status ----------------------------------------------------- ------------------------ -GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe (*), softpipe (*) +GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe, softpipe glBindFragDataLocation, glGetFragDataLocation DONE Conditional rendering (GL_NV_conditional_render) DONE (r300, swrast) @@ -45,7 +45,7 @@ GL 3.0, GLSL 1.30 --- all DONE: i965, nv50, nvc0, r600, radeonsi, llvmpipe (*), glVertexAttribI commands DONE Depth format cube textures DONE () GLX_ARB_create_context (GLX 1.4 is required) DONE - Multisample anti-aliasing DONE (r300) + Multisample anti-aliasing DONE (llvmpipe (*), softpipe (*), r300) (*) llvmpipe and softpipe have fake Multisample anti-aliasing support @@ -98,8 +98,8 @@ GL 4.0, GLSL 4.00: GL_ARB_draw_indirect DONE (i965, nvc0, radeonsi, llvmpipe, softpipe) GL_ARB_gpu_shader5 DONE (i965, nvc0) - 'precise' qualifier DONE - - Dynamically uniform sampler array indices DONE () - - Dynamically uniform UBO array indices DONE () + - Dynamically uniform sampler array indices DONE (r600) + - Dynamically uniform UBO array indices DONE (r600) - Implicit signed -> unsigned conversions DONE - Fused multiply-add DONE () - Packing/bitfield/conversion functions DONE (r600) @@ -107,7 +107,7 @@ GL 4.0, GLSL 4.00: - Geometry shader instancing DONE (r600) - Geometry shader multiple streams DONE () - Enhanced per-sample shading DONE (r600) - - Interpolation functions DONE () + - Interpolation functions DONE (r600) - New overload resolution rules DONE GL_ARB_gpu_shader_fp64 started (Dave) GL_ARB_sample_shading DONE (i965, nv50, nvc0, r600, radeonsi) @@ -187,15 +187,15 @@ GL 4.4, GLSL 4.40: GL 4.5, GLSL 4.50: GL_ARB_ES3_1_compatibility not started - GL_ARB_clip_control DONE (llvmpipe, softpipe, r300, r600, radeonsi) - GL_ARB_conditional_render_inverted DONE (i965, nvc0, llvmpipe, softpipe) + GL_ARB_clip_control DONE (nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe) + GL_ARB_conditional_render_inverted DONE (i965, nv50, nvc0, llvmpipe, softpipe) GL_ARB_cull_distance not started GL_ARB_derivative_control DONE (i965, nv50, nvc0, r600) - GL_ARB_direct_state_access not started + GL_ARB_direct_state_access started (Laura Ekstrand) GL_ARB_get_texture_sub_image started (Brian Paul) GL_ARB_shader_texture_image_samples not started GL_ARB_texture_barrier DONE (nv50, nvc0, r300, r600, radeonsi) - GL_KHR_context_flush_control not started + GL_KHR_context_flush_control DONE (all - but needs GLX/EXT extension to be useful) GL_KHR_robust_buffer_access_behavior not started GL_KHR_robustness 90% done (the ARB variant) diff --git a/mesalib/docs/egl.html b/mesalib/docs/egl.html index eebb8c7..e77c235 100644 --- a/mesalib/docs/egl.html +++ b/mesalib/docs/egl.html @@ -77,13 +77,6 @@ drivers will be installed to <code>${libdir}/egl</code>.</p> </dd> -<dt><code>--enable-gallium-egl</code></dt> -<dd> - -<p>Enable the optional <code>egl_gallium</code> driver.</p> - -</dd> - <dt><code>--with-egl-platforms</code></dt> <dd> diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 0a491a2..024bb5f 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,18 @@ <h1>News</h1> +<h2>November 21, 2014</h2> +<p> +<a href="relnotes/10.3.4.html">Mesa 10.3.4</a> is released. +This is a bug-fix release. +</p> + +<h2>November 8, 2014</h2> +<p> +<a href="relnotes/10.3.3.html">Mesa 10.3.3</a> is released. +This is a bug-fix release. +</p> + <h2>October 24, 2014</h2> <p> <a href="relnotes/10.3.2.html">Mesa 10.3.2</a> is released. diff --git a/mesalib/docs/llvmpipe.html b/mesalib/docs/llvmpipe.html index 291527b..72db93a 100644 --- a/mesalib/docs/llvmpipe.html +++ b/mesalib/docs/llvmpipe.html @@ -43,7 +43,7 @@ It's the fastest software rasterizer for Mesa. </p> </li> <li> - <p>LLVM: version 3.4 recommended; 3.1 or later required.</p> + <p>LLVM: version 3.4 recommended; 3.3 or later required.</p> <p> For Linux, on a recent Debian based distribution do: </p> diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 1c97edd..8dd7326 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,8 @@ The release notes summarize what's new or changed in each Mesa release. </p> <ul> +<li><a href="relnotes/10.3.4.html">10.3.4 release notes</a> +<li><a href="relnotes/10.3.3.html">10.3.3 release notes</a> <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> diff --git a/mesalib/docs/relnotes/10.3.3.html b/mesalib/docs/relnotes/10.3.3.html new file mode 100644 index 0000000..3ca6496 --- /dev/null +++ b/mesalib/docs/relnotes/10.3.3.html @@ -0,0 +1,209 @@ +<!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.3 Release Notes / November 8, 2014</h1> + +<p> +Mesa 10.3.3 is a bug fix release which fixes bugs found since the 10.3.2 release. +</p> +<p> +Mesa 10.3.3 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> +23a0c36d88cd5d8968ae6454160de2878192fd1d37b5d606adca1f1b7e788b79 MesaLib-10.3.3.tar.gz +0e4eee4a2ddf86456eed2fc44da367f95471f74249636710491e85cc256c4753 MesaLib-10.3.3.tar.bz2 +a83648f17d776b7cf6c813fbb15782d2644b937dc6a7c53d8c0d1b35411f4840 MesaLib-10.3.3.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=70410">Bug 70410</a> - egl-static/Makefile: linking fails with llvm >= 3.4</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82921">Bug 82921</a> - layout(location=0) emits error >= MAX_UNIFORM_LOCATIONS due to integer underflow</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83574">Bug 83574</a> - [llvmpipe] [softpipe] piglit arb_explicit_uniform_location-use-of-unused-loc regression</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85454">Bug 85454</a> - Unigine Sanctuary with Wine crashes on Mesa Git</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85918">Bug 85918</a> - Mesa: MSVC 2010/2012 Compile error</li> + +</ul> + + +<h2>Changes</h2> + +<p>Anuj Phogat (2):</p> +<ul> + <li>glsl: Fix crash due to negative array index</li> + <li>glsl: Use signed array index in update_max_array_access()</li> +</ul> + +<p>Brian Paul (1):</p> +<ul> + <li>mesa: fix UNCLAMPED_FLOAT_TO_UBYTE() macro for MSVC</li> +</ul> + +<p>Emil Velikov (2):</p> +<ul> + <li>docs: Add sha256 sums for the 10.3.2 release</li> + <li>Update version to 10.3.3</li> +</ul> + +<p>Ilia Mirkin (27):</p> +<ul> + <li>freedreno/ir3: fix FSLT/etc handling to return 0/-1 instead of 0/1.0</li> + <li>freedreno/ir3: INEG operates on src0, not src1</li> + <li>freedreno/ir3: add UARL support</li> + <li>freedreno/ir3: negate result of USLT/etc</li> + <li>freedreno/ir3: use unsigned comparison for UIF</li> + <li>freedreno/ir3: add TXL support</li> + <li>freedreno/ir3: fix UCMP handling</li> + <li>freedreno/ir3: implement UMUL correctly</li> + <li>freedreno: add default .dir-locals.el for emacs settings</li> + <li>freedreno/ir3: make texture instruction construction more dynamic</li> + <li>freedreno/ir3: fix TXB/TXL to actually pull the bias/lod argument</li> + <li>freedreno/ir3: add TXQ support</li> + <li>freedreno/ir3: add TXB2 support</li> + <li>freedreno: dual-source render targets are not supported</li> + <li>freedreno: instanced drawing/compute not yet supported</li> + <li>freedreno/ir3: avoid fan-in sources referring to same instruction</li> + <li>freedreno/ir3: add IDIV/UDIV support</li> + <li>freedreno/ir3: add UMOD support, based on UDIV</li> + <li>freedreno/ir3: add MOD support</li> + <li>freedreno/ir3: add ISSG support</li> + <li>freedreno/ir3: add UMAD support</li> + <li>freedreno/ir3: make TXQ return integers, not floats</li> + <li>freedreno/ir3: shadow comes before array</li> + <li>freedreno/ir3: add texture offset support</li> + <li>freedreno/ir3: add TXD support and expose ARB_shader_texture_lod</li> + <li>freedreno/ir3: add TXF support</li> + <li>freedreno: positions come out as integers, not half-integers</li> +</ul> + +<p>Jan Vesely (1):</p> +<ul> + <li>configure: include llvm systemlibs when using static llvm</li> +</ul> + +<p>Marek Olšák (5):</p> +<ul> + <li>r600g: fix polygon mode for points and lines and point/line fill modes</li> + <li>radeonsi: fix polygon mode for points and lines and point/line fill modes</li> + <li>radeonsi: fix incorrect index buffer max size for lowered 8-bit indices</li> + <li>Revert "st/mesa: set MaxUnrollIterations = 255"</li> + <li>r300g: remove enabled/disabled hyperz and AA compression messages</li> +</ul> + +<p>Mauro Rossi (1):</p> +<ul> + <li>gallium/nouveau: fully build the driver under android</li> +</ul> + +<p>Michel Dänzer (1):</p> +<ul> + <li>radeon/llvm: Dynamically allocate branch/loop stack arrays</li> +</ul> + +<p>Rob Clark (62):</p> +<ul> + <li>freedreno/ir3: detect scheduler fail</li> + <li>freedreno/ir3: add TXB</li> + <li>freedreno/ir3: add DDX/DDY</li> + <li>freedreno/ir3: bit of debug</li> + <li>freedreno/ir3: fix error in bail logic</li> + <li>freedreno/ir3: fix constlen with relative addressing</li> + <li>freedreno/ir3: add no-copy-propagate fallback step</li> + <li>freedreno: don't overflow cmdstream buffer so much</li> + <li>freedreno/ir3: fix potential segfault in RA</li> + <li>freedreno: update generated headers</li> + <li>freedreno/a3xx: enable hw primitive-restart</li> + <li>freedreno/a3xx: handle rendering to layer != 0</li> + <li>freedreno: update generated headers</li> + <li>freedreno/a3xx: format fixes</li> + <li>util/u_format: add _is_alpha()</li> + <li>freedreno/a3xx: alpha render-target shenanigans</li> + <li>freedreno/ir3: catch incorrect usage of tmp-dst</li> + <li>freedreno/ir3: add missing put_dst</li> + <li>freedreno: "fix" problems with excessive flushes</li> + <li>freedreno: update generated headers</li> + <li>freedreno/a3xx: 3d/array textures</li> + <li>freedreno: add DRM_CONF_SHARE_FD</li> + <li>freedreno/a3xx: more texture array fixes</li> + <li>freedreno/a3xx: initial texture border-color</li> + <li>freedreno: fix compiler warning</li> + <li>freedreno: don't advertise mirror-clamp support</li> + <li>freedreno: update generated headers</li> + <li>freedreno: we have more than 0 viewports!</li> + <li>freedreno: turn missing caps into compile warnings</li> + <li>freedreno/a3xx: add LOD_BIAS</li> + <li>freedreno/a3xx: add flat interpolation mode</li> + <li>freedreno/a3xx: add 32bit integer vtx formats</li> + <li>freedreno/a3xx: fix border color order</li> + <li>freedreno: move bind_sampler_states to per-generation</li> + <li>freedreno: add texcoord clamp support to lowering</li> + <li>freedreno/a3xx: add support to emulate GL_CLAMP</li> + <li>freedreno/a3xx: re-emit shaders on variant change</li> + <li>freedreno/lowering: fix token calculation for lowering</li> + <li>freedreno: destroy transfer pool after blitter</li> + <li>freedreno: max-texture-lod-bias should be 15.0f</li> + <li>freedreno: update generated headers</li> + <li>freedreno/a3xx: handle large shader program sizes</li> + <li>freedreno/a3xx: emit all immediates in one shot</li> + <li>freedreno/ir3: fix lockups with lame FRAG shaders</li> + <li>freedreno/a3xx: handle VS only outputting BCOLOR</li> + <li>freedreno: query fixes</li> + <li>freedreno/a3xx: refactor vertex state emit</li> + <li>freedreno/a3xx: refactor/optimize emit</li> + <li>freedreno/ir3: optimize shader key comparision</li> + <li>freedreno: inline fd_draw_emit()</li> + <li>freedreno: fix layer_stride</li> + <li>freedreno: update generated headers</li> + <li>freedreno/ir3: large const support</li> + <li>freedreno/a3xx: more layer/level fixes</li> + <li>freedreno/ir3: comment + better fxn name</li> + <li>freedreno/ir3: fix potential gpu lockup with kill</li> + <li>freedreno/a3xx: disable early-z when we have kill's</li> + <li>freedreno/ir3: add debug flag to disable cp</li> + <li>freedreno: clear vs scissor</li> + <li>freedreno: mark scissor state dirty when enable bit changes</li> + <li>freedreno/a3xx: fix viewport state during clear</li> + <li>freedreno/a3xx: fix depth/stencil restore format</li> +</ul> + +<p>Tapani Pälli (2):</p> +<ul> + <li>glsl: fix uniform location count used for glsl types</li> + <li>mesa: check that uniform exists in glUniform* functions</li> +</ul> + + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes/10.3.4.html b/mesalib/docs/relnotes/10.3.4.html new file mode 100644 index 0000000..bc29462 --- /dev/null +++ b/mesalib/docs/relnotes/10.3.4.html @@ -0,0 +1,106 @@ +<!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.4 Release Notes / November 21, 2014</h1> + +<p> +Mesa 10.3.4 is a bug fix release which fixes bugs found since the 10.3.3 release. +</p> +<p> +Mesa 10.3.4 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> +26482495ef6177f889dbd87c7edcccfedd995598785bbbd7e3e066352574c8e0 MesaLib-10.3.4.tar.gz +e6373913142338d10515daf619d659433bfd2989988198930c13b0945a15e98a MesaLib-10.3.4.tar.bz2 +8c3ebbb6535daf3414305860ebca6ac67dbb6e3d35058c7a6ce18b84b5945b7f MesaLib-10.3.4.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=76252">Bug 76252</a> - Dynamic loading/unloading of opengl32.dll results in a deadlock</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=78770">Bug 78770</a> - [SNB bisected]Webglc conformance/textures/texture-size-limit.html fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83500">Bug 83500</a> - si_dma_copy_tile causes GPU hangs</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=85647">Bug 85647</a> - Random radeonsi crashes with mesa 10.3.x</li> + +</ul> + +<h2>Changes</h2> +<p>Brian Paul (1):</p> +<ul> + <li>st/mesa: copy sampler_array_size field when copying instructions</li> +</ul> + +<p>Chad Versace (1):</p> +<ul> + <li>i965: Fix segfault in WebGL Conformance on Ivybridge</li> +</ul> + +<p>Dave Airlie (5):</p> +<ul> + <li>r600g/cayman: fix integer multiplication output overwrite (v2)</li> + <li>r600g/cayman: fix texture gather tests</li> + <li>r600g/cayman: handle empty vertex shaders</li> + <li>r600g: geom shaders: always load texture src regs from inputs</li> + <li>r600g: limit texture offset application to specific types (v2)</li> +</ul> + +<p>Emil Velikov (3):</p> +<ul> + <li>docs: Add sha256 sums for the 10.3.3 release</li> + <li>configure.ac: roll up a program for the sse4.1 check</li> + <li>get-pick-list.sh: Require explicit "10.3" for nominating stable patches</li> +</ul> + +<p>Ilia Mirkin (1):</p> +<ul> + <li>st/mesa: add a fallback for clear_with_quad when no vs_layer</li> +</ul> + +<p>José Fonseca (1):</p> +<ul> + <li>llvmpipe: Avoid deadlock when unloading opengl32.dll</li> +</ul> + +<p>Kenneth Graunke (1):</p> +<ul> + <li>i915g: we also have more than 0 viewports!</li> +</ul> + +<p>Michel Dänzer (1):</p> +<ul> + <li>radeonsi: Disable asynchronous DMA except for PIPE_BUFFER</li> +</ul> + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes/10.4.html b/mesalib/docs/relnotes/10.4.html index 67c3087..8682d71 100644 --- a/mesalib/docs/relnotes/10.4.html +++ b/mesalib/docs/relnotes/10.4.html @@ -44,9 +44,11 @@ Note: some of the new features are only available with certain drivers. </p> <ul> +<li>GL_ARB_conditional_render_inverted on nv50</li> <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> +<li>GL_ARB_clip_control on nv50, nvc0, r300, r600, radeonsi, llvmpipe, softpipe</li> +<li>GL_KHR_context_flush_control on all drivers</li> </ul> diff --git a/mesalib/docs/relnotes/10.4.html b/mesalib/docs/relnotes/10.5.0.html similarity index 75% copy from mesalib/docs/relnotes/10.4.html copy to mesalib/docs/relnotes/10.5.0.html index 67c3087..84bfcdb 100644 --- a/mesalib/docs/relnotes/10.4.html +++ b/mesalib/docs/relnotes/10.5.0.html @@ -14,15 +14,15 @@ <iframe src="../contents.html"></iframe> <div class="content"> -<h1>Mesa 10.4 Release Notes / TBD</h1> +<h1>Mesa 10.5.0 Release Notes / TBD</h1> <p> -Mesa 10.4 is a new development release. +Mesa 10.5.0 is a new development release. People who are concerned with stability and reliability should stick -with a previous release or wait for Mesa 10.4.1. +with a previous release or wait for Mesa 10.5.1. </p> <p> -Mesa 10.4 implements the OpenGL 3.3 API, but the version reported by +Mesa 10.5.0 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 @@ -44,9 +44,6 @@ Note: some of the new features are only available with certain drivers. </p> <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/include/D3D9/d3d9.h b/mesalib/include/D3D9/d3d9.h new file mode 100644 index 0000000..f872be7 --- /dev/null +++ b/mesalib/include/D3D9/d3d9.h @@ -0,0 +1,1858 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +/*** THIS FILE IS AUTOGENERATED. DO NOT MODIFY MANUALLY. ***/ + +#ifndef _D3D9_H_ +#define _D3D9_H_ + +#include "d3d9types.h" +#include "d3d9caps.h" + +typedef struct IDirect3D9 IDirect3D9, *PDIRECT3D9, *LPDIRECT3D9; +typedef struct IDirect3D9Ex IDirect3D9Ex, *PDIRECT3D9EX, *LPDIRECT3D9EX; +typedef struct IDirect3D9ExOverlayExtension IDirect3D9ExOverlayExtension, *PDIRECT3D9EXOVERLAYEXTENSION, *LPDIRECT3D9EXOVERLAYEXTENSION; +typedef struct IDirect3DAuthenticatedChannel9 IDirect3DAuthenticatedChannel9, *PDIRECT3DAUTHENTICATEDCHANNEL9, *LPDIRECT3DAUTHENTICATEDCHANNEL9; +typedef struct IDirect3DBaseTexture9 IDirect3DBaseTexture9, *PDIRECT3DBASETEXTURE9, *LPDIRECT3DBASETEXTURE9; +typedef struct IDirect3DCryptoSession9 IDirect3DCryptoSession9, *PDIRECT3DCRYPTOSESSION9, *LPDIRECT3DCRYPTOSESSION9; +typedef struct IDirect3DCubeTexture9 IDirect3DCubeTexture9, *PDIRECT3DCUBETEXTURE9, *LPDIRECT3DCUBETEXTURE9; +typedef struct IDirect3DDevice9 IDirect3DDevice9, *PDIRECT3DDEVICE9, *LPDIRECT3DDEVICE9; +typedef struct IDirect3DDevice9Ex IDirect3DDevice9Ex, *PDIRECT3DDEVICE9EX, *LPDIRECT3DDEVICE9EX; +typedef struct IDirect3DDevice9Video IDirect3DDevice9Video, *PDIRECT3DDEVICE9VIDEO, *LPDIRECT3DDEVICE9VIDEO; +typedef struct IDirect3DIndexBuffer9 IDirect3DIndexBuffer9, *PDIRECT3DINDEXBUFFER9, *LPDIRECT3DINDEXBUFFER9; +typedef struct IDirect3DPixelShader9 IDirect3DPixelShader9, *PDIRECT3DPIXELSHADER9, *LPDIRECT3DPIXELSHADER9; +typedef struct IDirect3DQuery9 IDirect3DQuery9, *PDIRECT3DQUERY9, *LPDIRECT3DQUERY9; +typedef struct IDirect3DResource9 IDirect3DResource9, *PDIRECT3DRESOURCE9, *LPDIRECT3DRESOURCE9; +typedef struct IDirect3DStateBlock9 IDirect3DStateBlock9, *PDIRECT3DSTATEBLOCK9, *LPDIRECT3DSTATEBLOCK9; +typedef struct IDirect3DSurface9 IDirect3DSurface9, *PDIRECT3DSURFACE9, *LPDIRECT3DSURFACE9; +typedef struct IDirect3DSwapChain9 IDirect3DSwapChain9, *PDIRECT3DSWAPCHAIN9, *LPDIRECT3DSWAPCHAIN9; +typedef struct IDirect3DSwapChain9Ex IDirect3DSwapChain9Ex, *PDIRECT3DSWAPCHAIN9EX, *LPDIRECT3DSWAPCHAIN9EX; +typedef struct IDirect3DTexture9 IDirect3DTexture9, *PDIRECT3DTEXTURE9, *LPDIRECT3DTEXTURE9; +typedef struct IDirect3DVertexBuffer9 IDirect3DVertexBuffer9, *PDIRECT3DVERTEXBUFFER9, *LPDIRECT3DVERTEXBUFFER9; +typedef struct IDirect3DVertexDeclaration9 IDirect3DVertexDeclaration9, *PDIRECT3DVERTEXDECLARATION9, *LPDIRECT3DVERTEXDECLARATION9; +typedef struct IDirect3DVertexShader9 IDirect3DVertexShader9, *PDIRECT3DVERTEXSHADER9, *LPDIRECT3DVERTEXSHADER9; +typedef struct IDirect3DVolume9 IDirect3DVolume9, *PDIRECT3DVOLUME9, *LPDIRECT3DVOLUME9; +typedef struct IDirect3DVolumeTexture9 IDirect3DVolumeTexture9, *PDIRECT3DVOLUMETEXTURE9, *LPDIRECT3DVOLUMETEXTURE9; + +#ifdef __cplusplus + +extern "C" const GUID IID_IDirect3D9; +extern "C" const GUID IID_IDirect3D9Ex; +extern "C" const GUID IID_IDirect3D9ExOverlayExtension; +extern "C" const GUID IID_IDirect3DAuthenticatedChannel9; +extern "C" const GUID IID_IDirect3DBaseTexture9; +extern "C" const GUID IID_IDirect3DCryptoSession9; +extern "C" const GUID IID_IDirect3DCubeTexture9; +extern "C" const GUID IID_IDirect3DDevice9; +extern "C" const GUID IID_IDirect3DDevice9Ex; +extern "C" const GUID IID_IDirect3DDevice9Video; +extern "C" const GUID IID_IDirect3DIndexBuffer9; +extern "C" const GUID IID_IDirect3DPixelShader9; +extern "C" const GUID IID_IDirect3DQuery9; +extern "C" const GUID IID_IDirect3DResource9; +extern "C" const GUID IID_IDirect3DStateBlock9; +extern "C" const GUID IID_IDirect3DSurface9; +extern "C" const GUID IID_IDirect3DSwapChain9; +extern "C" const GUID IID_IDirect3DSwapChain9Ex; +extern "C" const GUID IID_IDirect3DTexture9; +extern "C" const GUID IID_IDirect3DVertexBuffer9; +extern "C" const GUID IID_IDirect3DVertexDeclaration9; +extern "C" const GUID IID_IDirect3DVertexShader9; +extern "C" const GUID IID_IDirect3DVolume9; +extern "C" const GUID IID_IDirect3DVolumeTexture9; + +struct IDirect3D9 : public IUnknown +{ + virtual HRESULT WINAPI RegisterSoftwareDevice(void *pInitializeFunction) = 0; + virtual UINT WINAPI GetAdapterCount() = 0; + virtual HRESULT WINAPI GetAdapterIdentifier(UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier) = 0; + virtual UINT WINAPI GetAdapterModeCount(UINT Adapter, D3DFORMAT Format) = 0; + virtual HRESULT WINAPI EnumAdapterModes(UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE *pMode) = 0; + virtual HRESULT WINAPI GetAdapterDisplayMode(UINT Adapter, D3DDISPLAYMODE *pMode) = 0; + virtual HRESULT WINAPI CheckDeviceType(UINT Adapter, D3DDEVTYPE DevType, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, BOOL bWindowed) = 0; + virtual HRESULT WINAPI CheckDeviceFormat(UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) = 0; + virtual HRESULT WINAPI CheckDeviceMultiSampleType(UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels) = 0; + virtual HRESULT WINAPI CheckDepthStencilMatch(UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) = 0; + virtual HRESULT WINAPI CheckDeviceFormatConversion(UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) = 0; + virtual HRESULT WINAPI GetDeviceCaps(UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps) = 0; + virtual HMONITOR WINAPI GetAdapterMonitor(UINT Adapter) = 0; + virtual HRESULT WINAPI CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DDevice9 **ppReturnedDeviceInterface) = 0; +}; + +struct IDirect3D9Ex : public IDirect3D9 +{ + virtual UINT WINAPI GetAdapterModeCountEx(UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter) = 0; + virtual HRESULT WINAPI EnumAdapterModesEx(UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter, UINT Mode, D3DDISPLAYMODEEX *pMode) = 0; + virtual HRESULT WINAPI GetAdapterDisplayModeEx(UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) = 0; + virtual HRESULT WINAPI CreateDeviceEx(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode, IDirect3DDevice9Ex **ppReturnedDeviceInterface) = 0; + virtual HRESULT WINAPI GetAdapterLUID(UINT Adapter, LUID *pLUID) = 0; +}; + +struct IDirect3D9ExOverlayExtension : public IUnknown +{ + virtual HRESULT WINAPI CheckDeviceOverlayType(UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight, D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX *pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS *pOverlayCaps) = 0; +}; + +struct IDirect3DResource9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI SetPrivateData(REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) = 0; + virtual HRESULT WINAPI GetPrivateData(REFGUID refguid, void *pData, DWORD *pSizeOfData) = 0; + virtual HRESULT WINAPI FreePrivateData(REFGUID refguid) = 0; + virtual DWORD WINAPI SetPriority(DWORD PriorityNew) = 0; + virtual DWORD WINAPI GetPriority() = 0; + virtual void WINAPI PreLoad() = 0; + virtual D3DRESOURCETYPE WINAPI GetType() = 0; +}; + +struct IDirect3DBaseTexture9 : public IDirect3DResource9 +{ + virtual DWORD WINAPI SetLOD(DWORD LODNew) = 0; + virtual DWORD WINAPI GetLOD() = 0; + virtual DWORD WINAPI GetLevelCount() = 0; + virtual HRESULT WINAPI SetAutoGenFilterType(D3DTEXTUREFILTERTYPE FilterType) = 0; + virtual D3DTEXTUREFILTERTYPE WINAPI GetAutoGenFilterType() = 0; + virtual void WINAPI GenerateMipSubLevels() = 0; +}; + +struct IDirect3DCryptoSession9 : public IUnknown +{ + virtual HRESULT WINAPI GetCertificateSize(UINT *pCertificateSize) = 0; + virtual HRESULT WINAPI GetCertificate(UINT CertifacteSize, BYTE *ppCertificate) = 0; + virtual HRESULT WINAPI NegotiateKeyExchange(UINT DataSize, void *pData) = 0; + virtual HRESULT WINAPI EncryptionBlt(IDirect3DSurface9 *pSrcSurface, IDirect3DSurface9 *pDstSurface, UINT DstSurfaceSize, void *pIV) = 0; + virtual HRESULT WINAPI DecryptionBlt(IDirect3DSurface9 *pSrcSurface, IDirect3DSurface9 *pDstSurface, UINT SrcSurfaceSize, D3DENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, void *pContentKey, void *pIV) = 0; + virtual HRESULT WINAPI GetSurfacePitch(IDirect3DSurface9 *pSrcSurface, UINT *pSurfacePitch) = 0; + virtual HRESULT WINAPI StartSessionKeyRefresh(void *pRandomNumber, UINT RandomNumberSize) = 0; + virtual HRESULT WINAPI FinishSessionKeyRefresh() = 0; + virtual HRESULT WINAPI GetEncryptionBltKey(void *pReadbackKey, UINT KeySize) = 0; +}; + +struct IDirect3DCubeTexture9 : public IDirect3DBaseTexture9 +{ + virtual HRESULT WINAPI GetLevelDesc(UINT Level, D3DSURFACE_DESC *pDesc) = 0; + virtual HRESULT WINAPI GetCubeMapSurface(D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface9 **ppCubeMapSurface) = 0; + virtual HRESULT WINAPI LockRect(D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) = 0; + virtual HRESULT WINAPI UnlockRect(D3DCUBEMAP_FACES FaceType, UINT Level) = 0; + virtual HRESULT WINAPI AddDirtyRect(D3DCUBEMAP_FACES FaceType, const RECT *pDirtyRect) = 0; +}; + +struct IDirect3DDevice9 : public IUnknown +{ + virtual HRESULT WINAPI TestCooperativeLevel() = 0; + virtual UINT WINAPI GetAvailableTextureMem() = 0; + virtual HRESULT WINAPI EvictManagedResources() = 0; + virtual HRESULT WINAPI GetDirect3D(IDirect3D9 **ppD3D9) = 0; + virtual HRESULT WINAPI GetDeviceCaps(D3DCAPS9 *pCaps) = 0; + virtual HRESULT WINAPI GetDisplayMode(UINT iSwapChain, D3DDISPLAYMODE *pMode) = 0; + virtual HRESULT WINAPI GetCreationParameters(D3DDEVICE_CREATION_PARAMETERS *pParameters) = 0; + virtual HRESULT WINAPI SetCursorProperties(UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9 *pCursorBitmap) = 0; + virtual void WINAPI SetCursorPosition(int X, int Y, DWORD Flags) = 0; + virtual BOOL WINAPI ShowCursor(BOOL bShow) = 0; + virtual HRESULT WINAPI CreateAdditionalSwapChain(D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DSwapChain9 **pSwapChain) = 0; + virtual HRESULT WINAPI GetSwapChain(UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain) = 0; + virtual UINT WINAPI GetNumberOfSwapChains() = 0; + virtual HRESULT WINAPI Reset(D3DPRESENT_PARAMETERS *pPresentationParameters) = 0; + virtual HRESULT WINAPI Present(const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion) = 0; + virtual HRESULT WINAPI GetBackBuffer(UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer) = 0; + virtual HRESULT WINAPI GetRasterStatus(UINT iSwapChain, D3DRASTER_STATUS *pRasterStatus) = 0; + virtual HRESULT WINAPI SetDialogBoxMode(BOOL bEnableDialogs) = 0; + virtual void WINAPI SetGammaRamp(UINT iSwapChain, DWORD Flags, const D3DGAMMARAMP *pRamp) = 0; + virtual void WINAPI GetGammaRamp(UINT iSwapChain, D3DGAMMARAMP *pRamp) = 0; + virtual HRESULT WINAPI CreateTexture(UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateVolumeTexture(UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9 **ppVolumeTexture, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateCubeTexture(UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9 **ppCubeTexture, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateVertexBuffer(UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateIndexBuffer(UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateRenderTarget(UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI CreateDepthStencilSurface(UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI UpdateSurface(IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestinationSurface, const POINT *pDestPoint) = 0; + virtual HRESULT WINAPI UpdateTexture(IDirect3DBaseTexture9 *pSourceTexture, IDirect3DBaseTexture9 *pDestinationTexture) = 0; + virtual HRESULT WINAPI GetRenderTargetData(IDirect3DSurface9 *pRenderTarget, IDirect3DSurface9 *pDestSurface) = 0; + virtual HRESULT WINAPI GetFrontBufferData(UINT iSwapChain, IDirect3DSurface9 *pDestSurface) = 0; + virtual HRESULT WINAPI StretchRect(IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter) = 0; + virtual HRESULT WINAPI ColorFill(IDirect3DSurface9 *pSurface, const RECT *pRect, D3DCOLOR color) = 0; + virtual HRESULT WINAPI CreateOffscreenPlainSurface(UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) = 0; + virtual HRESULT WINAPI SetRenderTarget(DWORD RenderTargetIndex, IDirect3DSurface9 *pRenderTarget) = 0; + virtual HRESULT WINAPI GetRenderTarget(DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget) = 0; + virtual HRESULT WINAPI SetDepthStencilSurface(IDirect3DSurface9 *pNewZStencil) = 0; + virtual HRESULT WINAPI GetDepthStencilSurface(IDirect3DSurface9 **ppZStencilSurface) = 0; + virtual HRESULT WINAPI BeginScene() = 0; + virtual HRESULT WINAPI EndScene() = 0; + virtual HRESULT WINAPI Clear(DWORD Count, const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) = 0; + virtual HRESULT WINAPI SetTransform(D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix) = 0; + virtual HRESULT WINAPI GetTransform(D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix) = 0; + virtual HRESULT WINAPI MultiplyTransform(D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix) = 0; + virtual HRESULT WINAPI SetViewport(const D3DVIEWPORT9 *pViewport) = 0; + virtual HRESULT WINAPI GetViewport(D3DVIEWPORT9 *pViewport) = 0; + virtual HRESULT WINAPI SetMaterial(const D3DMATERIAL9 *pMaterial) = 0; + virtual HRESULT WINAPI GetMaterial(D3DMATERIAL9 *pMaterial) = 0; + virtual HRESULT WINAPI SetLight(DWORD Index, const D3DLIGHT9 *pLight) = 0; + virtual HRESULT WINAPI GetLight(DWORD Index, D3DLIGHT9 *pLight) = 0; + virtual HRESULT WINAPI LightEnable(DWORD Index, BOOL Enable) = 0; + virtual HRESULT WINAPI GetLightEnable(DWORD Index, BOOL *pEnable) = 0; + virtual HRESULT WINAPI SetClipPlane(DWORD Index, const float *pPlane) = 0; + virtual HRESULT WINAPI GetClipPlane(DWORD Index, float *pPlane) = 0; + virtual HRESULT WINAPI SetRenderState(D3DRENDERSTATETYPE State, DWORD Value) = 0; + virtual HRESULT WINAPI GetRenderState(D3DRENDERSTATETYPE State, DWORD *pValue) = 0; + virtual HRESULT WINAPI CreateStateBlock(D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB) = 0; + virtual HRESULT WINAPI BeginStateBlock() = 0; + virtual HRESULT WINAPI EndStateBlock(IDirect3DStateBlock9 **ppSB) = 0; + virtual HRESULT WINAPI SetClipStatus(const D3DCLIPSTATUS9 *pClipStatus) = 0; + virtual HRESULT WINAPI GetClipStatus(D3DCLIPSTATUS9 *pClipStatus) = 0; + virtual HRESULT WINAPI GetTexture(DWORD Stage, IDirect3DBaseTexture9 **ppTexture) = 0; + virtual HRESULT WINAPI SetTexture(DWORD Stage, IDirect3DBaseTexture9 *pTexture) = 0; + virtual HRESULT WINAPI GetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue) = 0; + virtual HRESULT WINAPI SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) = 0; + virtual HRESULT WINAPI GetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD *pValue) = 0; + virtual HRESULT WINAPI SetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) = 0; + virtual HRESULT WINAPI ValidateDevice(DWORD *pNumPasses) = 0; + virtual HRESULT WINAPI SetPaletteEntries(UINT PaletteNumber, const PALETTEENTRY *pEntries) = 0; + virtual HRESULT WINAPI GetPaletteEntries(UINT PaletteNumber, PALETTEENTRY *pEntries) = 0; + virtual HRESULT WINAPI SetCurrentTexturePalette(UINT PaletteNumber) = 0; + virtual HRESULT WINAPI GetCurrentTexturePalette(UINT *PaletteNumber) = 0; + virtual HRESULT WINAPI SetScissorRect(const RECT *pRect) = 0; + virtual HRESULT WINAPI GetScissorRect(RECT *pRect) = 0; + virtual HRESULT WINAPI SetSoftwareVertexProcessing(BOOL bSoftware) = 0; + virtual BOOL WINAPI GetSoftwareVertexProcessing() = 0; + virtual HRESULT WINAPI SetNPatchMode(float nSegments) = 0; + virtual float WINAPI GetNPatchMode() = 0; + virtual HRESULT WINAPI DrawPrimitive(D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) = 0; + virtual HRESULT WINAPI DrawIndexedPrimitive(D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount) = 0; + virtual HRESULT WINAPI DrawPrimitiveUP(D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride) = 0; + virtual HRESULT WINAPI DrawIndexedPrimitiveUP(D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertices, UINT PrimitiveCount, const void *pIndexData, D3DFORMAT IndexDataFormat, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride) = 0; + virtual HRESULT WINAPI ProcessVertices(UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9 *pDestBuffer, IDirect3DVertexDeclaration9 *pVertexDecl, DWORD Flags) = 0; + virtual HRESULT WINAPI CreateVertexDeclaration(const D3DVERTEXELEMENT9 *pVertexElements, IDirect3DVertexDeclaration9 **ppDecl) = 0; + virtual HRESULT WINAPI SetVertexDeclaration(IDirect3DVertexDeclaration9 *pDecl) = 0; + virtual HRESULT WINAPI GetVertexDeclaration(IDirect3DVertexDeclaration9 **ppDecl) = 0; + virtual HRESULT WINAPI SetFVF(DWORD FVF) = 0; + virtual HRESULT WINAPI GetFVF(DWORD *pFVF) = 0; + virtual HRESULT WINAPI CreateVertexShader(const DWORD *pFunction, IDirect3DVertexShader9 **ppShader) = 0; + virtual HRESULT WINAPI SetVertexShader(IDirect3DVertexShader9 *pShader) = 0; + virtual HRESULT WINAPI GetVertexShader(IDirect3DVertexShader9 **ppShader) = 0; + virtual HRESULT WINAPI SetVertexShaderConstantF(UINT StartRegister, const float *pConstantData, UINT Vector4fCount) = 0; + virtual HRESULT WINAPI GetVertexShaderConstantF(UINT StartRegister, float *pConstantData, UINT Vector4fCount) = 0; + virtual HRESULT WINAPI SetVertexShaderConstantI(UINT StartRegister, const int *pConstantData, UINT Vector4iCount) = 0; + virtual HRESULT WINAPI GetVertexShaderConstantI(UINT StartRegister, int *pConstantData, UINT Vector4iCount) = 0; + virtual HRESULT WINAPI SetVertexShaderConstantB(UINT StartRegister, const BOOL *pConstantData, UINT BoolCount) = 0; + virtual HRESULT WINAPI GetVertexShaderConstantB(UINT StartRegister, BOOL *pConstantData, UINT BoolCount) = 0; + virtual HRESULT WINAPI SetStreamSource(UINT StreamNumber, IDirect3DVertexBuffer9 *pStreamData, UINT OffsetInBytes, UINT Stride) = 0; + virtual HRESULT WINAPI GetStreamSource(UINT StreamNumber, IDirect3DVertexBuffer9 **ppStreamData, UINT *pOffsetInBytes, UINT *pStride) = 0; + virtual HRESULT WINAPI SetStreamSourceFreq(UINT StreamNumber, UINT Setting) = 0; + virtual HRESULT WINAPI GetStreamSourceFreq(UINT StreamNumber, UINT *pSetting) = 0; + virtual HRESULT WINAPI SetIndices(IDirect3DIndexBuffer9 *pIndexData) = 0; + virtual HRESULT WINAPI GetIndices(IDirect3DIndexBuffer9 **ppIndexData, UINT *pBaseVertexIndex) = 0; + virtual HRESULT WINAPI CreatePixelShader(const DWORD *pFunction, IDirect3DPixelShader9 **ppShader) = 0; + virtual HRESULT WINAPI SetPixelShader(IDirect3DPixelShader9 *pShader) = 0; + virtual HRESULT WINAPI GetPixelShader(IDirect3DPixelShader9 **ppShader) = 0; + virtual HRESULT WINAPI SetPixelShaderConstantF(UINT StartRegister, const float *pConstantData, UINT Vector4fCount) = 0; + virtual HRESULT WINAPI GetPixelShaderConstantF(UINT StartRegister, float *pConstantData, UINT Vector4fCount) = 0; + virtual HRESULT WINAPI SetPixelShaderConstantI(UINT StartRegister, const int *pConstantData, UINT Vector4iCount) = 0; + virtual HRESULT WINAPI GetPixelShaderConstantI(UINT StartRegister, int *pConstantData, UINT Vector4iCount) = 0; + virtual HRESULT WINAPI SetPixelShaderConstantB(UINT StartRegister, const BOOL *pConstantData, UINT BoolCount) = 0; + virtual HRESULT WINAPI GetPixelShaderConstantB(UINT StartRegister, BOOL *pConstantData, UINT BoolCount) = 0; + virtual HRESULT WINAPI DrawRectPatch(UINT Handle, const float *pNumSegs, const D3DRECTPATCH_INFO *pRectPatchInfo) = 0; + virtual HRESULT WINAPI DrawTriPatch(UINT Handle, const float *pNumSegs, const D3DTRIPATCH_INFO *pTriPatchInfo) = 0; + virtual HRESULT WINAPI DeletePatch(UINT Handle) = 0; + virtual HRESULT WINAPI CreateQuery(D3DQUERYTYPE Type, IDirect3DQuery9 **ppQuery) = 0; +}; + +struct IDirect3DDevice9Ex : public IDirect3DDevice9 +{ + virtual HRESULT WINAPI SetConvolutionMonoKernel(UINT width, UINT height, float *rows, float *columns) = 0; + virtual HRESULT WINAPI ComposeRects(IDirect3DSurface9 *pSrc, IDirect3DSurface9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset) = 0; + virtual HRESULT WINAPI PresentEx(const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD dwFlags) = 0; + virtual HRESULT WINAPI GetGPUThreadPriority(INT *pPriority) = 0; + virtual HRESULT WINAPI SetGPUThreadPriority(INT Priority) = 0; + virtual HRESULT WINAPI WaitForVBlank(UINT iSwapChain) = 0; + virtual HRESULT WINAPI CheckResourceResidency(IDirect3DResource9 **pResourceArray, UINT32 NumResources) = 0; + virtual HRESULT WINAPI SetMaximumFrameLatency(UINT MaxLatency) = 0; + virtual HRESULT WINAPI GetMaximumFrameLatency(UINT *pMaxLatency) = 0; + virtual HRESULT WINAPI CheckDeviceState(HWND hDestinationWindow) = 0; + virtual HRESULT WINAPI CreateRenderTargetEx(UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) = 0; + virtual HRESULT WINAPI CreateOffscreenPlainSurfaceEx(UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) = 0; + virtual HRESULT WINAPI CreateDepthStencilSurfaceEx(UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) = 0; + virtual HRESULT WINAPI ResetEx(D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode) = 0; + virtual HRESULT WINAPI GetDisplayModeEx(UINT iSwapChain, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) = 0; +}; + +struct IDirect3DDevice9Video : public IUnknown +{ + virtual HRESULT WINAPI GetContentProtectionCaps(const GUID *pCryptoType, const GUID *pDecodeProfile, D3DCONTENTPROTECTIONCAPS *pCaps) = 0; + virtual HRESULT WINAPI CreateAuthenticatedChannel(D3DAUTHENTICATEDCHANNELTYPE ChannelType, IDirect3DAuthenticatedChannel9 **ppAuthenticatedChannel, HANDLE *pChannelHandle) = 0; + virtual HRESULT WINAPI CreateCryptoSession(const GUID *pCryptoType, const GUID *pDecodeProfile, IDirect3DCryptoSession9 **ppCryptoSession, HANDLE *pCryptoHandle) = 0; +}; + +struct IDirect3DIndexBuffer9 : public IDirect3DResource9 +{ + virtual HRESULT WINAPI Lock(UINT OffsetToLock, UINT SizeToLock, void **ppbData, DWORD Flags) = 0; + virtual HRESULT WINAPI Unlock() = 0; + virtual HRESULT WINAPI GetDesc(D3DINDEXBUFFER_DESC *pDesc) = 0; +}; + +struct IDirect3DPixelShader9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI GetFunction(void *pData, UINT *pSizeOfData) = 0; +}; + +struct IDirect3DQuery9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual D3DQUERYTYPE WINAPI GetType() = 0; + virtual DWORD WINAPI GetDataSize() = 0; + virtual HRESULT WINAPI Issue(DWORD dwIssueFlags) = 0; + virtual HRESULT WINAPI GetData(void *pData, DWORD dwSize, DWORD dwGetDataFlags) = 0; +}; + +struct IDirect3DStateBlock9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI Capture() = 0; + virtual HRESULT WINAPI Apply() = 0; +}; + +struct IDirect3DSurface9 : public IDirect3DResource9 +{ + virtual HRESULT WINAPI GetContainer(REFIID riid, void **ppContainer) = 0; + virtual HRESULT WINAPI GetDesc(D3DSURFACE_DESC *pDesc) = 0; + virtual HRESULT WINAPI LockRect(D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) = 0; + virtual HRESULT WINAPI UnlockRect() = 0; + virtual HRESULT WINAPI GetDC(HDC *phdc) = 0; + virtual HRESULT WINAPI ReleaseDC(HDC hdc) = 0; +}; + +struct IDirect3DSwapChain9 : public IUnknown +{ + virtual HRESULT WINAPI Present(const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD dwFlags) = 0; + virtual HRESULT WINAPI GetFrontBufferData(IDirect3DSurface9 *pDestSurface) = 0; + virtual HRESULT WINAPI GetBackBuffer(UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer) = 0; + virtual HRESULT WINAPI GetRasterStatus(D3DRASTER_STATUS *pRasterStatus) = 0; + virtual HRESULT WINAPI GetDisplayMode(D3DDISPLAYMODE *pMode) = 0; + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI GetPresentParameters(D3DPRESENT_PARAMETERS *pPresentationParameters) = 0; +}; + +struct IDirect3DSwapChain9Ex : public IDirect3DSwapChain9 +{ + virtual HRESULT WINAPI GetLastPresentCount(UINT *pLastPresentCount) = 0; + virtual HRESULT WINAPI GetPresentStats(D3DPRESENTSTATS *pPresentationStatistics) = 0; + virtual HRESULT WINAPI GetDisplayModeEx(D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) = 0; +}; + +struct IDirect3DTexture9 : public IDirect3DBaseTexture9 +{ + virtual HRESULT WINAPI GetLevelDesc(UINT Level, D3DSURFACE_DESC *pDesc) = 0; + virtual HRESULT WINAPI GetSurfaceLevel(UINT Level, IDirect3DSurface9 **ppSurfaceLevel) = 0; + virtual HRESULT WINAPI LockRect(UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) = 0; + virtual HRESULT WINAPI UnlockRect(UINT Level) = 0; + virtual HRESULT WINAPI AddDirtyRect(const RECT *pDirtyRect) = 0; +}; + +struct IDirect3DVertexBuffer9 : public IDirect3DResource9 +{ + virtual HRESULT WINAPI Lock(UINT OffsetToLock, UINT SizeToLock, void **ppbData, DWORD Flags) = 0; + virtual HRESULT WINAPI Unlock() = 0; + virtual HRESULT WINAPI GetDesc(D3DVERTEXBUFFER_DESC *pDesc) = 0; +}; + +struct IDirect3DVertexDeclaration9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI GetDeclaration(D3DVERTEXELEMENT9 *pElement, UINT *pNumElements) = 0; +}; + +struct IDirect3DVertexShader9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI GetFunction(void *pData, UINT *pSizeOfData) = 0; +}; + +struct IDirect3DVolume9 : public IUnknown +{ + virtual HRESULT WINAPI GetDevice(IDirect3DDevice9 **ppDevice) = 0; + virtual HRESULT WINAPI SetPrivateData(REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags) = 0; + virtual HRESULT WINAPI GetPrivateData(REFGUID refguid, void *pData, DWORD *pSizeOfData) = 0; + virtual HRESULT WINAPI FreePrivateData(REFGUID refguid) = 0; + virtual HRESULT WINAPI GetContainer(REFIID riid, void **ppContainer) = 0; + virtual HRESULT WINAPI GetDesc(D3DVOLUME_DESC *pDesc) = 0; + virtual HRESULT WINAPI LockBox(D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags) = 0; + virtual HRESULT WINAPI UnlockBox() = 0; +}; + +#else /* __cplusplus */ + +extern const GUID IID_IDirect3D9; +extern const GUID IID_IDirect3D9Ex; +extern const GUID IID_IDirect3D9ExOverlayExtension; +extern const GUID IID_IDirect3DAuthenticatedChannel9; +extern const GUID IID_IDirect3DBaseTexture9; +extern const GUID IID_IDirect3DCryptoSession9; +extern const GUID IID_IDirect3DCubeTexture9; +extern const GUID IID_IDirect3DDevice9; +extern const GUID IID_IDirect3DDevice9Ex; +extern const GUID IID_IDirect3DDevice9Video; +extern const GUID IID_IDirect3DIndexBuffer9; +extern const GUID IID_IDirect3DPixelShader9; +extern const GUID IID_IDirect3DQuery9; +extern const GUID IID_IDirect3DResource9; +extern const GUID IID_IDirect3DStateBlock9; +extern const GUID IID_IDirect3DSurface9; +extern const GUID IID_IDirect3DSwapChain9; +extern const GUID IID_IDirect3DSwapChain9Ex; +extern const GUID IID_IDirect3DTexture9; +extern const GUID IID_IDirect3DVertexBuffer9; +extern const GUID IID_IDirect3DVertexDeclaration9; +extern const GUID IID_IDirect3DVertexShader9; +extern const GUID IID_IDirect3DVolume9; +extern const GUID IID_IDirect3DVolumeTexture9; + +typedef struct IDirect3D9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3D9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3D9 *This); + ULONG (WINAPI *Release)(IDirect3D9 *This); + /* IDirect3D9 */ + HRESULT (WINAPI *RegisterSoftwareDevice)(IDirect3D9 *This, void *pInitializeFunction); + UINT (WINAPI *GetAdapterCount)(IDirect3D9 *This); + HRESULT (WINAPI *GetAdapterIdentifier)(IDirect3D9 *This, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier); + UINT (WINAPI *GetAdapterModeCount)(IDirect3D9 *This, UINT Adapter, D3DFORMAT Format); + HRESULT (WINAPI *EnumAdapterModes)(IDirect3D9 *This, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetAdapterDisplayMode)(IDirect3D9 *This, UINT Adapter, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *CheckDeviceType)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DevType, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, BOOL bWindowed); + HRESULT (WINAPI *CheckDeviceFormat)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); + HRESULT (WINAPI *CheckDeviceMultiSampleType)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels); + HRESULT (WINAPI *CheckDepthStencilMatch)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat); + HRESULT (WINAPI *CheckDeviceFormatConversion)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat); + HRESULT (WINAPI *GetDeviceCaps)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps); + HMONITOR (WINAPI *GetAdapterMonitor)(IDirect3D9 *This, UINT Adapter); + HRESULT (WINAPI *CreateDevice)(IDirect3D9 *This, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DDevice9 **ppReturnedDeviceInterface); +} IDirect3D9Vtbl; +struct IDirect3D9 +{ + IDirect3D9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3D9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3D9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3D9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3D9 macros */ +#define IDirect3D9_RegisterSoftwareDevice(p,a) (p)->lpVtbl->RegisterSoftwareDevice(p,a) +#define IDirect3D9_GetAdapterCount(p) (p)->lpVtbl->GetAdapterCount(p) +#define IDirect3D9_GetAdapterIdentifier(p,a,b,c) (p)->lpVtbl->GetAdapterIdentifier(p,a,b,c) +#define IDirect3D9_GetAdapterModeCount(p,a,b) (p)->lpVtbl->GetAdapterModeCount(p,a,b) +#define IDirect3D9_EnumAdapterModes(p,a,b,c,d) (p)->lpVtbl->EnumAdapterModes(p,a,b,c,d) +#define IDirect3D9_GetAdapterDisplayMode(p,a,b) (p)->lpVtbl->GetAdapterDisplayMode(p,a,b) +#define IDirect3D9_CheckDeviceType(p,a,b,c,d,e) (p)->lpVtbl->CheckDeviceType(p,a,b,c,d,e) +#define IDirect3D9_CheckDeviceFormat(p,a,b,c,d,e,f) (p)->lpVtbl->CheckDeviceFormat(p,a,b,c,d,e,f) +#define IDirect3D9_CheckDeviceMultiSampleType(p,a,b,c,d,e,f) (p)->lpVtbl->CheckDeviceMultiSampleType(p,a,b,c,d,e,f) +#define IDirect3D9_CheckDepthStencilMatch(p,a,b,c,d,e) (p)->lpVtbl->CheckDepthStencilMatch(p,a,b,c,d,e) +#define IDirect3D9_CheckDeviceFormatConversion(p,a,b,c,d) (p)->lpVtbl->CheckDeviceFormatConversion(p,a,b,c,d) +#define IDirect3D9_GetDeviceCaps(p,a,b,c) (p)->lpVtbl->GetDeviceCaps(p,a,b,c) +#define IDirect3D9_GetAdapterMonitor(p,a) (p)->lpVtbl->GetAdapterMonitor(p,a) +#define IDirect3D9_CreateDevice(p,a,b,c,d,e,f) (p)->lpVtbl->CreateDevice(p,a,b,c,d,e,f) + +typedef struct IDirect3D9ExVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3D9Ex *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3D9Ex *This); + ULONG (WINAPI *Release)(IDirect3D9Ex *This); + /* IDirect3D9 */ + HRESULT (WINAPI *RegisterSoftwareDevice)(IDirect3D9Ex *This, void *pInitializeFunction); + UINT (WINAPI *GetAdapterCount)(IDirect3D9Ex *This); + HRESULT (WINAPI *GetAdapterIdentifier)(IDirect3D9Ex *This, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier); + UINT (WINAPI *GetAdapterModeCount)(IDirect3D9Ex *This, UINT Adapter, D3DFORMAT Format); + HRESULT (WINAPI *EnumAdapterModes)(IDirect3D9Ex *This, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetAdapterDisplayMode)(IDirect3D9Ex *This, UINT Adapter, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *CheckDeviceType)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DevType, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, BOOL bWindowed); + HRESULT (WINAPI *CheckDeviceFormat)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); + HRESULT (WINAPI *CheckDeviceMultiSampleType)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels); + HRESULT (WINAPI *CheckDepthStencilMatch)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat); + HRESULT (WINAPI *CheckDeviceFormatConversion)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat); + HRESULT (WINAPI *GetDeviceCaps)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps); + HMONITOR (WINAPI *GetAdapterMonitor)(IDirect3D9Ex *This, UINT Adapter); + HRESULT (WINAPI *CreateDevice)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DDevice9 **ppReturnedDeviceInterface); + /* IDirect3D9Ex */ + UINT (WINAPI *GetAdapterModeCountEx)(IDirect3D9Ex *This, UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter); + HRESULT (WINAPI *EnumAdapterModesEx)(IDirect3D9Ex *This, UINT Adapter, const D3DDISPLAYMODEFILTER *pFilter, UINT Mode, D3DDISPLAYMODEEX *pMode); + HRESULT (WINAPI *GetAdapterDisplayModeEx)(IDirect3D9Ex *This, UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); + HRESULT (WINAPI *CreateDeviceEx)(IDirect3D9Ex *This, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode, IDirect3DDevice9Ex **ppReturnedDeviceInterface); + HRESULT (WINAPI *GetAdapterLUID)(IDirect3D9Ex *This, UINT Adapter, LUID *pLUID); +} IDirect3D9ExVtbl; +struct IDirect3D9Ex +{ + IDirect3D9ExVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3D9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3D9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3D9Ex_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3D9 macros */ +#define IDirect3D9Ex_RegisterSoftwareDevice(p,a) (p)->lpVtbl->RegisterSoftwareDevice(p,a) +#define IDirect3D9Ex_GetAdapterCount(p) (p)->lpVtbl->GetAdapterCount(p) +#define IDirect3D9Ex_GetAdapterIdentifier(p,a,b,c) (p)->lpVtbl->GetAdapterIdentifier(p,a,b,c) +#define IDirect3D9Ex_GetAdapterModeCount(p,a,b) (p)->lpVtbl->GetAdapterModeCount(p,a,b) +#define IDirect3D9Ex_EnumAdapterModes(p,a,b,c,d) (p)->lpVtbl->EnumAdapterModes(p,a,b,c,d) +#define IDirect3D9Ex_GetAdapterDisplayMode(p,a,b) (p)->lpVtbl->GetAdapterDisplayMode(p,a,b) +#define IDirect3D9Ex_CheckDeviceType(p,a,b,c,d,e) (p)->lpVtbl->CheckDeviceType(p,a,b,c,d,e) +#define IDirect3D9Ex_CheckDeviceFormat(p,a,b,c,d,e,f) (p)->lpVtbl->CheckDeviceFormat(p,a,b,c,d,e,f) +#define IDirect3D9Ex_CheckDeviceMultiSampleType(p,a,b,c,d,e,f) (p)->lpVtbl->CheckDeviceMultiSampleType(p,a,b,c,d,e,f) +#define IDirect3D9Ex_CheckDepthStencilMatch(p,a,b,c,d,e) (p)->lpVtbl->CheckDepthStencilMatch(p,a,b,c,d,e) +#define IDirect3D9Ex_CheckDeviceFormatConversion(p,a,b,c,d) (p)->lpVtbl->CheckDeviceFormatConversion(p,a,b,c,d) +#define IDirect3D9Ex_GetDeviceCaps(p,a,b,c) (p)->lpVtbl->GetDeviceCaps(p,a,b,c) +#define IDirect3D9Ex_GetAdapterMonitor(p,a) (p)->lpVtbl->GetAdapterMonitor(p,a) +#define IDirect3D9Ex_CreateDevice(p,a,b,c,d,e,f) (p)->lpVtbl->CreateDevice(p,a,b,c,d,e,f) +/* IDirect3D9Ex macros */ +#define IDirect3D9Ex_GetAdapterModeCountEx(p,a,b) (p)->lpVtbl->GetAdapterModeCountEx(p,a,b) +#define IDirect3D9Ex_EnumAdapterModesEx(p,a,b,c,d) (p)->lpVtbl->EnumAdapterModesEx(p,a,b,c,d) +#define IDirect3D9Ex_GetAdapterDisplayModeEx(p,a,b,c) (p)->lpVtbl->GetAdapterDisplayModeEx(p,a,b,c) +#define IDirect3D9Ex_CreateDeviceEx(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateDeviceEx(p,a,b,c,d,e,f,g) +#define IDirect3D9Ex_GetAdapterLUID(p,a,b) (p)->lpVtbl->GetAdapterLUID(p,a,b) + +typedef struct IDirect3D9ExOverlayExtensionVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3D9ExOverlayExtension *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3D9ExOverlayExtension *This); + ULONG (WINAPI *Release)(IDirect3D9ExOverlayExtension *This); + /* IDirect3D9ExOverlayExtension */ + HRESULT (WINAPI *CheckDeviceOverlayType)(IDirect3D9ExOverlayExtension *This, UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight, D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX *pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS *pOverlayCaps); +} IDirect3D9ExOverlayExtensionVtbl; +struct IDirect3D9ExOverlayExtension +{ + IDirect3D9ExOverlayExtensionVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3D9ExOverlayExtension_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3D9ExOverlayExtension_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3D9ExOverlayExtension_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3D9ExOverlayExtension macros */ +#define IDirect3D9ExOverlayExtension_CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CheckDeviceOverlayType(p,a,b,c,d,e,f,g,h) + +typedef struct IDirect3DAuthenticatedChannel9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DAuthenticatedChannel9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DAuthenticatedChannel9 *This); + ULONG (WINAPI *Release)(IDirect3DAuthenticatedChannel9 *This); + /* IDirect3DAuthenticatedChannel9 */ + HRESULT (WINAPI *GetCertificateSize)(IDirect3DAuthenticatedChannel9 *This, UINT *pCertificateSize); + HRESULT (WINAPI *GetCertificate)(IDirect3DAuthenticatedChannel9 *This, UINT CertifacteSize, BYTE *ppCertificate); + HRESULT (WINAPI *NegotiateKeyExchange)(IDirect3DAuthenticatedChannel9 *This, UINT DataSize, void *pData); + HRESULT (WINAPI *Query)(IDirect3DAuthenticatedChannel9 *This, UINT InputSize, const void *pInput, UINT OutputSize, void *pOutput); + HRESULT (WINAPI *Configure)(IDirect3DAuthenticatedChannel9 *This, UINT InputSize, const void *pInput, D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT *pOutput); +} IDirect3DAuthenticatedChannel9Vtbl; +struct IDirect3DAuthenticatedChannel9 +{ + IDirect3DAuthenticatedChannel9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DAuthenticatedChannel9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DAuthenticatedChannel9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DAuthenticatedChannel9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DAuthenticatedChannel9 macros */ +#define IDirect3DAuthenticatedChannel9_GetCertificateSize(p,a) (p)->lpVtbl->GetCertificateSize(p,a) +#define IDirect3DAuthenticatedChannel9_GetCertificate(p,a,b) (p)->lpVtbl->GetCertificate(p,a,b) +#define IDirect3DAuthenticatedChannel9_NegotiateKeyExchange(p,a,b) (p)->lpVtbl->NegotiateKeyExchange(p,a,b) +#define IDirect3DAuthenticatedChannel9_Query(p,a,b,c,d) (p)->lpVtbl->Query(p,a,b,c,d) +#define IDirect3DAuthenticatedChannel9_Configure(p,a,b,c) (p)->lpVtbl->Configure(p,a,b,c) + +typedef struct IDirect3DBaseTexture9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DBaseTexture9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DBaseTexture9 *This); + ULONG (WINAPI *Release)(IDirect3DBaseTexture9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DBaseTexture9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DBaseTexture9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DBaseTexture9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DBaseTexture9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DBaseTexture9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DBaseTexture9 *This); + void (WINAPI *PreLoad)(IDirect3DBaseTexture9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DBaseTexture9 *This); + /* IDirect3DBaseTexture9 */ + DWORD (WINAPI *SetLOD)(IDirect3DBaseTexture9 *This, DWORD LODNew); + DWORD (WINAPI *GetLOD)(IDirect3DBaseTexture9 *This); + DWORD (WINAPI *GetLevelCount)(IDirect3DBaseTexture9 *This); + HRESULT (WINAPI *SetAutoGenFilterType)(IDirect3DBaseTexture9 *This, D3DTEXTUREFILTERTYPE FilterType); + D3DTEXTUREFILTERTYPE (WINAPI *GetAutoGenFilterType)(IDirect3DBaseTexture9 *This); + void (WINAPI *GenerateMipSubLevels)(IDirect3DBaseTexture9 *This); +} IDirect3DBaseTexture9Vtbl; +struct IDirect3DBaseTexture9 +{ + IDirect3DBaseTexture9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DBaseTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DBaseTexture9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DBaseTexture9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DBaseTexture9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DBaseTexture9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DBaseTexture9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DBaseTexture9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DBaseTexture9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DBaseTexture9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DBaseTexture9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DBaseTexture9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DBaseTexture9 macros */ +#define IDirect3DBaseTexture9_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) +#define IDirect3DBaseTexture9_GetLOD(p) (p)->lpVtbl->GetLOD(p) +#define IDirect3DBaseTexture9_GetLevelCount(p) (p)->lpVtbl->GetLevelCount(p) +#define IDirect3DBaseTexture9_SetAutoGenFilterType(p,a) (p)->lpVtbl->SetAutoGenFilterType(p,a) +#define IDirect3DBaseTexture9_GetAutoGenFilterType(p) (p)->lpVtbl->GetAutoGenFilterType(p) +#define IDirect3DBaseTexture9_GenerateMipSubLevels(p) (p)->lpVtbl->GenerateMipSubLevels(p) + +typedef struct IDirect3DCryptoSession9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DCryptoSession9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DCryptoSession9 *This); + ULONG (WINAPI *Release)(IDirect3DCryptoSession9 *This); + /* IDirect3DCryptoSession9 */ + HRESULT (WINAPI *GetCertificateSize)(IDirect3DCryptoSession9 *This, UINT *pCertificateSize); + HRESULT (WINAPI *GetCertificate)(IDirect3DCryptoSession9 *This, UINT CertifacteSize, BYTE *ppCertificate); + HRESULT (WINAPI *NegotiateKeyExchange)(IDirect3DCryptoSession9 *This, UINT DataSize, void *pData); + HRESULT (WINAPI *EncryptionBlt)(IDirect3DCryptoSession9 *This, IDirect3DSurface9 *pSrcSurface, IDirect3DSurface9 *pDstSurface, UINT DstSurfaceSize, void *pIV); + HRESULT (WINAPI *DecryptionBlt)(IDirect3DCryptoSession9 *This, IDirect3DSurface9 *pSrcSurface, IDirect3DSurface9 *pDstSurface, UINT SrcSurfaceSize, D3DENCRYPTED_BLOCK_INFO *pEncryptedBlockInfo, void *pContentKey, void *pIV); + HRESULT (WINAPI *GetSurfacePitch)(IDirect3DCryptoSession9 *This, IDirect3DSurface9 *pSrcSurface, UINT *pSurfacePitch); + HRESULT (WINAPI *StartSessionKeyRefresh)(IDirect3DCryptoSession9 *This, void *pRandomNumber, UINT RandomNumberSize); + HRESULT (WINAPI *FinishSessionKeyRefresh)(IDirect3DCryptoSession9 *This); + HRESULT (WINAPI *GetEncryptionBltKey)(IDirect3DCryptoSession9 *This, void *pReadbackKey, UINT KeySize); +} IDirect3DCryptoSession9Vtbl; +struct IDirect3DCryptoSession9 +{ + IDirect3DCryptoSession9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DCryptoSession9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DCryptoSession9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DCryptoSession9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DCryptoSession9 macros */ +#define IDirect3DCryptoSession9_GetCertificateSize(p,a) (p)->lpVtbl->GetCertificateSize(p,a) +#define IDirect3DCryptoSession9_GetCertificate(p,a,b) (p)->lpVtbl->GetCertificate(p,a,b) +#define IDirect3DCryptoSession9_NegotiateKeyExchange(p,a,b) (p)->lpVtbl->NegotiateKeyExchange(p,a,b) +#define IDirect3DCryptoSession9_EncryptionBlt(p,a,b,c,d) (p)->lpVtbl->EncryptionBlt(p,a,b,c,d) +#define IDirect3DCryptoSession9_DecryptionBlt(p,a,b,c,d,e,f) (p)->lpVtbl->DecryptionBlt(p,a,b,c,d,e,f) +#define IDirect3DCryptoSession9_GetSurfacePitch(p,a,b) (p)->lpVtbl->GetSurfacePitch(p,a,b) +#define IDirect3DCryptoSession9_StartSessionKeyRefresh(p,a,b) (p)->lpVtbl->StartSessionKeyRefresh(p,a,b) +#define IDirect3DCryptoSession9_FinishSessionKeyRefresh(p) (p)->lpVtbl->FinishSessionKeyRefresh(p) +#define IDirect3DCryptoSession9_GetEncryptionBltKey(p,a,b) (p)->lpVtbl->GetEncryptionBltKey(p,a,b) + +typedef struct IDirect3DCubeTexture9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DCubeTexture9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DCubeTexture9 *This); + ULONG (WINAPI *Release)(IDirect3DCubeTexture9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DCubeTexture9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DCubeTexture9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DCubeTexture9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DCubeTexture9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DCubeTexture9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DCubeTexture9 *This); + void (WINAPI *PreLoad)(IDirect3DCubeTexture9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DCubeTexture9 *This); + /* IDirect3DBaseTexture9 */ + DWORD (WINAPI *SetLOD)(IDirect3DCubeTexture9 *This, DWORD LODNew); + DWORD (WINAPI *GetLOD)(IDirect3DCubeTexture9 *This); + DWORD (WINAPI *GetLevelCount)(IDirect3DCubeTexture9 *This); + HRESULT (WINAPI *SetAutoGenFilterType)(IDirect3DCubeTexture9 *This, D3DTEXTUREFILTERTYPE FilterType); + D3DTEXTUREFILTERTYPE (WINAPI *GetAutoGenFilterType)(IDirect3DCubeTexture9 *This); + void (WINAPI *GenerateMipSubLevels)(IDirect3DCubeTexture9 *This); + /* IDirect3DCubeTexture9 */ + HRESULT (WINAPI *GetLevelDesc)(IDirect3DCubeTexture9 *This, UINT Level, D3DSURFACE_DESC *pDesc); + HRESULT (WINAPI *GetCubeMapSurface)(IDirect3DCubeTexture9 *This, D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface9 **ppCubeMapSurface); + HRESULT (WINAPI *LockRect)(IDirect3DCubeTexture9 *This, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags); + HRESULT (WINAPI *UnlockRect)(IDirect3DCubeTexture9 *This, D3DCUBEMAP_FACES FaceType, UINT Level); + HRESULT (WINAPI *AddDirtyRect)(IDirect3DCubeTexture9 *This, D3DCUBEMAP_FACES FaceType, const RECT *pDirtyRect); +} IDirect3DCubeTexture9Vtbl; +struct IDirect3DCubeTexture9 +{ + IDirect3DCubeTexture9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DCubeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DCubeTexture9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DCubeTexture9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DCubeTexture9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DCubeTexture9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DCubeTexture9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DCubeTexture9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DCubeTexture9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DCubeTexture9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DCubeTexture9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DCubeTexture9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DBaseTexture9 macros */ +#define IDirect3DCubeTexture9_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) +#define IDirect3DCubeTexture9_GetLOD(p) (p)->lpVtbl->GetLOD(p) +#define IDirect3DCubeTexture9_GetLevelCount(p) (p)->lpVtbl->GetLevelCount(p) +#define IDirect3DCubeTexture9_SetAutoGenFilterType(p,a) (p)->lpVtbl->SetAutoGenFilterType(p,a) +#define IDirect3DCubeTexture9_GetAutoGenFilterType(p) (p)->lpVtbl->GetAutoGenFilterType(p) +#define IDirect3DCubeTexture9_GenerateMipSubLevels(p) (p)->lpVtbl->GenerateMipSubLevels(p) +/* IDirect3DCubeTexture9 macros */ +#define IDirect3DCubeTexture9_GetLevelDesc(p,a,b) (p)->lpVtbl->GetLevelDesc(p,a,b) +#define IDirect3DCubeTexture9_GetCubeMapSurface(p,a,b,c) (p)->lpVtbl->GetCubeMapSurface(p,a,b,c) +#define IDirect3DCubeTexture9_LockRect(p,a,b,c,d,e) (p)->lpVtbl->LockRect(p,a,b,c,d,e) +#define IDirect3DCubeTexture9_UnlockRect(p,a,b) (p)->lpVtbl->UnlockRect(p,a,b) +#define IDirect3DCubeTexture9_AddDirtyRect(p,a,b) (p)->lpVtbl->AddDirtyRect(p,a,b) + +typedef struct IDirect3DDevice9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DDevice9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DDevice9 *This); + ULONG (WINAPI *Release)(IDirect3DDevice9 *This); + /* IDirect3DDevice9 */ + HRESULT (WINAPI *TestCooperativeLevel)(IDirect3DDevice9 *This); + UINT (WINAPI *GetAvailableTextureMem)(IDirect3DDevice9 *This); + HRESULT (WINAPI *EvictManagedResources)(IDirect3DDevice9 *This); + HRESULT (WINAPI *GetDirect3D)(IDirect3DDevice9 *This, IDirect3D9 **ppD3D9); + HRESULT (WINAPI *GetDeviceCaps)(IDirect3DDevice9 *This, D3DCAPS9 *pCaps); + HRESULT (WINAPI *GetDisplayMode)(IDirect3DDevice9 *This, UINT iSwapChain, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetCreationParameters)(IDirect3DDevice9 *This, D3DDEVICE_CREATION_PARAMETERS *pParameters); + HRESULT (WINAPI *SetCursorProperties)(IDirect3DDevice9 *This, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9 *pCursorBitmap); + void (WINAPI *SetCursorPosition)(IDirect3DDevice9 *This, int X, int Y, DWORD Flags); + BOOL (WINAPI *ShowCursor)(IDirect3DDevice9 *This, BOOL bShow); + HRESULT (WINAPI *CreateAdditionalSwapChain)(IDirect3DDevice9 *This, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DSwapChain9 **pSwapChain); + HRESULT (WINAPI *GetSwapChain)(IDirect3DDevice9 *This, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain); + UINT (WINAPI *GetNumberOfSwapChains)(IDirect3DDevice9 *This); + HRESULT (WINAPI *Reset)(IDirect3DDevice9 *This, D3DPRESENT_PARAMETERS *pPresentationParameters); + HRESULT (WINAPI *Present)(IDirect3DDevice9 *This, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion); + HRESULT (WINAPI *GetBackBuffer)(IDirect3DDevice9 *This, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer); + HRESULT (WINAPI *GetRasterStatus)(IDirect3DDevice9 *This, UINT iSwapChain, D3DRASTER_STATUS *pRasterStatus); + HRESULT (WINAPI *SetDialogBoxMode)(IDirect3DDevice9 *This, BOOL bEnableDialogs); + void (WINAPI *SetGammaRamp)(IDirect3DDevice9 *This, UINT iSwapChain, DWORD Flags, const D3DGAMMARAMP *pRamp); + void (WINAPI *GetGammaRamp)(IDirect3DDevice9 *This, UINT iSwapChain, D3DGAMMARAMP *pRamp); + HRESULT (WINAPI *CreateTexture)(IDirect3DDevice9 *This, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateVolumeTexture)(IDirect3DDevice9 *This, UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9 **ppVolumeTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateCubeTexture)(IDirect3DDevice9 *This, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9 **ppCubeTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateVertexBuffer)(IDirect3DDevice9 *This, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateIndexBuffer)(IDirect3DDevice9 *This, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateRenderTarget)(IDirect3DDevice9 *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateDepthStencilSurface)(IDirect3DDevice9 *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *UpdateSurface)(IDirect3DDevice9 *This, IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestinationSurface, const POINT *pDestPoint); + HRESULT (WINAPI *UpdateTexture)(IDirect3DDevice9 *This, IDirect3DBaseTexture9 *pSourceTexture, IDirect3DBaseTexture9 *pDestinationTexture); + HRESULT (WINAPI *GetRenderTargetData)(IDirect3DDevice9 *This, IDirect3DSurface9 *pRenderTarget, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *GetFrontBufferData)(IDirect3DDevice9 *This, UINT iSwapChain, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *StretchRect)(IDirect3DDevice9 *This, IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter); + HRESULT (WINAPI *ColorFill)(IDirect3DDevice9 *This, IDirect3DSurface9 *pSurface, const RECT *pRect, D3DCOLOR color); + HRESULT (WINAPI *CreateOffscreenPlainSurface)(IDirect3DDevice9 *This, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *SetRenderTarget)(IDirect3DDevice9 *This, DWORD RenderTargetIndex, IDirect3DSurface9 *pRenderTarget); + HRESULT (WINAPI *GetRenderTarget)(IDirect3DDevice9 *This, DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget); + HRESULT (WINAPI *SetDepthStencilSurface)(IDirect3DDevice9 *This, IDirect3DSurface9 *pNewZStencil); + HRESULT (WINAPI *GetDepthStencilSurface)(IDirect3DDevice9 *This, IDirect3DSurface9 **ppZStencilSurface); + HRESULT (WINAPI *BeginScene)(IDirect3DDevice9 *This); + HRESULT (WINAPI *EndScene)(IDirect3DDevice9 *This); + HRESULT (WINAPI *Clear)(IDirect3DDevice9 *This, DWORD Count, const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil); + HRESULT (WINAPI *SetTransform)(IDirect3DDevice9 *This, D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix); + HRESULT (WINAPI *GetTransform)(IDirect3DDevice9 *This, D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix); + HRESULT (WINAPI *MultiplyTransform)(IDirect3DDevice9 *This, D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix); + HRESULT (WINAPI *SetViewport)(IDirect3DDevice9 *This, const D3DVIEWPORT9 *pViewport); + HRESULT (WINAPI *GetViewport)(IDirect3DDevice9 *This, D3DVIEWPORT9 *pViewport); + HRESULT (WINAPI *SetMaterial)(IDirect3DDevice9 *This, const D3DMATERIAL9 *pMaterial); + HRESULT (WINAPI *GetMaterial)(IDirect3DDevice9 *This, D3DMATERIAL9 *pMaterial); + HRESULT (WINAPI *SetLight)(IDirect3DDevice9 *This, DWORD Index, const D3DLIGHT9 *pLight); + HRESULT (WINAPI *GetLight)(IDirect3DDevice9 *This, DWORD Index, D3DLIGHT9 *pLight); + HRESULT (WINAPI *LightEnable)(IDirect3DDevice9 *This, DWORD Index, BOOL Enable); + HRESULT (WINAPI *GetLightEnable)(IDirect3DDevice9 *This, DWORD Index, BOOL *pEnable); + HRESULT (WINAPI *SetClipPlane)(IDirect3DDevice9 *This, DWORD Index, const float *pPlane); + HRESULT (WINAPI *GetClipPlane)(IDirect3DDevice9 *This, DWORD Index, float *pPlane); + HRESULT (WINAPI *SetRenderState)(IDirect3DDevice9 *This, D3DRENDERSTATETYPE State, DWORD Value); + HRESULT (WINAPI *GetRenderState)(IDirect3DDevice9 *This, D3DRENDERSTATETYPE State, DWORD *pValue); + HRESULT (WINAPI *CreateStateBlock)(IDirect3DDevice9 *This, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB); + HRESULT (WINAPI *BeginStateBlock)(IDirect3DDevice9 *This); + HRESULT (WINAPI *EndStateBlock)(IDirect3DDevice9 *This, IDirect3DStateBlock9 **ppSB); + HRESULT (WINAPI *SetClipStatus)(IDirect3DDevice9 *This, const D3DCLIPSTATUS9 *pClipStatus); + HRESULT (WINAPI *GetClipStatus)(IDirect3DDevice9 *This, D3DCLIPSTATUS9 *pClipStatus); + HRESULT (WINAPI *GetTexture)(IDirect3DDevice9 *This, DWORD Stage, IDirect3DBaseTexture9 **ppTexture); + HRESULT (WINAPI *SetTexture)(IDirect3DDevice9 *This, DWORD Stage, IDirect3DBaseTexture9 *pTexture); + HRESULT (WINAPI *GetTextureStageState)(IDirect3DDevice9 *This, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue); + HRESULT (WINAPI *SetTextureStageState)(IDirect3DDevice9 *This, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value); + HRESULT (WINAPI *GetSamplerState)(IDirect3DDevice9 *This, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD *pValue); + HRESULT (WINAPI *SetSamplerState)(IDirect3DDevice9 *This, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value); + HRESULT (WINAPI *ValidateDevice)(IDirect3DDevice9 *This, DWORD *pNumPasses); + HRESULT (WINAPI *SetPaletteEntries)(IDirect3DDevice9 *This, UINT PaletteNumber, const PALETTEENTRY *pEntries); + HRESULT (WINAPI *GetPaletteEntries)(IDirect3DDevice9 *This, UINT PaletteNumber, PALETTEENTRY *pEntries); + HRESULT (WINAPI *SetCurrentTexturePalette)(IDirect3DDevice9 *This, UINT PaletteNumber); + HRESULT (WINAPI *GetCurrentTexturePalette)(IDirect3DDevice9 *This, UINT *PaletteNumber); + HRESULT (WINAPI *SetScissorRect)(IDirect3DDevice9 *This, const RECT *pRect); + HRESULT (WINAPI *GetScissorRect)(IDirect3DDevice9 *This, RECT *pRect); + HRESULT (WINAPI *SetSoftwareVertexProcessing)(IDirect3DDevice9 *This, BOOL bSoftware); + BOOL (WINAPI *GetSoftwareVertexProcessing)(IDirect3DDevice9 *This); + HRESULT (WINAPI *SetNPatchMode)(IDirect3DDevice9 *This, float nSegments); + float (WINAPI *GetNPatchMode)(IDirect3DDevice9 *This); + HRESULT (WINAPI *DrawPrimitive)(IDirect3DDevice9 *This, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount); + HRESULT (WINAPI *DrawIndexedPrimitive)(IDirect3DDevice9 *This, D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount); + HRESULT (WINAPI *DrawPrimitiveUP)(IDirect3DDevice9 *This, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride); + HRESULT (WINAPI *DrawIndexedPrimitiveUP)(IDirect3DDevice9 *This, D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertices, UINT PrimitiveCount, const void *pIndexData, D3DFORMAT IndexDataFormat, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride); + HRESULT (WINAPI *ProcessVertices)(IDirect3DDevice9 *This, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9 *pDestBuffer, IDirect3DVertexDeclaration9 *pVertexDecl, DWORD Flags); + HRESULT (WINAPI *CreateVertexDeclaration)(IDirect3DDevice9 *This, const D3DVERTEXELEMENT9 *pVertexElements, IDirect3DVertexDeclaration9 **ppDecl); + HRESULT (WINAPI *SetVertexDeclaration)(IDirect3DDevice9 *This, IDirect3DVertexDeclaration9 *pDecl); + HRESULT (WINAPI *GetVertexDeclaration)(IDirect3DDevice9 *This, IDirect3DVertexDeclaration9 **ppDecl); + HRESULT (WINAPI *SetFVF)(IDirect3DDevice9 *This, DWORD FVF); + HRESULT (WINAPI *GetFVF)(IDirect3DDevice9 *This, DWORD *pFVF); + HRESULT (WINAPI *CreateVertexShader)(IDirect3DDevice9 *This, const DWORD *pFunction, IDirect3DVertexShader9 **ppShader); + HRESULT (WINAPI *SetVertexShader)(IDirect3DDevice9 *This, IDirect3DVertexShader9 *pShader); + HRESULT (WINAPI *GetVertexShader)(IDirect3DDevice9 *This, IDirect3DVertexShader9 **ppShader); + HRESULT (WINAPI *SetVertexShaderConstantF)(IDirect3DDevice9 *This, UINT StartRegister, const float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *GetVertexShaderConstantF)(IDirect3DDevice9 *This, UINT StartRegister, float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *SetVertexShaderConstantI)(IDirect3DDevice9 *This, UINT StartRegister, const int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *GetVertexShaderConstantI)(IDirect3DDevice9 *This, UINT StartRegister, int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *SetVertexShaderConstantB)(IDirect3DDevice9 *This, UINT StartRegister, const BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *GetVertexShaderConstantB)(IDirect3DDevice9 *This, UINT StartRegister, BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *SetStreamSource)(IDirect3DDevice9 *This, UINT StreamNumber, IDirect3DVertexBuffer9 *pStreamData, UINT OffsetInBytes, UINT Stride); + HRESULT (WINAPI *GetStreamSource)(IDirect3DDevice9 *This, UINT StreamNumber, IDirect3DVertexBuffer9 **ppStreamData, UINT *pOffsetInBytes, UINT *pStride); + HRESULT (WINAPI *SetStreamSourceFreq)(IDirect3DDevice9 *This, UINT StreamNumber, UINT Setting); + HRESULT (WINAPI *GetStreamSourceFreq)(IDirect3DDevice9 *This, UINT StreamNumber, UINT *pSetting); + HRESULT (WINAPI *SetIndices)(IDirect3DDevice9 *This, IDirect3DIndexBuffer9 *pIndexData); + HRESULT (WINAPI *GetIndices)(IDirect3DDevice9 *This, IDirect3DIndexBuffer9 **ppIndexData, UINT *pBaseVertexIndex); + HRESULT (WINAPI *CreatePixelShader)(IDirect3DDevice9 *This, const DWORD *pFunction, IDirect3DPixelShader9 **ppShader); + HRESULT (WINAPI *SetPixelShader)(IDirect3DDevice9 *This, IDirect3DPixelShader9 *pShader); + HRESULT (WINAPI *GetPixelShader)(IDirect3DDevice9 *This, IDirect3DPixelShader9 **ppShader); + HRESULT (WINAPI *SetPixelShaderConstantF)(IDirect3DDevice9 *This, UINT StartRegister, const float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *GetPixelShaderConstantF)(IDirect3DDevice9 *This, UINT StartRegister, float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *SetPixelShaderConstantI)(IDirect3DDevice9 *This, UINT StartRegister, const int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *GetPixelShaderConstantI)(IDirect3DDevice9 *This, UINT StartRegister, int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *SetPixelShaderConstantB)(IDirect3DDevice9 *This, UINT StartRegister, const BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *GetPixelShaderConstantB)(IDirect3DDevice9 *This, UINT StartRegister, BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *DrawRectPatch)(IDirect3DDevice9 *This, UINT Handle, const float *pNumSegs, const D3DRECTPATCH_INFO *pRectPatchInfo); + HRESULT (WINAPI *DrawTriPatch)(IDirect3DDevice9 *This, UINT Handle, const float *pNumSegs, const D3DTRIPATCH_INFO *pTriPatchInfo); + HRESULT (WINAPI *DeletePatch)(IDirect3DDevice9 *This, UINT Handle); + HRESULT (WINAPI *CreateQuery)(IDirect3DDevice9 *This, D3DQUERYTYPE Type, IDirect3DQuery9 **ppQuery); +} IDirect3DDevice9Vtbl; +struct IDirect3DDevice9 +{ + IDirect3DDevice9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DDevice9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DDevice9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DDevice9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DDevice9 macros */ +#define IDirect3DDevice9_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p) +#define IDirect3DDevice9_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p) +#define IDirect3DDevice9_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) +#define IDirect3DDevice9_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a) +#define IDirect3DDevice9_GetDeviceCaps(p,a) (p)->lpVtbl->GetDeviceCaps(p,a) +#define IDirect3DDevice9_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) +#define IDirect3DDevice9_GetCreationParameters(p,a) (p)->lpVtbl->GetCreationParameters(p,a) +#define IDirect3DDevice9_SetCursorProperties(p,a,b,c) (p)->lpVtbl->SetCursorProperties(p,a,b,c) +#define IDirect3DDevice9_SetCursorPosition(p,a,b,c) (p)->lpVtbl->SetCursorPosition(p,a,b,c) +#define IDirect3DDevice9_ShowCursor(p,a) (p)->lpVtbl->ShowCursor(p,a) +#define IDirect3DDevice9_CreateAdditionalSwapChain(p,a,b) (p)->lpVtbl->CreateAdditionalSwapChain(p,a,b) +#define IDirect3DDevice9_GetSwapChain(p,a,b) (p)->lpVtbl->GetSwapChain(p,a,b) +#define IDirect3DDevice9_GetNumberOfSwapChains(p) (p)->lpVtbl->GetNumberOfSwapChains(p) +#define IDirect3DDevice9_Reset(p,a) (p)->lpVtbl->Reset(p,a) +#define IDirect3DDevice9_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d) +#define IDirect3DDevice9_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) +#define IDirect3DDevice9_GetRasterStatus(p,a,b) (p)->lpVtbl->GetRasterStatus(p,a,b) +#define IDirect3DDevice9_SetDialogBoxMode(p,a) (p)->lpVtbl->SetDialogBoxMode(p,a) +#define IDirect3DDevice9_SetGammaRamp(p,a,b,c) (p)->lpVtbl->SetGammaRamp(p,a,b,c) +#define IDirect3DDevice9_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b) +#define IDirect3DDevice9_CreateTexture(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateTexture(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9_CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i) +#define IDirect3DDevice9_CreateCubeTexture(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateCubeTexture(p,a,b,c,d,e,f,g) +#define IDirect3DDevice9_CreateVertexBuffer(p,a,b,c,d,e,f) (p)->lpVtbl->CreateVertexBuffer(p,a,b,c,d,e,f) +#define IDirect3DDevice9_CreateIndexBuffer(p,a,b,c,d,e,f) (p)->lpVtbl->CreateIndexBuffer(p,a,b,c,d,e,f) +#define IDirect3DDevice9_CreateRenderTarget(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateRenderTarget(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9_CreateDepthStencilSurface(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateDepthStencilSurface(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9_UpdateSurface(p,a,b,c,d) (p)->lpVtbl->UpdateSurface(p,a,b,c,d) +#define IDirect3DDevice9_UpdateTexture(p,a,b) (p)->lpVtbl->UpdateTexture(p,a,b) +#define IDirect3DDevice9_GetRenderTargetData(p,a,b) (p)->lpVtbl->GetRenderTargetData(p,a,b) +#define IDirect3DDevice9_GetFrontBufferData(p,a,b) (p)->lpVtbl->GetFrontBufferData(p,a,b) +#define IDirect3DDevice9_StretchRect(p,a,b,c,d,e) (p)->lpVtbl->StretchRect(p,a,b,c,d,e) +#define IDirect3DDevice9_ColorFill(p,a,b,c) (p)->lpVtbl->ColorFill(p,a,b,c) +#define IDirect3DDevice9_CreateOffscreenPlainSurface(p,a,b,c,d,e,f) (p)->lpVtbl->CreateOffscreenPlainSurface(p,a,b,c,d,e,f) +#define IDirect3DDevice9_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b) +#define IDirect3DDevice9_GetRenderTarget(p,a,b) (p)->lpVtbl->GetRenderTarget(p,a,b) +#define IDirect3DDevice9_SetDepthStencilSurface(p,a) (p)->lpVtbl->SetDepthStencilSurface(p,a) +#define IDirect3DDevice9_GetDepthStencilSurface(p,a) (p)->lpVtbl->GetDepthStencilSurface(p,a) +#define IDirect3DDevice9_BeginScene(p) (p)->lpVtbl->BeginScene(p) +#define IDirect3DDevice9_EndScene(p) (p)->lpVtbl->EndScene(p) +#define IDirect3DDevice9_Clear(p,a,b,c,d,e,f) (p)->lpVtbl->Clear(p,a,b,c,d,e,f) +#define IDirect3DDevice9_SetTransform(p,a,b) (p)->lpVtbl->SetTransform(p,a,b) +#define IDirect3DDevice9_GetTransform(p,a,b) (p)->lpVtbl->GetTransform(p,a,b) +#define IDirect3DDevice9_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b) +#define IDirect3DDevice9_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a) +#define IDirect3DDevice9_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a) +#define IDirect3DDevice9_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) +#define IDirect3DDevice9_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a) +#define IDirect3DDevice9_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b) +#define IDirect3DDevice9_GetLight(p,a,b) (p)->lpVtbl->GetLight(p,a,b) +#define IDirect3DDevice9_LightEnable(p,a,b) (p)->lpVtbl->LightEnable(p,a,b) +#define IDirect3DDevice9_GetLightEnable(p,a,b) (p)->lpVtbl->GetLightEnable(p,a,b) +#define IDirect3DDevice9_SetClipPlane(p,a,b) (p)->lpVtbl->SetClipPlane(p,a,b) +#define IDirect3DDevice9_GetClipPlane(p,a,b) (p)->lpVtbl->GetClipPlane(p,a,b) +#define IDirect3DDevice9_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b) +#define IDirect3DDevice9_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b) +#define IDirect3DDevice9_CreateStateBlock(p,a,b) (p)->lpVtbl->CreateStateBlock(p,a,b) +#define IDirect3DDevice9_BeginStateBlock(p) (p)->lpVtbl->BeginStateBlock(p) +#define IDirect3DDevice9_EndStateBlock(p,a) (p)->lpVtbl->EndStateBlock(p,a) +#define IDirect3DDevice9_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a) +#define IDirect3DDevice9_GetClipStatus(p,a) (p)->lpVtbl->GetClipStatus(p,a) +#define IDirect3DDevice9_GetTexture(p,a,b) (p)->lpVtbl->GetTexture(p,a,b) +#define IDirect3DDevice9_SetTexture(p,a,b) (p)->lpVtbl->SetTexture(p,a,b) +#define IDirect3DDevice9_GetTextureStageState(p,a,b,c) (p)->lpVtbl->GetTextureStageState(p,a,b,c) +#define IDirect3DDevice9_SetTextureStageState(p,a,b,c) (p)->lpVtbl->SetTextureStageState(p,a,b,c) +#define IDirect3DDevice9_GetSamplerState(p,a,b,c) (p)->lpVtbl->GetSamplerState(p,a,b,c) +#define IDirect3DDevice9_SetSamplerState(p,a,b,c) (p)->lpVtbl->SetSamplerState(p,a,b,c) +#define IDirect3DDevice9_ValidateDevice(p,a) (p)->lpVtbl->ValidateDevice(p,a) +#define IDirect3DDevice9_SetPaletteEntries(p,a,b) (p)->lpVtbl->SetPaletteEntries(p,a,b) +#define IDirect3DDevice9_GetPaletteEntries(p,a,b) (p)->lpVtbl->GetPaletteEntries(p,a,b) +#define IDirect3DDevice9_SetCurrentTexturePalette(p,a) (p)->lpVtbl->SetCurrentTexturePalette(p,a) +#define IDirect3DDevice9_GetCurrentTexturePalette(p,a) (p)->lpVtbl->GetCurrentTexturePalette(p,a) +#define IDirect3DDevice9_SetScissorRect(p,a) (p)->lpVtbl->SetScissorRect(p,a) +#define IDirect3DDevice9_GetScissorRect(p,a) (p)->lpVtbl->GetScissorRect(p,a) +#define IDirect3DDevice9_SetSoftwareVertexProcessing(p,a) (p)->lpVtbl->SetSoftwareVertexProcessing(p,a) +#define IDirect3DDevice9_GetSoftwareVertexProcessing(p) (p)->lpVtbl->GetSoftwareVertexProcessing(p) +#define IDirect3DDevice9_SetNPatchMode(p,a) (p)->lpVtbl->SetNPatchMode(p,a) +#define IDirect3DDevice9_GetNPatchMode(p) (p)->lpVtbl->GetNPatchMode(p) +#define IDirect3DDevice9_DrawPrimitive(p,a,b,c) (p)->lpVtbl->DrawPrimitive(p,a,b,c) +#define IDirect3DDevice9_DrawIndexedPrimitive(p,a,b,c,d,e,f) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e,f) +#define IDirect3DDevice9_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) +#define IDirect3DDevice9_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9_ProcessVertices(p,a,b,c,d,e,f) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e,f) +#define IDirect3DDevice9_CreateVertexDeclaration(p,a,b) (p)->lpVtbl->CreateVertexDeclaration(p,a,b) +#define IDirect3DDevice9_SetVertexDeclaration(p,a) (p)->lpVtbl->SetVertexDeclaration(p,a) +#define IDirect3DDevice9_GetVertexDeclaration(p,a) (p)->lpVtbl->GetVertexDeclaration(p,a) +#define IDirect3DDevice9_SetFVF(p,a) (p)->lpVtbl->SetFVF(p,a) +#define IDirect3DDevice9_GetFVF(p,a) (p)->lpVtbl->GetFVF(p,a) +#define IDirect3DDevice9_CreateVertexShader(p,a,b) (p)->lpVtbl->CreateVertexShader(p,a,b) +#define IDirect3DDevice9_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) +#define IDirect3DDevice9_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) +#define IDirect3DDevice9_SetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantF(p,a,b,c) +#define IDirect3DDevice9_GetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantF(p,a,b,c) +#define IDirect3DDevice9_SetVertexShaderConstantI(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantI(p,a,b,c) +#define IDirect3DDevice9_GetVertexShaderConstantI(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantI(p,a,b,c) +#define IDirect3DDevice9_SetVertexShaderConstantB(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantB(p,a,b,c) +#define IDirect3DDevice9_GetVertexShaderConstantB(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantB(p,a,b,c) +#define IDirect3DDevice9_SetStreamSource(p,a,b,c,d) (p)->lpVtbl->SetStreamSource(p,a,b,c,d) +#define IDirect3DDevice9_GetStreamSource(p,a,b,c,d) (p)->lpVtbl->GetStreamSource(p,a,b,c,d) +#define IDirect3DDevice9_SetStreamSourceFreq(p,a,b) (p)->lpVtbl->SetStreamSourceFreq(p,a,b) +#define IDirect3DDevice9_GetStreamSourceFreq(p,a,b) (p)->lpVtbl->GetStreamSourceFreq(p,a,b) +#define IDirect3DDevice9_SetIndices(p,a) (p)->lpVtbl->SetIndices(p,a) +#define IDirect3DDevice9_GetIndices(p,a,b) (p)->lpVtbl->GetIndices(p,a,b) +#define IDirect3DDevice9_CreatePixelShader(p,a,b) (p)->lpVtbl->CreatePixelShader(p,a,b) +#define IDirect3DDevice9_SetPixelShader(p,a) (p)->lpVtbl->SetPixelShader(p,a) +#define IDirect3DDevice9_GetPixelShader(p,a) (p)->lpVtbl->GetPixelShader(p,a) +#define IDirect3DDevice9_SetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantF(p,a,b,c) +#define IDirect3DDevice9_GetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantF(p,a,b,c) +#define IDirect3DDevice9_SetPixelShaderConstantI(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantI(p,a,b,c) +#define IDirect3DDevice9_GetPixelShaderConstantI(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantI(p,a,b,c) +#define IDirect3DDevice9_SetPixelShaderConstantB(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantB(p,a,b,c) +#define IDirect3DDevice9_GetPixelShaderConstantB(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantB(p,a,b,c) +#define IDirect3DDevice9_DrawRectPatch(p,a,b,c) (p)->lpVtbl->DrawRectPatch(p,a,b,c) +#define IDirect3DDevice9_DrawTriPatch(p,a,b,c) (p)->lpVtbl->DrawTriPatch(p,a,b,c) +#define IDirect3DDevice9_DeletePatch(p,a) (p)->lpVtbl->DeletePatch(p,a) +#define IDirect3DDevice9_CreateQuery(p,a,b) (p)->lpVtbl->CreateQuery(p,a,b) + +typedef struct IDirect3DDevice9ExVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DDevice9Ex *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DDevice9Ex *This); + ULONG (WINAPI *Release)(IDirect3DDevice9Ex *This); + /* IDirect3DDevice9 */ + HRESULT (WINAPI *TestCooperativeLevel)(IDirect3DDevice9Ex *This); + UINT (WINAPI *GetAvailableTextureMem)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *EvictManagedResources)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *GetDirect3D)(IDirect3DDevice9Ex *This, IDirect3D9 **ppD3D9); + HRESULT (WINAPI *GetDeviceCaps)(IDirect3DDevice9Ex *This, D3DCAPS9 *pCaps); + HRESULT (WINAPI *GetDisplayMode)(IDirect3DDevice9Ex *This, UINT iSwapChain, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetCreationParameters)(IDirect3DDevice9Ex *This, D3DDEVICE_CREATION_PARAMETERS *pParameters); + HRESULT (WINAPI *SetCursorProperties)(IDirect3DDevice9Ex *This, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9 *pCursorBitmap); + void (WINAPI *SetCursorPosition)(IDirect3DDevice9Ex *This, int X, int Y, DWORD Flags); + BOOL (WINAPI *ShowCursor)(IDirect3DDevice9Ex *This, BOOL bShow); + HRESULT (WINAPI *CreateAdditionalSwapChain)(IDirect3DDevice9Ex *This, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3DSwapChain9 **pSwapChain); + HRESULT (WINAPI *GetSwapChain)(IDirect3DDevice9Ex *This, UINT iSwapChain, IDirect3DSwapChain9 **pSwapChain); + UINT (WINAPI *GetNumberOfSwapChains)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *Reset)(IDirect3DDevice9Ex *This, D3DPRESENT_PARAMETERS *pPresentationParameters); + HRESULT (WINAPI *Present)(IDirect3DDevice9Ex *This, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion); + HRESULT (WINAPI *GetBackBuffer)(IDirect3DDevice9Ex *This, UINT iSwapChain, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer); + HRESULT (WINAPI *GetRasterStatus)(IDirect3DDevice9Ex *This, UINT iSwapChain, D3DRASTER_STATUS *pRasterStatus); + HRESULT (WINAPI *SetDialogBoxMode)(IDirect3DDevice9Ex *This, BOOL bEnableDialogs); + void (WINAPI *SetGammaRamp)(IDirect3DDevice9Ex *This, UINT iSwapChain, DWORD Flags, const D3DGAMMARAMP *pRamp); + void (WINAPI *GetGammaRamp)(IDirect3DDevice9Ex *This, UINT iSwapChain, D3DGAMMARAMP *pRamp); + HRESULT (WINAPI *CreateTexture)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9 **ppTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateVolumeTexture)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, UINT Depth, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9 **ppVolumeTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateCubeTexture)(IDirect3DDevice9Ex *This, UINT EdgeLength, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9 **ppCubeTexture, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateVertexBuffer)(IDirect3DDevice9Ex *This, UINT Length, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer9 **ppVertexBuffer, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateIndexBuffer)(IDirect3DDevice9Ex *This, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer9 **ppIndexBuffer, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateRenderTarget)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *CreateDepthStencilSurface)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *UpdateSurface)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestinationSurface, const POINT *pDestPoint); + HRESULT (WINAPI *UpdateTexture)(IDirect3DDevice9Ex *This, IDirect3DBaseTexture9 *pSourceTexture, IDirect3DBaseTexture9 *pDestinationTexture); + HRESULT (WINAPI *GetRenderTargetData)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pRenderTarget, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *GetFrontBufferData)(IDirect3DDevice9Ex *This, UINT iSwapChain, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *StretchRect)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter); + HRESULT (WINAPI *ColorFill)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pSurface, const RECT *pRect, D3DCOLOR color); + HRESULT (WINAPI *CreateOffscreenPlainSurface)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle); + HRESULT (WINAPI *SetRenderTarget)(IDirect3DDevice9Ex *This, DWORD RenderTargetIndex, IDirect3DSurface9 *pRenderTarget); + HRESULT (WINAPI *GetRenderTarget)(IDirect3DDevice9Ex *This, DWORD RenderTargetIndex, IDirect3DSurface9 **ppRenderTarget); + HRESULT (WINAPI *SetDepthStencilSurface)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pNewZStencil); + HRESULT (WINAPI *GetDepthStencilSurface)(IDirect3DDevice9Ex *This, IDirect3DSurface9 **ppZStencilSurface); + HRESULT (WINAPI *BeginScene)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *EndScene)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *Clear)(IDirect3DDevice9Ex *This, DWORD Count, const D3DRECT *pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil); + HRESULT (WINAPI *SetTransform)(IDirect3DDevice9Ex *This, D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix); + HRESULT (WINAPI *GetTransform)(IDirect3DDevice9Ex *This, D3DTRANSFORMSTATETYPE State, D3DMATRIX *pMatrix); + HRESULT (WINAPI *MultiplyTransform)(IDirect3DDevice9Ex *This, D3DTRANSFORMSTATETYPE State, const D3DMATRIX *pMatrix); + HRESULT (WINAPI *SetViewport)(IDirect3DDevice9Ex *This, const D3DVIEWPORT9 *pViewport); + HRESULT (WINAPI *GetViewport)(IDirect3DDevice9Ex *This, D3DVIEWPORT9 *pViewport); + HRESULT (WINAPI *SetMaterial)(IDirect3DDevice9Ex *This, const D3DMATERIAL9 *pMaterial); + HRESULT (WINAPI *GetMaterial)(IDirect3DDevice9Ex *This, D3DMATERIAL9 *pMaterial); + HRESULT (WINAPI *SetLight)(IDirect3DDevice9Ex *This, DWORD Index, const D3DLIGHT9 *pLight); + HRESULT (WINAPI *GetLight)(IDirect3DDevice9Ex *This, DWORD Index, D3DLIGHT9 *pLight); + HRESULT (WINAPI *LightEnable)(IDirect3DDevice9Ex *This, DWORD Index, BOOL Enable); + HRESULT (WINAPI *GetLightEnable)(IDirect3DDevice9Ex *This, DWORD Index, BOOL *pEnable); + HRESULT (WINAPI *SetClipPlane)(IDirect3DDevice9Ex *This, DWORD Index, const float *pPlane); + HRESULT (WINAPI *GetClipPlane)(IDirect3DDevice9Ex *This, DWORD Index, float *pPlane); + HRESULT (WINAPI *SetRenderState)(IDirect3DDevice9Ex *This, D3DRENDERSTATETYPE State, DWORD Value); + HRESULT (WINAPI *GetRenderState)(IDirect3DDevice9Ex *This, D3DRENDERSTATETYPE State, DWORD *pValue); + HRESULT (WINAPI *CreateStateBlock)(IDirect3DDevice9Ex *This, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9 **ppSB); + HRESULT (WINAPI *BeginStateBlock)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *EndStateBlock)(IDirect3DDevice9Ex *This, IDirect3DStateBlock9 **ppSB); + HRESULT (WINAPI *SetClipStatus)(IDirect3DDevice9Ex *This, const D3DCLIPSTATUS9 *pClipStatus); + HRESULT (WINAPI *GetClipStatus)(IDirect3DDevice9Ex *This, D3DCLIPSTATUS9 *pClipStatus); + HRESULT (WINAPI *GetTexture)(IDirect3DDevice9Ex *This, DWORD Stage, IDirect3DBaseTexture9 **ppTexture); + HRESULT (WINAPI *SetTexture)(IDirect3DDevice9Ex *This, DWORD Stage, IDirect3DBaseTexture9 *pTexture); + HRESULT (WINAPI *GetTextureStageState)(IDirect3DDevice9Ex *This, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD *pValue); + HRESULT (WINAPI *SetTextureStageState)(IDirect3DDevice9Ex *This, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value); + HRESULT (WINAPI *GetSamplerState)(IDirect3DDevice9Ex *This, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD *pValue); + HRESULT (WINAPI *SetSamplerState)(IDirect3DDevice9Ex *This, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value); + HRESULT (WINAPI *ValidateDevice)(IDirect3DDevice9Ex *This, DWORD *pNumPasses); + HRESULT (WINAPI *SetPaletteEntries)(IDirect3DDevice9Ex *This, UINT PaletteNumber, const PALETTEENTRY *pEntries); + HRESULT (WINAPI *GetPaletteEntries)(IDirect3DDevice9Ex *This, UINT PaletteNumber, PALETTEENTRY *pEntries); + HRESULT (WINAPI *SetCurrentTexturePalette)(IDirect3DDevice9Ex *This, UINT PaletteNumber); + HRESULT (WINAPI *GetCurrentTexturePalette)(IDirect3DDevice9Ex *This, UINT *PaletteNumber); + HRESULT (WINAPI *SetScissorRect)(IDirect3DDevice9Ex *This, const RECT *pRect); + HRESULT (WINAPI *GetScissorRect)(IDirect3DDevice9Ex *This, RECT *pRect); + HRESULT (WINAPI *SetSoftwareVertexProcessing)(IDirect3DDevice9Ex *This, BOOL bSoftware); + BOOL (WINAPI *GetSoftwareVertexProcessing)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *SetNPatchMode)(IDirect3DDevice9Ex *This, float nSegments); + float (WINAPI *GetNPatchMode)(IDirect3DDevice9Ex *This); + HRESULT (WINAPI *DrawPrimitive)(IDirect3DDevice9Ex *This, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount); + HRESULT (WINAPI *DrawIndexedPrimitive)(IDirect3DDevice9Ex *This, D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount); + HRESULT (WINAPI *DrawPrimitiveUP)(IDirect3DDevice9Ex *This, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride); + HRESULT (WINAPI *DrawIndexedPrimitiveUP)(IDirect3DDevice9Ex *This, D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertices, UINT PrimitiveCount, const void *pIndexData, D3DFORMAT IndexDataFormat, const void *pVertexStreamZeroData, UINT VertexStreamZeroStride); + HRESULT (WINAPI *ProcessVertices)(IDirect3DDevice9Ex *This, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9 *pDestBuffer, IDirect3DVertexDeclaration9 *pVertexDecl, DWORD Flags); + HRESULT (WINAPI *CreateVertexDeclaration)(IDirect3DDevice9Ex *This, const D3DVERTEXELEMENT9 *pVertexElements, IDirect3DVertexDeclaration9 **ppDecl); + HRESULT (WINAPI *SetVertexDeclaration)(IDirect3DDevice9Ex *This, IDirect3DVertexDeclaration9 *pDecl); + HRESULT (WINAPI *GetVertexDeclaration)(IDirect3DDevice9Ex *This, IDirect3DVertexDeclaration9 **ppDecl); + HRESULT (WINAPI *SetFVF)(IDirect3DDevice9Ex *This, DWORD FVF); + HRESULT (WINAPI *GetFVF)(IDirect3DDevice9Ex *This, DWORD *pFVF); + HRESULT (WINAPI *CreateVertexShader)(IDirect3DDevice9Ex *This, const DWORD *pFunction, IDirect3DVertexShader9 **ppShader); + HRESULT (WINAPI *SetVertexShader)(IDirect3DDevice9Ex *This, IDirect3DVertexShader9 *pShader); + HRESULT (WINAPI *GetVertexShader)(IDirect3DDevice9Ex *This, IDirect3DVertexShader9 **ppShader); + HRESULT (WINAPI *SetVertexShaderConstantF)(IDirect3DDevice9Ex *This, UINT StartRegister, const float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *GetVertexShaderConstantF)(IDirect3DDevice9Ex *This, UINT StartRegister, float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *SetVertexShaderConstantI)(IDirect3DDevice9Ex *This, UINT StartRegister, const int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *GetVertexShaderConstantI)(IDirect3DDevice9Ex *This, UINT StartRegister, int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *SetVertexShaderConstantB)(IDirect3DDevice9Ex *This, UINT StartRegister, const BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *GetVertexShaderConstantB)(IDirect3DDevice9Ex *This, UINT StartRegister, BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *SetStreamSource)(IDirect3DDevice9Ex *This, UINT StreamNumber, IDirect3DVertexBuffer9 *pStreamData, UINT OffsetInBytes, UINT Stride); + HRESULT (WINAPI *GetStreamSource)(IDirect3DDevice9Ex *This, UINT StreamNumber, IDirect3DVertexBuffer9 **ppStreamData, UINT *pOffsetInBytes, UINT *pStride); + HRESULT (WINAPI *SetStreamSourceFreq)(IDirect3DDevice9Ex *This, UINT StreamNumber, UINT Setting); + HRESULT (WINAPI *GetStreamSourceFreq)(IDirect3DDevice9Ex *This, UINT StreamNumber, UINT *pSetting); + HRESULT (WINAPI *SetIndices)(IDirect3DDevice9Ex *This, IDirect3DIndexBuffer9 *pIndexData); + HRESULT (WINAPI *GetIndices)(IDirect3DDevice9Ex *This, IDirect3DIndexBuffer9 **ppIndexData, UINT *pBaseVertexIndex); + HRESULT (WINAPI *CreatePixelShader)(IDirect3DDevice9Ex *This, const DWORD *pFunction, IDirect3DPixelShader9 **ppShader); + HRESULT (WINAPI *SetPixelShader)(IDirect3DDevice9Ex *This, IDirect3DPixelShader9 *pShader); + HRESULT (WINAPI *GetPixelShader)(IDirect3DDevice9Ex *This, IDirect3DPixelShader9 **ppShader); + HRESULT (WINAPI *SetPixelShaderConstantF)(IDirect3DDevice9Ex *This, UINT StartRegister, const float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *GetPixelShaderConstantF)(IDirect3DDevice9Ex *This, UINT StartRegister, float *pConstantData, UINT Vector4fCount); + HRESULT (WINAPI *SetPixelShaderConstantI)(IDirect3DDevice9Ex *This, UINT StartRegister, const int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *GetPixelShaderConstantI)(IDirect3DDevice9Ex *This, UINT StartRegister, int *pConstantData, UINT Vector4iCount); + HRESULT (WINAPI *SetPixelShaderConstantB)(IDirect3DDevice9Ex *This, UINT StartRegister, const BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *GetPixelShaderConstantB)(IDirect3DDevice9Ex *This, UINT StartRegister, BOOL *pConstantData, UINT BoolCount); + HRESULT (WINAPI *DrawRectPatch)(IDirect3DDevice9Ex *This, UINT Handle, const float *pNumSegs, const D3DRECTPATCH_INFO *pRectPatchInfo); + HRESULT (WINAPI *DrawTriPatch)(IDirect3DDevice9Ex *This, UINT Handle, const float *pNumSegs, const D3DTRIPATCH_INFO *pTriPatchInfo); + HRESULT (WINAPI *DeletePatch)(IDirect3DDevice9Ex *This, UINT Handle); + HRESULT (WINAPI *CreateQuery)(IDirect3DDevice9Ex *This, D3DQUERYTYPE Type, IDirect3DQuery9 **ppQuery); + /* IDirect3DDevice9Ex */ + HRESULT (WINAPI *SetConvolutionMonoKernel)(IDirect3DDevice9Ex *This, UINT width, UINT height, float *rows, float *columns); + HRESULT (WINAPI *ComposeRects)(IDirect3DDevice9Ex *This, IDirect3DSurface9 *pSrc, IDirect3DSurface9 *pDst, IDirect3DVertexBuffer9 *pSrcRectDescs, UINT NumRects, IDirect3DVertexBuffer9 *pDstRectDescs, D3DCOMPOSERECTSOP Operation, int Xoffset, int Yoffset); + HRESULT (WINAPI *PresentEx)(IDirect3DDevice9Ex *This, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD dwFlags); + HRESULT (WINAPI *GetGPUThreadPriority)(IDirect3DDevice9Ex *This, INT *pPriority); + HRESULT (WINAPI *SetGPUThreadPriority)(IDirect3DDevice9Ex *This, INT Priority); + HRESULT (WINAPI *WaitForVBlank)(IDirect3DDevice9Ex *This, UINT iSwapChain); + HRESULT (WINAPI *CheckResourceResidency)(IDirect3DDevice9Ex *This, IDirect3DResource9 **pResourceArray, UINT32 NumResources); + HRESULT (WINAPI *SetMaximumFrameLatency)(IDirect3DDevice9Ex *This, UINT MaxLatency); + HRESULT (WINAPI *GetMaximumFrameLatency)(IDirect3DDevice9Ex *This, UINT *pMaxLatency); + HRESULT (WINAPI *CheckDeviceState)(IDirect3DDevice9Ex *This, HWND hDestinationWindow); + HRESULT (WINAPI *CreateRenderTargetEx)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage); + HRESULT (WINAPI *CreateOffscreenPlainSurfaceEx)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage); + HRESULT (WINAPI *CreateDepthStencilSurfaceEx)(IDirect3DDevice9Ex *This, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage); + HRESULT (WINAPI *ResetEx)(IDirect3DDevice9Ex *This, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode); + HRESULT (WINAPI *GetDisplayModeEx)(IDirect3DDevice9Ex *This, UINT iSwapChain, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); +} IDirect3DDevice9ExVtbl; +struct IDirect3DDevice9Ex +{ + IDirect3DDevice9ExVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DDevice9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DDevice9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DDevice9Ex_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DDevice9 macros */ +#define IDirect3DDevice9Ex_TestCooperativeLevel(p) (p)->lpVtbl->TestCooperativeLevel(p) +#define IDirect3DDevice9Ex_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p) +#define IDirect3DDevice9Ex_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) +#define IDirect3DDevice9Ex_GetDirect3D(p,a) (p)->lpVtbl->GetDirect3D(p,a) +#define IDirect3DDevice9Ex_GetDeviceCaps(p,a) (p)->lpVtbl->GetDeviceCaps(p,a) +#define IDirect3DDevice9Ex_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) +#define IDirect3DDevice9Ex_GetCreationParameters(p,a) (p)->lpVtbl->GetCreationParameters(p,a) +#define IDirect3DDevice9Ex_SetCursorProperties(p,a,b,c) (p)->lpVtbl->SetCursorProperties(p,a,b,c) +#define IDirect3DDevice9Ex_SetCursorPosition(p,a,b,c) (p)->lpVtbl->SetCursorPosition(p,a,b,c) +#define IDirect3DDevice9Ex_ShowCursor(p,a) (p)->lpVtbl->ShowCursor(p,a) +#define IDirect3DDevice9Ex_CreateAdditionalSwapChain(p,a,b) (p)->lpVtbl->CreateAdditionalSwapChain(p,a,b) +#define IDirect3DDevice9Ex_GetSwapChain(p,a,b) (p)->lpVtbl->GetSwapChain(p,a,b) +#define IDirect3DDevice9Ex_GetNumberOfSwapChains(p) (p)->lpVtbl->GetNumberOfSwapChains(p) +#define IDirect3DDevice9Ex_Reset(p,a) (p)->lpVtbl->Reset(p,a) +#define IDirect3DDevice9Ex_Present(p,a,b,c,d) (p)->lpVtbl->Present(p,a,b,c,d) +#define IDirect3DDevice9Ex_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) +#define IDirect3DDevice9Ex_GetRasterStatus(p,a,b) (p)->lpVtbl->GetRasterStatus(p,a,b) +#define IDirect3DDevice9Ex_SetDialogBoxMode(p,a) (p)->lpVtbl->SetDialogBoxMode(p,a) +#define IDirect3DDevice9Ex_SetGammaRamp(p,a,b,c) (p)->lpVtbl->SetGammaRamp(p,a,b,c) +#define IDirect3DDevice9Ex_GetGammaRamp(p,a,b) (p)->lpVtbl->GetGammaRamp(p,a,b) +#define IDirect3DDevice9Ex_CreateTexture(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateTexture(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9Ex_CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateVolumeTexture(p,a,b,c,d,e,f,g,h,i) +#define IDirect3DDevice9Ex_CreateCubeTexture(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateCubeTexture(p,a,b,c,d,e,f,g) +#define IDirect3DDevice9Ex_CreateVertexBuffer(p,a,b,c,d,e,f) (p)->lpVtbl->CreateVertexBuffer(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_CreateIndexBuffer(p,a,b,c,d,e,f) (p)->lpVtbl->CreateIndexBuffer(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_CreateRenderTarget(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateRenderTarget(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9Ex_CreateDepthStencilSurface(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateDepthStencilSurface(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9Ex_UpdateSurface(p,a,b,c,d) (p)->lpVtbl->UpdateSurface(p,a,b,c,d) +#define IDirect3DDevice9Ex_UpdateTexture(p,a,b) (p)->lpVtbl->UpdateTexture(p,a,b) +#define IDirect3DDevice9Ex_GetRenderTargetData(p,a,b) (p)->lpVtbl->GetRenderTargetData(p,a,b) +#define IDirect3DDevice9Ex_GetFrontBufferData(p,a,b) (p)->lpVtbl->GetFrontBufferData(p,a,b) +#define IDirect3DDevice9Ex_StretchRect(p,a,b,c,d,e) (p)->lpVtbl->StretchRect(p,a,b,c,d,e) +#define IDirect3DDevice9Ex_ColorFill(p,a,b,c) (p)->lpVtbl->ColorFill(p,a,b,c) +#define IDirect3DDevice9Ex_CreateOffscreenPlainSurface(p,a,b,c,d,e,f) (p)->lpVtbl->CreateOffscreenPlainSurface(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_SetRenderTarget(p,a,b) (p)->lpVtbl->SetRenderTarget(p,a,b) +#define IDirect3DDevice9Ex_GetRenderTarget(p,a,b) (p)->lpVtbl->GetRenderTarget(p,a,b) +#define IDirect3DDevice9Ex_SetDepthStencilSurface(p,a) (p)->lpVtbl->SetDepthStencilSurface(p,a) +#define IDirect3DDevice9Ex_GetDepthStencilSurface(p,a) (p)->lpVtbl->GetDepthStencilSurface(p,a) +#define IDirect3DDevice9Ex_BeginScene(p) (p)->lpVtbl->BeginScene(p) +#define IDirect3DDevice9Ex_EndScene(p) (p)->lpVtbl->EndScene(p) +#define IDirect3DDevice9Ex_Clear(p,a,b,c,d,e,f) (p)->lpVtbl->Clear(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_SetTransform(p,a,b) (p)->lpVtbl->SetTransform(p,a,b) +#define IDirect3DDevice9Ex_GetTransform(p,a,b) (p)->lpVtbl->GetTransform(p,a,b) +#define IDirect3DDevice9Ex_MultiplyTransform(p,a,b) (p)->lpVtbl->MultiplyTransform(p,a,b) +#define IDirect3DDevice9Ex_SetViewport(p,a) (p)->lpVtbl->SetViewport(p,a) +#define IDirect3DDevice9Ex_GetViewport(p,a) (p)->lpVtbl->GetViewport(p,a) +#define IDirect3DDevice9Ex_SetMaterial(p,a) (p)->lpVtbl->SetMaterial(p,a) +#define IDirect3DDevice9Ex_GetMaterial(p,a) (p)->lpVtbl->GetMaterial(p,a) +#define IDirect3DDevice9Ex_SetLight(p,a,b) (p)->lpVtbl->SetLight(p,a,b) +#define IDirect3DDevice9Ex_GetLight(p,a,b) (p)->lpVtbl->GetLight(p,a,b) +#define IDirect3DDevice9Ex_LightEnable(p,a,b) (p)->lpVtbl->LightEnable(p,a,b) +#define IDirect3DDevice9Ex_GetLightEnable(p,a,b) (p)->lpVtbl->GetLightEnable(p,a,b) +#define IDirect3DDevice9Ex_SetClipPlane(p,a,b) (p)->lpVtbl->SetClipPlane(p,a,b) +#define IDirect3DDevice9Ex_GetClipPlane(p,a,b) (p)->lpVtbl->GetClipPlane(p,a,b) +#define IDirect3DDevice9Ex_SetRenderState(p,a,b) (p)->lpVtbl->SetRenderState(p,a,b) +#define IDirect3DDevice9Ex_GetRenderState(p,a,b) (p)->lpVtbl->GetRenderState(p,a,b) +#define IDirect3DDevice9Ex_CreateStateBlock(p,a,b) (p)->lpVtbl->CreateStateBlock(p,a,b) +#define IDirect3DDevice9Ex_BeginStateBlock(p) (p)->lpVtbl->BeginStateBlock(p) +#define IDirect3DDevice9Ex_EndStateBlock(p,a) (p)->lpVtbl->EndStateBlock(p,a) +#define IDirect3DDevice9Ex_SetClipStatus(p,a) (p)->lpVtbl->SetClipStatus(p,a) +#define IDirect3DDevice9Ex_GetClipStatus(p,a) (p)->lpVtbl->GetClipStatus(p,a) +#define IDirect3DDevice9Ex_GetTexture(p,a,b) (p)->lpVtbl->GetTexture(p,a,b) +#define IDirect3DDevice9Ex_SetTexture(p,a,b) (p)->lpVtbl->SetTexture(p,a,b) +#define IDirect3DDevice9Ex_GetTextureStageState(p,a,b,c) (p)->lpVtbl->GetTextureStageState(p,a,b,c) +#define IDirect3DDevice9Ex_SetTextureStageState(p,a,b,c) (p)->lpVtbl->SetTextureStageState(p,a,b,c) +#define IDirect3DDevice9Ex_GetSamplerState(p,a,b,c) (p)->lpVtbl->GetSamplerState(p,a,b,c) +#define IDirect3DDevice9Ex_SetSamplerState(p,a,b,c) (p)->lpVtbl->SetSamplerState(p,a,b,c) +#define IDirect3DDevice9Ex_ValidateDevice(p,a) (p)->lpVtbl->ValidateDevice(p,a) +#define IDirect3DDevice9Ex_SetPaletteEntries(p,a,b) (p)->lpVtbl->SetPaletteEntries(p,a,b) +#define IDirect3DDevice9Ex_GetPaletteEntries(p,a,b) (p)->lpVtbl->GetPaletteEntries(p,a,b) +#define IDirect3DDevice9Ex_SetCurrentTexturePalette(p,a) (p)->lpVtbl->SetCurrentTexturePalette(p,a) +#define IDirect3DDevice9Ex_GetCurrentTexturePalette(p,a) (p)->lpVtbl->GetCurrentTexturePalette(p,a) +#define IDirect3DDevice9Ex_SetScissorRect(p,a) (p)->lpVtbl->SetScissorRect(p,a) +#define IDirect3DDevice9Ex_GetScissorRect(p,a) (p)->lpVtbl->GetScissorRect(p,a) +#define IDirect3DDevice9Ex_SetSoftwareVertexProcessing(p,a) (p)->lpVtbl->SetSoftwareVertexProcessing(p,a) +#define IDirect3DDevice9Ex_GetSoftwareVertexProcessing(p) (p)->lpVtbl->GetSoftwareVertexProcessing(p) +#define IDirect3DDevice9Ex_SetNPatchMode(p,a) (p)->lpVtbl->SetNPatchMode(p,a) +#define IDirect3DDevice9Ex_GetNPatchMode(p) (p)->lpVtbl->GetNPatchMode(p) +#define IDirect3DDevice9Ex_DrawPrimitive(p,a,b,c) (p)->lpVtbl->DrawPrimitive(p,a,b,c) +#define IDirect3DDevice9Ex_DrawIndexedPrimitive(p,a,b,c,d,e,f) (p)->lpVtbl->DrawIndexedPrimitive(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) +#define IDirect3DDevice9Ex_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9Ex_ProcessVertices(p,a,b,c,d,e,f) (p)->lpVtbl->ProcessVertices(p,a,b,c,d,e,f) +#define IDirect3DDevice9Ex_CreateVertexDeclaration(p,a,b) (p)->lpVtbl->CreateVertexDeclaration(p,a,b) +#define IDirect3DDevice9Ex_SetVertexDeclaration(p,a) (p)->lpVtbl->SetVertexDeclaration(p,a) +#define IDirect3DDevice9Ex_GetVertexDeclaration(p,a) (p)->lpVtbl->GetVertexDeclaration(p,a) +#define IDirect3DDevice9Ex_SetFVF(p,a) (p)->lpVtbl->SetFVF(p,a) +#define IDirect3DDevice9Ex_GetFVF(p,a) (p)->lpVtbl->GetFVF(p,a) +#define IDirect3DDevice9Ex_CreateVertexShader(p,a,b) (p)->lpVtbl->CreateVertexShader(p,a,b) +#define IDirect3DDevice9Ex_SetVertexShader(p,a) (p)->lpVtbl->SetVertexShader(p,a) +#define IDirect3DDevice9Ex_GetVertexShader(p,a) (p)->lpVtbl->GetVertexShader(p,a) +#define IDirect3DDevice9Ex_SetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantF(p,a,b,c) +#define IDirect3DDevice9Ex_GetVertexShaderConstantF(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantF(p,a,b,c) +#define IDirect3DDevice9Ex_SetVertexShaderConstantI(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantI(p,a,b,c) +#define IDirect3DDevice9Ex_GetVertexShaderConstantI(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantI(p,a,b,c) +#define IDirect3DDevice9Ex_SetVertexShaderConstantB(p,a,b,c) (p)->lpVtbl->SetVertexShaderConstantB(p,a,b,c) +#define IDirect3DDevice9Ex_GetVertexShaderConstantB(p,a,b,c) (p)->lpVtbl->GetVertexShaderConstantB(p,a,b,c) +#define IDirect3DDevice9Ex_SetStreamSource(p,a,b,c,d) (p)->lpVtbl->SetStreamSource(p,a,b,c,d) +#define IDirect3DDevice9Ex_GetStreamSource(p,a,b,c,d) (p)->lpVtbl->GetStreamSource(p,a,b,c,d) +#define IDirect3DDevice9Ex_SetStreamSourceFreq(p,a,b) (p)->lpVtbl->SetStreamSourceFreq(p,a,b) +#define IDirect3DDevice9Ex_GetStreamSourceFreq(p,a,b) (p)->lpVtbl->GetStreamSourceFreq(p,a,b) +#define IDirect3DDevice9Ex_SetIndices(p,a) (p)->lpVtbl->SetIndices(p,a) +#define IDirect3DDevice9Ex_GetIndices(p,a,b) (p)->lpVtbl->GetIndices(p,a,b) +#define IDirect3DDevice9Ex_CreatePixelShader(p,a,b) (p)->lpVtbl->CreatePixelShader(p,a,b) +#define IDirect3DDevice9Ex_SetPixelShader(p,a) (p)->lpVtbl->SetPixelShader(p,a) +#define IDirect3DDevice9Ex_GetPixelShader(p,a) (p)->lpVtbl->GetPixelShader(p,a) +#define IDirect3DDevice9Ex_SetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantF(p,a,b,c) +#define IDirect3DDevice9Ex_GetPixelShaderConstantF(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantF(p,a,b,c) +#define IDirect3DDevice9Ex_SetPixelShaderConstantI(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantI(p,a,b,c) +#define IDirect3DDevice9Ex_GetPixelShaderConstantI(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantI(p,a,b,c) +#define IDirect3DDevice9Ex_SetPixelShaderConstantB(p,a,b,c) (p)->lpVtbl->SetPixelShaderConstantB(p,a,b,c) +#define IDirect3DDevice9Ex_GetPixelShaderConstantB(p,a,b,c) (p)->lpVtbl->GetPixelShaderConstantB(p,a,b,c) +#define IDirect3DDevice9Ex_DrawRectPatch(p,a,b,c) (p)->lpVtbl->DrawRectPatch(p,a,b,c) +#define IDirect3DDevice9Ex_DrawTriPatch(p,a,b,c) (p)->lpVtbl->DrawTriPatch(p,a,b,c) +#define IDirect3DDevice9Ex_DeletePatch(p,a) (p)->lpVtbl->DeletePatch(p,a) +#define IDirect3DDevice9Ex_CreateQuery(p,a,b) (p)->lpVtbl->CreateQuery(p,a,b) +/* IDirect3DDevice9Ex macros */ +#define IDirect3DDevice9Ex_SetConvolutionMonoKernel(p,a,b,c,d) (p)->lpVtbl->SetConvolutionMonoKernel(p,a,b,c,d) +#define IDirect3DDevice9Ex_ComposeRects(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->ComposeRects(p,a,b,c,d,e,f,g,h) +#define IDirect3DDevice9Ex_PresentEx(p,a,b,c,d,e) (p)->lpVtbl->PresentEx(p,a,b,c,d,e) +#define IDirect3DDevice9Ex_GetGPUThreadPriority(p,a) (p)->lpVtbl->GetGPUThreadPriority(p,a) +#define IDirect3DDevice9Ex_SetGPUThreadPriority(p,a) (p)->lpVtbl->SetGPUThreadPriority(p,a) +#define IDirect3DDevice9Ex_WaitForVBlank(p,a) (p)->lpVtbl->WaitForVBlank(p,a) +#define IDirect3DDevice9Ex_CheckResourceResidency(p,a,b) (p)->lpVtbl->CheckResourceResidency(p,a,b) +#define IDirect3DDevice9Ex_SetMaximumFrameLatency(p,a) (p)->lpVtbl->SetMaximumFrameLatency(p,a) +#define IDirect3DDevice9Ex_GetMaximumFrameLatency(p,a) (p)->lpVtbl->GetMaximumFrameLatency(p,a) +#define IDirect3DDevice9Ex_CheckDeviceState(p,a) (p)->lpVtbl->CheckDeviceState(p,a) +#define IDirect3DDevice9Ex_CreateRenderTargetEx(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateRenderTargetEx(p,a,b,c,d,e,f,g,h,i) +#define IDirect3DDevice9Ex_CreateOffscreenPlainSurfaceEx(p,a,b,c,d,e,f,g) (p)->lpVtbl->CreateOffscreenPlainSurfaceEx(p,a,b,c,d,e,f,g) +#define IDirect3DDevice9Ex_CreateDepthStencilSurfaceEx(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateDepthStencilSurfaceEx(p,a,b,c,d,e,f,g,h,i) +#define IDirect3DDevice9Ex_ResetEx(p,a,b) (p)->lpVtbl->ResetEx(p,a,b) +#define IDirect3DDevice9Ex_GetDisplayModeEx(p,a,b,c) (p)->lpVtbl->GetDisplayModeEx(p,a,b,c) + +typedef struct IDirect3DDevice9VideoVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DDevice9Video *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DDevice9Video *This); + ULONG (WINAPI *Release)(IDirect3DDevice9Video *This); + /* IDirect3DDevice9Video */ + HRESULT (WINAPI *GetContentProtectionCaps)(IDirect3DDevice9Video *This, const GUID *pCryptoType, const GUID *pDecodeProfile, D3DCONTENTPROTECTIONCAPS *pCaps); + HRESULT (WINAPI *CreateAuthenticatedChannel)(IDirect3DDevice9Video *This, D3DAUTHENTICATEDCHANNELTYPE ChannelType, IDirect3DAuthenticatedChannel9 **ppAuthenticatedChannel, HANDLE *pChannelHandle); + HRESULT (WINAPI *CreateCryptoSession)(IDirect3DDevice9Video *This, const GUID *pCryptoType, const GUID *pDecodeProfile, IDirect3DCryptoSession9 **ppCryptoSession, HANDLE *pCryptoHandle); +} IDirect3DDevice9VideoVtbl; +struct IDirect3DDevice9Video +{ + IDirect3DDevice9VideoVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DDevice9Video_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DDevice9Video_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DDevice9Video_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DDevice9Video macros */ +#define IDirect3DDevice9Video_GetContentProtectionCaps(p,a,b,c) (p)->lpVtbl->GetContentProtectionCaps(p,a,b,c) +#define IDirect3DDevice9Video_CreateAuthenticatedChannel(p,a,b,c) (p)->lpVtbl->CreateAuthenticatedChannel(p,a,b,c) +#define IDirect3DDevice9Video_CreateCryptoSession(p,a,b,c,d) (p)->lpVtbl->CreateCryptoSession(p,a,b,c,d) + +typedef struct IDirect3DIndexBuffer9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DIndexBuffer9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DIndexBuffer9 *This); + ULONG (WINAPI *Release)(IDirect3DIndexBuffer9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DIndexBuffer9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DIndexBuffer9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DIndexBuffer9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DIndexBuffer9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DIndexBuffer9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DIndexBuffer9 *This); + void (WINAPI *PreLoad)(IDirect3DIndexBuffer9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DIndexBuffer9 *This); + /* IDirect3DIndexBuffer9 */ + HRESULT (WINAPI *Lock)(IDirect3DIndexBuffer9 *This, UINT OffsetToLock, UINT SizeToLock, void **ppbData, DWORD Flags); + HRESULT (WINAPI *Unlock)(IDirect3DIndexBuffer9 *This); + HRESULT (WINAPI *GetDesc)(IDirect3DIndexBuffer9 *This, D3DINDEXBUFFER_DESC *pDesc); +} IDirect3DIndexBuffer9Vtbl; +struct IDirect3DIndexBuffer9 +{ + IDirect3DIndexBuffer9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DIndexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DIndexBuffer9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DIndexBuffer9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DIndexBuffer9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DIndexBuffer9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DIndexBuffer9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DIndexBuffer9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DIndexBuffer9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DIndexBuffer9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DIndexBuffer9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DIndexBuffer9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DIndexBuffer9 macros */ +#define IDirect3DIndexBuffer9_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d) +#define IDirect3DIndexBuffer9_Unlock(p) (p)->lpVtbl->Unlock(p) +#define IDirect3DIndexBuffer9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) + +typedef struct IDirect3DPixelShader9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DPixelShader9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DPixelShader9 *This); + ULONG (WINAPI *Release)(IDirect3DPixelShader9 *This); + /* IDirect3DPixelShader9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DPixelShader9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *GetFunction)(IDirect3DPixelShader9 *This, void *pData, UINT *pSizeOfData); +} IDirect3DPixelShader9Vtbl; +struct IDirect3DPixelShader9 +{ + IDirect3DPixelShader9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DPixelShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DPixelShader9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DPixelShader9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DPixelShader9 macros */ +#define IDirect3DPixelShader9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DPixelShader9_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) + +typedef struct IDirect3DQuery9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DQuery9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DQuery9 *This); + ULONG (WINAPI *Release)(IDirect3DQuery9 *This); + /* IDirect3DQuery9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DQuery9 *This, IDirect3DDevice9 **ppDevice); + D3DQUERYTYPE (WINAPI *GetType)(IDirect3DQuery9 *This); + DWORD (WINAPI *GetDataSize)(IDirect3DQuery9 *This); + HRESULT (WINAPI *Issue)(IDirect3DQuery9 *This, DWORD dwIssueFlags); + HRESULT (WINAPI *GetData)(IDirect3DQuery9 *This, void *pData, DWORD dwSize, DWORD dwGetDataFlags); +} IDirect3DQuery9Vtbl; +struct IDirect3DQuery9 +{ + IDirect3DQuery9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DQuery9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DQuery9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DQuery9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DQuery9 macros */ +#define IDirect3DQuery9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DQuery9_GetType(p) (p)->lpVtbl->GetType(p) +#define IDirect3DQuery9_GetDataSize(p) (p)->lpVtbl->GetDataSize(p) +#define IDirect3DQuery9_Issue(p,a) (p)->lpVtbl->Issue(p,a) +#define IDirect3DQuery9_GetData(p,a,b,c) (p)->lpVtbl->GetData(p,a,b,c) + +typedef struct IDirect3DResource9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DResource9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DResource9 *This); + ULONG (WINAPI *Release)(IDirect3DResource9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DResource9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DResource9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DResource9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DResource9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DResource9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DResource9 *This); + void (WINAPI *PreLoad)(IDirect3DResource9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DResource9 *This); +} IDirect3DResource9Vtbl; +struct IDirect3DResource9 +{ + IDirect3DResource9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DResource9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DResource9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DResource9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DResource9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DResource9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DResource9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DResource9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DResource9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DResource9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DResource9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DResource9_GetType(p) (p)->lpVtbl->GetType(p) + +typedef struct IDirect3DStateBlock9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DStateBlock9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DStateBlock9 *This); + ULONG (WINAPI *Release)(IDirect3DStateBlock9 *This); + /* IDirect3DStateBlock9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DStateBlock9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *Capture)(IDirect3DStateBlock9 *This); + HRESULT (WINAPI *Apply)(IDirect3DStateBlock9 *This); +} IDirect3DStateBlock9Vtbl; +struct IDirect3DStateBlock9 +{ + IDirect3DStateBlock9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DStateBlock9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DStateBlock9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DStateBlock9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DStateBlock9 macros */ +#define IDirect3DStateBlock9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DStateBlock9_Capture(p) (p)->lpVtbl->Capture(p) +#define IDirect3DStateBlock9_Apply(p) (p)->lpVtbl->Apply(p) + +typedef struct IDirect3DSurface9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DSurface9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DSurface9 *This); + ULONG (WINAPI *Release)(IDirect3DSurface9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DSurface9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DSurface9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DSurface9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DSurface9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DSurface9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DSurface9 *This); + void (WINAPI *PreLoad)(IDirect3DSurface9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DSurface9 *This); + /* IDirect3DSurface9 */ + HRESULT (WINAPI *GetContainer)(IDirect3DSurface9 *This, REFIID riid, void **ppContainer); + HRESULT (WINAPI *GetDesc)(IDirect3DSurface9 *This, D3DSURFACE_DESC *pDesc); + HRESULT (WINAPI *LockRect)(IDirect3DSurface9 *This, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags); + HRESULT (WINAPI *UnlockRect)(IDirect3DSurface9 *This); + HRESULT (WINAPI *GetDC)(IDirect3DSurface9 *This, HDC *phdc); + HRESULT (WINAPI *ReleaseDC)(IDirect3DSurface9 *This, HDC hdc); +} IDirect3DSurface9Vtbl; +struct IDirect3DSurface9 +{ + IDirect3DSurface9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DSurface9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSurface9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSurface9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DSurface9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSurface9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DSurface9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DSurface9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DSurface9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DSurface9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DSurface9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DSurface9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DSurface9 macros */ +#define IDirect3DSurface9_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) +#define IDirect3DSurface9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) +#define IDirect3DSurface9_LockRect(p,a,b,c) (p)->lpVtbl->LockRect(p,a,b,c) +#define IDirect3DSurface9_UnlockRect(p) (p)->lpVtbl->UnlockRect(p) +#define IDirect3DSurface9_GetDC(p,a) (p)->lpVtbl->GetDC(p,a) +#define IDirect3DSurface9_ReleaseDC(p,a) (p)->lpVtbl->ReleaseDC(p,a) + +typedef struct IDirect3DSwapChain9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DSwapChain9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DSwapChain9 *This); + ULONG (WINAPI *Release)(IDirect3DSwapChain9 *This); + /* IDirect3DSwapChain9 */ + HRESULT (WINAPI *Present)(IDirect3DSwapChain9 *This, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD dwFlags); + HRESULT (WINAPI *GetFrontBufferData)(IDirect3DSwapChain9 *This, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *GetBackBuffer)(IDirect3DSwapChain9 *This, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer); + HRESULT (WINAPI *GetRasterStatus)(IDirect3DSwapChain9 *This, D3DRASTER_STATUS *pRasterStatus); + HRESULT (WINAPI *GetDisplayMode)(IDirect3DSwapChain9 *This, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetDevice)(IDirect3DSwapChain9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *GetPresentParameters)(IDirect3DSwapChain9 *This, D3DPRESENT_PARAMETERS *pPresentationParameters); +} IDirect3DSwapChain9Vtbl; +struct IDirect3DSwapChain9 +{ + IDirect3DSwapChain9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DSwapChain9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSwapChain9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSwapChain9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DSwapChain9 macros */ +#define IDirect3DSwapChain9_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IDirect3DSwapChain9_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) +#define IDirect3DSwapChain9_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) +#define IDirect3DSwapChain9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSwapChain9_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) + +typedef struct IDirect3DSwapChain9ExVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DSwapChain9Ex *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DSwapChain9Ex *This); + ULONG (WINAPI *Release)(IDirect3DSwapChain9Ex *This); + /* IDirect3DSwapChain9 */ + HRESULT (WINAPI *Present)(IDirect3DSwapChain9Ex *This, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD dwFlags); + HRESULT (WINAPI *GetFrontBufferData)(IDirect3DSwapChain9Ex *This, IDirect3DSurface9 *pDestSurface); + HRESULT (WINAPI *GetBackBuffer)(IDirect3DSwapChain9Ex *This, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9 **ppBackBuffer); + HRESULT (WINAPI *GetRasterStatus)(IDirect3DSwapChain9Ex *This, D3DRASTER_STATUS *pRasterStatus); + HRESULT (WINAPI *GetDisplayMode)(IDirect3DSwapChain9Ex *This, D3DDISPLAYMODE *pMode); + HRESULT (WINAPI *GetDevice)(IDirect3DSwapChain9Ex *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *GetPresentParameters)(IDirect3DSwapChain9Ex *This, D3DPRESENT_PARAMETERS *pPresentationParameters); + /* IDirect3DSwapChain9Ex */ + HRESULT (WINAPI *GetLastPresentCount)(IDirect3DSwapChain9Ex *This, UINT *pLastPresentCount); + HRESULT (WINAPI *GetPresentStats)(IDirect3DSwapChain9Ex *This, D3DPRESENTSTATS *pPresentationStatistics); + HRESULT (WINAPI *GetDisplayModeEx)(IDirect3DSwapChain9Ex *This, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); +} IDirect3DSwapChain9ExVtbl; +struct IDirect3DSwapChain9Ex +{ + IDirect3DSwapChain9ExVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DSwapChain9Ex_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DSwapChain9Ex_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DSwapChain9Ex_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DSwapChain9 macros */ +#define IDirect3DSwapChain9Ex_Present(p,a,b,c,d,e) (p)->lpVtbl->Present(p,a,b,c,d,e) +#define IDirect3DSwapChain9Ex_GetFrontBufferData(p,a) (p)->lpVtbl->GetFrontBufferData(p,a) +#define IDirect3DSwapChain9Ex_GetBackBuffer(p,a,b,c) (p)->lpVtbl->GetBackBuffer(p,a,b,c) +#define IDirect3DSwapChain9Ex_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayMode(p,a) (p)->lpVtbl->GetDisplayMode(p,a) +#define IDirect3DSwapChain9Ex_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DSwapChain9Ex_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) +/* IDirect3DSwapChain9Ex macros */ +#define IDirect3DSwapChain9Ex_GetLastPresentCount(p,a) (p)->lpVtbl->GetLastPresentCount(p,a) +#define IDirect3DSwapChain9Ex_GetPresentStats(p,a) (p)->lpVtbl->GetPresentStats(p,a) +#define IDirect3DSwapChain9Ex_GetDisplayModeEx(p,a,b) (p)->lpVtbl->GetDisplayModeEx(p,a,b) + +typedef struct IDirect3DTexture9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DTexture9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DTexture9 *This); + ULONG (WINAPI *Release)(IDirect3DTexture9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DTexture9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DTexture9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DTexture9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DTexture9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DTexture9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DTexture9 *This); + void (WINAPI *PreLoad)(IDirect3DTexture9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DTexture9 *This); + /* IDirect3DBaseTexture9 */ + DWORD (WINAPI *SetLOD)(IDirect3DTexture9 *This, DWORD LODNew); + DWORD (WINAPI *GetLOD)(IDirect3DTexture9 *This); + DWORD (WINAPI *GetLevelCount)(IDirect3DTexture9 *This); + HRESULT (WINAPI *SetAutoGenFilterType)(IDirect3DTexture9 *This, D3DTEXTUREFILTERTYPE FilterType); + D3DTEXTUREFILTERTYPE (WINAPI *GetAutoGenFilterType)(IDirect3DTexture9 *This); + void (WINAPI *GenerateMipSubLevels)(IDirect3DTexture9 *This); + /* IDirect3DTexture9 */ + HRESULT (WINAPI *GetLevelDesc)(IDirect3DTexture9 *This, UINT Level, D3DSURFACE_DESC *pDesc); + HRESULT (WINAPI *GetSurfaceLevel)(IDirect3DTexture9 *This, UINT Level, IDirect3DSurface9 **ppSurfaceLevel); + HRESULT (WINAPI *LockRect)(IDirect3DTexture9 *This, UINT Level, D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags); + HRESULT (WINAPI *UnlockRect)(IDirect3DTexture9 *This, UINT Level); + HRESULT (WINAPI *AddDirtyRect)(IDirect3DTexture9 *This, const RECT *pDirtyRect); +} IDirect3DTexture9Vtbl; +struct IDirect3DTexture9 +{ + IDirect3DTexture9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DTexture9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DTexture9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DTexture9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DTexture9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DTexture9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DTexture9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DTexture9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DTexture9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DTexture9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DTexture9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DBaseTexture9 macros */ +#define IDirect3DTexture9_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) +#define IDirect3DTexture9_GetLOD(p) (p)->lpVtbl->GetLOD(p) +#define IDirect3DTexture9_GetLevelCount(p) (p)->lpVtbl->GetLevelCount(p) +#define IDirect3DTexture9_SetAutoGenFilterType(p,a) (p)->lpVtbl->SetAutoGenFilterType(p,a) +#define IDirect3DTexture9_GetAutoGenFilterType(p) (p)->lpVtbl->GetAutoGenFilterType(p) +#define IDirect3DTexture9_GenerateMipSubLevels(p) (p)->lpVtbl->GenerateMipSubLevels(p) +/* IDirect3DTexture9 macros */ +#define IDirect3DTexture9_GetLevelDesc(p,a,b) (p)->lpVtbl->GetLevelDesc(p,a,b) +#define IDirect3DTexture9_GetSurfaceLevel(p,a,b) (p)->lpVtbl->GetSurfaceLevel(p,a,b) +#define IDirect3DTexture9_LockRect(p,a,b,c,d) (p)->lpVtbl->LockRect(p,a,b,c,d) +#define IDirect3DTexture9_UnlockRect(p,a) (p)->lpVtbl->UnlockRect(p,a) +#define IDirect3DTexture9_AddDirtyRect(p,a) (p)->lpVtbl->AddDirtyRect(p,a) + +typedef struct IDirect3DVertexBuffer9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DVertexBuffer9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DVertexBuffer9 *This); + ULONG (WINAPI *Release)(IDirect3DVertexBuffer9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DVertexBuffer9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DVertexBuffer9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DVertexBuffer9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DVertexBuffer9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DVertexBuffer9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DVertexBuffer9 *This); + void (WINAPI *PreLoad)(IDirect3DVertexBuffer9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DVertexBuffer9 *This); + /* IDirect3DVertexBuffer9 */ + HRESULT (WINAPI *Lock)(IDirect3DVertexBuffer9 *This, UINT OffsetToLock, UINT SizeToLock, void **ppbData, DWORD Flags); + HRESULT (WINAPI *Unlock)(IDirect3DVertexBuffer9 *This); + HRESULT (WINAPI *GetDesc)(IDirect3DVertexBuffer9 *This, D3DVERTEXBUFFER_DESC *pDesc); +} IDirect3DVertexBuffer9Vtbl; +struct IDirect3DVertexBuffer9 +{ + IDirect3DVertexBuffer9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DVertexBuffer9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVertexBuffer9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVertexBuffer9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DVertexBuffer9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DVertexBuffer9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DVertexBuffer9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DVertexBuffer9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DVertexBuffer9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DVertexBuffer9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DVertexBuffer9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DVertexBuffer9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DVertexBuffer9 macros */ +#define IDirect3DVertexBuffer9_Lock(p,a,b,c,d) (p)->lpVtbl->Lock(p,a,b,c,d) +#define IDirect3DVertexBuffer9_Unlock(p) (p)->lpVtbl->Unlock(p) +#define IDirect3DVertexBuffer9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) + +typedef struct IDirect3DVertexDeclaration9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DVertexDeclaration9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DVertexDeclaration9 *This); + ULONG (WINAPI *Release)(IDirect3DVertexDeclaration9 *This); + /* IDirect3DVertexDeclaration9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DVertexDeclaration9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *GetDeclaration)(IDirect3DVertexDeclaration9 *This, D3DVERTEXELEMENT9 *pElement, UINT *pNumElements); +} IDirect3DVertexDeclaration9Vtbl; +struct IDirect3DVertexDeclaration9 +{ + IDirect3DVertexDeclaration9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DVertexDeclaration9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVertexDeclaration9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVertexDeclaration9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DVertexDeclaration9 macros */ +#define IDirect3DVertexDeclaration9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DVertexDeclaration9_GetDeclaration(p,a,b) (p)->lpVtbl->GetDeclaration(p,a,b) + +typedef struct IDirect3DVertexShader9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DVertexShader9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DVertexShader9 *This); + ULONG (WINAPI *Release)(IDirect3DVertexShader9 *This); + /* IDirect3DVertexShader9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DVertexShader9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *GetFunction)(IDirect3DVertexShader9 *This, void *pData, UINT *pSizeOfData); +} IDirect3DVertexShader9Vtbl; +struct IDirect3DVertexShader9 +{ + IDirect3DVertexShader9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DVertexShader9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVertexShader9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVertexShader9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DVertexShader9 macros */ +#define IDirect3DVertexShader9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DVertexShader9_GetFunction(p,a,b) (p)->lpVtbl->GetFunction(p,a,b) + +typedef struct IDirect3DVolume9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DVolume9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DVolume9 *This); + ULONG (WINAPI *Release)(IDirect3DVolume9 *This); + /* IDirect3DVolume9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DVolume9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DVolume9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DVolume9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DVolume9 *This, REFGUID refguid); + HRESULT (WINAPI *GetContainer)(IDirect3DVolume9 *This, REFIID riid, void **ppContainer); + HRESULT (WINAPI *GetDesc)(IDirect3DVolume9 *This, D3DVOLUME_DESC *pDesc); + HRESULT (WINAPI *LockBox)(IDirect3DVolume9 *This, D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags); + HRESULT (WINAPI *UnlockBox)(IDirect3DVolume9 *This); +} IDirect3DVolume9Vtbl; +struct IDirect3DVolume9 +{ + IDirect3DVolume9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DVolume9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVolume9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVolume9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DVolume9 macros */ +#define IDirect3DVolume9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DVolume9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DVolume9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DVolume9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DVolume9_GetContainer(p,a,b) (p)->lpVtbl->GetContainer(p,a,b) +#define IDirect3DVolume9_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) +#define IDirect3DVolume9_LockBox(p,a,b,c) (p)->lpVtbl->LockBox(p,a,b,c) +#define IDirect3DVolume9_UnlockBox(p) (p)->lpVtbl->UnlockBox(p) + +typedef struct IDirect3DVolumeTexture9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IDirect3DVolumeTexture9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IDirect3DVolumeTexture9 *This); + ULONG (WINAPI *Release)(IDirect3DVolumeTexture9 *This); + /* IDirect3DResource9 */ + HRESULT (WINAPI *GetDevice)(IDirect3DVolumeTexture9 *This, IDirect3DDevice9 **ppDevice); + HRESULT (WINAPI *SetPrivateData)(IDirect3DVolumeTexture9 *This, REFGUID refguid, const void *pData, DWORD SizeOfData, DWORD Flags); + HRESULT (WINAPI *GetPrivateData)(IDirect3DVolumeTexture9 *This, REFGUID refguid, void *pData, DWORD *pSizeOfData); + HRESULT (WINAPI *FreePrivateData)(IDirect3DVolumeTexture9 *This, REFGUID refguid); + DWORD (WINAPI *SetPriority)(IDirect3DVolumeTexture9 *This, DWORD PriorityNew); + DWORD (WINAPI *GetPriority)(IDirect3DVolumeTexture9 *This); + void (WINAPI *PreLoad)(IDirect3DVolumeTexture9 *This); + D3DRESOURCETYPE (WINAPI *GetType)(IDirect3DVolumeTexture9 *This); + /* IDirect3DBaseTexture9 */ + DWORD (WINAPI *SetLOD)(IDirect3DVolumeTexture9 *This, DWORD LODNew); + DWORD (WINAPI *GetLOD)(IDirect3DVolumeTexture9 *This); + DWORD (WINAPI *GetLevelCount)(IDirect3DVolumeTexture9 *This); + HRESULT (WINAPI *SetAutoGenFilterType)(IDirect3DVolumeTexture9 *This, D3DTEXTUREFILTERTYPE FilterType); + D3DTEXTUREFILTERTYPE (WINAPI *GetAutoGenFilterType)(IDirect3DVolumeTexture9 *This); + void (WINAPI *GenerateMipSubLevels)(IDirect3DVolumeTexture9 *This); + /* IDirect3DVolumeTexture9 */ + HRESULT (WINAPI *GetLevelDesc)(IDirect3DVolumeTexture9 *This, UINT Level, D3DVOLUME_DESC *pDesc); + HRESULT (WINAPI *GetVolumeLevel)(IDirect3DVolumeTexture9 *This, UINT Level, IDirect3DVolume9 **ppVolumeLevel); + HRESULT (WINAPI *LockBox)(IDirect3DVolumeTexture9 *This, UINT Level, D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags); + HRESULT (WINAPI *UnlockBox)(IDirect3DVolumeTexture9 *This, UINT Level); + HRESULT (WINAPI *AddDirtyBox)(IDirect3DVolumeTexture9 *This, const D3DBOX *pDirtyBox); +} IDirect3DVolumeTexture9Vtbl; +struct IDirect3DVolumeTexture9 +{ + IDirect3DVolumeTexture9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IDirect3DVolumeTexture9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DVolumeTexture9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DVolumeTexture9_Release(p) (p)->lpVtbl->Release(p) +/* IDirect3DResource9 macros */ +#define IDirect3DVolumeTexture9_GetDevice(p,a) (p)->lpVtbl->GetDevice(p,a) +#define IDirect3DVolumeTexture9_SetPrivateData(p,a,b,c,d) (p)->lpVtbl->SetPrivateData(p,a,b,c,d) +#define IDirect3DVolumeTexture9_GetPrivateData(p,a,b,c) (p)->lpVtbl->GetPrivateData(p,a,b,c) +#define IDirect3DVolumeTexture9_FreePrivateData(p,a) (p)->lpVtbl->FreePrivateData(p,a) +#define IDirect3DVolumeTexture9_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) +#define IDirect3DVolumeTexture9_GetPriority(p) (p)->lpVtbl->GetPriority(p) +#define IDirect3DVolumeTexture9_PreLoad(p) (p)->lpVtbl->PreLoad(p) +#define IDirect3DVolumeTexture9_GetType(p) (p)->lpVtbl->GetType(p) +/* IDirect3DBaseTexture9 macros */ +#define IDirect3DVolumeTexture9_SetLOD(p,a) (p)->lpVtbl->SetLOD(p,a) +#define IDirect3DVolumeTexture9_GetLOD(p) (p)->lpVtbl->GetLOD(p) +#define IDirect3DVolumeTexture9_GetLevelCount(p) (p)->lpVtbl->GetLevelCount(p) +#define IDirect3DVolumeTexture9_SetAutoGenFilterType(p,a) (p)->lpVtbl->SetAutoGenFilterType(p,a) +#define IDirect3DVolumeTexture9_GetAutoGenFilterType(p) (p)->lpVtbl->GetAutoGenFilterType(p) +#define IDirect3DVolumeTexture9_GenerateMipSubLevels(p) (p)->lpVtbl->GenerateMipSubLevels(p) +/* IDirect3DVolumeTexture9 macros */ +#define IDirect3DVolumeTexture9_GetLevelDesc(p,a,b) (p)->lpVtbl->GetLevelDesc(p,a,b) +#define IDirect3DVolumeTexture9_GetVolumeLevel(p,a,b) (p)->lpVtbl->GetVolumeLevel(p,a,b) +#define IDirect3DVolumeTexture9_LockBox(p,a,b,c,d) (p)->lpVtbl->LockBox(p,a,b,c,d) +#define IDirect3DVolumeTexture9_UnlockBox(p,a) (p)->lpVtbl->UnlockBox(p,a) +#define IDirect3DVolumeTexture9_AddDirtyBox(p,a) (p)->lpVtbl->AddDirtyBox(p,a) + +#endif /* __cplusplus */ + +#ifdef _WIN32 + +IDirect3D9 *WINAPI +Direct3DCreate9( UINT SDKVersion ); + +HRESULT WINAPI +Direct3DCreate9Ex( UINT SDKVersion, + IDirect3D9Ex **ppD3D9 ); + +void *WINAPI +Direct3DShaderValidatorCreate9( void ); + +int WINAPI +D3DPERF_BeginEvent( D3DCOLOR color, + LPCWSTR name ); + +int WINAPI +D3DPERF_EndEvent( void ); + +DWORD WINAPI +D3DPERF_GetStatus( void ); + +void WINAPI +D3DPERF_SetOptions( DWORD options ); + +BOOL WINAPI +D3DPERF_QueryRepeatFrame( void ); + +void WINAPI +D3DPERF_SetMarker( D3DCOLOR color, + LPCWSTR name ); + +void WINAPI +D3DPERF_SetRegion( D3DCOLOR color, + LPCWSTR name ); + +void WINAPI +DebugSetMute( void ); + +#endif + +#endif /* _D3D9_H_ */ diff --git a/mesalib/include/D3D9/d3d9caps.h b/mesalib/include/D3D9/d3d9caps.h new file mode 100644 index 0000000..0cce5d3 --- /dev/null +++ b/mesalib/include/D3D9/d3d9caps.h @@ -0,0 +1,387 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#ifndef _D3D9CAPS_H_ +#define _D3D9CAPS_H_ + +#include "d3d9types.h" + +/* Caps flags */ +#define D3DCAPS2_FULLSCREENGAMMA 0x00020000 +#define D3DCAPS2_CANCALIBRATEGAMMA 0x00100000 +#define D3DCAPS2_RESERVED 0x02000000 +#define D3DCAPS2_CANMANAGERESOURCE 0x10000000 +#define D3DCAPS2_DYNAMICTEXTURES 0x20000000 +#define D3DCAPS2_CANAUTOGENMIPMAP 0x40000000 +#define D3DCAPS2_CANSHARERESOURCE 0x80000000 + +#define D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 +#define D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080 +#define D3DCAPS3_COPY_TO_VIDMEM 0x00000100 +#define D3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200 +#define D3DCAPS3_DXVAHD 0x00000400 +#define D3DCAPS3_RESERVED 0x8000001F + +#define D3DPRESENT_INTERVAL_DEFAULT 0x00000000 +#define D3DPRESENT_INTERVAL_ONE 0x00000001 +#define D3DPRESENT_INTERVAL_TWO 0x00000002 +#define D3DPRESENT_INTERVAL_THREE 0x00000004 +#define D3DPRESENT_INTERVAL_FOUR 0x00000008 +#define D3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 + +#define D3DCURSORCAPS_COLOR 0x00000001 +#define D3DCURSORCAPS_LOWRES 0x00000002 + +#define D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010 +#define D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020 +#define D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040 +#define D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080 +#define D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100 +#define D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200 +#define D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400 +#define D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800 +#define D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000 +#define D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000 +#define D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000 +#define D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000 +#define D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000 +#define D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000 +#define D3DDEVCAPS_HWRASTERIZATION 0x00080000 +#define D3DDEVCAPS_PUREDEVICE 0x00100000 +#define D3DDEVCAPS_QUINTICRTPATCHES 0x00200000 +#define D3DDEVCAPS_RTPATCHES 0x00400000 +#define D3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000 +#define D3DDEVCAPS_NPATCHES 0x01000000 + +#define D3DPMISCCAPS_MASKZ 0x00000002 +#define D3DPMISCCAPS_CULLNONE 0x00000010 +#define D3DPMISCCAPS_CULLCW 0x00000020 +#define D3DPMISCCAPS_CULLCCW 0x00000040 +#define D3DPMISCCAPS_COLORWRITEENABLE 0x00000080 +#define D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100 +#define D3DPMISCCAPS_CLIPTLVERTS 0x00000200 +#define D3DPMISCCAPS_TSSARGTEMP 0x00000400 +#define D3DPMISCCAPS_BLENDOP 0x00000800 +#define D3DPMISCCAPS_NULLREFERENCE 0x00001000 +#define D3DPMISCCAPS_INDEPENDENTWRITEMASKS 0x00004000 +#define D3DPMISCCAPS_PERSTAGECONSTANT 0x00008000 +#define D3DPMISCCAPS_FOGANDSPECULARALPHA 0x00010000 +#define D3DPMISCCAPS_SEPARATEALPHABLEND 0x00020000 +#define D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 +#define D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 +#define D3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 +#define D3DPMISCCAPS_POSTBLENDSRGBCONVERT 0x00200000 + +#define D3DPRASTERCAPS_DITHER 0x00000001 +#define D3DPRASTERCAPS_ZTEST 0x00000010 +#define D3DPRASTERCAPS_FOGVERTEX 0x00000080 +#define D3DPRASTERCAPS_FOGTABLE 0x00000100 +#define D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 +#define D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 +#define D3DPRASTERCAPS_FOGRANGE 0x00010000 +#define D3DPRASTERCAPS_ANISOTROPY 0x00020000 +#define D3DPRASTERCAPS_WBUFFER 0x00040000 +#define D3DPRASTERCAPS_WFOG 0x00100000 +#define D3DPRASTERCAPS_ZFOG 0x00200000 +#define D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000 +#define D3DPRASTERCAPS_SCISSORTEST 0x01000000 +#define D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS 0x02000000 +#define D3DPRASTERCAPS_DEPTHBIAS 0x04000000 +#define D3DPRASTERCAPS_MULTISAMPLE_TOGGLE 0x08000000 + +#define D3DPCMPCAPS_NEVER 0x00000001 +#define D3DPCMPCAPS_LESS 0x00000002 +#define D3DPCMPCAPS_EQUAL 0x00000004 +#define D3DPCMPCAPS_LESSEQUAL 0x00000008 +#define D3DPCMPCAPS_GREATER 0x00000010 +#define D3DPCMPCAPS_NOTEQUAL 0x00000020 +#define D3DPCMPCAPS_GREATEREQUAL 0x00000040 +#define D3DPCMPCAPS_ALWAYS 0x00000080 + +#define D3DPBLENDCAPS_ZERO 0x00000001 +#define D3DPBLENDCAPS_ONE 0x00000002 +#define D3DPBLENDCAPS_SRCCOLOR 0x00000004 +#define D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 +#define D3DPBLENDCAPS_SRCALPHA 0x00000010 +#define D3DPBLENDCAPS_INVSRCALPHA 0x00000020 +#define D3DPBLENDCAPS_DESTALPHA 0x00000040 +#define D3DPBLENDCAPS_INVDESTALPHA 0x00000080 +#define D3DPBLENDCAPS_DESTCOLOR 0x00000100 +#define D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 +#define D3DPBLENDCAPS_SRCALPHASAT 0x00000400 +#define D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 +#define D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 +#define D3DPBLENDCAPS_BLENDFACTOR 0x00002000 +#ifndef D3D_DISABLE_9EX +# define D3DPBLENDCAPS_SRCCOLOR2 0x00004000 +# define D3DPBLENDCAPS_INVSRCCOLOR2 0x00008000 +#endif + +#define D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008 +#define D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200 +#define D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000 +#define D3DPSHADECAPS_FOGGOURAUD 0x00080000 + +#define D3DPTEXTURECAPS_PERSPECTIVE 0x00000001 +#define D3DPTEXTURECAPS_POW2 0x00000002 +#define D3DPTEXTURECAPS_ALPHA 0x00000004 +#define D3DPTEXTURECAPS_SQUAREONLY 0x00000020 +#define D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040 +#define D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080 +#define D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100 +#define D3DPTEXTURECAPS_PROJECTED 0x00000400 +#define D3DPTEXTURECAPS_CUBEMAP 0x00000800 +#define D3DPTEXTURECAPS_VOLUMEMAP 0x00002000 +#define D3DPTEXTURECAPS_MIPMAP 0x00004000 +#define D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000 +#define D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000 +#define D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000 +#define D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000 +#define D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000 + +#define D3DPTFILTERCAPS_MINFPOINT 0x00000100 +#define D3DPTFILTERCAPS_MINFLINEAR 0x00000200 +#define D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400 +#define D3DPTFILTERCAPS_MINFPYRAMIDALQUAD 0x00000800 +#define D3DPTFILTERCAPS_MINFGAUSSIANQUAD 0x00001000 +#define D3DPTFILTERCAPS_MIPFPOINT 0x00010000 +#define D3DPTFILTERCAPS_MIPFLINEAR 0x00020000 +#define D3DPTFILTERCAPS_MAGFPOINT 0x01000000 +#define D3DPTFILTERCAPS_MAGFLINEAR 0x02000000 +#define D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000 +#define D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD 0x08000000 +#define D3DPTFILTERCAPS_MAGFGAUSSIANQUAD 0x10000000 + +#define D3DPTADDRESSCAPS_WRAP 0x00000001 +#define D3DPTADDRESSCAPS_MIRROR 0x00000002 +#define D3DPTADDRESSCAPS_CLAMP 0x00000004 +#define D3DPTADDRESSCAPS_BORDER 0x00000008 +#define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +#define D3DPTADDRESSCAPS_MIRRORONCE 0x00000020 + +#define D3DLINECAPS_TEXTURE 0x00000001 +#define D3DLINECAPS_ZTEST 0x00000002 +#define D3DLINECAPS_BLEND 0x00000004 +#define D3DLINECAPS_ALPHACMP 0x00000008 +#define D3DLINECAPS_FOG 0x00000010 +#define D3DLINECAPS_ANTIALIAS 0x00000020 + +#define D3DSTENCILCAPS_KEEP 0x00000001 +#define D3DSTENCILCAPS_ZERO 0x00000002 +#define D3DSTENCILCAPS_REPLACE 0x00000004 +#define D3DSTENCILCAPS_INCRSAT 0x00000008 +#define D3DSTENCILCAPS_DECRSAT 0x00000010 +#define D3DSTENCILCAPS_INVERT 0x00000020 +#define D3DSTENCILCAPS_INCR 0x00000040 +#define D3DSTENCILCAPS_DECR 0x00000080 +#define D3DSTENCILCAPS_TWOSIDED 0x00000100 + +#define D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000FFFF +#define D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000 +#define D3DFVFCAPS_PSIZE 0x00100000 + +#define D3DTEXOPCAPS_DISABLE 0x00000001 +#define D3DTEXOPCAPS_SELECTARG1 0x00000002 +#define D3DTEXOPCAPS_SELECTARG2 0x00000004 +#define D3DTEXOPCAPS_MODULATE 0x00000008 +#define D3DTEXOPCAPS_MODULATE2X 0x00000010 +#define D3DTEXOPCAPS_MODULATE4X 0x00000020 +#define D3DTEXOPCAPS_ADD 0x00000040 +#define D3DTEXOPCAPS_ADDSIGNED 0x00000080 +#define D3DTEXOPCAPS_ADDSIGNED2X 0x00000100 +#define D3DTEXOPCAPS_SUBTRACT 0x00000200 +#define D3DTEXOPCAPS_ADDSMOOTH 0x00000400 +#define D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 +#define D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 +#define D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 +#define D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 +#define D3DTEXOPCAPS_PREMODULATE 0x00010000 +#define D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 +#define D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 +#define D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 +#define D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 +#define D3DTEXOPCAPS_BUMPENVMAP 0x00200000 +#define D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 +#define D3DTEXOPCAPS_DOTPRODUCT3 0x00800000 +#define D3DTEXOPCAPS_MULTIPLYADD 0x01000000 +#define D3DTEXOPCAPS_LERP 0x02000000 + +#define D3DVTXPCAPS_TEXGEN 0x00000001 +#define D3DVTXPCAPS_MATERIALSOURCE7 0x00000002 +#define D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008 +#define D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 +#define D3DVTXPCAPS_LOCALVIEWER 0x00000020 +#define D3DVTXPCAPS_TWEENING 0x00000040 +#define D3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100 +#define D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200 + +#define D3DDEVCAPS2_STREAMOFFSET 0x00000001 +#define D3DDEVCAPS2_DMAPNPATCH 0x00000002 +#define D3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004 +#define D3DDEVCAPS2_ADAPTIVETESSNPATCH 0x00000008 +#define D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES 0x00000010 +#define D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH 0x00000020 +#define D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET 0x00000040 + +#define D3DDTCAPS_UBYTE4 0x00000001 +#define D3DDTCAPS_UBYTE4N 0x00000002 +#define D3DDTCAPS_SHORT2N 0x00000004 +#define D3DDTCAPS_SHORT4N 0x00000008 +#define D3DDTCAPS_USHORT2N 0x00000010 +#define D3DDTCAPS_USHORT4N 0x00000020 +#define D3DDTCAPS_UDEC3 0x00000040 +#define D3DDTCAPS_DEC3N 0x00000080 +#define D3DDTCAPS_FLOAT16_2 0x00000100 +#define D3DDTCAPS_FLOAT16_4 0x00000200 + + +#define D3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define D3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define D3DVS20_MAX_NUMTEMPS 32 +#define D3DVS20_MIN_NUMTEMPS 12 +#define D3DVS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define D3DVS20_MIN_STATICFLOWCONTROLDEPTH 1 + +#define D3DVS20CAPS_PREDICATION (1 << 0) + +#define D3DPS20CAPS_ARBITRARYSWIZZLE (1 << 0) +#define D3DPS20CAPS_GRADIENTINSTRUCTIONS (1 << 1) +#define D3DPS20CAPS_PREDICATION (1 << 2) +#define D3DPS20CAPS_NODEPENDENTREADLIMIT (1 << 3) +#define D3DPS20CAPS_NOTEXINSTRUCTIONLIMIT (1 << 4) + +#define D3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH 24 +#define D3DPS20_MIN_DYNAMICFLOWCONTROLDEPTH 0 +#define D3DPS20_MAX_NUMTEMPS 32 +#define D3DPS20_MIN_NUMTEMPS 12 +#define D3DPS20_MAX_STATICFLOWCONTROLDEPTH 4 +#define D3DPS20_MIN_STATICFLOWCONTROLDEPTH 0 +#define D3DPS20_MAX_NUMINSTRUCTIONSLOTS 512 +#define D3DPS20_MIN_NUMINSTRUCTIONSLOTS 96 + +#define D3DMIN30SHADERINSTRUCTIONS 512 +#define D3DMAX30SHADERINSTRUCTIONS 32768 + +/* Structs */ +typedef struct _D3DVSHADERCAPS2_0 { + DWORD Caps; + INT DynamicFlowControlDepth; + INT NumTemps; + INT StaticFlowControlDepth; +} D3DVSHADERCAPS2_0, *PD3DVSHADERCAPS2_0, *LPD3DVSHADERCAPS2_0; + +typedef struct _D3DPSHADERCAPS2_0 { + DWORD Caps; + INT DynamicFlowControlDepth; + INT NumTemps; + INT StaticFlowControlDepth; + INT NumInstructionSlots; +} D3DPSHADERCAPS2_0, *PD3DPSHADERCAPS2_0, *LPD3DPSHADERCAPS2_0; + +typedef struct _D3DCAPS9 { + D3DDEVTYPE DeviceType; + UINT AdapterOrdinal; + DWORD Caps; + DWORD Caps2; + DWORD Caps3; + DWORD PresentationIntervals; + DWORD CursorCaps; + DWORD DevCaps; + DWORD PrimitiveMiscCaps; + DWORD RasterCaps; + DWORD ZCmpCaps; + DWORD SrcBlendCaps; + DWORD DestBlendCaps; + DWORD AlphaCmpCaps; + DWORD ShadeCaps; + DWORD TextureCaps; + DWORD TextureFilterCaps; + DWORD CubeTextureFilterCaps; + DWORD VolumeTextureFilterCaps; + DWORD TextureAddressCaps; + DWORD VolumeTextureAddressCaps; + DWORD LineCaps; + DWORD MaxTextureWidth; + DWORD MaxTextureHeight; + DWORD MaxVolumeExtent; + DWORD MaxTextureRepeat; + DWORD MaxTextureAspectRatio; + DWORD MaxAnisotropy; + float MaxVertexW; + float GuardBandLeft; + float GuardBandTop; + float GuardBandRight; + float GuardBandBottom; + float ExtentsAdjust; + DWORD StencilCaps; + DWORD FVFCaps; + DWORD TextureOpCaps; + DWORD MaxTextureBlendStages; + DWORD MaxSimultaneousTextures; + DWORD VertexProcessingCaps; + DWORD MaxActiveLights; + DWORD MaxUserClipPlanes; + DWORD MaxVertexBlendMatrices; + DWORD MaxVertexBlendMatrixIndex; + float MaxPointSize; + DWORD MaxPrimitiveCount; + DWORD MaxVertexIndex; + DWORD MaxStreams; + DWORD MaxStreamStride; + DWORD VertexShaderVersion; + DWORD MaxVertexShaderConst; + DWORD PixelShaderVersion; + float PixelShader1xMaxValue; + DWORD DevCaps2; + float MaxNpatchTessellationLevel; + DWORD Reserved5; + UINT MasterAdapterOrdinal; + UINT AdapterOrdinalInGroup; + UINT NumberOfAdaptersInGroup; + DWORD DeclTypes; + DWORD NumSimultaneousRTs; + DWORD StretchRectFilterCaps; + D3DVSHADERCAPS2_0 VS20Caps; + D3DPSHADERCAPS2_0 PS20Caps; + DWORD VertexTextureFilterCaps; + DWORD MaxVShaderInstructionsExecuted; + DWORD MaxPShaderInstructionsExecuted; + DWORD MaxVertexShader30InstructionSlots; + DWORD MaxPixelShader30InstructionSlots; +} D3DCAPS9, *PD3DCAPS9, *LPD3DCAPS9; + +typedef struct _D3DCONTENTPROTECTIONCAPS { + DWORD Caps; + GUID KeyExchangeType; + UINT BufferAlignmentStart; + UINT BlockAlignmentSize; + ULONGLONG ProtectedMemorySize; +} D3DCONTENTPROTECTIONCAPS, *PD3DCONTENTPROTECTIONCAPS, *LPD3DCONTENTPROTECTIONCAPS; + +typedef struct _D3DOVERLAYCAPS { + UINT Caps; + UINT MaxOverlayDisplayWidth; + UINT MaxOverlayDisplayHeight; +} D3DOVERLAYCAPS, *PD3DOVERLAYCAPS, *LPD3DOVERLAYCAPS; + +#endif /* _D3D9CAPS_H_ */ diff --git a/mesalib/include/D3D9/d3d9types.h b/mesalib/include/D3D9/d3d9types.h new file mode 100644 index 0000000..0a8f9e5 --- /dev/null +++ b/mesalib/include/D3D9/d3d9types.h @@ -0,0 +1,1797 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#ifndef _D3D9TYPES_H_ +#define _D3D9TYPES_H_ + +#ifdef _WIN32 +#include <windows.h> +#else /* _WIN32 */ +#include <stdint.h> + +#ifndef NULL +#define NULL 0 +#endif + +/******************************************************** + * Windows types * + ********************************************************/ +/* Function macros */ +#define FAILED(x) ((HRESULT)(x) < 0) +#define SUCCEEDED(x) ((HRESULT)(x) >= 0) + +#define MAKE_HRESULT(sev,fac,code) \ + ( \ + ((HRESULT)(sev) << 31) | \ + ((HRESULT)(fac) << 16) | \ + (HRESULT)(code) \ + ) + +/* Windows errors */ +#define E_OUTOFMEMORY MAKE_HRESULT(1, 0x007, 14) +#define E_NOINTERFACE MAKE_HRESULT(1, 0x000, 0x4002) +#define E_POINTER MAKE_HRESULT(1, 0x000, 0x4003) + +#define S_OK ((HRESULT)0) +#define S_FALSE ((HRESULT)1) + +/* WORD types */ +typedef uint8_t BYTE; +typedef uint16_t WORD; +typedef uint32_t DWORD; + +/* Renamed types */ +typedef int BOOL; +#ifndef FALSE +#define FALSE 0 +#define TRUE (!FALSE) +#endif + +typedef uint32_t UINT32; +typedef uint64_t UINT64; + +typedef unsigned short USHORT; +typedef unsigned int UINT; +typedef unsigned int ULONG; +typedef unsigned long long ULONGLONG; + +typedef short SHORT; +typedef int INT; +typedef int LONG; +typedef long long LONGLONG; +typedef float FLOAT; + +/* Windows types */ +typedef void *HANDLE; +typedef int32_t HRESULT; +typedef HANDLE HWND; +typedef HANDLE HMONITOR; +typedef HANDLE HDC; + +/* Unions */ +typedef union { + struct { + DWORD LowPart; + LONG HighPart; + }; + + struct { + DWORD LowPart; + LONG HighPart; + } u; + + LONGLONG QuadPart; +} LARGE_INTEGER, *LPLARGE_INTEGER; + +/* Structs */ + +typedef struct _GUID { + DWORD Data1; + WORD Data2; + WORD Data3; + BYTE Data4[8]; +} GUID, IID, *LPGUID, *REFGUID, *REFIID; + +typedef struct _LUID { + DWORD LowPart; + LONG HighPart; +} LUID, *LPLUID, *PLUID; + +typedef struct _PALETTEENTRY { + BYTE peRed; + BYTE peGreen; + BYTE peBlue; + BYTE peFlags; +} PALETTEENTRY, *LPPALETTEENTRY; + +typedef struct _POINT { + LONG x; + LONG y; +} POINT, *LPPOINT; + +typedef struct _RECT { + LONG left; + LONG top; + LONG right; + LONG bottom; +} RECT, *LPRECT; + +typedef struct _RGNDATAHEADER { + DWORD dwSize; + DWORD iType; + DWORD nCount; + DWORD nRgnSize; + RECT rcBound; +} RGNDATAHEADER, *LPRGNDATAHEADER; + +typedef struct _RGNDATA { + RGNDATAHEADER rdh; + char Buffer[1]; +} RGNDATA, *LPRGNDATA; +#endif /* _WIN32 */ + +#ifndef MAKEFOURCC +#define MAKEFOURCC(a, b, c, d) \ + ( \ + (DWORD)(BYTE)(a) | \ + ((DWORD)(BYTE)(b) << 8) | \ + ((DWORD)(BYTE)(c) << 16) | \ + ((DWORD)(BYTE)(d) << 24) \ + ) +#endif /* MAKEFOURCC */ + + +#define D3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 +#define D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 +#define D3DPRESENTFLAG_DEVICECLIP 0x00000004 +#define D3DPRESENTFLAG_VIDEO 0x00000010 +#define D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 +#define D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 +#define D3DPRESENTFLAG_OVERLAY_LIMITEDRGB 0x00000080 +#define D3DPRESENTFLAG_OVERLAY_YCbCr_BT709 0x00000100 +#define D3DPRESENTFLAG_OVERLAY_YCbCr_xvYCC 0x00000200 +#define D3DPRESENTFLAG_RESTRICTED_CONTENT 0x00000400 +#define D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER 0x00000800 + + +#ifdef WINAPI +#undef WINAPI +#endif /* WINAPI*/ + +#if defined(__x86_64__) || defined(_M_X64) +#define WINAPI __attribute__((ms_abi)) +#else /* x86_64 */ +#define WINAPI __attribute__((__stdcall__)) +#endif /* x86_64 */ + +/* Implementation caps */ +#define D3DPRESENT_BACK_BUFFERS_MAX 3 +#define D3DPRESENT_BACK_BUFFERS_MAX_EX 30 + +/* Functions */ +#define MAKE_D3DHRESULT(code) MAKE_HRESULT(1, 0x876, code) +#define MAKE_D3DSTATUS(code) MAKE_HRESULT(0, 0x876, code) + +/* SDK version */ +#define D3D_SDK_VERSION 32 + +/* Adapter */ +#define D3DADAPTER_DEFAULT 0 + +/******************************************************** + * Return codes * + ********************************************************/ +#define D3D_OK S_OK +#define D3DOK_NOAUTOGEN MAKE_D3DSTATUS(2159) +#define D3DERR_OUTOFVIDEOMEMORY MAKE_D3DHRESULT(380) +#define D3DERR_WASSTILLDRAWING MAKE_D3DHRESULT(540) +#define D3DERR_WRONGTEXTUREFORMAT MAKE_D3DHRESULT(2072) +#define D3DERR_UNSUPPORTEDCOLOROPERATION MAKE_D3DHRESULT(2073) +#define D3DERR_UNSUPPORTEDCOLORARG MAKE_D3DHRESULT(2074) +#define D3DERR_UNSUPPORTEDALPHAOPERATION MAKE_D3DHRESULT(2075) +#define D3DERR_UNSUPPORTEDALPHAARG MAKE_D3DHRESULT(2076) +#define D3DERR_TOOMANYOPERATIONS MAKE_D3DHRESULT(2077) +#define D3DERR_CONFLICTINGTEXTUREFILTER MAKE_D3DHRESULT(2078) +#define D3DERR_UNSUPPORTEDFACTORVALUE MAKE_D3DHRESULT(2079) +#define D3DERR_CONFLICTINGRENDERSTATE MAKE_D3DHRESULT(2081) +#define D3DERR_UNSUPPORTEDTEXTUREFILTER MAKE_D3DHRESULT(2082) +#define D3DERR_CONFLICTINGTEXTUREPALETTE MAKE_D3DHRESULT(2086) +#define D3DERR_DRIVERINTERNALERROR MAKE_D3DHRESULT(2087) +#define D3DERR_NOTFOUND MAKE_D3DHRESULT(2150) +#define D3DERR_MOREDATA MAKE_D3DHRESULT(2151) +#define D3DERR_DEVICELOST MAKE_D3DHRESULT(2152) +#define D3DERR_DEVICENOTRESET MAKE_D3DHRESULT(2153) +#define D3DERR_NOTAVAILABLE MAKE_D3DHRESULT(2154) +#define D3DERR_INVALIDDEVICE MAKE_D3DHRESULT(2155) +#define D3DERR_INVALIDCALL MAKE_D3DHRESULT(2156) +#define D3DERR_DRIVERINVALIDCALL MAKE_D3DHRESULT(2157) + +/******************************************************** + * Bitmasks * + *******************************************************/ +/* IDirect3DDevice9::Clear */ +#define D3DCLEAR_TARGET 0x00000001 +#define D3DCLEAR_ZBUFFER 0x00000002 +#define D3DCLEAR_STENCIL 0x00000004 + +/* Usage */ +/* http://msdn.microsoft.com/en-us/library/ee416659(VS.85).aspx */ +#define D3DUSAGE_RENDERTARGET 0x00000001 +#define D3DUSAGE_DEPTHSTENCIL 0x00000002 +#define D3DUSAGE_WRITEONLY 0x00000008 +#define D3DUSAGE_SOFTWAREPROCESSING 0x00000010 +#define D3DUSAGE_DONOTCLIP 0x00000020 +#define D3DUSAGE_POINTS 0x00000040 +#define D3DUSAGE_RTPATCHES 0x00000080 +#define D3DUSAGE_NPATCHES 0x00000100 +#define D3DUSAGE_DYNAMIC 0x00000200 +#define D3DUSAGE_AUTOGENMIPMAP 0x00000400 +#ifndef D3D_DISABLE_9EX +#define D3DUSAGE_RESTRICTED_CONTENT 0x00000800 +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER 0x00001000 +#define D3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 +#endif +#define D3DUSAGE_DMAP 0x00004000 +#define D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000 +#define D3DUSAGE_QUERY_SRGBREAD 0x00010000 +#define D3DUSAGE_QUERY_FILTER 0x00020000 +#define D3DUSAGE_QUERY_SRGBWRITE 0x00040000 +#define D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING 0x00080000 +#define D3DUSAGE_QUERY_VERTEXTEXTURE 0x00100000 +#define D3DUSAGE_QUERY_WRAPANDMIP 0x00200000 +#ifndef D3D_DISABLE_9EX +#define D3DUSAGE_NONSECURE 0x00800000 +#define D3DUSAGE_TEXTAPI 0x10000000 +#endif + +/* Buffer locking */ +/* http://msdn.microsoft.com/en-us/library/ee416503(VS.85).aspx */ +#define D3DLOCK_READONLY 0x00000010 +#define D3DLOCK_NOSYSLOCK 0x00000800 +#define D3DLOCK_NOOVERWRITE 0x00001000 +#define D3DLOCK_DISCARD 0x00002000 +#define D3DLOCK_DONOTWAIT 0x00004000 +#define D3DLOCK_NO_DIRTY_UPDATE 0x00008000 + +/* FVF */ +/* http://msdn.microsoft.com/en-us/library/ee416490(VS.85).aspx */ +/* http://msdn.microsoft.com/en-us/library/ms791638.aspx */ +#define D3DFVF_XYZ 0x00000002 +#define D3DFVF_XYZRHW 0x00000004 +#define D3DFVF_XYZB1 0x00000006 +#define D3DFVF_XYZB2 0x00000008 +#define D3DFVF_XYZB3 0x0000000A +#define D3DFVF_XYZB4 0x0000000C +#define D3DFVF_XYZB5 0x0000000E +#define D3DFVF_XYZW 0x00004002 +#define D3DFVF_POSITION_MASK 0x0000400E + +#define D3DFVF_NORMAL 0x00000010 +#define D3DFVF_PSIZE 0x00000020 +#define D3DFVF_DIFFUSE 0x00000040 +#define D3DFVF_SPECULAR 0x00000080 + +#define D3DFVF_TEX0 0x00000000 +#define D3DFVF_TEX1 0x00000100 +#define D3DFVF_TEX2 0x00000200 +#define D3DFVF_TEX3 0x00000300 +#define D3DFVF_TEX4 0x00000400 +#define D3DFVF_TEX5 0x00000500 +#define D3DFVF_TEX6 0x00000600 +#define D3DFVF_TEX7 0x00000700 +#define D3DFVF_TEX8 0x00000800 +#define D3DFVF_TEXCOUNT_MASK 0x00000F00 +#define D3DFVF_TEXCOUNT_SHIFT 8 +#define D3DFVF_TEXTUREFORMAT1 0x00000003 +#define D3DFVF_TEXTUREFORMAT2 0x00000000 +#define D3DFVF_TEXTUREFORMAT3 0x00000001 +#define D3DFVF_TEXTUREFORMAT4 0x00000002 + +#define D3DFVF_POSITION_MASK 0x0000400E +#define D3DFVF_TEXCOUNT_MASK 0x00000F00 +#define D3DFVF_TEXCOUNT_SHIFT 8 + +#define D3DFVF_LASTBETA_UBYTE4 0x00001000 +#define D3DFVF_LASTBETA_D3DCOLOR 0x00008000 + +#define D3DFVF_RESERVED0 0x00000001 +#define D3DFVF_RESERVED2 0x00006000 + +#define D3DTA_SELECTMASK 0x0000000f +#define D3DTA_DIFFUSE 0x00000000 +#define D3DTA_CURRENT 0x00000001 +#define D3DTA_TEXTURE 0x00000002 +#define D3DTA_TFACTOR 0x00000003 +#define D3DTA_SPECULAR 0x00000004 +#define D3DTA_TEMP 0x00000005 +#define D3DTA_CONSTANT 0x00000006 +#define D3DTA_COMPLEMENT 0x00000010 +#define D3DTA_ALPHAREPLICATE 0x00000020 + +#define D3DSPD_IUNKNOWN 0x00000001 + +#define D3DPRESENT_DONOTWAIT 0x00000001 +#define D3DPRESENT_LINEAR_CONTENT 0x00000002 + +#define D3DCREATE_FPU_PRESERVE 0x00000002 +#define D3DCREATE_MULTITHREADED 0x00000004 +#define D3DCREATE_PUREDEVICE 0x00000010 +#define D3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020 +#define D3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040 +#define D3DCREATE_MIXED_VERTEXPROCESSING 0x00000080 +#define D3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100 +#define D3DCREATE_ADAPTERGROUP_DEVICE 0x00000200 + +#define D3DSTREAMSOURCE_INDEXEDDATA (1 << 30) +#define D3DSTREAMSOURCE_INSTANCEDATA (2 << 30) + +/******************************************************** + * Function macros * + *******************************************************/ + +/* Colors */ +#define D3DCOLOR_ARGB(a,r,g,b) \ + ((D3DCOLOR)( \ + (((a) & 0xFF) << 24) | \ + (((r) & 0xFF) << 16) | \ + (((g) & 0xFF) << 8) | \ + ((b) & 0xFF) \ + )) + +#define D3DCOLOR_RGBA(r,g,b,a) D3DCOLOR_ARGB(a,r,g,b) +#define D3DCOLOR_XRGB(r,g,b) D3DCOLOR_ARGB(0xFF,r,g,b) +#define D3DCOLOR_AYUV(a,y,u,v) D3DCOLOR_ARGB(a,y,u,v) +#define D3DCOLOR_XYUV(y,u,v) D3DCOLOR_ARGB(0xFF,y,u,v) + +#define D3DCOLOR_COLORVALUE(r,g,b,a) \ + D3DCOLOR_RGBA( \ + (DWORD)((r) * 255.0f), \ + (DWORD)((g) * 255.0f), \ + (DWORD)((b) * 255.0f), \ + (DWORD)((a) * 255.0f) \ + ) + +/* Shaders */ +#define D3DDECL_END() { 0xFF, 0, D3DDECLTYPE_UNUSED, 0, 0, 0 } + +/***************************************************************************** + * Typedefs * + *****************************************************************************/ +typedef DWORD D3DCOLOR; + +/***************************************************************************** + * Enums * + *****************************************************************************/ +typedef enum D3DDISPLAYROTATION { + D3DDISPLAYROTATION_IDENTITY = 1, + D3DDISPLAYROTATION_90 = 2, + D3DDISPLAYROTATION_180 = 3, + D3DDISPLAYROTATION_270 = 4 +} D3DDISPLAYROTATION; + +typedef enum D3DSCANLINEORDERING { + D3DSCANLINEORDERING_UNKNOWN = 0, + D3DSCANLINEORDERING_PROGRESSIVE = 1, + D3DSCANLINEORDERING_INTERLACED = 2 +} D3DSCANLINEORDERING; + +typedef enum _D3DAUTHENTICATEDCHANNELTYPE { + D3DAUTHENTICATEDCHANNEL_D3D9 = 1, + D3DAUTHENTICATEDCHANNEL_DRIVER_SOFTWARE = 2, + D3DAUTHENTICATEDCHANNEL_DRIVER_HARDWARE = 3 +} D3DAUTHENTICATEDCHANNELTYPE; + +typedef enum _D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE { + PROCESSIDTYPE_UNKNOWN = 0, + PROCESSIDTYPE_DWM = 1, + PROCESSIDTYPE_HANDLE = 2 +} D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE; + +typedef enum _D3DBACKBUFFER_TYPE { + D3DBACKBUFFER_TYPE_MONO = 0, + D3DBACKBUFFER_TYPE_LEFT = 1, + D3DBACKBUFFER_TYPE_RIGHT = 2 +} D3DBACKBUFFER_TYPE; + +typedef enum _D3DBASISTYPE { + D3DBASIS_BEZIER = 0, + D3DBASIS_BSPLINE = 1, + D3DBASIS_CATMULL_ROM = 2 +} D3DBASISTYPE; + +typedef enum _D3DBLEND { + D3DBLEND_ZERO = 1, + D3DBLEND_ONE = 2, + D3DBLEND_SRCCOLOR = 3, + D3DBLEND_INVSRCCOLOR = 4, + D3DBLEND_SRCALPHA = 5, + D3DBLEND_INVSRCALPHA = 6, + D3DBLEND_DESTALPHA = 7, + D3DBLEND_INVDESTALPHA = 8, + D3DBLEND_DESTCOLOR = 9, + D3DBLEND_INVDESTCOLOR = 10, + D3DBLEND_SRCALPHASAT = 11, + D3DBLEND_BOTHSRCALPHA = 12, + D3DBLEND_BOTHINVSRCALPHA = 13, + D3DBLEND_BLENDFACTOR = 14, + D3DBLEND_INVBLENDFACTOR = 15, + D3DBLEND_SRCCOLOR2 = 16, + D3DBLEND_INVSRCCOLOR2 = 17 +} D3DBLEND; + +typedef enum _D3DBLENDOP { + D3DBLENDOP_ADD = 1, + D3DBLENDOP_SUBTRACT = 2, + D3DBLENDOP_REVSUBTRACT = 3, + D3DBLENDOP_MIN = 4, + D3DBLENDOP_MAX = 5 +} D3DBLENDOP; + +typedef enum _D3DBUSTYPE { + D3DBUSTYPE_OTHER = 0x00000000, + D3DBUSTYPE_PCI = 0x00000001, + D3DBUSTYPE_PCIX = 0x00000002, + D3DBUSTYPE_PCIEXPRESS = 0x00000003, + D3DBUSTYPE_AGP = 0x00000004, + D3DBUSIMPL_MODIFIER_INSIDE_OF_CHIPSET = 0x00010000, + D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP = 0x00020000, + D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET = 0x00030000, + D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR = 0x00040000, + D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE = 0x00050000, + D3DBUSIMPL_MODIFIER_NON_STANDARD = 0x80000000 +} D3DBUSTYPE; + +typedef enum _D3DCMPFUNC { + D3DCMP_NEVER = 1, + D3DCMP_LESS = 2, + D3DCMP_EQUAL = 3, + D3DCMP_LESSEQUAL = 4, + D3DCMP_GREATER = 5, + D3DCMP_NOTEQUAL = 6, + D3DCMP_GREATEREQUAL = 7, + D3DCMP_ALWAYS = 8 +} D3DCMPFUNC; + +typedef enum _D3DCOMPOSERECTSOP{ + D3DCOMPOSERECTS_COPY = 1, + D3DCOMPOSERECTS_OR = 2, + D3DCOMPOSERECTS_AND = 3, + D3DCOMPOSERECTS_NEG = 4 +} D3DCOMPOSERECTSOP; + +typedef enum _D3DCUBEMAP_FACES { + D3DCUBEMAP_FACE_POSITIVE_X = 0, + D3DCUBEMAP_FACE_NEGATIVE_X = 1, + D3DCUBEMAP_FACE_POSITIVE_Y = 2, + D3DCUBEMAP_FACE_NEGATIVE_Y = 3, + D3DCUBEMAP_FACE_POSITIVE_Z = 4, + D3DCUBEMAP_FACE_NEGATIVE_Z = 5 +} D3DCUBEMAP_FACES; + +typedef enum _D3DCULL { + D3DCULL_NONE = 1, + D3DCULL_CW = 2, + D3DCULL_CCW = 3 +} D3DCULL; + +typedef enum _D3DDEBUGMONITORTOKENS { + D3DDMT_ENABLE = 0, + D3DDMT_DISABLE = 1 +} D3DDEBUGMONITORTOKENS; + +typedef enum _D3DDECLMETHOD { + D3DDECLMETHOD_DEFAULT = 0, + D3DDECLMETHOD_PARTIALU = 1, + D3DDECLMETHOD_PARTIALV = 2, + D3DDECLMETHOD_CROSSUV = 3, + D3DDECLMETHOD_UV = 4, + D3DDECLMETHOD_LOOKUP = 5, + D3DDECLMETHOD_LOOKUPPRESAMPLED = 6 +} D3DDECLMETHOD; + +typedef enum _D3DDECLTYPE { + D3DDECLTYPE_FLOAT1 = 0, + D3DDECLTYPE_FLOAT2 = 1, + D3DDECLTYPE_FLOAT3 = 2, + D3DDECLTYPE_FLOAT4 = 3, + D3DDECLTYPE_D3DCOLOR = 4, + D3DDECLTYPE_UBYTE4 = 5, + D3DDECLTYPE_SHORT2 = 6, + D3DDECLTYPE_SHORT4 = 7, + D3DDECLTYPE_UBYTE4N = 8, + D3DDECLTYPE_SHORT2N = 9, + D3DDECLTYPE_SHORT4N = 10, + D3DDECLTYPE_USHORT2N = 11, + D3DDECLTYPE_USHORT4N = 12, + D3DDECLTYPE_UDEC3 = 13, + D3DDECLTYPE_DEC3N = 14, + D3DDECLTYPE_FLOAT16_2 = 15, + D3DDECLTYPE_FLOAT16_4 = 16, + D3DDECLTYPE_UNUSED = 17 +} D3DDECLTYPE; + +typedef enum _D3DDECLUSAGE { + D3DDECLUSAGE_POSITION = 0, + D3DDECLUSAGE_BLENDWEIGHT = 1, + D3DDECLUSAGE_BLENDINDICES = 2, + D3DDECLUSAGE_NORMAL = 3, + D3DDECLUSAGE_PSIZE = 4, + D3DDECLUSAGE_TEXCOORD = 5, + D3DDECLUSAGE_TANGENT = 6, + D3DDECLUSAGE_BINORMAL = 7, + D3DDECLUSAGE_TESSFACTOR = 8, + D3DDECLUSAGE_POSITIONT = 9, + D3DDECLUSAGE_COLOR = 10, + D3DDECLUSAGE_FOG = 11, + D3DDECLUSAGE_DEPTH = 12, + D3DDECLUSAGE_SAMPLE = 13 +} D3DDECLUSAGE; + +typedef enum _D3DDEGREETYPE { + D3DDEGREE_LINEAR = 1, + D3DDEGREE_QUADRATIC = 2, + D3DDEGREE_CUBIC = 3, + D3DDEGREE_QUINTIC = 5 +} D3DDEGREETYPE; + +typedef enum _D3DDEVTYPE { + D3DDEVTYPE_HAL = 1, + D3DDEVTYPE_REF = 2, + D3DDEVTYPE_SW = 3, + D3DDEVTYPE_NULLREF = 4 +} D3DDEVTYPE; + +typedef enum _D3DFILLMODE { + D3DFILL_POINT = 1, + D3DFILL_WIREFRAME = 2, + D3DFILL_SOLID = 3 +} D3DFILLMODE; + +typedef enum _D3DFOGMODE { + D3DFOG_NONE = 0, + D3DFOG_EXP = 1, + D3DFOG_EXP2 = 2, + D3DFOG_LINEAR = 3 +} D3DFOGMODE; + +typedef enum _D3DFORMAT { + D3DFMT_UNKNOWN = 0, + D3DFMT_R8G8B8 = 20, + D3DFMT_A8R8G8B8 = 21, + D3DFMT_X8R8G8B8 = 22, + D3DFMT_R5G6B5 = 23, + D3DFMT_X1R5G5B5 = 24, + D3DFMT_A1R5G5B5 = 25, + D3DFMT_A4R4G4B4 = 26, + D3DFMT_R3G3B2 = 27, + D3DFMT_A8 = 28, + D3DFMT_A8R3G3B2 = 29, + D3DFMT_X4R4G4B4 = 30, + D3DFMT_A2B10G10R10 = 31, + D3DFMT_A8B8G8R8 = 32, + D3DFMT_X8B8G8R8 = 33, + D3DFMT_G16R16 = 34, + D3DFMT_A2R10G10B10 = 35, + D3DFMT_A16B16G16R16 = 36, + D3DFMT_A8P8 = 40, + D3DFMT_P8 = 41, + D3DFMT_L8 = 50, + D3DFMT_A8L8 = 51, + D3DFMT_A4L4 = 52, + D3DFMT_V8U8 = 60, + D3DFMT_L6V5U5 = 61, + D3DFMT_X8L8V8U8 = 62, + D3DFMT_Q8W8V8U8 = 63, + D3DFMT_V16U16 = 64, + D3DFMT_A2W10V10U10 = 67, + D3DFMT_UYVY = MAKEFOURCC('U', 'Y', 'V', 'Y'), + D3DFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), + D3DFMT_YUY2 = MAKEFOURCC('Y', 'U', 'Y', '2'), + D3DFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), + D3DFMT_DXT1 = MAKEFOURCC('D', 'X', 'T', '1'), + D3DFMT_DXT2 = MAKEFOURCC('D', 'X', 'T', '2'), + D3DFMT_DXT3 = MAKEFOURCC('D', 'X', 'T', '3'), + D3DFMT_DXT4 = MAKEFOURCC('D', 'X', 'T', '4'), + D3DFMT_DXT5 = MAKEFOURCC('D', 'X', 'T', '5'), + D3DFMT_D16_LOCKABLE = 70, + D3DFMT_D32 = 71, + D3DFMT_D15S1 = 73, + D3DFMT_D24S8 = 75, + D3DFMT_D24X8 = 77, + D3DFMT_D24X4S4 = 79, + D3DFMT_D16 = 80, + D3DFMT_D32F_LOCKABLE = 82, + D3DFMT_D24FS8 = 83, + D3DFMT_D32_LOCKABLE = 84, + D3DFMT_S8_LOCKABLE = 85, + D3DFMT_L16 = 81, + D3DFMT_VERTEXDATA = 100, + D3DFMT_INDEX16 = 101, + D3DFMT_INDEX32 = 102, + D3DFMT_Q16W16V16U16 = 110, + D3DFMT_MULTI2_ARGB8 = MAKEFOURCC('M','E','T','1'), + D3DFMT_R16F = 111, + D3DFMT_G16R16F = 112, + D3DFMT_A16B16G16R16F = 113, + D3DFMT_R32F = 114, + D3DFMT_G32R32F = 115, + D3DFMT_A32B32G32R32F = 116, + D3DFMT_CxV8U8 = 117, + D3DFMT_A1 = 118, + D3DFMT_A2B10G10R10_XR_BIAS = 119, + D3DFMT_BINARYBUFFER = 199, + D3DFMT_DF16 = MAKEFOURCC('D', 'F', '1', '6'), + D3DFMT_DF24 = MAKEFOURCC('D', 'F', '2', '4'), + D3DFMT_INTZ = MAKEFOURCC('I', 'N', 'T', 'Z'), + D3DFMT_NULL = MAKEFOURCC('N', 'U', 'L', 'L'), + D3DFMT_NV11 = MAKEFOURCC('N', 'V', '1', '1'), + D3DFMT_NV12 = MAKEFOURCC('N', 'V', '1', '2'), + D3DFMT_Y210 = MAKEFOURCC('Y', '2', '1', '0'), + D3DFMT_Y216 = MAKEFOURCC('Y', '2', '1', '6'), + D3DFMT_Y410 = MAKEFOURCC('Y', '4', '1', '0') +} D3DFORMAT; + +typedef enum _D3DLIGHTTYPE { + D3DLIGHT_POINT = 1, + D3DLIGHT_SPOT = 2, + D3DLIGHT_DIRECTIONAL = 3 +} D3DLIGHTTYPE; + +typedef enum _D3DMATERIALCOLORSOURCE { + D3DMCS_MATERIAL = 0, + D3DMCS_COLOR1 = 1, + D3DMCS_COLOR2 = 2 +} D3DMATERIALCOLORSOURCE; + +typedef enum _D3DMULTISAMPLE_TYPE { + D3DMULTISAMPLE_NONE = 0, + D3DMULTISAMPLE_NONMASKABLE = 1, + D3DMULTISAMPLE_2_SAMPLES = 2, + D3DMULTISAMPLE_3_SAMPLES = 3, + D3DMULTISAMPLE_4_SAMPLES = 4, + D3DMULTISAMPLE_5_SAMPLES = 5, + D3DMULTISAMPLE_6_SAMPLES = 6, + D3DMULTISAMPLE_7_SAMPLES = 7, + D3DMULTISAMPLE_8_SAMPLES = 8, + D3DMULTISAMPLE_9_SAMPLES = 9, + D3DMULTISAMPLE_10_SAMPLES = 10, + D3DMULTISAMPLE_11_SAMPLES = 11, + D3DMULTISAMPLE_12_SAMPLES = 12, + D3DMULTISAMPLE_13_SAMPLES = 13, + D3DMULTISAMPLE_14_SAMPLES = 14, + D3DMULTISAMPLE_15_SAMPLES = 15, + D3DMULTISAMPLE_16_SAMPLES = 16 +} D3DMULTISAMPLE_TYPE; + +typedef enum _D3DPATCHEDGESTYLE { + D3DPATCHEDGE_DISCRETE = 0, + D3DPATCHEDGE_CONTINUOUS = 1 +} D3DPATCHEDGESTYLE; + +typedef enum _D3DPOOL { + D3DPOOL_DEFAULT = 0, + D3DPOOL_MANAGED = 1, + D3DPOOL_SYSTEMMEM = 2, + D3DPOOL_SCRATCH = 3 +} D3DPOOL; + +typedef enum _D3DPRIMITIVETYPE { + D3DPT_POINTLIST = 1, + D3DPT_LINELIST = 2, + D3DPT_LINESTRIP = 3, + D3DPT_TRIANGLELIST = 4, + D3DPT_TRIANGLESTRIP = 5, + D3DPT_TRIANGLEFAN = 6 +} D3DPRIMITIVETYPE; + +typedef enum _D3DQUERYTYPE { + D3DQUERYTYPE_VCACHE = 4, + D3DQUERYTYPE_RESOURCEMANAGER = 5, + D3DQUERYTYPE_VERTEXSTATS = 6, + D3DQUERYTYPE_EVENT = 8, + D3DQUERYTYPE_OCCLUSION = 9, + D3DQUERYTYPE_TIMESTAMP = 10, + D3DQUERYTYPE_TIMESTAMPDISJOINT = 11, + D3DQUERYTYPE_TIMESTAMPFREQ = 12, + D3DQUERYTYPE_PIPELINETIMINGS = 13, + D3DQUERYTYPE_INTERFACETIMINGS = 14, + D3DQUERYTYPE_VERTEXTIMINGS = 15, + D3DQUERYTYPE_PIXELTIMINGS = 16, + D3DQUERYTYPE_BANDWIDTHTIMINGS = 17, + D3DQUERYTYPE_CACHEUTILIZATION = 18, + D3DQUERYTYPE_MEMORYPRESSURE = 19 +} D3DQUERYTYPE; + +#define D3DISSUE_BEGIN (1 << 1) +#define D3DISSUE_END (1 << 0) +#define D3DGETDATA_FLUSH (1 << 0) + + +typedef enum _D3DRENDERSTATETYPE { + D3DRS_ZENABLE = 7, + D3DRS_FILLMODE = 8, + D3DRS_SHADEMODE = 9, + D3DRS_ZWRITEENABLE = 14, + D3DRS_ALPHATESTENABLE = 15, + D3DRS_LASTPIXEL = 16, + D3DRS_SRCBLEND = 19, + D3DRS_DESTBLEND = 20, + D3DRS_CULLMODE = 22, + D3DRS_ZFUNC = 23, + D3DRS_ALPHAREF = 24, + D3DRS_ALPHAFUNC = 25, + D3DRS_DITHERENABLE = 26, + D3DRS_ALPHABLENDENABLE = 27, + D3DRS_FOGENABLE = 28, + D3DRS_SPECULARENABLE = 29, + D3DRS_FOGCOLOR = 34, + D3DRS_FOGTABLEMODE = 35, + D3DRS_FOGSTART = 36, + D3DRS_FOGEND = 37, + D3DRS_FOGDENSITY = 38, + D3DRS_RANGEFOGENABLE = 48, + D3DRS_STENCILENABLE = 52, + D3DRS_STENCILFAIL = 53, + D3DRS_STENCILZFAIL = 54, + D3DRS_STENCILPASS = 55, + D3DRS_STENCILFUNC = 56, + D3DRS_STENCILREF = 57, + D3DRS_STENCILMASK = 58, + D3DRS_STENCILWRITEMASK = 59, + D3DRS_TEXTUREFACTOR = 60, + D3DRS_WRAP0 = 128, + D3DRS_WRAP1 = 129, + D3DRS_WRAP2 = 130, + D3DRS_WRAP3 = 131, + D3DRS_WRAP4 = 132, + D3DRS_WRAP5 = 133, + D3DRS_WRAP6 = 134, + D3DRS_WRAP7 = 135, + D3DRS_CLIPPING = 136, + D3DRS_LIGHTING = 137, + D3DRS_AMBIENT = 139, + D3DRS_FOGVERTEXMODE = 140, + D3DRS_COLORVERTEX = 141, + D3DRS_LOCALVIEWER = 142, + D3DRS_NORMALIZENORMALS = 143, + D3DRS_DIFFUSEMATERIALSOURCE = 145, + D3DRS_SPECULARMATERIALSOURCE = 146, + D3DRS_AMBIENTMATERIALSOURCE = 147, + D3DRS_EMISSIVEMATERIALSOURCE = 148, + D3DRS_VERTEXBLEND = 151, + D3DRS_CLIPPLANEENABLE = 152, + D3DRS_POINTSIZE = 154, + D3DRS_POINTSIZE_MIN = 155, + D3DRS_POINTSPRITEENABLE = 156, + D3DRS_POINTSCALEENABLE = 157, + D3DRS_POINTSCALE_A = 158, + D3DRS_POINTSCALE_B = 159, + D3DRS_POINTSCALE_C = 160, + D3DRS_MULTISAMPLEANTIALIAS = 161, + D3DRS_MULTISAMPLEMASK = 162, + D3DRS_PATCHEDGESTYLE = 163, + D3DRS_DEBUGMONITORTOKEN = 165, + D3DRS_POINTSIZE_MAX = 166, + D3DRS_INDEXEDVERTEXBLENDENABLE = 167, + D3DRS_COLORWRITEENABLE = 168, + D3DRS_TWEENFACTOR = 170, + D3DRS_BLENDOP = 171, + D3DRS_POSITIONDEGREE = 172, + D3DRS_NORMALDEGREE = 173, + D3DRS_SCISSORTESTENABLE = 174, + D3DRS_SLOPESCALEDEPTHBIAS = 175, + D3DRS_ANTIALIASEDLINEENABLE = 176, + D3DRS_MINTESSELLATIONLEVEL = 178, + D3DRS_MAXTESSELLATIONLEVEL = 179, + D3DRS_ADAPTIVETESS_X = 180, + D3DRS_ADAPTIVETESS_Y = 181, + D3DRS_ADAPTIVETESS_Z = 182, + D3DRS_ADAPTIVETESS_W = 183, + D3DRS_ENABLEADAPTIVETESSELLATION = 184, + D3DRS_TWOSIDEDSTENCILMODE = 185, + D3DRS_CCW_STENCILFAIL = 186, + D3DRS_CCW_STENCILZFAIL = 187, + D3DRS_CCW_STENCILPASS = 188, + D3DRS_CCW_STENCILFUNC = 189, + D3DRS_COLORWRITEENABLE1 = 190, + D3DRS_COLORWRITEENABLE2 = 191, + D3DRS_COLORWRITEENABLE3 = 192, + D3DRS_BLENDFACTOR = 193, + D3DRS_SRGBWRITEENABLE = 194, + D3DRS_DEPTHBIAS = 195, + D3DRS_WRAP8 = 198, + D3DRS_WRAP9 = 199, + D3DRS_WRAP10 = 200, + D3DRS_WRAP11 = 201, + D3DRS_WRAP12 = 202, + D3DRS_WRAP13 = 203, + D3DRS_WRAP14 = 204, + D3DRS_WRAP15 = 205, + D3DRS_SEPARATEALPHABLENDENABLE = 206, + D3DRS_SRCBLENDALPHA = 207, + D3DRS_DESTBLENDALPHA = 208, + D3DRS_BLENDOPALPHA = 209 +} D3DRENDERSTATETYPE; + +typedef enum _D3DRESOURCETYPE { + D3DRTYPE_SURFACE = 1, + D3DRTYPE_VOLUME = 2, + D3DRTYPE_TEXTURE = 3, + D3DRTYPE_VOLUMETEXTURE = 4, + D3DRTYPE_CUBETEXTURE = 5, + D3DRTYPE_VERTEXBUFFER = 6, + D3DRTYPE_INDEXBUFFER = 7 +} D3DRESOURCETYPE; +#define D3DRTYPECOUNT (D3DRTYPE_INDEXBUFFER+1) + +typedef enum _D3DSAMPLERSTATETYPE { + D3DSAMP_ADDRESSU = 1, + D3DSAMP_ADDRESSV = 2, + D3DSAMP_ADDRESSW = 3, + D3DSAMP_BORDERCOLOR = 4, + D3DSAMP_MAGFILTER = 5, + D3DSAMP_MINFILTER = 6, + D3DSAMP_MIPFILTER = 7, + D3DSAMP_MIPMAPLODBIAS = 8, + D3DSAMP_MAXMIPLEVEL = 9, + D3DSAMP_MAXANISOTROPY = 10, + D3DSAMP_SRGBTEXTURE = 11, + D3DSAMP_ELEMENTINDEX = 12, + D3DSAMP_DMAPOFFSET = 13 +} D3DSAMPLERSTATETYPE; + +typedef enum _D3DSAMPLER_TEXTURE_TYPE { + D3DSTT_UNKNOWN = 0<<27, + D3DSTT_1D = 1<<27, + D3DSTT_2D = 2<<27, + D3DSTT_CUBE = 3<<27, + D3DSTT_VOLUME = 4<<27 +} D3DSAMPLER_TEXTURE_TYPE; + +typedef enum _D3DSHADEMODE { + D3DSHADE_FLAT = 1, + D3DSHADE_GOURAUD = 2, + D3DSHADE_PHONG = 3 +} D3DSHADEMODE; + +typedef enum _D3DSHADER_ADDRESSMODE_TYPE { + D3DSHADER_ADDRMODE_ABSOLUTE = 0<<13, + D3DSHADER_ADDRMODE_RELATIVE = 1<<13 +} D3DSHADER_ADDRESSMODE_TYPE; + +typedef enum _D3DSHADER_COMPARISON { + D3DSPC_RESERVED0 = 0, + D3DSPC_GT = 1, + D3DSPC_EQ = 2, + D3DSPC_GE = 3, + D3DSPC_LT = 4, + D3DSPC_NE = 5, + D3DSPC_LE = 6, + D3DSPC_RESERVED1 = 7 +} D3DSHADER_COMPARISON; + +#define D3DDP_MAXTEXCOORD 8 + +#define D3DSI_OPCODE_MASK 0x0000FFFF +#define D3DSI_INSTLENGTH_MASK 0x0F000000 +#define D3DSI_INSTLENGTH_SHIFT 24 + +typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { + D3DSIO_NOP = 0, + D3DSIO_MOV = 1, + D3DSIO_ADD = 2, + D3DSIO_SUB = 3, + D3DSIO_MAD = 4, + D3DSIO_MUL = 5, + D3DSIO_RCP = 6, + D3DSIO_RSQ = 7, + D3DSIO_DP3 = 8, + D3DSIO_DP4 = 9, + D3DSIO_MIN = 10, + D3DSIO_MAX = 11, + D3DSIO_SLT = 12, + D3DSIO_SGE = 13, + D3DSIO_EXP = 14, + D3DSIO_LOG = 15, + D3DSIO_LIT = 16, + D3DSIO_DST = 17, + D3DSIO_LRP = 18, + D3DSIO_FRC = 19, + D3DSIO_M4x4 = 20, + D3DSIO_M4x3 = 21, + D3DSIO_M3x4 = 22, + D3DSIO_M3x3 = 23, + D3DSIO_M3x2 = 24, + D3DSIO_CALL = 25, + D3DSIO_CALLNZ = 26, + D3DSIO_LOOP = 27, + D3DSIO_RET = 28, + D3DSIO_ENDLOOP = 29, + D3DSIO_LABEL = 30, + D3DSIO_DCL = 31, + D3DSIO_POW = 32, + D3DSIO_CRS = 33, + D3DSIO_SGN = 34, + D3DSIO_ABS = 35, + D3DSIO_NRM = 36, + D3DSIO_SINCOS = 37, + D3DSIO_REP = 38, + D3DSIO_ENDREP = 39, + D3DSIO_IF = 40, + D3DSIO_IFC = 41, + D3DSIO_ELSE = 42, + D3DSIO_ENDIF = 43, + D3DSIO_BREAK = 44, + D3DSIO_BREAKC = 45, + D3DSIO_MOVA = 46, + D3DSIO_DEFB = 47, + D3DSIO_DEFI = 48, + D3DSIO_TEXCOORD = 64, + D3DSIO_TEXKILL = 65, + D3DSIO_TEX = 66, + D3DSIO_TEXBEM = 67, + D3DSIO_TEXBEML = 68, + D3DSIO_TEXREG2AR = 69, + D3DSIO_TEXREG2GB = 70, + D3DSIO_TEXM3x2PAD = 71, + D3DSIO_TEXM3x2TEX = 72, + D3DSIO_TEXM3x3PAD = 73, + D3DSIO_TEXM3x3TEX = 74, + D3DSIO_RESERVED0 = 75, + D3DSIO_TEXM3x3SPEC = 76, + D3DSIO_TEXM3x3VSPEC = 77, + D3DSIO_EXPP = 78, + D3DSIO_LOGP = 79, + D3DSIO_CND = 80, + D3DSIO_DEF = 81, + D3DSIO_TEXREG2RGB = 82, + D3DSIO_TEXDP3TEX = 83, + D3DSIO_TEXM3x2DEPTH = 84, + D3DSIO_TEXDP3 = 85, + D3DSIO_TEXM3x3 = 86, + D3DSIO_TEXDEPTH = 87, + D3DSIO_CMP = 88, + D3DSIO_BEM = 89, + D3DSIO_DP2ADD = 90, + D3DSIO_DSX = 91, + D3DSIO_DSY = 92, + D3DSIO_TEXLDD = 93, + D3DSIO_SETP = 94, + D3DSIO_TEXLDL = 95, + D3DSIO_BREAKP = 96, + D3DSIO_PHASE = 0xFFFD, + D3DSIO_COMMENT = 0xFFFE, + D3DSIO_END = 0xFFFF +} D3DSHADER_INSTRUCTION_OPCODE_TYPE; + +#define D3DSI_COISSUE 0x40000000 + +#define D3DSP_DCL_USAGE_SHIFT 0 +#define D3DSP_DCL_USAGE_MASK 0x0000000f + +#define D3DSP_DCL_USAGEINDEX_SHIFT 16 +#define D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 + +#define D3DSP_TEXTURETYPE_SHIFT 27 +#define D3DSP_TEXTURETYPE_MASK 0x78000000 + +#define D3DSP_REGNUM_MASK 0x000007FF + +#define D3DSP_WRITEMASK_0 0x00010000 +#define D3DSP_WRITEMASK_1 0x00020000 +#define D3DSP_WRITEMASK_2 0x00040000 +#define D3DSP_WRITEMASK_3 0x00080000 +#define D3DSP_WRITEMASK_ALL 0x000F0000 + +#define D3DSP_DSTMOD_SHIFT 20 +#define D3DSP_DSTMOD_MASK (0xF << D3DSP_DSTMOD_SHIFT) + +typedef enum _D3DSHADER_PARAM_DSTMOD_TYPE { + D3DSPDM_NONE = 0 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_SATURATE = 1 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_PARTIALPRECISION = 2 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_MSAMPCENTROID = 4 << D3DSP_DSTMOD_SHIFT, + D3DSPDM_FORCE_DWORD = 0x7FFFFFFF +} D3DSHADER_PARAM_DSTMOD_TYPE; + +#define D3DSP_DSTSHIFT_SHIFT 24 +#define D3DSP_DSTSHIFT_MASK (0xF << D3DSP_DSTSHIFT_SHIFT) + +#define D3DSP_REGTYPE_SHIFT 28 +#define D3DSP_REGTYPE_SHIFT2 8 +#define D3DSP_REGTYPE_MASK (0x7 << D3DSP_REGTYPE_SHIFT) +#define D3DSP_REGTYPE_MASK2 0x00001800 + +typedef enum _D3DSHADER_MISCTYPE_OFFSETS { + D3DSMO_POSITION = 0, + D3DSMO_FACE = 1 +} D3DSHADER_MISCTYPE_OFFSETS; + +typedef enum _D3DSHADER_PARAM_REGISTER_TYPE { + D3DSPR_TEMP = 0, + D3DSPR_INPUT = 1, + D3DSPR_CONST = 2, + D3DSPR_ADDR = 3, + D3DSPR_TEXTURE = 3, + D3DSPR_RASTOUT = 4, + D3DSPR_ATTROUT = 5, + D3DSPR_TEXCRDOUT = 6, + D3DSPR_OUTPUT = 6, + D3DSPR_CONSTINT = 7, + D3DSPR_COLOROUT = 8, + D3DSPR_DEPTHOUT = 9, + D3DSPR_SAMPLER = 10, + D3DSPR_CONST2 = 11, + D3DSPR_CONST3 = 12, + D3DSPR_CONST4 = 13, + D3DSPR_CONSTBOOL = 14, + D3DSPR_LOOP = 15, + D3DSPR_TEMPFLOAT16 = 16, + D3DSPR_MISCTYPE = 17, + D3DSPR_LABEL = 18, + D3DSPR_PREDICATE = 19 +} D3DSHADER_PARAM_REGISTER_TYPE; + +#define D3DSP_SWIZZLE_SHIFT 16 +#define D3DSP_SWIZZLE_MASK (0xFF << D3DSP_SWIZZLE_SHIFT) + +#define D3DSP_NOSWIZZLE \ + ((0 << (D3DSP_SWIZZLE_SHIFT + 0)) | (1 << (D3DSP_SWIZZLE_SHIFT + 2)) | (2 << (D3DSP_SWIZZLE_SHIFT + 4)) | (3 << (D3DSP_SWIZZLE_SHIFT + 6))) + +#define D3DSP_SRCMOD_SHIFT 24 +#define D3DSP_SRCMOD_MASK (0xF << D3DSP_SRCMOD_SHIFT) + +typedef enum _D3DSHADER_PARAM_SRCMOD_TYPE { + D3DSPSM_NONE = 0<<24, + D3DSPSM_NEG = 1<<24, + D3DSPSM_BIAS = 2<<24, + D3DSPSM_BIASNEG = 3<<24, + D3DSPSM_SIGN = 4<<24, + D3DSPSM_SIGNNEG = 5<<24, + D3DSPSM_COMP = 6<<24, + D3DSPSM_X2 = 7<<24, + D3DSPSM_X2NEG = 8<<24, + D3DSPSM_DZ = 9<<24, + D3DSPSM_DW = 10<<24, + D3DSPSM_ABS = 11<<24, + D3DSPSM_ABSNEG = 12<<24, + D3DSPSM_NOT = 13<<24 +} D3DSHADER_PARAM_SRCMOD_TYPE; + +#define D3DPS_VERSION(major, minor) (0xFFFF0000 | ((major) << 8) | (minor)) +#define D3DVS_VERSION(major, minor) (0xFFFE0000 | ((major) << 8) | (minor)) +#define D3DSHADER_VERSION_MAJOR(version) (((version) >> 8) & 0xFF) +#define D3DSHADER_VERSION_MINOR(version) (((version) >> 0) & 0xFF) + +#define D3DSI_COMMENTSIZE_SHIFT 16 +#define D3DSI_COMMENTSIZE_MASK (0x7FFF << D3DSI_COMMENTSIZE_SHIFT) + +typedef enum _D3DSTATEBLOCKTYPE { + D3DSBT_ALL = 1, + D3DSBT_PIXELSTATE = 2, + D3DSBT_VERTEXSTATE = 3 +} D3DSTATEBLOCKTYPE; + +typedef enum _D3DSTENCILOP { + D3DSTENCILOP_KEEP = 1, + D3DSTENCILOP_ZERO = 2, + D3DSTENCILOP_REPLACE = 3, + D3DSTENCILOP_INCRSAT = 4, + D3DSTENCILOP_DECRSAT = 5, + D3DSTENCILOP_INVERT = 6, + D3DSTENCILOP_INCR = 7, + D3DSTENCILOP_DECR = 8 +} D3DSTENCILOP; + +typedef enum _D3DSWAPEFFECT { + D3DSWAPEFFECT_DISCARD = 1, + D3DSWAPEFFECT_FLIP = 2, + D3DSWAPEFFECT_COPY = 3, + D3DSWAPEFFECT_OVERLAY = 4, + D3DSWAPEFFECT_FLIPEX = 5 +} D3DSWAPEFFECT; + +typedef enum _D3DTEXTUREADDRESS { + D3DTADDRESS_WRAP = 1, + D3DTADDRESS_MIRROR = 2, + D3DTADDRESS_CLAMP = 3, + D3DTADDRESS_BORDER = 4, + D3DTADDRESS_MIRRORONCE = 5 +} D3DTEXTUREADDRESS; + +typedef enum _D3DTEXTUREFILTERTYPE { + D3DTEXF_NONE = 0, + D3DTEXF_POINT = 1, + D3DTEXF_LINEAR = 2, + D3DTEXF_ANISOTROPIC = 3, + D3DTEXF_PYRAMIDALQUAD = 6, + D3DTEXF_GAUSSIANQUAD = 7, + D3DTEXF_CONVOLUTIONMONO = 8 +} D3DTEXTUREFILTERTYPE; + +typedef enum _D3DTEXTUREOP { + D3DTOP_DISABLE = 1, + D3DTOP_SELECTARG1 = 2, + D3DTOP_SELECTARG2 = 3, + D3DTOP_MODULATE = 4, + D3DTOP_MODULATE2X = 5, + D3DTOP_MODULATE4X = 6, + D3DTOP_ADD = 7, + D3DTOP_ADDSIGNED = 8, + D3DTOP_ADDSIGNED2X = 9, + D3DTOP_SUBTRACT = 10, + D3DTOP_ADDSMOOTH = 11, + D3DTOP_BLENDDIFFUSEALPHA = 12, + D3DTOP_BLENDTEXTUREALPHA = 13, + D3DTOP_BLENDFACTORALPHA = 14, + D3DTOP_BLENDTEXTUREALPHAPM = 15, + D3DTOP_BLENDCURRENTALPHA = 16, + D3DTOP_PREMODULATE = 17, + D3DTOP_MODULATEALPHA_ADDCOLOR = 18, + D3DTOP_MODULATECOLOR_ADDALPHA = 19, + D3DTOP_MODULATEINVALPHA_ADDCOLOR = 20, + D3DTOP_MODULATEINVCOLOR_ADDALPHA = 21, + D3DTOP_BUMPENVMAP = 22, + D3DTOP_BUMPENVMAPLUMINANCE = 23, + D3DTOP_DOTPRODUCT3 = 24, + D3DTOP_MULTIPLYADD = 25, + D3DTOP_LERP = 26 +} D3DTEXTUREOP; + +typedef enum _D3DTEXTURESTAGESTATETYPE { + D3DTSS_COLOROP = 1, + D3DTSS_COLORARG1 = 2, + D3DTSS_COLORARG2 = 3, + D3DTSS_ALPHAOP = 4, + D3DTSS_ALPHAARG1 = 5, + D3DTSS_ALPHAARG2 = 6, + D3DTSS_BUMPENVMAT00 = 7, + D3DTSS_BUMPENVMAT01 = 8, + D3DTSS_BUMPENVMAT10 = 9, + D3DTSS_BUMPENVMAT11 = 10, + D3DTSS_TEXCOORDINDEX = 11, + D3DTSS_BUMPENVLSCALE = 22, + D3DTSS_BUMPENVLOFFSET = 23, + D3DTSS_TEXTURETRANSFORMFLAGS = 24, + D3DTSS_COLORARG0 = 26, + D3DTSS_ALPHAARG0 = 27, + D3DTSS_RESULTARG = 28, + D3DTSS_CONSTANT = 32 +} D3DTEXTURESTAGESTATETYPE; + +/* MSDN has this in d3d9caps.h, but it should be here */ +#define D3DTSS_TCI_PASSTHRU 0x00000 +#define D3DTSS_TCI_CAMERASPACENORMAL 0x10000 +#define D3DTSS_TCI_CAMERASPACEPOSITION 0x20000 +#define D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x30000 +#define D3DTSS_TCI_SPHEREMAP 0x40000 + +typedef enum _D3DTEXTURETRANSFORMFLAGS { + D3DTTFF_DISABLE = 0, + D3DTTFF_COUNT1 = 1, + D3DTTFF_COUNT2 = 2, + D3DTTFF_COUNT3 = 3, + D3DTTFF_COUNT4 = 4, + D3DTTFF_PROJECTED = 256 +} D3DTEXTURETRANSFORMFLAGS; + +typedef enum _D3DTRANSFORMSTATETYPE { + D3DTS_VIEW = 2, + D3DTS_PROJECTION = 3, + D3DTS_TEXTURE0 = 16, + D3DTS_TEXTURE1 = 17, + D3DTS_TEXTURE2 = 18, + D3DTS_TEXTURE3 = 19, + D3DTS_TEXTURE4 = 20, + D3DTS_TEXTURE5 = 21, + D3DTS_TEXTURE6 = 22, + D3DTS_TEXTURE7 = 23 +} D3DTRANSFORMSTATETYPE; + +#define D3DDMAPSAMPLER 256 +#define D3DVERTEXTEXTURESAMPLER0 (D3DDMAPSAMPLER+1) +#define D3DVERTEXTEXTURESAMPLER1 (D3DDMAPSAMPLER+2) +#define D3DVERTEXTEXTURESAMPLER2 (D3DDMAPSAMPLER+3) +#define D3DVERTEXTEXTURESAMPLER3 (D3DDMAPSAMPLER+4) + +#define D3DTS_WORLD D3DTS_WORLDMATRIX(0) +#define D3DTS_WORLD1 D3DTS_WORLDMATRIX(1) +#define D3DTS_WORLD2 D3DTS_WORLDMATRIX(2) +#define D3DTS_WORLD3 D3DTS_WORLDMATRIX(3) +#define D3DTS_WORLDMATRIX(index) (D3DTRANSFORMSTATETYPE)(index + 256) + +typedef enum _D3DVERTEXBLENDFLAGS { + D3DVBF_DISABLE = 0, + D3DVBF_1WEIGHTS = 1, + D3DVBF_2WEIGHTS = 2, + D3DVBF_3WEIGHTS = 3, + D3DVBF_TWEENING = 255, + D3DVBF_0WEIGHTS = 256 +} D3DVERTEXBLENDFLAGS; + +typedef enum _D3DVS_ADDRESSMODE_TYPE { + D3DVS_ADDRMODE_ABSOLUTE = 0<<13, + D3DVS_ADDRMODE_RELATIVE = 1<<13 +} D3DVS_ADDRESSMODE_TYPE; + +typedef enum _D3DVS_RASTOUT_OFFSETS { + D3DSRO_POSITION = 0, + D3DSRO_FOG = 1, + D3DSRO_POINT_SIZE = 2 +} D3DVS_RASTOUT_OFFSETS; + +typedef enum _D3DZBUFFERTYPE { + D3DZB_FALSE = 0, + D3DZB_TRUE = 1, + D3DZB_USEW = 2 +} D3DZBUFFERTYPE; + +/***************************************************************************** + * Structs * + *****************************************************************************/ +typedef struct D3DDISPLAYMODEEX { + UINT Size; + UINT Width; + UINT Height; + UINT RefreshRate; + D3DFORMAT Format; + D3DSCANLINEORDERING ScanLineOrdering; +} D3DDISPLAYMODEEX, *PD3DDISPLAYMODEEX, *LPD3DDISPLAYMODEEX; + +typedef struct D3DDISPLAYMODEFILTER { + UINT Size; + D3DFORMAT Format; + D3DSCANLINEORDERING ScanLineOrdering; +} D3DDISPLAYMODEFILTER, *PD3DDISPLAYMODEFILTER, *LPD3DDISPLAYMODEFILTER; + +typedef struct _D3D_OMAC { + BYTE Omac[16]; +} D3D_OMAC, *PD3D_OMAC, *LPD3D_OMAC; + +typedef struct _D3DADAPTER_IDENTIFIER9 { + char Driver[512]; + char Description[512]; + char DeviceName[32]; + DWORD DriverVersionLowPart; + DWORD DriverVersionHighPart; + DWORD VendorId; + DWORD DeviceId; + DWORD SubSysId; + DWORD Revision; + GUID DeviceIdentifier; + DWORD WHQLLevel; +} D3DADAPTER_IDENTIFIER9, *PD3DADAPTER_IDENTIFIER9, *LPD3DADAPTER_IDENTIFIER9; + +typedef struct _D3DAES_CTR_IV { + UINT64 IV; + UINT64 Count; +} D3DAES_CTR_IV, *PD3DAES_CTR_IV, *LPD3DAES_CTR_IV; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT { + D3D_OMAC omac; + GUID ConfigureType; + HANDLE hChannel; + UINT SequenceNumber; +} D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT, *PD3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT, *LPD3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION { + D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT Parameters; + HANDLE DXVA2DecodeHandle; + HANDLE CryptoSessionHandle; + HANDLE DeviceHandle; +} D3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION, *PD3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION, *LPD3DAUTHENTICATEDCHANNEL_CONFIGURECRYPTOSESSION; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE { + D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT Parameters; + UINT StartSequenceQuery; + UINT StartSequenceConfigure; +} D3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE, *PD3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE, *LPD3DAUTHENTICATEDCHANNEL_CONFIGUREINITIALIZE; + +typedef struct _D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS { + union { + struct { + UINT ProtectionEnabled : 1; + UINT OverlayOrFullscreenRequired : 1; + UINT Reserved : 30; + }; + UINT Value; + }; +} D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS, *PD3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS, *LPD3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION { + D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT Parameters; + D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS Protections; +} D3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION, *PD3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION, *LPD3DAUTHENTICATEDCHANNEL_CONFIGUREPROTECTION; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE { + D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT Parameters; + D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE ProcessIdentiferType; + HANDLE ProcessHandle; + BOOL AllowAccess; +} D3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE, *PD3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE, *LPD3DAUTHENTICATEDCHANNEL_CONFIGURESHAREDRESOURCE; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION { + D3DAUTHENTICATEDCHANNEL_CONFIGURE_INPUT Parameters; + GUID EncryptionGuid; +} D3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION, *PD3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION, *LPD3DAUTHENTICATEDCHANNEL_CONFIGUREUNCOMPRESSEDENCRYPTION; + +typedef struct _D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT { + D3D_OMAC omac; + GUID ConfigureType; + HANDLE hChannel; + UINT SequenceNumber; + HRESULT ReturnCode; +} D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERY_INPUT { + GUID QueryType; + HANDLE hChannel; + UINT SequenceNumber; +} D3DAUTHENTICATEDCHANNEL_QUERY_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERY_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERY_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT { + D3D_OMAC omac; + GUID QueryType; + HANDLE hChannel; + UINT SequenceNumber; + HRESULT ReturnCode; +} D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + D3DAUTHENTICATEDCHANNELTYPE ChannelType; +} D3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYCHANNELTYPE_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_INPUT Input; + HANDLE DXVA2DecodeHandle; +} D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + HANDLE DXVA2DecodeHandle; + HANDLE CryptoSessionHandle; + HANDLE DeviceHandle; +} D3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYCRYPTOSESSION_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + HANDLE DeviceHandle; +} D3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYDEVICEHANDLE_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + UINT NumEncryptionGuids; +} D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUIDCOUNT_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_INPUT Input; + UINT EncryptionGuidIndex; +} D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + UINT EncryptionGuidIndex; + GUID EncryptionGuid; +} D3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYEVICTIONENCRYPTIONGUID_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + D3DBUSTYPE BusType; + BOOL bAccessibleInContiguousBlocks; + BOOL bAccessibleInNonContiguousBlocks; +} D3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_INPUT Input; + HANDLE DeviceHandle; + HANDLE CryptoSessionHandle; +} D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + HANDLE DeviceHandle; + HANDLE CryptoSessionHandle; + UINT NumOutputIDs; +} D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTIDCOUNT_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_INPUT Input; + HANDLE DeviceHandle; + HANDLE CryptoSessionHandle; + UINT OutputIDIndex; +} D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + HANDLE DeviceHandle; + HANDLE CryptoSessionHandle; + UINT OutputIDIndex; + UINT64 OutputID; +} D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + D3DAUTHENTICATEDCHANNEL_PROTECTION_FLAGS ProtectionFlags; +} D3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYPROTECTION_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + UINT NumRestrictedSharedResourceProcesses; +} D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESSCOUNT_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_INPUT Input; + UINT ProcessIndex; +} D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + UINT ProcessIndex; + D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE ProcessIdentifer; + HANDLE ProcessHandle; +} D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + GUID EncryptionGuid; +} D3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYUNCOMPRESSEDENCRYPTIONLEVEL_OUTPUT; + +typedef struct _D3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT { + D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT Output; + UINT NumUnrestrictedProtectedSharedResources; +} D3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT, *PD3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT, *LPD3DAUTHENTICATEDCHANNEL_QUERYUNRESTRICTEDPROTECTEDSHAREDRESOURCECOUNT_OUTPUT; + +typedef struct _D3DBOX { + UINT Left; + UINT Top; + UINT Right; + UINT Bottom; + UINT Front; + UINT Back; +} D3DBOX, *PD3DBOX, *LPD3DBOX; + +typedef struct _D3DCLIPSTATUS9 { + DWORD ClipUnion; + DWORD ClipIntersection; +} D3DCLIPSTATUS9, *PD3DCLIPSTATUS9, *LPD3DCLIPSTATUS9; + +typedef struct _D3DCOLORVALUE { + float r; + float g; + float b; + float a; +} D3DCOLORVALUE, *PD3DCOLORVALUE, *LPD3DCOLORVALUE; + +typedef struct _D3DCOMPOSERECTDESC { + USHORT X, Y; + USHORT Width, Height; +} D3DCOMPOSERECTDESC, *PD3DCOMPOSERECTDESC, *LPD3DCOMPOSERECTDESC; + +typedef struct _D3DCOMPOSERECTDESTINATION { + USHORT SrcRectIndex; + USHORT Reserved; + SHORT X, Y; +} D3DCOMPOSERECTDESTINATION, *PD3DCOMPOSERECTDESTINATION, *LPD3DCOMPOSERECTDESTINATION; + +typedef struct _D3DDEVICE_CREATION_PARAMETERS { + UINT AdapterOrdinal; + D3DDEVTYPE DeviceType; + HWND hFocusWindow; + DWORD BehaviorFlags; +} D3DDEVICE_CREATION_PARAMETERS, *PD3DDEVICE_CREATION_PARAMETERS, *LPD3DDEVICE_CREATION_PARAMETERS; + +typedef struct _D3DDEVINFO_D3D9BANDWIDTHTIMINGS { + FLOAT MaxBandwidthUtilized; + FLOAT FrontEndUploadMemoryUtilizedPercent; + FLOAT VertexRateUtilizedPercent; + FLOAT TriangleSetupRateUtilizedPercent; + FLOAT FillRateUtilizedPercent; +} D3DDEVINFO_D3D9BANDWIDTHTIMINGS, *PD3DDEVINFO_D3D9BANDWIDTHTIMINGS, *LPD3DDEVINFO_D3D9BANDWIDTHTIMINGS; + +typedef struct _D3DDEVINFO_D3D9CACHEUTILIZATION { + FLOAT TextureCacheHitRate; + FLOAT PostTransformVertexCacheHitRate; +} D3DDEVINFO_D3D9CACHEUTILIZATION, *PD3DDEVINFO_D3D9CACHEUTILIZATION, *LPD3DDEVINFO_D3D9CACHEUTILIZATION; + +typedef struct _D3DDEVINFO_D3D9INTERFACETIMINGS { + FLOAT WaitingForGPUToUseApplicationResourceTimePercent; + FLOAT WaitingForGPUToAcceptMoreCommandsTimePercent; + FLOAT WaitingForGPUToStayWithinLatencyTimePercent; + FLOAT WaitingForGPUExclusiveResourceTimePercent; + FLOAT WaitingForGPUOtherTimePercent; +} D3DDEVINFO_D3D9INTERFACETIMINGS, *PD3DDEVINFO_D3D9INTERFACETIMINGS, *LPD3DDEVINFO_D3D9INTERFACETIMINGS; + +typedef struct _D3DDEVINFO_D3D9PIPELINETIMINGS { + FLOAT VertexProcessingTimePercent; + FLOAT PixelProcessingTimePercent; + FLOAT OtherGPUProcessingTimePercent; + FLOAT GPUIdleTimePercent; +} D3DDEVINFO_D3D9PIPELINETIMINGS, *PD3DDEVINFO_D3D9PIPELINETIMINGS, *LPD3DDEVINFO_D3D9PIPELINETIMINGS; + +typedef struct _D3DDEVINFO_D3D9STAGETIMINGS { + FLOAT MemoryProcessingPercent; + FLOAT ComputationProcessingPercent; +} D3DDEVINFO_D3D9STAGETIMINGS, *PD3DDEVINFO_D3D9STAGETIMINGS, *LPD3DDEVINFO_D3D9STAGETIMINGS; + +typedef struct _D3DDEVINFO_D3DVERTEXSTATS { + DWORD NumRenderedTriangles; + DWORD NumExtraClippingTriangles; +} D3DDEVINFO_D3DVERTEXSTATS, *LPD3DDEVINFO_D3DVERTEXSTATS; + +typedef struct _D3DRESOURCESTATS { + BOOL bThrashing; + DWORD ApproxBytesDownloaded; + DWORD NumEvicts; + DWORD NumVidCreates; + DWORD LastPri; + DWORD NumUsed; + DWORD NumUsedInVidMem; + DWORD WorkingSet; + DWORD WorkingSetBytes; + DWORD TotalManaged; + DWORD TotalBytes; +} D3DRESOURCESTATS, *PD3DRESOURCESTATS, *LPD3DRESOURCESTATS; + +typedef struct _D3DDEVINFO_RESOURCEMANAGER { + D3DRESOURCESTATS stats[(D3DRTYPE_INDEXBUFFER+1)]; +} D3DDEVINFO_RESOURCEMANAGER, *LPD3DDEVINFO_RESOURCEMANAGER; + +typedef struct _D3DDEVINFO_VCACHE { + DWORD Pattern; + DWORD OptMethod; + DWORD CacheSize; + DWORD MagicNumber; +} D3DDEVINFO_VCACHE, *LPD3DDEVINFO_VCACHE; + +typedef struct _D3DDISPLAYMODE { + UINT Width; + UINT Height; + UINT RefreshRate; + D3DFORMAT Format; +} D3DDISPLAYMODE, *PD3DDISPLAYMODE, *LPD3DDISPLAYMODE; + +typedef struct _D3DENCRYPTED_BLOCK_INFO { + UINT NumEncryptedBytesAtBeginning; + UINT NumBytesInSkipPattern; + UINT NumBytesInEncryptPattern; +} D3DENCRYPTED_BLOCK_INFO, *PD3DENCRYPTED_BLOCK_INFO, *LPD3DENCRYPTED_BLOCK_INFO; + +typedef struct _D3DGAMMARAMP { + WORD red [256]; + WORD green[256]; + WORD blue [256]; +} D3DGAMMARAMP, *PD3DGAMMARAMP, *LPD3DGAMMARAMP; + +typedef struct _D3DINDEXBUFFER_DESC { + D3DFORMAT Format; + D3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; +} D3DINDEXBUFFER_DESC, *PD3DINDEXBUFFER_DESC, *LPD3DINDEXBUFFER_DESC; + +typedef struct _D3DVECTOR { + float x; + float y; + float z; +} D3DVECTOR, *PD3DVECTOR, *LPD3DVECTOR; + +typedef struct _D3DLIGHT9 { + D3DLIGHTTYPE Type; + D3DCOLORVALUE Diffuse; + D3DCOLORVALUE Specular; + D3DCOLORVALUE Ambient; + D3DVECTOR Position; + D3DVECTOR Direction; + float Range; + float Falloff; + float Attenuation0; + float Attenuation1; + float Attenuation2; + float Theta; + float Phi; +} D3DLIGHT9, *PD3DLIGHT9, *LPD3DLIGHT9; + +typedef struct _D3DLOCKED_BOX { + INT RowPitch; + INT SlicePitch; + void* pBits; +} D3DLOCKED_BOX, *PD3DLOCKED_BOX, *LPD3DLOCKED_BOX; + +typedef struct _D3DLOCKED_RECT { + INT Pitch; + void* pBits; +} D3DLOCKED_RECT, *PD3DLOCKED_RECT, *LPD3DLOCKED_RECT; + +typedef struct _D3DMATERIAL9 { + D3DCOLORVALUE Diffuse; + D3DCOLORVALUE Ambient; + D3DCOLORVALUE Specular; + D3DCOLORVALUE Emissive; + float Power; +} D3DMATERIAL9, *PD3DMATERIAL9, *LPD3DMATERIAL9; + +typedef struct _D3DMATRIX { + union { + struct { + float _11, _12, _13, _14; + float _21, _22, _23, _24; + float _31, _32, _33, _34; + float _41, _42, _43, _44; + }; + float m[4][4]; + }; +} D3DMATRIX, *PD3DMATRIX, *LPD3DMATRIX; + +typedef struct _D3DMEMORYPRESSURE { + UINT64 BytesEvictedFromProcess; + UINT64 SizeOfInefficientAllocation; + DWORD LevelOfEfficiency; +} D3DMEMORYPRESSURE, *PD3DMEMORYPRESSURE, *LPD3DMEMORYPRESSURE; + +typedef struct _D3DPRESENTSTATS { + UINT PresentCount; + UINT PresentRefreshCount; + UINT SyncRefreshCount; + LARGE_INTEGER SyncQPCTime; + LARGE_INTEGER SyncGPUTime; +} D3DPRESENTSTATS, *PD3DPRESENTSTATS, *LPD3DPRESENTSTATS; + +typedef struct _D3DPRESENT_PARAMETERS_ { + UINT BackBufferWidth; + UINT BackBufferHeight; + D3DFORMAT BackBufferFormat; + UINT BackBufferCount; + D3DMULTISAMPLE_TYPE MultiSampleType; + DWORD MultiSampleQuality; + D3DSWAPEFFECT SwapEffect; + HWND hDeviceWindow; + BOOL Windowed; + BOOL EnableAutoDepthStencil; + D3DFORMAT AutoDepthStencilFormat; + DWORD Flags; + UINT FullScreen_RefreshRateInHz; + UINT PresentationInterval; +} D3DPRESENT_PARAMETERS, *PD3DPRESENT_PARAMETERS, *LPD3DPRESENT_PARAMETERS; + +typedef struct _D3DRANGE { + UINT Offset; + UINT Size; +} D3DRANGE, *PD3DRANGE, *LPD3DRANGE; + +typedef struct _D3DRASTER_STATUS { + BOOL InVBlank; + UINT ScanLine; +} D3DRASTER_STATUS, *PD3DRASTER_STATUS, *LPD3DRASTER_STATUS; + +typedef struct _D3DRECT { + LONG x1; + LONG y1; + LONG x2; + LONG y2; +} D3DRECT, *PD3DRECT, *LPD3DRECT; + +typedef struct _D3DRECTPATCH_INFO { + UINT StartVertexOffsetWidth; + UINT StartVertexOffsetHeight; + UINT Width; + UINT Height; + UINT Stride; + D3DBASISTYPE Basis; + D3DDEGREETYPE Degree; +} D3DRECTPATCH_INFO, *PD3DRECTPATCH_INFO, *LPD3DRECTPATCH_INFO; + +typedef struct _D3DSURFACE_DESC { + D3DFORMAT Format; + D3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + D3DMULTISAMPLE_TYPE MultiSampleType; + DWORD MultiSampleQuality; + UINT Width; + UINT Height; +} D3DSURFACE_DESC, *PD3DSURFACE_DESC, *LPD3DSURFACE_DESC; + +typedef struct _D3DTRIPATCH_INFO { + UINT StartVertexOffset; + UINT NumVertices; + D3DBASISTYPE Basis; + D3DDEGREETYPE Degree; +} D3DTRIPATCH_INFO, *PD3DTRIPATCH_INFO, *LPD3DTRIPATCH_INFO; + +typedef struct _D3DVERTEXBUFFER_DESC { + D3DFORMAT Format; + D3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Size; + DWORD FVF; +} D3DVERTEXBUFFER_DESC, *PD3DVERTEXBUFFER_DESC, *LPD3DVERTEXBUFFER_DESC; + +typedef struct _D3DVERTEXELEMENT9 { + WORD Stream; + WORD Offset; + BYTE Type; + BYTE Method; + BYTE Usage; + BYTE UsageIndex; +} D3DVERTEXELEMENT9, *LPD3DVERTEXELEMENT9; + +typedef struct _D3DVIEWPORT9 { + DWORD X; + DWORD Y; + DWORD Width; + DWORD Height; + float MinZ; + float MaxZ; +} D3DVIEWPORT9, *PD3DVIEWPORT9, *LPD3DVIEWPORT9; + +typedef struct _D3DVOLUME_DESC { + D3DFORMAT Format; + D3DRESOURCETYPE Type; + DWORD Usage; + D3DPOOL Pool; + UINT Width; + UINT Height; + UINT Depth; +} D3DVOLUME_DESC, *PD3DVOLUME_DESC, *LPD3DVOLUME_DESC; + +#ifndef _WIN32 +/* If _WIN32 isn't declared it means only internal header files are used. To + * avoid a conflict, IUnknown is declared here rather than in d3d9.h */ + +typedef struct IUnknown IUnknown, *PUNKNOWN, *LPUNKNOWN; + +#ifdef __cplusplus +extern "C" const GUID IID_IUnknown; + +struct IUnknown +{ + virtual HRESULT WINAPI QueryInterface(REFIID riid, void **ppvObject) = 0; + virtual ULONG WINAPI AddRef() = 0; + virtual ULONG WINAPI Release() = 0; +}; +#else /* __cplusplus */ +extern const GUID IID_IUnknown; + +typedef struct IUnknownVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(IUnknown *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(IUnknown *This); + ULONG (WINAPI *Release)(IUnknown *This); +} IUnknownVtbl; + +struct IUnknown +{ + IUnknownVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IUnknown_Release(p) (p)->lpVtbl->Release(p) +#endif /* __cplusplus */ +#endif /* _WIN32 */ + +#endif /* _D3D9TYPES_H_ */ diff --git a/mesalib/include/GLES2/gl2ext.h b/mesalib/include/GLES2/gl2ext.h index a5e3f47..2b67c6e 100644 --- a/mesalib/include/GLES2/gl2ext.h +++ b/mesalib/include/GLES2/gl2ext.h @@ -33,14 +33,14 @@ extern "C" { ** used to make the header, and the header can be found at ** http://www.opengl.org/registry/ ** -** Khronos $Revision: 25922 $ on $Date: 2014-03-17 03:54:32 -0700 (Mon, 17 Mar 2014) $ +** Khronos $Revision: 28335 $ on $Date: 2014-09-26 18:55:45 -0700 (Fri, 26 Sep 2014) $ */ #ifndef GL_APIENTRYP #define GL_APIENTRYP GL_APIENTRY* #endif -/* Generated on date 20140317 */ +/* Generated on date 20140926 */ /* Generated C header for: * API: gles2 @@ -54,7 +54,6 @@ extern "C" { #ifndef GL_KHR_blend_equation_advanced #define GL_KHR_blend_equation_advanced 1 -#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 #define GL_MULTIPLY_KHR 0x9294 #define GL_SCREEN_KHR 0x9295 #define GL_OVERLAY_KHR 0x9296 @@ -76,6 +75,17 @@ GL_APICALL void GL_APIENTRY glBlendBarrierKHR (void); #endif #endif /* GL_KHR_blend_equation_advanced */ +#ifndef GL_KHR_blend_equation_advanced_coherent +#define GL_KHR_blend_equation_advanced_coherent 1 +#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 +#endif /* GL_KHR_blend_equation_advanced_coherent */ + +#ifndef GL_KHR_context_flush_control +#define GL_KHR_context_flush_control 1 +#define GL_CONTEXT_RELEASE_BEHAVIOR_KHR 0x82FB +#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x82FC +#endif /* GL_KHR_context_flush_control */ + #ifndef GL_KHR_debug #define GL_KHR_debug 1 typedef void (GL_APIENTRY *GLDEBUGPROCKHR)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const void *userParam); @@ -145,6 +155,34 @@ GL_APICALL void GL_APIENTRY glGetPointervKHR (GLenum pname, void **params); #endif #endif /* GL_KHR_debug */ +#ifndef GL_KHR_robust_buffer_access_behavior +#define GL_KHR_robust_buffer_access_behavior 1 +#endif /* GL_KHR_robust_buffer_access_behavior */ + +#ifndef GL_KHR_robustness +#define GL_KHR_robustness 1 +#define GL_CONTEXT_ROBUST_ACCESS_KHR 0x90F3 +#define GL_LOSE_CONTEXT_ON_RESET_KHR 0x8252 +#define GL_GUILTY_CONTEXT_RESET_KHR 0x8253 +#define GL_INNOCENT_CONTEXT_RESET_KHR 0x8254 +#define GL_UNKNOWN_CONTEXT_RESET_KHR 0x8255 +#define GL_RESET_NOTIFICATION_STRATEGY_KHR 0x8256 +#define GL_NO_RESET_NOTIFICATION_KHR 0x8261 +#define GL_CONTEXT_LOST_KHR 0x0507 +typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSKHRPROC) (void); +typedef void (GL_APIENTRYP PFNGLREADNPIXELSKHRPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); +typedef void (GL_APIENTRYP PFNGLGETNUNIFORMUIVKHRPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusKHR (void); +GL_APICALL void GL_APIENTRY glReadnPixelsKHR (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); +GL_APICALL void GL_APIENTRY glGetnUniformfvKHR (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); +GL_APICALL void GL_APIENTRY glGetnUniformivKHR (GLuint program, GLint location, GLsizei bufSize, GLint *params); +GL_APICALL void GL_APIENTRY glGetnUniformuivKHR (GLuint program, GLint location, GLsizei bufSize, GLuint *params); +#endif +#endif /* GL_KHR_robustness */ + #ifndef GL_KHR_texture_compression_astc_hdr #define GL_KHR_texture_compression_astc_hdr 1 #define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 @@ -200,6 +238,10 @@ GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum targe #define GL_SAMPLER_EXTERNAL_OES 0x8D66 #endif /* GL_OES_EGL_image_external */ +#ifndef GL_OES_compressed_ETC1_RGB8_sub_texture +#define GL_OES_compressed_ETC1_RGB8_sub_texture 1 +#endif /* GL_OES_compressed_ETC1_RGB8_sub_texture */ + #ifndef GL_OES_compressed_ETC1_RGB8_texture #define GL_OES_compressed_ETC1_RGB8_texture 1 #define GL_ETC1_RGB8_OES 0x8D64 @@ -512,6 +554,10 @@ GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLen #define GL_Z400_BINARY_AMD 0x8740 #endif /* GL_AMD_program_binary_Z400 */ +#ifndef GL_ANDROID_extension_pack_es31a +#define GL_ANDROID_extension_pack_es31a 1 +#endif /* GL_ANDROID_extension_pack_es31a */ + #ifndef GL_ANGLE_depth_texture #define GL_ANGLE_depth_texture 1 #endif /* GL_ANGLE_depth_texture */ @@ -587,6 +633,23 @@ GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLs #endif #endif /* GL_ANGLE_translated_shader_source */ +#ifndef GL_APPLE_clip_distance +#define GL_APPLE_clip_distance 1 +#define GL_MAX_CLIP_DISTANCES_APPLE 0x0D32 +#define GL_CLIP_DISTANCE0_APPLE 0x3000 +#define GL_CLIP_DISTANCE1_APPLE 0x3001 +#define GL_CLIP_DISTANCE2_APPLE 0x3002 +#define GL_CLIP_DISTANCE3_APPLE 0x3003 +#define GL_CLIP_DISTANCE4_APPLE 0x3004 +#define GL_CLIP_DISTANCE5_APPLE 0x3005 +#define GL_CLIP_DISTANCE6_APPLE 0x3006 +#define GL_CLIP_DISTANCE7_APPLE 0x3007 +#endif /* GL_APPLE_clip_distance */ + +#ifndef GL_APPLE_color_buffer_packed_float +#define GL_APPLE_color_buffer_packed_float 1 +#endif /* GL_APPLE_color_buffer_packed_float */ + #ifndef GL_APPLE_copy_texture_levels #define GL_APPLE_copy_texture_levels 1 typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); @@ -667,6 +730,14 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei #define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D #endif /* GL_APPLE_texture_max_level */ +#ifndef GL_APPLE_texture_packed_float +#define GL_APPLE_texture_packed_float 1 +#define GL_UNSIGNED_INT_10F_11F_11F_REV_APPLE 0x8C3B +#define GL_UNSIGNED_INT_5_9_9_9_REV_APPLE 0x8C3E +#define GL_R11F_G11F_B10F_APPLE 0x8C3A +#define GL_RGB9_E5_APPLE 0x8C3D +#endif /* GL_APPLE_texture_packed_float */ + #ifndef GL_ARM_mali_program_binary #define GL_ARM_mali_program_binary 1 #define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 @@ -691,6 +762,13 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei #define GL_ARM_shader_framebuffer_fetch_depth_stencil 1 #endif /* GL_ARM_shader_framebuffer_fetch_depth_stencil */ +#ifndef GL_DMP_program_binary +#define GL_DMP_program_binary 1 +#define GL_SMAPHS30_PROGRAM_BINARY_DMP 0x9251 +#define GL_SMAPHS_PROGRAM_BINARY_DMP 0x9252 +#define GL_DMP_PROGRAM_BINARY_DMP 0x9253 +#endif /* GL_DMP_program_binary */ + #ifndef GL_DMP_shader_binary #define GL_DMP_shader_binary 1 #define GL_SHADER_BINARY_DMP 0x9250 @@ -712,6 +790,14 @@ GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei #define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 #endif /* GL_EXT_color_buffer_half_float */ +#ifndef GL_EXT_copy_image +#define GL_EXT_copy_image 1 +typedef void (GL_APIENTRYP PFNGLCOPYIMAGESUBDATAEXTPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glCopyImageSubDataEXT (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +#endif +#endif /* GL_EXT_copy_image */ + #ifndef GL_EXT_debug_label #define GL_EXT_debug_label 1 #define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F @@ -829,6 +915,30 @@ GL_APICALL void GL_APIENTRY glDrawBuffersEXT (GLsizei n, const GLenum *bufs); #endif #endif /* GL_EXT_draw_buffers */ +#ifndef GL_EXT_draw_buffers_indexed +#define GL_EXT_draw_buffers_indexed 1 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +typedef void (GL_APIENTRYP PFNGLENABLEIEXTPROC) (GLenum target, GLuint index); +typedef void (GL_APIENTRYP PFNGLDISABLEIEXTPROC) (GLenum target, GLuint index); +typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONIEXTPROC) (GLuint buf, GLenum mode); +typedef void (GL_APIENTRYP PFNGLBLENDEQUATIONSEPARATEIEXTPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); +typedef void (GL_APIENTRYP PFNGLBLENDFUNCIEXTPROC) (GLuint buf, GLenum src, GLenum dst); +typedef void (GL_APIENTRYP PFNGLBLENDFUNCSEPARATEIEXTPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); +typedef void (GL_APIENTRYP PFNGLCOLORMASKIEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); +typedef GLboolean (GL_APIENTRYP PFNGLISENABLEDIEXTPROC) (GLenum target, GLuint index); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glEnableiEXT (GLenum target, GLuint index); +GL_APICALL void GL_APIENTRY glDisableiEXT (GLenum target, GLuint index); +GL_APICALL void GL_APIENTRY glBlendEquationiEXT (GLuint buf, GLenum mode); +GL_APICALL void GL_APIENTRY glBlendEquationSeparateiEXT (GLuint buf, GLenum modeRGB, GLenum modeAlpha); +GL_APICALL void GL_APIENTRY glBlendFunciEXT (GLuint buf, GLenum src, GLenum dst); +GL_APICALL void GL_APIENTRY glBlendFuncSeparateiEXT (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); +GL_APICALL void GL_APIENTRY glColorMaskiEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); +GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index); +#endif +#endif /* GL_EXT_draw_buffers_indexed */ + #ifndef GL_EXT_draw_instanced #define GL_EXT_draw_instanced 1 typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); @@ -839,6 +949,55 @@ GL_APICALL void GL_APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei cou #endif #endif /* GL_EXT_draw_instanced */ +#ifndef GL_EXT_geometry_point_size +#define GL_EXT_geometry_point_size 1 +#endif /* GL_EXT_geometry_point_size */ + +#ifndef GL_EXT_geometry_shader +#define GL_EXT_geometry_shader 1 +#define GL_GEOMETRY_SHADER_EXT 0x8DD9 +#define GL_GEOMETRY_SHADER_BIT_EXT 0x00000004 +#define GL_GEOMETRY_LINKED_VERTICES_OUT_EXT 0x8916 +#define GL_GEOMETRY_LINKED_INPUT_TYPE_EXT 0x8917 +#define GL_GEOMETRY_LINKED_OUTPUT_TYPE_EXT 0x8918 +#define GL_GEOMETRY_SHADER_INVOCATIONS_EXT 0x887F +#define GL_LAYER_PROVOKING_VERTEX_EXT 0x825E +#define GL_LINES_ADJACENCY_EXT 0x000A +#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B +#define GL_TRIANGLES_ADJACENCY_EXT 0x000C +#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D +#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF +#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS_EXT 0x8A2C +#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8A32 +#define GL_MAX_GEOMETRY_INPUT_COMPONENTS_EXT 0x9123 +#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS_EXT 0x9124 +#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 +#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 +#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS_EXT 0x8E5A +#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 +#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS_EXT 0x92CF +#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS_EXT 0x92D5 +#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS_EXT 0x90CD +#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS_EXT 0x90D7 +#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D +#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E +#define GL_UNDEFINED_VERTEX_EXT 0x8260 +#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 +#define GL_FRAMEBUFFER_DEFAULT_LAYERS_EXT 0x9312 +#define GL_MAX_FRAMEBUFFER_LAYERS_EXT 0x9317 +#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 +#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 +#define GL_REFERENCED_BY_GEOMETRY_SHADER_EXT 0x9309 +typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level); +#endif +#endif /* GL_EXT_geometry_shader */ + +#ifndef GL_EXT_gpu_shader5 +#define GL_EXT_gpu_shader5 1 +#endif /* GL_EXT_gpu_shader5 */ + #ifndef GL_EXT_instanced_arrays #define GL_EXT_instanced_arrays 1 #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_EXT 0x88FE @@ -911,12 +1070,23 @@ GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLi #define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A #endif /* GL_EXT_occlusion_query_boolean */ +#ifndef GL_EXT_primitive_bounding_box +#define GL_EXT_primitive_bounding_box 1 +#define GL_PRIMITIVE_BOUNDING_BOX_EXT 0x92BE +typedef void (GL_APIENTRYP PFNGLPRIMITIVEBOUNDINGBOXEXTPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glPrimitiveBoundingBoxEXT (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); +#endif +#endif /* GL_EXT_primitive_bounding_box */ + #ifndef GL_EXT_pvrtc_sRGB #define GL_EXT_pvrtc_sRGB 1 #define GL_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 #define GL_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55 #define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56 #define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV2_IMG 0x93F0 +#define GL_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV2_IMG 0x93F1 #endif /* GL_EXT_pvrtc_sRGB */ #ifndef GL_EXT_read_format_bgra @@ -1064,10 +1234,18 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin #define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 #endif /* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_implicit_conversions +#define GL_EXT_shader_implicit_conversions 1 +#endif /* GL_EXT_shader_implicit_conversions */ + #ifndef GL_EXT_shader_integer_mix #define GL_EXT_shader_integer_mix 1 #endif /* GL_EXT_shader_integer_mix */ +#ifndef GL_EXT_shader_io_blocks +#define GL_EXT_shader_io_blocks 1 +#endif /* GL_EXT_shader_io_blocks */ + #ifndef GL_EXT_shader_pixel_local_storage #define GL_EXT_shader_pixel_local_storage 1 #define GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE_EXT 0x8F63 @@ -1087,6 +1265,109 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin #define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 #endif /* GL_EXT_shadow_samplers */ +#ifndef GL_EXT_tessellation_point_size +#define GL_EXT_tessellation_point_size 1 +#endif /* GL_EXT_tessellation_point_size */ + +#ifndef GL_EXT_tessellation_shader +#define GL_EXT_tessellation_shader 1 +#define GL_PATCHES_EXT 0x000E +#define GL_PATCH_VERTICES_EXT 0x8E72 +#define GL_TESS_CONTROL_OUTPUT_VERTICES_EXT 0x8E75 +#define GL_TESS_GEN_MODE_EXT 0x8E76 +#define GL_TESS_GEN_SPACING_EXT 0x8E77 +#define GL_TESS_GEN_VERTEX_ORDER_EXT 0x8E78 +#define GL_TESS_GEN_POINT_MODE_EXT 0x8E79 +#define GL_ISOLINES_EXT 0x8E7A +#define GL_QUADS_EXT 0x0007 +#define GL_FRACTIONAL_ODD_EXT 0x8E7B +#define GL_FRACTIONAL_EVEN_EXT 0x8E7C +#define GL_MAX_PATCH_VERTICES_EXT 0x8E7D +#define GL_MAX_TESS_GEN_LEVEL_EXT 0x8E7E +#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E7F +#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E80 +#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS_EXT 0x8E81 +#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS_EXT 0x8E82 +#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS_EXT 0x8E83 +#define GL_MAX_TESS_PATCH_COMPONENTS_EXT 0x8E84 +#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS_EXT 0x8E85 +#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS_EXT 0x8E86 +#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS_EXT 0x8E89 +#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS_EXT 0x8E8A +#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS_EXT 0x886C +#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS_EXT 0x886D +#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS_EXT 0x8E1E +#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS_EXT 0x8E1F +#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS_EXT 0x92CD +#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS_EXT 0x92CE +#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS_EXT 0x92D3 +#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS_EXT 0x92D4 +#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS_EXT 0x90CB +#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS_EXT 0x90CC +#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS_EXT 0x90D8 +#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS_EXT 0x90D9 +#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 +#define GL_IS_PER_PATCH_EXT 0x92E7 +#define GL_REFERENCED_BY_TESS_CONTROL_SHADER_EXT 0x9307 +#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER_EXT 0x9308 +#define GL_TESS_CONTROL_SHADER_EXT 0x8E88 +#define GL_TESS_EVALUATION_SHADER_EXT 0x8E87 +#define GL_TESS_CONTROL_SHADER_BIT_EXT 0x00000008 +#define GL_TESS_EVALUATION_SHADER_BIT_EXT 0x00000010 +typedef void (GL_APIENTRYP PFNGLPATCHPARAMETERIEXTPROC) (GLenum pname, GLint value); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glPatchParameteriEXT (GLenum pname, GLint value); +#endif +#endif /* GL_EXT_tessellation_shader */ + +#ifndef GL_EXT_texture_border_clamp +#define GL_EXT_texture_border_clamp 1 +#define GL_TEXTURE_BORDER_COLOR_EXT 0x1004 +#define GL_CLAMP_TO_BORDER_EXT 0x812D +typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); +typedef void (GL_APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); +typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, const GLint *param); +typedef void (GL_APIENTRYP PFNGLSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, const GLuint *param); +typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIIVEXTPROC) (GLuint sampler, GLenum pname, GLint *params); +typedef void (GL_APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVEXTPROC) (GLuint sampler, GLenum pname, GLuint *params); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params); +GL_APICALL void GL_APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params); +GL_APICALL void GL_APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params); +GL_APICALL void GL_APIENTRY glSamplerParameterIivEXT (GLuint sampler, GLenum pname, const GLint *param); +GL_APICALL void GL_APIENTRY glSamplerParameterIuivEXT (GLuint sampler, GLenum pname, const GLuint *param); +GL_APICALL void GL_APIENTRY glGetSamplerParameterIivEXT (GLuint sampler, GLenum pname, GLint *params); +GL_APICALL void GL_APIENTRY glGetSamplerParameterIuivEXT (GLuint sampler, GLenum pname, GLuint *params); +#endif +#endif /* GL_EXT_texture_border_clamp */ + +#ifndef GL_EXT_texture_buffer +#define GL_EXT_texture_buffer 1 +#define GL_TEXTURE_BUFFER_EXT 0x8C2A +#define GL_TEXTURE_BUFFER_BINDING_EXT 0x8C2A +#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B +#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C +#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D +#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT_EXT 0x919F +#define GL_SAMPLER_BUFFER_EXT 0x8DC2 +#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 +#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 +#define GL_IMAGE_BUFFER_EXT 0x9051 +#define GL_INT_IMAGE_BUFFER_EXT 0x905C +#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 +#define GL_TEXTURE_BUFFER_OFFSET_EXT 0x919D +#define GL_TEXTURE_BUFFER_SIZE_EXT 0x919E +typedef void (GL_APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); +typedef void (GL_APIENTRYP PFNGLTEXBUFFERRANGEEXTPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer); +GL_APICALL void GL_APIENTRY glTexBufferRangeEXT (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +#endif +#endif /* GL_EXT_texture_buffer */ + #ifndef GL_EXT_texture_compression_dxt1 #define GL_EXT_texture_compression_dxt1 1 #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 @@ -1099,6 +1380,19 @@ GL_APICALL void GL_APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLin #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 #endif /* GL_EXT_texture_compression_s3tc */ +#ifndef GL_EXT_texture_cube_map_array +#define GL_EXT_texture_cube_map_array 1 +#define GL_TEXTURE_CUBE_MAP_ARRAY_EXT 0x9009 +#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_EXT 0x900A +#define GL_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900C +#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_EXT 0x900D +#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900E +#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_EXT 0x900F +#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 +#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F +#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A +#endif /* GL_EXT_texture_cube_map_array */ + #ifndef GL_EXT_texture_filter_anisotropic #define GL_EXT_texture_filter_anisotropic 1 #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE @@ -1161,6 +1455,19 @@ GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target #define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 #endif /* GL_EXT_texture_type_2_10_10_10_REV */ +#ifndef GL_EXT_texture_view +#define GL_EXT_texture_view 1 +#define GL_TEXTURE_VIEW_MIN_LEVEL_EXT 0x82DB +#define GL_TEXTURE_VIEW_NUM_LEVELS_EXT 0x82DC +#define GL_TEXTURE_VIEW_MIN_LAYER_EXT 0x82DD +#define GL_TEXTURE_VIEW_NUM_LAYERS_EXT 0x82DE +#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF +typedef void (GL_APIENTRYP PFNGLTEXTUREVIEWEXTPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glTextureViewEXT (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); +#endif +#endif /* GL_EXT_texture_view */ + #ifndef GL_EXT_unpack_subimage #define GL_EXT_unpack_subimage 1 #define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 diff --git a/mesalib/include/d3dadapter/d3dadapter9.h b/mesalib/include/d3dadapter/d3dadapter9.h new file mode 100644 index 0000000..76ad3d4 --- /dev/null +++ b/mesalib/include/d3dadapter/d3dadapter9.h @@ -0,0 +1,101 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#ifndef _D3DADAPTER9_H_ +#define _D3DADAPTER9_H_ + +#include "present.h" + +#ifndef __cplusplus + +/* Representation of an adapter group, although since this is implemented by + * the driver, it knows nothing about the windowing system it's on */ +typedef struct ID3DAdapter9Vtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(ID3DAdapter9 *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ID3DAdapter9 *This); + ULONG (WINAPI *Release)(ID3DAdapter9 *This); + + /* ID3DAdapter9 */ + HRESULT (WINAPI *GetAdapterIdentifier)(ID3DAdapter9 *This, DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier); + HRESULT (WINAPI *CheckDeviceType)(ID3DAdapter9 *This, D3DDEVTYPE DevType, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, BOOL bWindowed); + HRESULT (WINAPI *CheckDeviceFormat)(ID3DAdapter9 *This, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); + HRESULT (WINAPI *CheckDeviceMultiSampleType)(ID3DAdapter9 *This, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels); + HRESULT (WINAPI *CheckDepthStencilMatch)(ID3DAdapter9 *This, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat); + HRESULT (WINAPI *CheckDeviceFormatConversion)(ID3DAdapter9 *This, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat); + HRESULT (WINAPI *GetDeviceCaps)(ID3DAdapter9 *This, D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps); + HRESULT (WINAPI *CreateDevice)(ID3DAdapter9 *This, UINT RealAdapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3D9 *pD3D9, ID3DPresentGroup *pPresentationFactory, IDirect3DDevice9 **ppReturnedDeviceInterface); + HRESULT (WINAPI *CreateDeviceEx)(ID3DAdapter9 *This, UINT RealAdapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode, IDirect3D9Ex *pD3D9Ex, ID3DPresentGroup *pPresentationFactory, IDirect3DDevice9Ex **ppReturnedDeviceInterface); +} ID3DAdapter9Vtbl; + +struct ID3DAdapter9 +{ + ID3DAdapter9Vtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define ID3DAdapter9_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DAdapter9_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DAdapter9_Release(p) (p)->lpVtbl->Release(p) +/* ID3DAdapter9 macros */ +#define ID3DAdapter9_GetAdapterIdentifier(p,a,b) (p)->lpVtbl->GetAdapterIdentifier(p,a,b) +#define ID3DAdapter9_CheckDeviceType(p,a,b,c,d) (p)->lpVtbl->CheckDeviceType(p,a,b,c,d) +#define ID3DAdapter9_CheckDeviceFormat(p,a,b,c,d,e) (p)->lpVtbl->CheckDeviceFormat(p,a,b,c,d,e) +#define ID3DAdapter9_CheckDeviceMultiSampleType(p,a,b,c,d,e) (p)->lpVtbl->CheckDeviceMultiSampleType(p,a,b,c,d,e) +#define ID3DAdapter9_CheckDepthStencilMatch(p,a,b,c,d) (p)->lpVtbl->CheckDepthStencilMatch(p,a,b,c,d) +#define ID3DAdapter9_CheckDeviceFormatConversion(p,a,b,c) (p)->lpVtbl->CheckDeviceFormatConversion(p,a,b,c) +#define ID3DAdapter9_GetDeviceCaps(p,a,b) (p)->lpVtbl->GetDeviceCaps(p,a,b) +#define ID3DAdapter9_CreateDevice(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->CreateDevice(p,a,b,c,d,e,f,g,h) +#define ID3DAdapter9_CreateDeviceEx(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->CreateDeviceEx(p,a,b,c,d,e,f,g,h,i) + +#else /* __cplusplus */ + +struct ID3DAdapter9 : public IUnknown +{ + HRESULT WINAPI GetAdapterIdentifier(DWORD Flags, D3DADAPTER_IDENTIFIER9 *pIdentifier); + HRESULT WINAPI CheckDeviceType(D3DDEVTYPE DevType, D3DFORMAT AdapterFormat, D3DFORMAT BackBufferFormat, BOOL bWindowed); + HRESULT WINAPI CheckDeviceFormat(D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat); + HRESULT WINAPI CheckDeviceMultiSampleType(D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD *pQualityLevels); + HRESULT WINAPI CheckDepthStencilMatch(D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat); + HRESULT WINAPI CheckDeviceFormatConversion(D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat); + HRESULT WINAPI GetDeviceCaps(D3DDEVTYPE DeviceType, D3DCAPS9 *pCaps); + HRESULT WINAPI CreateDevice(UINT RealAdapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, IDirect3D9 *pD3D9, ID3DPresentGroup *pPresentationFactory, IDirect3DDevice9 **ppReturnedDeviceInterface); + HRESULT WINAPI CreateDeviceEx(UINT RealAdapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode, IDirect3D9Ex *pD3D9Ex, ID3DPresentGroup *pPresentationFactory, IDirect3DDevice9Ex **ppReturnedDeviceInterface); +}; + +#endif /* __cplusplus */ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* acquire a const struct D3DAdapter9* structure describing the interface + * queried. See */ +const void * WINAPI +D3DAdapter9GetProc( const char *name ); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* _D3DADAPTER9_H_ */ diff --git a/mesalib/include/d3dadapter/drm.h b/mesalib/include/d3dadapter/drm.h new file mode 100644 index 0000000..9ec3e60 --- /dev/null +++ b/mesalib/include/d3dadapter/drm.h @@ -0,0 +1,44 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#ifndef _D3DADAPTER9_DRM_H_ +#define _D3DADAPTER9_DRM_H_ + +#include "d3dadapter9.h" + +/* query driver support name */ +#define D3DADAPTER9DRM_NAME "drm" +/* current version */ +#define D3DADAPTER9DRM_MAJOR 0 +#define D3DADAPTER9DRM_MINOR 0 + +struct D3DAdapter9DRM +{ + unsigned major_version; /* ABI break */ + unsigned minor_version; /* backwards compatible feature additions */ + + /* NOTE: upon passing an fd to this function, it's now owned by this + function. If this function fails, the fd will be closed here as well */ + HRESULT (WINAPI *create_adapter)(int fd, ID3DAdapter9 **ppAdapter); +}; + +#endif /* _D3DADAPTER9_DRM_H_ */ diff --git a/mesalib/include/d3dadapter/present.h b/mesalib/include/d3dadapter/present.h new file mode 100644 index 0000000..08a9729 --- /dev/null +++ b/mesalib/include/d3dadapter/present.h @@ -0,0 +1,136 @@ +/* + * Copyright 2011 Joakim Sindholt <opensource(a)zhasha.com> + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * on the rights to use, copy, modify, merge, publish, distribute, sub + * license, and/or sell copies of the Software, and to permit persons to whom + * the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. */ + +#ifndef _D3DADAPTER_PRESENT_H_ +#define _D3DADAPTER_PRESENT_H_ + +#include <d3d9.h> + +#ifndef D3DOK_WINDOW_OCCLUDED +#define D3DOK_WINDOW_OCCLUDED MAKE_D3DSTATUS(2531) +#endif /* D3DOK_WINDOW_OCCLUDED */ + +#ifndef __cplusplus +typedef struct ID3DPresent ID3DPresent; +typedef struct ID3DPresentGroup ID3DPresentGroup; +typedef struct ID3DAdapter9 ID3DAdapter9; +typedef struct D3DWindowBuffer D3DWindowBuffer; + +/* Presentation backend for drivers to display their brilliant work */ +typedef struct ID3DPresentVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(ID3DPresent *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ID3DPresent *This); + ULONG (WINAPI *Release)(ID3DPresent *This); + + /* ID3DPresent */ + /* This function initializes the screen and window provided at creation. + * Hence why this should always be called as the one of first things a new + * swap chain does */ + HRESULT (WINAPI *SetPresentParameters)(ID3DPresent *This, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode); + /* Make a buffer visible to the window system via dma-buf fd. + * For better compatibility, it must be 32bpp and format ARGB/XRGB */ + HRESULT (WINAPI *NewD3DWindowBufferFromDmaBuf)(ID3DPresent *This, int dmaBufFd, int width, int height, int stride, int depth, int bpp, D3DWindowBuffer **out); + HRESULT (WINAPI *DestroyD3DWindowBuffer)(ID3DPresent *This, D3DWindowBuffer *buffer); + /* After presenting a buffer to the window system, the buffer + * may be used as is (no copy of the content) by the window system. + * You must not use a non-released buffer, else the user may see undefined content. */ + HRESULT (WINAPI *WaitBufferReleased)(ID3DPresent *This, D3DWindowBuffer *buffer); + HRESULT (WINAPI *FrontBufferCopy)(ID3DPresent *This, D3DWindowBuffer *buffer); + /* It is possible to do partial copy, but impossible to do resizing, which must + * be done by the client after checking the front buffer size */ + HRESULT (WINAPI *PresentBuffer)(ID3DPresent *This, D3DWindowBuffer *buffer, HWND hWndOverride, const RECT *pSourceRect, const RECT *pDestRect, const RGNDATA *pDirtyRegion, DWORD Flags); + HRESULT (WINAPI *GetRasterStatus)(ID3DPresent *This, D3DRASTER_STATUS *pRasterStatus); + HRESULT (WINAPI *GetDisplayMode)(ID3DPresent *This, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation); + HRESULT (WINAPI *GetPresentStats)(ID3DPresent *This, D3DPRESENTSTATS *pStats); + HRESULT (WINAPI *GetCursorPos)(ID3DPresent *This, POINT *pPoint); + HRESULT (WINAPI *SetCursorPos)(ID3DPresent *This, POINT *pPoint); + /* Cursor size is always 32x32. pBitmap and pHotspot can be NULL. */ + HRESULT (WINAPI *SetCursor)(ID3DPresent *This, void *pBitmap, POINT *pHotspot, BOOL bShow); + HRESULT (WINAPI *SetGammaRamp)(ID3DPresent *This, const D3DGAMMARAMP *pRamp, HWND hWndOverride); + HRESULT (WINAPI *GetWindowInfo)(ID3DPresent *This, HWND hWnd, int *width, int *height, int *depth); +} ID3DPresentVtbl; + +struct ID3DPresent +{ + ID3DPresentVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define ID3DPresent_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DPresent_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DPresent_Release(p) (p)->lpVtbl->Release(p) +/* ID3DPresent macros */ +#define ID3DPresent_GetPresentParameters(p,a) (p)->lpVtbl->GetPresentParameters(p,a) +#define ID3DPresent_SetPresentParameters(p,a,b) (p)->lpVtbl->SetPresentParameters(p,a,b) +#define ID3DPresent_NewD3DWindowBufferFromDmaBuf(p,a,b,c,d,e,f,g) (p)->lpVtbl->NewD3DWindowBufferFromDmaBuf(p,a,b,c,d,e,f,g) +#define ID3DPresent_DestroyD3DWindowBuffer(p,a) (p)->lpVtbl->DestroyD3DWindowBuffer(p,a) +#define ID3DPresent_WaitBufferReleased(p,a) (p)->lpVtbl->WaitBufferReleased(p,a) +#define ID3DPresent_FrontBufferCopy(p,a) (p)->lpVtbl->FrontBufferCopy(p,a) +#define ID3DPresent_PresentBuffer(p,a,b,c,d,e,f) (p)->lpVtbl->PresentBuffer(p,a,b,c,d,e,f) +#define ID3DPresent_GetRasterStatus(p,a) (p)->lpVtbl->GetRasterStatus(p,a) +#define ID3DPresent_GetDisplayMode(p,a,b) (p)->lpVtbl->GetDisplayMode(p,a,b) +#define ID3DPresent_GetPresentStats(p,a) (p)->lpVtbl->GetPresentStats(p,a) +#define ID3DPresent_GetCursorPos(p,a) (p)->lpVtbl->GetCursorPos(p,a) +#define ID3DPresent_SetCursorPos(p,a) (p)->lpVtbl->SetCursorPos(p,a) +#define ID3DPresent_SetCursor(p,a,b,c) (p)->lpVtbl->SetCursor(p,a,b,c) +#define ID3DPresent_SetGammaRamp(p,a,b) (p)->lpVtbl->SetGammaRamp(p,a,b) +#define ID3DPresent_GetWindowInfo(p,a,b,c,d) (p)->lpVtbl->GetWindowSize(p,a,b,c,d) + +typedef struct ID3DPresentGroupVtbl +{ + /* IUnknown */ + HRESULT (WINAPI *QueryInterface)(ID3DPresentGroup *This, REFIID riid, void **ppvObject); + ULONG (WINAPI *AddRef)(ID3DPresentGroup *This); + ULONG (WINAPI *Release)(ID3DPresentGroup *This); + + /* ID3DPresentGroup */ + /* When creating a device, it's relevant for the driver to know how many + * implicit swap chains to create. It has to create one per monitor in a + * multi-monitor setup */ + UINT (WINAPI *GetMultiheadCount)(ID3DPresentGroup *This); + /* returns only the implicit present interfaces */ + HRESULT (WINAPI *GetPresent)(ID3DPresentGroup *This, UINT Index, ID3DPresent **ppPresent); + /* used to create additional presentation interfaces along the way */ + HRESULT (WINAPI *CreateAdditionalPresent)(ID3DPresentGroup *This, D3DPRESENT_PARAMETERS *pPresentationParameters, ID3DPresent **ppPresent); + void (WINAPI *GetVersion) (ID3DPresentGroup *This, int *major, int *minor); +} ID3DPresentGroupVtbl; + +struct ID3DPresentGroup +{ + ID3DPresentGroupVtbl *lpVtbl; +}; + +/* IUnknown macros */ +#define ID3DPresentGroup_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DPresentGroup_AddRef(p) (p)->lpVtbl->AddRef(p) +#define ID3DPresentGroup_Release(p) (p)->lpVtbl->Release(p) +/* ID3DPresentGroup */ +#define ID3DPresentGroup_GetMultiheadCount(p) (p)->lpVtbl->GetMultiheadCount(p) +#define ID3DPresentGroup_GetPresent(p,a,b) (p)->lpVtbl->GetPresent(p,a,b) +#define ID3DPresentGroup_CreateAdditionalPresent(p,a,b) (p)->lpVtbl->CreateAdditionalPresent(p,a,b) +#define ID3DPresentGroup_GetVersion(p,a,b) (p)->lpVtbl->GetVersion(p,a,b) + +#endif /* __cplusplus */ + +#endif /* _D3DADAPTER_PRESENT_H_ */ diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index dd5ca56..8e2090b 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -301,6 +301,10 @@ def generate(env): cppdefines += ['HAVE_ALIAS'] else: cppdefines += ['GLX_ALIAS_UNSUPPORTED'] + + if env['platform'] in ('linux', 'darwin'): + cppdefines += ['HAVE_XLOCALE_H'] + if env['platform'] == 'haiku': cppdefines += [ 'HAVE_PTHREAD', @@ -374,22 +378,19 @@ def generate(env): #'-march=pentium4', ] if distutils.version.LooseVersion(ccversion) >= distutils.version.LooseVersion('4.2') \ - and (platform != 'windows' or env['build'] == 'debug' or True) \ and platform != 'haiku': # NOTE: We need to ensure stack is realigned given that we # produce shared objects, and have no control over the stack # alignment policy of the application. Therefore we need # -mstackrealign ore -mincoming-stack-boundary=2. # - # XXX: -O and -mstackrealign causes stack corruption on MinGW - # # XXX: We could have SSE without -mstackrealign if we always used # __attribute__((force_align_arg_pointer)), but that's not # always the case. ccflags += [ '-mstackrealign', # ensure stack is aligned - '-mmmx', '-msse', '-msse2', # enable SIMD intrinsics - #'-mfpmath=sse', + '-msse', '-msse2', # enable SIMD intrinsics + '-mfpmath=sse', # generate SSE floating-point arithmetic ] if platform in ['windows', 'darwin']: # Workaround http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37216 @@ -468,7 +469,7 @@ def generate(env): ] if env['machine'] == 'x86': ccflags += [ - #'/arch:SSE2', # use the SSE2 instructions + '/arch:SSE2', # use the SSE2 instructions (default since MSVC 2012) ] if platform == 'windows': ccflags += [ @@ -617,7 +618,7 @@ def generate(env): env.Tool('custom') createInstallMethods(env) - env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes']) + env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes', 'glproto >= 1.4.13']) env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1', 'xcb-dri2 >= 1.8']) env.PkgCheckModules('XF86VIDMODE', ['xxf86vm']) env.PkgCheckModules('DRM', ['libdrm >= 2.4.38']) diff --git a/mesalib/src/gallium/Automake.inc b/mesalib/src/gallium/Automake.inc index c43f735..9b312b1 100644 --- a/mesalib/src/gallium/Automake.inc +++ b/mesalib/src/gallium/Automake.inc @@ -58,7 +58,8 @@ GALLIUM_WINSYS_CFLAGS = \ GALLIUM_PIPE_LOADER_WINSYS_LIBS = \ - $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la + $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \ + $(top_builddir)/src/gallium/winsys/sw/wrapper/libwsw.la if HAVE_DRISW GALLIUM_PIPE_LOADER_WINSYS_LIBS += \ diff --git a/mesalib/src/gallium/Makefile.am b/mesalib/src/gallium/Makefile.am index 21595a1..81840b2 100644 --- a/mesalib/src/gallium/Makefile.am +++ b/mesalib/src/gallium/Makefile.am @@ -138,14 +138,6 @@ if HAVE_OPENVG SUBDIRS += state_trackers/vega endif -if HAVE_GALLIUM_EGL -SUBDIRS += state_trackers/egl targets/egl-static -endif - -if HAVE_GALLIUM_GBM -SUBDIRS += state_trackers/gbm targets/gbm -endif - if HAVE_X11_DRIVER SUBDIRS += state_trackers/glx/xlib targets/libgl-xlib endif @@ -174,11 +166,16 @@ if HAVE_ST_XVMC SUBDIRS += state_trackers/xvmc targets/xvmc endif +if HAVE_ST_NINE +SUBDIRS += state_trackers/nine targets/d3dadapter9 +endif + ## ## Don't forget to bundle the remaining (non autotools) state-trackers/targets ## EXTRA_DIST += \ + include \ state_trackers/README \ state_trackers/wgl targets/libgl-gdi \ targets/graw-gdi targets/graw-null targets/graw-xlib \ diff --git a/mesalib/src/gallium/auxiliary/Android.mk b/mesalib/src/gallium/auxiliary/Android.mk index 8046943..0bc1831 100644 --- a/mesalib/src/gallium/auxiliary/Android.mk +++ b/mesalib/src/gallium/auxiliary/Android.mk @@ -28,7 +28,9 @@ include $(LOCAL_PATH)/Makefile.sources include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(C_SOURCES) +LOCAL_SRC_FILES := \ + $(C_SOURCES) \ + $(VL_STUB_SOURCES) LOCAL_C_INCLUDES := \ $(GALLIUM_TOP)/auxiliary/util \ diff --git a/mesalib/src/gallium/auxiliary/Makefile.am b/mesalib/src/gallium/auxiliary/Makefile.am index 4d8ba89..4085e51 100644 --- a/mesalib/src/gallium/auxiliary/Makefile.am +++ b/mesalib/src/gallium/auxiliary/Makefile.am @@ -30,8 +30,7 @@ AM_CXXFLAGS += \ $(LLVM_CXXFLAGS) libgallium_la_SOURCES += \ - $(GALLIVM_SOURCES) \ - $(GALLIVM_CPP_SOURCES) + $(GALLIVM_SOURCES) endif @@ -46,3 +45,42 @@ indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv $(AM_V_at)$(MKDIR_P) util $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@ + + +noinst_LTLIBRARIES += libgalliumvl_stub.la +libgalliumvl_stub_la_SOURCES = \ + $(VL_STUB_SOURCES) + +if NEED_GALLIUM_VL + +noinst_LTLIBRARIES += libgalliumvl.la + +libgalliumvl_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(VL_CFLAGS) \ + $(LIBDRM_CFLAGS) \ + $(GALLIUM_PIPE_LOADER_DEFINES) \ + -DPIPE_SEARCH_DIR=\"$(libdir)/gallium-pipe\" + +if HAVE_GALLIUM_STATIC_TARGETS +libgalliumvl_la_CFLAGS += \ + -DGALLIUM_STATIC_TARGETS=1 + +endif # HAVE_GALLIUM_STATIC_TARGETS + +libgalliumvl_la_SOURCES = \ + $(VL_SOURCES) + +endif + +EXTRA_DIST = \ + Android.mk SConscript \ + indices/u_indices.c \ + indices/u_unfilled_indices.c \ + indices/u_indices_gen.py \ + indices/u_unfilled_gen.py \ + target-helpers \ + util/u_format.csv \ + util/u_format_pack.py \ + util/u_format_parse.py \ + util/u_format_table.py diff --git a/mesalib/src/gallium/auxiliary/Makefile.sources b/mesalib/src/gallium/auxiliary/Makefile.sources index f6621ef..8626264 100644 --- a/mesalib/src/gallium/auxiliary/Makefile.sources +++ b/mesalib/src/gallium/auxiliary/Makefile.sources @@ -1,13 +1,23 @@ C_SOURCES := \ cso_cache/cso_cache.c \ + cso_cache/cso_cache.h \ cso_cache/cso_context.c \ + cso_cache/cso_context.h \ cso_cache/cso_hash.c \ + cso_cache/cso_hash.h \ + draw/draw_cliptest_tmp.h \ draw/draw_context.c \ + draw/draw_context.h \ + draw/draw_decompose_tmp.h \ draw/draw_fs.c \ + draw/draw_fs.h \ draw/draw_gs.c \ - draw/draw_pipe.c \ + draw/draw_gs.h \ + draw/draw_gs_tmp.h \ draw/draw_pipe_aaline.c \ draw/draw_pipe_aapoint.c \ + draw/draw_pipe.c \ + draw/draw_pipe.h \ draw/draw_pipe_clip.c \ draw/draw_pipe_cull.c \ draw/draw_pipe_flatshade.c \ @@ -22,142 +32,315 @@ C_SOURCES := \ draw/draw_pipe_wide_line.c \ draw/draw_pipe_wide_point.c \ draw/draw_prim_assembler.c \ + draw/draw_prim_assembler.h \ + draw/draw_prim_assembler_tmp.h \ + draw/draw_private.h \ draw/draw_pt.c \ + draw/draw_pt_decompose.h \ draw/draw_pt_emit.c \ draw/draw_pt_fetch.c \ draw/draw_pt_fetch_emit.c \ draw/draw_pt_fetch_shade_emit.c \ draw/draw_pt_fetch_shade_pipeline.c \ + draw/draw_pt.h \ draw/draw_pt_post_vs.c \ draw/draw_pt_so_emit.c \ draw/draw_pt_util.c \ draw/draw_pt_vsplit.c \ + draw/draw_pt_vsplit_tmp.h \ + draw/draw_so_emit_tmp.h \ + draw/draw_split_tmp.h \ + draw/draw_vbuf.h \ draw/draw_vertex.c \ + draw/draw_vertex.h \ draw/draw_vs.c \ draw/draw_vs_exec.c \ + draw/draw_vs.h \ draw/draw_vs_variant.c \ hud/font.c \ + hud/font.h \ hud/hud_context.c \ + hud/hud_context.h \ hud/hud_cpu.c \ + hud/hud_driver_query.c \ hud/hud_fps.c \ - hud/hud_driver_query.c \ + hud/hud_private.h \ + indices/u_indices.h \ + indices/u_indices_priv.h \ indices/u_primconvert.c \ + indices/u_primconvert.h \ + os/os_memory_aligned.h \ + os/os_memory_debug.h \ + os/os_memory_stdc.h \ + os/os_memory.h \ os/os_misc.c \ + os/os_misc.h \ + os/os_mman.h \ os/os_process.c \ + os/os_process.h \ + os/os_thread.h \ os/os_time.c \ + os/os_time.h \ pipebuffer/pb_buffer_fenced.c \ + pipebuffer/pb_buffer_fenced.h \ + pipebuffer/pb_buffer.h \ pipebuffer/pb_buffer_malloc.c \ pipebuffer/pb_bufmgr_alt.c \ pipebuffer/pb_bufmgr_cache.c \ pipebuffer/pb_bufmgr_debug.c \ + pipebuffer/pb_bufmgr.h \ pipebuffer/pb_bufmgr_mm.c \ pipebuffer/pb_bufmgr_ondemand.c \ pipebuffer/pb_bufmgr_pool.c \ pipebuffer/pb_bufmgr_slab.c \ pipebuffer/pb_validate.c \ + pipebuffer/pb_validate.h \ + postprocess/filters.h \ + postprocess/postprocess.h \ postprocess/pp_celshade.c \ + postprocess/pp_celshade.h \ postprocess/pp_colors.c \ + postprocess/pp_colors.h \ + postprocess/pp_filters.h \ postprocess/pp_init.c \ + postprocess/pp_mlaa_areamap.h \ postprocess/pp_mlaa.c \ - postprocess/pp_run.c \ + postprocess/pp_mlaa.h \ + postprocess/pp_private.h \ postprocess/pp_program.c \ + postprocess/pp_run.c \ rbug/rbug_connection.c \ + rbug/rbug_connection.h \ rbug/rbug_context.c \ + rbug/rbug_context.h \ rbug/rbug_core.c \ + rbug/rbug_core.h \ rbug/rbug_demarshal.c \ - rbug/rbug_texture.c \ + rbug/rbug.h \ + rbug/rbug_internal.h \ + rbug/rbug_proto.h \ rbug/rbug_shader.c \ + rbug/rbug_shader.h \ + rbug/rbug_texture.c \ + rbug/rbug_texture.h \ rtasm/rtasm_cpu.c \ + rtasm/rtasm_cpu.h \ rtasm/rtasm_execmem.c \ + rtasm/rtasm_execmem.h \ rtasm/rtasm_x86sse.c \ + rtasm/rtasm_x86sse.h \ tgsi/tgsi_build.c \ + tgsi/tgsi_build.h \ tgsi/tgsi_dump.c \ + tgsi/tgsi_dump.h \ tgsi/tgsi_exec.c \ + tgsi/tgsi_exec.h \ tgsi/tgsi_info.c \ + tgsi/tgsi_info.h \ tgsi/tgsi_iterate.c \ + tgsi/tgsi_iterate.h \ tgsi/tgsi_lowering.c \ + tgsi/tgsi_lowering.h \ + tgsi/tgsi_opcode_tmp.h \ tgsi/tgsi_parse.c \ + tgsi/tgsi_parse.h \ tgsi/tgsi_sanity.c \ + tgsi/tgsi_sanity.h \ tgsi/tgsi_scan.c \ + tgsi/tgsi_scan.h \ tgsi/tgsi_strings.c \ + tgsi/tgsi_strings.h \ tgsi/tgsi_text.c \ + tgsi/tgsi_text.h \ tgsi/tgsi_transform.c \ + tgsi/tgsi_transform.h \ tgsi/tgsi_ureg.c \ + tgsi/tgsi_ureg.h \ tgsi/tgsi_util.c \ + tgsi/tgsi_util.h \ translate/translate.c \ + translate/translate.h \ translate/translate_cache.c \ + translate/translate_cache.h \ translate/translate_generic.c \ translate/translate_sse.c \ + util/dbghelp.h \ + util/u_atomic.h \ + util/u_bitmask.c \ + util/u_bitmask.h \ + util/u_blit.c \ + util/u_blit.h \ + util/u_blitter.c \ + util/u_blitter.h \ + util/u_box.h \ + util/u_cache.c \ + util/u_cache.h \ + util/u_caps.c \ + util/u_caps.h \ + util/u_clear.h \ + util/u_cpu_detect.c \ + util/u_cpu_detect.h \ util/u_debug.c \ util/u_debug_describe.c \ + util/u_debug_describe.h \ util/u_debug_flush.c \ + util/u_debug_flush.h \ + util/u_debug.h \ util/u_debug_memory.c \ util/u_debug_refcnt.c \ + util/u_debug_refcnt.h \ util/u_debug_stack.c \ + util/u_debug_stack.h \ util/u_debug_symbol.c \ - util/u_dump_defines.c \ - util/u_dump_state.c \ - util/u_bitmask.c \ - util/u_blit.c \ - util/u_blitter.c \ - util/u_cache.c \ - util/u_caps.c \ - util/u_cpu_detect.c \ + util/u_debug_symbol.h \ + util/u_dirty_flags.h \ + util/u_dirty_surfaces.h \ util/u_dl.c \ + util/u_dl.h \ + util/u_double_list.h \ util/u_draw.c \ + util/u_draw.h \ util/u_draw_quad.c \ + util/u_draw_quad.h \ + util/u_dual_blend.h \ + util/u_dump_defines.c \ + util/u_dump.h \ + util/u_dump_state.c \ + util/u_dynarray.h \ + util/u_fifo.h \ + util/u_format_bptc.c \ + util/u_format_bptc.h \ util/u_format.c \ - util/u_format_other.c \ + util/u_format_etc.c \ + util/u_format_etc.h \ + util/u_format.h \ util/u_format_latc.c \ - util/u_format_s3tc.c \ + util/u_format_latc.h \ + util/u_format_other.c \ + util/u_format_other.h \ + util/u_format_r11g11b10f.h \ + util/u_format_rgb9e5.h \ util/u_format_rgtc.c \ - util/u_format_etc.c \ - util/u_format_bptc.c \ + util/u_format_rgtc.h \ + util/u_format_s3tc.c \ + util/u_format_s3tc.h \ util/u_format_tests.c \ + util/u_format_tests.h \ util/u_format_yuv.c \ + util/u_format_yuv.h \ util/u_format_zs.c \ + util/u_format_zs.h \ util/u_framebuffer.c \ + util/u_framebuffer.h \ util/u_gen_mipmap.c \ + util/u_gen_mipmap.h \ + util/u_half.h \ util/u_handle_table.c \ + util/u_handle_table.h \ util/u_hash.c \ + util/u_hash.h \ util/u_hash_table.c \ + util/u_hash_table.h \ util/u_helpers.c \ + util/u_helpers.h \ util/u_index_modify.c \ + util/u_index_modify.h \ + util/u_init.h \ + util/u_inlines.h \ util/u_keymap.c \ + util/u_keymap.h \ util/u_linear.c \ + util/u_linear.h \ util/u_linkage.c \ - util/u_network.c \ + util/u_linkage.h \ util/u_math.c \ + util/u_math.h \ + util/u_memory.h \ util/u_mm.c \ + util/u_mm.h \ + util/u_network.c \ + util/u_network.h \ + util/u_pack_color.h \ + util/u_pointer.h \ + util/u_prim.h \ util/u_pstipple.c \ + util/u_pstipple.h \ + util/u_range.h \ + util/u_rect.h \ + util/u_resource.c \ + util/u_resource.h \ util/u_ringbuffer.c \ + util/u_ringbuffer.h \ util/u_sampler.c \ + util/u_sampler.h \ + util/u_simple_list.h \ util/u_simple_shaders.c \ + util/u_simple_shaders.h \ util/u_slab.c \ + util/u_slab.h \ util/u_snprintf.c \ + util/u_split_prim.h \ + util/u_sse.h \ util/u_staging.c \ + util/u_staging.h \ + util/u_string.h \ util/u_suballoc.c \ + util/u_suballoc.h \ util/u_surface.c \ + util/u_surface.h \ util/u_surfaces.c \ + util/u_surfaces.h \ + util/u_tests.c \ + util/u_tests.h \ util/u_texture.c \ + util/u_texture.h \ util/u_tile.c \ + util/u_tile.h \ + util/u_time.h \ util/u_transfer.c \ - util/u_resource.c \ + util/u_transfer.h \ util/u_upload_mgr.c \ + util/u_upload_mgr.h \ util/u_vbuf.c \ - vl/vl_csc.c \ + util/u_vbuf.h \ + util/u_video.h + +VL_SOURCES := \ vl/vl_compositor.c \ + vl/vl_compositor.h \ + vl/vl_csc.c \ + vl/vl_csc.h \ + vl/vl_decoder.c \ + vl/vl_decoder.h \ + vl/vl_defines.h \ + vl/vl_deint_filter.c \ + vl/vl_deint_filter.h \ + vl/vl_idct.c \ + vl/vl_idct.h \ vl/vl_matrix_filter.c \ + vl/vl_matrix_filter.h \ + vl/vl_mc.c \ + vl/vl_mc.h \ vl/vl_median_filter.c \ - vl/vl_decoder.c \ - vl/vl_mpeg12_decoder.c \ + vl/vl_median_filter.h \ vl/vl_mpeg12_bitstream.c \ + vl/vl_mpeg12_bitstream.h \ + vl/vl_mpeg12_decoder.c \ + vl/vl_mpeg12_decoder.h \ + vl/vl_rbsp.h \ + vl/vl_types.h \ + vl/vl_vertex_buffers.c \ + vl/vl_vertex_buffers.h \ + vl/vl_video_buffer.c \ + vl/vl_video_buffer.h \ + vl/vl_vlc.h \ + vl/vl_winsys.h \ + vl/vl_winsys_dri.c \ vl/vl_zscan.c \ - vl/vl_idct.c \ - vl/vl_mc.c \ - vl/vl_vertex_buffers.c \ - vl/vl_video_buffer.c \ - vl/vl_deint_filter.c + vl/vl_zscan.h + +VL_STUB_SOURCES := \ + vl/vl_stubs.c GENERATED_SOURCES := \ indices/u_indices_gen.c \ @@ -165,42 +348,67 @@ GENERATED_SOURCES := \ util/u_format_table.c GALLIVM_SOURCES := \ - gallivm/lp_bld_arit.c \ - gallivm/lp_bld_arit_overflow.c \ - gallivm/lp_bld_assert.c \ - gallivm/lp_bld_bitarit.c \ - gallivm/lp_bld_const.c \ - gallivm/lp_bld_conv.c \ - gallivm/lp_bld_flow.c \ - gallivm/lp_bld_format_aos.c \ - gallivm/lp_bld_format_aos_array.c \ - gallivm/lp_bld_format_float.c \ - gallivm/lp_bld_format_srgb.c \ - gallivm/lp_bld_format_soa.c \ - gallivm/lp_bld_format_yuv.c \ - gallivm/lp_bld_gather.c \ - gallivm/lp_bld_init.c \ - gallivm/lp_bld_intr.c \ - gallivm/lp_bld_logic.c \ - gallivm/lp_bld_pack.c \ - gallivm/lp_bld_printf.c \ - gallivm/lp_bld_quad.c \ - gallivm/lp_bld_sample.c \ - gallivm/lp_bld_sample_aos.c \ - gallivm/lp_bld_sample_soa.c \ - gallivm/lp_bld_struct.c \ - gallivm/lp_bld_swizzle.c \ - gallivm/lp_bld_tgsi.c \ - gallivm/lp_bld_tgsi_action.c \ - gallivm/lp_bld_tgsi_aos.c \ - gallivm/lp_bld_tgsi_info.c \ - gallivm/lp_bld_tgsi_soa.c \ - gallivm/lp_bld_type.c \ - draw/draw_llvm.c \ - draw/draw_llvm_sample.c \ - draw/draw_vs_llvm.c \ - draw/draw_pt_fetch_shade_pipeline_llvm.c - -GALLIVM_CPP_SOURCES := \ + gallivm/lp_bld_arit.c \ + gallivm/lp_bld_arit.h \ + gallivm/lp_bld_arit_overflow.c \ + gallivm/lp_bld_arit_overflow.h \ + gallivm/lp_bld_assert.c \ + gallivm/lp_bld_assert.h \ + gallivm/lp_bld_bitarit.c \ + gallivm/lp_bld_bitarit.h \ + gallivm/lp_bld_const.c \ + gallivm/lp_bld_const.h \ + gallivm/lp_bld_conv.c \ + gallivm/lp_bld_conv.h \ gallivm/lp_bld_debug.cpp \ - gallivm/lp_bld_misc.cpp + gallivm/lp_bld_debug.h \ + gallivm/lp_bld_flow.c \ + gallivm/lp_bld_flow.h \ + gallivm/lp_bld_format_aos_array.c \ + gallivm/lp_bld_format_aos.c \ + gallivm/lp_bld_format_float.c \ + gallivm/lp_bld_format.h \ + gallivm/lp_bld_format_soa.c \ + gallivm/lp_bld_format_srgb.c \ + gallivm/lp_bld_format_yuv.c \ + gallivm/lp_bld_gather.c \ + gallivm/lp_bld_gather.h \ + gallivm/lp_bld.h \ + gallivm/lp_bld_init.c \ + gallivm/lp_bld_init.h \ + gallivm/lp_bld_intr.c \ + gallivm/lp_bld_intr.h \ + gallivm/lp_bld_limits.h \ + gallivm/lp_bld_logic.c \ + gallivm/lp_bld_logic.h \ + gallivm/lp_bld_misc.cpp \ + gallivm/lp_bld_misc.h \ + gallivm/lp_bld_pack.c \ + gallivm/lp_bld_pack.h \ + gallivm/lp_bld_printf.c \ + gallivm/lp_bld_printf.h \ + gallivm/lp_bld_quad.c \ + gallivm/lp_bld_quad.h \ + gallivm/lp_bld_sample_aos.c \ + gallivm/lp_bld_sample_aos.h \ + gallivm/lp_bld_sample.c \ + gallivm/lp_bld_sample.h \ + gallivm/lp_bld_sample_soa.c \ + gallivm/lp_bld_struct.c \ + gallivm/lp_bld_struct.h \ + gallivm/lp_bld_swizzle.c \ + gallivm/lp_bld_swizzle.h \ + gallivm/lp_bld_tgsi_action.c \ + gallivm/lp_bld_tgsi_action.h \ + gallivm/lp_bld_tgsi_aos.c \ + gallivm/lp_bld_tgsi.c \ + gallivm/lp_bld_tgsi.h \ + gallivm/lp_bld_tgsi_info.c \ + gallivm/lp_bld_tgsi_soa.c \ + gallivm/lp_bld_type.c \ + gallivm/lp_bld_type.h \ + draw/draw_llvm.c \ + draw/draw_llvm.h \ + draw/draw_llvm_sample.c \ + draw/draw_pt_fetch_shade_pipeline_llvm.c \ + draw/draw_vs_llvm.c diff --git a/mesalib/src/gallium/auxiliary/SConscript b/mesalib/src/gallium/auxiliary/SConscript index 94041d2..6cb6b8c 100644 --- a/mesalib/src/gallium/auxiliary/SConscript +++ b/mesalib/src/gallium/auxiliary/SConscript @@ -36,13 +36,13 @@ env.Depends('util/u_format_table.c', [ source = env.ParseSourceList('Makefile.sources', [ 'C_SOURCES', + 'VL_STUB_SOURCES', 'GENERATED_SOURCES' ]) if env['llvm']: source += env.ParseSourceList('Makefile.sources', [ 'GALLIVM_SOURCES', - 'GALLIVM_CPP_SOURCES' ]) gallium = env.ConvenienceLibrary( diff --git a/mesalib/src/gallium/auxiliary/hud/hud_context.c b/mesalib/src/gallium/auxiliary/hud/hud_context.c index 18a8781..98678fc 100644 --- a/mesalib/src/gallium/auxiliary/hud/hud_context.c +++ b/mesalib/src/gallium/auxiliary/hud/hud_context.c @@ -444,11 +444,9 @@ hud_draw(struct hud_context *hud, struct pipe_resource *tex) viewport.scale[0] = 0.5f * hud->fb_width; viewport.scale[1] = 0.5f * hud->fb_height; viewport.scale[2] = 1.0f; - viewport.scale[3] = 1.0f; viewport.translate[0] = 0.5f * hud->fb_width; viewport.translate[1] = 0.5f * hud->fb_height; viewport.translate[2] = 0.0f; - viewport.translate[3] = 0.0f; cso_set_framebuffer(cso, &fb); cso_set_sample_mask(cso, ~0); diff --git a/mesalib/src/gallium/auxiliary/util/u_atomic.h b/mesalib/src/gallium/auxiliary/util/u_atomic.h index 2f2b42b..2500bc7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_atomic.h +++ b/mesalib/src/gallium/auxiliary/util/u_atomic.h @@ -24,12 +24,12 @@ #define PIPE_ATOMIC_MSVC_INTRINSIC #elif (defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)) #define PIPE_ATOMIC_ASM_MSVC_X86 +#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401) +#define PIPE_ATOMIC_GCC_INTRINSIC #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86)) #define PIPE_ATOMIC_ASM_GCC_X86 #elif (defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86_64)) #define PIPE_ATOMIC_ASM_GCC_X86_64 -#elif defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 401) -#define PIPE_ATOMIC_GCC_INTRINSIC #else #error "Unsupported platform" #endif @@ -69,6 +69,18 @@ p_atomic_dec(int32_t *v) } static INLINE int32_t +p_atomic_inc_return(int32_t *v) +{ + return __sync_add_and_fetch(v, 1); +} + +static INLINE int32_t +p_atomic_dec_return(int32_t *v) +{ + return __sync_sub_and_fetch(v, 1); +} + +static INLINE int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) { return __sync_val_compare_and_swap(v, old, _new); @@ -116,6 +128,18 @@ p_atomic_dec(int32_t *v) } static INLINE int32_t +p_atomic_inc_return(int32_t *v) +{ + return __sync_add_and_fetch(v, 1); +} + +static INLINE int32_t +p_atomic_dec_return(int32_t *v) +{ + return __sync_sub_and_fetch(v, 1); +} + +static INLINE int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) { return __sync_val_compare_and_swap(v, old, _new); @@ -161,6 +185,18 @@ p_atomic_dec(int32_t *v) } static INLINE int32_t +p_atomic_inc_return(int32_t *v) +{ + return __sync_add_and_fetch(v, 1); +} + +static INLINE int32_t +p_atomic_dec_return(int32_t *v) +{ + return __sync_sub_and_fetch(v, 1); +} + +static INLINE int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) { return __sync_val_compare_and_swap(v, old, _new); @@ -186,6 +222,8 @@ p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) #define p_atomic_dec_zero(_v) ((boolean) --(*(_v))) #define p_atomic_inc(_v) ((void) (*(_v))++) #define p_atomic_dec(_v) ((void) (*(_v))--) +#define p_atomic_inc_return(_v) ((*(_v))++) +#define p_atomic_dec_return(_v) ((*(_v))--) #define p_atomic_cmpxchg(_v, old, _new) (*(_v) == old ? *(_v) = (_new) : *(_v)) #endif @@ -288,6 +326,12 @@ p_atomic_inc(int32_t *v) _InterlockedIncrement((long *)v); } +static INLINE int32_t +p_atomic_inc_return(int32_t *v) +{ + return _InterlockedIncrement((long *)v); +} + static INLINE void p_atomic_dec(int32_t *v) { @@ -295,6 +339,12 @@ p_atomic_dec(int32_t *v) } static INLINE int32_t +p_atomic_dec_return(int32_t *v) +{ + return _InterlockedDecrement((long *)v); +} + +static INLINE int32_t p_atomic_cmpxchg(int32_t *v, int32_t old, int32_t _new) { return _InterlockedCompareExchange((long *)v, _new, old); @@ -329,6 +379,8 @@ p_atomic_dec_zero(int32_t *v) #define p_atomic_inc(_v) atomic_inc_32((uint32_t *) _v) #define p_atomic_dec(_v) atomic_dec_32((uint32_t *) _v) +#define p_atomic_inc_return(_v) atomic_inc_32_nv((uint32_t *) _v) +#define p_atomic_dec_return(_v) atomic_dec_32_nv((uint32_t *) _v) #define p_atomic_cmpxchg(_v, _old, _new) \ atomic_cas_32( (uint32_t *) _v, (uint32_t) _old, (uint32_t) _new) diff --git a/mesalib/src/gallium/auxiliary/util/u_blit.c b/mesalib/src/gallium/auxiliary/util/u_blit.c index 2573bed..90408ff 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blit.c +++ b/mesalib/src/gallium/auxiliary/util/u_blit.c @@ -188,7 +188,7 @@ set_vertex_shader(struct blit_state *ctx) const uint semantic_indexes[] = { 0, 0 }; ctx->vs = util_make_vertex_passthrough_shader(ctx->pipe, 2, semantic_names, - semantic_indexes); + semantic_indexes, FALSE); } cso_set_vertex_shader_handle(ctx->cso, ctx->vs); @@ -559,11 +559,9 @@ util_blit_pixels_tex(struct blit_state *ctx, ctx->viewport.scale[0] = 0.5f * dst->width; ctx->viewport.scale[1] = 0.5f * dst->height; ctx->viewport.scale[2] = 0.5f; - ctx->viewport.scale[3] = 1.0f; ctx->viewport.translate[0] = 0.5f * dst->width; ctx->viewport.translate[1] = 0.5f * dst->height; ctx->viewport.translate[2] = 0.5f; - ctx->viewport.translate[3] = 0.0f; cso_set_viewport(ctx->cso, &ctx->viewport); /* texture */ diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index e59fa04..9d087fe 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -319,7 +319,8 @@ static void bind_vs_pos_only(struct blitter_context_priv *ctx) ctx->vs_pos_only = util_make_vertex_passthrough_shader_with_so(pipe, 1, semantic_names, - semantic_indices, &so); + semantic_indices, FALSE, + &so); } pipe->bind_vs_state(pipe, ctx->vs_pos_only); @@ -335,7 +336,7 @@ static void bind_vs_passthrough(struct blitter_context_priv *ctx) const uint semantic_indices[] = { 0, 0 }; ctx->vs = util_make_vertex_passthrough_shader(pipe, 2, semantic_names, - semantic_indices); + semantic_indices, FALSE); } pipe->bind_vs_state(pipe, ctx->vs); @@ -682,11 +683,9 @@ static void blitter_set_rectangle(struct blitter_context_priv *ctx, ctx->viewport.scale[0] = 0.5f * ctx->dst_width; ctx->viewport.scale[1] = 0.5f * ctx->dst_height; ctx->viewport.scale[2] = 1.0f; - ctx->viewport.scale[3] = 1.0f; ctx->viewport.translate[0] = 0.5f * ctx->dst_width; ctx->viewport.translate[1] = 0.5f * ctx->dst_height; ctx->viewport.translate[2] = 0.0f; - ctx->viewport.translate[3] = 0.0f; ctx->base.pipe->set_viewport_states(ctx->base.pipe, 0, 1, &ctx->viewport); } diff --git a/mesalib/src/gallium/auxiliary/util/u_box.h b/mesalib/src/gallium/auxiliary/util/u_box.h index 0b28d0f..520a3d5 100644 --- a/mesalib/src/gallium/auxiliary/util/u_box.h +++ b/mesalib/src/gallium/auxiliary/util/u_box.h @@ -2,6 +2,7 @@ #define UTIL_BOX_INLINES_H #include "pipe/p_state.h" +#include "util/u_math.h" static INLINE void u_box_1d( unsigned x, @@ -77,4 +78,121 @@ void u_box_3d( unsigned x, box->depth = d; } +/* Clips @dst to width @w and height @h. + * Returns -1 if the resulting box would be empty (then @dst is left unchanged). + * 0 if nothing has been reduced. + * 1 if width has been reduced. + * 2 if height has been reduced. + * 3 if both width and height have been reduced. + * Aliasing permitted. + */ +static INLINE int +u_box_clip_2d(struct pipe_box *dst, + const struct pipe_box *box, int w, int h) +{ + unsigned i; + int a[2], b[2], dim[2]; + int *start, *end; + int res = 0; + + if (!box->width || !box->height) + return -1; + dim[0] = w; + dim[1] = h; + a[0] = box->x; + a[1] = box->y; + b[0] = box->x + box->width; + b[1] = box->y + box->height; + + for (i = 0; i < 2; ++i) { + start = (a[i] <= b[i]) ? &a[i] : &b[i]; + end = (a[i] <= b[i]) ? &b[i] : &a[i]; + + if (*end < 0 || *start >= dim[i]) + return -1; + if (*start < 0) { + *start = 0; + res |= (1 << i); + } + if (*end > dim[i]) { + *end = dim[i]; + res |= (1 << i); + } + } + + if (res) { + dst->x = a[0]; + dst->y = a[1]; + dst->width = b[0] - a[0]; + dst->height = b[1] - a[1]; + } + return res; +} + +static INLINE int64_t +u_box_volume_3d(const struct pipe_box *box) +{ + return (int64_t)box->width * box->height * box->depth; +} + +/* Aliasing of @dst permitted. */ +static INLINE void +u_box_union_2d(struct pipe_box *dst, + const struct pipe_box *a, const struct pipe_box *b) +{ + dst->x = MIN2(a->x, b->x); + dst->y = MIN2(a->y, b->y); + + dst->width = MAX2(a->x + a->width, b->x + b->width) - dst->x; + dst->height = MAX2(a->y + a->height, b->y + b->height) - dst->y; +} + +/* Aliasing of @dst permitted. */ +static INLINE void +u_box_union_3d(struct pipe_box *dst, + const struct pipe_box *a, const struct pipe_box *b) +{ + dst->x = MIN2(a->x, b->x); + dst->y = MIN2(a->y, b->y); + dst->z = MIN2(a->z, b->z); + + dst->width = MAX2(a->x + a->width, b->x + b->width) - dst->x; + dst->height = MAX2(a->y + a->height, b->y + b->height) - dst->y; + dst->depth = MAX2(a->z + a->depth, b->z + b->depth) - dst->z; +} + +static INLINE boolean +u_box_test_intersection_2d(const struct pipe_box *a, + const struct pipe_box *b) +{ + unsigned i; + int a_l[2], a_r[2], b_l[2], b_r[2]; + + a_l[0] = MIN2(a->x, a->x + a->width); + a_r[0] = MAX2(a->x, a->x + a->width); + a_l[1] = MIN2(a->y, a->y + a->height); + a_r[1] = MAX2(a->y, a->y + a->height); + + b_l[0] = MIN2(b->x, b->x + b->width); + b_r[0] = MAX2(b->x, b->x + b->width); + b_l[1] = MIN2(b->y, b->y + b->height); + b_r[1] = MAX2(b->y, b->y + b->height); + + for (i = 0; i < 2; ++i) { + if (a_l[i] > b_r[i] || a_r[i] < b_l[i]) + return FALSE; + } + return TRUE; +} + +static INLINE void +u_box_minify_2d(struct pipe_box *dst, + const struct pipe_box *src, unsigned l) +{ + dst->x = src->x >> l; + dst->y = src->y >> l; + dst->width = MAX2(src->width >> l, 1); + dst->height = MAX2(src->height >> l, 1); +} + #endif diff --git a/mesalib/src/gallium/auxiliary/util/u_format_pack.py b/mesalib/src/gallium/auxiliary/util/u_format_pack.py index 6ccf04c..d5138cc 100644 --- a/mesalib/src/gallium/auxiliary/util/u_format_pack.py +++ b/mesalib/src/gallium/auxiliary/util/u_format_pack.py @@ -207,9 +207,36 @@ def get_one_shift(type): assert False +def truncate_mantissa(x, bits): + '''Truncate an integer so it can be represented exactly with a floating + point mantissa''' + + assert isinstance(x, (int, long)) + + s = 1 + if x < 0: + s = -1 + x = -x + + # We can represent integers up to mantissa + 1 bits exactly + mask = (1 << (bits + 1)) - 1 + + # Slide the mask until the MSB matches + shift = 0 + while (x >> shift) & ~mask: + shift += 1 + + x &= mask << shift + x *= s + return x + + def value_to_native(type, value): '''Get the value of unity for this type.''' if type.type == FLOAT: + if type.size <= 32 \ + and isinstance(value, (int, long)): + return truncate_mantissa(value, 23) return value if type.type == FIXED: return int(value * (1 << (type.size/2))) @@ -226,9 +253,9 @@ def native_to_constant(type, value): '''Get the value of unity for this type.''' if type.type == FLOAT: if type.size <= 32: - return "%ff" % value + return "%.1ff" % float(value) else: - return "%ff" % value + return "%.1f" % float(value) else: return str(int(value)) @@ -251,8 +278,8 @@ def clamp_expr(src_channel, dst_channel, dst_native_type, value): dst_max = dst_channel.max() # Translate the destination range to the src native value - dst_min_native = value_to_native(src_channel, dst_min) - dst_max_native = value_to_native(src_channel, dst_max) + dst_min_native = native_to_constant(src_channel, value_to_native(src_channel, dst_min)) + dst_max_native = native_to_constant(src_channel, value_to_native(src_channel, dst_max)) if src_min < dst_min and src_max > dst_max: return 'CLAMP(%s, %s, %s)' % (value, dst_min_native, dst_max_native) diff --git a/mesalib/src/gallium/auxiliary/util/u_pstipple.c b/mesalib/src/gallium/auxiliary/util/u_pstipple.c index 509f815..1e1ec4a 100644 --- a/mesalib/src/gallium/auxiliary/util/u_pstipple.c +++ b/mesalib/src/gallium/auxiliary/util/u_pstipple.c @@ -180,9 +180,7 @@ struct pstip_transform_context { int maxInput; uint samplersUsed; /**< bitfield of samplers used */ int freeSampler; /** an available sampler for the pstipple */ - int texTemp; /**< temp registers */ int numImmed; - boolean firstInstruction; uint coordOrigin; }; @@ -243,7 +241,7 @@ free_bit(uint bitfield) /** - * TGSI instruction transform callback. + * TGSI transform prolog * Before the first instruction, insert our new code to sample the * stipple texture (using the fragment coord register) then kill the * fragment if the stipple texture bit is off. @@ -256,165 +254,95 @@ free_bit(uint bitfield) * [...original code...] */ static void -pstip_transform_inst(struct tgsi_transform_context *ctx, - struct tgsi_full_instruction *inst) +pstip_transform_prolog(struct tgsi_transform_context *ctx) { struct pstip_transform_context *pctx = (struct pstip_transform_context *) ctx; + int wincoordInput; + int texTemp; + + /* find free texture sampler */ + pctx->freeSampler = free_bit(pctx->samplersUsed); + if (pctx->freeSampler >= PIPE_MAX_SAMPLERS) + pctx->freeSampler = PIPE_MAX_SAMPLERS - 1; + + if (pctx->wincoordInput < 0) + wincoordInput = pctx->maxInput + 1; + else + wincoordInput = pctx->wincoordInput; + + if (pctx->wincoordInput < 0) { + /* declare new position input reg */ + tgsi_transform_input_decl(ctx, wincoordInput, + TGSI_SEMANTIC_POSITION, 1, + TGSI_INTERPOLATE_LINEAR); + } - if (pctx->firstInstruction) { - /* emit our new declarations before the first instruction */ - - struct tgsi_full_declaration decl; - struct tgsi_full_instruction newInst; - uint i; - int wincoordInput; - - /* find free texture sampler */ - pctx->freeSampler = free_bit(pctx->samplersUsed); - if (pctx->freeSampler >= PIPE_MAX_SAMPLERS) - pctx->freeSampler = PIPE_MAX_SAMPLERS - 1; - - if (pctx->wincoordInput < 0) - wincoordInput = pctx->maxInput + 1; - else - wincoordInput = pctx->wincoordInput; - - /* find one free temp register */ - for (i = 0; i < 32; i++) { - if ((pctx->tempsUsed & (1 << i)) == 0) { - /* found a free temp */ - if (pctx->texTemp < 0) - pctx->texTemp = i; - else - break; - } - } - assert(pctx->texTemp >= 0); - - if (pctx->wincoordInput < 0) { - /* declare new position input reg */ - decl = tgsi_default_full_declaration(); - decl.Declaration.File = TGSI_FILE_INPUT; - decl.Declaration.Interpolate = 1; - decl.Declaration.Semantic = 1; - decl.Semantic.Name = TGSI_SEMANTIC_POSITION; - decl.Semantic.Index = 0; - decl.Range.First = - decl.Range.Last = wincoordInput; - decl.Interp.Interpolate = TGSI_INTERPOLATE_LINEAR; - ctx->emit_declaration(ctx, &decl); - } + /* declare new sampler */ + tgsi_transform_sampler_decl(ctx, pctx->freeSampler); - /* declare new sampler */ - decl = tgsi_default_full_declaration(); - decl.Declaration.File = TGSI_FILE_SAMPLER; - decl.Range.First = - decl.Range.Last = pctx->freeSampler; - ctx->emit_declaration(ctx, &decl); - - /* declare new temp regs */ - decl = tgsi_default_full_declaration(); - decl.Declaration.File = TGSI_FILE_TEMPORARY; - decl.Range.First = - decl.Range.Last = pctx->texTemp; - ctx->emit_declaration(ctx, &decl); - - /* emit immediate = {1/32, 1/32, 1, 1} - * The index/position of this immediate will be pctx->numImmed - */ - { - static const float value[4] = { 1.0/32, 1.0/32, 1.0, 1.0 }; - struct tgsi_full_immediate immed; - uint size = 4; - immed = tgsi_default_full_immediate(); - immed.Immediate.NrTokens = 1 + size; /* one for the token itself */ - immed.u[0].Float = value[0]; - immed.u[1].Float = value[1]; - immed.u[2].Float = value[2]; - immed.u[3].Float = value[3]; - ctx->emit_immediate(ctx, &immed); - } - - pctx->firstInstruction = FALSE; - - - /* - * Insert new MUL/TEX/KILL_IF instructions at start of program - * Take gl_FragCoord, divide by 32 (stipple size), sample the - * texture and kill fragment if needed. - * - * We'd like to use non-normalized texcoords to index into a RECT - * texture, but we can only use REPEAT wrap mode with normalized - * texcoords. Darn. - */ - - /* XXX invert wincoord if origin isn't lower-left... */ - - /* MUL texTemp, INPUT[wincoord], 1/32; */ - newInst = tgsi_default_full_instruction(); - newInst.Instruction.Opcode = TGSI_OPCODE_MUL; - newInst.Instruction.NumDstRegs = 1; - newInst.Dst[0].Register.File = TGSI_FILE_TEMPORARY; - newInst.Dst[0].Register.Index = pctx->texTemp; - newInst.Instruction.NumSrcRegs = 2; - newInst.Src[0].Register.File = TGSI_FILE_INPUT; - newInst.Src[0].Register.Index = wincoordInput; - newInst.Src[1].Register.File = TGSI_FILE_IMMEDIATE; - newInst.Src[1].Register.Index = pctx->numImmed; - ctx->emit_instruction(ctx, &newInst); - - /* TEX texTemp, texTemp, sampler; */ - newInst = tgsi_default_full_instruction(); - newInst.Instruction.Opcode = TGSI_OPCODE_TEX; - newInst.Instruction.NumDstRegs = 1; - newInst.Dst[0].Register.File = TGSI_FILE_TEMPORARY; - newInst.Dst[0].Register.Index = pctx->texTemp; - newInst.Instruction.NumSrcRegs = 2; - newInst.Instruction.Texture = TRUE; - newInst.Texture.Texture = TGSI_TEXTURE_2D; - newInst.Src[0].Register.File = TGSI_FILE_TEMPORARY; - newInst.Src[0].Register.Index = pctx->texTemp; - newInst.Src[1].Register.File = TGSI_FILE_SAMPLER; - newInst.Src[1].Register.Index = pctx->freeSampler; - ctx->emit_instruction(ctx, &newInst); - - /* KILL_IF -texTemp; # if -texTemp < 0, kill fragment */ - newInst = tgsi_default_full_instruction(); - newInst.Instruction.Opcode = TGSI_OPCODE_KILL_IF; - newInst.Instruction.NumDstRegs = 0; - newInst.Instruction.NumSrcRegs = 1; - newInst.Src[0].Register.File = TGSI_FILE_TEMPORARY; - newInst.Src[0].Register.Index = pctx->texTemp; - newInst.Src[0].Register.Negate = 1; - ctx->emit_instruction(ctx, &newInst); + /* Declare temp[0] reg if not already declared. + * We can always use temp[0] since this code is before + * the rest of the shader. + */ + texTemp = 0; + if ((pctx->tempsUsed & (1 << texTemp)) == 0) { + tgsi_transform_temp_decl(ctx, texTemp); } - /* emit this instruction */ - ctx->emit_instruction(ctx, inst); + /* emit immediate = {1/32, 1/32, 1, 1} + * The index/position of this immediate will be pctx->numImmed + */ + tgsi_transform_immediate_decl(ctx, 1.0/32.0, 1.0/32.0, 1.0, 1.0); + + /* + * Insert new MUL/TEX/KILL_IF instructions at start of program + * Take gl_FragCoord, divide by 32 (stipple size), sample the + * texture and kill fragment if needed. + * + * We'd like to use non-normalized texcoords to index into a RECT + * texture, but we can only use REPEAT wrap mode with normalized + * texcoords. Darn. + */ + + /* XXX invert wincoord if origin isn't lower-left... */ + + /* MUL texTemp, INPUT[wincoord], 1/32; */ + tgsi_transform_op2_inst(ctx, TGSI_OPCODE_MUL, + TGSI_FILE_TEMPORARY, texTemp, + TGSI_WRITEMASK_XYZW, + TGSI_FILE_INPUT, wincoordInput, + TGSI_FILE_IMMEDIATE, pctx->numImmed); + + /* TEX texTemp, texTemp, sampler; */ + tgsi_transform_tex_2d_inst(ctx, + TGSI_FILE_TEMPORARY, texTemp, + TGSI_FILE_TEMPORARY, texTemp, + pctx->freeSampler); + + /* KILL_IF -texTemp; # if -texTemp < 0, kill fragment */ + tgsi_transform_kill_inst(ctx, + TGSI_FILE_TEMPORARY, texTemp, + TGSI_SWIZZLE_W); } /** * Given a fragment shader, return a new fragment shader which * samples a stipple texture and executes KILL. + * \param samplerUnitOut returns the index of the sampler unit which + * will be used to sample the stipple texture */ -struct pipe_shader_state * -util_pstipple_create_fragment_shader(struct pipe_context *pipe, - struct pipe_shader_state *fs, +struct tgsi_token * +util_pstipple_create_fragment_shader(const struct tgsi_token *tokens, unsigned *samplerUnitOut) { - struct pipe_shader_state *new_fs; struct pstip_transform_context transform; - const uint newLen = tgsi_num_tokens(fs->tokens) + NUM_NEW_TOKENS; - - new_fs = MALLOC(sizeof(*new_fs)); - if (!new_fs) - return NULL; + const uint newLen = tgsi_num_tokens(tokens) + NUM_NEW_TOKENS; + struct tgsi_token *new_tokens; - new_fs->tokens = tgsi_alloc_tokens(newLen); - if (!new_fs->tokens) { - FREE(new_fs); + new_tokens = tgsi_alloc_tokens(newLen); + if (!new_tokens) { return NULL; } @@ -423,21 +351,17 @@ util_pstipple_create_fragment_shader(struct pipe_context *pipe, memset(&transform, 0, sizeof(transform)); transform.wincoordInput = -1; transform.maxInput = -1; - transform.texTemp = -1; - transform.firstInstruction = TRUE; transform.coordOrigin = TGSI_FS_COORD_ORIGIN_UPPER_LEFT; - transform.base.transform_instruction = pstip_transform_inst; + transform.base.prolog = pstip_transform_prolog; transform.base.transform_declaration = pstip_transform_decl; transform.base.transform_immediate = pstip_transform_immed; - tgsi_scan_shader(fs->tokens, &transform.info); + tgsi_scan_shader(tokens, &transform.info); transform.coordOrigin = transform.info.properties[TGSI_PROPERTY_FS_COORD_ORIGIN]; - tgsi_transform_shader(fs->tokens, - (struct tgsi_token *) new_fs->tokens, - newLen, &transform.base); + tgsi_transform_shader(tokens, new_tokens, newLen, &transform.base); #if 0 /* DEBUG */ tgsi_dump(fs->tokens, 0); @@ -447,6 +371,6 @@ util_pstipple_create_fragment_shader(struct pipe_context *pipe, assert(transform.freeSampler < PIPE_MAX_SAMPLERS); *samplerUnitOut = transform.freeSampler; - return new_fs; + return new_tokens; } diff --git a/mesalib/src/gallium/auxiliary/util/u_pstipple.h b/mesalib/src/gallium/auxiliary/util/u_pstipple.h index 6fbed80..13155e7 100644 --- a/mesalib/src/gallium/auxiliary/util/u_pstipple.h +++ b/mesalib/src/gallium/auxiliary/util/u_pstipple.h @@ -47,9 +47,8 @@ util_pstipple_create_sampler_view(struct pipe_context *pipe, extern void * util_pstipple_create_sampler(struct pipe_context *pipe); -extern struct pipe_shader_state * -util_pstipple_create_fragment_shader(struct pipe_context *pipe, - struct pipe_shader_state *fs, +struct tgsi_token * +util_pstipple_create_fragment_shader(const struct tgsi_token *tokens, unsigned *samplerUnitOut); diff --git a/mesalib/src/gallium/auxiliary/util/u_rect.h b/mesalib/src/gallium/auxiliary/util/u_rect.h index dd87f81..cf29dff 100644 --- a/mesalib/src/gallium/auxiliary/util/u_rect.h +++ b/mesalib/src/gallium/auxiliary/util/u_rect.h @@ -30,6 +30,7 @@ #define U_RECT_H #include "pipe/p_compiler.h" +#include "util/u_math.h" #ifdef __cplusplus extern "C" { @@ -67,6 +68,12 @@ u_rect_find_intersection(const struct u_rect *a, } +static INLINE int +u_rect_area(const struct u_rect *r) +{ + return (r->x1 - r->x0) * (r->y1 - r->y0); +} + static INLINE void u_rect_possible_intersection(const struct u_rect *a, struct u_rect *b) @@ -79,6 +86,17 @@ u_rect_possible_intersection(const struct u_rect *a, } } +/* Set @d to a rectangle that covers both @a and @b. + */ +static INLINE void +u_rect_union(struct u_rect *d, const struct u_rect *a, const struct u_rect *b) +{ + d->x0 = MIN2(a->x0, b->x0); + d->y0 = MIN2(a->y0, b->y0); + d->x1 = MAX2(a->x1, b->x1); + d->y1 = MAX2(a->y1, b->y1); +} + #ifdef __cplusplus } #endif diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c index adf4887..edb3037 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.c @@ -59,11 +59,13 @@ void * util_make_vertex_passthrough_shader(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, - const uint *semantic_indexes) + const uint *semantic_indexes, + bool window_space) { return util_make_vertex_passthrough_shader_with_so(pipe, num_attribs, semantic_names, - semantic_indexes, NULL); + semantic_indexes, + window_space, NULL); } void * @@ -71,6 +73,7 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, const uint *semantic_indexes, + bool window_space, const struct pipe_stream_output_info *so) { struct ureg_program *ureg; @@ -80,6 +83,9 @@ util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, if (ureg == NULL) return NULL; + if (window_space) + ureg_property(ureg, TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION, TRUE); + for (i = 0; i < num_attribs; i++) { struct ureg_src src; struct ureg_dst dst; @@ -124,6 +130,76 @@ void *util_make_layered_clear_vertex_shader(struct pipe_context *pipe) return pipe->create_vs_state(pipe, &state); } +/** + * Takes position and color, and outputs position, color, and instance id. + */ +void *util_make_layered_clear_helper_vertex_shader(struct pipe_context *pipe) +{ + static const char text[] = + "VERT\n" + "DCL IN[0]\n" + "DCL IN[1]\n" + "DCL SV[0], INSTANCEID\n" + "DCL OUT[0], POSITION\n" + "DCL OUT[1], GENERIC[0]\n" + "DCL OUT[2], GENERIC[1]\n" + + "MOV OUT[0], IN[0]\n" + "MOV OUT[1], IN[1]\n" + "MOV OUT[2].x, SV[0].xxxx\n" + "END\n"; + struct tgsi_token tokens[1000]; + struct pipe_shader_state state = {tokens}; + + if (!tgsi_text_translate(text, tokens, Elements(tokens))) { + assert(0); + return NULL; + } + return pipe->create_vs_state(pipe, &state); +} + +/** + * Takes position, color, and target layer, and emits vertices on that target + * layer, with the specified color. + */ +void *util_make_layered_clear_geometry_shader(struct pipe_context *pipe) +{ + static const char text[] = + "GEOM\n" + "PROPERTY GS_INPUT_PRIMITIVE TRIANGLES\n" + "PROPERTY GS_OUTPUT_PRIMITIVE TRIANGLE_STRIP\n" + "PROPERTY GS_MAX_OUTPUT_VERTICES 3\n" + "PROPERTY GS_INVOCATIONS 1\n" + "DCL IN[][0], POSITION\n" /* position */ + "DCL IN[][1], GENERIC[0]\n" /* color */ + "DCL IN[][2], GENERIC[1]\n" /* vs invocation */ + "DCL OUT[0], POSITION\n" + "DCL OUT[1], GENERIC[0]\n" + "DCL OUT[2], LAYER\n" + "IMM[0] INT32 {0, 0, 0, 0}\n" + + "MOV OUT[0], IN[0][0]\n" + "MOV OUT[1], IN[0][1]\n" + "MOV OUT[2].x, IN[0][2].xxxx\n" + "EMIT IMM[0].xxxx\n" + "MOV OUT[0], IN[1][0]\n" + "MOV OUT[1], IN[1][1]\n" + "MOV OUT[2].x, IN[1][2].xxxx\n" + "EMIT IMM[0].xxxx\n" + "MOV OUT[0], IN[2][0]\n" + "MOV OUT[1], IN[2][1]\n" + "MOV OUT[2].x, IN[2][2].xxxx\n" + "EMIT IMM[0].xxxx\n" + "END\n"; + struct tgsi_token tokens[1000]; + struct pipe_shader_state state = {tokens}; + + if (!tgsi_text_translate(text, tokens, Elements(tokens))) { + assert(0); + return NULL; + } + return pipe->create_gs_state(pipe, &state); +} /** * Make simple fragment texture shader: diff --git a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h index c1d14aa..dd282e0 100644 --- a/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h +++ b/mesalib/src/gallium/auxiliary/util/u_simple_shaders.h @@ -47,19 +47,27 @@ extern void * util_make_vertex_passthrough_shader(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, - const uint *semantic_indexes); + const uint *semantic_indexes, + bool window_space); extern void * util_make_vertex_passthrough_shader_with_so(struct pipe_context *pipe, uint num_attribs, const uint *semantic_names, const uint *semantic_indexes, + bool window_space, const struct pipe_stream_output_info *so); extern void * util_make_layered_clear_vertex_shader(struct pipe_context *pipe); extern void * +util_make_layered_clear_helper_vertex_shader(struct pipe_context *pipe); + +extern void * +util_make_layered_clear_geometry_shader(struct pipe_context *pipe); + +extern void * util_make_fragment_tex_shader_writemask(struct pipe_context *pipe, unsigned tex_target, unsigned interp_mode, diff --git a/mesalib/src/gallium/auxiliary/util/u_snprintf.c b/mesalib/src/gallium/auxiliary/util/u_snprintf.c index 7a2bf2a..39e9b70 100644 --- a/mesalib/src/gallium/auxiliary/util/u_snprintf.c +++ b/mesalib/src/gallium/auxiliary/util/u_snprintf.c @@ -176,7 +176,7 @@ #define HAVE_ASPRINTF 1 /* not needed */ #define HAVE_STDARG_H 1 #define HAVE_STDDEF_H 1 -#define HAVE_STDINT_H 0 +#define HAVE_STDINT_H 1 #define HAVE_STDLIB_H 1 #define HAVE_INTTYPES_H 0 #define HAVE_LOCALE_H 0 diff --git a/mesalib/src/gallium/auxiliary/util/u_tests.c b/mesalib/src/gallium/auxiliary/util/u_tests.c new file mode 100644 index 0000000..c0f6327 --- /dev/null +++ b/mesalib/src/gallium/auxiliary/util/u_tests.c @@ -0,0 +1,268 @@ +/************************************************************************** + * + * Copyright 2014 Advanced Micro Devices, 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, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + **************************************************************************/ + +#include "util/u_tests.h" + +#include "util/u_draw_quad.h" +#include "util/u_format.h" +#include "util/u_inlines.h" +#include "util/u_simple_shaders.h" +#include "util/u_surface.h" +#include "util/u_tile.h" +#include "cso_cache/cso_context.h" +#include <stdio.h> + +#define TOLERANCE 0.01 + +static struct pipe_resource * +util_create_texture2d(struct pipe_screen *screen, unsigned width, + unsigned height, enum pipe_format format) +{ + struct pipe_resource templ = {{0}}; + + templ.target = PIPE_TEXTURE_2D; + templ.width0 = width; + templ.height0 = height; + templ.depth0 = 1; + templ.array_size = 1; + templ.format = format; + templ.usage = PIPE_USAGE_DEFAULT; + templ.bind = PIPE_BIND_SAMPLER_VIEW | + (util_format_is_depth_or_stencil(format) ? + PIPE_BIND_DEPTH_STENCIL : PIPE_BIND_RENDER_TARGET); + + return screen->resource_create(screen, &templ); +} + +static void +util_set_framebuffer_cb0(struct cso_context *cso, struct pipe_context *ctx, + struct pipe_resource *tex) +{ + struct pipe_surface templ = {{0}}, *surf; + struct pipe_framebuffer_state fb = {0}; + + templ.format = tex->format; + surf = ctx->create_surface(ctx, tex, &templ); + + fb.width = tex->width0; + fb.height = tex->height0; + fb.cbufs[0] = surf; + fb.nr_cbufs = 1; + + cso_set_framebuffer(cso, &fb); + pipe_surface_reference(&surf, NULL); +} + +static void +util_set_blend_normal(struct cso_context *cso) +{ + struct pipe_blend_state blend = {0}; + + blend.rt[0].colormask = PIPE_MASK_RGBA; + cso_set_blend(cso, &blend); +} + +static void +util_set_dsa_disable(struct cso_context *cso) +{ + struct pipe_depth_stencil_alpha_state dsa = {{0}}; + + cso_set_depth_stencil_alpha(cso, &dsa); +} + +static void +util_set_rasterizer_normal(struct cso_context *cso) +{ + struct pipe_rasterizer_state rs = {0}; + + rs.half_pixel_center = 1; + rs.bottom_edge_rule = 1; + rs.depth_clip = 1; + + cso_set_rasterizer(cso, &rs); +} + +static void +util_set_max_viewport(struct cso_context *cso, struct pipe_resource *tex) +{ + struct pipe_viewport_state viewport; + + viewport.scale[0] = 0.5f * tex->width0; + viewport.scale[1] = 0.5f * tex->height0; + viewport.scale[2] = 1.0f; + viewport.translate[0] = 0.5f * tex->width0; + viewport.translate[1] = 0.5f * tex->height0; + viewport.translate[2] = 0.0f; + + cso_set_viewport(cso, &viewport); +} + +static void +util_set_interleaved_vertex_elements(struct cso_context *cso, + unsigned num_elements) +{ + int i; + struct pipe_vertex_element *velem = + calloc(1, num_elements * sizeof(struct pipe_vertex_element)); + + for (i = 0; i < num_elements; i++) { + velem[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT; + velem[i].src_offset = i * 16; + } + + cso_set_vertex_elements(cso, num_elements, velem); + free(velem); +} + +static bool +util_probe_rect_rgba(struct pipe_context *ctx, struct pipe_resource *tex, + unsigned offx, unsigned offy, unsigned w, unsigned h, + const float *expected) +{ + struct pipe_transfer *transfer; + void *map; + float *pixels = malloc(w * h * 4 * sizeof(float)); + int x,y,c; + bool pass = true; + + map = pipe_transfer_map(ctx, tex, 0, 0, PIPE_TRANSFER_READ, + offx, offy, w, h, &transfer); + pipe_get_tile_rgba(transfer, map, 0, 0, w, h, pixels); + pipe_transfer_unmap(ctx, transfer); + + for (y = 0; y < h; y++) { + for (x = 0; x < w; x++) { + float *probe = &pixels[(y*w + x)*4]; + + for (c = 0; c < 4; c++) + if (fabs(probe[c] - expected[c]) >= TOLERANCE) { + printf("Probe color at (%i,%i), ", offx+x, offy+y); + printf("Expected: %.3f, %.3f, %.3f, %.3f, ", + expected[0], expected[1], expected[2], expected[3]); + printf("Got: %.3f, %.3f, %.3f, %.3f\n", + probe[0], probe[1], probe[2], probe[2]); + pass = false; + goto done; + } + } + } +done: + + free(pixels); + return pass; +} + +/** + * Test TGSI_PROPERTY_VS_WINDOW_SPACE_POSITION. + * + * The viewport state is set as usual, but it should have no effect. + * Clipping should also be disabled. + * + * POSITION.xyz should already be multiplied by 1/w and POSITION.w should + * contain 1/w. By setting w=0, we can test that POSITION.xyz isn't + * multiplied by 1/w (otherwise nothing would be rendered). + * + * TODO: Whether the value of POSITION.w is correctly interpreted as 1/w + * during perspective interpolation is not tested. + */ +static void +tgsi_vs_window_space_position(struct pipe_context *ctx) +{ + struct cso_context *cso; + struct pipe_resource *cb; + void *fs, *vs; + bool pass = true; + + static uint vs_attribs[] = { + TGSI_SEMANTIC_POSITION, + TGSI_SEMANTIC_GENERIC + }; + static uint vs_indices[] = {0, 0}; + static float vertices[] = { + 0, 0, 0, 0, 1, 0, 0, 1, + 0, 256, 0, 0, 1, 0, 0, 1, + 256, 256, 0, 0, 1, 0, 0, 1, + 256, 0, 0, 0, 1, 0, 0, 1, + }; + static float red[] = {1, 0, 0, 1}; + static float clear_color[] = {0.1, 0.1, 0.1, 0.1}; + + if (!ctx->screen->get_param(ctx->screen, + PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION)) { + printf("Test(%s) = skip\n", __func__); + return; + } + + cso = cso_create_context(ctx); + cb = util_create_texture2d(ctx->screen, 256, 256, + PIPE_FORMAT_R8G8B8A8_UNORM); + + /* Set states. */ + util_set_framebuffer_cb0(cso, ctx, cb); + util_set_blend_normal(cso); + util_set_dsa_disable(cso); + util_set_rasterizer_normal(cso); + util_set_max_viewport(cso, cb); + util_set_interleaved_vertex_elements(cso, 2); + + /* Fragment shader. */ + fs = util_make_fragment_passthrough_shader(ctx, TGSI_SEMANTIC_GENERIC, + TGSI_INTERPOLATE_LINEAR, TRUE); + cso_set_fragment_shader_handle(cso, fs); + + /* Vertex shader. */ + vs = util_make_vertex_passthrough_shader(ctx, 2, vs_attribs, vs_indices, + TRUE); + cso_set_vertex_shader_handle(cso, vs); + + /* Clear and draw. */ + ctx->clear(ctx, PIPE_CLEAR_COLOR0, (void*)clear_color, 0, 0); + util_draw_user_vertex_buffer(cso, vertices, PIPE_PRIM_QUADS, 4, 2); + + /* Probe pixels. */ + pass = pass && util_probe_rect_rgba(ctx, cb, 0, 0, + cb->width0, cb->height0, red); + + /* Cleanup. */ + cso_release_all(cso); + cso_destroy_context(cso); + ctx->delete_vs_state(ctx, vs); + ctx->delete_fs_state(ctx, fs); + pipe_resource_reference(&cb, NULL); + + printf("Test(%s) = %s\n", __func__, pass ? "pass" : "fail"); +} + +/** + * Run all tests. This should be run with a clean context after + * context_create. + */ +void +util_run_tests(struct pipe_context *ctx) +{ + tgsi_vs_window_space_position(ctx); +} diff --git a/mesalib/src/glsl/strtod.h b/mesalib/src/gallium/auxiliary/util/u_tests.h similarity index 72% copy from mesalib/src/glsl/strtod.h copy to mesalib/src/gallium/auxiliary/util/u_tests.h index ad847db..a143934 100644 --- a/mesalib/src/glsl/strtod.h +++ b/mesalib/src/gallium/auxiliary/util/u_tests.h @@ -1,5 +1,6 @@ -/* - * Copyright 2010 VMware, Inc. +/************************************************************************** + * + * Copyright 2014 Advanced Micro Devices, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -17,30 +18,20 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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. - */ - - -#ifndef STRTOD_H -#define STRTOD_H - -#ifdef __cplusplus -extern "C" { -#endif - -extern double -glsl_strtod(const char *s, char **end); + * + **************************************************************************/ -extern float -glsl_strtof(const char *s, char **end); +#ifndef U_TESTS_H +#define U_TESTS_H +#include "pipe/p_compiler.h" -#ifdef __cplusplus -} -#endif +struct pipe_context; +void util_run_tests(struct pipe_context *ctx); #endif diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources index 0c55327..676fa0d 100644 --- a/mesalib/src/glsl/Makefile.sources +++ b/mesalib/src/glsl/Makefile.sources @@ -59,6 +59,7 @@ LIBGLSL_FILES = \ $(GLSL_SRCDIR)/loop_controls.cpp \ $(GLSL_SRCDIR)/loop_unroll.cpp \ $(GLSL_SRCDIR)/lower_clip_distance.cpp \ + $(GLSL_SRCDIR)/lower_const_arrays_to_uniforms.cpp \ $(GLSL_SRCDIR)/lower_discard.cpp \ $(GLSL_SRCDIR)/lower_discard_flow.cpp \ $(GLSL_SRCDIR)/lower_if_to_cond_assign.cpp \ @@ -104,8 +105,7 @@ LIBGLSL_FILES = \ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \ $(GLSL_SRCDIR)/opt_vectorize.cpp \ - $(GLSL_SRCDIR)/s_expression.cpp \ - $(GLSL_SRCDIR)/strtod.c + $(GLSL_SRCDIR)/s_expression.cpp # glsl_compiler diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h index 15bf086..6995ae8 100644 --- a/mesalib/src/glsl/ast.h +++ b/mesalib/src/glsl/ast.h @@ -640,19 +640,6 @@ class ast_declarator_list; class ast_struct_specifier : public ast_node { public: - /** - * \brief Make a shallow copy of an ast_struct_specifier. - * - * Use only if the objects are allocated from the same context and will not - * be modified. Zeros the inherited ast_node's fields. - */ - ast_struct_specifier(const ast_struct_specifier& that): - ast_node(), name(that.name), declarations(that.declarations), - is_declaration(that.is_declaration) - { - /* empty */ - } - ast_struct_specifier(const char *identifier, ast_declarator_list *declarator_list); virtual void print(void) const; @@ -670,22 +657,6 @@ public: class ast_type_specifier : public ast_node { public: - /** - * \brief Make a shallow copy of an ast_type_specifier, specifying array - * fields. - * - * Use only if the objects are allocated from the same context and will not - * be modified. Zeros the inherited ast_node's fields. - */ - ast_type_specifier(const ast_type_specifier *that, - ast_array_specifier *array_specifier) - : ast_node(), type_name(that->type_name), structure(that->structure), - array_specifier(array_specifier), - default_precision(that->default_precision) - { - /* empty */ - } - /** Construct a type specifier from a type name */ ast_type_specifier(const char *name) : type_name(name), structure(NULL), array_specifier(NULL), diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll index e66a935..57c46be 100644 --- a/mesalib/src/glsl/glsl_lexer.ll +++ b/mesalib/src/glsl/glsl_lexer.ll @@ -23,7 +23,7 @@ */ #include <ctype.h> #include <limits.h> -#include "strtod.h" +#include "util/strtod.h" #include "ast.h" #include "glsl_parser_extras.h" #include "glsl_parser.h" @@ -450,24 +450,11 @@ layout { return LITERAL_INTEGER(8); } -[0-9]+\.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); - return FLOATCONSTANT; - } -\.[0-9]+([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); - return FLOATCONSTANT; - } -[0-9]+\.([eE][+-]?[0-9]+)?[fF]? { - yylval->real = glsl_strtof(yytext, NULL); - return FLOATCONSTANT; - } +[0-9]+\.[0-9]+([eE][+-]?[0-9]+)?[fF]? | +\.[0-9]+([eE][+-]?[0-9]+)?[fF]? | +[0-9]+\.([eE][+-]?[0-9]+)?[fF]? | [0-9]+[eE][+-]?[0-9]+[fF]? { - yylval->real = glsl_strtof(yytext, NULL); - return FLOATCONSTANT; - } -[0-9]+[fF] { - yylval->real = glsl_strtof(yytext, NULL); + yylval->real = _mesa_strtof(yytext, NULL); return FLOATCONSTANT; } diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp index 79f8494..27e3301 100644 --- a/mesalib/src/glsl/glsl_parser_extras.cpp +++ b/mesalib/src/glsl/glsl_parser_extras.cpp @@ -1350,9 +1350,15 @@ ast_struct_specifier::ast_struct_specifier(const char *identifier, ast_declarator_list *declarator_list) { if (identifier == NULL) { + static mtx_t mutex = _MTX_INITIALIZER_NP; static unsigned anon_count = 1; - identifier = ralloc_asprintf(this, "#anon_struct_%04x", anon_count); - anon_count++; + unsigned count; + + mtx_lock(&mutex); + count = anon_count++; + mtx_unlock(&mutex); + + identifier = ralloc_asprintf(this, "#anon_struct_%04x", count); } name = identifier; this->declarations.push_degenerate_list_at_head(&declarator_list->link); diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp index c11d864..5f99193 100644 --- a/mesalib/src/glsl/glsl_types.cpp +++ b/mesalib/src/glsl/glsl_types.cpp @@ -29,6 +29,7 @@ extern "C" { #include "program/hash_table.h" } +mtx_t glsl_type::mutex = _MTX_INITIALIZER_NP; hash_table *glsl_type::array_types = NULL; hash_table *glsl_type::record_types = NULL; hash_table *glsl_type::interface_types = NULL; @@ -53,9 +54,14 @@ glsl_type::glsl_type(GLenum gl_type, vector_elements(vector_elements), matrix_columns(matrix_columns), length(0) { + mtx_lock(&glsl_type::mutex); + init_ralloc_type_ctx(); assert(name != NULL); this->name = ralloc_strdup(this->mem_ctx, name); + + mtx_unlock(&glsl_type::mutex); + /* Neither dimension is zero or both dimensions are zero. */ assert((vector_elements == 0) == (matrix_columns == 0)); @@ -71,9 +77,14 @@ glsl_type::glsl_type(GLenum gl_type, glsl_base_type base_type, sampler_array(array), sampler_type(type), interface_packing(0), length(0) { + mtx_lock(&glsl_type::mutex); + init_ralloc_type_ctx(); assert(name != NULL); this->name = ralloc_strdup(this->mem_ctx, name); + + mtx_unlock(&glsl_type::mutex); + memset(& fields, 0, sizeof(fields)); if (base_type == GLSL_TYPE_SAMPLER) { @@ -95,11 +106,14 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, { unsigned int i; + mtx_lock(&glsl_type::mutex); + init_ralloc_type_ctx(); assert(name != NULL); this->name = ralloc_strdup(this->mem_ctx, name); this->fields.structure = ralloc_array(this->mem_ctx, glsl_struct_field, length); + for (i = 0; i < length; i++) { this->fields.structure[i].type = fields[i].type; this->fields.structure[i].name = ralloc_strdup(this->fields.structure, @@ -110,6 +124,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, this->fields.structure[i].sample = fields[i].sample; this->fields.structure[i].matrix_layout = fields[i].matrix_layout; } + + mtx_unlock(&glsl_type::mutex); } glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, @@ -123,6 +139,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, { unsigned int i; + mtx_lock(&glsl_type::mutex); + init_ralloc_type_ctx(); assert(name != NULL); this->name = ralloc_strdup(this->mem_ctx, name); @@ -138,6 +156,8 @@ glsl_type::glsl_type(const glsl_struct_field *fields, unsigned num_fields, this->fields.structure[i].sample = fields[i].sample; this->fields.structure[i].matrix_layout = fields[i].matrix_layout; } + + mtx_unlock(&glsl_type::mutex); } @@ -285,6 +305,8 @@ const glsl_type *glsl_type::get_scalar_type() const void _mesa_glsl_release_types(void) { + mtx_lock(&glsl_type::mutex); + if (glsl_type::array_types != NULL) { hash_table_dtor(glsl_type::array_types); glsl_type::array_types = NULL; @@ -294,6 +316,8 @@ _mesa_glsl_release_types(void) hash_table_dtor(glsl_type::record_types); glsl_type::record_types = NULL; } + + mtx_unlock(&glsl_type::mutex); } @@ -302,7 +326,7 @@ glsl_type::glsl_type(const glsl_type *array, unsigned length) : sampler_dimensionality(0), sampler_shadow(0), sampler_array(0), sampler_type(0), interface_packing(0), vector_elements(0), matrix_columns(0), - name(NULL), length(length) + length(length), name(NULL) { this->fields.array = array; /* Inherit the gl type of the base. The GL type is used for @@ -316,7 +340,10 @@ glsl_type::glsl_type(const glsl_type *array, unsigned length) : * NUL. */ const unsigned name_length = strlen(array->name) + 10 + 3; + + mtx_lock(&glsl_type::mutex); char *const n = (char *) ralloc_size(this->mem_ctx, name_length); + mtx_unlock(&glsl_type::mutex); if (length == 0) snprintf(n, name_length, "%s[]", array->name); @@ -452,12 +479,6 @@ glsl_type::get_instance(unsigned base_type, unsigned rows, unsigned columns) const glsl_type * glsl_type::get_array_instance(const glsl_type *base, unsigned array_size) { - - if (array_types == NULL) { - array_types = hash_table_ctor(64, hash_table_string_hash, - hash_table_string_compare); - } - /* Generate a name using the base type pointer in the key. This is * done because the name of the base type may not be unique across * shaders. For example, two shaders may have different record types @@ -466,9 +487,19 @@ glsl_type::get_array_instance(const glsl_type *base, unsigned array_size) char key[128]; snprintf(key, sizeof(key), "%p[%u]", (void *) base, array_size); + mtx_lock(&glsl_type::mutex); + + if (array_types == NULL) { + array_types = hash_table_ctor(64, hash_table_string_hash, + hash_table_string_compare); + } + const glsl_type *t = (glsl_type *) hash_table_find(array_types, key); + if (t == NULL) { + mtx_unlock(&glsl_type::mutex); t = new glsl_type(base, array_size); + mtx_lock(&glsl_type::mutex); hash_table_insert(array_types, (void *) t, ralloc_strdup(mem_ctx, key)); } @@ -477,6 +508,8 @@ glsl_type::get_array_instance(const glsl_type *base, unsigned array_size) assert(t->length == array_size); assert(t->fields.array == base); + mtx_unlock(&glsl_type::mutex); + return t; } @@ -575,13 +608,17 @@ glsl_type::get_record_instance(const glsl_struct_field *fields, { const glsl_type key(fields, num_fields, name); + mtx_lock(&glsl_type::mutex); + if (record_types == NULL) { record_types = hash_table_ctor(64, record_key_hash, record_key_compare); } const glsl_type *t = (glsl_type *) hash_table_find(record_types, & key); if (t == NULL) { + mtx_unlock(&glsl_type::mutex); t = new glsl_type(fields, num_fields, name); + mtx_lock(&glsl_type::mutex); hash_table_insert(record_types, (void *) t, t); } @@ -590,6 +627,8 @@ glsl_type::get_record_instance(const glsl_struct_field *fields, assert(t->length == num_fields); assert(strcmp(t->name, name) == 0); + mtx_unlock(&glsl_type::mutex); + return t; } @@ -602,13 +641,17 @@ glsl_type::get_interface_instance(const glsl_struct_field *fields, { const glsl_type key(fields, num_fields, packing, block_name); + mtx_lock(&glsl_type::mutex); + if (interface_types == NULL) { interface_types = hash_table_ctor(64, record_key_hash, record_key_compare); } const glsl_type *t = (glsl_type *) hash_table_find(interface_types, & key); if (t == NULL) { + mtx_unlock(&glsl_type::mutex); t = new glsl_type(fields, num_fields, packing, block_name); + mtx_lock(&glsl_type::mutex); hash_table_insert(interface_types, (void *) t, t); } @@ -617,6 +660,8 @@ glsl_type::get_interface_instance(const glsl_struct_field *fields, assert(t->length == num_fields); assert(strcmp(t->name, block_name) == 0); + mtx_unlock(&glsl_type::mutex); + return t; } diff --git a/mesalib/src/glsl/glsl_types.h b/mesalib/src/glsl/glsl_types.h index eeb14c2..474b129 100644 --- a/mesalib/src/glsl/glsl_types.h +++ b/mesalib/src/glsl/glsl_types.h @@ -122,16 +122,18 @@ struct glsl_type { * easier to just ralloc_free 'mem_ctx' (or any of its ancestors). */ static void* operator new(size_t size) { - if (glsl_type::mem_ctx == NULL) { - glsl_type::mem_ctx = ralloc_context(NULL); - assert(glsl_type::mem_ctx != NULL); - } + mtx_lock(&glsl_type::mutex); + + /* mem_ctx should have been created by the static members */ + assert(glsl_type::mem_ctx != NULL); void *type; type = ralloc_size(glsl_type::mem_ctx, size); assert(type != NULL); + mtx_unlock(&glsl_type::mutex); + return type; } @@ -139,7 +141,9 @@ struct glsl_type { * ralloc_free in that case. */ static void operator delete(void *type) { + mtx_lock(&glsl_type::mutex); ralloc_free(type); + mtx_unlock(&glsl_type::mutex); } /** @@ -149,18 +153,11 @@ struct glsl_type { * these will be 0. */ /*@{*/ - unsigned vector_elements:3; /**< 1, 2, 3, or 4 vector elements. */ - unsigned matrix_columns:3; /**< 1, 2, 3, or 4 matrix columns. */ + uint8_t vector_elements; /**< 1, 2, 3, or 4 vector elements. */ + uint8_t matrix_columns; /**< 1, 2, 3, or 4 matrix columns. */ /*@}*/ /** - * Name of the data type - * - * Will never be \c NULL. - */ - const char *name; - - /** * For \c GLSL_TYPE_ARRAY, this is the length of the array. For * \c GLSL_TYPE_STRUCT or \c GLSL_TYPE_INTERFACE, it is the number of * elements in the structure and the number of values pointed to by @@ -169,6 +166,13 @@ struct glsl_type { unsigned length; /** + * Name of the data type + * + * Will never be \c NULL. + */ + const char *name; + + /** * Subtype of composite data types. */ union { @@ -618,6 +622,9 @@ struct glsl_type { bool record_compare(const glsl_type *b) const; private: + + static mtx_t mutex; + /** * ralloc context for all glsl_type allocations * diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp index c712c6a..fe5601a 100644 --- a/mesalib/src/glsl/ir.cpp +++ b/mesalib/src/glsl/ir.cpp @@ -46,11 +46,6 @@ bool ir_rvalue::is_negative_one() const return false; } -bool ir_rvalue::is_basis() const -{ - return false; -} - /** * Modify the swizzle make to move one component to another * @@ -1191,49 +1186,6 @@ ir_constant::is_negative_one() const } bool -ir_constant::is_basis() const -{ - if (!this->type->is_scalar() && !this->type->is_vector()) - return false; - - if (this->type->is_boolean()) - return false; - - unsigned ones = 0; - for (unsigned c = 0; c < this->type->vector_elements; c++) { - switch (this->type->base_type) { - case GLSL_TYPE_FLOAT: - if (this->value.f[c] == 1.0) - ones++; - else if (this->value.f[c] != 0.0) - return false; - break; - case GLSL_TYPE_INT: - if (this->value.i[c] == 1) - ones++; - else if (this->value.i[c] != 0) - return false; - break; - case GLSL_TYPE_UINT: - if (int(this->value.u[c]) == 1) - ones++; - else if (int(this->value.u[c]) != 0) - return false; - break; - default: - /* The only other base types are structures, arrays, samplers, and - * booleans. Samplers cannot be constants, and the others should - * have been filtered out above. - */ - assert(!"Should not get here."); - return false; - } - } - - return ones == 1; -} - -bool ir_constant::is_uint16_constant() const { if (!type->is_integer()) diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h index 90c443c..a0f48b2 100644 --- a/mesalib/src/glsl/ir.h +++ b/mesalib/src/glsl/ir.h @@ -251,8 +251,7 @@ public: * for vector and scalar types that have all elements set to the value * zero (or \c false for booleans). * - * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one, - * ir_constant::is_basis + * \sa ir_constant::has_value, ir_rvalue::is_one, ir_rvalue::is_negative_one */ virtual bool is_zero() const; @@ -264,8 +263,7 @@ public: * for vector and scalar types that have all elements set to the value * one (or \c true for booleans). * - * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one, - * ir_constant::is_basis + * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_negative_one */ virtual bool is_one() const; @@ -278,25 +276,10 @@ public: * negative one. For boolean types, the result is always \c false. * * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one - * ir_constant::is_basis */ virtual bool is_negative_one() const; /** - * Determine if an r-value is a basis vector - * - * The base implementation of this function always returns \c false. The - * \c ir_constant class over-rides this function to return \c true \b only - * for vector and scalar types that have one element set to the value one, - * and the other elements set to the value zero. For boolean types, the - * result is always \c false. - * - * \sa ir_constant::has_value, ir_rvalue::is_zero, ir_rvalue::is_one, - * is_constant::is_negative_one - */ - virtual bool is_basis() const; - - /** * Determine if an r-value is an unsigned integer constant which can be * stored in 16 bits. * @@ -359,6 +342,12 @@ enum ir_var_declaration_type { * re-declared by the shader. */ ir_var_declared_implicitly, + + /** + * Variable is implicitly generated by the compiler and should not be + * visible via the API. + */ + ir_var_hidden, }; /** @@ -2257,7 +2246,7 @@ public: * Determine whether a constant has the same value as another constant * * \sa ir_constant::is_zero, ir_constant::is_one, - * ir_constant::is_negative_one, ir_constant::is_basis + * ir_constant::is_negative_one */ bool has_value(const ir_constant *) const; @@ -2270,7 +2259,6 @@ public: virtual bool is_zero() const; virtual bool is_one() const; virtual bool is_negative_one() const; - virtual bool is_basis() const; /** * Return true for constants that could be stored as 16-bit unsigned values. diff --git a/mesalib/src/glsl/ir_optimization.h b/mesalib/src/glsl/ir_optimization.h index e25857a..34e0b4b 100644 --- a/mesalib/src/glsl/ir_optimization.h +++ b/mesalib/src/glsl/ir_optimization.h @@ -114,6 +114,7 @@ bool lower_noise(exec_list *instructions); bool lower_variable_index_to_cond_assign(exec_list *instructions, bool lower_input, bool lower_output, bool lower_temp, bool lower_uniform); bool lower_quadop_vector(exec_list *instructions, bool dont_lower_swz); +bool lower_const_arrays_to_uniforms(exec_list *instructions); bool lower_clip_distance(gl_shader *shader); void lower_output_reads(exec_list *instructions); bool lower_packing_builtins(exec_list *instructions, int op_mask); diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp index ae00e79..fd318c0 100644 --- a/mesalib/src/glsl/ir_reader.cpp +++ b/mesalib/src/glsl/ir_reader.cpp @@ -972,7 +972,7 @@ ir_reader::read_texture(s_expression *expr) op = ir_query_levels; } else if (MATCH(expr, other_pattern)) { op = ir_texture::get_opcode(tag->value()); - if (op == -1) + if (op == (ir_texture_opcode) -1) return NULL; } else { ir_read_error(NULL, "unexpected texture pattern %s", tag->value()); diff --git a/mesalib/src/glsl/ir_uniform.h b/mesalib/src/glsl/ir_uniform.h index b9ecf7c..21b5d05 100644 --- a/mesalib/src/glsl/ir_uniform.h +++ b/mesalib/src/glsl/ir_uniform.h @@ -175,6 +175,12 @@ struct gl_uniform_storage { * arrays this is the first element in the array. */ unsigned remap_location; + + /** + * This is a compiler-generated uniform that should not be advertised + * via the API. + */ + bool hidden; }; #ifdef __cplusplus diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp index 400e134..de2f6c9 100644 --- a/mesalib/src/glsl/link_uniforms.cpp +++ b/mesalib/src/glsl/link_uniforms.cpp @@ -585,6 +585,8 @@ private: this->uniforms[id].driver_storage = NULL; this->uniforms[id].storage = this->values; this->uniforms[id].atomic_buffer_index = -1; + this->uniforms[id].hidden = + current_var->data.how_declared == ir_var_hidden; if (this->ubo_block_index != -1) { this->uniforms[id].block_index = this->ubo_block_index; @@ -806,6 +808,50 @@ link_set_image_access_qualifiers(struct gl_shader_program *prog) } } +/** + * Sort the array of uniform storage so that the non-hidden uniforms are first + * + * This function sorts the list "in place." This is important because some of + * the storage accessible from \c uniforms has \c uniforms as its \c ralloc + * context. If \c uniforms is freed, some other storage will also be freed. + */ +static unsigned +move_hidden_uniforms_to_end(struct gl_shader_program *prog, + struct gl_uniform_storage *uniforms, + unsigned num_elements) +{ + struct gl_uniform_storage *sorted_uniforms = + ralloc_array(prog, struct gl_uniform_storage, num_elements); + unsigned hidden_uniforms = 0; + unsigned j = 0; + + /* Add the non-hidden uniforms. */ + for (unsigned i = 0; i < num_elements; i++) { + if (!uniforms[i].hidden) + sorted_uniforms[j++] = uniforms[i]; + } + + /* Add and count the hidden uniforms. */ + for (unsigned i = 0; i < num_elements; i++) { + if (uniforms[i].hidden) { + sorted_uniforms[j++] = uniforms[i]; + hidden_uniforms++; + } + } + + assert(prog->UniformHash != NULL); + prog->UniformHash->clear(); + for (unsigned i = 0; i < num_elements; i++) { + if (sorted_uniforms[i].name != NULL) + prog->UniformHash->put(i, sorted_uniforms[i].name); + } + + memcpy(uniforms, sorted_uniforms, sizeof(uniforms[0]) * num_elements); + ralloc_free(sorted_uniforms); + + return hidden_uniforms; +} + void link_assign_uniform_locations(struct gl_shader_program *prog, unsigned int boolean_true) @@ -926,6 +972,9 @@ link_assign_uniform_locations(struct gl_shader_program *prog, sizeof(prog->_LinkedShaders[i]->SamplerTargets)); } + const unsigned hidden_uniforms = + move_hidden_uniforms_to_end(prog, uniforms, num_user_uniforms); + /* Reserve all the explicit locations of the active uniforms. */ for (unsigned i = 0; i < num_user_uniforms; i++) { if (uniforms[i].remap_location != UNMAPPED_UNIFORM_LOC) { @@ -978,6 +1027,7 @@ link_assign_uniform_locations(struct gl_shader_program *prog, #endif prog->NumUserUniformStorage = num_user_uniforms; + prog->NumHiddenUniforms = hidden_uniforms; prog->UniformStorage = uniforms; link_set_image_access_qualifiers(prog); diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp index 2d31801..de6b1fb 100644 --- a/mesalib/src/glsl/linker.cpp +++ b/mesalib/src/glsl/linker.cpp @@ -642,7 +642,7 @@ validate_geometry_shader_emissions(struct gl_context *ctx, emit_vertex.run(prog->_LinkedShaders[MESA_SHADER_GEOMETRY]->ir); if (emit_vertex.error()) { linker_error(prog, "Invalid call %s(%d). Accepted values for the " - "stream parameter are in the range [0, %d].", + "stream parameter are in the range [0, %d].\n", emit_vertex.error_func(), emit_vertex.error_stream(), ctx->Const.MaxVertexStreams - 1); @@ -676,7 +676,7 @@ validate_geometry_shader_emissions(struct gl_context *ctx, */ if (prog->Geom.UsesStreams && prog->Geom.OutputType != GL_POINTS) { linker_error(prog, "EmitStreamVertex(n) and EndStreamPrimitive(n) " - "with n>0 requires point output"); + "with n>0 requires point output\n"); } } } @@ -808,7 +808,7 @@ cross_validate_globals(struct gl_shader_program *prog, linker_error(prog, "All redeclarations of gl_FragDepth in all " "fragment shaders in a single program must have " - "the same set of qualifiers."); + "the same set of qualifiers.\n"); } if (var->data.used && layout_differs) { @@ -817,7 +817,7 @@ cross_validate_globals(struct gl_shader_program *prog, "qualifier in any fragment shader, it must be " "redeclared with the same layout qualifier in " "all fragment shaders that have assignments to " - "gl_FragDepth"); + "gl_FragDepth\n"); } } @@ -948,7 +948,7 @@ interstage_cross_validate_uniform_blocks(struct gl_shader_program *prog) &sh->UniformBlocks[j]); if (index == -1) { - linker_error(prog, "uniform block `%s' has mismatching definitions", + linker_error(prog, "uniform block `%s' has mismatching definitions\n", sh->UniformBlocks[j].Name); return false; } @@ -1635,7 +1635,7 @@ link_intrastage_shaders(void *mem_ctx, if ((other_sig != NULL) && other_sig->is_defined && !other_sig->is_builtin()) { - linker_error(prog, "function `%s' is multiply defined", + linker_error(prog, "function `%s' is multiply defined\n", f->name); return NULL; } @@ -2086,7 +2086,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog, if (attr + slots > max_index) { linker_error(prog, "insufficient contiguous locations " - "available for %s `%s' %d %d %d", string, + "available for %s `%s' %d %d %d\n", string, var->name, used_locations, use_mask, attr); return false; } @@ -2155,7 +2155,7 @@ assign_attribute_or_color_locations(gl_shader_program *prog, linker_error(prog, "insufficient contiguous locations " - "available for %s `%s'", + "available for %s `%s'\n", string, to_assign[i].var->name); return false; } @@ -2257,7 +2257,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) continue; if (sh->num_samplers > ctx->Const.Program[i].MaxTextureImageUnits) { - linker_error(prog, "Too many %s shader texture samplers", + linker_error(prog, "Too many %s shader texture samplers\n", _mesa_shader_stage_to_string(i)); } @@ -2271,7 +2271,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) _mesa_shader_stage_to_string(i)); } else { linker_error(prog, "Too many %s shader default uniform block " - "components", + "components\n", _mesa_shader_stage_to_string(i)); } } @@ -2284,7 +2284,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) "this is non-portable out-of-spec behavior\n", _mesa_shader_stage_to_string(i)); } else { - linker_error(prog, "Too many %s shader uniform components", + linker_error(prog, "Too many %s shader uniform components\n", _mesa_shader_stage_to_string(i)); } } @@ -2302,7 +2302,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) } if (total_uniform_blocks > ctx->Const.MaxCombinedUniformBlocks) { - linker_error(prog, "Too many combined uniform blocks (%d/%d)", + linker_error(prog, "Too many combined uniform blocks (%d/%d)\n", prog->NumUniformBlocks, ctx->Const.MaxCombinedUniformBlocks); } else { @@ -2310,7 +2310,7 @@ check_resources(struct gl_context *ctx, struct gl_shader_program *prog) const unsigned max_uniform_blocks = ctx->Const.Program[i].MaxUniformBlocks; if (blocks[i] > max_uniform_blocks) { - linker_error(prog, "Too many %s uniform blocks (%d/%d)", + linker_error(prog, "Too many %s uniform blocks (%d/%d)\n", _mesa_shader_stage_to_string(i), blocks[i], max_uniform_blocks); @@ -2338,7 +2338,7 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog) if (sh) { if (sh->NumImages > ctx->Const.Program[i].MaxImageUniforms) - linker_error(prog, "Too many %s shader image uniforms", + linker_error(prog, "Too many %s shader image uniforms\n", _mesa_shader_stage_to_string(i)); total_image_units += sh->NumImages; @@ -2354,11 +2354,11 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog) } if (total_image_units > ctx->Const.MaxCombinedImageUniforms) - linker_error(prog, "Too many combined image uniforms"); + linker_error(prog, "Too many combined image uniforms\n"); if (total_image_units + fragment_outputs > ctx->Const.MaxCombinedImageUnitsAndFragmentOutputs) - linker_error(prog, "Too many combined image uniforms and fragment outputs"); + linker_error(prog, "Too many combined image uniforms and fragment outputs\n"); } @@ -2382,7 +2382,7 @@ reserve_explicit_locations(struct gl_shader_program *prog, max_loc + 1); if (!prog->UniformRemapTable) { - linker_error(prog, "Out of memory during linking."); + linker_error(prog, "Out of memory during linking.\n"); return false; } @@ -2411,8 +2411,8 @@ reserve_explicit_locations(struct gl_shader_program *prog, * or linker error will be generated." */ linker_error(prog, - "location qualifier for uniform %s overlaps" - "previously used location", + "location qualifier for uniform %s overlaps " + "previously used location\n", var->name); return false; } @@ -2447,7 +2447,7 @@ check_explicit_uniform_locations(struct gl_context *ctx, string_to_uint_map *uniform_map = new string_to_uint_map; if (!uniform_map) { - linker_error(prog, "Out of memory during linking."); + linker_error(prog, "Out of memory during linking.\n"); return; } @@ -2678,6 +2678,8 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) &ctx->Const.ShaderCompilerOptions[i], ctx->Const.NativeIntegers)) ; + + lower_const_arrays_to_uniforms(prog->_LinkedShaders[i]->ir); } /* Check and validate stream emissions in geometry shaders */ @@ -2719,7 +2721,7 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) */ if (first == MESA_SHADER_FRAGMENT) { linker_error(prog, "Transform feedback varyings specified, but " - "no vertex or geometry shader is present."); + "no vertex or geometry shader is present.\n"); goto done; } diff --git a/mesalib/src/glsl/list.h b/mesalib/src/glsl/list.h index b6c32bc..995c666 100644 --- a/mesalib/src/glsl/list.h +++ b/mesalib/src/glsl/list.h @@ -521,6 +521,27 @@ exec_node_insert_list_before(struct exec_node *n, struct exec_list *before) exec_list_make_empty(before); } +static inline void +exec_list_validate(const struct exec_list *list) +{ + const struct exec_node *node; + + assert(list->head->prev == (const struct exec_node *) &list->head); + assert(list->tail == NULL); + assert(list->tail_pred->next == (const struct exec_node *) &list->tail); + + /* We could try to use one of the interators below for this but they all + * either require C++ or assume the exec_node is embedded in a structure + * which is not the case for this function. + */ + for (node = exec_list_get_head_const(list); + !exec_node_is_tail_sentinel(node); + node = exec_node_get_next_const(node)) { + assert(node->next->prev == node); + assert(node->prev->next == node); + } +} + #ifdef __cplusplus inline void exec_list::make_empty() { diff --git a/mesalib/src/glsl/loop_unroll.cpp b/mesalib/src/glsl/loop_unroll.cpp index ce795f6..635e1dd 100644 --- a/mesalib/src/glsl/loop_unroll.cpp +++ b/mesalib/src/glsl/loop_unroll.cpp @@ -64,6 +64,7 @@ class loop_unroll_count : public ir_hierarchical_visitor { public: int nodes; bool unsupported_variable_indexing; + bool array_indexed_by_induction_var_with_exact_iterations; /* If there are nested loops, the node count will be inaccurate. */ bool nested_loop; @@ -74,6 +75,7 @@ public: nodes = 0; nested_loop = false; unsupported_variable_indexing = false; + array_indexed_by_induction_var_with_exact_iterations = false; run(list); } @@ -112,6 +114,14 @@ public: ir_variable *array = ir->array->variable_referenced(); loop_variable *lv = ls->get(ir->array_index->variable_referenced()); if (array && lv && lv->is_induction_var()) { + /* If an array is indexed by a loop induction variable, and the + * array size is exactly the number of loop iterations, this is + * probably a simple for-loop trying to access each element in + * turn; the application may expect it to be unrolled. + */ + if (int(array->type->length) == ls->limiting_terminator->iterations) + array_indexed_by_induction_var_with_exact_iterations = true; + switch (array->data.mode) { case ir_var_auto: case ir_var_temporary: @@ -314,7 +324,8 @@ loop_unroll_visitor::visit_leave(ir_loop *ir) bool loop_too_large = count.nested_loop || count.nodes * iterations > max_iterations * 5; - if (loop_too_large && !count.unsupported_variable_indexing) + if (loop_too_large && !count.unsupported_variable_indexing && + !count.array_indexed_by_induction_var_with_exact_iterations) return visit_continue; /* Note: the limiting terminator contributes 1 to ls->num_loop_jumps. diff --git a/mesalib/src/glsl/lower_const_arrays_to_uniforms.cpp b/mesalib/src/glsl/lower_const_arrays_to_uniforms.cpp new file mode 100644 index 0000000..2243f47 --- /dev/null +++ b/mesalib/src/glsl/lower_const_arrays_to_uniforms.cpp @@ -0,0 +1,111 @@ +/* + * Copyright © 2014 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/** + * \file lower_const_arrays_to_uniforms.cpp + * + * Lower constant arrays to uniform arrays. + * + * Some driver backends (such as i965 and nouveau) don't handle constant arrays + * gracefully, instead treating them as ordinary writable temporary arrays. + * Since arrays can be large, this often means spilling them to scratch memory, + * which usually involves a large number of instructions. + * + * This must be called prior to link_set_uniform_initializers(); we need the + * linker to process our new uniform's constant initializer. + * + * This should be called after optimizations, since those can result in + * splitting and removing arrays that are indexed by constant expressions. + */ +#include "ir.h" +#include "ir_visitor.h" +#include "ir_rvalue_visitor.h" +#include "glsl_types.h" + +namespace { +class lower_const_array_visitor : public ir_rvalue_visitor { +public: + lower_const_array_visitor(exec_list *insts) + { + instructions = insts; + progress = false; + index = 0; + } + + bool run() + { + visit_list_elements(this, instructions); + return progress; + } + + void handle_rvalue(ir_rvalue **rvalue); + +private: + exec_list *instructions; + bool progress; + unsigned index; +}; + +void +lower_const_array_visitor::handle_rvalue(ir_rvalue **rvalue) +{ + if (!*rvalue) + return; + + ir_dereference_array *dra = (*rvalue)->as_dereference_array(); + if (!dra) + return; + + ir_constant *con = dra->array->as_constant(); + if (!con || !con->type->is_array()) + return; + + void *mem_ctx = ralloc_parent(con); + + char *uniform_name = ralloc_asprintf(mem_ctx, "constarray__%d", index++); + + ir_variable *uni = + new(mem_ctx) ir_variable(con->type, uniform_name, ir_var_uniform); + uni->constant_initializer = con; + uni->constant_value = con; + uni->data.has_initializer = true; + uni->data.how_declared = ir_var_hidden; + uni->data.read_only = true; + /* Assume the whole thing is accessed. */ + uni->data.max_array_access = uni->type->length - 1; + instructions->push_head(uni); + + ir_dereference_variable *varref = new(mem_ctx) ir_dereference_variable(uni); + *rvalue = new(mem_ctx) ir_dereference_array(varref, dra->array_index); + + progress = true; +} + +} /* anonymous namespace */ + +bool +lower_const_arrays_to_uniforms(exec_list *instructions) +{ + lower_const_array_visitor v(instructions); + return v.run(); +} diff --git a/mesalib/src/glsl/main.cpp b/mesalib/src/glsl/main.cpp index 9b36a1f..91e457a 100644 --- a/mesalib/src/glsl/main.cpp +++ b/mesalib/src/glsl/main.cpp @@ -35,6 +35,7 @@ #include "glsl_parser_extras.h" #include "ir_optimization.h" #include "program.h" +#include "program/hash_table.h" #include "loop_analysis.h" #include "standalone_scaffolding.h" @@ -357,6 +358,11 @@ main(int argc, char **argv) assert(whole_program != NULL); whole_program->InfoLog = ralloc_strdup(whole_program, ""); + /* Created just to avoid segmentation faults */ + whole_program->AttributeBindings = new string_to_uint_map; + whole_program->FragDataBindings = new string_to_uint_map; + whole_program->FragDataIndexBindings = new string_to_uint_map; + for (/* empty */; argc > optind; optind++) { whole_program->Shaders = reralloc(whole_program, whole_program->Shaders, @@ -415,6 +421,10 @@ main(int argc, char **argv) for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) ralloc_free(whole_program->_LinkedShaders[i]); + delete whole_program->AttributeBindings; + delete whole_program->FragDataBindings; + delete whole_program->FragDataIndexBindings; + ralloc_free(whole_program); _mesa_glsl_release_types(); _mesa_glsl_release_builtin_functions(); diff --git a/mesalib/src/glsl/opt_algebraic.cpp b/mesalib/src/glsl/opt_algebraic.cpp index 0cdb8ec..430f5cb 100644 --- a/mesalib/src/glsl/opt_algebraic.cpp +++ b/mesalib/src/glsl/opt_algebraic.cpp @@ -105,12 +105,6 @@ is_vec_negative_one(ir_constant *ir) } static inline bool -is_vec_basis(ir_constant *ir) -{ - return (ir == NULL) ? false : ir->is_basis(); -} - -static inline bool is_valid_vec_const(ir_constant *ir) { if (ir == NULL) @@ -537,21 +531,34 @@ ir_algebraic_visitor::handle_expression(ir_expression *ir) if (is_vec_zero(op_const[0]) || is_vec_zero(op_const[1])) return ir_constant::zero(mem_ctx, ir->type); - if (is_vec_basis(op_const[0])) { - unsigned component = 0; - for (unsigned c = 0; c < op_const[0]->type->vector_elements; c++) { - if (op_const[0]->value.f[c] == 1.0) - component = c; - } - return new(mem_ctx) ir_swizzle(ir->operands[1], component, 0, 0, 0, 1); - } - if (is_vec_basis(op_const[1])) { - unsigned component = 0; - for (unsigned c = 0; c < op_const[1]->type->vector_elements; c++) { - if (op_const[1]->value.f[c] == 1.0) - component = c; - } - return new(mem_ctx) ir_swizzle(ir->operands[0], component, 0, 0, 0, 1); + for (int i = 0; i < 2; i++) { + if (!op_const[i]) + continue; + + unsigned components[4] = { 0 }, count = 0; + + for (unsigned c = 0; c < op_const[i]->type->vector_elements; c++) { + if (op_const[i]->value.f[c] == 0.0) + continue; + + components[count] = c; + count++; + } + + /* No channels had zero values; bail. */ + if (count >= op_const[i]->type->vector_elements) + break; + + ir_expression_operation op = count == 1 ? + ir_binop_mul : ir_binop_dot; + + /* Swizzle both operands to remove the channels that were zero. */ + return new(mem_ctx) + ir_expression(op, glsl_type::float_type, + new(mem_ctx) ir_swizzle(ir->operands[0], + components, count), + new(mem_ctx) ir_swizzle(ir->operands[1], + components, count)); } break; diff --git a/mesalib/src/glsl/opt_cse.cpp b/mesalib/src/glsl/opt_cse.cpp index 9c96835..b0b67f4 100644 --- a/mesalib/src/glsl/opt_cse.cpp +++ b/mesalib/src/glsl/opt_cse.cpp @@ -194,6 +194,8 @@ is_cse_candidate_visitor::visit(ir_dereference_variable *ir) if (ir->var->data.read_only) { return visit_continue; } else { + if (debug) + printf("CSE: non-candidate: var %s is not read only\n", ir->var->name); ok = false; return visit_stop; } @@ -220,8 +222,11 @@ is_cse_candidate(ir_rvalue *ir) /* Our temporary variable assignment generation isn't ready to handle * anything bigger than a vector. */ - if (!ir->type->is_vector() && !ir->type->is_scalar()) + if (!ir->type->is_vector() && !ir->type->is_scalar()) { + if (debug) + printf("CSE: non-candidate: not a vector/scalar\n"); return false; + } /* Only handle expressions and textures currently. We may want to extend * to variable-index array dereferences at some point. @@ -231,6 +236,8 @@ is_cse_candidate(ir_rvalue *ir) case ir_type_texture: break; default: + if (debug) + printf("CSE: non-candidate: not an expression/texture\n"); return false; } diff --git a/mesalib/src/glsl/s_expression.cpp b/mesalib/src/glsl/s_expression.cpp index 1a28e1d..2928a4d 100644 --- a/mesalib/src/glsl/s_expression.cpp +++ b/mesalib/src/glsl/s_expression.cpp @@ -73,7 +73,7 @@ read_atom(void *ctx, const char *&src, char *&symbol_buffer) } else { // Check if the atom is a number. char *float_end = NULL; - float f = glsl_strtof(src, &float_end); + float f = _mesa_strtof(src, &float_end); if (float_end != src) { char *int_end = NULL; int i = strtol(src, &int_end, 10); diff --git a/mesalib/src/glsl/s_expression.h b/mesalib/src/glsl/s_expression.h index 642af19..1d47535 100644 --- a/mesalib/src/glsl/s_expression.h +++ b/mesalib/src/glsl/s_expression.h @@ -27,7 +27,7 @@ #define S_EXPRESSION_H #include "main/core.h" /* for Elements */ -#include "strtod.h" +#include "util/strtod.h" #include "list.h" /* Type-safe downcasting macros (also safe to pass NULL) */ diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript index bc1c43a..97ebfe6 100644 --- a/mesalib/src/mapi/glapi/SConscript +++ b/mesalib/src/mapi/glapi/SConscript @@ -16,6 +16,7 @@ if env['platform'] == 'windows': env.Append(CPPDEFINES = [ '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers 'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers + 'KHRONOS_DLL_EXPORTS', # declare gl* as __declspec(dllexport) in Khronos headers ]) if env['gles']: env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS']) diff --git a/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml b/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml new file mode 100644 index 0000000..bc72435 --- /dev/null +++ b/mesalib/src/mapi/glapi/gen/KHR_context_flush_control.xml @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd"> + +<OpenGLAPI> + +<category name="GL_KHR_context_flush_control" number="168"> + <enum name="CONTEXT_RELEASE_BEHAVIOR" value="0x82FB"/> + <enum name="CONTEXT_RELEASE_BEHAVIOR_FLUSH" value="0x82FC"/> +</category> + +</OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 72e5095..7f76f19 100644 --- a/mesalib/src/mapi/glapi/gen/Makefile.am +++ b/mesalib/src/mapi/glapi/gen/Makefile.am @@ -61,12 +61,10 @@ EXTRA_DIST= \ $(MESA_GLAPI_DIR)/glapi_x86-64.S \ $(MESA_GLAPI_DIR)/glapi_sparc.S \ $(COMMON_GLX) \ - extension_helper.py \ gl_apitemp.py \ gl_enums.py \ gl_genexec.py \ gl_gentable.py \ - gl_offsets.py \ gl_procs.py \ gl_SPARC_asm.py \ gl_table.py \ @@ -76,7 +74,6 @@ EXTRA_DIST= \ glX_proto_send.py \ glX_proto_size.py \ glX_server_table.py \ - mesadef.py \ remap_helper.py \ gl_API.dtd diff --git a/mesalib/src/mapi/glapi/gen/extension_helper.py b/mesalib/src/mapi/glapi/gen/extension_helper.py deleted file mode 100644 index da633dc..0000000 --- a/mesalib/src/mapi/glapi/gen/extension_helper.py +++ /dev/null @@ -1,324 +0,0 @@ -#!/usr/bin/env python - -# (C) Copyright IBM Corporation 2005 -# All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -# Authors: -# Ian Romanick <idr(a)us.ibm.com> - -import gl_XML -import license -import sys, getopt, string - -vtxfmt = [ - "ArrayElement", \ - "Color3f", \ - "Color3fv", \ - "Color4f", \ - "Color4fv", \ - "EdgeFlag", \ - "EdgeFlagv", \ - "EvalCoord1f", \ - "EvalCoord1fv", \ - "EvalCoord2f", \ - "EvalCoord2fv", \ - "EvalPoint1", \ - "EvalPoint2", \ - "FogCoordfEXT", \ - "FogCoordfvEXT", \ - "Indexf", \ - "Indexfv", \ - "Materialfv", \ - "MultiTexCoord1fARB", \ - "MultiTexCoord1fvARB", \ - "MultiTexCoord2fARB", \ - "MultiTexCoord2fvARB", \ - "MultiTexCoord3fARB", \ - "MultiTexCoord3fvARB", \ - "MultiTexCoord4fARB", \ - "MultiTexCoord4fvARB", \ - "Normal3f", \ - "Normal3fv", \ - "SecondaryColor3fEXT", \ - "SecondaryColor3fvEXT", \ - "TexCoord1f", \ - "TexCoord1fv", \ - "TexCoord2f", \ - "TexCoord2fv", \ - "TexCoord3f", \ - "TexCoord3fv", \ - "TexCoord4f", \ - "TexCoord4fv", \ - "Vertex2f", \ - "Vertex2fv", \ - "Vertex3f", \ - "Vertex3fv", \ - "Vertex4f", \ - "Vertex4fv", \ - "CallList", \ - "CallLists", \ - "Begin", \ - "End", \ - "VertexAttrib1fNV", \ - "VertexAttrib1fvNV", \ - "VertexAttrib2fNV", \ - "VertexAttrib2fvNV", \ - "VertexAttrib3fNV", \ - "VertexAttrib3fvNV", \ - "VertexAttrib4fNV", \ - "VertexAttrib4fvNV", \ - "VertexAttrib1fARB", \ - "VertexAttrib1fvARB", \ - "VertexAttrib2fARB", \ - "VertexAttrib2fvARB", \ - "VertexAttrib3fARB", \ - "VertexAttrib3fvARB", \ - "VertexAttrib4fARB", \ - "VertexAttrib4fvARB", \ - "Rectf", \ - "DrawArrays", \ - "DrawElements", \ - "DrawRangeElements", \ - "EvalMesh1", \ - "EvalMesh2", \ -] - -def all_entrypoints_in_abi(f, abi, api): - for n in f.entry_points: - [category, num] = api.get_category_for_name( n ) - if category not in abi: - return 0 - - return 1 - - -def any_entrypoints_in_abi(f, abi, api): - for n in f.entry_points: - [category, num] = api.get_category_for_name( n ) - if category in abi: - return 1 - - return 0 - - -def condition_for_function(f, abi, all_not_in_ABI): - """Create a C-preprocessor condition for the function. - - There are two modes of operation. If all_not_in_ABI is set, a - condition is only created is all of the entry-point names for f are - not in the selected ABI. If all_not_in_ABI is not set, a condition - is created if any entryp-point name is not in the selected ABI. - """ - - condition = [] - for n in f.entry_points: - [category, num] = api.get_category_for_name( n ) - if category not in abi: - condition.append( 'defined(need_%s)' % (gl_XML.real_category_name( category )) ) - elif all_not_in_ABI: - return [] - - return condition - - -class PrintGlExtensionGlue(gl_XML.gl_print_base): - def __init__(self): - gl_XML.gl_print_base.__init__(self) - - self.name = "extension_helper.py (from Mesa)" - self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") - return - - - def printRealHeader(self): - print '#include "utils.h"' - print '#include "main/dispatch.h"' - print '' - return - - - def printBody(self, api): - abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ] - - category_list = {} - - print '#ifndef NULL' - print '# define NULL 0' - print '#endif' - print '' - - for f in api.functionIterateAll(): - condition = condition_for_function(f, abi, 0) - if len(condition): - print '#if %s' % (string.join(condition, " || ")) - print 'static const char %s_names[] =' % (f.name) - - parameter_signature = '' - for p in f.parameterIterator(): - if p.is_padding: - continue - - # FIXME: This is a *really* ugly hack. :( - - tn = p.type_expr.get_base_type_node() - if p.is_pointer(): - parameter_signature += 'p' - elif tn.integer: - parameter_signature += 'i' - elif tn.size == 4: - parameter_signature += 'f' - else: - parameter_signature += 'd' - - print ' "%s\\0" /* Parameter signature */' % (parameter_signature) - - for n in f.entry_points: - print ' "gl%s\\0"' % (n) - - [category, num] = api.get_category_for_name( n ) - if category not in abi: - c = gl_XML.real_category_name(category) - if not category_list.has_key(c): - category_list[ c ] = [] - - category_list[ c ].append( f ) - - print ' "";' - print '#endif' - print '' - - keys = category_list.keys() - keys.sort() - - for category in keys: - print '#if defined(need_%s)' % (category) - print 'static const struct dri_extension_function %s_functions[] = {' % (category) - - for f in category_list[ category ]: - # A function either has an offset that is - # assigned by the ABI, or it has a remap - # index. - if any_entrypoints_in_abi(f, abi, api): - index_name = "-1" - offset = f.offset - else: - index_name = "%s_remap_index" % (f.name) - offset = -1 - - print ' { %s_names, %s, %d },' % (f.name, index_name, offset) - - - print ' { NULL, 0, 0 }' - print '};' - print '#endif' - print '' - - return - - -class PrintInitDispatch(gl_XML.gl_print_base): - def __init__(self): - gl_XML.gl_print_base.__init__(self) - - self.name = "extension_helper.py (from Mesa)" - self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM") - return - - - def do_function_body(self, api, abi, vtxfmt_only): - last_condition_string = None - for f in api.functionIterateByOffset(): - if (f.name in vtxfmt) and not vtxfmt_only: - continue - - if (f.name not in vtxfmt) and vtxfmt_only: - continue - - condition = condition_for_function(f, abi, 1) - condition_string = string.join(condition, " || ") - - if condition_string != last_condition_string: - if last_condition_string: - print '#endif /* %s */' % (last_condition_string) - - if condition_string: - print '#if %s' % (condition_string) - - if vtxfmt_only: - print ' disp->%s = vfmt->%s;' % (f.name, f.name) - else: - print ' disp->%s = _mesa_%s;' % (f.name, f.name) - - last_condition_string = condition_string - - if last_condition_string: - print '#endif /* %s */' % (last_condition_string) - - - - def printBody(self, api): - abi = [ "1.0", "1.1", "1.2", "GL_ARB_multitexture" ] - - print 'void driver_init_exec_table(struct _glapi_table *disp)' - print '{' - self.do_function_body(api, abi, 0) - print '}' - print '' - print 'void driver_install_vtxfmt(struct _glapi_table *disp, const GLvertexformat *vfmt)' - print '{' - self.do_function_body(api, abi, 1) - print '}' - - return - - -def show_usage(): - print "Usage: %s [-f input_file_name] [-m output_mode]" % sys.argv[0] - print " -m output_mode Output mode can be one of 'extensions' or 'exec_init'." - sys.exit(1) - -if __name__ == '__main__': - file_name = "gl_API.xml" - - try: - (args, trail) = getopt.getopt(sys.argv[1:], "f:m:") - except Exception,e: - show_usage() - - mode = "extensions" - for (arg,val) in args: - if arg == "-f": - file_name = val - if arg == '-m': - mode = val - - - api = gl_XML.parse_GL_API( file_name ) - - if mode == "extensions": - printer = PrintGlExtensionGlue() - elif mode == "exec_init": - printer = PrintInitDispatch() - else: - show_usage() - - printer.Print( api ) diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 534e6a0..e1b1246 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8379,6 +8379,8 @@ <xi:include href="ARB_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="KHR_context_flush_control.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +  <category name="GL_EXT_blend_color" number="2"> diff --git a/mesalib/src/mapi/glapi/gen/gl_offsets.py b/mesalib/src/mapi/glapi/gen/gl_offsets.py deleted file mode 100644 index 897ac18..0000000 --- a/mesalib/src/mapi/glapi/gen/gl_offsets.py +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env python - -# (C) Copyright IBM Corporation 2004, 2005 -# All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -# Authors: -# Ian Romanick <idr(a)us.ibm.com> - -import gl_XML -import license -import sys, getopt - -class PrintGlOffsets(gl_XML.gl_print_base): - def __init__(self, es=False): - gl_XML.gl_print_base.__init__(self) - - self.es = es - self.name = "gl_offsets.py (from Mesa)" - self.header_tag = '_GLAPI_OFFSETS_H_' - self.license = license.bsd_license_template % ( \ -"""Copyright (C) 1999-2001 Brian Paul All Rights Reserved. -(C) Copyright IBM Corporation 2004""", "BRIAN PAUL, IBM") - return - - def printBody(self, api): - print '/* this file should not be included directly in mesa */' - print '' - - functions = [] - abi_functions = [] - alias_functions = [] - count = 0 - for f in api.functionIterateByOffset(): - if not f.is_abi(): - functions.append( [f, count] ) - count += 1 - else: - abi_functions.append( f ) - - if self.es: - # remember functions with aliases - if len(f.entry_points) > 1: - alias_functions.append(f) - - for f in abi_functions: - print '#define _gloffset_%s %d' % (f.name, f.offset) - last_static = f.offset - - print '' - print '#if !defined(_GLAPI_USE_REMAP_TABLE)' - print '' - - for [f, index] in functions: - print '#define _gloffset_%s %d' % (f.name, f.offset) - - print '#define _gloffset_FIRST_DYNAMIC %d' % (api.next_offset) - - print '' - print '#else' - print '' - - for [f, index] in functions: - print '#define _gloffset_%s driDispatchRemapTable[%s_remap_index]' % (f.name, f.name) - - print '' - print '#endif /* !defined(_GLAPI_USE_REMAP_TABLE) */' - - if alias_functions: - print '' - print '/* define aliases for compatibility */' - for f in alias_functions: - for name in f.entry_points: - if name != f.name: - print '#define _gloffset_%s _gloffset_%s' % (name, f.name) - return - - -def show_usage(): - print "Usage: %s [-f input_file_name] [-c]" % sys.argv[0] - print " -c Enable compatibility with OpenGL ES." - sys.exit(1) - -if __name__ == '__main__': - file_name = "gl_API.xml" - - try: - (args, trail) = getopt.getopt(sys.argv[1:], "f:c") - except Exception,e: - show_usage() - - es = False - for (arg,val) in args: - if arg == "-f": - file_name = val - elif arg == "-c": - es = True - - api = gl_XML.parse_GL_API( file_name ) - - printer = PrintGlOffsets(es) - printer.Print( api ) diff --git a/mesalib/src/mapi/glapi/gen/mesadef.py b/mesalib/src/mapi/glapi/gen/mesadef.py deleted file mode 100644 index 77cc4a3..0000000 --- a/mesalib/src/mapi/glapi/gen/mesadef.py +++ /dev/null @@ -1,215 +0,0 @@ -#!/usr/bin/env python - - -# Mesa 3-D graphics library -# -# Copyright (C) 1999-2001 Brian Paul All Rights Reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. - - -# Generate the mesa.def file for Windows. -# -# Usage: -# mesadef.py >mesa.def -# Then copy to src/mesa/drivers/windows/gdi -# -# Dependencies: -# The apispec file must be in the current directory. - - - -import apiparser -import string - - -def PrintHead(): - print '; DO NOT EDIT - This file generated automatically by mesadef.py script' - print 'DESCRIPTION \'Mesa (OpenGL work-alike) for Win32\'' - print 'VERSION 6.0' - print ';' - print '; Module definition file for Mesa (OPENGL32.DLL)' - print ';' - print '; Note: The OpenGL functions use the STDCALL' - print '; function calling convention. Microsoft\'s' - print '; OPENGL32 uses this convention and so must the' - print '; Mesa OPENGL32 so that the Mesa DLL can be used' - print '; as a drop-in replacement.' - print ';' - print '; The linker exports STDCALL entry points with' - print '; \'decorated\' names; e.g., _glBegin@0, where the' - print '; trailing number is the number of bytes of ' - print '; parameter data pushed onto the stack. The' - print '; callee is responsible for popping this data' - print '; off the stack, usually via a RETF n instruction.' - print ';' - print '; However, the Microsoft OPENGL32.DLL does not export' - print '; the decorated names, even though the calling convention' - print '; is STDCALL. So, this module definition file is' - print '; needed to force the Mesa OPENGL32.DLL to export the' - print '; symbols in the same manner as the Microsoft DLL.' - print '; Were it not for this problem, this file would not' - print '; be needed (for the gl* functions) since the entry' - print '; points are compiled with dllexport declspec.' - print ';' - print '; However, this file is still needed to export "internal"' - print '; Mesa symbols for the benefit of the OSMESA32.DLL.' - print ';' - print 'EXPORTS' - return -#enddef - - -def PrintTail(): - print ';' - print '; WGL API' - print '\twglChoosePixelFormat' - print '\twglCopyContext' - print '\twglCreateContext' - print '\twglCreateLayerContext' - print '\twglDeleteContext' - print '\twglDescribeLayerPlane' - print '\twglDescribePixelFormat' - print '\twglGetCurrentContext' - print '\twglGetCurrentDC' - print '\twglGetExtensionsStringARB' - print '\twglGetLayerPaletteEntries' - print '\twglGetPixelFormat' - print '\twglGetProcAddress' - print '\twglMakeCurrent' - print '\twglRealizeLayerPalette' - print '\twglSetLayerPaletteEntries' - print '\twglSetPixelFormat' - print '\twglShareLists' - print '\twglSwapBuffers' - print '\twglSwapLayerBuffers' - print '\twglUseFontBitmapsA' - print '\twglUseFontBitmapsW' - print '\twglUseFontOutlinesA' - print '\twglUseFontOutlinesW' - print ';' - print '; Mesa internals - mostly for OSMESA' - print '\t_ac_CreateContext' - print '\t_ac_DestroyContext' - print '\t_ac_InvalidateState' - print '\t_glapi_get_context' - print '\t_glapi_get_proc_address' - print '\t_mesa_buffer_data' - print '\t_mesa_buffer_map' - print '\t_mesa_buffer_subdata' - print '\t_mesa_choose_tex_format' - print '\t_mesa_compressed_texture_size' - print '\t_mesa_create_framebuffer' - print '\t_mesa_create_visual' - print '\t_mesa_delete_buffer_object' - print '\t_mesa_delete_texture_object' - print '\t_mesa_destroy_framebuffer' - print '\t_mesa_destroy_visual' - print '\t_mesa_enable_1_3_extensions' - print '\t_mesa_enable_1_4_extensions' - print '\t_mesa_enable_1_5_extensions' - print '\t_mesa_enable_sw_extensions' - print '\t_mesa_error' - print '\t_mesa_free_context_data' - print '\t_mesa_get_current_context' - print '\t_mesa_init_default_imports' - print '\t_mesa_initialize_context' - print '\t_mesa_make_current' - print '\t_mesa_new_buffer_object' - print '\t_mesa_new_texture_object' - print '\t_mesa_problem' - print '\t_mesa_store_compressed_teximage1d' - print '\t_mesa_store_compressed_teximage2d' - print '\t_mesa_store_compressed_teximage3d' - print '\t_mesa_store_compressed_texsubimage1d' - print '\t_mesa_store_compressed_texsubimage2d' - print '\t_mesa_store_compressed_texsubimage3d' - print '\t_mesa_store_teximage1d' - print '\t_mesa_store_teximage2d' - print '\t_mesa_store_teximage3d' - print '\t_mesa_store_texsubimage1d' - print '\t_mesa_store_texsubimage2d' - print '\t_mesa_store_texsubimage3d' - print '\t_mesa_test_proxy_teximage' - print '\t_mesa_Viewport' - print '\t_mesa_meta_CopyColorSubTable' - print '\t_mesa_meta_CopyColorTable' - print '\t_mesa_meta_CopyConvolutionFilter1D' - print '\t_mesa_meta_CopyConvolutionFilter2D' - print '\t_mesa_meta_CopyTexImage1D' - print '\t_mesa_meta_CopyTexImage2D' - print '\t_mesa_meta_CopyTexSubImage1D' - print '\t_mesa_meta_CopyTexSubImage2D' - print '\t_mesa_meta_CopyTexSubImage3D' - print '\t_swrast_Accum' - print '\t_swrast_alloc_buffers' - print '\t_swrast_Bitmap' - print '\t_swrast_CopyPixels' - print '\t_swrast_DrawPixels' - print '\t_swrast_GetDeviceDriverReference' - print '\t_swrast_Clear' - print '\t_swrast_choose_line' - print '\t_swrast_choose_triangle' - print '\t_swrast_CreateContext' - print '\t_swrast_DestroyContext' - print '\t_swrast_InvalidateState' - print '\t_swrast_ReadPixels' - print '\t_swrast_zbuffer_address' - print '\t_swsetup_Wakeup' - print '\t_swsetup_CreateContext' - print '\t_swsetup_DestroyContext' - print '\t_swsetup_InvalidateState' - print '\t_tnl_CreateContext' - print '\t_tnl_DestroyContext' - print '\t_tnl_InvalidateState' - print '\t_tnl_MakeCurrent' - print '\t_tnl_run_pipeline' -#enddef - - -records = [] - -def FindOffset(funcName): - for (name, alias, offset) in records: - if name == funcName: - return offset - #endif - #endfor - return -1 -#enddef - - -def EmitEntry(name, returnType, argTypeList, argNameList, alias, offset): - if alias == '': - dispatchName = name - else: - dispatchName = alias - if offset < 0: - offset = FindOffset(dispatchName) - if offset >= 0 and string.find(name, "unused") == -1: - print '\tgl%s' % (name) - # save this info in case we need to look up an alias later - records.append((name, dispatchName, offset)) - -#enddef - - -PrintHead() -apiparser.ProcessSpecFile("APIspec", EmitEntry) -PrintTail() diff --git a/mesalib/src/mesa/Android.libmesa_dricore.mk b/mesalib/src/mesa/Android.libmesa_dricore.mk index 1e6d948..2ab593d 100644 --- a/mesalib/src/mesa/Android.libmesa_dricore.mk +++ b/mesalib/src/mesa/Android.libmesa_dricore.mk @@ -51,10 +51,16 @@ endif # MESA_ENABLE_ASM ifeq ($(ARCH_X86_HAVE_SSE4_1),true) LOCAL_SRC_FILES += \ - $(SRCDIR)main/streaming-load-memcpy.c + $(SRCDIR)main/streaming-load-memcpy.c \ + $(SRCDIR)main/sse_minmax.c LOCAL_CFLAGS := -msse4.1 endif +ifeq ($(ARCH_X86_HAVE_SSE4_1),true) +LOCAL_CFLAGS += \ + -DUSE_SSE41 +endif + LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src \ diff --git a/mesalib/src/mesa/Android.libmesa_st_mesa.mk b/mesalib/src/mesa/Android.libmesa_st_mesa.mk index 8b8d652..618d6bf 100644 --- a/mesalib/src/mesa/Android.libmesa_st_mesa.mk +++ b/mesalib/src/mesa/Android.libmesa_st_mesa.mk @@ -48,6 +48,11 @@ ifeq ($(TARGET_ARCH),x86) endif # x86 endif # MESA_ENABLE_ASM +ifeq ($(ARCH_X86_HAVE_SSE4_1),true) +LOCAL_CFLAGS := \ + -DUSE_SSE41 +endif + LOCAL_C_INCLUDES := \ $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \ $(MESA_TOP)/src/gallium/auxiliary \ diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am index e71bccb..932db4f 100644 --- a/mesalib/src/mesa/Makefile.am +++ b/mesalib/src/mesa/Makefile.am @@ -151,7 +151,8 @@ libmesagallium_la_LIBADD = \ $(ARCH_LIBS) libmesa_sse41_la_SOURCES = \ - main/streaming-load-memcpy.c + main/streaming-load-memcpy.c \ + main/sse_minmax.c libmesa_sse41_la_CFLAGS = $(AM_CFLAGS) -msse4.1 pkgconfigdir = $(libdir)/pkgconfig diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c index 6c78928..d6e875f 100644 --- a/mesalib/src/mesa/drivers/dri/common/dri_util.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c @@ -376,19 +376,17 @@ driCreateContextAttribs(__DRIscreen *screen, int api, return NULL; } - /* The EGL_KHR_create_context spec says: + /* The latest version of EGL_KHR_create_context spec says: * - * "Flags are only defined for OpenGL context creation, and specifying - * a flags value other than zero for other types of contexts, - * including OpenGL ES contexts, will generate an error." + * "If the EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR flag bit is set in + * EGL_CONTEXT_FLAGS_KHR, then a <debug context> will be created. + * [...] This bit is supported for OpenGL and OpenGL ES contexts. * - * The GLX_EXT_create_context_es2_profile specification doesn't say - * anything specific about this case. However, none of the known flags - * have any meaning in an ES context, so this seems safe. + * None of the other flags have any meaning in an ES context, so this seems safe. */ if (mesa_api != API_OPENGL_COMPAT && mesa_api != API_OPENGL_CORE - && flags != 0) { + && (flags & ~__DRI_CTX_FLAG_DEBUG)) { *error = __DRI_CTX_ERROR_BAD_FLAG; return NULL; } @@ -569,6 +567,12 @@ static int driUnbindContext(__DRIcontext *pcp) if (pcp == NULL) return GL_FALSE; + /* + ** Call driUnbindContext before checking for valid drawables + ** to handle surfaceless contexts properly. + */ + pcp->driScreenPriv->driver->UnbindContext(pcp); + pdp = pcp->driDrawablePriv; prp = pcp->driReadablePriv; @@ -576,8 +580,6 @@ static int driUnbindContext(__DRIcontext *pcp) if (!pdp && !prp) return GL_TRUE; - pcp->driScreenPriv->driver->UnbindContext(pcp); - assert(pdp); if (pdp->refcount == 0) { /* ERROR!!! */ diff --git a/mesalib/src/mesa/drivers/dri/common/xmlpool/t_options.h b/mesalib/src/mesa/drivers/dri/common/xmlpool/t_options.h index b73a662..4e5a721 100644 --- a/mesalib/src/mesa/drivers/dri/common/xmlpool/t_options.h +++ b/mesalib/src/mesa/drivers/dri/common/xmlpool/t_options.h @@ -340,3 +340,21 @@ DRI_CONF_SECTION_BEGIN \ DRI_CONF_OPT_BEGIN(device_id, string, def) \ DRI_CONF_DESC(en,gettext("Define the graphic device to use if possible")) \ DRI_CONF_OPT_END + +/** + * \brief Gallium-Nine specific configuration options + */ + +#define DRI_CONF_SECTION_NINE \ +DRI_CONF_SECTION_BEGIN \ + DRI_CONF_DESC(en,gettext("Gallium Nine")) + +#define DRI_CONF_NINE_THROTTLE(def) \ +DRI_CONF_OPT_BEGIN(throttle_value, int, def) \ + DRI_CONF_DESC(en,gettext("Define the throttling value. -1 for no throttling, -2 for default (usually 2), 0 for glfinish behaviour")) \ +DRI_CONF_OPT_END + +#define DRI_CONF_NINE_THREADSUBMIT(def) \ +DRI_CONF_OPT_BEGIN_B(thread_submit, def) \ + DRI_CONF_DESC(en,gettext("Use an additional thread to submit buffers.")) \ +DRI_CONF_OPT_END diff --git a/mesalib/src/mesa/drivers/windows/gdi/mesa.def b/mesalib/src/mesa/drivers/windows/gdi/mesa.def index 92736b3..a52207b 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/mesa.def +++ b/mesalib/src/mesa/drivers/windows/gdi/mesa.def @@ -1,6 +1,3 @@ -; DO NOT EDIT - This file generated automatically by mesadef.py script -;DESCRIPTION 'Mesa (OpenGL work-alike) for Win32' -VERSION 6.5 ; ; Module definition file for Mesa (OPENGL32.DLL) ; @@ -27,15 +24,23 @@ VERSION 6.5 ; points are compiled with dllexport declspec. ; EXPORTS - glNewList - glEndList - glCallList - glCallLists - glDeleteLists - glGenLists - glListBase + glAccum + glAlphaFunc + glAreTexturesResident + glArrayElement glBegin + glBindTexture glBitmap + glBlendFunc + glCallList + glCallLists + glClear + glClearAccum + glClearColor + glClearDepth + glClearIndex + glClearStencil + glClipPlane glColor3b glColor3bv glColor3d @@ -68,9 +73,88 @@ EXPORTS glColor4uiv glColor4us glColor4usv + glColorMask + glColorMaterial + glColorPointer + glCopyPixels + glCopyTexImage1D + glCopyTexImage2D + glCopyTexSubImage1D + glCopyTexSubImage2D + glCullFace + glDeleteLists + glDeleteTextures + glDepthFunc + glDepthMask + glDepthRange + glDisable + glDisableClientState + glDrawArrays + glDrawBuffer + glDrawElements + glDrawPixels glEdgeFlag + glEdgeFlagPointer glEdgeFlagv + glEnable + glEnableClientState glEnd + glEndList + glEvalCoord1d + glEvalCoord1dv + glEvalCoord1f + glEvalCoord1fv + glEvalCoord2d + glEvalCoord2dv + glEvalCoord2f + glEvalCoord2fv + glEvalMesh1 + glEvalMesh2 + glEvalPoint1 + glEvalPoint2 + glFeedbackBuffer + glFinish + glFlush + glFogf + glFogfv + glFogi + glFogiv + glFrontFace + glFrustum + glGenLists + glGenTextures + glGetBooleanv + glGetClipPlane + glGetDoublev + glGetError + glGetFloatv + glGetIntegerv + glGetLightfv + glGetLightiv + glGetMapdv + glGetMapfv + glGetMapiv + glGetMaterialfv + glGetMaterialiv + glGetPixelMapfv + glGetPixelMapuiv + glGetPixelMapusv + glGetPointerv + glGetPolygonStipple + glGetString + glGetTexEnvfv + glGetTexEnviv + glGetTexGendv + glGetTexGenfv + glGetTexGeniv + glGetTexImage + glGetTexLevelParameterfv + glGetTexLevelParameteriv + glGetTexParameterfv + glGetTexParameteriv + glHint + glIndexMask + glIndexPointer glIndexd glIndexdv glIndexf @@ -79,6 +163,45 @@ EXPORTS glIndexiv glIndexs glIndexsv + glIndexub + glIndexubv + glInitNames + glInterleavedArrays + glIsEnabled + glIsList + glIsTexture + glLightModelf + glLightModelfv + glLightModeli + glLightModeliv + glLightf + glLightfv + glLighti + glLightiv + glLineStipple + glLineWidth + glListBase + glLoadIdentity + glLoadMatrixd + glLoadMatrixf + glLoadName + glLogicOp + glMap1d + glMap1f + glMap2d + glMap2f + glMapGrid1d + glMapGrid1f + glMapGrid2d + glMapGrid2f + glMaterialf + glMaterialfv + glMateriali + glMaterialiv + glMatrixMode + glMultMatrixd + glMultMatrixf + glNewList glNormal3b glNormal3bv glNormal3d @@ -89,6 +212,30 @@ EXPORTS glNormal3iv glNormal3s glNormal3sv + glNormalPointer + glOrtho + glPassThrough + glPixelMapfv + glPixelMapuiv + glPixelMapusv + glPixelStoref + glPixelStorei + glPixelTransferf + glPixelTransferi + glPixelZoom + glPointSize + glPolygonMode + glPolygonOffset + glPolygonStipple + glPopAttrib + glPopClientAttrib + glPopMatrix + glPopName + glPrioritizeTextures + glPushAttrib + glPushClientAttrib + glPushMatrix + glPushName glRasterPos2d glRasterPos2dv glRasterPos2f @@ -113,6 +260,8 @@ EXPORTS glRasterPos4iv glRasterPos4s glRasterPos4sv + glReadBuffer + glReadPixels glRectd glRectdv glRectf @@ -121,6 +270,17 @@ EXPORTS glRectiv glRects glRectsv + glRenderMode + glRotated + glRotatef + glScaled + glScalef + glScissor + glSelectBuffer + glShadeModel + glStencilFunc + glStencilMask + glStencilOp glTexCoord1d glTexCoord1dv glTexCoord1f @@ -153,6 +313,27 @@ EXPORTS glTexCoord4iv glTexCoord4s glTexCoord4sv + glTexCoordPointer + glTexEnvf + glTexEnvfv + glTexEnvi + glTexEnviv + glTexGend + glTexGendv + glTexGenf + glTexGenfv + glTexGeni + glTexGeniv + glTexImage1D + glTexImage2D + glTexParameterf + glTexParameterfv + glTexParameteri + glTexParameteriv + glTexSubImage1D + glTexSubImage2D + glTranslated + glTranslatef glVertex2d glVertex2dv glVertex2f @@ -177,643 +358,8 @@ EXPORTS glVertex4iv glVertex4s glVertex4sv - glClipPlane - glColorMaterial - glCullFace - glFogf - glFogfv - glFogi - glFogiv - glFrontFace - glHint - glLightf - glLightfv - glLighti - glLightiv - glLightModelf - glLightModelfv - glLightModeli - glLightModeliv - glLineStipple - glLineWidth - glMaterialf - glMaterialfv - glMateriali - glMaterialiv - glPointSize - glPolygonMode - glPolygonStipple - glScissor - glShadeModel - glTexParameterf - glTexParameterfv - glTexParameteri - glTexParameteriv - glTexImage1D - glTexImage2D - glTexEnvf - glTexEnvfv - glTexEnvi - glTexEnviv - glTexGend - glTexGendv - glTexGenf - glTexGenfv - glTexGeni - glTexGeniv - glFeedbackBuffer - glSelectBuffer - glRenderMode - glInitNames - glLoadName - glPassThrough - glPopName - glPushName - glDrawBuffer - glClear - glClearAccum - glClearIndex - glClearColor - glClearStencil - glClearDepth - glStencilMask - glColorMask - glDepthMask - glIndexMask - glAccum - glDisable - glEnable - glFinish - glFlush - glPopAttrib - glPushAttrib - glMap1d - glMap1f - glMap2d - glMap2f - glMapGrid1d - glMapGrid1f - glMapGrid2d - glMapGrid2f - glEvalCoord1d - glEvalCoord1dv - glEvalCoord1f - glEvalCoord1fv - glEvalCoord2d - glEvalCoord2dv - glEvalCoord2f - glEvalCoord2fv - glEvalMesh1 - glEvalPoint1 - glEvalMesh2 - glEvalPoint2 - glAlphaFunc - glBlendFunc - glLogicOp - glStencilFunc - glStencilOp - glDepthFunc - glPixelZoom - glPixelTransferf - glPixelTransferi - glPixelStoref - glPixelStorei - glPixelMapfv - glPixelMapuiv - glPixelMapusv - glReadBuffer - glCopyPixels - glReadPixels - glDrawPixels - glGetBooleanv - glGetClipPlane - glGetDoublev - glGetError - glGetFloatv - glGetIntegerv - glGetLightfv - glGetLightiv - glGetMapdv - glGetMapfv - glGetMapiv - glGetMaterialfv - glGetMaterialiv - glGetPixelMapfv - glGetPixelMapuiv - glGetPixelMapusv - glGetPolygonStipple - glGetString - glGetTexEnvfv - glGetTexEnviv - glGetTexGendv - glGetTexGenfv - glGetTexGeniv - glGetTexImage - glGetTexParameterfv - glGetTexParameteriv - glGetTexLevelParameterfv - glGetTexLevelParameteriv - glIsEnabled - glIsList - glDepthRange - glFrustum - glLoadIdentity - glLoadMatrixf - glLoadMatrixd - glMatrixMode - glMultMatrixf - glMultMatrixd - glOrtho - glPopMatrix - glPushMatrix - glRotated - glRotatef - glScaled - glScalef - glTranslated - glTranslatef - glViewport - glArrayElement - glColorPointer - glDisableClientState - glDrawArrays - glDrawElements - glEdgeFlagPointer - glEnableClientState - glGetPointerv - glIndexPointer - glInterleavedArrays - glNormalPointer - glTexCoordPointer glVertexPointer - glPolygonOffset - glCopyTexImage1D - glCopyTexImage2D - glCopyTexSubImage1D - glCopyTexSubImage2D - glTexSubImage1D - glTexSubImage2D - glAreTexturesResident - glBindTexture - glDeleteTextures - glGenTextures - glIsTexture - glPrioritizeTextures - glIndexub - glIndexubv - glPopClientAttrib - glPushClientAttrib - glBlendColor - glBlendEquation - glDrawRangeElements - glColorTable - glColorTableParameterfv - glColorTableParameteriv - glCopyColorTable - glGetColorTable - glGetColorTableParameterfv - glGetColorTableParameteriv - glColorSubTable - glCopyColorSubTable - glConvolutionFilter1D - glConvolutionFilter2D - glConvolutionParameterf - glConvolutionParameterfv - glConvolutionParameteri - glConvolutionParameteriv - glCopyConvolutionFilter1D - glCopyConvolutionFilter2D - glGetConvolutionFilter - glGetConvolutionParameterfv - glGetConvolutionParameteriv - glGetSeparableFilter - glSeparableFilter2D - glGetHistogram - glGetHistogramParameterfv - glGetHistogramParameteriv - glGetMinmax - glGetMinmaxParameterfv - glGetMinmaxParameteriv - glHistogram - glMinmax - glResetHistogram - glResetMinmax - glTexImage3D - glTexSubImage3D - glCopyTexSubImage3D - glActiveTextureARB - glClientActiveTextureARB - glMultiTexCoord1dARB - glMultiTexCoord1dvARB - glMultiTexCoord1fARB - glMultiTexCoord1fvARB - glMultiTexCoord1iARB - glMultiTexCoord1ivARB - glMultiTexCoord1sARB - glMultiTexCoord1svARB - glMultiTexCoord2dARB - glMultiTexCoord2dvARB - glMultiTexCoord2fARB - glMultiTexCoord2fvARB - glMultiTexCoord2iARB - glMultiTexCoord2ivARB - glMultiTexCoord2sARB - glMultiTexCoord2svARB - glMultiTexCoord3dARB - glMultiTexCoord3dvARB - glMultiTexCoord3fARB - glMultiTexCoord3fvARB - glMultiTexCoord3iARB - glMultiTexCoord3ivARB - glMultiTexCoord3sARB - glMultiTexCoord3svARB - glMultiTexCoord4dARB - glMultiTexCoord4dvARB - glMultiTexCoord4fARB - glMultiTexCoord4fvARB - glMultiTexCoord4iARB - glMultiTexCoord4ivARB - glMultiTexCoord4sARB - glMultiTexCoord4svARB - glLoadTransposeMatrixfARB - glLoadTransposeMatrixdARB - glMultTransposeMatrixfARB - glMultTransposeMatrixdARB - glSampleCoverageARB - glCompressedTexImage3DARB - glCompressedTexImage2DARB - glCompressedTexImage1DARB - glCompressedTexSubImage3DARB - glCompressedTexSubImage2DARB - glCompressedTexSubImage1DARB - glGetCompressedTexImageARB - glActiveTexture - glClientActiveTexture - glMultiTexCoord1d - glMultiTexCoord1dv - glMultiTexCoord1f - glMultiTexCoord1fv - glMultiTexCoord1i - glMultiTexCoord1iv - glMultiTexCoord1s - glMultiTexCoord1sv - glMultiTexCoord2d - glMultiTexCoord2dv - glMultiTexCoord2f - glMultiTexCoord2fv - glMultiTexCoord2i - glMultiTexCoord2iv - glMultiTexCoord2s - glMultiTexCoord2sv - glMultiTexCoord3d - glMultiTexCoord3dv - glMultiTexCoord3f - glMultiTexCoord3fv - glMultiTexCoord3i - glMultiTexCoord3iv - glMultiTexCoord3s - glMultiTexCoord3sv - glMultiTexCoord4d - glMultiTexCoord4dv - glMultiTexCoord4f - glMultiTexCoord4fv - glMultiTexCoord4i - glMultiTexCoord4iv - glMultiTexCoord4s - glMultiTexCoord4sv - glLoadTransposeMatrixf - glLoadTransposeMatrixd - glMultTransposeMatrixf - glMultTransposeMatrixd - glSampleCoverage - glCompressedTexImage3D - glCompressedTexImage2D - glCompressedTexImage1D - glCompressedTexSubImage3D - glCompressedTexSubImage2D - glCompressedTexSubImage1D - glGetCompressedTexImage - glBlendColorEXT - glPolygonOffsetEXT - glTexImage3DEXT - glTexSubImage3DEXT - glTexSubImage1DEXT - glTexSubImage2DEXT - glCopyTexImage1DEXT - glCopyTexImage2DEXT - glCopyTexSubImage1DEXT - glCopyTexSubImage2DEXT - glCopyTexSubImage3DEXT - glAreTexturesResidentEXT - glBindTextureEXT - glDeleteTexturesEXT - glGenTexturesEXT - glIsTextureEXT - glPrioritizeTexturesEXT - glArrayElementEXT - glColorPointerEXT - glDrawArraysEXT - glEdgeFlagPointerEXT - glGetPointervEXT - glIndexPointerEXT - glNormalPointerEXT - glTexCoordPointerEXT - glVertexPointerEXT - glBlendEquationEXT - glPointParameterfEXT - glPointParameterfvEXT - glPointParameterfARB - glPointParameterfvARB - glColorTableEXT - glGetColorTableEXT - glGetColorTableParameterivEXT - glGetColorTableParameterfvEXT - glLockArraysEXT - glUnlockArraysEXT - glDrawRangeElementsEXT - glSecondaryColor3bEXT - glSecondaryColor3bvEXT - glSecondaryColor3dEXT - glSecondaryColor3dvEXT - glSecondaryColor3fEXT - glSecondaryColor3fvEXT - glSecondaryColor3iEXT - glSecondaryColor3ivEXT - glSecondaryColor3sEXT - glSecondaryColor3svEXT - glSecondaryColor3ubEXT - glSecondaryColor3ubvEXT - glSecondaryColor3uiEXT - glSecondaryColor3uivEXT - glSecondaryColor3usEXT - glSecondaryColor3usvEXT - glSecondaryColorPointerEXT - glMultiDrawArraysEXT - glMultiDrawElementsEXT - glFogCoordfEXT - glFogCoordfvEXT - glFogCoorddEXT - glFogCoorddvEXT - glFogCoordPointerEXT - glBlendFuncSeparateEXT - glWindowPos2dMESA - glWindowPos2dvMESA - glWindowPos2fMESA - glWindowPos2fvMESA - glWindowPos2iMESA - glWindowPos2ivMESA - glWindowPos2sMESA - glWindowPos2svMESA - glWindowPos3dMESA - glWindowPos3dvMESA - glWindowPos3fMESA - glWindowPos3fvMESA - glWindowPos3iMESA - glWindowPos3ivMESA - glWindowPos3sMESA - glWindowPos3svMESA - glWindowPos4dMESA - glWindowPos4dvMESA - glWindowPos4fMESA - glWindowPos4fvMESA - glWindowPos4iMESA - glWindowPos4ivMESA - glWindowPos4sMESA - glWindowPos4svMESA - glWindowPos2dARB - glWindowPos2fARB - glWindowPos2iARB - glWindowPos2sARB - glWindowPos2dvARB - glWindowPos2fvARB - glWindowPos2ivARB - glWindowPos2svARB - glWindowPos3dARB - glWindowPos3fARB - glWindowPos3iARB - glWindowPos3sARB - glWindowPos3dvARB - glWindowPos3fvARB - glWindowPos3ivARB - glWindowPos3svARB - glAreProgramsResidentNV - glBindProgramNV - glDeleteProgramsNV - glExecuteProgramNV - glGenProgramsNV - glGetProgramParameterdvNV - glGetProgramParameterfvNV - glGetProgramivNV - glGetProgramStringNV - glGetTrackMatrixivNV - glGetVertexAttribdvNV - glGetVertexAttribfvNV - glGetVertexAttribivNV - glGetVertexAttribPointervNV - glIsProgramNV - glLoadProgramNV - glProgramParameter4dNV - glProgramParameter4dvNV - glProgramParameter4fNV - glProgramParameter4fvNV - glProgramParameters4dvNV - glProgramParameters4fvNV - glRequestResidentProgramsNV - glTrackMatrixNV - glVertexAttribPointerNV - glVertexAttrib1dNV - glVertexAttrib1dvNV - glVertexAttrib1fNV - glVertexAttrib1fvNV - glVertexAttrib1sNV - glVertexAttrib1svNV - glVertexAttrib2dNV - glVertexAttrib2dvNV - glVertexAttrib2fNV - glVertexAttrib2fvNV - glVertexAttrib2sNV - glVertexAttrib2svNV - glVertexAttrib3dNV - glVertexAttrib3dvNV - glVertexAttrib3fNV - glVertexAttrib3fvNV - glVertexAttrib3sNV - glVertexAttrib3svNV - glVertexAttrib4dNV - glVertexAttrib4dvNV - glVertexAttrib4fNV - glVertexAttrib4fvNV - glVertexAttrib4sNV - glVertexAttrib4svNV - glVertexAttrib4ubNV - glVertexAttrib4ubvNV - glVertexAttribs1dvNV - glVertexAttribs1fvNV - glVertexAttribs1svNV - glVertexAttribs2dvNV - glVertexAttribs2fvNV - glVertexAttribs2svNV - glVertexAttribs3dvNV - glVertexAttribs3fvNV - glVertexAttribs3svNV - glVertexAttribs4dvNV - glVertexAttribs4fvNV - glVertexAttribs4svNV - glVertexAttribs4ubvNV - glPointParameteriNV - glPointParameterivNV - glFogCoordf - glFogCoordfv - glFogCoordd - glFogCoorddv - glFogCoordPointer - glMultiDrawArrays - glMultiDrawElements - glPointParameterf - glPointParameterfv - glPointParameteri - glPointParameteriv - glSecondaryColor3b - glSecondaryColor3bv - glSecondaryColor3d - glSecondaryColor3dv - glSecondaryColor3f - glSecondaryColor3fv - glSecondaryColor3i - glSecondaryColor3iv - glSecondaryColor3s - glSecondaryColor3sv - glSecondaryColor3ub - glSecondaryColor3ubv - glSecondaryColor3ui - glSecondaryColor3uiv - glSecondaryColor3us - glSecondaryColor3usv - glSecondaryColorPointer - glWindowPos2d - glWindowPos2dv - glWindowPos2f - glWindowPos2fv - glWindowPos2i - glWindowPos2iv - glWindowPos2s - glWindowPos2sv - glWindowPos3d - glWindowPos3dv - glWindowPos3f - glWindowPos3fv - glWindowPos3i - glWindowPos3iv - glWindowPos3s - glWindowPos3sv - glVertexAttrib1sARB - glVertexAttrib1fARB - glVertexAttrib1dARB - glVertexAttrib2sARB - glVertexAttrib2fARB - glVertexAttrib2dARB - glVertexAttrib3sARB - glVertexAttrib3fARB - glVertexAttrib3dARB - glVertexAttrib4sARB - glVertexAttrib4fARB - glVertexAttrib4dARB - glVertexAttrib4NubARB - glVertexAttrib1svARB - glVertexAttrib1fvARB - glVertexAttrib1dvARB - glVertexAttrib2svARB - glVertexAttrib2fvARB - glVertexAttrib2dvARB - glVertexAttrib3svARB - glVertexAttrib3fvARB - glVertexAttrib3dvARB - glVertexAttrib4bvARB - glVertexAttrib4svARB - glVertexAttrib4ivARB - glVertexAttrib4ubvARB - glVertexAttrib4usvARB - glVertexAttrib4uivARB - glVertexAttrib4fvARB - glVertexAttrib4dvARB - glVertexAttrib4NbvARB - glVertexAttrib4NsvARB - glVertexAttrib4NivARB - glVertexAttrib4NubvARB - glVertexAttrib4NusvARB - glVertexAttrib4NuivARB - glVertexAttribPointerARB - glEnableVertexAttribArrayARB - glDisableVertexAttribArrayARB - glProgramStringARB - glBindProgramARB - glDeleteProgramsARB - glGenProgramsARB - glIsProgramARB - glProgramEnvParameter4dARB - glProgramEnvParameter4dvARB - glProgramEnvParameter4fARB - glProgramEnvParameter4fvARB - glProgramLocalParameter4dARB - glProgramLocalParameter4dvARB - glProgramLocalParameter4fARB - glProgramLocalParameter4fvARB - glGetProgramEnvParameterdvARB - glGetProgramEnvParameterfvARB - glGetProgramLocalParameterdvARB - glGetProgramLocalParameterfvARB - glGetProgramivARB - glGetProgramStringARB - glGetVertexAttribdvARB - glGetVertexAttribfvARB - glGetVertexAttribivARB - glGetVertexAttribPointervARB - glProgramNamedParameter4fNV - glProgramNamedParameter4dNV - glProgramNamedParameter4fvNV - glProgramNamedParameter4dvNV - glGetProgramNamedParameterfvNV - glGetProgramNamedParameterdvNV - glBindBufferARB - glBufferDataARB - glBufferSubDataARB - glDeleteBuffersARB - glGenBuffersARB - glGetBufferParameterivARB - glGetBufferPointervARB - glGetBufferSubDataARB - glIsBufferARB - glMapBufferARB - glUnmapBufferARB - glGenQueriesARB - glDeleteQueriesARB - glIsQueryARB - glBeginQueryARB - glEndQueryARB - glGetQueryivARB - glGetQueryObjectivARB - glGetQueryObjectuivARB - glBindBuffer - glBufferData - glBufferSubData - glDeleteBuffers - glGenBuffers - glGetBufferParameteriv - glGetBufferPointerv - glGetBufferSubData - glIsBuffer - glMapBuffer - glUnmapBuffer - glGenQueries - glDeleteQueries - glIsQuery - glBeginQuery - glEndQuery - glGetQueryiv - glGetQueryObjectiv - glGetQueryObjectuiv -; -; WGL API + glViewport wglChoosePixelFormat wglCopyContext wglCreateContext @@ -837,4 +383,3 @@ EXPORTS wglUseFontBitmapsW wglUseFontOutlinesA wglUseFontOutlinesW - wglGetExtensionsStringARB diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c index 9b80600..bf4fa3e 100644 --- a/mesalib/src/mesa/main/api_validate.c +++ b/mesalib/src/mesa/main/api_validate.c @@ -55,52 +55,6 @@ index_bytes(GLenum type, GLsizei count) /** - * Find the max index in the given element/index buffer - */ -GLuint -_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type, - const void *indices, - struct gl_buffer_object *elementBuf) -{ - const GLubyte *map = NULL; - GLuint max = 0; - GLuint i; - - if (_mesa_is_bufferobj(elementBuf)) { - /* elements are in a user-defined buffer object. need to map it */ - map = ctx->Driver.MapBufferRange(ctx, 0, elementBuf->Size, - GL_MAP_READ_BIT, elementBuf, - MAP_INTERNAL); - /* Actual address is the sum of pointers */ - indices = (const GLvoid *) ADD_POINTERS(map, (const GLubyte *) indices); - } - - if (type == GL_UNSIGNED_INT) { - for (i = 0; i < count; i++) - if (((GLuint *) indices)[i] > max) - max = ((GLuint *) indices)[i]; - } - else if (type == GL_UNSIGNED_SHORT) { - for (i = 0; i < count; i++) - if (((GLushort *) indices)[i] > max) - max = ((GLushort *) indices)[i]; - } - else { - ASSERT(type == GL_UNSIGNED_BYTE); - for (i = 0; i < count; i++) - if (((GLubyte *) indices)[i] > max) - max = ((GLubyte *) indices)[i]; - } - - if (map) { - ctx->Driver.UnmapBuffer(ctx, elementBuf, MAP_INTERNAL); - } - - return max; -} - - -/** * Check if OK to draw arrays/elements. */ static GLboolean @@ -749,17 +703,17 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, return GL_FALSE; } - if (!obj->EndedAnytime) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawTransformFeedback*"); - return GL_FALSE; - } - if (stream >= ctx->Const.MaxVertexStreams) { _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTransformFeedbackStream*(index>=MaxVertexStream)"); return GL_FALSE; } + if (!obj->EndedAnytime) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawTransformFeedback*"); + return GL_FALSE; + } + if (numInstances <= 0) { if (numInstances < 0) _mesa_error(ctx, GL_INVALID_VALUE, diff --git a/mesalib/src/mesa/main/api_validate.h b/mesalib/src/mesa/main/api_validate.h index 8238df1..0bb91c6 100644 --- a/mesalib/src/mesa/main/api_validate.h +++ b/mesalib/src/mesa/main/api_validate.h @@ -35,12 +35,6 @@ struct gl_context; struct gl_transform_feedback_object; -extern GLuint -_mesa_max_buffer_index(struct gl_context *ctx, GLuint count, GLenum type, - const void *indices, - struct gl_buffer_object *elementBuf); - - extern bool _mesa_is_valid_prim_mode(struct gl_context *ctx, GLenum mode); diff --git a/mesalib/src/mesa/main/attrib.c b/mesalib/src/mesa/main/attrib.c index 5345339..4684615 100644 --- a/mesalib/src/mesa/main/attrib.c +++ b/mesalib/src/mesa/main/attrib.c @@ -1345,7 +1345,8 @@ _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); + if (ctx->Extensions.ARB_clip_control) + _mesa_ClipControl(xform->ClipOrigin, xform->ClipDepthMode); } break; case GL_TEXTURE_BIT: diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 25b9bfc..400c158 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -719,6 +719,9 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api) /** GL_ARB_gpu_shader5 */ consts->MinFragmentInterpolationOffset = MIN_FRAGMENT_INTERPOLATION_OFFSET; consts->MaxFragmentInterpolationOffset = MAX_FRAGMENT_INTERPOLATION_OFFSET; + + /** GL_KHR_context_flush_control */ + consts->ContextReleaseBehavior = GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH; } @@ -729,6 +732,8 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api) static void check_context_limits(struct gl_context *ctx) { + (void) ctx; + /* check that we don't exceed the size of various bitfields */ assert(VARYING_SLOT_MAX <= (8 * sizeof(ctx->VertexProgram._Current->Base.OutputsWritten))); @@ -1622,9 +1627,11 @@ _mesa_make_current( struct gl_context *newCtx, } if (curCtx && - (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && + (curCtx->WinSysDrawBuffer || curCtx->WinSysReadBuffer) && /* make sure this context is valid for flushing */ - curCtx != newCtx) + curCtx != newCtx && + curCtx->Const.ContextReleaseBehavior == + GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH) _mesa_flush(curCtx); /* We used to call _glapi_check_multithread() here. Now do it in drivers */ diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c index 25171f0..7d622bb 100644 --- a/mesalib/src/mesa/main/errors.c +++ b/mesalib/src/mesa/main/errors.c @@ -676,22 +676,41 @@ debug_pop_group(struct gl_debug_state *debug) /** - * Return debug state for the context. The debug state will be allocated - * and initialized upon the first call. + * Lock and return debug state for the context. The debug state will be + * allocated and initialized upon the first call. When NULL is returned, the + * debug state is not locked. */ static struct gl_debug_state * -_mesa_get_debug_state(struct gl_context *ctx) +_mesa_lock_debug_state(struct gl_context *ctx) { + mtx_lock(&ctx->DebugMutex); + if (!ctx->Debug) { ctx->Debug = debug_create(); if (!ctx->Debug) { - _mesa_error(ctx, GL_OUT_OF_MEMORY, "allocating debug state"); + GET_CURRENT_CONTEXT(cur); + mtx_unlock(&ctx->DebugMutex); + + /* + * This function may be called from other threads. When that is the + * case, we cannot record this OOM error. + */ + if (ctx == cur) + _mesa_error(ctx, GL_OUT_OF_MEMORY, "allocating debug state"); + + return NULL; } } return ctx->Debug; } +static void +_mesa_unlock_debug_state(struct gl_context *ctx) +{ + mtx_unlock(&ctx->DebugMutex); +} + /** * Set the integer debug state specified by \p pname. This can be called from * _mesa_set_enable for example. @@ -699,7 +718,7 @@ _mesa_get_debug_state(struct gl_context *ctx) bool _mesa_set_debug_state_int(struct gl_context *ctx, GLenum pname, GLint val) { - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); + struct gl_debug_state *debug = _mesa_lock_debug_state(ctx); if (!debug) return false; @@ -716,6 +735,8 @@ _mesa_set_debug_state_int(struct gl_context *ctx, GLenum pname, GLint val) break; } + _mesa_unlock_debug_state(ctx); + return true; } @@ -729,9 +750,12 @@ _mesa_get_debug_state_int(struct gl_context *ctx, GLenum pname) struct gl_debug_state *debug; GLint val; + mtx_lock(&ctx->DebugMutex); debug = ctx->Debug; - if (!debug) + if (!debug) { + mtx_unlock(&ctx->DebugMutex); return 0; + } switch (pname) { case GL_DEBUG_OUTPUT: @@ -756,6 +780,8 @@ _mesa_get_debug_state_int(struct gl_context *ctx, GLenum pname) break; } + mtx_unlock(&ctx->DebugMutex); + return val; } @@ -769,9 +795,12 @@ _mesa_get_debug_state_ptr(struct gl_context *ctx, GLenum pname) struct gl_debug_state *debug; void *val; + mtx_lock(&ctx->DebugMutex); debug = ctx->Debug; - if (!debug) + if (!debug) { + mtx_unlock(&ctx->DebugMutex); return NULL; + } switch (pname) { case GL_DEBUG_CALLBACK_FUNCTION_ARB: @@ -786,9 +815,49 @@ _mesa_get_debug_state_ptr(struct gl_context *ctx, GLenum pname) break; } + mtx_unlock(&ctx->DebugMutex); + return val; } +/** + * Insert a debug message. The mutex is assumed to be locked, and will be + * unlocked by this call. + */ +static void +log_msg_locked_and_unlock(struct gl_context *ctx, + enum mesa_debug_source source, + enum mesa_debug_type type, GLuint id, + enum mesa_debug_severity severity, + GLint len, const char *buf) +{ + struct gl_debug_state *debug = ctx->Debug; + + if (!debug_is_message_enabled(debug, source, type, id, severity)) { + _mesa_unlock_debug_state(ctx); + return; + } + + if (ctx->Debug->Callback) { + GLenum gl_source = debug_source_enums[source]; + GLenum gl_type = debug_type_enums[type]; + GLenum gl_severity = debug_severity_enums[severity]; + GLDEBUGPROC callback = ctx->Debug->Callback; + const void *data = ctx->Debug->CallbackData; + + /* + * When ctx->Debug->SyncOutput is GL_FALSE, the client is prepared for + * unsynchronous calls. When it is GL_TRUE, we will not spawn threads. + * In either case, we can call the callback unlocked. + */ + _mesa_unlock_debug_state(ctx); + callback(gl_source, gl_type, id, gl_severity, len, buf, data); + } + else { + debug_log_message(ctx->Debug, source, type, id, severity, len, buf); + _mesa_unlock_debug_state(ctx); + } +} /** * Log a client or driver debug message. @@ -798,24 +867,12 @@ log_msg(struct gl_context *ctx, enum mesa_debug_source source, enum mesa_debug_type type, GLuint id, enum mesa_debug_severity severity, GLint len, const char *buf) { - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); + struct gl_debug_state *debug = _mesa_lock_debug_state(ctx); if (!debug) return; - if (!debug_is_message_enabled(debug, source, type, id, severity)) - return; - - if (debug->Callback) { - GLenum gl_type = debug_type_enums[type]; - GLenum gl_severity = debug_severity_enums[severity]; - - debug->Callback(debug_source_enums[source], gl_type, id, gl_severity, - len, buf, debug->CallbackData); - return; - } - - debug_log_message(debug, source, type, id, severity, len, buf); + log_msg_locked_and_unlock(ctx, source, type, id, severity, len, buf); } @@ -956,7 +1013,7 @@ _mesa_GetDebugMessageLog(GLuint count, GLsizei logSize, GLenum *sources, return 0; } - debug = _mesa_get_debug_state(ctx); + debug = _mesa_lock_debug_state(ctx); if (!debug) return 0; @@ -991,6 +1048,8 @@ _mesa_GetDebugMessageLog(GLuint count, GLsizei logSize, GLenum *sources, debug_delete_messages(debug, 1); } + _mesa_unlock_debug_state(ctx); + return ret; } @@ -1027,7 +1086,7 @@ _mesa_DebugMessageControl(GLenum gl_source, GLenum gl_type, return; } - debug = _mesa_get_debug_state(ctx); + debug = _mesa_lock_debug_state(ctx); if (!debug) return; @@ -1039,6 +1098,8 @@ _mesa_DebugMessageControl(GLenum gl_source, GLenum gl_type, else { debug_set_message_enable_all(debug, source, type, severity, enabled); } + + _mesa_unlock_debug_state(ctx); } @@ -1046,10 +1107,11 @@ void GLAPIENTRY _mesa_DebugMessageCallback(GLDEBUGPROC callback, const void *userParam) { GET_CURRENT_CONTEXT(ctx); - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); + struct gl_debug_state *debug = _mesa_lock_debug_state(ctx); if (debug) { debug->Callback = callback; debug->CallbackData = userParam; + _mesa_unlock_debug_state(ctx); } } @@ -1059,18 +1121,10 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length, const GLchar *message) { GET_CURRENT_CONTEXT(ctx); - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); const char *callerstr = "glPushDebugGroup"; + struct gl_debug_state *debug; struct gl_debug_message *emptySlot; - if (!debug) - return; - - if (debug->GroupStackDepth >= MAX_DEBUG_GROUP_STACK_DEPTH-1) { - _mesa_error(ctx, GL_STACK_OVERFLOW, "%s", callerstr); - return; - } - switch(source) { case GL_DEBUG_SOURCE_APPLICATION: case GL_DEBUG_SOURCE_THIRD_PARTY: @@ -1086,10 +1140,15 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length, if (!validate_length(ctx, callerstr, length)) return; /* GL_INVALID_VALUE */ - log_msg(ctx, gl_enum_to_debug_source(source), - MESA_DEBUG_TYPE_PUSH_GROUP, id, - MESA_DEBUG_SEVERITY_NOTIFICATION, length, - message); + debug = _mesa_lock_debug_state(ctx); + if (!debug) + return; + + if (debug->GroupStackDepth >= MAX_DEBUG_GROUP_STACK_DEPTH-1) { + _mesa_unlock_debug_state(ctx); + _mesa_error(ctx, GL_STACK_OVERFLOW, "%s", callerstr); + return; + } /* pop reuses the message details from push so we store this */ emptySlot = debug_get_group_message(debug); @@ -1101,6 +1160,12 @@ _mesa_PushDebugGroup(GLenum source, GLuint id, GLsizei length, length, message); debug_push_group(debug); + + log_msg_locked_and_unlock(ctx, + gl_enum_to_debug_source(source), + MESA_DEBUG_TYPE_PUSH_GROUP, id, + MESA_DEBUG_SEVERITY_NOTIFICATION, length, + message); } @@ -1108,35 +1173,43 @@ void GLAPIENTRY _mesa_PopDebugGroup(void) { GET_CURRENT_CONTEXT(ctx); - struct gl_debug_state *debug = _mesa_get_debug_state(ctx); const char *callerstr = "glPopDebugGroup"; - struct gl_debug_message *gdmessage; + struct gl_debug_state *debug; + struct gl_debug_message *gdmessage, msg; + debug = _mesa_lock_debug_state(ctx); if (!debug) return; if (debug->GroupStackDepth <= 0) { + _mesa_unlock_debug_state(ctx); _mesa_error(ctx, GL_STACK_UNDERFLOW, "%s", callerstr); return; } debug_pop_group(debug); + /* make a shallow copy */ gdmessage = debug_get_group_message(debug); - log_msg(ctx, gdmessage->source, - gl_enum_to_debug_type(GL_DEBUG_TYPE_POP_GROUP), - gdmessage->id, - gl_enum_to_debug_severity(GL_DEBUG_SEVERITY_NOTIFICATION), - gdmessage->length, gdmessage->message); - - debug_message_clear(gdmessage); + msg = *gdmessage; + gdmessage->message = NULL; + gdmessage->length = 0; + + log_msg_locked_and_unlock(ctx, + msg.source, + gl_enum_to_debug_type(GL_DEBUG_TYPE_POP_GROUP), + msg.id, + gl_enum_to_debug_severity(GL_DEBUG_SEVERITY_NOTIFICATION), + msg.length, msg.message); + + debug_message_clear(&msg); } void _mesa_init_errors(struct gl_context *ctx) { - /* no-op */ + mtx_init(&ctx->DebugMutex, mtx_plain); } @@ -1148,6 +1221,8 @@ _mesa_free_errors_data(struct gl_context *ctx) /* set to NULL just in case it is used before context is completely gone. */ ctx->Debug = NULL; } + + mtx_destroy(&ctx->DebugMutex); } @@ -1362,6 +1437,8 @@ _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) debug_get_id(&error_msg_id); do_output = should_output(ctx, error, fmtString); + + mtx_lock(&ctx->DebugMutex); if (ctx->Debug) { do_log = debug_is_message_enabled(ctx->Debug, MESA_DEBUG_SOURCE_API, @@ -1372,6 +1449,7 @@ _mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) else { do_log = GL_FALSE; } + mtx_unlock(&ctx->DebugMutex); if (do_output || do_log) { char s[MAX_DEBUG_MESSAGE_LENGTH], s2[MAX_DEBUG_MESSAGE_LENGTH]; diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 15d66a7..0df04c2 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -320,6 +320,7 @@ static const struct extension extension_table[] = { /* KHR extensions */ { "GL_KHR_debug", o(dummy_true), GL, 2012 }, + { "GL_KHR_context_flush_control", o(dummy_true), GL | ES2, 2014 }, /* Vendor extensions */ { "GL_3DFX_texture_compression_FXT1", o(TDFX_texture_compression_FXT1), GL, 1999 }, diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index aa9f282..09a61ac 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -318,6 +318,9 @@ descriptor=[ [ "PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL", "CONST(MAX_PERFQUERY_COUNTER_NAME_LENGTH), extra_INTEL_performance_query" ], [ "PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL", "CONST(MAX_PERFQUERY_COUNTER_DESC_LENGTH), extra_INTEL_performance_query" ], [ "PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL", "CONST(PERFQUERY_HAVE_GPA_EXTENDED_COUNTERS), extra_INTEL_performance_query" ], + +# GL_KHR_context_flush_control + [ "CONTEXT_RELEASE_BEHAVIOR", "CONTEXT_ENUM(Const.ContextReleaseBehavior), NO_EXTRA" ], ]}, # GLES3 is not a typo. @@ -624,7 +627,7 @@ descriptor=[ # == GL_CURRENT_MATRIX_NV [ "CURRENT_MATRIX_ARB", "LOC_CUSTOM, TYPE_MATRIX, 0, extra_ARB_vertex_program_ARB_fragment_program" ], # == GL_CURRENT_MATRIX_NV - [ "TRANSPOSE_CURRENT_MATRIX_ARB", "LOC_CUSTOM, TYPE_MATRIX, 0, extra_ARB_vertex_program_ARB_fragment_program" ], + [ "TRANSPOSE_CURRENT_MATRIX_ARB", "LOC_CUSTOM, TYPE_MATRIX_T, 0, extra_ARB_vertex_program_ARB_fragment_program" ], # == GL_PROGRAM_ERROR_POSITION_NV [ "PROGRAM_ERROR_POSITION_ARB", "CONTEXT_INT(Program.ErrorPos), extra_ARB_vertex_program_ARB_fragment_program" ], diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index b8c7548..4f5a2d1 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/src/mesa/main/imports.c @@ -499,25 +499,6 @@ _mesa_strdup( const char *s ) } } -/** Wrapper around strtof() */ -float -_mesa_strtof( const char *s, char **end ) -{ -#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ - !defined(ANDROID) && !defined(__HAIKU__) && !defined(__UCLIBC__) && \ - !defined(__NetBSD__) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); - } - return strtof_l(s, end, loc); -#elif defined(_ISOC99_SOURCE) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600) - return strtof(s, end); -#else - return (float)strtod(s, end); -#endif -} - /** Compute simple checksum/hash for a string */ unsigned int _mesa_str_checksum(const char *str) diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index 436d165..0fcba4f 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -540,9 +540,6 @@ _mesa_half_is_negative(GLhalfARB h) extern char * _mesa_strdup( const char *s ); -extern float -_mesa_strtof( const char *s, char **end ); - extern unsigned int _mesa_str_checksum(const char *str); diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index e1f1f1d..7389baa 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2843,6 +2843,7 @@ struct gl_shader_program /* post-link info: */ unsigned NumUserUniformStorage; + unsigned NumHiddenUniforms; struct gl_uniform_storage *UniformStorage; /** @@ -3680,6 +3681,9 @@ struct gl_constants GLboolean FakeSWMSAA; + /** GL_KHR_context_flush_control */ + GLenum ContextReleaseBehavior; + struct gl_shader_compiler_options ShaderCompilerOptions[MESA_SHADER_STAGES]; }; @@ -4390,6 +4394,7 @@ struct gl_context GLuint ErrorDebugCount; /* GL_ARB_debug_output/GL_KHR_debug */ + mtx_t DebugMutex; struct gl_debug_state *Debug; GLenum RenderMode; /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */ diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index 2be9092..6657820 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -565,13 +565,15 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param *params = _mesa_longest_attribute_name_length(shProg); return; case GL_ACTIVE_UNIFORMS: - *params = shProg->NumUserUniformStorage; + *params = shProg->NumUserUniformStorage - shProg->NumHiddenUniforms; return; case GL_ACTIVE_UNIFORM_MAX_LENGTH: { unsigned i; GLint max_len = 0; + const unsigned num_uniforms = + shProg->NumUserUniformStorage - shProg->NumHiddenUniforms; - for (i = 0; i < shProg->NumUserUniformStorage; i++) { + for (i = 0; i < num_uniforms; i++) { /* Add one for the terminating NUL character for a non-array, and * 4 for the "[0]" and the NUL for an array. */ diff --git a/mesalib/src/mesa/main/sse_minmax.c b/mesalib/src/mesa/main/sse_minmax.c new file mode 100644 index 0000000..222ac14 --- /dev/null +++ b/mesalib/src/mesa/main/sse_minmax.c @@ -0,0 +1,97 @@ +/* + * Copyright © 2014 Timothy Arceri + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Author: + * Timothy Arceri <t_arceri(a)yahoo.com.au> + * + */ + +#ifdef __SSE4_1__ +#include "main/sse_minmax.h" +#include <smmintrin.h> +#include <stdint.h> + +void +_mesa_uint_array_min_max(const unsigned *ui_indices, unsigned *min_index, + unsigned *max_index, const unsigned count) +{ + unsigned max_ui = 0; + unsigned min_ui = ~0U; + unsigned i = 0; + unsigned aligned_count = count; + + /* handle the first few values without SSE until the pointer is aligned */ + while (((uintptr_t)ui_indices & 15) && aligned_count) { + if (*ui_indices > max_ui) + max_ui = *ui_indices; + if (*ui_indices < min_ui) + min_ui = *ui_indices; + + aligned_count--; + ui_indices++; + } + + /* TODO: The actual threshold for SSE begin useful may be higher than 8. + * Some careful microbenchmarks and measurement are required to + * find the actual tipping point. + */ + if (aligned_count >= 8) { + unsigned max_arr[4] __attribute__ ((aligned (16))); + unsigned min_arr[4] __attribute__ ((aligned (16))); + unsigned vec_count; + __m128i max_ui4 = _mm_setzero_si128(); + __m128i min_ui4 = _mm_set1_epi32(~0U); + __m128i ui_indices4; + __m128i *ui_indices_ptr; + + vec_count = aligned_count & ~0x3; + ui_indices_ptr = (__m128i *)ui_indices; + for (i = 0; i < vec_count / 4; i++) { + ui_indices4 = _mm_load_si128(&ui_indices_ptr[i]); + max_ui4 = _mm_max_epu32(ui_indices4, max_ui4); + min_ui4 = _mm_min_epu32(ui_indices4, min_ui4); + } + + _mm_store_si128((__m128i *)max_arr, max_ui4); + _mm_store_si128((__m128i *)min_arr, min_ui4); + + for (i = 0; i < 4; i++) { + if (max_arr[i] > max_ui) + max_ui = max_arr[i]; + if (min_arr[i] < min_ui) + min_ui = min_arr[i]; + } + i = vec_count; + } + + for (; i < aligned_count; i++) { + if (ui_indices[i] > max_ui) + max_ui = ui_indices[i]; + if (ui_indices[i] < min_ui) + min_ui = ui_indices[i]; + } + + *min_index = min_ui; + *max_index = max_ui; +} + +#endif diff --git a/xorg-server/include/dbus-core.h b/mesalib/src/mesa/main/sse_minmax.h similarity index 57% copy from xorg-server/include/dbus-core.h copy to mesalib/src/mesa/main/sse_minmax.h index b2d6d1b..953c4e9 100644 --- a/xorg-server/include/dbus-core.h +++ b/mesalib/src/mesa/main/sse_minmax.h @@ -1,5 +1,5 @@ /* - * Copyright © 2013 Red Hat, Inc. + * Copyright © 2014 Timothy Arceri * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -17,40 +17,14 @@ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + * + * Author: + * Timothy Arceri <t_arceri(a)yahoo.com.au> * - * Author: Hans de Goede <hdegoede(a)redhat.com> */ -#ifndef DBUS_CORE_H -#define DBUS_CORE_H - -#ifdef NEED_DBUS -typedef struct DBusConnection DBusConnection; - -typedef void (*dbus_core_connect_hook) (DBusConnection * connection, - void *data); -typedef void (*dbus_core_disconnect_hook) (void *data); - -struct dbus_core_hook { - dbus_core_connect_hook connect; - dbus_core_disconnect_hook disconnect; - void *data; - - struct dbus_core_hook *next; -}; - -int dbus_core_init(void); -void dbus_core_fini(void); -int dbus_core_add_hook(struct dbus_core_hook *hook); -void dbus_core_remove_hook(struct dbus_core_hook *hook); - -#else - -#define dbus_core_init() -#define dbus_core_fini() - -#endif - -#endif +void +_mesa_uint_array_min_max(const unsigned *ui_indices, unsigned *min_index, + unsigned *max_index, const unsigned count); diff --git a/mesalib/src/mesa/main/streaming-load-memcpy.c b/mesalib/src/mesa/main/streaming-load-memcpy.c index 8427149..d7147af 100644 --- a/mesalib/src/mesa/main/streaming-load-memcpy.c +++ b/mesalib/src/mesa/main/streaming-load-memcpy.c @@ -26,7 +26,6 @@ * */ -#ifdef __SSE4_1__ #include "main/macros.h" #include "main/streaming-load-memcpy.h" #include <smmintrin.h> @@ -84,5 +83,3 @@ _mesa_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len) memcpy(d, s, len); } } - -#endif diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c index 832e661..ec16af9 100644 --- a/mesalib/src/mesa/main/texformat.c +++ b/mesalib/src/mesa/main/texformat.c @@ -155,12 +155,14 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, case GL_ALPHA4: case GL_ALPHA8: RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8); + RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM); break; case GL_ALPHA12: case GL_ALPHA16: RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM16); RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8); + RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM); break; /* Luminance formats */ @@ -224,6 +226,7 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, case GL_COMPRESSED_ALPHA_ARB: RETURN_IF_SUPPORTED(MESA_FORMAT_A_UNORM8); + RETURN_IF_SUPPORTED(MESA_FORMAT_L8A8_UNORM); break; case GL_COMPRESSED_LUMINANCE_ARB: RETURN_IF_SUPPORTED(MESA_FORMAT_L_UNORM8); diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c index f913e42..f858cef 100644 --- a/mesalib/src/mesa/main/texstore.c +++ b/mesalib/src/mesa/main/texstore.c @@ -1667,8 +1667,10 @@ texstore_rgba_integer(TEXSTORE_PARAMS) assert(is_array && !normalized); - if (!is_array) + if (!is_array) { + free(tmp_row); return GL_FALSE; + } invert_swizzle(dst2rgba, rgba2dst); compute_component_mapping(GL_RGBA, baseInternalFormat, base2rgba); diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp index fcb14c4..32870d0 100644 --- a/mesalib/src/mesa/main/uniform_query.cpp +++ b/mesalib/src/mesa/main/uniform_query.cpp @@ -176,46 +176,13 @@ validate_uniform_parameters(struct gl_context *ctx, struct gl_shader_program *shProg, GLint location, GLsizei count, unsigned *array_index, - const char *caller, - bool negative_one_is_not_valid) + const char *caller) { - if (!shProg || !shProg->LinkStatus) { + if (shProg == NULL) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(program not linked)", caller); return NULL; } - if (location == -1) { - /* For glGetUniform, page 264 (page 278 of the PDF) of the OpenGL 2.1 - * spec says: - * - * "The error INVALID_OPERATION is generated if program has not been - * linked successfully, or if location is not a valid location for - * program." - * - * For glUniform, page 82 (page 96 of the PDF) of the OpenGL 2.1 spec - * says: - * - * "If the value of location is -1, the Uniform* commands will - * silently ignore the data passed in, and the current uniform - * values will not be changed." - * - * Allowing -1 for the location parameter of glUniform allows - * applications to avoid error paths in the case that, for example, some - * uniform variable is removed by the compiler / linker after - * optimization. In this case, the new value of the uniform is dropped - * on the floor. For the case of glGetUniform, there is nothing - * sensible to do for a location of -1. - * - * The negative_one_is_not_valid flag selects between the two behaviors. - */ - if (negative_one_is_not_valid) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", - caller, location); - } - - return NULL; - } - /* From page 12 (page 26 of the PDF) of the OpenGL 2.1 spec: * * "If a negative number is provided where an argument of type sizei or @@ -226,10 +193,26 @@ validate_uniform_parameters(struct gl_context *ctx, return NULL; } - /* Check that the given location is in bounds of uniform remap table. */ - if (location >= (GLint) shProg->NumUniformRemapTable) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", - caller, location); + /* Check that the given location is in bounds of uniform remap table. + * Unlinked programs will have NumUniformRemapTable == 0, so we can take + * the shProg->LinkStatus check out of the main path. + */ + if (unlikely(location >= (GLint) shProg->NumUniformRemapTable)) { + if (!shProg->LinkStatus) + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(program not linked)", + caller); + else + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", + caller, location); + + return NULL; + } + + if (location == -1) { + if (!shProg->LinkStatus) + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(program not linked)", + caller); + return NULL; } @@ -269,27 +252,30 @@ validate_uniform_parameters(struct gl_context *ctx, struct gl_uniform_storage *const uni = shProg->UniformRemapTable[location]; - if (uni->array_elements == 0 && count > 1) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(count > 1 for non-array, location=%d)", - caller, location); - return NULL; - } + if (uni->array_elements == 0) { + if (count > 1) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(count > 1 for non-array, location=%d)", + caller, location); + return NULL; + } - /* The array index specified by the uniform location is just the uniform - * location minus the base location of of the uniform. - */ - *array_index = location - uni->remap_location; + assert((location - uni->remap_location) == 0); + *array_index = 0; + } else { + /* The array index specified by the uniform location is just the uniform + * location minus the base location of of the uniform. + */ + *array_index = location - uni->remap_location; - /* If the uniform is an array, check that array_index is in bounds. - * If not an array, check that array_index is zero. - * array_index is unsigned so no need to check for less than zero. - */ - const unsigned limit = MAX2(uni->array_elements, 1); - if (*array_index >= limit) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", - caller, location); - return NULL; + /* If the uniform is an array, check that array_index is in bounds. + * array_index is unsigned so no need to check for less than zero. + */ + if (*array_index >= uni->array_elements) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(location=%d)", + caller, location); + return NULL; + } } return uni; } @@ -308,9 +294,39 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, struct gl_uniform_storage *const uni = validate_uniform_parameters(ctx, shProg, location, 1, - &offset, "glGetUniform", true); - if (uni == NULL) + &offset, "glGetUniform"); + if (uni == NULL) { + /* For glGetUniform, page 264 (page 278 of the PDF) of the OpenGL 2.1 + * spec says: + * + * "The error INVALID_OPERATION is generated if program has not been + * linked successfully, or if location is not a valid location for + * program." + * + * For glUniform, page 82 (page 96 of the PDF) of the OpenGL 2.1 spec + * says: + * + * "If the value of location is -1, the Uniform* commands will + * silently ignore the data passed in, and the current uniform + * values will not be changed." + * + * Allowing -1 for the location parameter of glUniform allows + * applications to avoid error paths in the case that, for example, some + * uniform variable is removed by the compiler / linker after + * optimization. In this case, the new value of the uniform is dropped + * on the floor. For the case of glGetUniform, there is nothing + * sensible to do for a location of -1. + * + * If the location was -1, validate_unfirom_parameters will return NULL + * without raising an error. Raise the error here. + */ + if (location == -1) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetUniform(location=%d)", + location); + } + return; + } { unsigned elements = (uni->type->is_sampler()) @@ -342,8 +358,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location, */ if (returnType == uni->type->base_type || ((returnType == GLSL_TYPE_INT - || returnType == GLSL_TYPE_UINT - || returnType == GLSL_TYPE_SAMPLER) + || returnType == GLSL_TYPE_UINT) && (uni->type->base_type == GLSL_TYPE_INT || uni->type->base_type == GLSL_TYPE_UINT @@ -583,93 +598,22 @@ _mesa_propagate_uniforms_to_driver_storage(struct gl_uniform_storage *uni, extern "C" void _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, GLint location, GLsizei count, - const GLvoid *values, GLenum type) + const GLvoid *values, + enum glsl_base_type basicType, + unsigned src_components) { unsigned offset; - unsigned components; - unsigned src_components; - enum glsl_base_type basicType; struct gl_uniform_storage *const uni = validate_uniform_parameters(ctx, shProg, location, count, - &offset, "glUniform", false); + &offset, "glUniform"); if (uni == NULL) return; /* Verify that the types are compatible. */ - switch (type) { - case GL_FLOAT: - basicType = GLSL_TYPE_FLOAT; - src_components = 1; - break; - case GL_FLOAT_VEC2: - basicType = GLSL_TYPE_FLOAT; - src_components = 2; - break; - case GL_FLOAT_VEC3: - basicType = GLSL_TYPE_FLOAT; - src_components = 3; - break; - case GL_FLOAT_VEC4: - basicType = GLSL_TYPE_FLOAT; - src_components = 4; - break; - case GL_UNSIGNED_INT: - basicType = GLSL_TYPE_UINT; - src_components = 1; - break; - case GL_UNSIGNED_INT_VEC2: - basicType = GLSL_TYPE_UINT; - src_components = 2; - break; - case GL_UNSIGNED_INT_VEC3: - basicType = GLSL_TYPE_UINT; - src_components = 3; - break; - case GL_UNSIGNED_INT_VEC4: - basicType = GLSL_TYPE_UINT; - src_components = 4; - break; - case GL_INT: - basicType = GLSL_TYPE_INT; - src_components = 1; - break; - case GL_INT_VEC2: - basicType = GLSL_TYPE_INT; - src_components = 2; - break; - case GL_INT_VEC3: - basicType = GLSL_TYPE_INT; - src_components = 3; - break; - case GL_INT_VEC4: - basicType = GLSL_TYPE_INT; - src_components = 4; - break; - case GL_BOOL: - case GL_BOOL_VEC2: - case GL_BOOL_VEC3: - case GL_BOOL_VEC4: - case GL_FLOAT_MAT2: - case GL_FLOAT_MAT2x3: - case GL_FLOAT_MAT2x4: - case GL_FLOAT_MAT3x2: - case GL_FLOAT_MAT3: - case GL_FLOAT_MAT3x4: - case GL_FLOAT_MAT4x2: - case GL_FLOAT_MAT4x3: - case GL_FLOAT_MAT4: - default: - _mesa_problem(NULL, "Invalid type in %s", __func__); - return; - } - - if (uni->type->is_sampler()) { - components = 1; - } else { - components = uni->type->vector_elements; - } + const unsigned components = uni->type->is_sampler() + ? 1 : uni->type->vector_elements; bool match; switch (uni->type->base_type) { @@ -690,7 +634,7 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, return; } - if (ctx->_Shader->Flags & GLSL_UNIFORMS) { + if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) { log_uniform(values, basicType, components, 1, count, false, shProg, location, uni); } @@ -713,9 +657,7 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, * GL_INVALID_VALUE error and ignore the command. */ if (uni->type->is_sampler()) { - int i; - - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { const unsigned texUnit = ((unsigned *) values)[i]; /* check that the sampler (tex unit index) is legal */ @@ -730,9 +672,7 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, } if (uni->type->is_image()) { - int i; - - for (i = 0; i < count; i++) { + for (int i = 0; i < count; i++) { const int unit = ((GLint *) values)[i]; /* check that the image unit is legal */ @@ -772,9 +712,8 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, (const union gl_constant_value *) values; union gl_constant_value *dst = &uni->storage[components * offset]; const unsigned elems = components * count; - unsigned i; - for (i = 0; i < elems; i++) { + for (unsigned i = 0; i < elems; i++) { if (basicType == GLSL_TYPE_FLOAT) { dst[i].i = src[i].f != 0.0f ? ctx->Const.UniformBooleanTrue : 0; } else { @@ -791,19 +730,16 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, * the changes through. */ if (uni->type->is_sampler()) { - int i; - bool flushed = false; - for (i = 0; i < MESA_SHADER_STAGES; i++) { + for (int i = 0; i < MESA_SHADER_STAGES; i++) { struct gl_shader *const sh = shProg->_LinkedShaders[i]; - int j; /* If the shader stage doesn't use the sampler uniform, skip this. */ if (sh == NULL || !uni->sampler[i].active) continue; - for (j = 0; j < count; j++) { + for (int j = 0; j < count; j++) { sh->SamplerUnits[uni->sampler[i].index + offset + j] = ((unsigned *) values)[j]; } @@ -845,13 +781,11 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg, * uniforms to image units present in the shader data structure. */ if (uni->type->is_image()) { - int i, j; - - for (i = 0; i < MESA_SHADER_STAGES; i++) { + for (int i = 0; i < MESA_SHADER_STAGES; i++) { if (uni->image[i].active) { struct gl_shader *sh = shProg->_LinkedShaders[i]; - for (j = 0; j < count; j++) + for (int j = 0; j < count; j++) sh->ImageUnits[uni->image[i].index + offset + j] = ((GLint *) values)[j]; } @@ -878,7 +812,7 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, struct gl_uniform_storage *const uni = validate_uniform_parameters(ctx, shProg, location, count, - &offset, "glUniformMatrix", false); + &offset, "glUniformMatrix"); if (uni == NULL) return; @@ -902,17 +836,17 @@ _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, } /* GL_INVALID_VALUE is generated if `transpose' is not GL_FALSE. - * http://www.khronos.org/opengles/sdk/docs/man/xhtml/glUniform.xml */ - if (ctx->API == API_OPENGLES - || (ctx->API == API_OPENGLES2 && ctx->Version < 30)) { - if (transpose) { + * http://www.khronos.org/opengles/sdk/docs/man/xhtml/glUniform.xml + */ + if (transpose) { + if (ctx->API == API_OPENGLES2 && ctx->Version < 30) { _mesa_error(ctx, GL_INVALID_VALUE, "glUniformMatrix(matrix transpose is not GL_FALSE)"); return; } } - if (ctx->_Shader->Flags & GLSL_UNIFORMS) { + if (unlikely(ctx->_Shader->Flags & GLSL_UNIFORMS)) { log_uniform(values, GLSL_TYPE_FLOAT, components, vectors, count, bool(transpose), shProg, location, uni); } diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c index c307107..d2d70e7f 100644 --- a/mesalib/src/mesa/main/uniforms.c +++ b/mesalib/src/mesa/main/uniforms.c @@ -151,7 +151,7 @@ void GLAPIENTRY _mesa_Uniform1f(GLint location, GLfloat v0) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GL_FLOAT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GLSL_TYPE_FLOAT, 1); } void GLAPIENTRY @@ -161,7 +161,7 @@ _mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1) GLfloat v[2]; v[0] = v0; v[1] = v1; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_FLOAT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_FLOAT, 2); } void GLAPIENTRY @@ -172,7 +172,7 @@ _mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2) v[0] = v0; v[1] = v1; v[2] = v2; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_FLOAT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_FLOAT, 3); } void GLAPIENTRY @@ -185,14 +185,14 @@ _mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, v[1] = v1; v[2] = v2; v[3] = v3; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_FLOAT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_FLOAT, 4); } void GLAPIENTRY _mesa_Uniform1i(GLint location, GLint v0) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GL_INT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GLSL_TYPE_INT, 1); } void GLAPIENTRY @@ -202,7 +202,7 @@ _mesa_Uniform2i(GLint location, GLint v0, GLint v1) GLint v[2]; v[0] = v0; v[1] = v1; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_INT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_INT, 2); } void GLAPIENTRY @@ -213,7 +213,7 @@ _mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2) v[0] = v0; v[1] = v1; v[2] = v2; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_INT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_INT, 3); } void GLAPIENTRY @@ -225,63 +225,63 @@ _mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3) v[1] = v1; v[2] = v2; v[3] = v3; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_INT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_INT, 4); } void GLAPIENTRY _mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_FLOAT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_FLOAT, 1); } void GLAPIENTRY _mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_FLOAT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_FLOAT, 2); } void GLAPIENTRY _mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_FLOAT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_FLOAT, 3); } void GLAPIENTRY _mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_FLOAT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_FLOAT, 4); } void GLAPIENTRY _mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_INT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_INT, 1); } void GLAPIENTRY _mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_INT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_INT, 2); } void GLAPIENTRY _mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_INT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_INT, 3); } void GLAPIENTRY _mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_INT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_INT, 4); } /** Same as above with direct state access **/ @@ -292,7 +292,7 @@ _mesa_ProgramUniform1f(GLuint program, GLint location, GLfloat v0) struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1f"); - _mesa_uniform(ctx, shProg, location, 1, &v0, GL_FLOAT); + _mesa_uniform(ctx, shProg, location, 1, &v0, GLSL_TYPE_FLOAT, 1); } void GLAPIENTRY @@ -304,7 +304,7 @@ _mesa_ProgramUniform2f(GLuint program, GLint location, GLfloat v0, GLfloat v1) v[0] = v0; v[1] = v1; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2f"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_FLOAT_VEC2); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_FLOAT, 2); } void GLAPIENTRY @@ -318,7 +318,7 @@ _mesa_ProgramUniform3f(GLuint program, GLint location, GLfloat v0, GLfloat v1, v[1] = v1; v[2] = v2; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3f"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_FLOAT_VEC3); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_FLOAT, 3); } void GLAPIENTRY @@ -333,7 +333,7 @@ _mesa_ProgramUniform4f(GLuint program, GLint location, GLfloat v0, GLfloat v1, v[2] = v2; v[3] = v3; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4f"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_FLOAT_VEC4); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_FLOAT, 4); } void GLAPIENTRY @@ -343,7 +343,7 @@ _mesa_ProgramUniform1i(GLuint program, GLint location, GLint v0) struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1i"); - _mesa_uniform(ctx, shProg, location, 1, &v0, GL_INT); + _mesa_uniform(ctx, shProg, location, 1, &v0, GLSL_TYPE_INT, 1); } void GLAPIENTRY @@ -355,7 +355,7 @@ _mesa_ProgramUniform2i(GLuint program, GLint location, GLint v0, GLint v1) v[0] = v0; v[1] = v1; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2i"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_INT_VEC2); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_INT, 2); } void GLAPIENTRY @@ -369,7 +369,7 @@ _mesa_ProgramUniform3i(GLuint program, GLint location, GLint v0, GLint v1, v[1] = v1; v[2] = v2; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3i"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_INT_VEC3); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_INT, 3); } void GLAPIENTRY @@ -384,7 +384,7 @@ _mesa_ProgramUniform4i(GLuint program, GLint location, GLint v0, GLint v1, v[2] = v2; v[3] = v3; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4i"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_INT_VEC4); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_INT, 4); } void GLAPIENTRY @@ -395,7 +395,7 @@ _mesa_ProgramUniform1fv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1fv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_FLOAT); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_FLOAT, 1); } void GLAPIENTRY @@ -406,7 +406,7 @@ _mesa_ProgramUniform2fv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2fv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_FLOAT_VEC2); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_FLOAT, 2); } void GLAPIENTRY @@ -417,7 +417,7 @@ _mesa_ProgramUniform3fv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3fv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_FLOAT_VEC3); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_FLOAT, 3); } void GLAPIENTRY @@ -428,7 +428,7 @@ _mesa_ProgramUniform4fv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4fv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_FLOAT_VEC4); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_FLOAT, 4); } void GLAPIENTRY @@ -439,7 +439,7 @@ _mesa_ProgramUniform1iv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1iv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_INT); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_INT, 1); } void GLAPIENTRY @@ -450,7 +450,7 @@ _mesa_ProgramUniform2iv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2iv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_INT_VEC2); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_INT, 2); } void GLAPIENTRY @@ -461,7 +461,7 @@ _mesa_ProgramUniform3iv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3iv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_INT_VEC3); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_INT, 3); } void GLAPIENTRY @@ -472,7 +472,7 @@ _mesa_ProgramUniform4iv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4iv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_INT_VEC4); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_INT, 4); } @@ -481,7 +481,7 @@ void GLAPIENTRY _mesa_Uniform1ui(GLint location, GLuint v0) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GL_UNSIGNED_INT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, &v0, GLSL_TYPE_UINT, 1); } void GLAPIENTRY @@ -491,7 +491,7 @@ _mesa_Uniform2ui(GLint location, GLuint v0, GLuint v1) GLuint v[2]; v[0] = v0; v[1] = v1; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_UINT, 2); } void GLAPIENTRY @@ -502,7 +502,7 @@ _mesa_Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) v[0] = v0; v[1] = v1; v[2] = v2; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_UINT, 3); } void GLAPIENTRY @@ -514,35 +514,35 @@ _mesa_Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) v[1] = v1; v[2] = v2; v[3] = v3; - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GL_UNSIGNED_INT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, 1, v, GLSL_TYPE_UINT, 4); } void GLAPIENTRY _mesa_Uniform1uiv(GLint location, GLsizei count, const GLuint *value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_UNSIGNED_INT); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_UINT, 1); } void GLAPIENTRY _mesa_Uniform2uiv(GLint location, GLsizei count, const GLuint *value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC2); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_UINT, 2); } void GLAPIENTRY _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC3); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_UINT, 3); } void GLAPIENTRY _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value) { GET_CURRENT_CONTEXT(ctx); - _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GL_UNSIGNED_INT_VEC4); + _mesa_uniform(ctx, ctx->_Shader->ActiveProgram, location, count, value, GLSL_TYPE_UINT, 4); } @@ -583,7 +583,7 @@ _mesa_ProgramUniform1ui(GLuint program, GLint location, GLuint v0) struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1ui"); - _mesa_uniform(ctx, shProg, location, 1, &v0, GL_UNSIGNED_INT); + _mesa_uniform(ctx, shProg, location, 1, &v0, GLSL_TYPE_UINT, 1); } void GLAPIENTRY @@ -596,7 +596,7 @@ _mesa_ProgramUniform2ui(GLuint program, GLint location, GLuint v0, GLuint v1) v[1] = v1; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2ui"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_UNSIGNED_INT_VEC2); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_UINT, 2); } void GLAPIENTRY @@ -611,7 +611,7 @@ _mesa_ProgramUniform3ui(GLuint program, GLint location, GLuint v0, GLuint v1, v[2] = v2; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3ui"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_UNSIGNED_INT_VEC3); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_UINT, 3); } void GLAPIENTRY @@ -626,7 +626,7 @@ _mesa_ProgramUniform4ui(GLuint program, GLint location, GLuint v0, GLuint v1, v[2] = v2; v[3] = v3; shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4ui"); - _mesa_uniform(ctx, shProg, location, 1, v, GL_UNSIGNED_INT_VEC4); + _mesa_uniform(ctx, shProg, location, 1, v, GLSL_TYPE_UINT, 4); } void GLAPIENTRY @@ -637,7 +637,7 @@ _mesa_ProgramUniform1uiv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform1uiv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_UNSIGNED_INT); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_UINT, 1); } void GLAPIENTRY @@ -648,7 +648,7 @@ _mesa_ProgramUniform2uiv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform2uiv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_UNSIGNED_INT_VEC2); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_UINT, 2); } void GLAPIENTRY @@ -659,7 +659,7 @@ _mesa_ProgramUniform3uiv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform3uiv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_UNSIGNED_INT_VEC3); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_UINT, 3); } void GLAPIENTRY @@ -670,7 +670,7 @@ _mesa_ProgramUniform4uiv(GLuint program, GLint location, GLsizei count, struct gl_shader_program *shProg = _mesa_lookup_shader_program_err(ctx, program, "glProgramUniform4uiv"); - _mesa_uniform(ctx, shProg, location, count, value, GL_UNSIGNED_INT_VEC4); + _mesa_uniform(ctx, shProg, location, count, value, GLSL_TYPE_UINT, 4); } @@ -1208,7 +1208,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex, struct gl_shader_program *shProg; if (!ctx->Extensions.ARB_uniform_buffer_object) { - _mesa_error(ctx, GL_INVALID_OPERATION, "glGetActiveUniformBlockiv"); + _mesa_error(ctx, GL_INVALID_OPERATION, "glGetActiveUniformName"); return; } diff --git a/mesalib/src/mesa/main/uniforms.h b/mesalib/src/mesa/main/uniforms.h index 6575a52..0a9ee7d 100644 --- a/mesalib/src/mesa/main/uniforms.h +++ b/mesalib/src/mesa/main/uniforms.h @@ -265,7 +265,9 @@ _mesa_get_uniform_location(struct gl_shader_program *shProg, void _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shader_program, GLint location, GLsizei count, - const GLvoid *values, GLenum type); + const GLvoid *values, + enum glsl_base_type basicType, + unsigned src_components); void _mesa_uniform_matrix(struct gl_context *ctx, struct gl_shader_program *shProg, diff --git a/mesalib/src/mesa/main/viewport.c b/mesalib/src/mesa/main/viewport.c index d6a9e29..0adce9c 100644 --- a/mesalib/src/mesa/main/viewport.c +++ b/mesalib/src/mesa/main/viewport.c @@ -459,15 +459,14 @@ _mesa_ClipControl(GLenum origin, GLenum depth) ctx->Transform.ClipDepthMode == depth) return; - FLUSH_VERTICES(ctx, 0); + /* Affects transform state and the viewport transform */ + FLUSH_VERTICES(ctx, _NEW_TRANSFORM | _NEW_VIEWPORT); 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); @@ -476,9 +475,6 @@ _mesa_ClipControl(GLenum origin, GLenum depth) 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); } diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c index fcc9ed5..650c40f 100644 --- a/mesalib/src/mesa/program/prog_execute.c +++ b/mesalib/src/mesa/program/prog_execute.c @@ -1119,77 +1119,6 @@ _mesa_execute_program(struct gl_context * ctx, break; case OPCODE_NOP: break; - case OPCODE_PK2H: /* pack two 16-bit floats in one 32-bit float */ - { - GLfloat a[4]; - GLuint result[4]; - GLhalfNV hx, hy; - fetch_vector4(&inst->SrcReg[0], machine, a); - hx = _mesa_float_to_half(a[0]); - hy = _mesa_float_to_half(a[1]); - result[0] = - result[1] = - result[2] = - result[3] = hx | (hy << 16); - store_vector4ui(inst, machine, result); - } - break; - case OPCODE_PK2US: /* pack two GLushorts into one 32-bit float */ - { - GLfloat a[4]; - GLuint result[4], usx, usy; - fetch_vector4(&inst->SrcReg[0], machine, a); - a[0] = CLAMP(a[0], 0.0F, 1.0F); - a[1] = CLAMP(a[1], 0.0F, 1.0F); - usx = F_TO_I(a[0] * 65535.0F); - usy = F_TO_I(a[1] * 65535.0F); - result[0] = - result[1] = - result[2] = - result[3] = usx | (usy << 16); - store_vector4ui(inst, machine, result); - } - break; - case OPCODE_PK4B: /* pack four GLbytes into one 32-bit float */ - { - GLfloat a[4]; - GLuint result[4], ubx, uby, ubz, ubw; - fetch_vector4(&inst->SrcReg[0], machine, a); - a[0] = CLAMP(a[0], -128.0F / 127.0F, 1.0F); - a[1] = CLAMP(a[1], -128.0F / 127.0F, 1.0F); - a[2] = CLAMP(a[2], -128.0F / 127.0F, 1.0F); - a[3] = CLAMP(a[3], -128.0F / 127.0F, 1.0F); - ubx = F_TO_I(127.0F * a[0] + 128.0F); - uby = F_TO_I(127.0F * a[1] + 128.0F); - ubz = F_TO_I(127.0F * a[2] + 128.0F); - ubw = F_TO_I(127.0F * a[3] + 128.0F); - result[0] = - result[1] = - result[2] = - result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24); - store_vector4ui(inst, machine, result); - } - break; - case OPCODE_PK4UB: /* pack four GLubytes into one 32-bit float */ - { - GLfloat a[4]; - GLuint result[4], ubx, uby, ubz, ubw; - fetch_vector4(&inst->SrcReg[0], machine, a); - a[0] = CLAMP(a[0], 0.0F, 1.0F); - a[1] = CLAMP(a[1], 0.0F, 1.0F); - a[2] = CLAMP(a[2], 0.0F, 1.0F); - a[3] = CLAMP(a[3], 0.0F, 1.0F); - ubx = F_TO_I(255.0F * a[0]); - uby = F_TO_I(255.0F * a[1]); - ubz = F_TO_I(255.0F * a[2]); - ubw = F_TO_I(255.0F * a[3]); - result[0] = - result[1] = - result[2] = - result[3] = ubx | (uby << 8) | (ubz << 16) | (ubw << 24); - store_vector4ui(inst, machine, result); - } - break; case OPCODE_POW: { GLfloat a[4], b[4], result[4]; @@ -1224,20 +1153,6 @@ _mesa_execute_program(struct gl_context * ctx, pc = machine->CallStack[--machine->StackDepth] - 1; } break; - case OPCODE_RFL: /* reflection vector */ - { - GLfloat axis[4], dir[4], result[4], tmpX, tmpW; - fetch_vector4(&inst->SrcReg[0], machine, axis); - fetch_vector4(&inst->SrcReg[1], machine, dir); - tmpW = DOT3(axis, axis); - tmpX = (2.0F * DOT3(axis, dir)) / tmpW; - result[0] = tmpX * axis[0] - dir[0]; - result[1] = tmpX * axis[1] - dir[1]; - result[2] = tmpX * axis[2] - dir[2]; - /* result[3] is never written! XXX enforce in parser! */ - store_vector4(inst, machine, result); - } - break; case OPCODE_RSQ: /* 1 / sqrt() */ { GLfloat a[4], result[4]; @@ -1279,12 +1194,6 @@ _mesa_execute_program(struct gl_context * ctx, } } break; - case OPCODE_SFL: /* set false, operands ignored */ - { - static const GLfloat result[4] = { 0.0F, 0.0F, 0.0F, 0.0F }; - store_vector4(inst, machine, result); - } - break; case OPCODE_SGE: /* set on greater or equal */ { GLfloat a[4], b[4], result[4]; @@ -1395,12 +1304,6 @@ _mesa_execute_program(struct gl_context * ctx, store_vector4(inst, machine, result); } break; - case OPCODE_STR: /* set true, operands ignored */ - { - static const GLfloat result[4] = { 1.0F, 1.0F, 1.0F, 1.0F }; - store_vector4(inst, machine, result); - } - break; case OPCODE_SUB: { GLfloat a[4], b[4], result[4]; @@ -1574,52 +1477,6 @@ _mesa_execute_program(struct gl_context * ctx, store_vector4(inst, machine, result); } break; - case OPCODE_UP2H: /* unpack two 16-bit floats */ - { - const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine); - GLfloat result[4]; - GLushort hx, hy; - hx = raw & 0xffff; - hy = raw >> 16; - result[0] = result[2] = _mesa_half_to_float(hx); - result[1] = result[3] = _mesa_half_to_float(hy); - store_vector4(inst, machine, result); - } - break; - case OPCODE_UP2US: /* unpack two GLushorts */ - { - const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine); - GLfloat result[4]; - GLushort usx, usy; - usx = raw & 0xffff; - usy = raw >> 16; - result[0] = result[2] = usx * (1.0f / 65535.0f); - result[1] = result[3] = usy * (1.0f / 65535.0f); - store_vector4(inst, machine, result); - } - break; - case OPCODE_UP4B: /* unpack four GLbytes */ - { - const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine); - GLfloat result[4]; - result[0] = (((raw >> 0) & 0xff) - 128) / 127.0F; - result[1] = (((raw >> 8) & 0xff) - 128) / 127.0F; - result[2] = (((raw >> 16) & 0xff) - 128) / 127.0F; - result[3] = (((raw >> 24) & 0xff) - 128) / 127.0F; - store_vector4(inst, machine, result); - } - break; - case OPCODE_UP4UB: /* unpack four GLubytes */ - { - const GLuint raw = fetch_vector1ui(&inst->SrcReg[0], machine); - GLfloat result[4]; - result[0] = ((raw >> 0) & 0xff) / 255.0F; - result[1] = ((raw >> 8) & 0xff) / 255.0F; - result[2] = ((raw >> 16) & 0xff) / 255.0F; - result[3] = ((raw >> 24) & 0xff) / 255.0F; - store_vector4(inst, machine, result); - } - break; case OPCODE_XPD: /* cross product */ { GLfloat a[4], b[4], result[4]; @@ -1637,19 +1494,6 @@ _mesa_execute_program(struct gl_context * ctx, } } break; - case OPCODE_X2D: /* 2-D matrix transform */ - { - GLfloat a[4], b[4], c[4], result[4]; - fetch_vector4(&inst->SrcReg[0], machine, a); - fetch_vector4(&inst->SrcReg[1], machine, b); - fetch_vector4(&inst->SrcReg[2], machine, c); - result[0] = a[0] + b[0] * c[0] + b[1] * c[1]; - result[1] = a[1] + b[0] * c[2] + b[1] * c[3]; - result[2] = a[2] + b[0] * c[0] + b[1] * c[1]; - result[3] = a[3] + b[0] * c[2] + b[1] * c[3]; - store_vector4(inst, machine, result); - } - break; case OPCODE_END: return GL_TRUE; default: diff --git a/mesalib/src/mesa/program/prog_instruction.c b/mesalib/src/mesa/program/prog_instruction.c index e2eadc3..976024e 100644 --- a/mesalib/src/mesa/program/prog_instruction.c +++ b/mesalib/src/mesa/program/prog_instruction.c @@ -191,18 +191,12 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = { { OPCODE_NOISE2, "NOISE2", 1, 1 }, { OPCODE_NOISE3, "NOISE3", 1, 1 }, { OPCODE_NOISE4, "NOISE4", 1, 1 }, - { OPCODE_PK2H, "PK2H", 1, 1 }, - { OPCODE_PK2US, "PK2US", 1, 1 }, - { OPCODE_PK4B, "PK4B", 1, 1 }, - { OPCODE_PK4UB, "PK4UB", 1, 1 }, { OPCODE_POW, "POW", 2, 1 }, { OPCODE_RCP, "RCP", 1, 1 }, { OPCODE_RET, "RET", 0, 0 }, - { OPCODE_RFL, "RFL", 1, 1 }, { OPCODE_RSQ, "RSQ", 1, 1 }, { OPCODE_SCS, "SCS", 1, 1 }, { OPCODE_SEQ, "SEQ", 2, 1 }, - { OPCODE_SFL, "SFL", 0, 1 }, { OPCODE_SGE, "SGE", 2, 1 }, { OPCODE_SGT, "SGT", 2, 1 }, { OPCODE_SIN, "SIN", 1, 1 }, @@ -210,7 +204,6 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = { { OPCODE_SLT, "SLT", 2, 1 }, { OPCODE_SNE, "SNE", 2, 1 }, { OPCODE_SSG, "SSG", 1, 1 }, - { OPCODE_STR, "STR", 0, 1 }, { OPCODE_SUB, "SUB", 2, 1 }, { OPCODE_SWZ, "SWZ", 1, 1 }, { OPCODE_TEX, "TEX", 1, 1 }, @@ -220,11 +213,6 @@ static const struct instruction_info InstInfo[MAX_OPCODE] = { { OPCODE_TXP, "TXP", 1, 1 }, { OPCODE_TXP_NV, "TXP_NV", 1, 1 }, { OPCODE_TRUNC, "TRUNC", 1, 1 }, - { OPCODE_UP2H, "UP2H", 1, 1 }, - { OPCODE_UP2US, "UP2US", 1, 1 }, - { OPCODE_UP4B, "UP4B", 1, 1 }, - { OPCODE_UP4UB, "UP4UB", 1, 1 }, - { OPCODE_X2D, "X2D", 3, 1 }, { OPCODE_XPD, "XPD", 2, 1 } }; diff --git a/mesalib/src/mesa/program/prog_instruction.h b/mesalib/src/mesa/program/prog_instruction.h index b9604e5..de78804 100644 --- a/mesalib/src/mesa/program/prog_instruction.h +++ b/mesalib/src/mesa/program/prog_instruction.h @@ -187,18 +187,12 @@ typedef enum prog_opcode { OPCODE_NOISE2, /* X */ OPCODE_NOISE3, /* X */ OPCODE_NOISE4, /* X */ - OPCODE_PK2H, /* X */ - OPCODE_PK2US, /* X */ - OPCODE_PK4B, /* X */ - OPCODE_PK4UB, /* X */ OPCODE_POW, /* X X X X */ OPCODE_RCP, /* X X X X X */ OPCODE_RET, /* 2 2 opt */ - OPCODE_RFL, /* X */ OPCODE_RSQ, /* X X X X X */ OPCODE_SCS, /* X X */ OPCODE_SEQ, /* 2 X X */ - OPCODE_SFL, /* 2 X */ OPCODE_SGE, /* X X X X X */ OPCODE_SGT, /* 2 X X */ OPCODE_SIN, /* X 2 X X */ @@ -206,7 +200,6 @@ typedef enum prog_opcode { OPCODE_SLT, /* X X X X X */ OPCODE_SNE, /* 2 X X */ OPCODE_SSG, /* 2 X */ - OPCODE_STR, /* 2 X */ OPCODE_SUB, /* X X 1.1 X X */ OPCODE_SWZ, /* X X X */ OPCODE_TEX, /* X 3 X X */ @@ -216,11 +209,6 @@ typedef enum prog_opcode { OPCODE_TXP, /* X X */ OPCODE_TXP_NV, /* 3 X */ OPCODE_TRUNC, /* X */ - OPCODE_UP2H, /* X */ - OPCODE_UP2US, /* X */ - OPCODE_UP4B, /* X */ - OPCODE_UP4UB, /* X */ - OPCODE_X2D, /* X */ OPCODE_XPD, /* X X */ MAX_OPCODE } gl_inst_opcode; diff --git a/mesalib/src/mesa/program/program_lexer.l b/mesalib/src/mesa/program/program_lexer.l index d5dbcf3..2fcd71f 100644 --- a/mesalib/src/mesa/program/program_lexer.l +++ b/mesalib/src/mesa/program/program_lexer.l @@ -28,6 +28,7 @@ #include "program/symbol_table.h" #include "program/program_parser.h" #include "program/program_parse.tab.h" +#include "util/strtod.h" #define require_ARB_vp (yyextra->mode == ARB_vertex) #define require_ARB_fp (yyextra->mode == ARB_fragment) @@ -216,26 +217,19 @@ MIN{sz}{cc}{sat} { return_opcode( 1, BIN_OP, MIN, 3); } MOV{sz}{cc}{sat} { return_opcode( 1, VECTOR_OP, MOV, 3); } MUL{sz}{cc}{sat} { return_opcode( 1, BIN_OP, MUL, 3); } -PK2H { return_opcode(require_NV_fp, VECTOR_OP, PK2H, 4); } -PK2US { return_opcode(require_NV_fp, VECTOR_OP, PK2US, 5); } -PK4B { return_opcode(require_NV_fp, VECTOR_OP, PK4B, 4); } -PK4UB { return_opcode(require_NV_fp, VECTOR_OP, PK4UB, 5); } POW{szf}{cc}{sat} { return_opcode( 1, BINSC_OP, POW, 3); } RCP{szf}{cc}{sat} { return_opcode( 1, SCALAR_OP, RCP, 3); } -RFL{szf}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, RFL, 3); } RSQ{szf}{cc}{sat} { return_opcode( 1, SCALAR_OP, RSQ, 3); } SCS{sat} { return_opcode(require_ARB_fp, SCALAR_OP, SCS, 3); } SEQ{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SEQ, 3); } -SFL{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SFL, 3); } SGE{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SGE, 3); } SGT{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SGT, 3); } SIN{szf}{cc}{sat} { return_opcode(require_ARB_fp, SCALAR_OP, SIN, 3); } SLE{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SLE, 3); } SLT{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SLT, 3); } SNE{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, SNE, 3); } -STR{sz}{cc}{sat} { return_opcode(require_NV_fp, BIN_OP, STR, 3); } SUB{sz}{cc}{sat} { return_opcode( 1, BIN_OP, SUB, 3); } SWZ{sat} { return_opcode( 1, SWZ, SWZ, 3); } @@ -244,12 +238,6 @@ TXB{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TXB, 3); } TXD{cc}{sat} { return_opcode(require_NV_fp, TXD_OP, TXD, 3); } TXP{cc}{sat} { return_opcode(require_ARB_fp, SAMPLE_OP, TXP, 3); } -UP2H{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2H, 4); } -UP2US{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP2US, 5); } -UP4B{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP4B, 4); } -UP4UB{cc}{sat} { return_opcode(require_NV_fp, SCALAR_OP, UP4UB, 5); } - -X2D{szf}{cc}{sat} { return_opcode(require_NV_fp, TRI_OP, X2D, 3); } XPD{sat} { return_opcode( 1, BIN_OP, XPD, 3); } vertex { return_token_or_IDENTIFIER(require_ARB_vp, VERTEX); } diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c index 5020978..606f19a 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c @@ -72,7 +72,7 @@ static void update_raster_state( struct st_context *st ) { raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW); - /* _NEW_VIEWPORT */ + /* _NEW_TRANSFORM */ if (ctx->Transform.ClipOrigin == GL_UPPER_LEFT) { raster->front_ccw ^= 1; } @@ -246,13 +246,10 @@ 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 */ + /* _NEW_TRANSFORM */ 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; @@ -267,6 +264,7 @@ static void update_raster_state( struct st_context *st ) /* _NEW_TRANSFORM */ raster->depth_clip = !ctx->Transform.DepthClamp; raster->clip_plane_enable = ctx->Transform.ClipPlanesEnabled; + raster->clip_halfz = (ctx->Transform.ClipDepthMode == GL_ZERO_TO_ONE); cso_set_rasterizer(st->cso_context, raster); } @@ -283,8 +281,7 @@ const struct st_tracked_state st_update_rasterizer = { _NEW_PROGRAM | _NEW_SCISSOR | _NEW_FRAG_CLAMP | - _NEW_TRANSFORM | - _NEW_VIEWPORT), /* mesa state dependencies*/ + _NEW_TRANSFORM), /* 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 5b99208..efa056e 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_viewport.c +++ b/mesalib/src/mesa/state_tracker/st_atom_viewport.c @@ -70,12 +70,10 @@ update_viewport( struct st_context *st ) 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] = 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; } cso_set_viewport(st->cso_context, &st->state.viewport[0]); diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c index e3ba5a8..2107ab1 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c @@ -504,11 +504,9 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, vp.scale[0] = 0.5f * width; vp.scale[1] = height * (invert ? -0.5f : 0.5f); vp.scale[2] = 0.5f; - vp.scale[3] = 1.0f; vp.translate[0] = 0.5f * width; vp.translate[1] = 0.5f * height; vp.translate[2] = 0.5f; - vp.translate[3] = 0.0f; cso_set_viewport(cso, &vp); } @@ -769,7 +767,8 @@ st_Bitmap(struct gl_context *ctx, GLint x, GLint y, const uint semantic_indexes[] = { 0, 0, 0 }; st->bitmap.vs = util_make_vertex_passthrough_shader(st->pipe, 3, semantic_names, - semantic_indexes); + semantic_indexes, + FALSE); } if (UseBitmapCache && accum_bitmap(ctx, x, y, width, height, unpack, bitmap)) diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 2c1414e..45dea59 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -88,6 +88,14 @@ st_destroy_clear(struct st_context *st) cso_delete_vertex_shader(st->cso_context, st->clear.vs); st->clear.vs = NULL; } + if (st->clear.vs_layered) { + cso_delete_vertex_shader(st->cso_context, st->clear.vs_layered); + st->clear.vs_layered = NULL; + } + if (st->clear.gs_layered) { + cso_delete_geometry_shader(st->cso_context, st->clear.gs_layered); + st->clear.gs_layered = NULL; + } } @@ -123,10 +131,12 @@ set_vertex_shader(struct st_context *st) const uint semantic_indexes[] = { 0, 0 }; st->clear.vs = util_make_vertex_passthrough_shader(st->pipe, 2, semantic_names, - semantic_indexes); + semantic_indexes, + FALSE); } cso_set_vertex_shader_handle(st->cso_context, st->clear.vs); + cso_set_geometry_shader_handle(st->cso_context, NULL); } @@ -135,18 +145,25 @@ set_vertex_shader_layered(struct st_context *st) { struct pipe_context *pipe = st->pipe; - if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_INSTANCEID) || - !pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_VS_LAYER_VIEWPORT)) { - assert(!"Got layered clear, but the VS layer output is unsupported"); + if (!pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_INSTANCEID)) { + assert(!"Got layered clear, but VS instancing is unsupported"); set_vertex_shader(st); return; } if (!st->clear.vs_layered) { - st->clear.vs_layered = util_make_layered_clear_vertex_shader(pipe); + bool vs_layer = + pipe->screen->get_param(pipe->screen, PIPE_CAP_TGSI_VS_LAYER_VIEWPORT); + if (vs_layer) { + st->clear.vs_layered = util_make_layered_clear_vertex_shader(pipe); + } else { + st->clear.vs_layered = util_make_layered_clear_helper_vertex_shader(pipe); + st->clear.gs_layered = util_make_layered_clear_geometry_shader(pipe); + } } cso_set_vertex_shader_handle(st->cso_context, st->clear.vs_layered); + cso_set_geometry_shader_handle(st->cso_context, st->clear.gs_layered); } @@ -323,16 +340,13 @@ clear_with_quad(struct gl_context *ctx, unsigned clear_buffers) vp.scale[0] = 0.5f * fb_width; vp.scale[1] = fb_height * (invert ? -0.5f : 0.5f); vp.scale[2] = 0.5f; - vp.scale[3] = 1.0f; vp.translate[0] = 0.5f * fb_width; vp.translate[1] = 0.5f * fb_height; vp.translate[2] = 0.5f; - vp.translate[3] = 0.0f; cso_set_viewport(st->cso_context, &vp); } set_fragment_shader(st); - cso_set_geometry_shader_handle(st->cso_context, NULL); if (num_layers > 1) set_vertex_shader_layered(st); diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 5ae092b..939fc20 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -776,11 +776,9 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, vp.scale[0] = 0.5f * w; vp.scale[1] = -0.5f * h; vp.scale[2] = 0.5f; - vp.scale[3] = 1.0f; vp.translate[0] = 0.5f * w; vp.translate[1] = 0.5f * h; vp.translate[2] = 0.5f; - vp.translate[3] = 0.0f; cso_set_viewport(cso, &vp); } diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c index f997e6b..d057ff6 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawtex.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawtex.c @@ -91,7 +91,7 @@ lookup_shader(struct pipe_context *pipe, util_make_vertex_passthrough_shader(pipe, num_attribs, semantic_names, - semantic_indexes); + semantic_indexes, FALSE); NumCachedShaders++; return CachedShaders[i].handle; @@ -258,11 +258,9 @@ st_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, vp.scale[0] = 0.5f * width; vp.scale[1] = height * (invert ? -0.5f : 0.5f); vp.scale[2] = 1.0f; - vp.scale[3] = 1.0f; vp.translate[0] = 0.5f * width; vp.translate[1] = 0.5f * height; vp.translate[2] = 0.0f; - vp.translate[3] = 0.0f; cso_set_viewport(cso, &vp); } diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h index 58f14f9..15f9df4 100644 --- a/mesalib/src/mesa/state_tracker/st_context.h +++ b/mesalib/src/mesa/state_tracker/st_context.h @@ -181,6 +181,7 @@ struct st_context void *vs; void *fs; void *vs_layered; + void *gs_layered; } clear; /** used for anything using util_draw_vertex_buffer */ diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index aff3dde..bdfab8b 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -241,8 +241,7 @@ void st_init_limits(struct pipe_screen *screen, if (options->EmitNoLoops) options->MaxUnrollIterations = MIN2(screen->get_shader_param(screen, sh, PIPE_SHADER_CAP_MAX_INSTRUCTIONS), 65536); - else - options->MaxUnrollIterations = 255; /* SM3 limit */ + options->LowerClipDistance = true; } 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 a4e2c8d..8e91c4b 100644 --- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -4022,6 +4022,7 @@ get_pixel_transfer_visitor(struct st_fragment_program *fp, newinst = v->emit(NULL, inst->op, inst->dst, src_regs[0], src_regs[1], src_regs[2]); newinst->tex_target = inst->tex_target; + newinst->sampler_array_size = inst->sampler_array_size; } /* Make modifications to fragment program info. */ @@ -4101,6 +4102,7 @@ get_bitmap_visitor(struct st_fragment_program *fp, newinst = v->emit(NULL, inst->op, inst->dst, src_regs[0], src_regs[1], src_regs[2]); newinst->tex_target = inst->tex_target; + newinst->sampler_array_size = inst->sampler_array_size; } /* Make modifications to fragment program info. */ @@ -4524,8 +4526,10 @@ compile_tgsi_instruction(struct st_translate *t, inst->saturate, clamp_dst_color_output); - for (i = 0; i < num_src; i++) + for (i = 0; i < num_src; i++) { + assert(inst->src[i].file != PROGRAM_UNDEFINED); src[i] = translate_src(t, &inst->src[i]); + } switch(inst->op) { case TGSI_OPCODE_BGNLOOP: @@ -4555,6 +4559,7 @@ compile_tgsi_instruction(struct st_translate *t, case TGSI_OPCODE_TG4: case TGSI_OPCODE_LODQ: src[num_src] = t->samplers[inst->sampler.index]; + assert(src[num_src].File != TGSI_FILE_NULL); if (inst->sampler.reladdr) src[num_src] = ureg_src_indirect(src[num_src], ureg_src(t->address[2])); @@ -4721,7 +4726,8 @@ emit_wpos(struct st_context *st, } else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) { /* the driver supports lower-left origin, need to invert Y */ - ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_ORIGIN, + TGSI_FS_COORD_ORIGIN_LOWER_LEFT); invert = TRUE; } else @@ -4731,7 +4737,8 @@ emit_wpos(struct st_context *st, /* Fragment shader wants origin in lower-left */ if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) /* the driver supports lower-left origin */ - ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_ORIGIN, + TGSI_FS_COORD_ORIGIN_LOWER_LEFT); else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) /* the driver supports upper-left origin, need to invert Y */ invert = TRUE; @@ -4744,7 +4751,8 @@ emit_wpos(struct st_context *st, if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) { /* the driver supports pixel center integer */ adjY[1] = 1.0f; - ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_PIXEL_CENTER, + TGSI_FS_COORD_PIXEL_CENTER_INTEGER); } else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) { /* the driver supports pixel center half integer, need to bias X,Y */ @@ -4763,7 +4771,8 @@ emit_wpos(struct st_context *st, else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) { /* the driver supports pixel center integer, need to bias X,Y */ adjX = adjY[0] = adjY[1] = 0.5f; - ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_PIXEL_CENTER, + TGSI_FS_COORD_PIXEL_CENTER_INTEGER); } else assert(0); diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c index df6de73..606d678 100644 --- a/mesalib/src/mesa/state_tracker/st_manager.c +++ b/mesalib/src/mesa/state_tracker/st_manager.c @@ -452,7 +452,8 @@ st_framebuffer_create(struct st_context *st, st_pipe_format_to_mesa_format(srgb_format) != MESA_FORMAT_NONE && screen->is_format_supported(screen, srgb_format, PIPE_TEXTURE_2D, stfbi->visual->samples, - PIPE_BIND_RENDER_TARGET)) + (PIPE_BIND_DISPLAY_TARGET | + PIPE_BIND_RENDER_TARGET))) mode.sRGBCapable = GL_TRUE; } diff --git a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c index 26a5f51..2c9d9a5 100644 --- a/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c +++ b/mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c @@ -891,7 +891,8 @@ emit_wpos(struct st_context *st, } else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) { /* the driver supports lower-left origin, need to invert Y */ - ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_ORIGIN, + TGSI_FS_COORD_ORIGIN_LOWER_LEFT); invert = TRUE; } else @@ -901,7 +902,8 @@ emit_wpos(struct st_context *st, /* Fragment shader wants origin in lower-left */ if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT)) /* the driver supports lower-left origin */ - ureg_property_fs_coord_origin(ureg, TGSI_FS_COORD_ORIGIN_LOWER_LEFT); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_ORIGIN, + TGSI_FS_COORD_ORIGIN_LOWER_LEFT); else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_ORIGIN_UPPER_LEFT)) /* the driver supports upper-left origin, need to invert Y */ invert = TRUE; @@ -914,7 +916,8 @@ emit_wpos(struct st_context *st, if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) { /* the driver supports pixel center integer */ adjY[1] = 1.0f; - ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_PIXEL_CENTER, + TGSI_FS_COORD_PIXEL_CENTER_INTEGER); } else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_HALF_INTEGER)) { /* the driver supports pixel center half integer, need to bias X,Y */ @@ -933,7 +936,8 @@ emit_wpos(struct st_context *st, else if (pscreen->get_param(pscreen, PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER)) { /* the driver supports pixel center integer, need to bias X,Y */ adjX = adjY[0] = adjY[1] = 0.5f; - ureg_property_fs_coord_pixel_center(ureg, TGSI_FS_COORD_PIXEL_CENTER_INTEGER); + ureg_property(ureg, TGSI_PROPERTY_FS_COORD_PIXEL_CENTER, + TGSI_FS_COORD_PIXEL_CENTER_INTEGER); } else assert(0); diff --git a/mesalib/src/mesa/state_tracker/st_program.c b/mesalib/src/mesa/state_tracker/st_program.c index 926086b..737c269 100644 --- a/mesalib/src/mesa/state_tracker/st_program.c +++ b/mesalib/src/mesa/state_tracker/st_program.c @@ -742,21 +742,25 @@ st_translate_fragment_program(struct st_context *st, debug_printf("\n"); } if (write_all == GL_TRUE) - ureg_property_fs_color0_writes_all_cbufs(ureg, 1); + ureg_property(ureg, TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS, 1); if (stfp->Base.FragDepthLayout != FRAG_DEPTH_LAYOUT_NONE) { switch (stfp->Base.FragDepthLayout) { case FRAG_DEPTH_LAYOUT_ANY: - ureg_property_fs_depth_layout(ureg, TGSI_FS_DEPTH_LAYOUT_ANY); + ureg_property(ureg, TGSI_PROPERTY_FS_DEPTH_LAYOUT, + TGSI_FS_DEPTH_LAYOUT_ANY); break; case FRAG_DEPTH_LAYOUT_GREATER: - ureg_property_fs_depth_layout(ureg, TGSI_FS_DEPTH_LAYOUT_GREATER); + ureg_property(ureg, TGSI_PROPERTY_FS_DEPTH_LAYOUT, + TGSI_FS_DEPTH_LAYOUT_GREATER); break; case FRAG_DEPTH_LAYOUT_LESS: - ureg_property_fs_depth_layout(ureg, TGSI_FS_DEPTH_LAYOUT_LESS); + ureg_property(ureg, TGSI_PROPERTY_FS_DEPTH_LAYOUT, + TGSI_FS_DEPTH_LAYOUT_LESS); break; case FRAG_DEPTH_LAYOUT_UNCHANGED: - ureg_property_fs_depth_layout(ureg, TGSI_FS_DEPTH_LAYOUT_UNCHANGED); + ureg_property(ureg, TGSI_PROPERTY_FS_DEPTH_LAYOUT, + TGSI_FS_DEPTH_LAYOUT_UNCHANGED); break; default: assert(0); @@ -1122,10 +1126,11 @@ st_translate_geometry_program(struct st_context *st, stgp->tgsi.tokens = NULL; } - ureg_property_gs_input_prim(ureg, stgp->Base.InputType); - ureg_property_gs_output_prim(ureg, stgp->Base.OutputType); - ureg_property_gs_max_vertices(ureg, stgp->Base.VerticesOut); - ureg_property_gs_invocations(ureg, stgp->Base.Invocations); + ureg_property(ureg, TGSI_PROPERTY_GS_INPUT_PRIM, stgp->Base.InputType); + ureg_property(ureg, TGSI_PROPERTY_GS_OUTPUT_PRIM, stgp->Base.OutputType); + ureg_property(ureg, TGSI_PROPERTY_GS_MAX_OUTPUT_VERTICES, + stgp->Base.VerticesOut); + ureg_property(ureg, TGSI_PROPERTY_GS_INVOCATIONS, stgp->Base.Invocations); if (stgp->glsl_to_tgsi) st_translate_program(st->ctx, diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c index 045dbb5..e623b36 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_array.c +++ b/mesalib/src/mesa/vbo/vbo_exec_array.c @@ -36,6 +36,8 @@ #include "main/enums.h" #include "main/macros.h" #include "main/transformfeedback.h" +#include "main/sse_minmax.h" +#include "x86/common_x86_asm.h" #include "vbo_context.h" @@ -119,10 +121,16 @@ vbo_get_minmax_index(struct gl_context *ctx, } } else { - for (i = 0; i < count; i++) { - if (ui_indices[i] > max_ui) max_ui = ui_indices[i]; - if (ui_indices[i] < min_ui) min_ui = ui_indices[i]; +#if defined(USE_SSE41) + if (cpu_has_sse4_1) { + _mesa_uint_array_min_max(ui_indices, &min_ui, &max_ui, count); } + else +#endif + for (i = 0; i < count; i++) { + if (ui_indices[i] > max_ui) max_ui = ui_indices[i]; + if (ui_indices[i] < min_ui) min_ui = ui_indices[i]; + } } *min_index = min_ui; *max_index = max_ui; diff --git a/mesalib/src/mesa/x86/common_x86_features.h b/mesalib/src/mesa/x86/common_x86_features.h index 66f2cf6..65634aa 100644 --- a/mesalib/src/mesa/x86/common_x86_features.h +++ b/mesalib/src/mesa/x86/common_x86_features.h @@ -59,13 +59,39 @@ #define X86_CPUEXT_3DNOW_EXT (1<<30) #define X86_CPUEXT_3DNOW (1<<31) +#ifdef __MMX__ +#define cpu_has_mmx 1 +#else #define cpu_has_mmx (_mesa_x86_cpu_features & X86_FEATURE_MMX) +#endif + #define cpu_has_mmxext (_mesa_x86_cpu_features & X86_FEATURE_MMXEXT) + +#ifdef __SSE__ +#define cpu_has_xmm 1 +#else #define cpu_has_xmm (_mesa_x86_cpu_features & X86_FEATURE_XMM) +#endif + +#ifdef __SSE2__ +#define cpu_has_xmm2 1 +#else #define cpu_has_xmm2 (_mesa_x86_cpu_features & X86_FEATURE_XMM2) +#endif + +#ifdef __3dNOW__ +#define cpu_has_3dnow 1 +#else #define cpu_has_3dnow (_mesa_x86_cpu_features & X86_FEATURE_3DNOW) +#endif + #define cpu_has_3dnowext (_mesa_x86_cpu_features & X86_FEATURE_3DNOWEXT) + +#ifdef __SSE4_1__ +#define cpu_has_sse4_1 1 +#else #define cpu_has_sse4_1 (_mesa_x86_cpu_features & X86_FEATURE_SSE4_1) +#endif #endif diff --git a/mesalib/src/util/Makefile.sources b/mesalib/src/util/Makefile.sources index 952b799..9e27424 100644 --- a/mesalib/src/util/Makefile.sources +++ b/mesalib/src/util/Makefile.sources @@ -3,7 +3,8 @@ MESA_UTIL_FILES := \ ralloc.c \ register_allocate.c \ register_allocate.h \ - rgtc.c + rgtc.c \ + strtod.cpp MESA_UTIL_GENERATED_FILES = \ format_srgb.c diff --git a/mesalib/src/util/hash_table.c b/mesalib/src/util/hash_table.c index 1b6726c..920bdfd 100644 --- a/mesalib/src/util/hash_table.c +++ b/mesalib/src/util/hash_table.c @@ -385,12 +385,12 @@ _mesa_hash_table_random_entry(struct hash_table *ht, /** - * Quick FNV-1 hash implementation based on: + * Quick FNV-1a hash implementation based on: * http://www.isthe.com/chongo/tech/comp/fnv/ * - * FNV-1 is not be the best hash out there -- Jenkins's lookup3 is supposed to - * be quite good, and it probably beats FNV. But FNV has the advantage that - * it involves almost no code. For an improvement on both, see Paul + * FNV-1a is not be the best hash out there -- Jenkins's lookup3 is supposed + * to be quite good, and it probably beats FNV. But FNV has the advantage + * that it involves almost no code. For an improvement on both, see Paul * Hsieh's http://www.azillionmonkeys.com/qed/hash.html */ uint32_t @@ -408,7 +408,7 @@ _mesa_hash_data(const void *data, size_t size) return hash; } -/** FNV-1 string hash implementation */ +/** FNV-1a string hash implementation */ uint32_t _mesa_hash_string(const char *key) { diff --git a/mesalib/src/util/macros.h b/mesalib/src/util/macros.h index ff37a7d..5fc6729 100644 --- a/mesalib/src/util/macros.h +++ b/mesalib/src/util/macros.h @@ -29,6 +29,10 @@ # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) #endif +/* For compatibility with Clang's __has_builtin() */ +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif /** * __builtin_expect macros @@ -69,6 +73,12 @@ do { \ assert(!str); \ __builtin_unreachable(); \ } while (0) +#elif _MSC_VER >= 1200 +#define unreachable(str) \ +do { \ + assert(!str); \ + __assume(0); \ +} while (0) #endif #ifndef unreachable @@ -79,7 +89,13 @@ do { \ * Assume macro. Useful for expressing our assumptions to the compiler, * typically for purposes of silencing warnings. */ -#ifdef HAVE___BUILTIN_UNREACHABLE +#if __has_builtin(__builtin_assume) +#define assume(expr) \ +do { \ + assert(expr); \ + __builtin_assume(expr); \ +} while (0) +#elif defined HAVE___BUILTIN_UNREACHABLE #define assume(expr) ((expr) ? ((void) 0) \ : (assert(!"assumption failed"), \ __builtin_unreachable())) diff --git a/mesalib/src/glsl/strtod.c b/mesalib/src/util/strtod.cpp similarity index 71% rename from mesalib/src/glsl/strtod.c rename to mesalib/src/util/strtod.cpp index 5d4346b..2b4dd98 100644 --- a/mesalib/src/glsl/strtod.c +++ b/mesalib/src/util/strtod.cpp @@ -28,7 +28,7 @@ #ifdef _GNU_SOURCE #include <locale.h> -#ifdef __APPLE__ +#ifdef HAVE_XLOCALE_H #include <xlocale.h> #endif #endif @@ -36,21 +36,22 @@ #include "strtod.h" +#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) +static struct locale_initializer { + locale_initializer() { loc = newlocale(LC_CTYPE_MASK, "C", NULL); } + locale_t loc; +} loc_init; +#endif /** * Wrapper around strtod which uses the "C" locale so the decimal * point is always '.' */ double -glsl_strtod(const char *s, char **end) +_mesa_strtod(const char *s, char **end) { -#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ - !defined(__HAIKU__) && !defined(__UCLIBC__) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); - } - return strtod_l(s, end, loc); +#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) + return strtod_l(s, end, loc_init.loc); #else return strtod(s, end); #endif @@ -62,16 +63,11 @@ glsl_strtod(const char *s, char **end) * point is always '.' */ float -glsl_strtof(const char *s, char **end) +_mesa_strtof(const char *s, char **end) { -#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && \ - !defined(__HAIKU__) && !defined(__UCLIBC__) - static locale_t loc = NULL; - if (!loc) { - loc = newlocale(LC_CTYPE_MASK, "C", NULL); - } - return strtof_l(s, end, loc); -#elif _XOPEN_SOURCE >= 600 || _ISOC99_SOURCE +#if defined(_GNU_SOURCE) && defined(HAVE_XLOCALE_H) + return strtof_l(s, end, loc_init.loc); +#elif defined(HAVE_STRTOF) return strtof(s, end); #else return (float) strtod(s, end); diff --git a/mesalib/src/glsl/strtod.h b/mesalib/src/util/strtod.h similarity index 94% rename from mesalib/src/glsl/strtod.h rename to mesalib/src/util/strtod.h index ad847db..02c25dd 100644 --- a/mesalib/src/glsl/strtod.h +++ b/mesalib/src/util/strtod.h @@ -32,10 +32,10 @@ extern "C" { #endif extern double -glsl_strtod(const char *s, char **end); +_mesa_strtod(const char *s, char **end); extern float -glsl_strtof(const char *s, char **end); +_mesa_strtof(const char *s, char **end); #ifdef __cplusplus diff --git a/xkbcomp/configure.ac b/xkbcomp/configure.ac index fb71294..8937d84 100644 --- a/xkbcomp/configure.ac +++ b/xkbcomp/configure.ac @@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([xkbcomp], [1.2.4], +AC_INIT([xkbcomp], [1.3.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [xkbcomp]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c index 956e79c..adfa89a 100644 --- a/xkbcomp/xkbcomp.c +++ b/xkbcomp/xkbcomp.c @@ -576,17 +576,37 @@ parseArgs(int argc, char *argv[]) } else if (strncmp(argv[i], "-w", 2) == 0) { - if ((i >= (argc - 1)) || (!isdigit(argv[i + 1][0]))) + unsigned long utmp; + char *tmp2; + /* If text is just after "-w" in the same word, then it must + * be a number and it is the warning level. Otherwise, if the + * next argument is a number, then it is the warning level, + * else the warning level is assumed to be 0. + */ + if (argv[i][2] == '\0') { warningLevel = 0; - if (isdigit(argv[i][2])) - if (sscanf(&argv[i][2], "%i", &itmp) == 1) - warningLevel = itmp; + if (i < argc - 1) + { + utmp = strtoul(argv[i+1], &tmp2, 10); + if (argv[i+1][0] != '\0' && *tmp2 == '\0') + { + warningLevel = utmp > 10 ? 10 : utmp; + i++; + } + } } else { - if (sscanf(argv[++i], "%i", &itmp) == 1) - warningLevel = itmp; + utmp = strtoul(&argv[i][2], &tmp2, 10); + if (*tmp2 == '\0') + warningLevel = utmp > 10 ? 10 : utmp; + else + { + ERROR1("Unknown flag \"%s\" on command line\n", argv[i]); + Usage(argc, argv); + return False; + } } } else if ((strcmp(argv[i], "-xkb") == 0) && (!xkblist)) diff --git a/xorg-server/Xext/dpms.c b/xorg-server/Xext/dpms.c index 5f1a35d..cdfaa97 100644 --- a/xorg-server/Xext/dpms.c +++ b/xorg-server/Xext/dpms.c @@ -14,14 +14,14 @@ 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 -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +Except as contained in this notice, the name of Digital Equipment Corporation shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital +dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ diff --git a/xorg-server/Xext/dpmsstubs.c b/xorg-server/Xext/dpmsstubs.c index 80f13f5..f05d1e9 100644 --- a/xorg-server/Xext/dpmsstubs.c +++ b/xorg-server/Xext/dpmsstubs.c @@ -14,14 +14,14 @@ 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 -DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, -BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING, +BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation +Except as contained in this notice, the name of Digital Equipment Corporation shall not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from Digital +dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ diff --git a/xorg-server/Xext/panoramiX.c b/xorg-server/Xext/panoramiX.c index 4d79c46..2bbae2f 100644 --- a/xorg-server/Xext/panoramiX.c +++ b/xorg-server/Xext/panoramiX.c @@ -427,7 +427,7 @@ XineramaReinitData(void) /* * PanoramiXExtensionInit(): - * Called from InitExtensions in main(). + * Called from InitExtensions in main(). * Register PanoramiXeen Extension * Initialize global variables. */ diff --git a/xorg-server/Xext/panoramiX.h b/xorg-server/Xext/panoramiX.h index 6578dfa..c16b9a5 100644 --- a/xorg-server/Xext/panoramiX.h +++ b/xorg-server/Xext/panoramiX.h @@ -28,7 +28,7 @@ Equipment Corporation. /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ -/* +/* * PanoramiX definitions */ diff --git a/xorg-server/Xext/panoramiXprocs.c b/xorg-server/Xext/panoramiXprocs.c index 0122ff3..413a66a 100644 --- a/xorg-server/Xext/panoramiXprocs.c +++ b/xorg-server/Xext/panoramiXprocs.c @@ -509,7 +509,7 @@ PanoramiXConfigureWindow(ClientPtr client) } } - /* have to go forward or you get expose events before + /* have to go forward or you get expose events before ConfigureNotify events */ FOR_NSCREENS_FORWARD(j) { stuff->window = win->info[j].id; @@ -1037,7 +1037,7 @@ PanoramiXClearToBackground(ClientPtr client) return result; } -/* +/* For Window to Pixmap copies you're screwed since each screen's pixmap will look like what it sees on its screen. Unless the screens overlap and the window lies on each, the two copies diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c index bf2ab2e..cce7c46 100644 --- a/xorg-server/Xext/security.c +++ b/xorg-server/Xext/security.c @@ -928,12 +928,12 @@ SecurityReceive(CallbackListPtr *pcbl, void *unused, void *calldata) * Returns: nothing. * * Side Effects: - * + * * If a new client is connecting, its authorization ID is copied to * client->authID. If this is a generated authorization, its reference * count is bumped, its timer is cancelled if it was running, and its * trustlevel is copied to TRUSTLEVEL(client). - * + * * If a client is disconnecting and the client was using a generated * authorization, the authorization's reference count is decremented, and * if it is now zero, the timer for this authorization is started. diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index 4dad8b6..db9d474 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -248,21 +248,20 @@ ShmDestroyPixmap(PixmapPtr pPixmap) { ScreenPtr pScreen = pPixmap->drawable.pScreen; ShmScrPrivateRec *screen_priv = ShmGetScreenPriv(pScreen); + void *shmdesc = NULL; Bool ret; - if (pPixmap->refcnt == 1) { - ShmDescPtr shmdesc; - - shmdesc = (ShmDescPtr) dixLookupPrivate(&pPixmap->devPrivates, - shmPixmapPrivateKey); - if (shmdesc) - ShmDetachSegment((void *) shmdesc, pPixmap->drawable.id); - } + if (pPixmap->refcnt == 1) + shmdesc = dixLookupPrivate(&pPixmap->devPrivates, shmPixmapPrivateKey); pScreen->DestroyPixmap = screen_priv->destroyPixmap; ret = (*pScreen->DestroyPixmap) (pPixmap); screen_priv->destroyPixmap = pScreen->DestroyPixmap; pScreen->DestroyPixmap = ShmDestroyPixmap; + + if (shmdesc) + ShmDetachSegment(shmdesc, pPixmap->drawable.id); + return ret; } @@ -405,7 +404,7 @@ ProcShmAttach(ClientPtr client) } /* The attach was performed with root privs. We must - * do manual checking of access rights for the credentials + * do manual checking of access rights for the credentials * of the client */ if (shm_access(client, &(SHM_PERM(buf)), stuff->readOnly) == -1) { @@ -1148,7 +1147,7 @@ ProcShmAttachFd(ClientPtr client) fd, 0); close(fd); - if ((shmdesc->addr == ((char *) -1))) { + if (shmdesc->addr == ((char *) -1)) { free(shmdesc); return BadAccess; } @@ -1238,7 +1237,7 @@ ProcShmCreateSegment(ClientPtr client) MAP_SHARED, fd, 0); - if ((shmdesc->addr == ((char *) -1))) { + if (shmdesc->addr == ((char *) -1)) { close(fd); free(shmdesc); return BadAccess; diff --git a/xorg-server/Xext/sync.c b/xorg-server/Xext/sync.c index 755ed94..ba08cd1 100644 --- a/xorg-server/Xext/sync.c +++ b/xorg-server/Xext/sync.c @@ -2715,7 +2715,7 @@ IdleTimeBlockHandler(void *pCounter, struct timeval **wt, void *LastSelectMask) break; } } - /* + /* * We've been called exactly on the idle time, but we have a * NegativeTransition trigger which requires a transition from an * idle time greater than this. Schedule a wakeup for the next diff --git a/xorg-server/Xext/syncsrv.h b/xorg-server/Xext/syncsrv.h index 8c2c00d..a8062d1 100644 --- a/xorg-server/Xext/syncsrv.h +++ b/xorg-server/Xext/syncsrv.h @@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or Olivetti not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c index 546b942..2737938 100644 --- a/xorg-server/Xext/xres.c +++ b/xorg-server/Xext/xres.c @@ -358,8 +358,8 @@ ResGetApproxPixmapBytes(PixmapPtr pix) bytesPerPixel = (float)pix->drawable.bitsPerPixel / 8.0; nPixels = pix->drawable.width * pix->drawable.height; - /* Divide by refcnt as pixmap could be shared between clients, - * so total pixmap mem is shared between these. + /* Divide by refcnt as pixmap could be shared between clients, + * so total pixmap mem is shared between these. */ return (nPixels * bytesPerPixel) / pix->refcnt; } @@ -375,7 +375,7 @@ ResFindResourcePixmaps(void *value, XID id, RESTYPE type, void *cdata) *bytes += size.pixmapRefSize; } -static void +static void ResFindPixmaps(void *value, XID id, void *cdata) { unsigned long *bytes = (unsigned long *) cdata; @@ -448,13 +448,13 @@ ProcXResQueryClientPixmapBytes(ClientPtr client) FindClientResourcesByType(clients[clientID], RT_PIXMAP, ResFindPixmaps, (void *) (&bytes)); - /* - * Make sure win background pixmaps also held to account. + /* + * Make sure win background pixmaps also held to account. */ FindClientResourcesByType(clients[clientID], RT_WINDOW, ResFindWindowPixmaps, (void *) (&bytes)); - /* + /* * GC Tile & Stipple pixmaps too. */ FindClientResourcesByType(clients[clientID], RT_GC, diff --git a/xorg-server/Xext/xvdisp.c b/xorg-server/Xext/xvdisp.c index 0bdfed3..86f982a 100644 --- a/xorg-server/Xext/xvdisp.c +++ b/xorg-server/Xext/xvdisp.c @@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/Xext/xvdix.h b/xorg-server/Xext/xvdix.h index e67a3c7..621a1e3 100644 --- a/xorg-server/Xext/xvdix.h +++ b/xorg-server/Xext/xvdix.h @@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -25,18 +25,18 @@ SOFTWARE. #ifndef XVDIX_H #define XVDIX_H /* -** File: +** File: ** ** xvdix.h --- Xv device independent header file ** -** Author: +** Author: ** ** David Carver (Digital Workstation Engineering/Project Athena) ** ** Revisions: ** ** 29.08.91 Carver -** - removed UnrealizeWindow wrapper unrealizing windows no longer +** - removed UnrealizeWindow wrapper unrealizing windows no longer ** preempts video ** ** 11.06.91 Carver diff --git a/xorg-server/Xext/xvmain.c b/xorg-server/Xext/xvmain.c index bc176c8..0abf190 100644 --- a/xorg-server/Xext/xvmain.c +++ b/xorg-server/Xext/xvmain.c @@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the names of Digital or MIT not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -23,11 +23,11 @@ SOFTWARE. ******************************************************************/ /* -** File: +** File: ** ** xvmain.c --- Xv server extension main device independent module. -** -** Author: +** +** Author: ** ** David Carver (Digital Workstation Engineering/Project Athena) ** @@ -58,7 +58,7 @@ SOFTWARE. ** ** 24.01.91 Carver ** - version 1.4 upgrade -** +** ** Notes: ** ** Port structures reference client structures in a two different @@ -86,7 +86,7 @@ SOFTWARE. #include "scrnintstr.h" #include "windowstr.h" #include "pixmapstr.h" -#include "gc.h" +#include "gcstruct.h" #include "extnsionst.h" #include "extinit.h" #include "dixstruct.h" @@ -915,7 +915,7 @@ XvdiSelectPortNotify(ClientPtr client, XvPortPtr pPort, BOOL onoff) return Success; } - /* DIDN'T FIND IT; SO REUSE LIST ELEMENT IF ONE IS FREE OTHERWISE + /* DIDN'T FIND IT; SO REUSE LIST ELEMENT IF ONE IS FREE OTHERWISE CREATE A NEW ONE AND ADD IT TO THE BEGINNING OF THE LIST */ if (!tpn) { diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c index dfbff06..8daded0 100644 --- a/xorg-server/composite/compalloc.c +++ b/xorg-server/composite/compalloc.c @@ -156,7 +156,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update) return BadAccess; /* - * Allocate per-client per-window structure + * Allocate per-client per-window structure * The client *could* allocate multiple, but while supported, * it is not expected to be common */ @@ -353,7 +353,7 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update) if (ccw->update == CompositeRedirectManual) return BadAccess; /* - * Allocate per-client per-window structure + * Allocate per-client per-window structure * The client *could* allocate multiple, but while supported, * it is not expected to be common */ @@ -401,7 +401,7 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update) return BadAlloc; if (ccw->update == CompositeRedirectManual) { csw->update = CompositeRedirectManual; - /* + /* * tell damage extension that damage events for this client are * critical output */ @@ -430,7 +430,7 @@ compFreeClientSubwindows(WindowPtr pWin, XID id) *prev = ccw->next; if (ccw->update == CompositeRedirectManual) { - /* + /* * tell damage extension that damage events for this client are * critical output */ diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c index fcfc349..f1a8255 100644 --- a/xorg-server/composite/compext.c +++ b/xorg-server/composite/compext.c @@ -299,7 +299,7 @@ ProcCompositeGetOverlayWindow(ClientPtr client) VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess); pScreen = pWin->drawable.pScreen; - /* + /* * Create an OverlayClient structure to mark this client's * interest in the overlay window */ @@ -351,7 +351,7 @@ ProcCompositeReleaseOverlayWindow(ClientPtr client) REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq); VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess); - /* + /* * Has client queried a reference to the overlay window * on this screen? If not, generate an error. */ diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c index 111c16e..3ac075a 100644 --- a/xorg-server/composite/compinit.c +++ b/xorg-server/composite/compinit.c @@ -78,6 +78,7 @@ compCloseScreen(ScreenPtr pScreen) pScreen->PositionWindow = cs->PositionWindow; pScreen->GetImage = cs->GetImage; + pScreen->GetSpans = cs->GetSpans; pScreen->SourceValidate = cs->SourceValidate; free(cs); @@ -151,6 +152,21 @@ compGetImage(DrawablePtr pDrawable, } static void +compGetSpans(DrawablePtr pDrawable, int wMax, DDXPointPtr ppt, int *pwidth, + int nspans, char *pdstStart) +{ + ScreenPtr pScreen = pDrawable->pScreen; + CompScreenPtr cs = GetCompScreen(pScreen); + + pScreen->GetSpans = cs->GetSpans; + if (pDrawable->type == DRAWABLE_WINDOW) + compPaintChildrenToWindow((WindowPtr) pDrawable); + (*pScreen->GetSpans) (pDrawable, wMax, ppt, pwidth, nspans, pdstStart); + cs->GetSpans = pScreen->GetSpans; + pScreen->GetSpans = compGetSpans; +} + +static void compSourceValidate(DrawablePtr pDrawable, int x, int y, int width, int height, unsigned int subWindowMode) @@ -193,7 +209,7 @@ compFindVisuallessDepth(ScreenPtr pScreen, int d) } } /* - * If there isn't one, then it's gonna be hard to have + * If there isn't one, then it's gonna be hard to have * an associated visual */ return 0; @@ -432,6 +448,9 @@ compScreenInit(ScreenPtr pScreen) cs->GetImage = pScreen->GetImage; pScreen->GetImage = compGetImage; + cs->GetSpans = pScreen->GetSpans; + pScreen->GetSpans = compGetSpans; + cs->SourceValidate = pScreen->SourceValidate; pScreen->SourceValidate = compSourceValidate; diff --git a/xorg-server/composite/compint.h b/xorg-server/composite/compint.h index 56b76c5..09241f2 100644 --- a/xorg-server/composite/compint.h +++ b/xorg-server/composite/compint.h @@ -76,7 +76,7 @@ /* * enable this for debugging - + #define COMPOSITE_DEBUG */ @@ -168,6 +168,7 @@ typedef struct _CompScreen { CompOverlayClientPtr pOverlayClients; GetImageProcPtr GetImage; + GetSpansProcPtr GetSpans; SourceValidateProcPtr SourceValidate; } CompScreenRec, *CompScreenPtr; diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c index 7932dda..20c860d 100644 --- a/xorg-server/composite/compoverlay.c +++ b/xorg-server/composite/compoverlay.c @@ -52,7 +52,7 @@ #include "panoramiXsrv.h" #endif -/* +/* * Delete the given overlay client list element from its screen list. */ void @@ -110,7 +110,7 @@ compCreateOverlayClient(ScreenPtr pScreen, ClientPtr pClient) pOc->pNext = cs->pOverlayClients; cs->pOverlayClients = pOc; - /* + /* * Create a resource for this element so it can be deleted * when the client goes away. */ diff --git a/xorg-server/composite/compwindow.c b/xorg-server/composite/compwindow.c index 9a6b2da..77bdfa2 100644 --- a/xorg-server/composite/compwindow.c +++ b/xorg-server/composite/compwindow.c @@ -567,10 +567,11 @@ compCreateWindow(WindowPtr pWin) if (pWin->parent && ret) { CompSubwindowsPtr csw = GetCompSubwindows(pWin->parent); CompClientWindowPtr ccw; + PixmapPtr parent_pixmap = (*pScreen->GetWindowPixmap)(pWin->parent); + PixmapPtr window_pixmap = (*pScreen->GetWindowPixmap)(pWin); - (*pScreen->SetWindowPixmap) (pWin, - (*pScreen->GetWindowPixmap) (pWin-> - parent)); + if (window_pixmap != parent_pixmap) + (*pScreen->SetWindowPixmap) (pWin, parent_pixmap); if (csw) for (ccw = csw->clients; ccw; ccw = ccw->next) compRedirectWindow(clients[CLIENT_ID(ccw->id)], diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac index ac68f17..140e33e 100644 --- a/xorg-server/configure.ac +++ b/xorg-server/configure.ac @@ -26,9 +26,9 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.16.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xorg-server) -RELEASE_DATE="2014-07-17" -RELEASE_NAME="Baba Ghanouj" +AC_INIT([xorg-server], 1.16.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] xorg-server) +RELEASE_DATE="2014-10-28" +RELEASE_NAME="Chanterelle" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) @@ -698,6 +698,7 @@ case $host_os in CONFIG_UDEV=no CONFIG_UDEV_KMS=no DGA=no + DRM=no DRI2=no DRI3=no INT10MODULE=no @@ -1993,11 +1994,13 @@ if test "x$XORG" = xyes; then gnu*) XORG_OS_SUBDIR="hurd" ;; + cygwin*) + XORG_OS_SUBDIR="stub" + ;; *) XORG_OS_SUBDIR="stub" AC_MSG_NOTICE([m4_text_wrap(m4_join([ ], - [Your OS is unknown. Xorg currently only supports Linux,], - [Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.], + [Your OS is unknown.], [If you are interested in porting Xorg to your platform,], [please email xorg(a)lists.freedesktop.org.]))]) ;; @@ -2553,6 +2556,7 @@ hw/xfree86/dixmods/Makefile hw/xfree86/doc/Makefile hw/xfree86/dri/Makefile hw/xfree86/dri2/Makefile +hw/xfree86/dri2/pci_ids/Makefile hw/xfree86/drivers/Makefile hw/xfree86/drivers/modesetting/Makefile hw/xfree86/exa/Makefile diff --git a/xorg-server/dbe/dbe.c b/xorg-server/dbe/dbe.c index 8896720..527588c 100644 --- a/xorg-server/dbe/dbe.c +++ b/xorg-server/dbe/dbe.c @@ -1,5 +1,5 @@ /****************************************************************************** - * + * * Copyright (c) 1994, 1995 Hewlett-Packard Company * * Permission is hereby granted, free of charge, to any person obtaining @@ -9,10 +9,10 @@ * 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. @@ -20,12 +20,12 @@ * 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 Hewlett-Packard * Company 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 Hewlett-Packard Company. - * + * * DIX DBE code * *****************************************************************************/ @@ -152,7 +152,7 @@ ProcDbeGetVersion(ClientPtr client) * BadIDChoice - id is out of range for client; id is already in use * BadMatch - window is not an InputOutput window; * visual of window is not on list returned by - * DBEGetVisualInfo; + * DBEGetVisualInfo; * BadValue - invalid swap action is specified * BadWindow - window is not a valid window * Success @@ -835,7 +835,7 @@ SProcDbeGetVersion(ClientPtr client) * BadIDChoice - id is out of range for client; id is already in use * BadMatch - window is not an InputOutput window; * visual of window is not on list returned by - * DBEGetVisualInfo; + * DBEGetVisualInfo; * BadValue - invalid swap action is specified * BadWindow - window is not a valid window * Success @@ -1058,7 +1058,7 @@ SProcDbeDispatch(ClientPtr client) * * TRUE - setup was successful * FALSE - the window's background state is NONE - * + * *****************************************************************************/ static Bool diff --git a/xorg-server/dbe/dbestruct.h b/xorg-server/dbe/dbestruct.h index 2002066..fe2ef0a 100644 --- a/xorg-server/dbe/dbestruct.h +++ b/xorg-server/dbe/dbestruct.h @@ -1,5 +1,5 @@ /****************************************************************************** - * + * * Copyright (c) 1994, 1995 Hewlett-Packard Company * * Permission is hereby granted, free of charge, to any person obtaining @@ -9,10 +9,10 @@ * 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. @@ -20,12 +20,12 @@ * 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 Hewlett-Packard * Company 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 Hewlett-Packard Company. - * + * * Header file for DIX-related DBE * *****************************************************************************/ @@ -139,7 +139,7 @@ typedef struct _DbeWindowPrivRec { * possibly resulting in a page swap and loss of performance. Initially we * will use this array to store buffer IDs. For situations where we have * more IDs than can fit in this static array, we will allocate a larger - * array to use, possibly suffering a performance loss. + * array to use, possibly suffering a performance loss. */ XID initIDs[DBE_INIT_MAX_IDS]; diff --git a/xorg-server/dbe/midbe.c b/xorg-server/dbe/midbe.c index 0479ecc..8f75910 100644 --- a/xorg-server/dbe/midbe.c +++ b/xorg-server/dbe/midbe.c @@ -1,5 +1,5 @@ /****************************************************************************** - * + * * Copyright (c) 1994, 1995 Hewlett-Packard Company * * Permission is hereby granted, free of charge, to any person obtaining @@ -9,10 +9,10 @@ * 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. @@ -20,12 +20,12 @@ * 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 Hewlett-Packard * Company 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 Hewlett-Packard Company. - * + * * Machine-independent DBE code * *****************************************************************************/ @@ -396,7 +396,7 @@ miDbeSwapBuffers(ClientPtr client, int *pNumWindows, DbeSwapInfoPtr swapInfo) * resource deletion easier. It is not guaranteed which delete function is * called first. Hence, we will let miDbeWinPrivDelete() free all DBE * resources. - * + * * This function deletes/frees the following stuff associated with * the window private: * @@ -443,7 +443,7 @@ miDbeWinPrivDelete(DbeWindowPrivPtr pDbeWindowPriv, XID bufId) * * Description: * - * This function was cloned from miMbxPositionWindow() in mimultibuf.c. + * This function was cloned from miMbxPositionWindow() in mimultibuf.c. * This function resizes the buffer when the window is resized. * *****************************************************************************/ diff --git a/xorg-server/dbe/midbe.h b/xorg-server/dbe/midbe.h index 4eed538..67320ea 100644 --- a/xorg-server/dbe/midbe.h +++ b/xorg-server/dbe/midbe.h @@ -8,10 +8,10 @@ * 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. @@ -19,12 +19,12 @@ * 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 Hewlett-Packard * Company 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 Hewlett-Packard Company. - * + * * Header file for users of machine-independent DBE code * *****************************************************************************/ diff --git a/xorg-server/dix/atom.c b/xorg-server/dix/atom.c index 6f85968..22cd0dc 100644 --- a/xorg-server/dix/atom.c +++ b/xorg-server/dix/atom.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/colormap.c b/xorg-server/dix/colormap.c index c1ff88e..4d408d5 100644 --- a/xorg-server/dix/colormap.c +++ b/xorg-server/dix/colormap.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -181,11 +181,11 @@ static void FindColorInRootCmap(ColormapPtr /* pmap */ , #define RGBMASK(vis) (vis->redMask | vis->greenMask | vis->blueMask | ALPHAMASK(vis)) -/* GetNextBitsOrBreak(bits, mask, base) -- +/* GetNextBitsOrBreak(bits, mask, base) -- * (Suggestion: First read the macro, then read this explanation. * * Either generate the next value to OR in to a pixel or break out of this - * while loop + * while loop * * This macro is used when we're trying to generate all 2^n combinations of * bits in mask. What we're doing here is counting in binary, except that @@ -197,11 +197,11 @@ static void FindColorInRootCmap(ColormapPtr /* pmap */ , * base has 1 bit set where the least significant bit of mask is set * * For example,if mask is 01010, base should be 0010 and we count like this: - * 00010 (see this isn't so hard), + * 00010 (see this isn't so hard), * then we add base to bits and get 0100. (bits & ~mask) is (0100 & 0100) so * we add that to bits getting (0100 + 0100) = * 01000 for our next value. - * then we add 0010 to get + * then we add 0010 to get * 01010 and we're done (easy as 1, 2, 3) */ #define GetNextBitsOrBreak(bits, mask, base) \ @@ -225,9 +225,9 @@ typedef struct _colorResource { * fShared should only be set if refcnt == AllocPrivate, and only in red map */ -/** - * Create and initialize the color map - * +/** + * Create and initialize the color map + * * \param mid resource to use for this colormap * \param alloc 1 iff all entries are allocated writable */ @@ -370,7 +370,7 @@ CreateColormap(Colormap mid, ScreenPtr pScreen, VisualPtr pVisual, if (!AddResource(mid, RT_COLORMAP, (void *) pmap)) return BadAlloc; - /* + /* * Security creation/labeling check */ i = XaceHook(XACE_RESOURCE_ACCESS, clients[client], mid, RT_COLORMAP, @@ -1456,7 +1456,7 @@ FreePixels(ColormapPtr pmap, int client) } } -/** +/** * Frees all of a client's colors and cells. * * \param value must conform to DeleteType @@ -1574,7 +1574,7 @@ AllocColorPlanes(int client, ColormapPtr pmap, int colors, /* Allocate the proper pixels */ /* XXX This is sort of bad, because of contig is set, we force all * r + g + b bits to be contiguous. Should only force contiguity - * per mask + * per mask */ ok = AllocPseudo(client, pmap, colors, r + g + b, contig, pixels, &mask, &ppixFirst); @@ -1786,7 +1786,7 @@ AllocPseudo(int client, ColormapPtr pmap, int c, int r, Bool contig, * pixels are the unique pixels. *pMask has the mask to Or with the * unique pixels to get the rest of them. * - * Returns True iff all pixels could be allocated + * Returns True iff all pixels could be allocated * All cells allocated will have refcnt set to AllocPrivate and shared to FALSE * (see AllocShared for why we care) */ @@ -2056,7 +2056,7 @@ AllocShared(ColormapPtr pmap, Pixel * ppix, int c, int r, int g, int b, } /** FreeColors - * Free colors and/or cells (probably slow for large numbers) + * Free colors and/or cells (probably slow for large numbers) */ int FreeColors(ColormapPtr pmap, int client, int count, Pixel * pixels, Pixel mask) @@ -2097,7 +2097,7 @@ FreeColors(ColormapPtr pmap, int client, int count, Pixel * pixels, Pixel mask) /** * Helper for FreeColors -- frees all combinations of *newpixels and mask bits * which the client has allocated in channel colormap cells of pmap. - * doesn't change newpixels if it doesn't need to + * doesn't change newpixels if it doesn't need to * * \param pmap which colormap head * \param color which sub-map, eg, RED, BLUE, PSEUDO diff --git a/xorg-server/dix/cursor.c b/xorg-server/dix/cursor.c index 56c5606..1525857 100644 --- a/xorg-server/dix/cursor.c +++ b/xorg-server/dix/cursor.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index 3fb7ca0..c4fdbe1 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -2622,7 +2622,7 @@ GetPairedDevice(DeviceIntPtr dev) * slave. * - MASTER_KEYBOARD: the master keyboard for this device or NULL for a * floating slave - * - MASTER_POINTER: the master keyboard for this device or NULL for a + * - MASTER_POINTER: the master pointer for this device or NULL for a * floating slave * - POINTER_OR_FLOAT: the master pointer for this device or the device for * a floating slave diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c index 74abecd..d844a09 100644 --- a/xorg-server/dix/dispatch.c +++ b/xorg-server/dix/dispatch.c @@ -26,13 +26,13 @@ Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -364,9 +364,9 @@ Dispatch(void) clientReady[0] = SmartScheduleClient(clientReady, nready); nready = 1; } - /***************** - * Handle events in round robin fashion, doing input between - * each round + /***************** + * Handle events in round robin fashion, doing input between + * each round *****************/ while (!dispatchException && (--nready >= 0)) { @@ -3198,7 +3198,7 @@ ProcChangeAccessControl(ClientPtr client) /********************* * CloseDownRetainedResources * - * Find all clients that are gone and have terminated in RetainTemporary + * Find all clients that are gone and have terminated in RetainTemporary * and destroy their resources. *********************/ diff --git a/xorg-server/dix/dispatch.h b/xorg-server/dix/dispatch.h index 3f3f3a2..939a6b9 100644 --- a/xorg-server/dix/dispatch.h +++ b/xorg-server/dix/dispatch.h @@ -26,7 +26,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. /* * This prototypes the dispatch.c module (except for functions declared in * global headers), plus related dispatch procedures from devices.c, events.c, - * extension.c, property.c. + * extension.c, property.c. */ #ifdef HAVE_DIX_CONFIG_H diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c index 1c6442c..bc2732f 100644 --- a/xorg-server/dix/dixfonts.c +++ b/xorg-server/dix/dixfonts.c @@ -806,7 +806,7 @@ ListFonts(ClientPtr client, unsigned char *pattern, unsigned length, int i; LFclosurePtr c; - /* + /* * The right error to return here would be BadName, however the * specification does not allow for a Name error on this request. * Perhaps a better solution would be to return a nil list, i.e. @@ -1057,7 +1057,7 @@ StartListFontsWithInfo(ClientPtr client, int length, unsigned char *pattern, int i; LFWIclosurePtr c; - /* + /* * The right error to return here would be BadName, however the * specification does not allow for a Name error on this request. * Perhaps a better solution would be to return a nil list, i.e. @@ -1851,7 +1851,7 @@ GetClientResolutions(int *num) pScreen = screenInfo.screens[0]; res.x_resolution = (pScreen->width * 25.4) / pScreen->mmWidth; /* - * XXX - we'll want this as long as bitmap instances are prevalent + * XXX - we'll want this as long as bitmap instances are prevalent so that we can match them from scalable fonts */ if (res.x_resolution < 88) diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c index cdd370b..205550e 100644 --- a/xorg-server/dix/dixutils.c +++ b/xorg-server/dix/dixutils.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -352,7 +352,7 @@ DeleteWindowFromAnySaveSet(WindowPtr pWin) /* No-op Don't Do Anything : sometimes we need to be able to call a procedure * that doesn't do anything. For example, on screen with only static * colormaps, if someone calls install colormap, it's easier to have a dummy - * procedure to call than to check if there's a procedure + * procedure to call than to check if there's a procedure */ void NoopDDA(void) @@ -373,7 +373,7 @@ static Bool inHandler; static Bool handlerDeleted; /** - * + * * \param pTimeout DIX doesn't want to know how OS represents time * \param pReadMask nor how it represents the det of descriptors */ diff --git a/xorg-server/dix/extension.c b/xorg-server/dix/extension.c index e43291e..56e3abc 100644 --- a/xorg-server/dix/extension.c +++ b/xorg-server/dix/extension.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/gc.c b/xorg-server/dix/gc.c index 88d6501..78f3be2 100644 --- a/xorg-server/dix/gc.c +++ b/xorg-server/dix/gc.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -87,22 +87,22 @@ ValidateGC(DrawablePtr pDraw, GC * pGC) * specified. ddxen can call this too; they should normally pass * NullClient for the client since any access checking should have * already been done at a higher level. - * + * * If you have any XIDs, you must use ChangeGCXIDs: - * + * * CARD32 v[2]; * v[0] = FillTiled; * v[1] = pid; * ChangeGCXIDs(client, pGC, GCFillStyle|GCTile, v); - * + * * However, if you need to pass a pointer to a pixmap or font, you must * use ChangeGC: - * + * * ChangeGCVal v[2]; * v[0].val = FillTiled; * v[1].ptr = pPixmap; * ChangeGC(client, pGC, GCFillStyle|GCTile, v); - * + * * If you have neither XIDs nor pointers, you can use either function, * but ChangeGC will do less work. * @@ -495,7 +495,6 @@ NewGCObject(ScreenPtr pScreen, int depth) pGC->graphicsExposures = TRUE; pGC->clipOrg.x = 0; pGC->clipOrg.y = 0; - pGC->clientClipType = CT_NONE; pGC->clientClip = (void *) NULL; pGC->numInDashList = 2; pGC->dash = DefaultDash; @@ -791,7 +790,7 @@ since we can't create them without already having a GC. any code using the tile or stipple has to set them explicitly anyway, since the state of the scratch gc is unknown. This is OK because ChangeGC() has to be able to deal with NULL tiles and -stipples anyway (in case the CreateGC() call has provided a +stipples anyway (in case the CreateGC() call has provided a value for them -- we can't set the default tile until the client-supplied attributes are installed, since the fgPixel is what fills the default tile. (maybe this comment should @@ -1033,7 +1032,7 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects, } /* - sets reasonable defaults + sets reasonable defaults if we can get a pre-allocated one, use it and mark it as used. if we can't, create one out of whole cloth (The Velveteen GC -- if you use it often enough it will become real.) @@ -1067,7 +1066,7 @@ GetScratchGC(unsigned depth, ScreenPtr pScreen) pGC->graphicsExposures = FALSE; pGC->clipOrg.x = 0; pGC->clipOrg.y = 0; - if (pGC->clientClipType != CT_NONE) + if (pGC->clientClip) (*pGC->funcs->ChangeClip) (pGC, CT_NONE, NULL, 0); pGC->stateChanges = GCAllBits; return pGC; diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index ffa89fa..dd96265 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -1248,8 +1248,8 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask) double x, y, ox, oy; int has_x, has_y; - has_x = valuator_mask_fetch_double(mask, 0, &ox); - has_y = valuator_mask_fetch_double(mask, 1, &oy); + has_x = valuator_mask_isset(mask, 0); + has_y = valuator_mask_isset(mask, 1); if (!has_x && !has_y) return; @@ -1263,23 +1263,23 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask) pixman_f_transform_invert(&invert, &dev->scale_and_transform); transform(&invert, &ox, &oy); - - x = ox; - y = oy; } - if (valuator_mask_isset(mask, 0)) - ox = x = valuator_mask_get_double(mask, 0); + if (has_x) + ox = valuator_mask_get_double(mask, 0); - if (valuator_mask_isset(mask, 1)) - oy = y = valuator_mask_get_double(mask, 1); + if (has_y) + oy = valuator_mask_get_double(mask, 1); + + x = ox; + y = oy; transform(&dev->scale_and_transform, &x, &y); - if (valuator_mask_isset(mask, 0) || ox != x) + if (has_x || ox != x) valuator_mask_set_double(mask, 0, x); - if (valuator_mask_isset(mask, 1) || oy != y) + if (has_y || oy != y) valuator_mask_set_double(mask, 1, y); } diff --git a/xorg-server/dix/globals.c b/xorg-server/dix/globals.c index eaa2afe..f36a938 100644 --- a/xorg-server/dix/globals.c +++ b/xorg-server/dix/globals.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/glyphcurs.c b/xorg-server/dix/glyphcurs.c index 5404025..eca6a4c 100644 --- a/xorg-server/dix/glyphcurs.c +++ b/xorg-server/dix/glyphcurs.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/grabs.c b/xorg-server/dix/grabs.c index e3fc38b..b92f1e7 100644 --- a/xorg-server/dix/grabs.c +++ b/xorg-server/dix/grabs.c @@ -28,13 +28,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -419,9 +419,9 @@ GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab) /** * Compares two grabs and returns TRUE if the first grab matches the second - * grab. - * - * A match is when + * grab. + * + * A match is when * - the devices set for the grab are equal (this is optional). * - the event types for both grabs are equal. * - XXX @@ -522,7 +522,7 @@ GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab) * Any previously existing grab that matches the new grab will be removed. * Adding a new grab that would override another client's grab will result in * a BadAccess. - * + * * @return Success or X error code on failure. */ int diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c index e5bcc31..5c2a32d 100644 --- a/xorg-server/dix/inpututils.c +++ b/xorg-server/dix/inpututils.c @@ -239,8 +239,10 @@ build_modmap_from_modkeymap(CARD8 *modmap, KeyCode *modkeymap, if (!modkeymap[i]) continue; +#if MAP_LENGTH < 256 if (modkeymap[i] >= MAP_LENGTH) return BadValue; +#endif if (modmap[modkeymap[i]]) return BadValue; diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 930a85f..09f9504 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/property.c b/xorg-server/dix/property.c index 9f51cd0..ff7f31a 100644 --- a/xorg-server/dix/property.c +++ b/xorg-server/dix/property.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/region.c b/xorg-server/dix/region.c index 15f3d01..ce1014e 100644 --- a/xorg-server/dix/region.c +++ b/xorg-server/dix/region.c @@ -21,20 +21,20 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Except as contained in this notice, the name of The Open Group 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 Open Group. - -Copyright 1987, 1988, 1989 by -Digital Equipment Corporation, Maynard, Massachusetts. + +Copyright 1987, 1988, 1989 by +Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -118,9 +118,9 @@ Equipment Corporation. * there is no separate list of band start pointers. * * The y-x band representation does not minimize rectangles. In particular, - * if a rectangle vertically crosses a band (the rectangle has scanlines in + * if a rectangle vertically crosses a band (the rectangle has scanlines in * the y1 to y2 area spanned by the band), then the rectangle may be broken - * down into two or more smaller rectangles stacked one atop the other. + * down into two or more smaller rectangles stacked one atop the other. * * ----------- ----------- * | | | | band 0 @@ -944,7 +944,7 @@ RegionUnionO(RegionPtr pReg, /*- *----------------------------------------------------------------------- * RegionAppend -- - * + * * "Append" the rgn rectangles onto the end of dstrgn, maintaining * knowledge of YX-banding when it's easy. Otherwise, dstrgn just * becomes a non-y-x-banded random collection of rectangles, and not @@ -1099,7 +1099,7 @@ QuickSortRects(BoxRec rects[], int numRects) /*- *----------------------------------------------------------------------- * RegionValidate -- - * + * * Take a ``region'' which is a non-y-x-banded random collection of * rectangles, and compute a nice region which is the union of all the * rectangles. diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c index c254244..26debdb 100644 --- a/xorg-server/dix/resource.c +++ b/xorg-server/dix/resource.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -101,7 +101,7 @@ Equipment Corporation. * FreeAllResources, LookupIDByType, LookupIDByClass, GetXIDRange */ -/* +/* * A resource ID is a 32 bit quantity, the upper 2 bits of which are * off-limits for client-visible resources. The next 8 bits are * used as client ID, and the low 22 bits come from the client. @@ -725,7 +725,7 @@ GetXIDRange(int client, Bool server, XID *minp, XID *maxp) /** * GetXIDList is called by the XC-MISC extension's MiscGetXIDList function. - * This function tries to find count unused XIDs for the given client. It + * This function tries to find count unused XIDs for the given client. It * puts the IDs in the array pids and returns the number found, which should * almost always be the number requested. * @@ -1118,8 +1118,8 @@ FreeClientResources(ClientPtr client) resources = clientTable[client->index].resources; for (j = 0; j < clientTable[client->index].buckets; j++) { /* It may seem silly to update the head of this resource list as - we delete the members, since the entire list will be deleted any way, - but there are some resource deletion functions "FreeClientPixels" for + we delete the members, since the entire list will be deleted any way, + but there are some resource deletion functions "FreeClientPixels" for one which do a LookupID on another resource id (a Colormap id in this case), so the resource list must be kept valid up to the point that it is deleted, so every time we delete a resource, we must update the diff --git a/xorg-server/dix/selection.c b/xorg-server/dix/selection.c index e905b1e..4e994b1 100644 --- a/xorg-server/dix/selection.c +++ b/xorg-server/dix/selection.c @@ -26,13 +26,13 @@ Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -176,7 +176,7 @@ ProcSetSelectionOwner(ClientPtr client) if (rc == Success) { /* If the timestamp in client's request is in the past relative to the time stamp indicating the last time the owner of the - selection was set, do not set the selection, just return + selection was set, do not set the selection, just return success. */ if (CompareTimeStamps(time, pSel->lastTimeChanged) == EARLIER) return Success; diff --git a/xorg-server/dix/swaprep.c b/xorg-server/dix/swaprep.c index 559fe27..905fef7 100644 --- a/xorg-server/dix/swaprep.c +++ b/xorg-server/dix/swaprep.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/swapreq.c b/xorg-server/dix/swapreq.c index 0f6d49e..61d3ce0 100644 --- a/xorg-server/dix/swapreq.c +++ b/xorg-server/dix/swapreq.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/tables.c b/xorg-server/dix/tables.c index 686cddd..88b372e 100644 --- a/xorg-server/dix/tables.c +++ b/xorg-server/dix/tables.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index d43ef03..d49276c 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -49,13 +49,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts, All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -135,7 +135,7 @@ Equipment Corporation. #include <X11/Xatom.h> /* must come after server includes */ /****** - * Window stuff for server + * Window stuff for server * * CreateRootWindow, CreateWindow, ChangeWindowAttributes, * GetWindowAttributes, DeleteWindow, DestroySubWindows, @@ -633,7 +633,7 @@ RealChildHead(WindowPtr pWin) /***** * CreateWindow - * Makes a window in response to client request + * Makes a window in response to client request *****/ WindowPtr @@ -1038,10 +1038,10 @@ SetRootWindowBackground(WindowPtr pWin, ScreenPtr pScreen, Mask *index2) /***** * ChangeWindowAttributes - * + * * The value-mask specifies which attributes are to be changed; the * value-list contains one value for each one bit in the mask, from least - * to most significant bit in the mask. + * to most significant bit in the mask. *****/ int @@ -1459,8 +1459,8 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) /* We SHOULD check for an error value here XXX */ (*pScreen->ChangeWindowAttributes) (pWin, vmaskCopy); - /* - If the border contents have changed, redraw the border. + /* + If the border contents have changed, redraw the border. Note that this has to be done AFTER pScreen->ChangeWindowAttributes for the tile to be rotated, and the correct function selected. */ @@ -1814,7 +1814,7 @@ ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh) /* * IsSiblingAboveMe - * returns Above if pSib above pMe in stack or Below otherwise + * returns Above if pSib above pMe in stack or Below otherwise */ static int @@ -1914,7 +1914,7 @@ IOverlapAnyWindow(WindowPtr pWin, BoxPtr box) } /* - * WhereDoIGoInTheStack() + * WhereDoIGoInTheStack() * Given pWin and pSib and the relationshipe smode, return * the window that pWin should go ABOVE. * If a pSib is specified: @@ -1922,7 +1922,7 @@ IOverlapAnyWindow(WindowPtr pWin, BoxPtr box) * Below: pWin is placed just below pSib * TopIf: if pSib occludes pWin, then pWin is placed * at the top of the stack - * BottomIf: if pWin occludes pSib, then pWin is + * BottomIf: if pWin occludes pSib, then pWin is * placed at the bottom of the stack * Opposite: if pSib occludes pWin, then pWin is placed at the * top of the stack, else if pWin occludes pSib, then @@ -2316,7 +2316,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client) * For RaiseLowest, raises the lowest mapped child (if any) that is * obscured by another child to the top of the stack. For LowerHighest, * lowers the highest mapped child (if any) that is obscuring another - * child to the bottom of the stack. Exposure processing is performed + * child to the bottom of the stack. Exposure processing is performed * ******/ @@ -3243,7 +3243,7 @@ CheckWindowOptionalNeed(WindowPtr w) return; if (optional->userProps != NULL) return; - if (optional->backingBitPlanes != ~0L) + if (optional->backingBitPlanes != (CARD32)~0L) return; if (optional->backingPixel != 0) return; @@ -3327,9 +3327,9 @@ MakeWindowOptional(WindowPtr pWin) * changing the window cursor (e.g. using XDefineCursor()) will not have any * visible effect. Only when one of the device cursors is set to None again, * this device's cursor will display the changed standard cursor. - * + * * CursorIsNone of the window struct is NOT modified if you set a device - * cursor. + * cursor. * * Assumption: If there is a node for a device in the list, the device has a * cursor. If the cursor is set to None, it is inherited by the parent. @@ -3424,7 +3424,7 @@ ChangeWindowDeviceCursor(WindowPtr pWin, DeviceIntPtr pDev, CursorPtr pCursor) if (pOldCursor) FreeCursor(pOldCursor, (Cursor) 0); - /* FIXME: We SHOULD check for an error value here XXX + /* FIXME: We SHOULD check for an error value here XXX (comment taken from ChangeWindowAttributes) */ (*pScreen->ChangeWindowAttributes) (pWin, CWCursor); @@ -3491,7 +3491,7 @@ WindowSeekDeviceCursor(WindowPtr pWin, } /* Return True if a parent has the same device cursor set or False if - * otherwise + * otherwise */ static Bool WindowParentHasDeviceCursor(WindowPtr pWin, diff --git a/xorg-server/exa/exa.c b/xorg-server/exa/exa.c index a2995db..51d36f3 100644 --- a/xorg-server/exa/exa.c +++ b/xorg-server/exa/exa.c @@ -719,7 +719,7 @@ ExaBlockHandler(ScreenPtr pScreen, void *pTimeout, if (pExaScr->info->flags & EXA_HANDLES_PIXMAPS) return; - /* Try and keep the offscreen memory area tidy every now and then (at most + /* Try and keep the offscreen memory area tidy every now and then (at most * once per second) when the server has been idle for at least 100ms. */ if (pExaScr->numOffscreenAvailable > 1) { diff --git a/xorg-server/exa/exa.h b/xorg-server/exa/exa.h index 98d094d..949ea3a 100644 --- a/xorg-server/exa/exa.h +++ b/xorg-server/exa/exa.h @@ -233,7 +233,7 @@ typedef struct _ExaDriver { * @{ */ /** - * PrepareCopy() sets up the driver for doing a copy within video + * PrepareCopy() sets up the driver for doing a copy within video * memory. * * @param pSrcPixmap source pixmap @@ -471,7 +471,7 @@ typedef struct _ExaDriver { * UploadToScreen() can aid in pixmap migration, but is most important for * the performance of exaGlyphs() (antialiased font drawing) by allowing * pipelining of data uploads, avoiding a sync of the card after each glyph. - * + * * @return TRUE if the driver successfully uploaded the data. FALSE * indicates that EXA should fall back to doing the upload in software. * @@ -512,7 +512,7 @@ typedef struct _ExaDriver { * migration, which is the read from framebuffer when evicting pixmaps from * framebuffer memory. Thus, it is highly recommended, even though * implementations are typically complicated. - * + * * @return TRUE if the driver successfully downloaded the data. FALSE * indicates that EXA should fall back to doing the download in software. * @@ -704,7 +704,7 @@ typedef struct _ExaDriver { * @{ */ /** - * EXA_OFFSCREEN_PIXMAPS indicates to EXA that the driver can support + * EXA_OFFSCREEN_PIXMAPS indicates to EXA that the driver can support * offscreen pixmaps. */ #define EXA_OFFSCREEN_PIXMAPS (1 << 0) diff --git a/xorg-server/exa/exa_accel.c b/xorg-server/exa/exa_accel.c index 9c742bd..5aa7d10 100644 --- a/xorg-server/exa/exa_accel.c +++ b/xorg-server/exa/exa_accel.c @@ -413,7 +413,7 @@ exaHWCopyNtoN(DrawablePtr pSrcDrawable, if (!pGC || !exaGCReadsDestination(pDstDrawable, pGC->planemask, pGC->fillStyle, pGC->alu, - pGC->clientClipType)) { + pGC->clientClip != NULL)) { dstregion = RegionCreate(NullBox, 0); RegionCopy(dstregion, srcregion); RegionTranslate(dstregion, dst_off_x - dx - src_off_x, @@ -771,7 +771,7 @@ exaPolySegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSeg) static Bool exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, CARD32 planemask, CARD32 alu, - unsigned int clientClipType); + Bool hasClientClip); static void exaPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, xRectangle *prect) @@ -816,11 +816,11 @@ exaPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, xRectangle *prect) if (((pGC->fillStyle == FillSolid || pGC->tileIsPixel) && exaFillRegionSolid(pDrawable, pReg, pGC->fillStyle == FillSolid ? pGC->fgPixel : pGC->tile.pixel, pGC->planemask, - pGC->alu, pGC->clientClipType)) || + pGC->alu, pGC->clientClip != NULL)) || (pGC->fillStyle == FillTiled && !pGC->tileIsPixel && exaFillRegionTiled(pDrawable, pReg, pGC->tile.pixmap, &pGC->patOrg, pGC->planemask, pGC->alu, - pGC->clientClipType))) { + pGC->clientClip != NULL))) { goto out; } } @@ -990,7 +990,7 @@ exaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) static Bool exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, - CARD32 planemask, CARD32 alu, unsigned int clientClipType) + CARD32 planemask, CARD32 alu, Bool hasClientClip) { ExaScreenPriv(pDrawable->pScreen); PixmapPtr pPixmap = exaGetDrawablePixmap(pDrawable); @@ -1013,8 +1013,7 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, pixmaps[0].pPix = pPixmap; pixmaps[0].pReg = exaGCReadsDestination(pDrawable, planemask, FillSolid, alu, - clientClipType) ? NULL : - pRegion; + hasClientClip) ? NULL : pRegion; exaDoMigration(pixmaps, 1, TRUE); } @@ -1074,7 +1073,7 @@ exaFillRegionSolid(DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, Bool exaFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu, - unsigned int clientClipType) + Bool hasClientClip) { ExaScreenPriv(pDrawable->pScreen); PixmapPtr pPixmap; @@ -1096,7 +1095,7 @@ exaFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, if (tileWidth == 1 && tileHeight == 1) return exaFillRegionSolid(pDrawable, pRegion, exaGetPixmapFirstPixel(pTile), planemask, - alu, clientClipType); + alu, hasClientClip); pPixmap = exaGetDrawablePixmap(pDrawable); pExaPixmap = ExaGetPixmapPriv(pPixmap); @@ -1113,8 +1112,7 @@ exaFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, pixmaps[0].pPix = pPixmap; pixmaps[0].pReg = exaGCReadsDestination(pDrawable, planemask, FillTiled, alu, - clientClipType) ? NULL : - pRegion; + hasClientClip) ? NULL : pRegion; pixmaps[1].as_dst = FALSE; pixmaps[1].as_src = TRUE; pixmaps[1].pPix = pTile; diff --git a/xorg-server/exa/exa_glyphs.c b/xorg-server/exa/exa_glyphs.c index aa71b21..41f3694 100644 --- a/xorg-server/exa/exa_glyphs.c +++ b/xorg-server/exa/exa_glyphs.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL Red Hat * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -33,7 +33,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Owen Taylor <otaylor(a)fishsoup.net> @@ -318,8 +318,8 @@ exaGlyphCacheHashRemove(ExaGlyphCachePtr cache, int pos) * are: * * | XXXXXXXXXX | - * i j - * + * i j + * * |XXX XXXX| * j i * diff --git a/xorg-server/exa/exa_priv.h b/xorg-server/exa/exa_priv.h index 88bfd37..ca4db72 100644 --- a/xorg-server/exa/exa_priv.h +++ b/xorg-server/exa/exa_priv.h @@ -455,12 +455,11 @@ ExaCheckAddTraps(PicturePtr pPicture, static _X_INLINE Bool exaGCReadsDestination(DrawablePtr pDrawable, unsigned long planemask, unsigned int fillStyle, unsigned char alu, - unsigned int clientClipType) + Bool clientClip) { return ((alu != GXcopy && alu != GXclear && alu != GXset && alu != GXcopyInverted) || fillStyle == FillStippled || - clientClipType != CT_NONE || - !EXA_PM_IS_SOLID(pDrawable, planemask)); + clientClip != FALSE || !EXA_PM_IS_SOLID(pDrawable, planemask)); } void @@ -470,7 +469,7 @@ Bool exaFillRegionTiled(DrawablePtr pDrawable, RegionPtr pRegion, PixmapPtr pTile, DDXPointPtr pPatOrg, CARD32 planemask, CARD32 alu, - unsigned int clientClipType); + Bool clientClip); void diff --git a/xorg-server/exa/exa_render.c b/xorg-server/exa/exa_render.c index c4edf40..e3e5526 100644 --- a/xorg-server/exa/exa_render.c +++ b/xorg-server/exa/exa_render.c @@ -559,7 +559,7 @@ exaCompositeRects(CARD8 op, box.y2 = y2 < MAXSHORT ? y2 : MAXSHORT; /* The pixmap migration code relies on pendingDamage indicating - * the bounds of the current rendering, so we need to force + * the bounds of the current rendering, so we need to force * the actual damage into that region before we do anything, and * (see use of DamagePendingRegion in exaCopyDirty) */ @@ -613,7 +613,7 @@ exaCompositeRects(CARD8 op, /************************************************************/ if (!pMask) { - /* Now we have to flush the damage out from pendingDamage => damage + /* Now we have to flush the damage out from pendingDamage => damage * Calling DamageRegionProcessPending has that effect. */ diff --git a/xorg-server/exa/exa_unaccel.c b/xorg-server/exa/exa_unaccel.c index b0c6344..73eada9 100644 --- a/xorg-server/exa/exa_unaccel.c +++ b/xorg-server/exa/exa_unaccel.c @@ -107,7 +107,7 @@ ExaCheckPutImage(DrawablePtr pDrawable, GCPtr pGC, int depth, EXA_FALLBACK(("to %p (%c)\n", pDrawable, exaDrawableLocation(pDrawable))); if (!pExaScr->prepare_access_reg || !pExaPixmap->pDamage || exaGCReadsDestination(pDrawable, pGC->planemask, pGC->fillStyle, - pGC->alu, pGC->clientClipType)) + pGC->alu, pGC->clientClip != NULL)) exaPrepareAccess(pDrawable, EXA_PREPARE_DEST); else pExaScr->prepare_access_reg(pPixmap, EXA_PREPARE_DEST, @@ -143,7 +143,7 @@ ExaCheckCopyNtoN(DrawablePtr pSrc, DrawablePtr pDst, GCPtr pGC, if (pExaScr->prepare_access_reg && !exaGCReadsDestination(pDst, pGC->planemask, pGC->fillStyle, - pGC->alu, pGC->clientClipType) && + pGC->alu, pGC->clientClip != NULL) && RegionInitBoxes(&reg, pbox, nbox)) { PixmapPtr pPixmap = exaGetDrawablePixmap(pDst); @@ -179,10 +179,9 @@ ExaFallbackPrepareReg(DrawablePtr pDrawable, ExaScreenPriv(pScreen); if (pExaScr->prepare_access_reg && - !(checkReads && exaGCReadsDestination(pDrawable, - pGC->planemask, - pGC->fillStyle, - pGC->alu, pGC->clientClipType))) { + !(checkReads && exaGCReadsDestination(pDrawable, pGC->planemask, + pGC->fillStyle, pGC->alu, + pGC->clientClip != NULL))) { BoxRec box; RegionRec reg; int xoff, yoff; diff --git a/xorg-server/fb/Makefile.am b/xorg-server/fb/Makefile.am index 752eabe..65b5d94 100644 --- a/xorg-server/fb/Makefile.am +++ b/xorg-server/fb/Makefile.am @@ -44,8 +44,6 @@ libfb_la_SOURCES = \ fbseg.c \ fbsetsp.c \ fbsolid.c \ - fbstipple.c \ - fbtile.c \ fbtrap.c \ fbutil.c \ fbwindow.c diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h index d176bb3..ab110f3 100644 --- a/xorg-server/fb/fb.h +++ b/xorg-server/fb/fb.h @@ -83,11 +83,7 @@ #define FB_SHIFT LOG2_BITMAP_PAD #endif -#if FB_SHIFT < LOG2_BITMAP_PAD -error FB_SHIFT must be >= LOG2_BITMAP_PAD -#endif #define FB_UNIT (1 << FB_SHIFT) -#define FB_HALFUNIT (1 << (FB_SHIFT-1)) #define FB_MASK (FB_UNIT - 1) #define FB_ALLONES ((FbBits) -1) #if GLYPHPADBYTES != 4 @@ -105,37 +101,15 @@ error FB_SHIFT must be >= LOG2_BITMAP_PAD #define FbStipStrideToBitsStride(s) (((s) >> (FB_SHIFT - FB_STIP_SHIFT))) #define FbBitsStrideToStipStride(s) (((s) << (FB_SHIFT - FB_STIP_SHIFT))) #define FbFullMask(n) ((n) == FB_UNIT ? FB_ALLONES : ((((FbBits) 1) << n) - 1)) -#if FB_SHIFT == 6 -#ifdef WIN32 -typedef unsigned __int64 FbBits; -#else -#if defined(__alpha__) || defined(__alpha) || \ - defined(ia64) || defined(__ia64__) || \ - defined(__sparc64__) || defined(_LP64) || \ - defined(__s390x__) || \ - defined(amd64) || defined (__amd64__) || \ - defined (__powerpc64__) -typedef unsigned long FbBits; -#else -typedef unsigned long long FbBits; -#endif -#endif -#endif #if FB_SHIFT == 5 typedef CARD32 FbBits; -#endif - -#if FB_SHIFT == 4 -typedef CARD16 FbBits; +#else +#error "Unsupported FB_SHIFT" #endif #if LOG2_BITMAP_PAD == FB_SHIFT typedef FbBits FbStip; -#else -#if LOG2_BITMAP_PAD == 5 -typedef CARD32 FbStip; -#endif #endif typedef int FbStride; @@ -264,122 +238,8 @@ extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data); n >>= FB_SHIFT; \ } -#if FB_SHIFT == 6 -#define FbDoLeftMaskByteRRop6Cases(dst,xor) \ - case (sizeof (FbBits) - 7) | (1 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 7) | (2 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 7) | (3 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 7) | (4 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 7) | (5 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 7) | (6 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 7): \ - FbStorePart(dst,sizeof (FbBits) - 7,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \ - break; \ - case (sizeof (FbBits) - 6) | (1 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 6) | (2 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 6) | (3 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 6) | (4 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 6) | (5 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 6): \ - FbStorePart(dst,sizeof (FbBits) - 6,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \ - break; \ - case (sizeof (FbBits) - 5) | (1 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 5) | (2 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 5) | (3 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 5) | (4 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 5): \ - FbStorePart(dst,sizeof (FbBits) - 5,CARD8,xor); \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \ - break; \ - case (sizeof (FbBits) - 4) | (1 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 4) | (2 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - break; \ - case (sizeof (FbBits) - 4) | (3 << (FB_SHIFT - 3)): \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD16,xor); \ - FbStorePart(dst,sizeof (FbBits) - 2,CARD8,xor); \ - break; \ - case (sizeof (FbBits) - 4): \ - FbStorePart(dst,sizeof (FbBits) - 4,CARD32,xor); \ - break; - -#define FbDoRightMaskByteRRop6Cases(dst,xor) \ - case 4: \ - FbStorePart(dst,0,CARD32,xor); \ - break; \ - case 5: \ - FbStorePart(dst,0,CARD32,xor); \ - FbStorePart(dst,4,CARD8,xor); \ - break; \ - case 6: \ - FbStorePart(dst,0,CARD32,xor); \ - FbStorePart(dst,4,CARD16,xor); \ - break; \ - case 7: \ - FbStorePart(dst,0,CARD32,xor); \ - FbStorePart(dst,4,CARD16,xor); \ - FbStorePart(dst,6,CARD8,xor); \ - break; -#else -#define FbDoLeftMaskByteRRop6Cases(dst,xor) -#define FbDoRightMaskByteRRop6Cases(dst,xor) -#endif - #define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \ switch (lb) { \ - FbDoLeftMaskByteRRop6Cases(dst,xor) \ case (sizeof (FbBits) - 3) | (1 << (FB_SHIFT - 3)): \ FbStorePart(dst,sizeof (FbBits) - 3,CARD8,xor); \ break; \ @@ -416,7 +276,6 @@ extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data); FbStorePart(dst,0,CARD16,xor); \ FbStorePart(dst,2,CARD8,xor); \ break; \ - FbDoRightMaskByteRRop6Cases(dst,xor) \ default: \ WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, r)); \ } \ @@ -470,21 +329,7 @@ extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data); FbLaneCase2((n)>>2,a,(o)+2) \ } -#define FbLaneCase8(n,a,o) \ - if ((n) == 0x0ff) { \ - *(FbBits *) ((a)+(o)) = fgxor; \ - } else { \ - FbLaneCase4((n)&15,a,o) \ - FbLaneCase4((n)>>4,a,(o)+4) \ - } - -#if FB_SHIFT == 6 -#define FbLaneCase(n,a) FbLaneCase8(n,(CARD8 *) (a),0) -#endif - -#if FB_SHIFT == 5 #define FbLaneCase(n,a) FbLaneCase4(n,(CARD8 *) (a),0) -#endif /* Rotate a filled pixel value to the specified alignement */ #define FbRot24(p,b) (FbScrRight(p,b) | FbScrLeft(p,24-(b))) @@ -497,19 +342,6 @@ extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data); #define FbPrev24Stip(p) (FbRot24(p,FB_STIP_UNIT%24)) /* step a rotation value to the next/previous rotation value */ -#if FB_UNIT == 64 -#define FbNext24Rot(r) ((r) == 16 ? 0 : (r) + 8) -#define FbPrev24Rot(r) ((r) == 0 ? 16 : (r) - 8) - -#if IMAGE_BYTE_ORDER == MSBFirst -#define FbFirst24Rot(x) (((x) + 8) % 24) -#else -#define FbFirst24Rot(x) ((x) % 24) -#endif - -#endif - -#if FB_UNIT == 32 #define FbNext24Rot(r) ((r) == 0 ? 16 : (r) - 8) #define FbPrev24Rot(r) ((r) == 16 ? 0 : (r) + 8) @@ -518,7 +350,6 @@ extern _X_EXPORT void fbSetBits(FbStip * bits, int stride, FbStip data); #else #define FbFirst24Rot(x) ((x) % 24) #endif -#endif #define FbNext24RotStip(r) ((r) == 0 ? 16 : (r) - 8) #define FbPrev24RotStip(r) ((r) == 16 ? 0 : (r) + 8) @@ -621,7 +452,6 @@ typedef struct { FbBits bgand, bgxor; /* for stipples */ FbBits fg, bg, pm; /* expanded and filled */ unsigned int dashLength; /* total of all dash elements */ - unsigned char evenStipple; /* stipple is even */ unsigned char bpp; /* current drawable bpp */ } FbGCPrivRec, *FbGCPrivPtr; @@ -714,11 +544,6 @@ typedef struct { * Accelerated tiles are power of 2 width <= FB_UNIT */ #define FbEvenTile(w) ((w) <= FB_UNIT && FbPowerOfTwo(w)) -/* - * Accelerated stipples are power of 2 width and <= FB_UNIT/dstBpp - * with dstBpp a power of 2 as well - */ -#define FbEvenStip(w,bpp) ((w) * (bpp) <= FB_UNIT && FbPowerOfTwo(w) && FbPowerOfTwo(bpp)) /* * fb24_32.c @@ -925,13 +750,6 @@ fbArc24(FbBits * dst, int dstBpp, xArc * arc, int dx, int dy, FbBits and, FbBits xor); extern _X_EXPORT void - -fbGlyph24(FbBits * dstLine, - FbStride dstStride, - int dstBpp, FbStip * stipple, FbBits fg, int height, int shift); - -extern _X_EXPORT void - fbPolyline24(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ptsOrig); @@ -1220,9 +1038,6 @@ fbGetSpans(DrawablePtr pDrawable, * fbglyph.c */ -extern _X_EXPORT Bool - fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height); - extern _X_EXPORT void fbPolyGlyphBlt(DrawablePtr pDrawable, @@ -1283,15 +1098,6 @@ fbGetImage(DrawablePtr pDrawable, */ extern _X_EXPORT void - -fbZeroLine(DrawablePtr pDrawable, - GCPtr pGC, int mode, int npt, DDXPointPtr ppt); - -extern _X_EXPORT void - fbZeroSegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSegs); - -extern _X_EXPORT void - fbPolyLine(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ppt); @@ -1339,36 +1145,12 @@ extern _X_EXPORT RegionPtr extern _X_EXPORT void -fbDots(FbBits * dstOrig, - FbStride dstStride, - int dstBpp, - BoxPtr pBox, - xPoint * pts, - int npt, - int xorg, int yorg, int xoff, int yoff, FbBits andOrig, FbBits xorOrig); - -extern _X_EXPORT void - fbPolyPoint(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, xPoint * pptInit); /* * fbpush.c */ -extern _X_EXPORT void - -fbPushPattern(DrawablePtr pDrawable, - GCPtr pGC, - FbStip * src, - FbStride srcStride, - int srcX, int x, int y, int width, int height); - -extern _X_EXPORT void - -fbPushFill(DrawablePtr pDrawable, - GCPtr pGC, - FbStip * src, - FbStride srcStride, int srcX, int x, int y, int width, int height); extern _X_EXPORT void @@ -1462,34 +1244,20 @@ typedef void FbBres(DrawablePtr pDrawable, int signdy, int axis, int x, int y, int e, int e1, int e3, int len); -extern _X_EXPORT FbBres fbBresSolid, fbBresDash, fbBresFill, fbBresFillDash; +extern _X_EXPORT void +fbSegment(DrawablePtr pDrawable, + GCPtr pGC, + int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset); /* * fbsetsp.c */ extern _X_EXPORT void - fbSetSpans(DrawablePtr pDrawable, GCPtr pGC, char *src, DDXPointPtr ppt, int *pwidth, int nspans, int fSorted); -extern _X_EXPORT FbBres *fbSelectBres(DrawablePtr pDrawable, GCPtr pGC); - -extern _X_EXPORT void - -fbBres(DrawablePtr pDrawable, - GCPtr pGC, - int dashOffset, - int signdx, - int signdy, int axis, int x, int y, int e, int e1, int e3, int len); - -extern _X_EXPORT void - -fbSegment(DrawablePtr pDrawable, - GCPtr pGC, - int xa, int ya, int xb, int yb, Bool drawLast, int *dashOffset); - /* * fbsolid.c */ @@ -1507,104 +1275,10 @@ fbSolid24(FbBits * dst, int dstX, int width, int height, FbBits and, FbBits xor); /* - * fbstipple.c - */ - -extern _X_EXPORT void - fbTransparentSpan(FbBits * dst, FbBits stip, FbBits fgxor, int n); - -extern _X_EXPORT void - -fbEvenStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipHeight, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot); - -extern _X_EXPORT void - -fbOddStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipWidth, - int stipHeight, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot); - -extern _X_EXPORT void - -fbStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipWidth, - int stipHeight, - Bool even, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot); - -/* - * fbtile.c - */ - -extern _X_EXPORT void - -fbEvenTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileHeight, int alu, FbBits pm, int xRot, int yRot); - -extern _X_EXPORT void - -fbOddTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileWidth, - int tileHeight, int alu, FbBits pm, int bpp, int xRot, int yRot); - -extern _X_EXPORT void - -fbTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileWidth, - int tileHeight, int alu, FbBits pm, int bpp, int xRot, int yRot); - -/* * fbutil.c */ extern _X_EXPORT FbBits fbReplicatePixel(Pixel p, int bpp); -extern _X_EXPORT void - fbReduceRasterOp(int rop, FbBits fg, FbBits pm, FbBits * andp, FbBits * xorp); - #ifdef FB_ACCESS_WRAPPER extern _X_EXPORT ReadMemoryProcPtr wfbReadMemory; extern _X_EXPORT WriteMemoryProcPtr wfbWriteMemory; diff --git a/xorg-server/fb/fb24_32.c b/xorg-server/fb/fb24_32.c index ecb3951..b95019e 100644 --- a/xorg-server/fb/fb24_32.c +++ b/xorg-server/fb/fb24_32.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/fb/fb24_32.h b/xorg-server/fb/fb24_32.h index b357edf..77eef23 100644 --- a/xorg-server/fb/fb24_32.h +++ b/xorg-server/fb/fb24_32.h @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/fb/fbbits.c b/xorg-server/fb/fbbits.c index ac44f3e..d7d089c 100644 --- a/xorg-server/fb/fbbits.c +++ b/xorg-server/fb/fbbits.c @@ -70,9 +70,6 @@ #define POLYSEGMENT fbPolySegment16 #define BITS CARD16 #define BITS2 CARD32 -#if FB_SHIFT == 6 -#define BITS4 FbBits -#endif #include "fbbits.h" @@ -85,9 +82,6 @@ #undef POLYSEGMENT #undef BITS #undef BITS2 -#if FB_SHIFT == 6 -#undef BITS4 -#endif #define BRESSOLID fbBresSolid24 #define BRESDASH fbBresDash24 @@ -155,9 +149,6 @@ #define POLYLINE fbPolyline32 #define POLYSEGMENT fbPolySegment32 #define BITS CARD32 -#if FB_SHIFT == 6 -#define BITS2 FbBits -#endif #include "fbbits.h" @@ -169,6 +160,3 @@ #undef POLYLINE #undef POLYSEGMENT #undef BITS -#if FB_SHIFT == 6 -#undef BITS2 -#endif diff --git a/xorg-server/fb/fbblt.c b/xorg-server/fb/fbblt.c index c615106..b412365 100644 --- a/xorg-server/fb/fbblt.c +++ b/xorg-server/fb/fbblt.c @@ -520,277 +520,12 @@ fbBlt24(FbBits * srcLine, #endif } -#if FB_SHIFT == FB_STIP_SHIFT + 1 - -/* - * Could be generalized to FB_SHIFT > FB_STIP_SHIFT + 1 by - * creating an ring of values stepped through for each line - */ - -void -fbBltOdd(FbBits * srcLine, - FbStride srcStrideEven, - FbStride srcStrideOdd, - int srcXEven, - int srcXOdd, - FbBits * dstLine, - FbStride dstStrideEven, - FbStride dstStrideOdd, - int dstXEven, - int dstXOdd, int width, int height, int alu, FbBits pm, int bpp) -{ - FbBits *src; - int leftShiftEven, rightShiftEven; - FbBits startmaskEven, endmaskEven; - int nmiddleEven; - - FbBits *dst; - int leftShiftOdd, rightShiftOdd; - FbBits startmaskOdd, endmaskOdd; - int nmiddleOdd; - - int leftShift, rightShift; - FbBits startmask, endmask; - int nmiddle; - - int srcX, dstX; - - FbBits bits, bits1; - int n; - - Bool destInvarient; - Bool even; - - FbDeclareMergeRop(); - - FbInitializeMergeRop(alu, pm); - destInvarient = FbDestInvarientMergeRop(); - - srcLine += srcXEven >> FB_SHIFT; - dstLine += dstXEven >> FB_SHIFT; - srcXEven &= FB_MASK; - dstXEven &= FB_MASK; - srcXOdd &= FB_MASK; - dstXOdd &= FB_MASK; - - FbMaskBits(dstXEven, width, startmaskEven, nmiddleEven, endmaskEven); - FbMaskBits(dstXOdd, width, startmaskOdd, nmiddleOdd, endmaskOdd); - - even = TRUE; - InitializeShifts(srcXEven, dstXEven, leftShiftEven, rightShiftEven); - InitializeShifts(srcXOdd, dstXOdd, leftShiftOdd, rightShiftOdd); - while (height--) { - src = srcLine; - dst = dstLine; - if (even) { - srcX = srcXEven; - dstX = dstXEven; - startmask = startmaskEven; - endmask = endmaskEven; - nmiddle = nmiddleEven; - leftShift = leftShiftEven; - rightShift = rightShiftEven; - srcLine += srcStrideEven; - dstLine += dstStrideEven; - even = FALSE; - } - else { - srcX = srcXOdd; - dstX = dstXOdd; - startmask = startmaskOdd; - endmask = endmaskOdd; - nmiddle = nmiddleOdd; - leftShift = leftShiftOdd; - rightShift = rightShiftOdd; - srcLine += srcStrideOdd; - dstLine += dstStrideOdd; - even = TRUE; - } - if (srcX == dstX) { - if (startmask) { - bits = READ(src++); - WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), startmask)); - dst++; - } - n = nmiddle; - if (destInvarient) { - while (n--) { - bits = READ(src++); - WRITE(dst, FbDoDestInvarientMergeRop(bits)); - dst++; - } - } - else { - while (n--) { - bits = READ(src++); - WRITE(dst, FbDoMergeRop(bits, READ(dst))); - dst++; - } - } - if (endmask) { - bits = READ(src); - WRITE(dst, FbDoMaskMergeRop(bits, READ(dst), endmask)); - } - } - else { - bits = 0; - if (srcX > dstX) - bits = READ(src++); - if (startmask) { - bits1 = FbScrLeft(bits, leftShift); - bits = READ(src++); - bits1 |= FbScrRight(bits, rightShift); - WRITE(dst, FbDoMaskMergeRop(bits1, READ(dst), startmask)); - dst++; - } - n = nmiddle; - if (destInvarient) { - while (n--) { - bits1 = FbScrLeft(bits, leftShift); - bits = READ(src++); - bits1 |= FbScrRight(bits, rightShift); - WRITE(dst, FbDoDestInvarientMergeRop(bits1)); - dst++; - } - } - else { - while (n--) { - bits1 = FbScrLeft(bits, leftShift); - bits = READ(src++); - bits1 |= FbScrRight(bits, rightShift); - WRITE(dst, FbDoMergeRop(bits1, READ(dst))); - dst++; - } - } - if (endmask) { - bits1 = FbScrLeft(bits, leftShift); - if (FbScrLeft(endmask, rightShift)) { - bits = READ(src); - bits1 |= FbScrRight(bits, rightShift); - } - WRITE(dst, FbDoMaskMergeRop(bits1, READ(dst), endmask)); - } - } - } -} - -void -fbBltOdd24(FbBits * srcLine, - FbStride srcStrideEven, - FbStride srcStrideOdd, - int srcXEven, - int srcXOdd, - FbBits * dstLine, - FbStride dstStrideEven, - FbStride dstStrideOdd, - int dstXEven, int dstXOdd, int width, int height, int alu, FbBits pm) -{ - Bool even = TRUE; - - while (height--) { - if (even) { - fbBlt24Line(srcLine, srcXEven, dstLine, dstXEven, - width, alu, pm, FALSE); - srcLine += srcStrideEven; - dstLine += dstStrideEven; - even = FALSE; - } - else { - fbBlt24Line(srcLine, srcXOdd, dstLine, dstXOdd, - width, alu, pm, FALSE); - srcLine += srcStrideOdd; - dstLine += dstStrideOdd; - even = TRUE; - } - } -} - -#endif - -#if FB_STIP_SHIFT != FB_SHIFT -void -fbSetBltOdd(FbStip * stip, - FbStride stipStride, - int srcX, - FbBits ** bits, - FbStride * strideEven, - FbStride * strideOdd, int *srcXEven, int *srcXOdd) -{ - int srcAdjust; - int strideAdjust; - - /* - * bytes needed to align source - */ - srcAdjust = (((int) stip) & (FB_MASK >> 3)); - /* - * FbStip units needed to align stride - */ - strideAdjust = stipStride & (FB_MASK >> FB_STIP_SHIFT); - - *bits = (FbBits *) ((char *) stip - srcAdjust); - if (srcAdjust) { - *strideEven = FbStipStrideToBitsStride(stipStride + 1); - *strideOdd = FbStipStrideToBitsStride(stipStride); - - *srcXEven = srcX + (srcAdjust << 3); - *srcXOdd = srcX + (srcAdjust << 3) - (strideAdjust << FB_STIP_SHIFT); - } - else { - *strideEven = FbStipStrideToBitsStride(stipStride); - *strideOdd = FbStipStrideToBitsStride(stipStride + 1); - - *srcXEven = srcX; - *srcXOdd = srcX + (strideAdjust << FB_STIP_SHIFT); - } -} -#endif - void fbBltStip(FbStip * src, FbStride srcStride, /* in FbStip units, not FbBits units */ int srcX, FbStip * dst, FbStride dstStride, /* in FbStip units, not FbBits units */ int dstX, int width, int height, int alu, FbBits pm, int bpp) { -#if FB_STIP_SHIFT != FB_SHIFT - if (FB_STIP_ODDSTRIDE(srcStride) || FB_STIP_ODDPTR(src) || - FB_STIP_ODDSTRIDE(dstStride) || FB_STIP_ODDPTR(dst)) { - FbStride srcStrideEven, srcStrideOdd; - FbStride dstStrideEven, dstStrideOdd; - int srcXEven, srcXOdd; - int dstXEven, dstXOdd; - FbBits *s, *d; - int sx, dx; - - src += srcX >> FB_STIP_SHIFT; - srcX &= FB_STIP_MASK; - dst += dstX >> FB_STIP_SHIFT; - dstX &= FB_STIP_MASK; - - fbSetBltOdd(src, srcStride, srcX, - &s, &srcStrideEven, &srcStrideOdd, &srcXEven, &srcXOdd); - - fbSetBltOdd(dst, dstStride, dstX, - &d, &dstStrideEven, &dstStrideOdd, &dstXEven, &dstXOdd); - - if (bpp == 24 && !FbCheck24Pix(pm)) { - fbBltOdd24(s, srcStrideEven, srcStrideOdd, - srcXEven, srcXOdd, - d, dstStrideEven, dstStrideOdd, - dstXEven, dstXOdd, width, height, alu, pm); - } - else { - fbBltOdd(s, srcStrideEven, srcStrideOdd, - srcXEven, srcXOdd, - d, dstStrideEven, dstStrideOdd, - dstXEven, dstXOdd, width, height, alu, pm, bpp); - } - } - else -#endif - { - fbBlt((FbBits *) src, FbStipStrideToBitsStride(srcStride), - srcX, - (FbBits *) dst, FbStipStrideToBitsStride(dstStride), - dstX, width, height, alu, pm, bpp, FALSE, FALSE); - } + fbBlt((FbBits *) src, FbStipStrideToBitsStride(srcStride), srcX, + (FbBits *) dst, FbStipStrideToBitsStride(dstStride), dstX, + width, height, alu, pm, bpp, FALSE, FALSE); } diff --git a/xorg-server/fb/fbbltone.c b/xorg-server/fb/fbbltone.c index bfcb5a2..d089a43 100644 --- a/xorg-server/fb/fbbltone.c +++ b/xorg-server/fb/fbbltone.c @@ -26,6 +26,101 @@ #include "fb.h" +/* + * Stipple masks are independent of bit/byte order as long + * as bitorder == byteorder. FB doesn't handle the case + * where these differ + */ +#define BitsMask(x,w) ((FB_ALLONES << ((x) & FB_MASK)) & \ + (FB_ALLONES >> ((FB_UNIT - ((x) + (w))) & FB_MASK))) + +#define Mask(x,w) BitsMask((x)*(w),(w)) + +#define SelMask(b,n,w) ((((b) >> n) & 1) * Mask(n,w)) + +#define C1(b,w) \ + (SelMask(b,0,w)) + +#define C2(b,w) \ + (SelMask(b,0,w) | \ + SelMask(b,1,w)) + +#define C4(b,w) \ + (SelMask(b,0,w) | \ + SelMask(b,1,w) | \ + SelMask(b,2,w) | \ + SelMask(b,3,w)) + +#define C8(b,w) \ + (SelMask(b,0,w) | \ + SelMask(b,1,w) | \ + SelMask(b,2,w) | \ + SelMask(b,3,w) | \ + SelMask(b,4,w) | \ + SelMask(b,5,w) | \ + SelMask(b,6,w) | \ + SelMask(b,7,w)) + +static const FbBits fbStipple8Bits[256] = { + C8(0, 4), C8(1, 4), C8(2, 4), C8(3, 4), C8(4, 4), C8(5, 4), + C8(6, 4), C8(7, 4), C8(8, 4), C8(9, 4), C8(10, 4), C8(11, 4), + C8(12, 4), C8(13, 4), C8(14, 4), C8(15, 4), C8(16, 4), C8(17, 4), + C8(18, 4), C8(19, 4), C8(20, 4), C8(21, 4), C8(22, 4), C8(23, 4), + C8(24, 4), C8(25, 4), C8(26, 4), C8(27, 4), C8(28, 4), C8(29, 4), + C8(30, 4), C8(31, 4), C8(32, 4), C8(33, 4), C8(34, 4), C8(35, 4), + C8(36, 4), C8(37, 4), C8(38, 4), C8(39, 4), C8(40, 4), C8(41, 4), + C8(42, 4), C8(43, 4), C8(44, 4), C8(45, 4), C8(46, 4), C8(47, 4), + C8(48, 4), C8(49, 4), C8(50, 4), C8(51, 4), C8(52, 4), C8(53, 4), + C8(54, 4), C8(55, 4), C8(56, 4), C8(57, 4), C8(58, 4), C8(59, 4), + C8(60, 4), C8(61, 4), C8(62, 4), C8(63, 4), C8(64, 4), C8(65, 4), + C8(66, 4), C8(67, 4), C8(68, 4), C8(69, 4), C8(70, 4), C8(71, 4), + C8(72, 4), C8(73, 4), C8(74, 4), C8(75, 4), C8(76, 4), C8(77, 4), + C8(78, 4), C8(79, 4), C8(80, 4), C8(81, 4), C8(82, 4), C8(83, 4), + C8(84, 4), C8(85, 4), C8(86, 4), C8(87, 4), C8(88, 4), C8(89, 4), + C8(90, 4), C8(91, 4), C8(92, 4), C8(93, 4), C8(94, 4), C8(95, 4), + C8(96, 4), C8(97, 4), C8(98, 4), C8(99, 4), C8(100, 4), C8(101, 4), + C8(102, 4), C8(103, 4), C8(104, 4), C8(105, 4), C8(106, 4), C8(107, 4), + C8(108, 4), C8(109, 4), C8(110, 4), C8(111, 4), C8(112, 4), C8(113, 4), + C8(114, 4), C8(115, 4), C8(116, 4), C8(117, 4), C8(118, 4), C8(119, 4), + C8(120, 4), C8(121, 4), C8(122, 4), C8(123, 4), C8(124, 4), C8(125, 4), + C8(126, 4), C8(127, 4), C8(128, 4), C8(129, 4), C8(130, 4), C8(131, 4), + C8(132, 4), C8(133, 4), C8(134, 4), C8(135, 4), C8(136, 4), C8(137, 4), + C8(138, 4), C8(139, 4), C8(140, 4), C8(141, 4), C8(142, 4), C8(143, 4), + C8(144, 4), C8(145, 4), C8(146, 4), C8(147, 4), C8(148, 4), C8(149, 4), + C8(150, 4), C8(151, 4), C8(152, 4), C8(153, 4), C8(154, 4), C8(155, 4), + C8(156, 4), C8(157, 4), C8(158, 4), C8(159, 4), C8(160, 4), C8(161, 4), + C8(162, 4), C8(163, 4), C8(164, 4), C8(165, 4), C8(166, 4), C8(167, 4), + C8(168, 4), C8(169, 4), C8(170, 4), C8(171, 4), C8(172, 4), C8(173, 4), + C8(174, 4), C8(175, 4), C8(176, 4), C8(177, 4), C8(178, 4), C8(179, 4), + C8(180, 4), C8(181, 4), C8(182, 4), C8(183, 4), C8(184, 4), C8(185, 4), + C8(186, 4), C8(187, 4), C8(188, 4), C8(189, 4), C8(190, 4), C8(191, 4), + C8(192, 4), C8(193, 4), C8(194, 4), C8(195, 4), C8(196, 4), C8(197, 4), + C8(198, 4), C8(199, 4), C8(200, 4), C8(201, 4), C8(202, 4), C8(203, 4), + C8(204, 4), C8(205, 4), C8(206, 4), C8(207, 4), C8(208, 4), C8(209, 4), + C8(210, 4), C8(211, 4), C8(212, 4), C8(213, 4), C8(214, 4), C8(215, 4), + C8(216, 4), C8(217, 4), C8(218, 4), C8(219, 4), C8(220, 4), C8(221, 4), + C8(222, 4), C8(223, 4), C8(224, 4), C8(225, 4), C8(226, 4), C8(227, 4), + C8(228, 4), C8(229, 4), C8(230, 4), C8(231, 4), C8(232, 4), C8(233, 4), + C8(234, 4), C8(235, 4), C8(236, 4), C8(237, 4), C8(238, 4), C8(239, 4), + C8(240, 4), C8(241, 4), C8(242, 4), C8(243, 4), C8(244, 4), C8(245, 4), + C8(246, 4), C8(247, 4), C8(248, 4), C8(249, 4), C8(250, 4), C8(251, 4), + C8(252, 4), C8(253, 4), C8(254, 4), C8(255, 4), +}; + +static const FbBits fbStipple4Bits[16] = { + C4(0, 8), C4(1, 8), C4(2, 8), C4(3, 8), C4(4, 8), C4(5, 8), + C4(6, 8), C4(7, 8), C4(8, 8), C4(9, 8), C4(10, 8), C4(11, 8), + C4(12, 8), C4(13, 8), C4(14, 8), C4(15, 8), +}; + +static const FbBits fbStipple2Bits[4] = { + C2(0, 16), C2(1, 16), C2(2, 16), C2(3, 16), +}; + +static const FbBits fbStipple1Bits[2] = { + C1(0, 32), C1(1, 32), +}; + #ifdef __clang__ /* shift overflow is intentional */ #pragma clang diagnostic ignored "-Wshift-overflow" @@ -62,85 +157,6 @@ bits = (src < srcEnd ? READ(src++) : 0); \ } -#define LaneCases1(n,a) case n: FbLaneCase(n,a); break -#define LaneCases2(n,a) LaneCases1(n,a); LaneCases1(n+1,a) -#define LaneCases4(n,a) LaneCases2(n,a); LaneCases2(n+2,a) -#define LaneCases8(n,a) LaneCases4(n,a); LaneCases4(n+4,a) -#define LaneCases16(n,a) LaneCases8(n,a); LaneCases8(n+8,a) -#define LaneCases32(n,a) LaneCases16(n,a); LaneCases16(n+16,a) -#define LaneCases64(n,a) LaneCases32(n,a); LaneCases32(n+32,a) -#define LaneCases128(n,a) LaneCases64(n,a); LaneCases64(n+64,a) -#define LaneCases256(n,a) LaneCases128(n,a); LaneCases128(n+128,a) - -#if FB_SHIFT == 6 -#define LaneCases(a) LaneCases256(0,a) -#endif - -#if FB_SHIFT == 5 -#define LaneCases(a) LaneCases16(0,a) -#endif - -#if FB_SHIFT == 6 -CARD8 fb8Lane[256] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, - 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, - 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 115, - 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, - 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 149, 150, 151, - 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, - 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181, 182, 183, 184, - 185, 186, 187, - 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, - 203, 204, 205, - 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, - 221, 222, 223, - 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, - 239, 240, 241, - 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, -}; - -CARD8 fb16Lane[256] = { - 0x00, 0x03, 0x0c, 0x0f, - 0x30, 0x33, 0x3c, 0x3f, - 0xc0, 0xc3, 0xcc, 0xcf, - 0xf0, 0xf3, 0xfc, 0xff, -}; - -CARD8 fb32Lane[16] = { - 0x00, 0x0f, 0xf0, 0xff, -}; -#endif - -#if FB_SHIFT == 5 -CARD8 fb8Lane[16] = { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 -}; - -CARD8 fb16Lane[16] = { - 0, 3, 12, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; - -CARD8 fb32Lane[16] = { - 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -}; -#endif - -CARD8 *fbLaneTable[33] = { - 0, 0, 0, 0, 0, 0, 0, 0, - fb8Lane, 0, 0, 0, 0, 0, 0, 0, - fb16Lane, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - fb32Lane -}; - void fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ int srcX, /* bit position of source */ @@ -169,7 +185,6 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ Bool transparent; /* accelerate 0 nop */ int srcinc; /* source units consumed */ Bool endNeedsLoad = FALSE; /* need load for endmask */ - CARD8 *fbLane; int startbyte, endbyte; if (dstBpp == 24) { @@ -191,7 +206,7 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ pixelsPerDst = FB_UNIT / dstBpp; /* - * Number of source stipple patterns in FbStip + * Number of source stipple patterns in FbStip */ unitsPerSrc = FB_STIP_UNIT / pixelsPerDst; @@ -233,15 +248,26 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ * Get pointer to stipple mask array for this depth */ fbBits = 0; /* unused */ - if (pixelsPerDst <= 8) - fbBits = fbStippleTable[pixelsPerDst]; - fbLane = 0; - if (transparent && fgand == 0 && dstBpp >= 8) - fbLane = fbLaneTable[dstBpp]; + switch (pixelsPerDst) { + case 8: + fbBits = fbStipple8Bits; + break; + case 4: + fbBits = fbStipple4Bits; + break; + case 2: + fbBits = fbStipple2Bits; + break; + case 1: + fbBits = fbStipple1Bits; + break; + default: + return; + } /* - * Compute total number of destination words written, but - * don't count endmask + * Compute total number of destination words written, but + * don't count endmask */ nDst = nmiddle; if (startmask) @@ -287,21 +313,11 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ * Consume stipple bits for startmask */ if (startmask) { -#if FB_UNIT > 32 - if (pixelsPerDst == 16) - mask = FbStipple16Bits(FbLeftStipBits(bits, 16)); - else -#endif - mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; - if (fbLane) { - fbTransparentSpan(dst, mask & startmask, fgxor, 1); - } - else { - if (mask || !transparent) - FbDoLeftMaskByteStippleRRop(dst, mask, - fgand, fgxor, bgand, bgxor, - startbyte, startmask); - } + mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; + if (mask || !transparent) + FbDoLeftMaskByteStippleRRop(dst, mask, + fgand, fgxor, bgand, bgxor, + startbyte, startmask); bits = FbStipLeft(bits, pixelsPerDst); dst++; n--; @@ -314,41 +330,22 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ w -= n; if (copy) { while (n--) { -#if FB_UNIT > 32 - if (pixelsPerDst == 16) - mask = FbStipple16Bits(FbLeftStipBits(bits, 16)); - else -#endif - mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; + mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; WRITE(dst, FbOpaqueStipple(mask, fgxor, bgxor)); dst++; bits = FbStipLeft(bits, pixelsPerDst); } } else { - if (fbLane) { - while (bits && n) { - switch (fbLane[FbLeftStipBits(bits, pixelsPerDst)]) { - LaneCases((CARD8 *) dst); - } - bits = FbStipLeft(bits, pixelsPerDst); - dst++; - n--; - } - dst += n; - } - else { - while (n--) { - left = FbLeftStipBits(bits, pixelsPerDst); - if (left || !transparent) { - mask = fbBits[left]; - WRITE(dst, FbStippleRRop(READ(dst), mask, - fgand, fgxor, bgand, - bgxor)); - } - dst++; - bits = FbStipLeft(bits, pixelsPerDst); + while (n--) { + left = FbLeftStipBits(bits, pixelsPerDst); + if (left || !transparent) { + mask = fbBits[left]; + WRITE(dst, FbStippleRRop(READ(dst), mask, fgand, + fgxor, bgand, bgxor)); } + dst++; + bits = FbStipLeft(bits, pixelsPerDst); } } if (!w) @@ -369,21 +366,10 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ if (endNeedsLoad) { LoadBits; } -#if FB_UNIT > 32 - if (pixelsPerDst == 16) - mask = FbStipple16Bits(FbLeftStipBits(bits, 16)); - else -#endif - mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; - if (fbLane) { - fbTransparentSpan(dst, mask & endmask, fgxor, 1); - } - else { - if (mask || !transparent) - FbDoRightMaskByteStippleRRop(dst, mask, - fgand, fgxor, bgand, bgxor, - endbyte, endmask); - } + mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; + if (mask || !transparent) + FbDoRightMaskByteStippleRRop(dst, mask, fgand, fgxor, + bgand, bgxor, endbyte, endmask); } dst += dstStride; src += srcStride; @@ -412,47 +398,6 @@ fbBltOne(FbStip * src, FbStride srcStride, /* FbStip units per scanline */ #define SelMask24(b,n,r) ((((b) >> n) & 1) * Mask24(n,r)) -/* - * Untested for MSBFirst or FB_UNIT == 32 - */ - -#if FB_UNIT == 64 -#define C4_24(b,r) \ - (SelMask24(b,0,r) | \ - SelMask24(b,1,r) | \ - SelMask24(b,2,r) | \ - SelMask24(b,3,r)) - -#define FbStip24New(rot) (2 + (rot != 0)) -#define FbStip24Len 4 - -const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { - /* rotate 0 */ - { - C4_24(0, 0), C4_24(1, 0), C4_24(2, 0), C4_24(3, 0), - C4_24(4, 0), C4_24(5, 0), C4_24(6, 0), C4_24(7, 0), - C4_24(8, 0), C4_24(9, 0), C4_24(10, 0), C4_24(11, 0), - C4_24(12, 0), C4_24(13, 0), C4_24(14, 0), C4_24(15, 0), - }, - /* rotate 8 */ - { - C4_24(0, 8), C4_24(1, 8), C4_24(2, 8), C4_24(3, 8), - C4_24(4, 8), C4_24(5, 8), C4_24(6, 8), C4_24(7, 8), - C4_24(8, 8), C4_24(9, 8), C4_24(10, 8), C4_24(11, 8), - C4_24(12, 8), C4_24(13, 8), C4_24(14, 8), C4_24(15, 8), - }, - /* rotate 16 */ - { - C4_24(0, 16), C4_24(1, 16), C4_24(2, 16), C4_24(3, 16), - C4_24(4, 16), C4_24(5, 16), C4_24(6, 16), C4_24(7, 16), - C4_24(8, 16), C4_24(9, 16), C4_24(10, 16), C4_24(11, 16), - C4_24(12, 16), C4_24(13, 16), C4_24(14, 16), C4_24(15, 16), - } -}; - -#endif - -#if FB_UNIT == 32 #define C2_24(b,r) \ (SelMask24(b,0,r) | \ SelMask24(b,1,r)) @@ -478,7 +423,6 @@ const FbBits fbStipple24Bits[3][1 << FbStip24Len] = { C2_24(0, 16), C2_24(1, 16), C2_24(2, 16), C2_24(3, 16), } }; -#endif #if BITMAP_BIT_ORDER == LSBFirst diff --git a/xorg-server/fb/fbfill.c b/xorg-server/fb/fbfill.c index de9d6b3..05d81ab 100644 --- a/xorg-server/fb/fbfill.c +++ b/xorg-server/fb/fbfill.c @@ -26,6 +26,88 @@ #include "fb.h" +static void +fbTile(FbBits * dst, FbStride dstStride, int dstX, int width, int height, + FbBits * tile, FbStride tileStride, int tileWidth, int tileHeight, + int alu, FbBits pm, int bpp, int xRot, int yRot) +{ + int tileX, tileY; + int widthTmp; + int h, w; + int x, y; + + modulus(-yRot, tileHeight, tileY); + y = 0; + while (height) { + h = tileHeight - tileY; + if (h > height) + h = height; + height -= h; + widthTmp = width; + x = dstX; + modulus(dstX - xRot, tileWidth, tileX); + while (widthTmp) { + w = tileWidth - tileX; + if (w > widthTmp) + w = widthTmp; + widthTmp -= w; + fbBlt(tile + tileY * tileStride, + tileStride, + tileX, + dst + y * dstStride, + dstStride, x, w, h, alu, pm, bpp, FALSE, FALSE); + x += w; + tileX = 0; + } + y += h; + tileY = 0; + } +} + +static void +fbStipple(FbBits * dst, FbStride dstStride, + int dstX, int dstBpp, + int width, int height, + FbStip * stip, FbStride stipStride, + int stipWidth, int stipHeight, + FbBits fgand, FbBits fgxor, + FbBits bgand, FbBits bgxor, + int xRot, int yRot) +{ + int stipX, stipY, sx; + int widthTmp; + int h, w; + int x, y; + + modulus(-yRot, stipHeight, stipY); + modulus(dstX / dstBpp - xRot, stipWidth, stipX); + y = 0; + while (height) { + h = stipHeight - stipY; + if (h > height) + h = height; + height -= h; + widthTmp = width; + x = dstX; + sx = stipX; + while (widthTmp) { + w = (stipWidth - sx) * dstBpp; + if (w > widthTmp) + w = widthTmp; + widthTmp -= w; + fbBltOne(stip + stipY * stipStride, + stipStride, + sx, + dst + y * dstStride, + dstStride, x, dstBpp, w, h, fgand, fgxor, bgand, bgxor); + x += w; + sx = 0; + } + y += h; + stipY = 0; + } +} + void fbFill(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int width, int height) { @@ -97,7 +179,7 @@ fbFill(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int width, int height) fbStipple(dst + (y + dstYoff) * dstStride, dstStride, (x + dstXoff) * dstBpp, dstBpp, width * dstBpp, height, stip, stipStride, stipWidth, stipHeight, - pPriv->evenStipple, fgand, fgxor, bgand, bgxor, + fgand, fgxor, bgand, bgxor, pGC->patOrg.x + pDrawable->x + dstXoff, pGC->patOrg.y + pDrawable->y - y); fbFinishAccess(&pStip->drawable); diff --git a/xorg-server/fb/fbfillrect.c b/xorg-server/fb/fbfillrect.c index 64ba2b4..0075b2c 100644 --- a/xorg-server/fb/fbfillrect.c +++ b/xorg-server/fb/fbfillrect.c @@ -74,7 +74,7 @@ fbPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrect, xRectangle *prect) } else { pbox = RegionRects(pClip); - /* + /* * clip the rectangle to each box in the clip region * this is logically equivalent to calling Intersect() */ diff --git a/xorg-server/fb/fbgc.c b/xorg-server/fb/fbgc.c index f4d7f3a..19c6131 100644 --- a/xorg-server/fb/fbgc.c +++ b/xorg-server/fb/fbgc.c @@ -110,80 +110,6 @@ fbPadPixmap(PixmapPtr pPixmap) fbFinishAccess(&pPixmap->drawable); } -/* - * Verify that 'bits' repeats every 'len' bits - */ -static Bool -fbBitsRepeat(FbBits bits, int len, int width) -{ - FbBits mask = FbBitsMask(0, len); - FbBits orig = bits & mask; - int i; - - if (width > FB_UNIT) - width = FB_UNIT; - for (i = 0; i < width / len; i++) { - if ((bits & mask) != orig) - return FALSE; - bits = FbScrLeft(bits, len); - } - return TRUE; -} - -/* - * Check whether an entire bitmap line is a repetition of - * the first 'len' bits - */ -static Bool -fbLineRepeat(FbBits * bits, int len, int width) -{ - FbBits first = bits[0]; - - if (!fbBitsRepeat(first, len, width)) - return FALSE; - width = (width + FB_UNIT - 1) >> FB_SHIFT; - bits++; - while (--width) - if (READ(bits) != first) - return FALSE; - return TRUE; -} - -/* - * The even stipple code wants the first FB_UNIT/bpp bits on - * each scanline to represent the entire stipple - */ -static Bool -fbCanEvenStipple(PixmapPtr pStipple, int bpp) -{ - int len = FB_UNIT / bpp; - FbBits *bits; - int stride; - int stip_bpp; - _X_UNUSED int stipXoff, stipYoff; - int h; - - /* can't even stipple 24bpp drawables */ - if ((bpp & (bpp - 1)) != 0) - return FALSE; - /* make sure the stipple width is a multiple of the even stipple width */ - if (pStipple->drawable.width % len != 0) - return FALSE; - fbGetDrawable(&pStipple->drawable, bits, stride, stip_bpp, stipXoff, - stipYoff); - h = pStipple->drawable.height; - /* check to see that the stipple repeats horizontally */ - while (h--) { - if (!fbLineRepeat(bits, len, pStipple->drawable.width)) { - fbFinishAccess(&pStipple->drawable); - return FALSE; - } - bits += stride; - } - fbFinishAccess(&pStipple->drawable); - return TRUE; -} - void fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) { @@ -193,7 +119,7 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) /* * if the client clip is different or moved OR the subwindowMode has * changed OR the window's clip has changed since the last validation - * we need to recompute the composite clip + * we need to recompute the composite clip */ if ((changes & @@ -239,16 +165,7 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable) fbPadPixmap(pGC->tile.pixmap); } if (changes & GCStipple) { - pPriv->evenStipple = FALSE; - if (pGC->stipple) { - - /* can we do an even stipple ?? */ - if (FbEvenStip(pGC->stipple->drawable.width, - pDrawable->bitsPerPixel) && - (fbCanEvenStipple(pGC->stipple, pDrawable->bitsPerPixel))) - pPriv->evenStipple = TRUE; - if (pGC->stipple->drawable.width * pDrawable->bitsPerPixel < FB_UNIT) fbPadPixmap(pGC->stipple); diff --git a/xorg-server/fb/fbglyph.c b/xorg-server/fb/fbglyph.c index 4f2904c..61cb8de 100644 --- a/xorg-server/fb/fbglyph.c +++ b/xorg-server/fb/fbglyph.c @@ -29,7 +29,7 @@ #include <X11/fonts/fontstruct.h> #include "dixfontstr.h" -Bool +static Bool fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) { BoxRec box; @@ -56,11 +56,7 @@ fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) #define WRITE1(d,n,fg) WRITE((d) + (n), (CARD8) fg) #define WRITE2(d,n,fg) WRITE((CARD16 *) &(d[n]), (CARD16) fg) #define WRITE4(d,n,fg) WRITE((CARD32 *) &(d[n]), (CARD32) fg) -#if FB_UNIT == 6 && IMAGE_BYTE_ORDER == LSBFirst -#define WRITE8(d) WRITE((FbBits *) &(d[0]), fg) -#else #define WRITE8(d) WRITE4(d,0,_ABCA), WRITE4(d,4,_BCAB) -#endif /* * This is a bit tricky, but it's brief. Write 12 bytes worth @@ -69,7 +65,7 @@ fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) * * a b c d a b c d a b c d bytes * A B C A B C A B C A B C pixels - * + * * f0 f1 f2 * A B C A B C A B C A B C pixels LSB * C A B C A B C A B C A B pixels MSB @@ -120,7 +116,7 @@ fbGlyphIn(RegionPtr pRegion, int x, int y, int width, int height) #define CASE(a,b,c,d) (a | (b << 1) | (c << 2) | (d << 3)) #endif -void +static void fbGlyph24(FbBits * dstBits, FbStride dstStride, int dstBpp, FbStip * stipple, FbBits fg, int x, int height) diff --git a/xorg-server/fb/fbline.c b/xorg-server/fb/fbline.c index 80dc89d..3e582e6 100644 --- a/xorg-server/fb/fbline.c +++ b/xorg-server/fb/fbline.c @@ -26,7 +26,7 @@ #include "fb.h" -void +static void fbZeroLine(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ppt) { int x1, y1, x2, y2; @@ -54,7 +54,7 @@ fbZeroLine(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt, DDXPointPtr ppt) } } -void +static void fbZeroSegment(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pSegs) { int dashOffset; diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c index 6a5f0f8..1e5e6b3 100644 --- a/xorg-server/fb/fboverlay.c +++ b/xorg-server/fb/fboverlay.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/fb/fboverlay.h b/xorg-server/fb/fboverlay.h index 47727e4..3312145 100644 --- a/xorg-server/fb/fboverlay.h +++ b/xorg-server/fb/fboverlay.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/fb/fbpict.c b/xorg-server/fb/fbpict.c index f9c9917..c8378ad 100644 --- a/xorg-server/fb/fbpict.c +++ b/xorg-server/fb/fbpict.c @@ -82,7 +82,7 @@ fbDestroyGlyphCache(void) } } -void +static void fbUnrealizeGlyph(ScreenPtr pScreen, GlyphPtr pGlyph) { @@ -113,7 +113,7 @@ fbGlyphs(CARD8 op, int xDst = list->xOff, yDst = list->yOff; miCompositeSourceValidate(pSrc); - + n_glyphs = 0; for (i = 0; i < nlist; ++i) n_glyphs += list[i].len; @@ -122,12 +122,12 @@ fbGlyphs(CARD8 op, glyphCache = pixman_glyph_cache_create(); pixman_glyph_cache_freeze (glyphCache); - + if (n_glyphs > N_STACK_GLYPHS) { if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t)))) goto out; } - + i = 0; x = y = 0; while (nlist--) { @@ -309,17 +309,9 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff) return NULL; #ifdef FB_ACCESS_WRAPPER -#if FB_SHIFT==5 - pixman_image_set_accessors(image, (pixman_read_memory_func_t) wfbReadMemory, (pixman_write_memory_func_t) wfbWriteMemory); - -#else - -#error The pixman library only works when FbBits is 32 bits wide - -#endif #endif /* pCompositeClip is undefined for source pictures, so diff --git a/xorg-server/fb/fbpict.h b/xorg-server/fb/fbpict.h index 8b0f59f..5cb8663 100644 --- a/xorg-server/fb/fbpict.h +++ b/xorg-server/fb/fbpict.h @@ -72,10 +72,6 @@ fbTriangles(CARD8 op, INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); extern _X_EXPORT void -fbUnrealizeGlyph(ScreenPtr pScreen, - GlyphPtr pGlyph); - -extern _X_EXPORT void fbGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/xorg-server/fb/fbpixmap.c b/xorg-server/fb/fbpixmap.c index 677f28a..951a925 100644 --- a/xorg-server/fb/fbpixmap.c +++ b/xorg-server/fb/fbpixmap.c @@ -132,7 +132,7 @@ if (((rx1) < (rx2)) && ((ry1) < (ry2)) && \ r++; \ } -/* Convert bitmap clip mask into clipping region. +/* Convert bitmap clip mask into clipping region. * First, goes through each line and makes boxes by noting the transitions * from 0 to 1 and 1 to 0. * Then it coalesces the current line with the previous if they have boxes @@ -246,8 +246,8 @@ fbPixmapToRegion(PixmapPtr pPix) rx1, h, base + (width & FB_MASK), h + 1); } /* if all rectangles on this line have the same x-coords as - * those on the previous line, then add 1 to all the previous y2s and - * throw away all the rectangles from this line + * those on the previous line, then add 1 to all the previous y2s and + * throw away all the rectangles from this line */ fSame = FALSE; if (irectPrevStart != -1) { diff --git a/xorg-server/fb/fbpoint.c b/xorg-server/fb/fbpoint.c index d5129d7..be7c801 100644 --- a/xorg-server/fb/fbpoint.c +++ b/xorg-server/fb/fbpoint.c @@ -35,7 +35,7 @@ typedef void (*FbDots) (FbBits * dst, int xorg, int yorg, int xoff, int yoff, FbBits and, FbBits xor); -void +static void fbDots(FbBits * dstOrig, FbStride dstStride, int dstBpp, diff --git a/xorg-server/fb/fbpush.c b/xorg-server/fb/fbpush.c index f0a861c..1d1bcfd 100644 --- a/xorg-server/fb/fbpush.c +++ b/xorg-server/fb/fbpush.c @@ -26,7 +26,7 @@ #include "fb.h" -void +static void fbPushPattern(DrawablePtr pDrawable, GCPtr pGC, FbStip * src, @@ -84,7 +84,7 @@ fbPushPattern(DrawablePtr pDrawable, } } -void +static void fbPushFill(DrawablePtr pDrawable, GCPtr pGC, FbStip * src, diff --git a/xorg-server/fb/fbrop.h b/xorg-server/fb/fbrop.h index 4362adb..bc12b14 100644 --- a/xorg-server/fb/fbrop.h +++ b/xorg-server/fb/fbrop.h @@ -92,19 +92,9 @@ extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16]; #define fbAndStip(rop,fg,pm) fbAndT(rop,fg,pm,FbStip) /* - * Stippling operations; + * Stippling operations; */ -extern _X_EXPORT const FbBits fbStipple16Bits[256]; /* half of table */ - -#define FbStipple16Bits(b) \ - (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT) -extern _X_EXPORT const FbBits fbStipple8Bits[256]; -extern _X_EXPORT const FbBits fbStipple4Bits[16]; -extern _X_EXPORT const FbBits fbStipple2Bits[4]; -extern _X_EXPORT const FbBits fbStipple1Bits[2]; -extern _X_EXPORT const FbBits *const fbStippleTable[]; - #define FbStippleRRop(dst, b, fa, fx, ba, bx) \ (FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b) diff --git a/xorg-server/fb/fbseg.c b/xorg-server/fb/fbseg.c index 1848387..c3c196a 100644 --- a/xorg-server/fb/fbseg.c +++ b/xorg-server/fb/fbseg.c @@ -33,7 +33,7 @@ ((dir < 0) ? FbStipLeft(mask,bpp) : \ FbStipRight(mask,bpp))) -void +static void fbBresSolid(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -65,12 +65,6 @@ fbBresSolid(DrawablePtr pDrawable, if (axis == X_AXIS) { bits = 0; while (len--) { - if (e >= 0) { - WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits)); - bits = 0; - dst += dstStride; - e += e3; - } bits |= mask; mask = fbBresShiftMask(mask, signdx, dstBpp); if (!mask) { @@ -80,12 +74,23 @@ fbBresSolid(DrawablePtr pDrawable, mask = mask0; } e += e1; + if (e >= 0) { + if (bits) { + WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, bits)); + bits = 0; + } + dst += dstStride; + e += e3; + } } if (bits) WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, bits)); } else { while (len--) { + WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask)); + dst += dstStride; + e += e1; if (e >= 0) { e += e3; mask = fbBresShiftMask(mask, signdx, dstBpp); @@ -94,16 +99,13 @@ fbBresSolid(DrawablePtr pDrawable, mask = mask0; } } - WRITE(dst, FbDoMaskRRop(READ(dst), and, xor, mask)); - dst += dstStride; - e += e1; } } fbFinishAccess(pDrawable); } -void +static void fbBresDash(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -176,7 +178,7 @@ fbBresDash(DrawablePtr pDrawable, fbFinishAccess(pDrawable); } -void +static void fbBresFill(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -216,7 +218,7 @@ fbSetFg(DrawablePtr pDrawable, GCPtr pGC, Pixel fg) } } -void +static void fbBresFillDash(DrawablePtr pDrawable, GCPtr pGC, int dashOffset, @@ -434,7 +436,7 @@ fbBresDash24RRop(DrawablePtr pDrawable, * based on the contents of the specified GC. */ -FbBres * +static FbBres * fbSelectBres(DrawablePtr pDrawable, GCPtr pGC) { FbGCPrivPtr pPriv = fbGetGCPrivate(pGC); @@ -494,18 +496,6 @@ fbSelectBres(DrawablePtr pDrawable, GCPtr pGC) } void -fbBres(DrawablePtr pDrawable, - GCPtr pGC, - int dashOffset, - int signdx, - int signdy, int axis, int x1, int y1, int e, int e1, int e3, int len) -{ - (*fbSelectBres(pDrawable, pGC)) (pDrawable, pGC, dashOffset, - signdx, signdy, axis, x1, y1, - e, e1, e3, len); -} - -void fbSegment(DrawablePtr pDrawable, GCPtr pGC, int x1, int y1, int x2, int y2, Bool drawLast, int *dashOffset) diff --git a/xorg-server/fb/fbstipple.c b/xorg-server/fb/fbstipple.c deleted file mode 100644 index f6c84a2..0000000 --- a/xorg-server/fb/fbstipple.c +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Copyright © 1998 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "fb.h" - -/* - * This is a slight abuse of the preprocessor to generate repetitive - * code, the idea is to generate code for each case of a copy-mode - * transparent stipple - */ -#define LaneCases1(c,a) case c: \ - while (n--) { FbLaneCase(c,a); a++; } \ - break -#define LaneCases2(c,a) LaneCases1(c,a); LaneCases1(c+1,a) -#define LaneCases4(c,a) LaneCases2(c,a); LaneCases2(c+2,a) -#define LaneCases8(c,a) LaneCases4(c,a); LaneCases4(c+4,a) -#define LaneCases16(c,a) LaneCases8(c,a); LaneCases8(c+8,a) -#define LaneCases32(c,a) LaneCases16(c,a); LaneCases16(c+16,a) -#define LaneCases64(c,a) LaneCases32(c,a); LaneCases32(c+32,a) -#define LaneCases128(c,a) LaneCases64(c,a); LaneCases64(c+64,a) -#define LaneCases256(c,a) LaneCases128(c,a); LaneCases128(c+128,a) - -#if FB_SHIFT == 6 -#define LaneCases(a) LaneCases256(0,a) -#endif - -#if FB_SHIFT == 5 -#define LaneCases(a) LaneCases16(0,a) -#endif - -/* - * Repeat a transparent stipple across a scanline n times - */ - -void -fbTransparentSpan(FbBits * dst, FbBits stip, FbBits fgxor, int n) -{ - FbStip s; - - s = ((FbStip) (stip) & 0x01); - s |= ((FbStip) (stip >> 8) & 0x02); - s |= ((FbStip) (stip >> 16) & 0x04); - s |= ((FbStip) (stip >> 24) & 0x08); -#if FB_SHIFT > 5 - s |= ((FbStip) (stip >> 32) & 0x10); - s |= ((FbStip) (stip >> 40) & 0x20); - s |= ((FbStip) (stip >> 48) & 0x40); - s |= ((FbStip) (stip >> 56) & 0x80); -#endif - switch (s) { - LaneCases(dst); - } -} - -void -fbEvenStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipHeight, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot) -{ - FbBits startmask, endmask; - FbBits mask, and, xor; - int nmiddle, n; - FbStip *s, *stipEnd, bits; - int rot, stipX, stipY; - int pixelsPerDst; - const FbBits *fbBits; - Bool transparent; - int startbyte, endbyte; - - /* - * Check for a transparent stipple (stencil) - */ - transparent = FALSE; - if (dstBpp >= 8 && fgand == 0 && bgand == FB_ALLONES && bgxor == 0) - transparent = TRUE; - - pixelsPerDst = FB_UNIT / dstBpp; - /* - * Adjust dest pointers - */ - dst += dstX >> FB_SHIFT; - dstX &= FB_MASK; - FbMaskBitsBytes(dstX, width, fgand == 0 && bgand == 0, - startmask, startbyte, nmiddle, endmask, endbyte); - - if (startmask) - dstStride--; - dstStride -= nmiddle; - - xRot *= dstBpp; - /* - * Compute stip start scanline and rotation parameters - */ - stipEnd = stip + stipStride * stipHeight; - modulus(-yRot, stipHeight, stipY); - s = stip + stipStride * stipY; - modulus(-xRot, FB_UNIT, stipX); - rot = stipX; - - /* - * Get pointer to stipple mask array for this depth - */ - /* fbStippleTable covers all valid bpp (4,8,16,32) */ - fbBits = fbStippleTable[pixelsPerDst]; - - while (height--) { - /* - * Extract stipple bits for this scanline; - */ - bits = READ(s); - s += stipStride; - if (s == stipEnd) - s = stip; -#if FB_UNIT > 32 - if (pixelsPerDst == 16) - mask = FbStipple16Bits(FbLeftStipBits(bits, 16)); - else -#endif - mask = fbBits[FbLeftStipBits(bits, pixelsPerDst)]; - /* - * Rotate into position and compute reduced rop values - */ - mask = FbRotLeft(mask, rot); - and = (fgand & mask) | (bgand & ~mask); - xor = (fgxor & mask) | (bgxor & ~mask); - - if (transparent) { - if (startmask) { - fbTransparentSpan(dst, mask & startmask, fgxor, 1); - dst++; - } - fbTransparentSpan(dst, mask, fgxor, nmiddle); - dst += nmiddle; - if (endmask) - fbTransparentSpan(dst, mask & endmask, fgxor, 1); - } - else { - /* - * Fill scanline - */ - if (startmask) { - FbDoLeftMaskByteRRop(dst, startbyte, startmask, and, xor); - dst++; - } - n = nmiddle; - if (!and) - while (n--) - WRITE(dst++, xor); - else { - while (n--) { - WRITE(dst, FbDoRRop(READ(dst), and, xor)); - dst++; - } - } - if (endmask) - FbDoRightMaskByteRRop(dst, endbyte, endmask, and, xor); - } - dst += dstStride; - } -} - -void -fbOddStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipWidth, - int stipHeight, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot) -{ - int stipX, stipY, sx; - int widthTmp; - int h, w; - int x, y; - - modulus(-yRot, stipHeight, stipY); - modulus(dstX / dstBpp - xRot, stipWidth, stipX); - y = 0; - while (height) { - h = stipHeight - stipY; - if (h > height) - h = height; - height -= h; - widthTmp = width; - x = dstX; - sx = stipX; - while (widthTmp) { - w = (stipWidth - sx) * dstBpp; - if (w > widthTmp) - w = widthTmp; - widthTmp -= w; - fbBltOne(stip + stipY * stipStride, - stipStride, - sx, - dst + y * dstStride, - dstStride, x, dstBpp, w, h, fgand, fgxor, bgand, bgxor); - x += w; - sx = 0; - } - y += h; - stipY = 0; - } -} - -void -fbStipple(FbBits * dst, - FbStride dstStride, - int dstX, - int dstBpp, - int width, - int height, - FbStip * stip, - FbStride stipStride, - int stipWidth, - int stipHeight, - Bool even, - FbBits fgand, - FbBits fgxor, FbBits bgand, FbBits bgxor, int xRot, int yRot) -{ - if (even) - fbEvenStipple(dst, dstStride, dstX, dstBpp, width, height, - stip, stipStride, stipHeight, - fgand, fgxor, bgand, bgxor, xRot, yRot); - else - fbOddStipple(dst, dstStride, dstX, dstBpp, width, height, - stip, stipStride, stipWidth, stipHeight, - fgand, fgxor, bgand, bgxor, xRot, yRot); -} diff --git a/xorg-server/fb/fbtile.c b/xorg-server/fb/fbtile.c deleted file mode 100644 index 785c5f0..0000000 --- a/xorg-server/fb/fbtile.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * Copyright © 1998 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "fb.h" - -/* - * Accelerated tile fill -- tile width is a power of two not greater - * than FB_UNIT - */ - -void -fbEvenTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileHeight, int alu, FbBits pm, int xRot, int yRot) -{ - FbBits *t, *tileEnd, bits; - FbBits startmask, endmask; - FbBits and, xor; - int n, nmiddle; - int tileX, tileY; - int rot; - int startbyte, endbyte; - - dst += dstX >> FB_SHIFT; - dstX &= FB_MASK; - FbMaskBitsBytes(dstX, width, FbDestInvarientRop(alu, pm), - startmask, startbyte, nmiddle, endmask, endbyte); - if (startmask) - dstStride--; - dstStride -= nmiddle; - - /* - * Compute tile start scanline and rotation parameters - */ - tileEnd = tile + tileHeight * tileStride; - modulus(-yRot, tileHeight, tileY); - t = tile + tileY * tileStride; - modulus(-xRot, FB_UNIT, tileX); - rot = tileX; - - while (height--) { - - /* - * Pick up bits for this scanline - */ - bits = READ(t); - t += tileStride; - if (t >= tileEnd) - t = tile; - bits = FbRotLeft(bits, rot); - and = fbAnd(alu, bits, pm); - xor = fbXor(alu, bits, pm); - - if (startmask) { - FbDoLeftMaskByteRRop(dst, startbyte, startmask, and, xor); - dst++; - } - n = nmiddle; - if (!and) - while (n--) - WRITE(dst++, xor); - else - while (n--) { - WRITE(dst, FbDoRRop(READ(dst), and, xor)); - dst++; - } - if (endmask) - FbDoRightMaskByteRRop(dst, endbyte, endmask, and, xor); - dst += dstStride; - } -} - -void -fbOddTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileWidth, - int tileHeight, int alu, FbBits pm, int bpp, int xRot, int yRot) -{ - int tileX, tileY; - int widthTmp; - int h, w; - int x, y; - - modulus(-yRot, tileHeight, tileY); - y = 0; - while (height) { - h = tileHeight - tileY; - if (h > height) - h = height; - height -= h; - widthTmp = width; - x = dstX; - modulus(dstX - xRot, tileWidth, tileX); - while (widthTmp) { - w = tileWidth - tileX; - if (w > widthTmp) - w = widthTmp; - widthTmp -= w; - fbBlt(tile + tileY * tileStride, - tileStride, - tileX, - dst + y * dstStride, - dstStride, x, w, h, alu, pm, bpp, FALSE, FALSE); - x += w; - tileX = 0; - } - y += h; - tileY = 0; - } -} - -void -fbTile(FbBits * dst, - FbStride dstStride, - int dstX, - int width, - int height, - FbBits * tile, - FbStride tileStride, - int tileWidth, - int tileHeight, int alu, FbBits pm, int bpp, int xRot, int yRot) -{ - if (FbEvenTile(tileWidth)) - fbEvenTile(dst, dstStride, dstX, width, height, - tile, tileStride, tileHeight, alu, pm, xRot, yRot); - else - fbOddTile(dst, dstStride, dstX, width, height, - tile, tileStride, tileWidth, tileHeight, - alu, pm, bpp, xRot, yRot); -} diff --git a/xorg-server/fb/fbutil.c b/xorg-server/fb/fbutil.c index 2ca80d1..c1d5923 100644 --- a/xorg-server/fb/fbutil.c +++ b/xorg-server/fb/fbutil.c @@ -39,84 +39,6 @@ fbReplicatePixel(Pixel p, int bpp) return b; } -void -fbReduceRasterOp(int rop, FbBits fg, FbBits pm, FbBits * andp, FbBits * xorp) -{ - FbBits and, xor; - - switch (rop) { - default: - case GXclear: /* 0 0 0 0 */ - and = 0; - xor = 0; - break; - case GXand: /* 0 0 0 1 */ - and = fg; - xor = 0; - break; - case GXandReverse: /* 0 0 1 0 */ - and = fg; - xor = fg; - break; - case GXcopy: /* 0 0 1 1 */ - and = 0; - xor = fg; - break; - case GXandInverted: /* 0 1 0 0 */ - and = ~fg; - xor = 0; - break; - case GXnoop: /* 0 1 0 1 */ - and = FB_ALLONES; - xor = 0; - break; - case GXxor: /* 0 1 1 0 */ - and = FB_ALLONES; - xor = fg; - break; - case GXor: /* 0 1 1 1 */ - and = ~fg; - xor = fg; - break; - case GXnor: /* 1 0 0 0 */ - and = ~fg; - xor = ~fg; - break; - case GXequiv: /* 1 0 0 1 */ - and = FB_ALLONES; - xor = ~fg; - break; - case GXinvert: /* 1 0 1 0 */ - and = FB_ALLONES; - xor = FB_ALLONES; - break; - case GXorReverse: /* 1 0 1 1 */ - and = ~fg; - xor = FB_ALLONES; - break; - case GXcopyInverted: /* 1 1 0 0 */ - and = 0; - xor = ~fg; - break; - case GXorInverted: /* 1 1 0 1 */ - and = fg; - xor = ~fg; - break; - case GXnand: /* 1 1 1 0 */ - and = fg; - xor = FB_ALLONES; - break; - case GXset: /* 1 1 1 1 */ - and = 0; - xor = FB_ALLONES; - break; - } - and |= ~pm; - xor &= pm; - *andp = and; - *xorp = xor; -} - #define O 0 #define I FB_ALLONES @@ -139,233 +61,3 @@ const FbMergeRopRec FbMergeRopBits[16] = { {O, O, O, I}, /* set 0xf 1 */ }; -/* - * Stipple masks are independent of bit/byte order as long - * as bitorder == byteorder. FB doesn't handle the case - * where these differ - */ -#define BitsMask(x,w) ((FB_ALLONES << ((x) & FB_MASK)) & \ - (FB_ALLONES >> ((FB_UNIT - ((x) + (w))) & FB_MASK))) - -#define Mask(x,w) BitsMask((x)*(w),(w)) - -#define SelMask(b,n,w) ((((b) >> n) & 1) * Mask(n,w)) - -#define C1(b,w) \ - (SelMask(b,0,w)) - -#define C2(b,w) \ - (SelMask(b,0,w) | \ - SelMask(b,1,w)) - -#define C4(b,w) \ - (SelMask(b,0,w) | \ - SelMask(b,1,w) | \ - SelMask(b,2,w) | \ - SelMask(b,3,w)) - -#define C8(b,w) \ - (SelMask(b,0,w) | \ - SelMask(b,1,w) | \ - SelMask(b,2,w) | \ - SelMask(b,3,w) | \ - SelMask(b,4,w) | \ - SelMask(b,5,w) | \ - SelMask(b,6,w) | \ - SelMask(b,7,w)) - -#if FB_UNIT == 16 -#define fbStipple16Bits 0 -#define fbStipple8Bits 0 -const FbBits fbStipple4Bits[16] = { - C4(0, 4), C4(1, 4), C4(2, 4), C4(3, 4), C4(4, 4), C4(5, 4), - C4(6, 4), C4(7, 4), C4(8, 4), C4(9, 4), C4(10, 4), C4(11, 4), - C4(12, 4), C4(13, 4), C4(14, 4), C4(15, 4), -}; - -const FbBits fbStipple2Bits[4] = { - C2(0, 8), C2(1, 8), C2(2, 8), C2(3, 8), -}; - -const FbBits fbStipple1Bits[2] = { - C1(0, 16), C1(1, 16), -}; -#endif -#if FB_UNIT == 32 -#define fbStipple16Bits 0 -const FbBits fbStipple8Bits[256] = { - C8(0, 4), C8(1, 4), C8(2, 4), C8(3, 4), C8(4, 4), C8(5, 4), - C8(6, 4), C8(7, 4), C8(8, 4), C8(9, 4), C8(10, 4), C8(11, 4), - C8(12, 4), C8(13, 4), C8(14, 4), C8(15, 4), C8(16, 4), C8(17, 4), - C8(18, 4), C8(19, 4), C8(20, 4), C8(21, 4), C8(22, 4), C8(23, 4), - C8(24, 4), C8(25, 4), C8(26, 4), C8(27, 4), C8(28, 4), C8(29, 4), - C8(30, 4), C8(31, 4), C8(32, 4), C8(33, 4), C8(34, 4), C8(35, 4), - C8(36, 4), C8(37, 4), C8(38, 4), C8(39, 4), C8(40, 4), C8(41, 4), - C8(42, 4), C8(43, 4), C8(44, 4), C8(45, 4), C8(46, 4), C8(47, 4), - C8(48, 4), C8(49, 4), C8(50, 4), C8(51, 4), C8(52, 4), C8(53, 4), - C8(54, 4), C8(55, 4), C8(56, 4), C8(57, 4), C8(58, 4), C8(59, 4), - C8(60, 4), C8(61, 4), C8(62, 4), C8(63, 4), C8(64, 4), C8(65, 4), - C8(66, 4), C8(67, 4), C8(68, 4), C8(69, 4), C8(70, 4), C8(71, 4), - C8(72, 4), C8(73, 4), C8(74, 4), C8(75, 4), C8(76, 4), C8(77, 4), - C8(78, 4), C8(79, 4), C8(80, 4), C8(81, 4), C8(82, 4), C8(83, 4), - C8(84, 4), C8(85, 4), C8(86, 4), C8(87, 4), C8(88, 4), C8(89, 4), - C8(90, 4), C8(91, 4), C8(92, 4), C8(93, 4), C8(94, 4), C8(95, 4), - C8(96, 4), C8(97, 4), C8(98, 4), C8(99, 4), C8(100, 4), C8(101, 4), - C8(102, 4), C8(103, 4), C8(104, 4), C8(105, 4), C8(106, 4), C8(107, 4), - C8(108, 4), C8(109, 4), C8(110, 4), C8(111, 4), C8(112, 4), C8(113, 4), - C8(114, 4), C8(115, 4), C8(116, 4), C8(117, 4), C8(118, 4), C8(119, 4), - C8(120, 4), C8(121, 4), C8(122, 4), C8(123, 4), C8(124, 4), C8(125, 4), - C8(126, 4), C8(127, 4), C8(128, 4), C8(129, 4), C8(130, 4), C8(131, 4), - C8(132, 4), C8(133, 4), C8(134, 4), C8(135, 4), C8(136, 4), C8(137, 4), - C8(138, 4), C8(139, 4), C8(140, 4), C8(141, 4), C8(142, 4), C8(143, 4), - C8(144, 4), C8(145, 4), C8(146, 4), C8(147, 4), C8(148, 4), C8(149, 4), - C8(150, 4), C8(151, 4), C8(152, 4), C8(153, 4), C8(154, 4), C8(155, 4), - C8(156, 4), C8(157, 4), C8(158, 4), C8(159, 4), C8(160, 4), C8(161, 4), - C8(162, 4), C8(163, 4), C8(164, 4), C8(165, 4), C8(166, 4), C8(167, 4), - C8(168, 4), C8(169, 4), C8(170, 4), C8(171, 4), C8(172, 4), C8(173, 4), - C8(174, 4), C8(175, 4), C8(176, 4), C8(177, 4), C8(178, 4), C8(179, 4), - C8(180, 4), C8(181, 4), C8(182, 4), C8(183, 4), C8(184, 4), C8(185, 4), - C8(186, 4), C8(187, 4), C8(188, 4), C8(189, 4), C8(190, 4), C8(191, 4), - C8(192, 4), C8(193, 4), C8(194, 4), C8(195, 4), C8(196, 4), C8(197, 4), - C8(198, 4), C8(199, 4), C8(200, 4), C8(201, 4), C8(202, 4), C8(203, 4), - C8(204, 4), C8(205, 4), C8(206, 4), C8(207, 4), C8(208, 4), C8(209, 4), - C8(210, 4), C8(211, 4), C8(212, 4), C8(213, 4), C8(214, 4), C8(215, 4), - C8(216, 4), C8(217, 4), C8(218, 4), C8(219, 4), C8(220, 4), C8(221, 4), - C8(222, 4), C8(223, 4), C8(224, 4), C8(225, 4), C8(226, 4), C8(227, 4), - C8(228, 4), C8(229, 4), C8(230, 4), C8(231, 4), C8(232, 4), C8(233, 4), - C8(234, 4), C8(235, 4), C8(236, 4), C8(237, 4), C8(238, 4), C8(239, 4), - C8(240, 4), C8(241, 4), C8(242, 4), C8(243, 4), C8(244, 4), C8(245, 4), - C8(246, 4), C8(247, 4), C8(248, 4), C8(249, 4), C8(250, 4), C8(251, 4), - C8(252, 4), C8(253, 4), C8(254, 4), C8(255, 4), -}; - -const FbBits fbStipple4Bits[16] = { - C4(0, 8), C4(1, 8), C4(2, 8), C4(3, 8), C4(4, 8), C4(5, 8), - C4(6, 8), C4(7, 8), C4(8, 8), C4(9, 8), C4(10, 8), C4(11, 8), - C4(12, 8), C4(13, 8), C4(14, 8), C4(15, 8), -}; - -const FbBits fbStipple2Bits[4] = { - C2(0, 16), C2(1, 16), C2(2, 16), C2(3, 16), -}; - -const FbBits fbStipple1Bits[2] = { - C1(0, 32), C1(1, 32), -}; -#endif -#if FB_UNIT == 64 -const FbBits fbStipple16Bits[256] = { - C8(0, 4), C8(1, 4), C8(2, 4), C8(3, 4), C8(4, 4), C8(5, 4), - C8(6, 4), C8(7, 4), C8(8, 4), C8(9, 4), C8(10, 4), C8(11, 4), - C8(12, 4), C8(13, 4), C8(14, 4), C8(15, 4), C8(16, 4), C8(17, 4), - C8(18, 4), C8(19, 4), C8(20, 4), C8(21, 4), C8(22, 4), C8(23, 4), - C8(24, 4), C8(25, 4), C8(26, 4), C8(27, 4), C8(28, 4), C8(29, 4), - C8(30, 4), C8(31, 4), C8(32, 4), C8(33, 4), C8(34, 4), C8(35, 4), - C8(36, 4), C8(37, 4), C8(38, 4), C8(39, 4), C8(40, 4), C8(41, 4), - C8(42, 4), C8(43, 4), C8(44, 4), C8(45, 4), C8(46, 4), C8(47, 4), - C8(48, 4), C8(49, 4), C8(50, 4), C8(51, 4), C8(52, 4), C8(53, 4), - C8(54, 4), C8(55, 4), C8(56, 4), C8(57, 4), C8(58, 4), C8(59, 4), - C8(60, 4), C8(61, 4), C8(62, 4), C8(63, 4), C8(64, 4), C8(65, 4), - C8(66, 4), C8(67, 4), C8(68, 4), C8(69, 4), C8(70, 4), C8(71, 4), - C8(72, 4), C8(73, 4), C8(74, 4), C8(75, 4), C8(76, 4), C8(77, 4), - C8(78, 4), C8(79, 4), C8(80, 4), C8(81, 4), C8(82, 4), C8(83, 4), - C8(84, 4), C8(85, 4), C8(86, 4), C8(87, 4), C8(88, 4), C8(89, 4), - C8(90, 4), C8(91, 4), C8(92, 4), C8(93, 4), C8(94, 4), C8(95, 4), - C8(96, 4), C8(97, 4), C8(98, 4), C8(99, 4), C8(100, 4), C8(101, 4), - C8(102, 4), C8(103, 4), C8(104, 4), C8(105, 4), C8(106, 4), C8(107, 4), - C8(108, 4), C8(109, 4), C8(110, 4), C8(111, 4), C8(112, 4), C8(113, 4), - C8(114, 4), C8(115, 4), C8(116, 4), C8(117, 4), C8(118, 4), C8(119, 4), - C8(120, 4), C8(121, 4), C8(122, 4), C8(123, 4), C8(124, 4), C8(125, 4), - C8(126, 4), C8(127, 4), C8(128, 4), C8(129, 4), C8(130, 4), C8(131, 4), - C8(132, 4), C8(133, 4), C8(134, 4), C8(135, 4), C8(136, 4), C8(137, 4), - C8(138, 4), C8(139, 4), C8(140, 4), C8(141, 4), C8(142, 4), C8(143, 4), - C8(144, 4), C8(145, 4), C8(146, 4), C8(147, 4), C8(148, 4), C8(149, 4), - C8(150, 4), C8(151, 4), C8(152, 4), C8(153, 4), C8(154, 4), C8(155, 4), - C8(156, 4), C8(157, 4), C8(158, 4), C8(159, 4), C8(160, 4), C8(161, 4), - C8(162, 4), C8(163, 4), C8(164, 4), C8(165, 4), C8(166, 4), C8(167, 4), - C8(168, 4), C8(169, 4), C8(170, 4), C8(171, 4), C8(172, 4), C8(173, 4), - C8(174, 4), C8(175, 4), C8(176, 4), C8(177, 4), C8(178, 4), C8(179, 4), - C8(180, 4), C8(181, 4), C8(182, 4), C8(183, 4), C8(184, 4), C8(185, 4), - C8(186, 4), C8(187, 4), C8(188, 4), C8(189, 4), C8(190, 4), C8(191, 4), - C8(192, 4), C8(193, 4), C8(194, 4), C8(195, 4), C8(196, 4), C8(197, 4), - C8(198, 4), C8(199, 4), C8(200, 4), C8(201, 4), C8(202, 4), C8(203, 4), - C8(204, 4), C8(205, 4), C8(206, 4), C8(207, 4), C8(208, 4), C8(209, 4), - C8(210, 4), C8(211, 4), C8(212, 4), C8(213, 4), C8(214, 4), C8(215, 4), - C8(216, 4), C8(217, 4), C8(218, 4), C8(219, 4), C8(220, 4), C8(221, 4), - C8(222, 4), C8(223, 4), C8(224, 4), C8(225, 4), C8(226, 4), C8(227, 4), - C8(228, 4), C8(229, 4), C8(230, 4), C8(231, 4), C8(232, 4), C8(233, 4), - C8(234, 4), C8(235, 4), C8(236, 4), C8(237, 4), C8(238, 4), C8(239, 4), - C8(240, 4), C8(241, 4), C8(242, 4), C8(243, 4), C8(244, 4), C8(245, 4), - C8(246, 4), C8(247, 4), C8(248, 4), C8(249, 4), C8(250, 4), C8(251, 4), - C8(252, 4), C8(253, 4), C8(254, 4), C8(255, 4), -}; - -const FbBits fbStipple8Bits[256] = { - C8(0, 8), C8(1, 8), C8(2, 8), C8(3, 8), C8(4, 8), C8(5, 8), - C8(6, 8), C8(7, 8), C8(8, 8), C8(9, 8), C8(10, 8), C8(11, 8), - C8(12, 8), C8(13, 8), C8(14, 8), C8(15, 8), C8(16, 8), C8(17, 8), - C8(18, 8), C8(19, 8), C8(20, 8), C8(21, 8), C8(22, 8), C8(23, 8), - C8(24, 8), C8(25, 8), C8(26, 8), C8(27, 8), C8(28, 8), C8(29, 8), - C8(30, 8), C8(31, 8), C8(32, 8), C8(33, 8), C8(34, 8), C8(35, 8), - C8(36, 8), C8(37, 8), C8(38, 8), C8(39, 8), C8(40, 8), C8(41, 8), - C8(42, 8), C8(43, 8), C8(44, 8), C8(45, 8), C8(46, 8), C8(47, 8), - C8(48, 8), C8(49, 8), C8(50, 8), C8(51, 8), C8(52, 8), C8(53, 8), - C8(54, 8), C8(55, 8), C8(56, 8), C8(57, 8), C8(58, 8), C8(59, 8), - C8(60, 8), C8(61, 8), C8(62, 8), C8(63, 8), C8(64, 8), C8(65, 8), - C8(66, 8), C8(67, 8), C8(68, 8), C8(69, 8), C8(70, 8), C8(71, 8), - C8(72, 8), C8(73, 8), C8(74, 8), C8(75, 8), C8(76, 8), C8(77, 8), - C8(78, 8), C8(79, 8), C8(80, 8), C8(81, 8), C8(82, 8), C8(83, 8), - C8(84, 8), C8(85, 8), C8(86, 8), C8(87, 8), C8(88, 8), C8(89, 8), - C8(90, 8), C8(91, 8), C8(92, 8), C8(93, 8), C8(94, 8), C8(95, 8), - C8(96, 8), C8(97, 8), C8(98, 8), C8(99, 8), C8(100, 8), C8(101, 8), - C8(102, 8), C8(103, 8), C8(104, 8), C8(105, 8), C8(106, 8), C8(107, 8), - C8(108, 8), C8(109, 8), C8(110, 8), C8(111, 8), C8(112, 8), C8(113, 8), - C8(114, 8), C8(115, 8), C8(116, 8), C8(117, 8), C8(118, 8), C8(119, 8), - C8(120, 8), C8(121, 8), C8(122, 8), C8(123, 8), C8(124, 8), C8(125, 8), - C8(126, 8), C8(127, 8), C8(128, 8), C8(129, 8), C8(130, 8), C8(131, 8), - C8(132, 8), C8(133, 8), C8(134, 8), C8(135, 8), C8(136, 8), C8(137, 8), - C8(138, 8), C8(139, 8), C8(140, 8), C8(141, 8), C8(142, 8), C8(143, 8), - C8(144, 8), C8(145, 8), C8(146, 8), C8(147, 8), C8(148, 8), C8(149, 8), - C8(150, 8), C8(151, 8), C8(152, 8), C8(153, 8), C8(154, 8), C8(155, 8), - C8(156, 8), C8(157, 8), C8(158, 8), C8(159, 8), C8(160, 8), C8(161, 8), - C8(162, 8), C8(163, 8), C8(164, 8), C8(165, 8), C8(166, 8), C8(167, 8), - C8(168, 8), C8(169, 8), C8(170, 8), C8(171, 8), C8(172, 8), C8(173, 8), - C8(174, 8), C8(175, 8), C8(176, 8), C8(177, 8), C8(178, 8), C8(179, 8), - C8(180, 8), C8(181, 8), C8(182, 8), C8(183, 8), C8(184, 8), C8(185, 8), - C8(186, 8), C8(187, 8), C8(188, 8), C8(189, 8), C8(190, 8), C8(191, 8), - C8(192, 8), C8(193, 8), C8(194, 8), C8(195, 8), C8(196, 8), C8(197, 8), - C8(198, 8), C8(199, 8), C8(200, 8), C8(201, 8), C8(202, 8), C8(203, 8), - C8(204, 8), C8(205, 8), C8(206, 8), C8(207, 8), C8(208, 8), C8(209, 8), - C8(210, 8), C8(211, 8), C8(212, 8), C8(213, 8), C8(214, 8), C8(215, 8), - C8(216, 8), C8(217, 8), C8(218, 8), C8(219, 8), C8(220, 8), C8(221, 8), - C8(222, 8), C8(223, 8), C8(224, 8), C8(225, 8), C8(226, 8), C8(227, 8), - C8(228, 8), C8(229, 8), C8(230, 8), C8(231, 8), C8(232, 8), C8(233, 8), - C8(234, 8), C8(235, 8), C8(236, 8), C8(237, 8), C8(238, 8), C8(239, 8), - C8(240, 8), C8(241, 8), C8(242, 8), C8(243, 8), C8(244, 8), C8(245, 8), - C8(246, 8), C8(247, 8), C8(248, 8), C8(249, 8), C8(250, 8), C8(251, 8), - C8(252, 8), C8(253, 8), C8(254, 8), C8(255, 8), -}; - -const FbBits fbStipple4Bits[16] = { - C4(0, 16), C4(1, 16), C4(2, 16), C4(3, 16), C4(4, 16), C4(5, 16), - C4(6, 16), C4(7, 16), C4(8, 16), C4(9, 16), C4(10, 16), C4(11, 16), - C4(12, 16), C4(13, 16), C4(14, 16), C4(15, 16), -}; - -const FbBits fbStipple2Bits[4] = { - C2(0, 32), C2(1, 32), C2(2, 32), C2(3, 32), -}; - -#define fbStipple1Bits 0 -#endif -const FbBits *const fbStippleTable[] = { - 0, - fbStipple1Bits, - fbStipple2Bits, - 0, - fbStipple4Bits, - 0, - 0, - 0, - fbStipple8Bits, -}; diff --git a/xorg-server/fb/wfbrename.h b/xorg-server/fb/wfbrename.h index 749c6d0..baa80f8 100644 --- a/xorg-server/fb/wfbrename.h +++ b/xorg-server/fb/wfbrename.h @@ -1,4 +1,3 @@ -#define fb16Lane wfb16Lane #define fb24_32CopyMtoN wfb24_32CopyMtoN #define fb24_32CreateScreenResources wfb24_32CreateScreenResources #define fb24_32GetImage wfb24_32GetImage @@ -7,8 +6,6 @@ #define fb24_32PutZImage wfb24_32PutZImage #define fb24_32ReformatTile wfb24_32ReformatTile #define fb24_32SetSpans wfb24_32SetSpans -#define fb32Lane wfb32Lane -#define fb8Lane wfb8Lane #define fbAddTraps wfbAddTraps #define fbAddTriangles wfbAddTriangles #define fbAllocatePrivates wfbAllocatePrivates @@ -61,8 +58,6 @@ #define fbDots24 wfbDots24 #define fbDots32 wfbDots32 #define fbDots8 wfbDots8 -#define fbEvenStipple wfbEvenStipple -#define fbEvenTile wfbEvenTile #define fbExpandDirectColors wfbExpandDirectColors #define fbFill wfbFill #define fbFillRegionSolid wfbFillRegionSolid @@ -79,18 +74,13 @@ #define fbGlyph24 wfbGlyph24 #define fbGlyph32 wfbGlyph32 #define fbGlyph8 wfbGlyph8 -#define fbGlyphIn wfbGlyphIn #define fbHasVisualTypes wfbHasVisualTypes #define fbImageGlyphBlt wfbImageGlyphBlt #define fbIn wfbIn #define fbInitializeColormap wfbInitializeColormap #define fbInitVisuals wfbInitVisuals -#define fbInstallColormap wfbInstallColormap -#define fbLaneTable wfbLaneTable #define fbListInstalledColormaps wfbListInstalledColormaps #define FbMergeRopBits wFbMergeRopBits -#define fbOddStipple wfbOddStipple -#define fbOddTile wfbOddTile #define fbOver wfbOver #define fbOver24 wfbOver24 #define fbOverlayCloseScreen wfbOverlayCloseScreen @@ -133,8 +123,6 @@ #define fbQueryBestSize wfbQueryBestSize #define fbRasterizeTrapezoid wfbRasterizeTrapezoid #define fbRealizeFont wfbRealizeFont -#define fbRealizeWindow wfbRealizeWindow -#define fbReduceRasterOp wfbReduceRasterOp #define fbReplicatePixel wfbReplicatePixel #define fbResolveColor wfbResolveColor #define fbScreenPrivateKeyRec wfbScreenPrivateKeyRec @@ -148,15 +136,6 @@ #define fbSolid wfbSolid #define fbSolid24 wfbSolid24 #define fbSolidBoxClipped wfbSolidBoxClipped -#define fbStipple wfbStipple -#define fbStipple1Bits wfbStipple1Bits -#define fbStipple24Bits wfbStipple24Bits -#define fbStipple2Bits wfbStipple2Bits -#define fbStipple4Bits wfbStipple4Bits -#define fbStipple8Bits wfbStipple8Bits -#define fbStippleTable wfbStippleTable -#define fbTile wfbTile -#define fbTransparentSpan wfbTransparentSpan #define fbTrapezoids wfbTrapezoids #define fbTriangles wfbTriangles #define fbUninstallColormap wfbUninstallColormap @@ -164,7 +143,5 @@ #define fbUnrealizeFont wfbUnrealizeFont #define fbValidateGC wfbValidateGC #define fbWinPrivateKeyRec wfbWinPrivateKeyRec -#define fbZeroLine wfbZeroLine -#define fbZeroSegment wfbZeroSegment #define free_pixman_pict wfb_free_pixman_pict #define image_from_pict wfb_image_from_pict diff --git a/xorg-server/glamor/glamor.c b/xorg-server/glamor/glamor.c index fc24b1b..d228e35 100644 --- a/xorg-server/glamor/glamor.c +++ b/xorg-server/glamor/glamor.c @@ -106,6 +106,7 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex) ErrorF("XXX fail to create fbo.\n"); return; } + fbo->external = TRUE; glamor_pixmap_attach_fbo(pixmap, fbo); } diff --git a/xorg-server/glamor/glamor_fbo.c b/xorg-server/glamor/glamor_fbo.c index 090dfd8..4273826 100644 --- a/xorg-server/glamor/glamor_fbo.c +++ b/xorg-server/glamor/glamor_fbo.c @@ -153,7 +153,7 @@ glamor_pixmap_fbo_cache_put(glamor_pixmap_fbo *fbo) #else n_format = cache_format(fbo->format); - if (fbo->fb == 0 || n_format == -1 + if (fbo->fb == 0 || fbo->external || n_format == -1 || fbo->glamor_priv->fbo_cache_watermark >= FBO_CACHE_THRESHOLD) { fbo->glamor_priv->tick += GLAMOR_CACHE_EXPIRE_MAX; glamor_fbo_expire(fbo->glamor_priv); @@ -237,6 +237,7 @@ glamor_create_fbo_from_tex(glamor_screen_private *glamor_priv, fbo->tex = tex; fbo->width = w; fbo->height = h; + fbo->external = FALSE; fbo->format = format; fbo->glamor_priv = glamor_priv; diff --git a/xorg-server/glamor/glamor_picture.c b/xorg-server/glamor/glamor_picture.c index cbbc194..bc658f8 100644 --- a/xorg-server/glamor/glamor_picture.c +++ b/xorg-server/glamor/glamor_picture.c @@ -45,7 +45,7 @@ glamor_upload_picture_to_texture(PicturePtr picture) return glamor_upload_pixmap_to_texture(pixmap); } -/* +/* * We should already have drawable attached to it, if it has one. * Then set the attached pixmap to is_picture format, and set * the pict format. diff --git a/xorg-server/glamor/glamor_pixmap.c b/xorg-server/glamor/glamor_pixmap.c index 355fe4b..947113e 100644 --- a/xorg-server/glamor/glamor_pixmap.c +++ b/xorg-server/glamor/glamor_pixmap.c @@ -774,8 +774,8 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, return FALSE; bits = glamor_color_convert_to_bits(bits, converted_bits, w, h, stride, no_alpha, revert, swap_rb); - free(converted_bits); if (bits == NULL) { + free(converted_bits); ErrorF("Failed to convert pixmap no_alpha %d," "revert mode %d, swap mode %d\n", no_alpha, revert, swap_rb); return FALSE; @@ -808,45 +808,44 @@ _glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, format, type, x + fbo_x_off, y + fbo_y_off, w, h, bits, pbo); - return TRUE; + } else { + ptexcoords = texcoords_inv; + + pixmap_priv_get_dest_scale(pixmap_priv, &dst_xscale, &dst_yscale); + glamor_set_normalize_vcoords(pixmap_priv, dst_xscale, + dst_yscale, + x, y, + x + w, y + h, + vertices); + /* Slow path, we need to flip y or wire alpha to 1. */ + glamor_make_current(glamor_priv); + glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, + GL_FALSE, 2 * sizeof(float), vertices); + glEnableVertexAttribArray(GLAMOR_VERTEX_POS); + glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, + GL_FALSE, 2 * sizeof(float), ptexcoords); + glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); + + glamor_set_destination_pixmap_priv_nc(pixmap_priv); + __glamor_upload_pixmap_to_texture(pixmap, &tex, + format, type, 0, 0, w, h, bits, pbo); + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, tex); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glUseProgram(glamor_priv->finish_access_prog[no_alpha]); + glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert); + glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], swap_rb); + + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + glDisableVertexAttribArray(GLAMOR_VERTEX_POS); + glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); + glDeleteTextures(1, &tex); + glBindFramebuffer(GL_FRAMEBUFFER, 0); } - ptexcoords = texcoords_inv; - - pixmap_priv_get_dest_scale(pixmap_priv, &dst_xscale, &dst_yscale); - glamor_set_normalize_vcoords(pixmap_priv, dst_xscale, - dst_yscale, - x, y, - x + w, y + h, - vertices); - /* Slow path, we need to flip y or wire alpha to 1. */ - glamor_make_current(glamor_priv); - glVertexAttribPointer(GLAMOR_VERTEX_POS, 2, GL_FLOAT, - GL_FALSE, 2 * sizeof(float), vertices); - glEnableVertexAttribArray(GLAMOR_VERTEX_POS); - glVertexAttribPointer(GLAMOR_VERTEX_SOURCE, 2, GL_FLOAT, - GL_FALSE, 2 * sizeof(float), ptexcoords); - glEnableVertexAttribArray(GLAMOR_VERTEX_SOURCE); - - glamor_set_destination_pixmap_priv_nc(pixmap_priv); - __glamor_upload_pixmap_to_texture(pixmap, &tex, - format, type, 0, 0, w, h, bits, pbo); - glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, tex); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glUseProgram(glamor_priv->finish_access_prog[no_alpha]); - glUniform1i(glamor_priv->finish_access_revert[no_alpha], revert); - glUniform1i(glamor_priv->finish_access_swap_rb[no_alpha], swap_rb); - - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - - glDisableVertexAttribArray(GLAMOR_VERTEX_POS); - glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); - glDeleteTextures(1, &tex); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - if (need_free_bits) free(bits); return TRUE; diff --git a/xorg-server/glamor/glamor_priv.h b/xorg-server/glamor/glamor_priv.h index c089db8..885f12a 100644 --- a/xorg-server/glamor/glamor_priv.h +++ b/xorg-server/glamor/glamor_priv.h @@ -352,6 +352,7 @@ enum glamor_fbo_state { * @pbo: attached pbo. * @width: width of this fbo. * @height: height of this fbo. + * @external set when the texture was not created by glamor * @format: internal format of this fbo's texture. * @type: internal type of this fbo's texture. * @glamor_priv: point to glamor private data. @@ -365,6 +366,7 @@ typedef struct glamor_pixmap_fbo { GLuint pbo; int width; int height; + Bool external; GLenum format; GLenum type; glamor_screen_private *glamor_priv; diff --git a/xorg-server/glx/glxbyteorder.h b/xorg-server/glx/glxbyteorder.h index 73f0f7d..aa88b44 100644 --- a/xorg-server/glx/glxbyteorder.h +++ b/xorg-server/glx/glxbyteorder.h @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2006, 2007 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL @@ -25,7 +25,7 @@ /** * \file glxbyteorder.h * Platform glue for handling byte-ordering issues in GLX protocol. - * + * * \author Ian Romanick <idr(a)us.ibm.com> */ #if !defined(__GLXBYTEORDER_H__) diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index d11c667..8d3fa9f 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -233,13 +233,13 @@ DoCreateContext(__GLXclientState * cl, GLXContextID gcId, LEGAL_NEW_RESOURCE(gcId, client); /* - ** Find the display list space that we want to share. + ** Find the display list space that we want to share. ** ** NOTE: In a multithreaded X server, we would need to keep a reference - ** count for each display list so that if one client detroyed a list that - ** another client was using, the list would not really be freed until it - ** was no longer in use. Since this sample implementation has no support - ** for multithreaded servers, we don't do this. + ** count for each display list so that if one client detroyed a list that + ** another client was using, the list would not really be freed until it + ** was no longer in use. Since this sample implementation has no support + ** for multithreaded servers, we don't do this. */ if (shareList == None) { shareglxc = 0; @@ -992,7 +992,7 @@ __glXDisp_GetVisualConfigs(__GLXclientState * cl, GLbyte * pc) buf[p++] = modes->level; assert(p == GLX_VIS_CONFIG_UNPAIRED); - /* + /* ** Add token/value pairs for extensions. */ buf[p++] = GLX_VISUAL_CAVEAT_EXT; @@ -1041,7 +1041,7 @@ __glXDisp_GetVisualConfigs(__GLXclientState * cl, GLbyte * pc) * and interface into the driver on the server-side to get GLXFBConfigs, * so we "invent" some based on the \c __GLXvisualConfig structures that * the driver does supply. - * + * * The reply format for both \c glXGetFBConfigs and \c glXGetFBConfigsSGIX * is the same, so this routine pulls double duty. */ @@ -2253,9 +2253,9 @@ __glXDisp_RenderLarge(__GLXclientState * cl, GLbyte * pc) /* NOTE: the two pad macros have been added below; they are needed ** because the client library pads the total byte count, but not ** the per-request byte counts. The Protocol Encoding says the - ** total byte count should not be padded, so a proposal will be - ** made to the ARB to relax the padding constraint on the total - ** byte count, thus preserving backward compatibility. Meanwhile, + ** total byte count should not be padded, so a proposal will be + ** made to the ARB to relax the padding constraint on the total + ** byte count, thus preserving backward compatibility. Meanwhile, ** the padding done below fixes a bug that did not allow ** large commands of odd sizes to be accepted by the server. */ @@ -2528,7 +2528,7 @@ __glXpresentCompleteNotify(WindowPtr window, CARD8 present_kind, CARD8 present_m glx_type = GLX_FLIP_COMPLETE_INTEL; else glx_type = GLX_BLIT_COMPLETE_INTEL; - + __glXsendSwapEvent(drawable, glx_type, ust, msc, serial); } diff --git a/xorg-server/glx/glxdri2.c b/xorg-server/glx/glxdri2.c index 5a8966f..bcd57a4 100644 --- a/xorg-server/glx/glxdri2.c +++ b/xorg-server/glx/glxdri2.c @@ -187,7 +187,7 @@ __glXdriSwapEvent(ClientPtr client, void *data, int type, CARD64 ust, glx_type = GLX_FLIP_COMPLETE_INTEL; break; } - + __glXsendSwapEvent(drawable, glx_type, ust, msc, sbc); } diff --git a/xorg-server/glx/glxscreens.c b/xorg-server/glx/glxscreens.c index 78769f4..b0ad3b7 100644 --- a/xorg-server/glx/glxscreens.c +++ b/xorg-server/glx/glxscreens.c @@ -155,7 +155,7 @@ static const char GLServerExtensions[] = "GL_SUN_slice_accum "; /* -** We have made the simplifying assuption that the same extensions are +** We have made the simplifying assuption that the same extensions are ** supported across all screens in a multi-screen system. */ unsigned glxMajorVersion = SERVER_GLX_MAJOR_VERSION; diff --git a/xorg-server/glx/glxscreens.h b/xorg-server/glx/glxscreens.h index c8119fd..a905877 100644 --- a/xorg-server/glx/glxscreens.h +++ b/xorg-server/glx/glxscreens.h @@ -56,7 +56,7 @@ struct __GLXconfig { /* GLX */ GLint visualID; - GLint visualType; /**< One of the GLX X visual types. (i.e., + GLint visualType; /**< One of the GLX X visual types. (i.e., * \c GLX_TRUE_COLOR, etc.) */ diff --git a/xorg-server/glx/indirect_dispatch.c b/xorg-server/glx/indirect_dispatch.c index f6cabef..24784e6 100644 --- a/xorg-server/glx/indirect_dispatch.c +++ b/xorg-server/glx/indirect_dispatch.c @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h index e6e3fda..536be60 100644 --- a/xorg-server/glx/indirect_dispatch.h +++ b/xorg-server/glx/indirect_dispatch.h @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_dispatch_swap.c b/xorg-server/glx/indirect_dispatch_swap.c index c0bb64d..7ebcc63 100644 --- a/xorg-server/glx/indirect_dispatch_swap.c +++ b/xorg-server/glx/indirect_dispatch_swap.c @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_program.c b/xorg-server/glx/indirect_program.c index d503262..cda139e 100644 --- a/xorg-server/glx/indirect_program.c +++ b/xorg-server/glx/indirect_program.c @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2005, 2006 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c index 026afb6..abd0766 100644 --- a/xorg-server/glx/indirect_reqsize.c +++ b/xorg-server/glx/indirect_reqsize.c @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_reqsize.h b/xorg-server/glx/indirect_reqsize.h index 43e1e69..49d400c 100644 --- a/xorg-server/glx/indirect_reqsize.h +++ b/xorg-server/glx/indirect_reqsize.h @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_size.h b/xorg-server/glx/indirect_size.h index fec7ed3..6a3d14c 100644 --- a/xorg-server/glx/indirect_size.h +++ b/xorg-server/glx/indirect_size.h @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2004 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c index f879311..7e81e62 100644 --- a/xorg-server/glx/indirect_size_get.c +++ b/xorg-server/glx/indirect_size_get.c @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2004 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_size_get.h b/xorg-server/glx/indirect_size_get.h index 9b62036..5af11d3 100644 --- a/xorg-server/glx/indirect_size_get.h +++ b/xorg-server/glx/indirect_size_get.h @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2004 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_table.c b/xorg-server/glx/indirect_table.c index 33e3d6a..f0f0b83 100644 --- a/xorg-server/glx/indirect_table.c +++ b/xorg-server/glx/indirect_table.c @@ -3,18 +3,18 @@ /* * (C) Copyright IBM Corporation 2005, 2006 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_table.h b/xorg-server/glx/indirect_table.h index a39dc4e..c0d6ee9 100644 --- a/xorg-server/glx/indirect_table.h +++ b/xorg-server/glx/indirect_table.h @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2005, 2006 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_texture_compression.c b/xorg-server/glx/indirect_texture_compression.c index 2018de6..cda7656 100644 --- a/xorg-server/glx/indirect_texture_compression.c +++ b/xorg-server/glx/indirect_texture_compression.c @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2005, 2006 * 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, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/indirect_util.c b/xorg-server/glx/indirect_util.c index f9d1243..926e57c 100644 --- a/xorg-server/glx/indirect_util.c +++ b/xorg-server/glx/indirect_util.c @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL @@ -205,7 +205,7 @@ get_decode_index(const struct __glXDispatchInfo *dispatch_info, unsigned opcode) unsigned child_index; /* Calculate the slice of bits used by this node. - * + * * If remaining_bits = 8 and tree[index] = 3, the mask of just the * remaining bits is 0x00ff and the mask for the remaining bits after * this node is 0x001f. By taking 0x00ff & ~0x001f, we get 0x00e0. diff --git a/xorg-server/glx/indirect_util.h b/xorg-server/glx/indirect_util.h index 0e65075..f5db262 100644 --- a/xorg-server/glx/indirect_util.h +++ b/xorg-server/glx/indirect_util.h @@ -1,18 +1,18 @@ /* * (C) Copyright IBM Corporation 2005 * All Rights Reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sub license, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c index bcc3a53..ba22d10 100644 --- a/xorg-server/glx/rensize.c +++ b/xorg-server/glx/rensize.c @@ -129,12 +129,12 @@ __glXMap2fReqSize(const GLbyte * pc, Bool swap) /** * Calculate the size of an image. - * + * * The size of an image sent to the server from the client or sent from the * server to the client is calculated. The size is based on the dimensions * of the image, the type of pixel data, padding in the image, and the * alignment requirements of the image. - * + * * \param format Format of the pixels. Same as the \c format parameter * to \c glTexImage1D * \param type Type of the pixel data. Same as the \c type parameter diff --git a/xorg-server/hw/dmx/config/Canvas.c b/xorg-server/hw/dmx/config/Canvas.c index 1031033..3662fe8 100644 --- a/xorg-server/hw/dmx/config/Canvas.c +++ b/xorg-server/hw/dmx/config/Canvas.c @@ -9,7 +9,7 @@ * * 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 diff --git a/xorg-server/hw/dmx/config/dmxprint.c b/xorg-server/hw/dmx/config/dmxprint.c index 3145fb5..9dec52b 100644 --- a/xorg-server/hw/dmx/config/dmxprint.c +++ b/xorg-server/hw/dmx/config/dmxprint.c @@ -35,7 +35,7 @@ * * This file provides support routines and helper functions to be used * to pretty-print DMX configurations. - * + * * Because the DMX configuration file parsing should be capable of being * used in a stand-alone fashion (i.e., independent from the DMX server * source tree), no dependencies on other DMX routines are made. */ diff --git a/xorg-server/hw/dmx/dmxgc.c b/xorg-server/hw/dmx/dmxgc.c index 2d61ea2..2343167 100644 --- a/xorg-server/hw/dmx/dmxgc.c +++ b/xorg-server/hw/dmx/dmxgc.c @@ -391,13 +391,10 @@ dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) pGC->funcs->ChangeClip(pGC, type, pvalue, nrects); /* Set the client clip on the back-end server */ - switch (pGC->clientClipType) { - case CT_NONE: + if (!pGC->clientClip) { if (dmxScreen->beDisplay) XSetClipMask(dmxScreen->beDisplay, pGCPriv->gc, None); - break; - - case CT_REGION: + } else { if (dmxScreen->beDisplay) { nRects = RegionNumRects((RegionPtr) pGC->clientClip); pRects = malloc(nRects * sizeof(*pRects)); @@ -416,11 +413,6 @@ dmxChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) free(pRects); } - break; - - case CT_PIXMAP: - /* Condensed down to REGION in the mi code */ - break; } DMX_GC_FUNC_EPILOGUE(pGC); diff --git a/xorg-server/hw/dmx/dmxpict.h b/xorg-server/hw/dmx/dmxpict.h index 080da3b..f36eca3 100644 --- a/xorg-server/hw/dmx/dmxpict.h +++ b/xorg-server/hw/dmx/dmxpict.h @@ -34,7 +34,7 @@ /** \file * This file provides access to the externally visible RENDER support * functions, global variables and macros for DMX. - * + * * FIXME: Move function definitions for non-externally visible function * to .c file. */ diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c index 23c3366..fb4d5ac 100644 --- a/xorg-server/hw/dmx/glxProxy/glxcmds.c +++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c @@ -188,7 +188,7 @@ CreateContext(__GLXclientState * cl, #endif /* - ** Find the display list space that we want to share. + ** Find the display list space that we want to share. ** */ if (shareList == None) { @@ -1751,7 +1751,7 @@ __glXGetVisualConfigs(__GLXclientState * cl, GLbyte * pc) buf[p++] = pGlxVisual->stencilSize; buf[p++] = pGlxVisual->auxBuffers; buf[p++] = pGlxVisual->level; - /* + /* ** Add token/value pairs for extensions. */ buf[p++] = GLX_VISUAL_CAVEAT_EXT; @@ -3087,7 +3087,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc) void *val; /* - ** Check if windowId is valid + ** Check if windowId is valid */ rc = dixLookupDrawable(&pDraw, windowId, client, M_DRAWABLE_WINDOW, DixAddAccess); @@ -3112,7 +3112,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc) visId = pGlxFBConfig->associatedVisualId; /* - ** Check if the fbconfig supports rendering to windows + ** Check if the fbconfig supports rendering to windows */ if (!(pGlxFBConfig->drawableType & GLX_WINDOW_BIT)) { return BadMatch; @@ -3134,7 +3134,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc) } /* - ** Check if color buffer depth of fbconfig matches depth + ** Check if color buffer depth of fbconfig matches depth ** of window. */ if (pVisual->nplanes != pDraw->depth) { @@ -3144,7 +3144,7 @@ __glXCreateWindow(__GLXclientState * cl, GLbyte * pc) else /* ** The window was created with no visual that corresponds - ** to fbconfig + ** to fbconfig */ return BadMatch; @@ -3561,7 +3561,7 @@ __glXGetDrawableAttributes(__GLXclientState * cl, GLbyte * pc) return __glXBadDrawable; } - /* if the drawable is a window or GLXWindow - + /* if the drawable is a window or GLXWindow - * we need to find the base id on the back-end server */ if (!be_drawable) { @@ -3723,7 +3723,7 @@ __glXChangeDrawableAttributes(__GLXclientState * cl, GLbyte * pc) return __glXBadDrawable; } - /* if the drawable is a window or GLXWindow - + /* if the drawable is a window or GLXWindow - * we need to find the base id on the back-end server */ if (!be_drawable) { diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c index 679a302..0344973 100644 --- a/xorg-server/hw/dmx/glxProxy/glxsingle.c +++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c @@ -233,7 +233,7 @@ __glXForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc) dmxScreen = &dmxScreens[glxc->pScreen->myNum]; dpy = GetBackEndDisplay(cl, glxc->pScreen->myNum); - /* + /* * send the request to the first back-end server */ LockDisplay(dpy); @@ -329,7 +329,7 @@ __glXForwardAllWithReply(__GLXclientState * cl, GLbyte * pc) pc += sz_xGLXSingleReq; buf_size = (req->length << 2) - sz_xGLXSingleReq; - /* + /* * send the request to the first back-end server(s) */ for (s = to_screen; s >= from_screen; s--) { diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.c b/xorg-server/hw/dmx/glxProxy/glxvendor.c index b475daf..fc8aff0 100644 --- a/xorg-server/hw/dmx/glxProxy/glxvendor.c +++ b/xorg-server/hw/dmx/glxProxy/glxvendor.c @@ -220,7 +220,7 @@ __glXVForwardPipe0WithReply(__GLXclientState * cl, GLbyte * pc) dmxScreen = &dmxScreens[glxc->pScreen->myNum]; dpy = GetBackEndDisplay(cl, glxc->pScreen->myNum); - /* + /* * send the request to the first back-end server */ LockDisplay(dpy); @@ -311,7 +311,7 @@ __glXVForwardAllWithReply(__GLXclientState * cl, GLbyte * pc) pc += sz_xGLXVendorPrivateReq; buf_size = (req->length << 2) - sz_xGLXVendorPrivateReq; - /* + /* * send the request to the first back-end server(s) */ for (s = to_screen; s >= from_screen; s--) { diff --git a/xorg-server/hw/dmx/input/ChkNotMaskEv.c b/xorg-server/hw/dmx/input/ChkNotMaskEv.c index bde04ae..8411af8 100644 --- a/xorg-server/hw/dmx/input/ChkNotMaskEv.c +++ b/xorg-server/hw/dmx/input/ChkNotMaskEv.c @@ -16,7 +16,7 @@ * OPEN GROUP 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 Open Group 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 Open Group. diff --git a/xorg-server/hw/dmx/input/lnx-keyboard.c b/xorg-server/hw/dmx/input/lnx-keyboard.c index 1a4d01f..0aa62f4 100644 --- a/xorg-server/hw/dmx/input/lnx-keyboard.c +++ b/xorg-server/hw/dmx/input/lnx-keyboard.c @@ -65,19 +65,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Orest Zborowski and David Dawes - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Orest Zborowski and David Dawes + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Orest Zborowski - * and David Dawes make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * and David Dawes make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OREST ZBOROWSKI AND DAVID DAWES DISCLAIMS ALL WARRANTIES WITH REGARD + * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL OREST ZBOROWSKI OR DAVID DAWES BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ diff --git a/xorg-server/hw/dmx/input/lnx-ms.c b/xorg-server/hw/dmx/input/lnx-ms.c index 210f6de..621f0fe 100644 --- a/xorg-server/hw/dmx/input/lnx-ms.c +++ b/xorg-server/hw/dmx/input/lnx-ms.c @@ -17,7 +17,7 @@ * * 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 diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index 5761710..93a48a9 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.c +++ b/xorg-server/hw/kdrive/ephyr/ephyr.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -313,8 +313,8 @@ ephyrShadowUpdate(ScreenPtr pScreen, shadowBufPtr pBuf) EPHYR_LOG("slow paint"); /* FIXME: Slow Rotated/Reflected updates could be much - * much faster efficiently updating via tranforming - * pBuf->pDamage regions + * much faster efficiently updating via tranforming + * pBuf->pDamage regions */ shadowUpdateRotatePacked(pScreen, pBuf); hostx_paint_rect(screen, 0, 0, 0, 0, screen->width, screen->height); @@ -535,7 +535,7 @@ ephyrRandRSetConfig(ScreenPtr pScreen, goto bail4; } else { - /* Without shadow fb ( non rotated ) we need + /* Without shadow fb ( non rotated ) we need * to use damage to efficiently update display * via signal regions what to copy from 'fb'. */ @@ -687,7 +687,7 @@ ephyrInitScreen(ScreenPtr pScreen) Bool ephyrFinishInitScreen(ScreenPtr pScreen) { - /* FIXME: Calling this even if not using shadow. + /* FIXME: Calling this even if not using shadow. * Seems harmless enough. But may be safer elsewhere. */ if (!shadowSetup(pScreen)) @@ -773,7 +773,7 @@ ephyrCloseScreen(ScreenPtr pScreen) ephyrUnsetInternalDamage(pScreen); } -/* +/* * Port of Mark McLoughlin's Xnest fix for focus in + modifier bug. * See https://bugs.freedesktop.org/show_bug.cgi?id=3030 */ diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h index f3a3c8e..2395a7f 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyr.h +++ b/xorg-server/hw/kdrive/ephyr/ephyr.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)o-hand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.c b/xorg-server/hw/kdrive/ephyr/ephyrdri.c index 16678fc..1e34301 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdri.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdri.h b/xorg-server/hw/kdrive/ephyr/ephyrdri.h index 8f2d302..b312e62 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdri.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrdri.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c index 8368d12..3d5cf77 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.h b/xorg-server/hw/kdrive/ephyr/ephyrdriext.h index 5808576..9755715 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrglxext.c b/xorg-server/hw/kdrive/ephyr/ephyrglxext.c index 632a9c4..248689e 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrglxext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrglxext.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrglxext.h b/xorg-server/hw/kdrive/ephyr/ephyrglxext.h index 053f8d3..8b4b3a2 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrglxext.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrglxext.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c index 007524d..0b98cce 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h index 309d0f2..f1eec5f 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrhostglx.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c index bcfb750..897aa19 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)o-hand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrlog.h b/xorg-server/hw/kdrive/ephyr/ephyrlog.h index 0da0a25..43679e1 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrlog.h +++ b/xorg-server/hw/kdrive/ephyr/ephyrlog.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c index ab18c7a..56a5ff1 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrvideo.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrvideo.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)openedhand.com> - * - * Copyright © 2007 OpenedHand Ltd + * + * Copyright © 2007 OpenedHand Ltd * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c index 0562625..8d6d5e8 100644 --- a/xorg-server/hw/kdrive/ephyr/hostx.c +++ b/xorg-server/hw/kdrive/ephyr/hostx.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)o-hand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -974,15 +974,15 @@ hostx_paint_rect(KdScreenInfo *screen, hostx_paint_debug_rect(screen, dx, dy, width, height); } - /* + /* * If the depth of the ephyr server is less than that of the host, * the kdrive fb does not point to the ximage data but to a buffer * ( fb_data ), we shift the various bits from this onto the XImage * so they match the host. * - * Note, This code is pretty new ( and simple ) so may break on - * endian issues, 32 bpp host etc. - * Not sure if 8bpp case is right either. + * Note, This code is pretty new ( and simple ) so may break on + * endian issues, 32 bpp host etc. + * Not sure if 8bpp case is right either. * ... and it will be slower than the matching depth case. */ diff --git a/xorg-server/hw/kdrive/ephyr/hostx.h b/xorg-server/hw/kdrive/ephyr/hostx.h index 229961e..87acd5a 100644 --- a/xorg-server/hw/kdrive/ephyr/hostx.h +++ b/xorg-server/hw/kdrive/ephyr/hostx.h @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)o-hand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/ephyr/os.c b/xorg-server/hw/kdrive/ephyr/os.c index 56b52d1..0dbcbb8 100644 --- a/xorg-server/hw/kdrive/ephyr/os.c +++ b/xorg-server/hw/kdrive/ephyr/os.c @@ -1,8 +1,8 @@ /* * Xephyr - A kdrive X server thats runs in a host X window. * Authored by Matthew Allum <mallum(a)o-hand.com> - * - * Copyright © 2004 Nokia + * + * Copyright © 2004 Nokia * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c index 163d5c1..369db33 100644 --- a/xorg-server/hw/kdrive/src/kxv.c +++ b/xorg-server/hw/kdrive/src/kxv.c @@ -492,7 +492,7 @@ static void KdXVCopyClip(XvPortRecPrivatePtr portPriv, GCPtr pGC) { /* copy the new clip if it exists */ - if ((pGC->clientClipType == CT_REGION) && pGC->clientClip) { + if (pGC->clientClip) { if (!portPriv->clientClip) portPriv->clientClip = RegionCreate(NullBox, 1); /* Note: this is in window coordinates */ diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am index 30f7c8f..d46bf0a 100644 --- a/xorg-server/hw/xfree86/Makefile.am +++ b/xorg-server/hw/xfree86/Makefile.am @@ -43,7 +43,7 @@ SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \ parser ramdac shadowfb vbe vgahw \ loader dixmods dri dri2 exa modes \ - utils doc man glamor_egl + utils doc man glamor_egl drivers bin_PROGRAMS = Xorg nodist_Xorg_SOURCES = sdksyms.c diff --git a/xorg-server/hw/xfree86/common/Makefile.am b/xorg-server/hw/xfree86/common/Makefile.am index 7a2b4bc..54e7f4d 100644 --- a/xorg-server/hw/xfree86/common/Makefile.am +++ b/xorg-server/hw/xfree86/common/Makefile.am @@ -103,4 +103,8 @@ if LNXACPI XORG_CFLAGS += -DHAVE_ACPI endif +if NEED_DBUS +XORG_CFLAGS += $(DBUS_CFLAGS) +endif + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) diff --git a/xorg-server/hw/xfree86/common/compiler.h b/xorg-server/hw/xfree86/common/compiler.h index 5325129..1653574 100644 --- a/xorg-server/hw/xfree86/common/compiler.h +++ b/xorg-server/hw/xfree86/common/compiler.h @@ -1077,9 +1077,9 @@ extern _X_EXPORT void xf86SlowBCopyToBus(unsigned char *, unsigned char *, int); (*xf86WriteMmio16)((CARD16)(val), base, offset) #elif defined(__powerpc__) || defined(__sparc__) - /* + /* * we provide byteswapping and no byteswapping functions here - * with byteswapping as default, + * with byteswapping as default, * drivers that don't need byteswapping should define MMIO_IS_BE */ #define MMIO_IN8(base, offset) xf86ReadMmio8(base, offset) diff --git a/xorg-server/hw/xfree86/common/xf86AutoConfig.c b/xorg-server/hw/xfree86/common/xf86AutoConfig.c index 2b53b90..03dad15 100644 --- a/xorg-server/hw/xfree86/common/xf86AutoConfig.c +++ b/xorg-server/hw/xfree86/common/xf86AutoConfig.c @@ -9,10 +9,10 @@ * 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 @@ -20,12 +20,12 @@ * 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 copyright holder(s) * and author(s) 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 copyright holder(s) and author(s). - * + * * Author: David Dawes <dawes(a)XFree86.Org>. */ diff --git a/xorg-server/hw/xfree86/common/xf86Bus.c b/xorg-server/hw/xfree86/common/xf86Bus.c index bd3e4e3..889294f 100644 --- a/xorg-server/hw/xfree86/common/xf86Bus.c +++ b/xorg-server/hw/xfree86/common/xf86Bus.c @@ -519,7 +519,7 @@ xf86GetDevFromEntity(int entityIndex, int instance) } /* - * xf86AccessEnter() -- gets called to save the text mode VGA IO + * xf86AccessEnter() -- gets called to save the text mode VGA IO * resources when reentering the server after a VT switch. */ void diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c index 5b254ba..d42572f 100644 --- a/xorg-server/hw/xfree86/common/xf86Config.c +++ b/xorg-server/hw/xfree86/common/xf86Config.c @@ -274,7 +274,7 @@ xf86ModulelistFromConfig(void ***optlist) if (xf86configptr->conf_modules) { /* Walk the disable list and let people know what we've parsed to - * not be loaded + * not be loaded */ modp = xf86configptr->conf_modules->mod_disable_lst; while (modp) { @@ -1941,7 +1941,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor) /* now add the modes found in the modes section to the list of modes for this monitor unless it has been added before - because we are reusing the same section + because we are reusing the same section for another screen */ if (xf86itemNotSublist((GenericListPtr) conf_monitor->mon_modeline_lst, (GenericListPtr) modes->mon_modeline_lst)) { diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c index 8dbca3a..cc7ff1b 100644 --- a/xorg-server/hw/xfree86/common/xf86Configure.c +++ b/xorg-server/hw/xfree86/common/xf86Configure.c @@ -679,8 +679,8 @@ DoConfigure(void) if (primary) continue; /* not primary: assign it to next device of same driver */ - /* - * NOTE: we assume that devices in DevToConfig + /* + * NOTE: we assume that devices in DevToConfig * and xf86Screens[] have the same order except * for the primary device which always comes first. */ diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c index 44bc559..9a5550f 100644 --- a/xorg-server/hw/xfree86/common/xf86Mode.c +++ b/xorg-server/hw/xfree86/common/xf86Mode.c @@ -1878,8 +1878,8 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes, const int ntypes = sizeof(types) / sizeof(int); int n; - /* - * We did not find the estimated virtual size. So now we want to + /* + * We did not find the estimated virtual size. So now we want to * find the largest mode available, but we want to search in the * modes in the order of "types" listed above. */ @@ -2033,8 +2033,8 @@ xf86PruneDriverModes(ScrnInfoPtr scrp) /* * A modePool mode's prev field is used to hold a pointer to the * member of the scrp->modes list for which a match was considered. - * Clear that pointer first, otherwise xf86DeleteMode might get - * confused + * Clear that pointer first, otherwise xf86DeleteMode might get + * confused */ scrp->modePool->prev = NULL; xf86DeleteMode(&scrp->modePool, scrp->modePool); diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h index b848f53..e68fe9c 100644 --- a/xorg-server/hw/xfree86/common/xf86Module.h +++ b/xorg-server/hw/xfree86/common/xf86Module.h @@ -80,9 +80,9 @@ typedef enum { * mask is 0xFFFF0000. */ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) -#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(18, 0) +#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0) #define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0) -#define ABI_EXTENSION_VERSION SET_ABI_VERSION(8, 0) +#define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) #define MODINFOSTRING1 0xef23fdc5 diff --git a/xorg-server/hw/xfree86/common/xf86PciInfo.h b/xorg-server/hw/xfree86/common/xf86PciInfo.h index d6450e2..0f54308 100644 --- a/xorg-server/hw/xfree86/common/xf86PciInfo.h +++ b/xorg-server/hw/xfree86/common/xf86PciInfo.h @@ -40,7 +40,7 @@ * or for non-video devices unless they're needed by a driver or elsewhere. * A comprehensive set of PCI vendor, device and subsystem data is * auto-generated from the ../etc/pci.ids file using the pciids2c.pl script, - * and is used in scanpci utility. Don't modify the pci.ids file. If + * and is used in scanpci utility. Don't modify the pci.ids file. If * new/corrected entries are required, add them to ../etc/extrapci.ids. */ diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c index 4e8060b..1fb5b16 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.c +++ b/xorg-server/hw/xfree86/common/xf86Xinput.c @@ -1,6 +1,6 @@ /* * Copyright 1995-1999 by Frederic Lepied, France. <Lepied(a)XFree86.org> - * + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -9,8 +9,8 @@ * advertising or publicity pertaining to distribution of the software without * specific, written prior permission. Frederic Lepied makes no * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * + * is provided "as is" without express or implied warranty. + * * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR @@ -315,7 +315,7 @@ ApplyTransformationMatrix(DeviceIntPtr dev) /*********************************************************************** * * xf86ProcessCommonOptions -- - * + * * Process global options. * *********************************************************************** @@ -1077,7 +1077,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev) OsReleaseSignals(); } -/* +/* * convenient functions to post events */ @@ -1401,7 +1401,7 @@ xf86FirstLocalDevice(void) return xf86InputDevs; } -/* +/* * Cx - raw data from touch screen * to_max - scaled highest dimension * (remember, this is of rows - 1 because of 0 origin) @@ -1475,7 +1475,7 @@ xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum) * Device will be moved to the off_devices list, but it will still be there * until you really clean up after it. * Notifies the client about an inactive device. - * + * * @param panic True if device is unrecoverable and needs to be removed. */ void @@ -1493,7 +1493,7 @@ xf86DisableDevice(DeviceIntPtr dev, Bool panic) /** * Reactivate a device. Call this function from the driver if you just found * out that the read error wasn't quite that bad after all. - * Device will be re-activated, and an event sent to the client. + * Device will be re-activated, and an event sent to the client. */ void xf86EnableDevice(DeviceIntPtr dev) diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h index 66a64fb..42d66d2 100644 --- a/xorg-server/hw/xfree86/common/xf86Xinput.h +++ b/xorg-server/hw/xfree86/common/xf86Xinput.h @@ -1,6 +1,6 @@ /* * Copyright 1995-1999 by Frederic Lepied, France. <Lepied(a)XFree86.org> - * + * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that @@ -9,8 +9,8 @@ * advertising or publicity pertaining to distribution of the software without * specific, written prior permission. Frederic Lepied makes no * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * + * is provided "as is" without express or implied warranty. + * * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/xorg-server/hw/xfree86/common/xf86cmap.c b/xorg-server/hw/xfree86/common/xf86cmap.c index c4bae56..ab51f96 100644 --- a/xorg-server/hw/xfree86/common/xf86cmap.c +++ b/xorg-server/hw/xfree86/common/xf86cmap.c @@ -443,7 +443,7 @@ CMapInstallColormap(ColormapPtr pmap) (*pScreen->InstallColormap) (pmap); pScreen->InstallColormap = CMapInstallColormap; - /* Important. We let the lower layers, namely DGA, + /* Important. We let the lower layers, namely DGA, overwrite the choice of Colormap to install */ if (GetInstalledmiColormap(pmap->pScreen)) pmap = GetInstalledmiColormap(pmap->pScreen); @@ -958,7 +958,7 @@ CMapChangeGamma(ScrnInfoPtr pScrn, Gamma gamma) } if (pLink) { - /* need to trick CMapRefreshColors() into thinking + /* need to trick CMapRefreshColors() into thinking this is the currently installed map */ SetInstalledmiColormap(pScreen, pLink->cmap); CMapReinstallMap(pLink->cmap); diff --git a/xorg-server/hw/xfree86/common/xf86fbman.c b/xorg-server/hw/xfree86/common/xf86fbman.c index db715bd..1b2cb57 100644 --- a/xorg-server/hw/xfree86/common/xf86fbman.c +++ b/xorg-server/hw/xfree86/common/xf86fbman.c @@ -38,7 +38,7 @@ #include "regionstr.h" #include "xf86fbman.h" -/* +/* #define DEBUG */ @@ -259,7 +259,7 @@ xf86PurgeUnlockedOffscreenAreas(ScreenPtr pScreen) return (*funcs->PurgeOffscreenAreas) (pScreen); } -/************************************************************\ +/************************************************************\ Below is a specific implementation of an offscreen manager. @@ -1381,7 +1381,7 @@ xf86InitFBManagerLinear(ScreenPtr pScreen, int offset, int size) return TRUE; } -/* This is an implementation specific function and should +/* This is an implementation specific function and should disappear after the next release. People should use the real linear functions instead */ diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c index 5ad9b70..15988b8 100644 --- a/xorg-server/hw/xfree86/common/xf86platformBus.c +++ b/xorg-server/hw/xfree86/common/xf86platformBus.c @@ -497,7 +497,7 @@ xf86platformAddDevice(int index) if (xf86GPUScreens[i]->PreInit && xf86GPUScreens[i]->PreInit(xf86GPUScreens[i], 0)) - xf86GPUScreens[i]->configured = TRUE; + xf86GPUScreens[i]->configured = TRUE; if (!xf86GPUScreens[i]->configured) { ErrorF("hotplugged device %d didn't configure\n", i); diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h index 9ad1b90..643a65d 100644 --- a/xorg-server/hw/xfree86/common/xf86str.h +++ b/xorg-server/hw/xfree86/common/xf86str.h @@ -568,7 +568,7 @@ typedef struct _PciChipsets { * In drivers that don't have a specific vendor (e.g., vga) contains the * device ID for either the generic VGA or generic 8514 devices. This * turns out to be the same as the subclass and programming interface - * value (e.g., the full 24-bit class for the VGA device is 0x030000 (or + * value (e.g., the full 24-bit class for the VGA device is 0x030000 (or * 0x000101) and for 8514 is 0x030001). */ int PCIid; diff --git a/xorg-server/hw/xfree86/common/xf86vmode.c b/xorg-server/hw/xfree86/common/xf86vmode.c index 2b07833..0ce58e3 100644 --- a/xorg-server/hw/xfree86/common/xf86vmode.c +++ b/xorg-server/hw/xfree86/common/xf86vmode.c @@ -17,13 +17,13 @@ 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 Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES +IN NO EVENT SHALL Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY -shall not be used in advertising or otherwise to promote the sale, use +Except as contained in this notice, the name of Kaleb S. KEITHLEY +shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY @@ -361,7 +361,7 @@ ProcXF86VidModeGetModeLine(ClientPtr client) } /* - * Older servers sometimes had server privates that the VidMode + * Older servers sometimes had server privates that the VidMode * extention made available. So to be compatiable pretend that * there are no server privates to pass to the client */ diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c index 5ef5de1..b974cd2 100644 --- a/xorg-server/hw/xfree86/common/xf86xv.c +++ b/xorg-server/hw/xfree86/common/xf86xv.c @@ -599,7 +599,7 @@ static void xf86XVCopyClip(XvPortRecPrivatePtr portPriv, GCPtr pGC) { /* copy the new clip if it exists */ - if ((pGC->clientClipType == CT_REGION) && pGC->clientClip) { + if (pGC->clientClip) { if (!portPriv->clientClip) portPriv->clientClip = RegionCreate(NullBox, 1); /* Note: this is in window coordinates */ diff --git a/xorg-server/hw/xfree86/common/xf86xvmc.h b/xorg-server/hw/xfree86/common/xf86xvmc.h index aaa4e65..023aff5 100644 --- a/xorg-server/hw/xfree86/common/xf86xvmc.h +++ b/xorg-server/hw/xfree86/common/xf86xvmc.h @@ -51,7 +51,7 @@ typedef struct { } XF86MCSurfaceInfoRec, *XF86MCSurfaceInfoPtr; /* - xf86XvMCCreateContextProc + xf86XvMCCreateContextProc DIX will fill everything out in the context except the driver_priv. The port_priv holds the private data specified for the port when @@ -71,7 +71,7 @@ typedef void (*xf86XvMCDestroyContextProcPtr) (ScrnInfoPtr pScrn, XvMCContextPtr context); /* - xf86XvMCCreateSurfaceProc + xf86XvMCCreateSurfaceProc DIX will fill everything out in the surface except the driver_priv. The driver may store whatever it wants in driver_priv. The driver @@ -87,7 +87,7 @@ typedef void (*xf86XvMCDestroySurfaceProcPtr) (ScrnInfoPtr pScrn, XvMCSurfacePtr surface); /* - xf86XvMCCreateSubpictureProc + xf86XvMCCreateSubpictureProc DIX will fill everything out in the subpicture except the driver_priv, num_palette_entries, entry_bytes and component_order. The driver may @@ -122,8 +122,8 @@ typedef struct { xf86XvMCDestroySubpictureProcPtr DestroySubpicture; } XF86MCAdaptorRec, *XF86MCAdaptorPtr; -/* - xf86XvMCScreenInit +/* + xf86XvMCScreenInit Unlike Xv, the adaptor data is not copied from this structure. This structure's data is used so it must stick around for the diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c index 15e4beb..29185ad 100644 --- a/xorg-server/hw/xfree86/ddc/ddc.c +++ b/xorg-server/hw/xfree86/ddc/ddc.c @@ -1,5 +1,5 @@ -/* xf86DDC.c - * +/* xf86DDC.c + * * Copyright 1998,1999 by Egbert Eich <Egbert.Eich(a)Physik.TU-Darmstadt.DE> */ @@ -212,10 +212,10 @@ TestDDC1(ScrnInfoPtr pScrn, unsigned int (*read_DDC) (ScrnInfoPtr)) return count; } -/* +/* * read EDID record , pass it to callback function to interpret. * callback function will store it for further use by calling - * function; it will also decide if we need to reread it + * function; it will also decide if we need to reread it */ static unsigned char * EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed, @@ -328,7 +328,7 @@ DDC2Init(I2CBusPtr pBus) I2CDevPtr dev = NULL; /* - * Slow down the bus so that older monitors don't + * Slow down the bus so that older monitors don't * miss things. */ pBus->RiseFallTime = 20; diff --git a/xorg-server/hw/xfree86/ddc/edid.h b/xorg-server/hw/xfree86/ddc/edid.h index 91565a2..4c2da51 100644 --- a/xorg-server/hw/xfree86/ddc/edid.h +++ b/xorg-server/hw/xfree86/ddc/edid.h @@ -1,9 +1,9 @@ /* - * edid.h: defines to parse an EDID block + * edid.h: defines to parse an EDID block * - * This file contains all information to interpret a standard EDIC block - * transmitted by a display device via DDC (Display Data Channel). So far - * there is no information to deal with optional EDID blocks. + * This file contains all information to interpret a standard EDIC block + * transmitted by a display device via DDC (Display Data Channel). So far + * there is no information to deal with optional EDID blocks. * DDC is a Trademark of VESA (Video Electronics Standard Association). * * Copyright 1998 by Egbert Eich <Egbert.Eich(a)Physik.TU-Darmstadt.DE> diff --git a/xorg-server/hw/xfree86/ddc/print_edid.c b/xorg-server/hw/xfree86/ddc/print_edid.c index 4f983f9..e16b124 100644 --- a/xorg-server/hw/xfree86/ddc/print_edid.c +++ b/xorg-server/hw/xfree86/ddc/print_edid.c @@ -21,7 +21,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * print_edid.c: print out all information retrieved from display device + * print_edid.c: print out all information retrieved from display device */ #ifdef HAVE_XORG_CONFIG_H diff --git a/xorg-server/hw/xfree86/ddc/xf86DDC.h b/xorg-server/hw/xfree86/ddc/xf86DDC.h index 727813f..7d81ab9 100644 --- a/xorg-server/hw/xfree86/ddc/xf86DDC.h +++ b/xorg-server/hw/xfree86/ddc/xf86DDC.h @@ -1,9 +1,9 @@ /* xf86DDC.h * - * This file contains all information to interpret a standard EDIC block - * transmitted by a display device via DDC (Display Data Channel). So far - * there is no information to deal with optional EDID blocks. + * This file contains all information to interpret a standard EDIC block + * transmitted by a display device via DDC (Display Data Channel). So far + * there is no information to deal with optional EDID blocks. * DDC is a Trademark of VESA (Video Electronics Standard Association). * * Copyright 1998 by Egbert Eich <Egbert.Eich(a)Physik.TU-Darmstadt.DE> diff --git a/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c b/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c index 6dd21dd..79cf081 100644 --- a/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c +++ b/xorg-server/hw/xfree86/dixmods/xkbKillSrv.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/hw/xfree86/dixmods/xkbVT.c b/xorg-server/hw/xfree86/dixmods/xkbVT.c index 4ca4451..9840961 100644 --- a/xorg-server/hw/xfree86/dixmods/xkbVT.c +++ b/xorg-server/hw/xfree86/dixmods/xkbVT.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c index 5077c7c..ae92fc2 100644 --- a/xorg-server/hw/xfree86/dri/dri.c +++ b/xorg-server/hw/xfree86/dri/dri.c @@ -2292,11 +2292,11 @@ DRIAdjustFrame(ScrnInfoPtr pScrn, int x, int y) _DRIAdjustFrame(pScrn, pDRIPriv, x, y); } -/* +/* * DRIMoveBuffersHelper swaps the regions rects in place leaving you * a region with the rects in the order that you need to blit them, * but it is possibly (likely) an invalid region afterwards. If you - * need to use the region again for anything you have to call + * need to use the region again for anything you have to call * REGION_VALIDATE on it, or better yet, save a copy first. */ diff --git a/xorg-server/hw/xfree86/dri/sarea.h b/xorg-server/hw/xfree86/dri/sarea.h index 7a55b49..1bef242 100644 --- a/xorg-server/hw/xfree86/dri/sarea.h +++ b/xorg-server/hw/xfree86/dri/sarea.h @@ -1,7 +1,7 @@ /** - * \file sarea.h + * \file sarea.h * SAREA definitions. - * + * * \author Kevin E. Martin <kevin(a)precisioninsight.com> * \author Jens Owen <jens(a)tungstengraphics.com> * \author Rickard E. (Rik) Faith <faith(a)valinux.com> @@ -11,7 +11,7 @@ * Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. * Copyright 2000 VA Linux Systems, 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 @@ -19,11 +19,11 @@ * distribute, sub license, and/or sell copies of the Software, and to * permit persons to whom the Software is furnished to do so, subject to * the following conditions: - * + * * The above copyright notice and this permission notice (including the * next paragraph) shall be included in all copies or substantial portions * of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. diff --git a/xorg-server/hw/xfree86/dri2/Makefile.am b/xorg-server/hw/xfree86/dri2/Makefile.am index 502a2ee..78e507b 100644 --- a/xorg-server/hw/xfree86/dri2/Makefile.am +++ b/xorg-server/hw/xfree86/dri2/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS=pci_ids + noinst_LTLIBRARIES = libdri2.la AM_CFLAGS = \ -DHAVE_XORG_CONFIG_H \ diff --git a/xorg-server/hw/xfree86/dri2/dri2.c b/xorg-server/hw/xfree86/dri2/dri2.c index 6459f11..c8fcd62 100644 --- a/xorg-server/hw/xfree86/dri2/dri2.c +++ b/xorg-server/hw/xfree86/dri2/dri2.c @@ -1410,6 +1410,59 @@ get_prime_id(void) return -1; } +#include "pci_ids/pci_id_driver_map.h" + +static char * +dri2_probe_driver_name(ScreenPtr pScreen, DRI2InfoPtr info) +{ + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]); + struct pci_device *pdev = NULL; + int i, j; + + if (pEnt) + pdev = xf86GetPciInfoForEntity(pEnt->index); + + /* For non-PCI devices, just assume that the 3D driver is named + * the same as the kernel driver. This is currently true for vc4 + * and msm (freedreno). + */ + if (!pdev) { + drmVersionPtr version = drmGetVersion(info->fd); + char *kernel_driver; + + if (!version) { + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[DRI2] Couldn't drmGetVersion() on non-PCI device, " + "no driver name found.\n"); + return NULL; + } + + kernel_driver = strndup(version->name, version->name_len); + drmFreeVersion(version); + return kernel_driver; + } + + for (i = 0; driver_map[i].driver; i++) { + if (pdev->vendor_id != driver_map[i].vendor_id) + continue; + + if (driver_map[i].num_chips_ids == -1) + return strdup(driver_map[i].driver); + + for (j = 0; j < driver_map[i].num_chips_ids; j++) { + if (driver_map[i].chip_ids[j] == pdev->device_id) + return strdup(driver_map[i].driver); + } + } + + xf86DrvMsg(pScreen->myNum, X_ERROR, + "[DRI2] No driver mapping found for PCI device " + "0x%04x / 0x%04x\n", + pdev->vendor_id, pdev->device_id); + return NULL; +} + Bool DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) { @@ -1524,7 +1577,14 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) ds->driverNames = malloc(sizeof(*ds->driverNames)); if (!ds->driverNames) goto err_out; - ds->driverNames[0] = info->driverName; + + if (info->driverName) { + ds->driverNames[0] = info->driverName; + } else { + ds->driverNames[0] = dri2_probe_driver_name(pScreen, info); + if (!ds->driverNames[0]) + return FALSE; + } } else { ds->numDrivers = info->numDrivers; diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/Makefile.am b/xorg-server/hw/xfree86/dri2/pci_ids/Makefile.am new file mode 100644 index 0000000..c511108 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/Makefile.am @@ -0,0 +1,11 @@ +EXTRA_DIST = \ + pci_id_driver_map.h \ + i810_pci_ids.h \ + i915_pci_ids.h \ + i965_pci_ids.h \ + r200_pci_ids.h \ + r300_pci_ids.h \ + r600_pci_ids.h \ + radeon_pci_ids.h \ + radeonsi_pci_ids.h \ + vmwgfx_pci_ids.h diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/i810_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/i810_pci_ids.h new file mode 100644 index 0000000..7f68192 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/i810_pci_ids.h @@ -0,0 +1,4 @@ +CHIPSET(0x7121, I810, i8xx) +CHIPSET(0x7123, I810_DC100, i8xx) +CHIPSET(0x7125, I810_E, i8xx) +CHIPSET(0x1132, I815, i8xx) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/i915_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/i915_pci_ids.h new file mode 100644 index 0000000..7d51975 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/i915_pci_ids.h @@ -0,0 +1,15 @@ +CHIPSET(0x3577, I830_M, "Intel(R) 830M") +CHIPSET(0x2562, 845_G, "Intel(R) 845G") +CHIPSET(0x3582, I855_GM, "Intel(R) 852GM/855GM") +CHIPSET(0x2572, I865_G, "Intel(R) 865G") +CHIPSET(0x2582, I915_G, "Intel(R) 915G") +CHIPSET(0x258A, E7221_G, "Intel(R) E7221G (i915)") +CHIPSET(0x2592, I915_GM, "Intel(R) 915GM") +CHIPSET(0x2772, I945_G, "Intel(R) 945G") +CHIPSET(0x27A2, I945_GM, "Intel(R) 945GM") +CHIPSET(0x27AE, I945_GME, "Intel(R) 945GME") +CHIPSET(0x29B2, Q35_G, "Intel(R) Q35") +CHIPSET(0x29C2, G33_G, "Intel(R) G33") +CHIPSET(0x29D2, Q33_G, "Intel(R) Q33") +CHIPSET(0xA011, IGD_GM, "Intel(R) IGD") +CHIPSET(0xA001, IGD_G, "Intel(R) IGD") diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/i965_pci_ids.h new file mode 100644 index 0000000..2e04301 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/i965_pci_ids.h @@ -0,0 +1,115 @@ +CHIPSET(0x29A2, i965, "Intel(R) 965G") +CHIPSET(0x2992, i965, "Intel(R) 965Q") +CHIPSET(0x2982, i965, "Intel(R) 965G") +CHIPSET(0x2972, i965, "Intel(R) 946GZ") +CHIPSET(0x2A02, i965, "Intel(R) 965GM") +CHIPSET(0x2A12, i965, "Intel(R) 965GME/GLE") +CHIPSET(0x2A42, g4x, "Mobile Intel® GM45 Express Chipset") +CHIPSET(0x2E02, g4x, "Intel(R) Integrated Graphics Device") +CHIPSET(0x2E12, g4x, "Intel(R) Q45/Q43") +CHIPSET(0x2E22, g4x, "Intel(R) G45/G43") +CHIPSET(0x2E32, g4x, "Intel(R) G41") +CHIPSET(0x2E42, g4x, "Intel(R) B43") +CHIPSET(0x2E92, g4x, "Intel(R) B43") +CHIPSET(0x0042, ilk, "Intel(R) Ironlake Desktop") +CHIPSET(0x0046, ilk, "Intel(R) Ironlake Mobile") +CHIPSET(0x0102, snb_gt1, "Intel(R) Sandybridge Desktop") +CHIPSET(0x0112, snb_gt2, "Intel(R) Sandybridge Desktop") +CHIPSET(0x0122, snb_gt2, "Intel(R) Sandybridge Desktop") +CHIPSET(0x0106, snb_gt1, "Intel(R) Sandybridge Mobile") +CHIPSET(0x0116, snb_gt2, "Intel(R) Sandybridge Mobile") +CHIPSET(0x0126, snb_gt2, "Intel(R) Sandybridge Mobile") +CHIPSET(0x010A, snb_gt1, "Intel(R) Sandybridge Server") +CHIPSET(0x0152, ivb_gt1, "Intel(R) Ivybridge Desktop") +CHIPSET(0x0162, ivb_gt2, "Intel(R) Ivybridge Desktop") +CHIPSET(0x0156, ivb_gt1, "Intel(R) Ivybridge Mobile") +CHIPSET(0x0166, ivb_gt2, "Intel(R) Ivybridge Mobile") +CHIPSET(0x015a, ivb_gt1, "Intel(R) Ivybridge Server") +CHIPSET(0x016a, ivb_gt2, "Intel(R) Ivybridge Server") +CHIPSET(0x0402, hsw_gt1, "Intel(R) Haswell Desktop") +CHIPSET(0x0412, hsw_gt2, "Intel(R) Haswell Desktop") +CHIPSET(0x0422, hsw_gt3, "Intel(R) Haswell Desktop") +CHIPSET(0x0406, hsw_gt1, "Intel(R) Haswell Mobile") +CHIPSET(0x0416, hsw_gt2, "Intel(R) Haswell Mobile") +CHIPSET(0x0426, hsw_gt3, "Intel(R) Haswell Mobile") +CHIPSET(0x040A, hsw_gt1, "Intel(R) Haswell Server") +CHIPSET(0x041A, hsw_gt2, "Intel(R) Haswell Server") +CHIPSET(0x042A, hsw_gt3, "Intel(R) Haswell Server") +CHIPSET(0x040B, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x041B, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x042B, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x040E, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x041E, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x042E, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0C02, hsw_gt1, "Intel(R) Haswell Desktop") +CHIPSET(0x0C12, hsw_gt2, "Intel(R) Haswell Desktop") +CHIPSET(0x0C22, hsw_gt3, "Intel(R) Haswell Desktop") +CHIPSET(0x0C06, hsw_gt1, "Intel(R) Haswell Mobile") +CHIPSET(0x0C16, hsw_gt2, "Intel(R) Haswell Mobile") +CHIPSET(0x0C26, hsw_gt3, "Intel(R) Haswell Mobile") +CHIPSET(0x0C0A, hsw_gt1, "Intel(R) Haswell Server") +CHIPSET(0x0C1A, hsw_gt2, "Intel(R) Haswell Server") +CHIPSET(0x0C2A, hsw_gt3, "Intel(R) Haswell Server") +CHIPSET(0x0C0B, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0C1B, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0C2B, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0C0E, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0C1E, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0C2E, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0A02, hsw_gt1, "Intel(R) Haswell Desktop") +CHIPSET(0x0A12, hsw_gt2, "Intel(R) Haswell Desktop") +CHIPSET(0x0A22, hsw_gt3, "Intel(R) Haswell Desktop") +CHIPSET(0x0A06, hsw_gt1, "Intel(R) Haswell Mobile") +CHIPSET(0x0A16, hsw_gt2, "Intel(R) Haswell Mobile") +CHIPSET(0x0A26, hsw_gt3, "Intel(R) Haswell Mobile") +CHIPSET(0x0A0A, hsw_gt1, "Intel(R) Haswell Server") +CHIPSET(0x0A1A, hsw_gt2, "Intel(R) Haswell Server") +CHIPSET(0x0A2A, hsw_gt3, "Intel(R) Haswell Server") +CHIPSET(0x0A0B, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0A1B, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0A2B, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0A0E, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0A1E, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0A2E, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0D02, hsw_gt1, "Intel(R) Haswell Desktop") +CHIPSET(0x0D12, hsw_gt2, "Intel(R) Haswell Desktop") +CHIPSET(0x0D22, hsw_gt3, "Intel(R) Haswell Desktop") +CHIPSET(0x0D06, hsw_gt1, "Intel(R) Haswell Mobile") +CHIPSET(0x0D16, hsw_gt2, "Intel(R) Haswell Mobile") +CHIPSET(0x0D26, hsw_gt3, "Intel(R) Haswell Mobile") +CHIPSET(0x0D0A, hsw_gt1, "Intel(R) Haswell Server") +CHIPSET(0x0D1A, hsw_gt2, "Intel(R) Haswell Server") +CHIPSET(0x0D2A, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0D0B, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0D1B, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0D2B, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0D0E, hsw_gt1, "Intel(R) Haswell") +CHIPSET(0x0D1E, hsw_gt2, "Intel(R) Haswell") +CHIPSET(0x0D2E, hsw_gt3, "Intel(R) Haswell") +CHIPSET(0x0F31, byt, "Intel(R) Bay Trail") +CHIPSET(0x0F32, byt, "Intel(R) Bay Trail") +CHIPSET(0x0F33, byt, "Intel(R) Bay Trail") +CHIPSET(0x0157, byt, "Intel(R) Bay Trail") +CHIPSET(0x0155, byt, "Intel(R) Bay Trail") +CHIPSET(0x1602, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x1606, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x160A, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x160B, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x160D, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x160E, bdw_gt1, "Intel(R) Broadwell GT1") +CHIPSET(0x1612, bdw_gt2, "Intel(R) HD Graphics 5600 (Broadwell GT2)") +CHIPSET(0x1616, bdw_gt2, "Intel(R) HD Graphics 5500 (Broadwell GT2)") +CHIPSET(0x161A, bdw_gt2, "Intel(R) Broadwell GT2") +CHIPSET(0x161B, bdw_gt2, "Intel(R) Broadwell GT2") +CHIPSET(0x161D, bdw_gt2, "Intel(R) Broadwell GT2") +CHIPSET(0x161E, bdw_gt2, "Intel(R) HD Graphics 5300 (Broadwell GT2)") +CHIPSET(0x1622, bdw_gt3, "Intel(R) Iris Pro 6200 (Broadwell GT3e)") +CHIPSET(0x1626, bdw_gt3, "Intel(R) HD Graphics 6000 (Broadwell GT3)") +CHIPSET(0x162A, bdw_gt3, "Intel(R) Iris Pro P6300 (Broadwell GT3e)") +CHIPSET(0x162B, bdw_gt3, "Intel(R) Iris 6100 (Broadwell GT3)") +CHIPSET(0x162D, bdw_gt3, "Intel(R) Broadwell GT3") +CHIPSET(0x162E, bdw_gt3, "Intel(R) Broadwell GT3") +CHIPSET(0x22B0, chv, "Intel(R) Cherryview") +CHIPSET(0x22B1, chv, "Intel(R) Cherryview") +CHIPSET(0x22B2, chv, "Intel(R) Cherryview") +CHIPSET(0x22B3, chv, "Intel(R) Cherryview") diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h b/xorg-server/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h new file mode 100644 index 0000000..8a97c6f --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/pci_id_driver_map.h @@ -0,0 +1,80 @@ +#ifndef _PCI_ID_DRIVER_MAP_H_ +#define _PCI_ID_DRIVER_MAP_H_ + +#include <stddef.h> + +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#endif + +static const int i915_chip_ids[] = { +#define CHIPSET(chip, desc, name) chip, +#include "pci_ids/i915_pci_ids.h" +#undef CHIPSET +}; + +static const int i965_chip_ids[] = { +#define CHIPSET(chip, family, name) chip, +#include "pci_ids/i965_pci_ids.h" +#undef CHIPSET +}; + +#ifndef DRIVER_MAP_GALLIUM_ONLY +static const int r100_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/radeon_pci_ids.h" +#undef CHIPSET +}; + +static const int r200_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/r200_pci_ids.h" +#undef CHIPSET +}; +#endif + +static const int r300_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/r300_pci_ids.h" +#undef CHIPSET +}; + +static const int r600_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/r600_pci_ids.h" +#undef CHIPSET +}; + +static const int radeonsi_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/radeonsi_pci_ids.h" +#undef CHIPSET +}; + +static const int vmwgfx_chip_ids[] = { +#define CHIPSET(chip, name, family) chip, +#include "pci_ids/vmwgfx_pci_ids.h" +#undef CHIPSET +}; + +static const struct { + int vendor_id; + const char *driver; + const int *chip_ids; + int num_chips_ids; +} driver_map[] = { + { 0x8086, "i915", i915_chip_ids, ARRAY_SIZE(i915_chip_ids) }, + { 0x8086, "i965", i965_chip_ids, ARRAY_SIZE(i965_chip_ids) }, +#ifndef DRIVER_MAP_GALLIUM_ONLY + { 0x1002, "radeon", r100_chip_ids, ARRAY_SIZE(r100_chip_ids) }, + { 0x1002, "r200", r200_chip_ids, ARRAY_SIZE(r200_chip_ids) }, +#endif + { 0x1002, "r300", r300_chip_ids, ARRAY_SIZE(r300_chip_ids) }, + { 0x1002, "r600", r600_chip_ids, ARRAY_SIZE(r600_chip_ids) }, + { 0x1002, "radeonsi", radeonsi_chip_ids, ARRAY_SIZE(radeonsi_chip_ids) }, + { 0x10de, "nouveau", NULL, -1 }, + { 0x15ad, "vmwgfx", vmwgfx_chip_ids, ARRAY_SIZE(vmwgfx_chip_ids) }, + { 0x0000, NULL, NULL, 0 }, +}; + +#endif /* _PCI_ID_DRIVER_MAP_H_ */ diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/r200_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/r200_pci_ids.h new file mode 100644 index 0000000..f857ca7 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/r200_pci_ids.h @@ -0,0 +1,24 @@ +CHIPSET(0x5148, R200_QH, R200) +CHIPSET(0x514C, R200_QL, R200) +CHIPSET(0x514D, R200_QM, R200) +CHIPSET(0x4242, R200_BB, R200) + +CHIPSET(0x4966, RV250_If, RV250) +CHIPSET(0x4967, RV250_Ig, RV250) +CHIPSET(0x4C64, RV250_Ld, RV250) +CHIPSET(0x4C66, RV250_Lf, RV250) +CHIPSET(0x4C67, RV250_Lg, RV250) + +CHIPSET(0x4C6E, RV280_4C6E, RV280) +CHIPSET(0x5960, RV280_5960, RV280) +CHIPSET(0x5961, RV280_5961, RV280) +CHIPSET(0x5962, RV280_5962, RV280) +CHIPSET(0x5964, RV280_5964, RV280) +CHIPSET(0x5965, RV280_5965, RV280) +CHIPSET(0x5C61, RV280_5C61, RV280) +CHIPSET(0x5C63, RV280_5C63, RV280) + +CHIPSET(0x5834, RS300_5834, RS300) +CHIPSET(0x5835, RS300_5835, RS300) +CHIPSET(0x7834, RS350_7834, RS300) +CHIPSET(0x7835, RS350_7835, RS300) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/r300_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/r300_pci_ids.h new file mode 100644 index 0000000..791026a --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/r300_pci_ids.h @@ -0,0 +1,227 @@ +CHIPSET(0x4144, R300_AD, R300) +CHIPSET(0x4145, R300_AE, R300) +CHIPSET(0x4146, R300_AF, R300) +CHIPSET(0x4147, R300_AG, R300) +CHIPSET(0x4E44, R300_ND, R300) +CHIPSET(0x4E45, R300_NE, R300) +CHIPSET(0x4E46, R300_NF, R300) +CHIPSET(0x4E47, R300_NG, R300) + +CHIPSET(0x4E48, R350_NH, R350) +CHIPSET(0x4E49, R350_NI, R350) +CHIPSET(0x4E4B, R350_NK, R350) +CHIPSET(0x4148, R350_AH, R350) +CHIPSET(0x4149, R350_AI, R350) +CHIPSET(0x414A, R350_AJ, R350) +CHIPSET(0x414B, R350_AK, R350) +CHIPSET(0x4E4A, R360_NJ, R350) + +CHIPSET(0x4150, RV350_AP, RV350) +CHIPSET(0x4151, RV350_AQ, RV350) +CHIPSET(0x4152, RV350_AR, RV350) +CHIPSET(0x4153, RV350_AS, RV350) +CHIPSET(0x4154, RV350_AT, RV350) +CHIPSET(0x4155, RV350_AU, RV350) +CHIPSET(0x4156, RV350_AV, RV350) +CHIPSET(0x4E50, RV350_NP, RV350) +CHIPSET(0x4E51, RV350_NQ, RV350) +CHIPSET(0x4E52, RV350_NR, RV350) +CHIPSET(0x4E53, RV350_NS, RV350) +CHIPSET(0x4E54, RV350_NT, RV350) +CHIPSET(0x4E56, RV350_NV, RV350) + +CHIPSET(0x5460, RV370_5460, RV370) +CHIPSET(0x5462, RV370_5462, RV370) +CHIPSET(0x5464, RV370_5464, RV370) +CHIPSET(0x5B60, RV370_5B60, RV370) +CHIPSET(0x5B62, RV370_5B62, RV370) +CHIPSET(0x5B63, RV370_5B63, RV370) +CHIPSET(0x5B64, RV370_5B64, RV370) +CHIPSET(0x5B65, RV370_5B65, RV370) + +CHIPSET(0x3150, RV380_3150, RV380) +CHIPSET(0x3151, RV380_3151, RV380) +CHIPSET(0x3152, RV380_3152, RV380) +CHIPSET(0x3154, RV380_3154, RV380) +CHIPSET(0x3155, RV380_3155, RV380) +CHIPSET(0x3E50, RV380_3E50, RV380) +CHIPSET(0x3E54, RV380_3E54, RV380) + +CHIPSET(0x4A48, R420_JH, R420) +CHIPSET(0x4A49, R420_JI, R420) +CHIPSET(0x4A4A, R420_JJ, R420) +CHIPSET(0x4A4B, R420_JK, R420) +CHIPSET(0x4A4C, R420_JL, R420) +CHIPSET(0x4A4D, R420_JM, R420) +CHIPSET(0x4A4E, R420_JN, R420) +CHIPSET(0x4A4F, R420_JO, R420) +CHIPSET(0x4A50, R420_JP, R420) +CHIPSET(0x4A54, R420_JT, R420) + +CHIPSET(0x5548, R423_UH, R423) +CHIPSET(0x5549, R423_UI, R423) +CHIPSET(0x554A, R423_UJ, R423) +CHIPSET(0x554B, R423_UK, R423) +CHIPSET(0x5550, R423_5550, R423) +CHIPSET(0x5551, R423_UQ, R423) +CHIPSET(0x5552, R423_UR, R423) +CHIPSET(0x5554, R423_UT, R423) +CHIPSET(0x5D57, R423_5D57, R423) + +CHIPSET(0x554C, R430_554C, R430) +CHIPSET(0x554D, R430_554D, R430) +CHIPSET(0x554E, R430_554E, R430) +CHIPSET(0x554F, R430_554F, R430) +CHIPSET(0x5D48, R430_5D48, R430) +CHIPSET(0x5D49, R430_5D49, R430) +CHIPSET(0x5D4A, R430_5D4A, R430) + +CHIPSET(0x5D4C, R480_5D4C, R480) +CHIPSET(0x5D4D, R480_5D4D, R480) +CHIPSET(0x5D4E, R480_5D4E, R480) +CHIPSET(0x5D4F, R480_5D4F, R480) +CHIPSET(0x5D50, R480_5D50, R480) +CHIPSET(0x5D52, R480_5D52, R480) + +CHIPSET(0x4B48, R481_4B48, R481) +CHIPSET(0x4B49, R481_4B49, R481) +CHIPSET(0x4B4A, R481_4B4A, R481) +CHIPSET(0x4B4B, R481_4B4B, R481) +CHIPSET(0x4B4C, R481_4B4C, R481) + +CHIPSET(0x564A, RV410_564A, RV410) +CHIPSET(0x564B, RV410_564B, RV410) +CHIPSET(0x564F, RV410_564F, RV410) +CHIPSET(0x5652, RV410_5652, RV410) +CHIPSET(0x5653, RV410_5653, RV410) +CHIPSET(0x5657, RV410_5657, RV410) +CHIPSET(0x5E48, RV410_5E48, RV410) +CHIPSET(0x5E4A, RV410_5E4A, RV410) +CHIPSET(0x5E4B, RV410_5E4B, RV410) +CHIPSET(0x5E4C, RV410_5E4C, RV410) +CHIPSET(0x5E4D, RV410_5E4D, RV410) +CHIPSET(0x5E4F, RV410_5E4F, RV410) + +CHIPSET(0x5A41, RS400_5A41, RS400) +CHIPSET(0x5A42, RS400_5A42, RS400) + +CHIPSET(0x5A61, RC410_5A61, RC410) +CHIPSET(0x5A62, RC410_5A62, RC410) + +CHIPSET(0x5954, RS480_5954, RS480) +CHIPSET(0x5955, RS480_5955, RS480) +CHIPSET(0x5974, RS482_5974, RS480) +CHIPSET(0x5975, RS482_5975, RS480) + +CHIPSET(0x7100, R520_7100, R520) +CHIPSET(0x7101, R520_7101, R520) +CHIPSET(0x7102, R520_7102, R520) +CHIPSET(0x7103, R520_7103, R520) +CHIPSET(0x7104, R520_7104, R520) +CHIPSET(0x7105, R520_7105, R520) +CHIPSET(0x7106, R520_7106, R520) +CHIPSET(0x7108, R520_7108, R520) +CHIPSET(0x7109, R520_7109, R520) +CHIPSET(0x710A, R520_710A, R520) +CHIPSET(0x710B, R520_710B, R520) +CHIPSET(0x710C, R520_710C, R520) +CHIPSET(0x710E, R520_710E, R520) +CHIPSET(0x710F, R520_710F, R520) + +CHIPSET(0x7140, RV515_7140, RV515) +CHIPSET(0x7141, RV515_7141, RV515) +CHIPSET(0x7142, RV515_7142, RV515) +CHIPSET(0x7143, RV515_7143, RV515) +CHIPSET(0x7144, RV515_7144, RV515) +CHIPSET(0x7145, RV515_7145, RV515) +CHIPSET(0x7146, RV515_7146, RV515) +CHIPSET(0x7147, RV515_7147, RV515) +CHIPSET(0x7149, RV515_7149, RV515) +CHIPSET(0x714A, RV515_714A, RV515) +CHIPSET(0x714B, RV515_714B, RV515) +CHIPSET(0x714C, RV515_714C, RV515) +CHIPSET(0x714D, RV515_714D, RV515) +CHIPSET(0x714E, RV515_714E, RV515) +CHIPSET(0x714F, RV515_714F, RV515) +CHIPSET(0x7151, RV515_7151, RV515) +CHIPSET(0x7152, RV515_7152, RV515) +CHIPSET(0x7153, RV515_7153, RV515) +CHIPSET(0x715E, RV515_715E, RV515) +CHIPSET(0x715F, RV515_715F, RV515) +CHIPSET(0x7180, RV515_7180, RV515) +CHIPSET(0x7181, RV515_7181, RV515) +CHIPSET(0x7183, RV515_7183, RV515) +CHIPSET(0x7186, RV515_7186, RV515) +CHIPSET(0x7187, RV515_7187, RV515) +CHIPSET(0x7188, RV515_7188, RV515) +CHIPSET(0x718A, RV515_718A, RV515) +CHIPSET(0x718B, RV515_718B, RV515) +CHIPSET(0x718C, RV515_718C, RV515) +CHIPSET(0x718D, RV515_718D, RV515) +CHIPSET(0x718F, RV515_718F, RV515) +CHIPSET(0x7193, RV515_7193, RV515) +CHIPSET(0x7196, RV515_7196, RV515) +CHIPSET(0x719B, RV515_719B, RV515) +CHIPSET(0x719F, RV515_719F, RV515) +CHIPSET(0x7200, RV515_7200, RV515) +CHIPSET(0x7210, RV515_7210, RV515) +CHIPSET(0x7211, RV515_7211, RV515) + +CHIPSET(0x71C0, RV530_71C0, RV530) +CHIPSET(0x71C1, RV530_71C1, RV530) +CHIPSET(0x71C2, RV530_71C2, RV530) +CHIPSET(0x71C3, RV530_71C3, RV530) +CHIPSET(0x71C4, RV530_71C4, RV530) +CHIPSET(0x71C5, RV530_71C5, RV530) +CHIPSET(0x71C6, RV530_71C6, RV530) +CHIPSET(0x71C7, RV530_71C7, RV530) +CHIPSET(0x71CD, RV530_71CD, RV530) +CHIPSET(0x71CE, RV530_71CE, RV530) +CHIPSET(0x71D2, RV530_71D2, RV530) +CHIPSET(0x71D4, RV530_71D4, RV530) +CHIPSET(0x71D5, RV530_71D5, RV530) +CHIPSET(0x71D6, RV530_71D6, RV530) +CHIPSET(0x71DA, RV530_71DA, RV530) +CHIPSET(0x71DE, RV530_71DE, RV530) + +CHIPSET(0x7281, RV560_7281, RV560) +CHIPSET(0x7283, RV560_7283, RV560) +CHIPSET(0x7287, RV560_7287, RV560) +CHIPSET(0x7290, RV560_7290, RV560) +CHIPSET(0x7291, RV560_7291, RV560) +CHIPSET(0x7293, RV560_7293, RV560) +CHIPSET(0x7297, RV560_7297, RV560) + +CHIPSET(0x7280, RV570_7280, RV570) +CHIPSET(0x7288, RV570_7288, RV570) +CHIPSET(0x7289, RV570_7289, RV570) +CHIPSET(0x728B, RV570_728B, RV570) +CHIPSET(0x728C, RV570_728C, RV570) + +CHIPSET(0x7240, R580_7240, R580) +CHIPSET(0x7243, R580_7243, R580) +CHIPSET(0x7244, R580_7244, R580) +CHIPSET(0x7245, R580_7245, R580) +CHIPSET(0x7246, R580_7246, R580) +CHIPSET(0x7247, R580_7247, R580) +CHIPSET(0x7248, R580_7248, R580) +CHIPSET(0x7249, R580_7249, R580) +CHIPSET(0x724A, R580_724A, R580) +CHIPSET(0x724B, R580_724B, R580) +CHIPSET(0x724C, R580_724C, R580) +CHIPSET(0x724D, R580_724D, R580) +CHIPSET(0x724E, R580_724E, R580) +CHIPSET(0x724F, R580_724F, R580) +CHIPSET(0x7284, R580_7284, R580) + +CHIPSET(0x793F, RS600_793F, RS600) +CHIPSET(0x7941, RS600_7941, RS600) +CHIPSET(0x7942, RS600_7942, RS600) + +CHIPSET(0x791E, RS690_791E, RS690) +CHIPSET(0x791F, RS690_791F, RS690) + +CHIPSET(0x796C, RS740_796C, RS740) +CHIPSET(0x796D, RS740_796D, RS740) +CHIPSET(0x796E, RS740_796E, RS740) +CHIPSET(0x796F, RS740_796F, RS740) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/r600_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/r600_pci_ids.h new file mode 100644 index 0000000..533c9f3 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/r600_pci_ids.h @@ -0,0 +1,327 @@ +CHIPSET(0x9400, R600_9400, R600) +CHIPSET(0x9401, R600_9401, R600) +CHIPSET(0x9402, R600_9402, R600) +CHIPSET(0x9403, R600_9403, R600) +CHIPSET(0x9405, R600_9405, R600) +CHIPSET(0x940A, R600_940A, R600) +CHIPSET(0x940B, R600_940B, R600) +CHIPSET(0x940F, R600_940F, R600) + +CHIPSET(0x94C0, RV610_94C0, RV610) +CHIPSET(0x94C1, RV610_94C1, RV610) +CHIPSET(0x94C3, RV610_94C3, RV610) +CHIPSET(0x94C4, RV610_94C4, RV610) +CHIPSET(0x94C5, RV610_94C5, RV610) +CHIPSET(0x94C6, RV610_94C6, RV610) +CHIPSET(0x94C7, RV610_94C7, RV610) +CHIPSET(0x94C8, RV610_94C8, RV610) +CHIPSET(0x94C9, RV610_94C9, RV610) +CHIPSET(0x94CB, RV610_94CB, RV610) +CHIPSET(0x94CC, RV610_94CC, RV610) +CHIPSET(0x94CD, RV610_94CD, RV610) + +CHIPSET(0x9580, RV630_9580, RV630) +CHIPSET(0x9581, RV630_9581, RV630) +CHIPSET(0x9583, RV630_9583, RV630) +CHIPSET(0x9586, RV630_9586, RV630) +CHIPSET(0x9587, RV630_9587, RV630) +CHIPSET(0x9588, RV630_9588, RV630) +CHIPSET(0x9589, RV630_9589, RV630) +CHIPSET(0x958A, RV630_958A, RV630) +CHIPSET(0x958B, RV630_958B, RV630) +CHIPSET(0x958C, RV630_958C, RV630) +CHIPSET(0x958D, RV630_958D, RV630) +CHIPSET(0x958E, RV630_958E, RV630) +CHIPSET(0x958F, RV630_958F, RV630) + +CHIPSET(0x9500, RV670_9500, RV670) +CHIPSET(0x9501, RV670_9501, RV670) +CHIPSET(0x9504, RV670_9504, RV670) +CHIPSET(0x9505, RV670_9505, RV670) +CHIPSET(0x9506, RV670_9506, RV670) +CHIPSET(0x9507, RV670_9507, RV670) +CHIPSET(0x9508, RV670_9508, RV670) +CHIPSET(0x9509, RV670_9509, RV670) +CHIPSET(0x950F, RV670_950F, RV670) +CHIPSET(0x9511, RV670_9511, RV670) +CHIPSET(0x9515, RV670_9515, RV670) +CHIPSET(0x9517, RV670_9517, RV670) +CHIPSET(0x9519, RV670_9519, RV670) + +CHIPSET(0x95C0, RV620_95C0, RV620) +CHIPSET(0x95C2, RV620_95C2, RV620) +CHIPSET(0x95C4, RV620_95C4, RV620) +CHIPSET(0x95C5, RV620_95C5, RV620) +CHIPSET(0x95C6, RV620_95C6, RV620) +CHIPSET(0x95C7, RV620_95C7, RV620) +CHIPSET(0x95C9, RV620_95C9, RV620) +CHIPSET(0x95CC, RV620_95CC, RV620) +CHIPSET(0x95CD, RV620_95CD, RV620) +CHIPSET(0x95CE, RV620_95CE, RV620) +CHIPSET(0x95CF, RV620_95CF, RV620) + +CHIPSET(0x9590, RV635_9590, RV635) +CHIPSET(0x9591, RV635_9591, RV635) +CHIPSET(0x9593, RV635_9593, RV635) +CHIPSET(0x9595, RV635_9595, RV635) +CHIPSET(0x9596, RV635_9596, RV635) +CHIPSET(0x9597, RV635_9597, RV635) +CHIPSET(0x9598, RV635_9598, RV635) +CHIPSET(0x9599, RV635_9599, RV635) +CHIPSET(0x959B, RV635_959B, RV635) + +CHIPSET(0x9610, RS780_9610, RS780) +CHIPSET(0x9611, RS780_9611, RS780) +CHIPSET(0x9612, RS780_9612, RS780) +CHIPSET(0x9613, RS780_9613, RS780) +CHIPSET(0x9614, RS780_9614, RS780) +CHIPSET(0x9615, RS780_9615, RS780) +CHIPSET(0x9616, RS780_9616, RS780) + +CHIPSET(0x9710, RS880_9710, RS880) +CHIPSET(0x9711, RS880_9711, RS880) +CHIPSET(0x9712, RS880_9712, RS880) +CHIPSET(0x9713, RS880_9713, RS880) +CHIPSET(0x9714, RS880_9714, RS880) +CHIPSET(0x9715, RS880_9715, RS880) + +CHIPSET(0x9440, RV770_9440, RV770) +CHIPSET(0x9441, RV770_9441, RV770) +CHIPSET(0x9442, RV770_9442, RV770) +CHIPSET(0x9443, RV770_9443, RV770) +CHIPSET(0x9444, RV770_9444, RV770) +CHIPSET(0x9446, RV770_9446, RV770) +CHIPSET(0x944A, RV770_944A, RV770) +CHIPSET(0x944B, RV770_944B, RV770) +CHIPSET(0x944C, RV770_944C, RV770) +CHIPSET(0x944E, RV770_944E, RV770) +CHIPSET(0x9450, RV770_9450, RV770) +CHIPSET(0x9452, RV770_9452, RV770) +CHIPSET(0x9456, RV770_9456, RV770) +CHIPSET(0x945A, RV770_945A, RV770) +CHIPSET(0x945B, RV770_945B, RV770) +CHIPSET(0x945E, RV770_945E, RV770) +CHIPSET(0x9460, RV790_9460, RV770) +CHIPSET(0x9462, RV790_9462, RV770) +CHIPSET(0x946A, RV770_946A, RV770) +CHIPSET(0x946B, RV770_946B, RV770) +CHIPSET(0x947A, RV770_947A, RV770) +CHIPSET(0x947B, RV770_947B, RV770) + +CHIPSET(0x9480, RV730_9480, RV730) +CHIPSET(0x9487, RV730_9487, RV730) +CHIPSET(0x9488, RV730_9488, RV730) +CHIPSET(0x9489, RV730_9489, RV730) +CHIPSET(0x948A, RV730_948A, RV730) +CHIPSET(0x948F, RV730_948F, RV730) +CHIPSET(0x9490, RV730_9490, RV730) +CHIPSET(0x9491, RV730_9491, RV730) +CHIPSET(0x9495, RV730_9495, RV730) +CHIPSET(0x9498, RV730_9498, RV730) +CHIPSET(0x949C, RV730_949C, RV730) +CHIPSET(0x949E, RV730_949E, RV730) +CHIPSET(0x949F, RV730_949F, RV730) + +CHIPSET(0x9540, RV710_9540, RV710) +CHIPSET(0x9541, RV710_9541, RV710) +CHIPSET(0x9542, RV710_9542, RV710) +CHIPSET(0x954E, RV710_954E, RV710) +CHIPSET(0x954F, RV710_954F, RV710) +CHIPSET(0x9552, RV710_9552, RV710) +CHIPSET(0x9553, RV710_9553, RV710) +CHIPSET(0x9555, RV710_9555, RV710) +CHIPSET(0x9557, RV710_9557, RV710) +CHIPSET(0x955F, RV710_955F, RV710) + +CHIPSET(0x94A0, RV740_94A0, RV740) +CHIPSET(0x94A1, RV740_94A1, RV740) +CHIPSET(0x94A3, RV740_94A3, RV740) +CHIPSET(0x94B1, RV740_94B1, RV740) +CHIPSET(0x94B3, RV740_94B3, RV740) +CHIPSET(0x94B4, RV740_94B4, RV740) +CHIPSET(0x94B5, RV740_94B5, RV740) +CHIPSET(0x94B9, RV740_94B9, RV740) + +CHIPSET(0x68E0, CEDAR_68E0, CEDAR) +CHIPSET(0x68E1, CEDAR_68E1, CEDAR) +CHIPSET(0x68E4, CEDAR_68E4, CEDAR) +CHIPSET(0x68E5, CEDAR_68E5, CEDAR) +CHIPSET(0x68E8, CEDAR_68E8, CEDAR) +CHIPSET(0x68E9, CEDAR_68E9, CEDAR) +CHIPSET(0x68F1, CEDAR_68F1, CEDAR) +CHIPSET(0x68F2, CEDAR_68F2, CEDAR) +CHIPSET(0x68F8, CEDAR_68F8, CEDAR) +CHIPSET(0x68F9, CEDAR_68F9, CEDAR) +CHIPSET(0x68FA, CEDAR_68FA, CEDAR) +CHIPSET(0x68FE, CEDAR_68FE, CEDAR) + +CHIPSET(0x68C0, REDWOOD_68C0, REDWOOD) +CHIPSET(0x68C1, REDWOOD_68C1, REDWOOD) +CHIPSET(0x68C7, REDWOOD_68C7, REDWOOD) +CHIPSET(0x68C8, REDWOOD_68C8, REDWOOD) +CHIPSET(0x68C9, REDWOOD_68C9, REDWOOD) +CHIPSET(0x68D8, REDWOOD_68D8, REDWOOD) +CHIPSET(0x68D9, REDWOOD_68D9, REDWOOD) +CHIPSET(0x68DA, REDWOOD_68DA, REDWOOD) +CHIPSET(0x68DE, REDWOOD_68DE, REDWOOD) + +CHIPSET(0x68A0, JUNIPER_68A0, JUNIPER) +CHIPSET(0x68A1, JUNIPER_68A1, JUNIPER) +CHIPSET(0x68A8, JUNIPER_68A8, JUNIPER) +CHIPSET(0x68A9, JUNIPER_68A9, JUNIPER) +CHIPSET(0x68B0, JUNIPER_68B0, JUNIPER) +CHIPSET(0x68B8, JUNIPER_68B8, JUNIPER) +CHIPSET(0x68B9, JUNIPER_68B9, JUNIPER) +CHIPSET(0x68BA, JUNIPER_68BA, JUNIPER) +CHIPSET(0x68BE, JUNIPER_68BE, JUNIPER) +CHIPSET(0x68BF, JUNIPER_68BF, JUNIPER) + +CHIPSET(0x6880, CYPRESS_6880, CYPRESS) +CHIPSET(0x6888, CYPRESS_6888, CYPRESS) +CHIPSET(0x6889, CYPRESS_6889, CYPRESS) +CHIPSET(0x688A, CYPRESS_688A, CYPRESS) +CHIPSET(0x688C, CYPRESS_688C, CYPRESS) +CHIPSET(0x688D, CYPRESS_688D, CYPRESS) +CHIPSET(0x6898, CYPRESS_6898, CYPRESS) +CHIPSET(0x6899, CYPRESS_6899, CYPRESS) +CHIPSET(0x689B, CYPRESS_689B, CYPRESS) +CHIPSET(0x689E, CYPRESS_689E, CYPRESS) + +CHIPSET(0x689C, HEMLOCK_689C, HEMLOCK) +CHIPSET(0x689D, HEMLOCK_689D, HEMLOCK) + +CHIPSET(0x9802, PALM_9802, PALM) +CHIPSET(0x9803, PALM_9803, PALM) +CHIPSET(0x9804, PALM_9804, PALM) +CHIPSET(0x9805, PALM_9805, PALM) +CHIPSET(0x9806, PALM_9806, PALM) +CHIPSET(0x9807, PALM_9807, PALM) +CHIPSET(0x9808, PALM_9808, PALM) +CHIPSET(0x9809, PALM_9809, PALM) +CHIPSET(0x980A, PALM_980A, PALM) + +CHIPSET(0x9640, SUMO_9640, SUMO) +CHIPSET(0x9641, SUMO_9641, SUMO) +CHIPSET(0x9642, SUMO2_9642, SUMO2) +CHIPSET(0x9643, SUMO2_9643, SUMO2) +CHIPSET(0x9644, SUMO2_9644, SUMO2) +CHIPSET(0x9645, SUMO2_9645, SUMO2) +CHIPSET(0x9647, SUMO_9647, SUMO) +CHIPSET(0x9648, SUMO_9648, SUMO) +CHIPSET(0x9649, SUMO2_9649, SUMO2) +CHIPSET(0x964a, SUMO_964A, SUMO) +CHIPSET(0x964b, SUMO_964B, SUMO) +CHIPSET(0x964c, SUMO_964C, SUMO) +CHIPSET(0x964e, SUMO_964E, SUMO) +CHIPSET(0x964f, SUMO_964F, SUMO) + +CHIPSET(0x6700, CAYMAN_6700, CAYMAN) +CHIPSET(0x6701, CAYMAN_6701, CAYMAN) +CHIPSET(0x6702, CAYMAN_6702, CAYMAN) +CHIPSET(0x6703, CAYMAN_6703, CAYMAN) +CHIPSET(0x6704, CAYMAN_6704, CAYMAN) +CHIPSET(0x6705, CAYMAN_6705, CAYMAN) +CHIPSET(0x6706, CAYMAN_6706, CAYMAN) +CHIPSET(0x6707, CAYMAN_6707, CAYMAN) +CHIPSET(0x6708, CAYMAN_6708, CAYMAN) +CHIPSET(0x6709, CAYMAN_6709, CAYMAN) +CHIPSET(0x6718, CAYMAN_6718, CAYMAN) +CHIPSET(0x6719, CAYMAN_6719, CAYMAN) +CHIPSET(0x671C, CAYMAN_671C, CAYMAN) +CHIPSET(0x671D, CAYMAN_671D, CAYMAN) +CHIPSET(0x671F, CAYMAN_671F, CAYMAN) + +CHIPSET(0x6720, BARTS_6720, BARTS) +CHIPSET(0x6721, BARTS_6721, BARTS) +CHIPSET(0x6722, BARTS_6722, BARTS) +CHIPSET(0x6723, BARTS_6723, BARTS) +CHIPSET(0x6724, BARTS_6724, BARTS) +CHIPSET(0x6725, BARTS_6725, BARTS) +CHIPSET(0x6726, BARTS_6726, BARTS) +CHIPSET(0x6727, BARTS_6727, BARTS) +CHIPSET(0x6728, BARTS_6728, BARTS) +CHIPSET(0x6729, BARTS_6729, BARTS) +CHIPSET(0x6738, BARTS_6738, BARTS) +CHIPSET(0x6739, BARTS_6739, BARTS) +CHIPSET(0x673E, BARTS_673E, BARTS) + +CHIPSET(0x6740, TURKS_6740, TURKS) +CHIPSET(0x6741, TURKS_6741, TURKS) +CHIPSET(0x6742, TURKS_6742, TURKS) +CHIPSET(0x6743, TURKS_6743, TURKS) +CHIPSET(0x6744, TURKS_6744, TURKS) +CHIPSET(0x6745, TURKS_6745, TURKS) +CHIPSET(0x6746, TURKS_6746, TURKS) +CHIPSET(0x6747, TURKS_6747, TURKS) +CHIPSET(0x6748, TURKS_6748, TURKS) +CHIPSET(0x6749, TURKS_6749, TURKS) +CHIPSET(0x674A, TURKS_674A, TURKS) +CHIPSET(0x6750, TURKS_6750, TURKS) +CHIPSET(0x6751, TURKS_6751, TURKS) +CHIPSET(0x6758, TURKS_6758, TURKS) +CHIPSET(0x6759, TURKS_6759, TURKS) +CHIPSET(0x675B, TURKS_675B, TURKS) +CHIPSET(0x675D, TURKS_675D, TURKS) +CHIPSET(0x675F, TURKS_675F, TURKS) +CHIPSET(0x6840, TURKS_6840, TURKS) +CHIPSET(0x6841, TURKS_6841, TURKS) +CHIPSET(0x6842, TURKS_6842, TURKS) +CHIPSET(0x6843, TURKS_6843, TURKS) +CHIPSET(0x6849, TURKS_6849, TURKS) +CHIPSET(0x6850, TURKS_6850, TURKS) +CHIPSET(0x6858, TURKS_6858, TURKS) +CHIPSET(0x6859, TURKS_6859, TURKS) + +CHIPSET(0x6760, CAICOS_6760, CAICOS) +CHIPSET(0x6761, CAICOS_6761, CAICOS) +CHIPSET(0x6762, CAICOS_6762, CAICOS) +CHIPSET(0x6763, CAICOS_6763, CAICOS) +CHIPSET(0x6764, CAICOS_6764, CAICOS) +CHIPSET(0x6765, CAICOS_6765, CAICOS) +CHIPSET(0x6766, CAICOS_6766, CAICOS) +CHIPSET(0x6767, CAICOS_6767, CAICOS) +CHIPSET(0x6768, CAICOS_6768, CAICOS) +CHIPSET(0x6770, CAICOS_6770, CAICOS) +CHIPSET(0x6771, CAICOS_6771, CAICOS) +CHIPSET(0x6772, CAICOS_6772, CAICOS) +CHIPSET(0x6778, CAICOS_6778, CAICOS) +CHIPSET(0x6779, CAICOS_6779, CAICOS) +CHIPSET(0x677B, CAICOS_677B, CAICOS) + +CHIPSET(0x9900, ARUBA_9900, ARUBA) +CHIPSET(0x9901, ARUBA_9901, ARUBA) +CHIPSET(0x9903, ARUBA_9903, ARUBA) +CHIPSET(0x9904, ARUBA_9904, ARUBA) +CHIPSET(0x9905, ARUBA_9905, ARUBA) +CHIPSET(0x9906, ARUBA_9906, ARUBA) +CHIPSET(0x9907, ARUBA_9907, ARUBA) +CHIPSET(0x9908, ARUBA_9908, ARUBA) +CHIPSET(0x9909, ARUBA_9909, ARUBA) +CHIPSET(0x990A, ARUBA_990A, ARUBA) +CHIPSET(0x990B, ARUBA_990B, ARUBA) +CHIPSET(0x990C, ARUBA_990C, ARUBA) +CHIPSET(0x990D, ARUBA_990D, ARUBA) +CHIPSET(0x990E, ARUBA_990E, ARUBA) +CHIPSET(0x990F, ARUBA_990F, ARUBA) +CHIPSET(0x9910, ARUBA_9910, ARUBA) +CHIPSET(0x9913, ARUBA_9913, ARUBA) +CHIPSET(0x9917, ARUBA_9917, ARUBA) +CHIPSET(0x9918, ARUBA_9918, ARUBA) +CHIPSET(0x9919, ARUBA_9919, ARUBA) +CHIPSET(0x9990, ARUBA_9990, ARUBA) +CHIPSET(0x9991, ARUBA_9991, ARUBA) +CHIPSET(0x9992, ARUBA_9992, ARUBA) +CHIPSET(0x9993, ARUBA_9993, ARUBA) +CHIPSET(0x9994, ARUBA_9994, ARUBA) +CHIPSET(0x9995, ARUBA_9995, ARUBA) +CHIPSET(0x9996, ARUBA_9996, ARUBA) +CHIPSET(0x9997, ARUBA_9997, ARUBA) +CHIPSET(0x9998, ARUBA_9998, ARUBA) +CHIPSET(0x9999, ARUBA_9999, ARUBA) +CHIPSET(0x999A, ARUBA_999A, ARUBA) +CHIPSET(0x999B, ARUBA_999B, ARUBA) +CHIPSET(0x999C, ARUBA_999C, ARUBA) +CHIPSET(0x999D, ARUBA_999D, ARUBA) +CHIPSET(0x99A0, ARUBA_99A0, ARUBA) +CHIPSET(0x99A2, ARUBA_99A2, ARUBA) +CHIPSET(0x99A4, ARUBA_99A4, ARUBA) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/radeon_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/radeon_pci_ids.h new file mode 100644 index 0000000..a9efc76 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/radeon_pci_ids.h @@ -0,0 +1,23 @@ +CHIPSET(0x4C57, RADEON_LW, RV200) +CHIPSET(0x4C58, RADEON_LX, RV200) +CHIPSET(0x4C59, RADEON_LY, RV100) +CHIPSET(0x4C5A, RADEON_LZ, RV100) +CHIPSET(0x5144, RADEON_QD, R100) +CHIPSET(0x5145, RADEON_QE, R100) +CHIPSET(0x5146, RADEON_QF, R100) +CHIPSET(0x5147, RADEON_QG, R100) +CHIPSET(0x5159, RADEON_QY, RV100) +CHIPSET(0x515A, RADEON_QZ, RV100) + +CHIPSET(0x5157, RV200_QW, RV200) +CHIPSET(0x5158, RV200_QX, RV200) + +CHIPSET(0x515E, RN50_515E, UNKNOWN) +CHIPSET(0x5969, RN50_5969, UNKNOWN) + +CHIPSET(0x4136, RS100_4136, RS100) +CHIPSET(0x4336, RS100_4336, RS100) +CHIPSET(0x4137, RS200_4137, RS200) +CHIPSET(0x4337, RS200_4337, RS200) +CHIPSET(0x4237, RS250_4237, RS200) +CHIPSET(0x4437, RS250_4437, RS200) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h new file mode 100644 index 0000000..571e863 --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h @@ -0,0 +1,157 @@ +CHIPSET(0x6780, TAHITI_6780, TAHITI) +CHIPSET(0x6784, TAHITI_6784, TAHITI) +CHIPSET(0x6788, TAHITI_6788, TAHITI) +CHIPSET(0x678A, TAHITI_678A, TAHITI) +CHIPSET(0x6790, TAHITI_6790, TAHITI) +CHIPSET(0x6791, TAHITI_6791, TAHITI) +CHIPSET(0x6792, TAHITI_6792, TAHITI) +CHIPSET(0x6798, TAHITI_6798, TAHITI) +CHIPSET(0x6799, TAHITI_6799, TAHITI) +CHIPSET(0x679A, TAHITI_679A, TAHITI) +CHIPSET(0x679B, TAHITI_679B, TAHITI) +CHIPSET(0x679E, TAHITI_679E, TAHITI) +CHIPSET(0x679F, TAHITI_679F, TAHITI) + +CHIPSET(0x6800, PITCAIRN_6800, PITCAIRN) +CHIPSET(0x6801, PITCAIRN_6801, PITCAIRN) +CHIPSET(0x6802, PITCAIRN_6802, PITCAIRN) +CHIPSET(0x6806, PITCAIRN_6806, PITCAIRN) +CHIPSET(0x6808, PITCAIRN_6808, PITCAIRN) +CHIPSET(0x6809, PITCAIRN_6809, PITCAIRN) +CHIPSET(0x6810, PITCAIRN_6810, PITCAIRN) +CHIPSET(0x6811, PITCAIRN_6811, PITCAIRN) +CHIPSET(0x6816, PITCAIRN_6816, PITCAIRN) +CHIPSET(0x6817, PITCAIRN_6817, PITCAIRN) +CHIPSET(0x6818, PITCAIRN_6818, PITCAIRN) +CHIPSET(0x6819, PITCAIRN_6819, PITCAIRN) +CHIPSET(0x684C, PITCAIRN_684C, PITCAIRN) + +CHIPSET(0x6820, VERDE_6820, VERDE) +CHIPSET(0x6821, VERDE_6821, VERDE) +CHIPSET(0x6822, VERDE_6822, VERDE) +CHIPSET(0x6823, VERDE_6823, VERDE) +CHIPSET(0x6824, VERDE_6824, VERDE) +CHIPSET(0x6825, VERDE_6825, VERDE) +CHIPSET(0x6826, VERDE_6826, VERDE) +CHIPSET(0x6827, VERDE_6827, VERDE) +CHIPSET(0x6828, VERDE_6828, VERDE) +CHIPSET(0x6829, VERDE_6829, VERDE) +CHIPSET(0x682A, VERDE_682A, VERDE) +CHIPSET(0x682B, VERDE_682B, VERDE) +CHIPSET(0x682C, VERDE_682C, VERDE) +CHIPSET(0x682D, VERDE_682D, VERDE) +CHIPSET(0x682F, VERDE_682F, VERDE) +CHIPSET(0x6830, VERDE_6830, VERDE) +CHIPSET(0x6831, VERDE_6831, VERDE) +CHIPSET(0x6835, VERDE_6835, VERDE) +CHIPSET(0x6837, VERDE_6837, VERDE) +CHIPSET(0x6838, VERDE_6838, VERDE) +CHIPSET(0x6839, VERDE_6839, VERDE) +CHIPSET(0x683B, VERDE_683B, VERDE) +CHIPSET(0x683D, VERDE_683D, VERDE) +CHIPSET(0x683F, VERDE_683F, VERDE) + +CHIPSET(0x6600, OLAND_6600, OLAND) +CHIPSET(0x6601, OLAND_6601, OLAND) +CHIPSET(0x6602, OLAND_6602, OLAND) +CHIPSET(0x6603, OLAND_6603, OLAND) +CHIPSET(0x6604, OLAND_6604, OLAND) +CHIPSET(0x6605, OLAND_6605, OLAND) +CHIPSET(0x6606, OLAND_6606, OLAND) +CHIPSET(0x6607, OLAND_6607, OLAND) +CHIPSET(0x6608, OLAND_6608, OLAND) +CHIPSET(0x6610, OLAND_6610, OLAND) +CHIPSET(0x6611, OLAND_6611, OLAND) +CHIPSET(0x6613, OLAND_6613, OLAND) +CHIPSET(0x6620, OLAND_6620, OLAND) +CHIPSET(0x6621, OLAND_6621, OLAND) +CHIPSET(0x6623, OLAND_6623, OLAND) +CHIPSET(0x6631, OLAND_6631, OLAND) + +CHIPSET(0x6660, HAINAN_6660, HAINAN) +CHIPSET(0x6663, HAINAN_6663, HAINAN) +CHIPSET(0x6664, HAINAN_6664, HAINAN) +CHIPSET(0x6665, HAINAN_6665, HAINAN) +CHIPSET(0x6667, HAINAN_6667, HAINAN) +CHIPSET(0x666F, HAINAN_666F, HAINAN) + +CHIPSET(0x6640, BONAIRE_6640, BONAIRE) +CHIPSET(0x6641, BONAIRE_6641, BONAIRE) +CHIPSET(0x6646, BONAIRE_6646, BONAIRE) +CHIPSET(0x6647, BONAIRE_6647, BONAIRE) +CHIPSET(0x6649, BONAIRE_6649, BONAIRE) +CHIPSET(0x6650, BONAIRE_6650, BONAIRE) +CHIPSET(0x6651, BONAIRE_6651, BONAIRE) +CHIPSET(0x6658, BONAIRE_6658, BONAIRE) +CHIPSET(0x665C, BONAIRE_665C, BONAIRE) +CHIPSET(0x665D, BONAIRE_665D, BONAIRE) + +CHIPSET(0x9830, KABINI_9830, KABINI) +CHIPSET(0x9831, KABINI_9831, KABINI) +CHIPSET(0x9832, KABINI_9832, KABINI) +CHIPSET(0x9833, KABINI_9833, KABINI) +CHIPSET(0x9834, KABINI_9834, KABINI) +CHIPSET(0x9835, KABINI_9835, KABINI) +CHIPSET(0x9836, KABINI_9836, KABINI) +CHIPSET(0x9837, KABINI_9837, KABINI) +CHIPSET(0x9838, KABINI_9838, KABINI) +CHIPSET(0x9839, KABINI_9839, KABINI) +CHIPSET(0x983A, KABINI_983A, KABINI) +CHIPSET(0x983B, KABINI_983B, KABINI) +CHIPSET(0x983C, KABINI_983C, KABINI) +CHIPSET(0x983D, KABINI_983D, KABINI) +CHIPSET(0x983E, KABINI_983E, KABINI) +CHIPSET(0x983F, KABINI_983F, KABINI) + +CHIPSET(0x9850, MULLINS_9850, MULLINS) +CHIPSET(0x9851, MULLINS_9851, MULLINS) +CHIPSET(0x9852, MULLINS_9852, MULLINS) +CHIPSET(0x9853, MULLINS_9853, MULLINS) +CHIPSET(0x9854, MULLINS_9854, MULLINS) +CHIPSET(0x9855, MULLINS_9855, MULLINS) +CHIPSET(0x9856, MULLINS_9856, MULLINS) +CHIPSET(0x9857, MULLINS_9857, MULLINS) +CHIPSET(0x9858, MULLINS_9858, MULLINS) +CHIPSET(0x9859, MULLINS_9859, MULLINS) +CHIPSET(0x985A, MULLINS_985A, MULLINS) +CHIPSET(0x985B, MULLINS_985B, MULLINS) +CHIPSET(0x985C, MULLINS_985C, MULLINS) +CHIPSET(0x985D, MULLINS_985D, MULLINS) +CHIPSET(0x985E, MULLINS_985E, MULLINS) +CHIPSET(0x985F, MULLINS_985F, MULLINS) + +CHIPSET(0x1304, KAVERI_1304, KAVERI) +CHIPSET(0x1305, KAVERI_1305, KAVERI) +CHIPSET(0x1306, KAVERI_1306, KAVERI) +CHIPSET(0x1307, KAVERI_1307, KAVERI) +CHIPSET(0x1309, KAVERI_1309, KAVERI) +CHIPSET(0x130A, KAVERI_130A, KAVERI) +CHIPSET(0x130B, KAVERI_130B, KAVERI) +CHIPSET(0x130C, KAVERI_130C, KAVERI) +CHIPSET(0x130D, KAVERI_130D, KAVERI) +CHIPSET(0x130E, KAVERI_130E, KAVERI) +CHIPSET(0x130F, KAVERI_130F, KAVERI) +CHIPSET(0x1310, KAVERI_1310, KAVERI) +CHIPSET(0x1311, KAVERI_1311, KAVERI) +CHIPSET(0x1312, KAVERI_1312, KAVERI) +CHIPSET(0x1313, KAVERI_1313, KAVERI) +CHIPSET(0x1315, KAVERI_1315, KAVERI) +CHIPSET(0x1316, KAVERI_1316, KAVERI) +CHIPSET(0x1317, KAVERI_1317, KAVERI) +CHIPSET(0x1318, KAVERI_1318, KAVERI) +CHIPSET(0x131B, KAVERI_131B, KAVERI) +CHIPSET(0x131C, KAVERI_131C, KAVERI) +CHIPSET(0x131D, KAVERI_131D, KAVERI) + +CHIPSET(0x67A0, HAWAII_67A0, HAWAII) +CHIPSET(0x67A1, HAWAII_67A1, HAWAII) +CHIPSET(0x67A2, HAWAII_67A2, HAWAII) +CHIPSET(0x67A8, HAWAII_67A8, HAWAII) +CHIPSET(0x67A9, HAWAII_67A9, HAWAII) +CHIPSET(0x67AA, HAWAII_67AA, HAWAII) +CHIPSET(0x67B0, HAWAII_67B0, HAWAII) +CHIPSET(0x67B1, HAWAII_67B1, HAWAII) +CHIPSET(0x67B8, HAWAII_67B8, HAWAII) +CHIPSET(0x67B9, HAWAII_67B9, HAWAII) +CHIPSET(0x67BA, HAWAII_67BA, HAWAII) +CHIPSET(0x67BE, HAWAII_67BE, HAWAII) diff --git a/xorg-server/hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h b/xorg-server/hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h new file mode 100644 index 0000000..124d75b --- /dev/null +++ b/xorg-server/hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h @@ -0,0 +1 @@ +CHIPSET(0x0405, SVGAII, SVGAII) diff --git a/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am b/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am index e6834e2..5b08600 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am +++ b/xorg-server/hw/xfree86/drivers/modesetting/Makefile.am @@ -30,6 +30,7 @@ AM_CPPFLAGS = \ $(XORG_INCS) \ -I$(top_srcdir)/glamor \ -I$(srcdir)/../../ddc \ + -I$(srcdir)/../../dri2 \ -I$(srcdir)/../../i2c \ -I$(srcdir)/../../modes \ -I$(srcdir)/../../parser \ @@ -42,10 +43,13 @@ modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) modesetting_drv_ladir = @moduledir@/drivers modesetting_drv_la_SOURCES = \ + dri2.c \ driver.c \ driver.h \ drmmode_display.c \ - drmmode_display.h + drmmode_display.h \ + vblank.c \ + $(NULL) drivermandir = $(DRIVER_MAN_DIR) driverman_PRE = modesetting.man diff --git a/xorg-server/hw/xfree86/drivers/modesetting/dri2.c b/xorg-server/hw/xfree86/drivers/modesetting/dri2.c new file mode 100644 index 0000000..6c88060 --- /dev/null +++ b/xorg-server/hw/xfree86/drivers/modesetting/dri2.c @@ -0,0 +1,863 @@ +/* + * Copyright © 2013 Intel Corporation + * Copyright © 2014 Broadcom + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +/** + * @file dri2.c + * + * Implements generic support for DRI2 on KMS, using glamor pixmaps + * for color buffer management (no support for other aux buffers), and + * the DRM vblank ioctls. + * + * This doesn't implement pageflipping yet. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include "dix-config.h" +#endif + +#include <time.h> +#include "list.h" +#include "xf86.h" +#include "driver.h" +#include "dri2.h" + +#ifdef GLAMOR +#define GLAMOR_FOR_XORG 1 +#include "glamor.h" + +enum ms_dri2_frame_event_type { + MS_DRI2_QUEUE_SWAP, + MS_DRI2_WAIT_MSC, +}; + +typedef struct ms_dri2_frame_event { + ScreenPtr screen; + + DrawablePtr drawable; + ClientPtr client; + enum ms_dri2_frame_event_type type; + int frame; + xf86CrtcPtr crtc; + + struct xorg_list drawable_resource, client_resource; + + /* for swaps & flips only */ + DRI2SwapEventPtr event_complete; + void *event_data; + DRI2BufferPtr front; + DRI2BufferPtr back; +} ms_dri2_frame_event_rec, *ms_dri2_frame_event_ptr; + +typedef struct { + int refcnt; + PixmapPtr pixmap; +} ms_dri2_buffer_private_rec, *ms_dri2_buffer_private_ptr; + +static DevPrivateKeyRec ms_dri2_client_key; +static RESTYPE frame_event_client_type, frame_event_drawable_type; +static int ms_dri2_server_generation; + +struct ms_dri2_resource { + XID id; + RESTYPE type; + struct xorg_list list; +}; + +static struct ms_dri2_resource * +ms_get_resource(XID id, RESTYPE type) +{ + struct ms_dri2_resource *resource; + void *ptr; + + ptr = NULL; + dixLookupResourceByType(&ptr, id, type, NULL, DixWriteAccess); + if (ptr) + return ptr; + + resource = malloc(sizeof(*resource)); + if (resource == NULL) + return NULL; + + if (!AddResource(id, type, resource)) { + free(resource); + return NULL; + } + + resource->id = id; + resource->type = type; + xorg_list_init(&resource->list); + return resource; +} + +static inline PixmapPtr +get_drawable_pixmap(DrawablePtr drawable) +{ + ScreenPtr screen = drawable->pScreen; + + if (drawable->type == DRAWABLE_PIXMAP) + return (PixmapPtr) drawable; + else + return screen->GetWindowPixmap((WindowPtr) drawable); +} + +static PixmapPtr +get_front_buffer(DrawablePtr drawable) +{ + PixmapPtr pixmap; + + pixmap = get_drawable_pixmap(drawable); + pixmap->refcnt++; + + return pixmap; +} + +static DRI2Buffer2Ptr +ms_dri2_create_buffer(DrawablePtr drawable, unsigned int attachment, + unsigned int format) +{ + ScreenPtr screen = drawable->pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + DRI2Buffer2Ptr buffer; + PixmapPtr pixmap; + uint32_t size; + uint16_t pitch; + ms_dri2_buffer_private_ptr private; + + buffer = calloc(1, sizeof *buffer); + if (buffer == NULL) + return NULL; + + private = calloc(1, sizeof(*private)); + if (private == NULL) { + free(buffer); + return NULL; + } + + pixmap = NULL; + if (attachment == DRI2BufferFrontLeft) + pixmap = get_front_buffer(drawable); + + if (pixmap == NULL) { + int pixmap_width = drawable->width; + int pixmap_height = drawable->height; + int pixmap_cpp = (format != 0) ? format : drawable->depth; + + /* Assume that non-color-buffers require special + * device-specific handling. Mesa currently makes no requests + * for non-color aux buffers. + */ + switch (attachment) { + case DRI2BufferAccum: + case DRI2BufferBackLeft: + case DRI2BufferBackRight: + case DRI2BufferFakeFrontLeft: + case DRI2BufferFakeFrontRight: + case DRI2BufferFrontLeft: + case DRI2BufferFrontRight: + break; + + case DRI2BufferStencil: + case DRI2BufferDepth: + case DRI2BufferDepthStencil: + case DRI2BufferHiz: + default: + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "Request for DRI2 buffer attachment %d unsupported\n", + attachment); + free(private); + free(buffer); + return NULL; + } + + pixmap = screen->CreatePixmap(screen, + pixmap_width, + pixmap_height, + pixmap_cpp, + 0); + if (pixmap == NULL) { + if (pixmap) + screen->DestroyPixmap(pixmap); + free(private); + free(buffer); + return NULL; + } + } + + buffer->attachment = attachment; + buffer->cpp = pixmap->drawable.bitsPerPixel / 8; + buffer->format = format; + /* The buffer's flags field is unused by the client drivers in + * Mesa currently. + */ + buffer->flags = 0; + + buffer->name = glamor_name_from_pixmap(pixmap, &pitch, &size); + buffer->pitch = pitch; + if (buffer->name == -1) { + xf86DrvMsg(scrn->scrnIndex, X_ERROR, + "Failed to get DRI2 name for pixmap\n"); + screen->DestroyPixmap(pixmap); + free(private); + free(buffer); + return NULL; + } + + buffer->driverPrivate = private; + private->refcnt = 1; + private->pixmap = pixmap; + + return buffer; +} + +static void +ms_dri2_reference_buffer(DRI2Buffer2Ptr buffer) +{ + if (buffer) { + ms_dri2_buffer_private_ptr private = buffer->driverPrivate; + private->refcnt++; + } +} + +static void ms_dri2_destroy_buffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer) +{ + if (!buffer) + return; + + if (buffer->driverPrivate) { + ms_dri2_buffer_private_ptr private = buffer->driverPrivate; + if (--private->refcnt == 0) { + ScreenPtr screen = private->pixmap->drawable.pScreen; + screen->DestroyPixmap(private->pixmap); + free(private); + free(buffer); + } + } else { + free(buffer); + } +} + +static void +ms_dri2_copy_region(DrawablePtr drawable, RegionPtr pRegion, + DRI2BufferPtr destBuffer, DRI2BufferPtr sourceBuffer) +{ + ms_dri2_buffer_private_ptr src_priv = sourceBuffer->driverPrivate; + ms_dri2_buffer_private_ptr dst_priv = destBuffer->driverPrivate; + PixmapPtr src_pixmap = src_priv->pixmap; + PixmapPtr dst_pixmap = dst_priv->pixmap; + ScreenPtr screen = drawable->pScreen; + DrawablePtr src = (sourceBuffer->attachment == DRI2BufferFrontLeft) + ? drawable : &src_pixmap->drawable; + DrawablePtr dst = (destBuffer->attachment == DRI2BufferFrontLeft) + ? drawable : &dst_pixmap->drawable; + RegionPtr pCopyClip; + GCPtr gc; + + gc = GetScratchGC(dst->depth, screen); + if (!gc) + return; + + pCopyClip = REGION_CREATE(screen, NULL, 0); + REGION_COPY(screen, pCopyClip, pRegion); + (*gc->funcs->ChangeClip) (gc, CT_REGION, pCopyClip, 0); + ValidateGC(dst, gc); + + /* It's important that this copy gets submitted before the direct + * rendering client submits rendering for the next frame, but we + * don't actually need to submit right now. The client will wait + * for the DRI2CopyRegion reply or the swap buffer event before + * rendering, and we'll hit the flush callback chain before those + * messages are sent. We submit our batch buffers from the flush + * callback chain so we know that will happen before the client + * tries to render again. + */ + gc->ops->CopyArea(src, dst, gc, + 0, 0, + drawable->width, drawable->height, + 0, 0); + + FreeScratchGC(gc); +} + +static uint64_t +gettime_us(void) +{ + struct timespec tv; + + if (clock_gettime(CLOCK_MONOTONIC, &tv)) + return 0; + + return (uint64_t)tv.tv_sec * 1000000 + tv.tv_nsec / 1000; +} + +/** + * Get current frame count and frame count timestamp, based on drawable's + * crtc. + */ +static int +ms_dri2_get_msc(DrawablePtr draw, CARD64 *ust, CARD64 *msc) +{ + int ret; + xf86CrtcPtr crtc = ms_dri2_crtc_covering_drawable(draw); + + /* Drawable not displayed, make up a *monotonic* value */ + if (crtc == NULL) { + *ust = gettime_us(); + *msc = 0; + return TRUE; + } + + ret = ms_get_crtc_ust_msc(crtc, ust, msc); + + if (ret) + return FALSE; + + return TRUE; +} + +static XID +get_client_id(ClientPtr client) +{ + XID *ptr = dixGetPrivateAddr(&client->devPrivates, &ms_dri2_client_key); + if (*ptr == 0) + *ptr = FakeClientID(client->index); + return *ptr; +} + +/* + * Hook this frame event into the server resource + * database so we can clean it up if the drawable or + * client exits while the swap is pending + */ +static Bool +ms_dri2_add_frame_event(ms_dri2_frame_event_ptr info) +{ + struct ms_dri2_resource *resource; + + resource = ms_get_resource(get_client_id(info->client), + frame_event_client_type); + if (resource == NULL) + return FALSE; + + xorg_list_add(&info->client_resource, &resource->list); + + resource = ms_get_resource(info->drawable->id, frame_event_drawable_type); + if (resource == NULL) { + xorg_list_del(&info->client_resource); + return FALSE; + } + + xorg_list_add(&info->drawable_resource, &resource->list); + + return TRUE; +} + +static void +ms_dri2_del_frame_event(ms_dri2_frame_event_rec *info) +{ + xorg_list_del(&info->client_resource); + xorg_list_del(&info->drawable_resource); + + if (info->front) + ms_dri2_destroy_buffer(NULL, info->front); + if (info->back) + ms_dri2_destroy_buffer(NULL, info->back); + + free(info); +} + +static void +ms_dri2_blit_swap(DrawablePtr drawable, + DRI2BufferPtr dst, + DRI2BufferPtr src) +{ + BoxRec box; + RegionRec region; + + box.x1 = 0; + box.y1 = 0; + box.x2 = drawable->width; + box.y2 = drawable->height; + REGION_INIT(pScreen, &region, &box, 0); + + ms_dri2_copy_region(drawable, &region, dst, src); +} + +static void +ms_dri2_frame_event_handler(uint64_t msc, + uint64_t usec, + void *data) +{ + ms_dri2_frame_event_ptr frame_info = data; + DrawablePtr drawable = frame_info->drawable; + ScreenPtr screen = frame_info->screen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + uint32_t tv_sec = usec / 1000000; + uint32_t tv_usec = usec % 1000000; + + if (!drawable) { + ms_dri2_del_frame_event(frame_info); + return; + } + + switch (frame_info->type) { + case MS_DRI2_QUEUE_SWAP: + ms_dri2_blit_swap(drawable, frame_info->front, frame_info->back); + DRI2SwapComplete(frame_info->client, drawable, msc, tv_sec, tv_usec, + DRI2_BLIT_COMPLETE, + frame_info->client ? frame_info->event_complete : NULL, + frame_info->event_data); + break; + + case MS_DRI2_WAIT_MSC: + if (frame_info->client) + DRI2WaitMSCComplete(frame_info->client, drawable, + msc, tv_sec, tv_usec); + break; + + default: + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "%s: unknown vblank event (type %d) received\n", __func__, + frame_info->type); + break; + } + + ms_dri2_del_frame_event(frame_info); +} + +static void +ms_dri2_frame_event_abort(void *data) +{ + ms_dri2_frame_event_ptr frame_info = data; + + ms_dri2_del_frame_event(frame_info); +} + +/** + * Request a DRM event when the requested conditions will be satisfied. + * + * We need to handle the event and ask the server to wake up the client when + * we receive it. + */ +static int +ms_dri2_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc, + CARD64 divisor, CARD64 remainder) +{ + ScreenPtr screen = draw->pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + ms_dri2_frame_event_ptr wait_info; + drmVBlank vbl; + int ret; + xf86CrtcPtr crtc = ms_dri2_crtc_covering_drawable(draw); + drmmode_crtc_private_ptr drmmode_crtc; + CARD64 current_msc, current_ust, request_msc; + uint32_t seq; + + /* Drawable not visible, return immediately */ + if (!crtc) + goto out_complete; + drmmode_crtc = crtc->driver_private; + + wait_info = calloc(1, sizeof(*wait_info)); + if (!wait_info) + goto out_complete; + + wait_info->screen = screen; + wait_info->drawable = draw; + wait_info->client = client; + wait_info->type = MS_DRI2_WAIT_MSC; + + if (!ms_dri2_add_frame_event(wait_info)) { + free(wait_info); + wait_info = NULL; + goto out_complete; + } + + /* Get current count */ + ret = ms_get_crtc_ust_msc(crtc, &current_ust, &current_msc); + + /* + * If divisor is zero, or current_msc is smaller than target_msc, + * we just need to make sure target_msc passes before waking up the + * client. + */ + if (divisor == 0 || current_msc < target_msc) { + /* If target_msc already reached or passed, set it to + * current_msc to ensure we return a reasonable value back + * to the caller. This keeps the client from continually + * sending us MSC targets from the past by forcibly updating + * their count on this call. + */ + seq = ms_drm_queue_alloc(crtc, wait_info, + ms_dri2_frame_event_handler, + ms_dri2_frame_event_abort); + if (!seq) + goto out_free; + + if (current_msc >= target_msc) + target_msc = current_msc; + vbl.request.type = (DRM_VBLANK_ABSOLUTE | + DRM_VBLANK_EVENT | + drmmode_crtc->vblank_pipe); + vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, target_msc); + vbl.request.signal = (unsigned long)seq; + + ret = drmWaitVBlank(ms->fd, &vbl); + if (ret) { + static int limit = 5; + if (limit) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "%s:%d get vblank counter failed: %s\n", + __FUNCTION__, __LINE__, + strerror(errno)); + limit--; + } + goto out_free; + } + + wait_info->frame = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence); + DRI2BlockClient(client, draw); + return TRUE; + } + + /* + * If we get here, target_msc has already passed or we don't have one, + * so we queue an event that will satisfy the divisor/remainder equation. + */ + vbl.request.type = + DRM_VBLANK_ABSOLUTE | DRM_VBLANK_EVENT | drmmode_crtc->vblank_pipe; + + request_msc = current_msc - (current_msc % divisor) + + remainder; + /* + * If calculated remainder is larger than requested remainder, + * it means we've passed the last point where + * seq % divisor == remainder, so we need to wait for the next time + * that will happen. + */ + if ((current_msc % divisor) >= remainder) + request_msc += divisor; + + seq = ms_drm_queue_alloc(crtc, wait_info, + ms_dri2_frame_event_handler, + ms_dri2_frame_event_abort); + if (!seq) + goto out_free; + + vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, request_msc); + vbl.request.signal = (unsigned long)seq; + + ret = drmWaitVBlank(ms->fd, &vbl); + if (ret) { + static int limit = 5; + if (limit) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "%s:%d get vblank counter failed: %s\n", + __FUNCTION__, __LINE__, + strerror(errno)); + limit--; + } + goto out_free; + } + + wait_info->frame = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence); + DRI2BlockClient(client, draw); + + return TRUE; + + out_free: + ms_dri2_del_frame_event(wait_info); + out_complete: + DRI2WaitMSCComplete(client, draw, target_msc, 0, 0); + return TRUE; +} + +/** + * ScheduleSwap is responsible for requesting a DRM vblank event for + * the appropriate frame, or executing the swap immediately if it + * doesn't need to wait. + * + * When the swap is complete, the driver should call into the server so it + * can send any swap complete events that have been requested. + */ +static int +ms_dri2_schedule_swap(ClientPtr client, DrawablePtr draw, + DRI2BufferPtr front, DRI2BufferPtr back, + CARD64 *target_msc, CARD64 divisor, + CARD64 remainder, DRI2SwapEventPtr func, void *data) +{ + ScreenPtr screen = draw->pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + drmVBlank vbl; + int ret; + xf86CrtcPtr crtc = ms_dri2_crtc_covering_drawable(draw); + drmmode_crtc_private_ptr drmmode_crtc; + ms_dri2_frame_event_ptr frame_info = NULL; + uint64_t current_msc, current_ust; + uint64_t request_msc; + uint32_t seq; + + /* Drawable not displayed... just complete the swap */ + if (!crtc) + goto blit_fallback; + drmmode_crtc = crtc->driver_private; + + frame_info = calloc(1, sizeof(*frame_info)); + if (!frame_info) + goto blit_fallback; + + frame_info->screen = screen; + frame_info->drawable = draw; + frame_info->client = client; + frame_info->event_complete = func; + frame_info->event_data = data; + frame_info->front = front; + frame_info->back = back; + frame_info->crtc = crtc; + frame_info->type = MS_DRI2_QUEUE_SWAP; + + if (!ms_dri2_add_frame_event(frame_info)) { + free(frame_info); + frame_info = NULL; + goto blit_fallback; + } + + ms_dri2_reference_buffer(front); + ms_dri2_reference_buffer(back); + + ret = ms_get_crtc_ust_msc(crtc, &current_ust, &current_msc); + + /* + * If divisor is zero, or current_msc is smaller than target_msc + * we just need to make sure target_msc passes before initiating + * the swap. + */ + if (divisor == 0 || current_msc < *target_msc) { + /* We need to use DRM_VBLANK_NEXTONMISS to avoid unreliable + * timestamping later on. + */ + vbl.request.type = (DRM_VBLANK_ABSOLUTE | + DRM_VBLANK_NEXTONMISS | + DRM_VBLANK_EVENT | + drmmode_crtc->vblank_pipe); + + /* If target_msc already reached or passed, set it to + * current_msc to ensure we return a reasonable value back + * to the caller. This makes swap_interval logic more robust. + */ + if (current_msc >= *target_msc) + *target_msc = current_msc; + + seq = ms_drm_queue_alloc(crtc, frame_info, + ms_dri2_frame_event_handler, + ms_dri2_frame_event_abort); + if (!seq) + goto blit_fallback; + + vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, *target_msc); + vbl.request.signal = (unsigned long)seq; + + ret = drmWaitVBlank(ms->fd, &vbl); + if (ret) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "divisor 0 get vblank counter failed: %s\n", + strerror(errno)); + goto blit_fallback; + } + + *target_msc = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence); + frame_info->frame = *target_msc; + + return TRUE; + } + + /* + * If we get here, target_msc has already passed or we don't have one, + * and we need to queue an event that will satisfy the divisor/remainder + * equation. + */ + vbl.request.type = (DRM_VBLANK_ABSOLUTE | + DRM_VBLANK_NEXTONMISS | + DRM_VBLANK_EVENT | + drmmode_crtc->vblank_pipe); + + request_msc = current_msc - (current_msc % divisor) + + remainder; + + /* + * If the calculated deadline vbl.request.sequence is smaller than + * or equal to current_msc, it means we've passed the last point + * when effective onset frame seq could satisfy + * seq % divisor == remainder, so we need to wait for the next time + * this will happen. + + * This comparison takes the DRM_VBLANK_NEXTONMISS delay into account. + */ + if (request_msc <= current_msc) + request_msc += divisor; + + + seq = ms_drm_queue_alloc(crtc, frame_info, + ms_dri2_frame_event_handler, + ms_dri2_frame_event_abort); + if (!seq) + goto blit_fallback; + + vbl.request.sequence = ms_crtc_msc_to_kernel_msc(crtc, request_msc); + vbl.request.signal = (unsigned long)seq; + + ret = drmWaitVBlank(ms->fd, &vbl); + if (ret) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "final get vblank counter failed: %s\n", + strerror(errno)); + goto blit_fallback; + } + + *target_msc = ms_kernel_msc_to_crtc_msc(crtc, vbl.reply.sequence); + frame_info->frame = *target_msc; + + return TRUE; + + blit_fallback: + ms_dri2_blit_swap(draw, front, back); + DRI2SwapComplete(client, draw, 0, 0, 0, DRI2_BLIT_COMPLETE, func, data); + if (frame_info) + ms_dri2_del_frame_event(frame_info); + *target_msc = 0; /* offscreen, so zero out target vblank count */ + return TRUE; +} + +static int +ms_dri2_frame_event_client_gone(void *data, XID id) +{ + struct ms_dri2_resource *resource = data; + + while (!xorg_list_is_empty(&resource->list)) { + ms_dri2_frame_event_ptr info = + xorg_list_first_entry(&resource->list, + ms_dri2_frame_event_rec, + client_resource); + + xorg_list_del(&info->client_resource); + info->client = NULL; + } + free(resource); + + return Success; +} + +static int +ms_dri2_frame_event_drawable_gone(void *data, XID id) +{ + struct ms_dri2_resource *resource = data; + + while (!xorg_list_is_empty(&resource->list)) { + ms_dri2_frame_event_ptr info = + xorg_list_first_entry(&resource->list, + ms_dri2_frame_event_rec, + drawable_resource); + + xorg_list_del(&info->drawable_resource); + info->drawable = NULL; + } + free(resource); + + return Success; +} + +static Bool +ms_dri2_register_frame_event_resource_types(void) +{ + frame_event_client_type = + CreateNewResourceType(ms_dri2_frame_event_client_gone, + "Frame Event Client"); + if (!frame_event_client_type) + return FALSE; + + frame_event_drawable_type = + CreateNewResourceType(ms_dri2_frame_event_drawable_gone, + "Frame Event Drawable"); + if (!frame_event_drawable_type) + return FALSE; + + return TRUE; +} + +Bool +ms_dri2_screen_init(ScreenPtr screen) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + DRI2InfoRec info; + + if (!glamor_supports_pixmap_import_export(screen)) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "DRI2: glamor lacks support for pixmap import/export\n"); + } + + if (!xf86LoaderCheckSymbol("DRI2Version")) + return FALSE; + + if (!dixRegisterPrivateKey(&ms_dri2_client_key, + PRIVATE_CLIENT, sizeof(XID))) + return FALSE; + + if (serverGeneration != ms_dri2_server_generation) { + ms_dri2_server_generation = serverGeneration; + if (!ms_dri2_register_frame_event_resource_types()) { + xf86DrvMsg(scrn->scrnIndex, X_WARNING, + "Cannot register DRI2 frame event resources\n"); + return FALSE; + } + } + + memset(&info, '\0', sizeof(info)); + info.fd = ms->fd; + info.driverName = NULL; /* Compat field, unused. */ + info.deviceName = drmGetDeviceNameFromFd(ms->fd); + + info.version = 4; + info.CreateBuffer = ms_dri2_create_buffer; + info.DestroyBuffer = ms_dri2_destroy_buffer; + info.CopyRegion = ms_dri2_copy_region; + info.ScheduleSwap = ms_dri2_schedule_swap; + info.GetMSC = ms_dri2_get_msc; + info.ScheduleWaitMSC = ms_dri2_schedule_wait_msc; + + /* These two will be filled in by dri2.c */ + info.numDrivers = 0; + info.driverNames = NULL; + + return DRI2ScreenInit(screen, &info); +} + +void +ms_dri2_close_screen(ScreenPtr screen) +{ + DRI2CloseScreen(screen); +} + +#endif /* GLAMOR */ diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.c b/xorg-server/hw/xfree86/drivers/modesetting/driver.c index c62147a..592f246 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/driver.c +++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.c @@ -25,7 +25,7 @@ * * * Original Author: Alan Hourihane <alanh(a)tungstengraphics.com> - * Rewrite: Dave Airlie <airlied(a)redhat.com> + * Rewrite: Dave Airlie <airlied(a)redhat.com> * */ @@ -788,7 +788,9 @@ PreInit(ScrnInfoPtr pScrn, int flags) try_enable_glamor(pScrn); - if (!ms->glamor) { + if (ms->glamor) { + xf86LoadSubModule(pScrn, "dri2"); + } else { Bool prefer_shadow = TRUE; ret = drmGetCap(ms->fd, DRM_CAP_DUMB_PREFER_SHADOW, &value); @@ -1107,6 +1109,21 @@ ScreenInit(ScreenPtr pScreen, int argc, char **argv) if (serverGeneration == 1) xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options); + if (!ms_vblank_screen_init(pScreen)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize vblank support.\n"); + return FALSE; + } + +#ifdef GLAMOR + if (ms->glamor) { + if (!ms_dri2_screen_init(pScreen)) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Failed to initialize the DRI2 extension.\n"); + } + } +#endif + return EnterVT(pScrn); } @@ -1172,6 +1189,14 @@ CloseScreen(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); modesettingPtr ms = modesettingPTR(pScrn); +#ifdef GLAMOR + if (ms->glamor) { + ms_dri2_close_screen(pScreen); + } +#endif + + ms_vblank_close_screen(pScreen); + if (ms->damage) { DamageUnregister(ms->damage); DamageDestroy(ms->damage); diff --git a/xorg-server/hw/xfree86/drivers/modesetting/driver.h b/xorg-server/hw/xfree86/drivers/modesetting/driver.h index 35f2419..9eda1c4 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/driver.h +++ b/xorg-server/hw/xfree86/drivers/modesetting/driver.h @@ -30,6 +30,7 @@ #include <errno.h> #include <drm.h> #include <xf86drm.h> +#include <xf86Crtc.h> #include <damage.h> #include "drmmode_display.h" @@ -42,6 +43,26 @@ typedef struct { ScrnInfoPtr pScrn_2; } EntRec, *EntPtr; +typedef void (*ms_drm_handler_proc)(uint64_t frame, + uint64_t usec, + void *data); + +typedef void (*ms_drm_abort_proc)(void *data); + +/** + * A tracked handler for an event that will hopefully be generated by + * the kernel, and what to do when it is encountered. + */ +struct ms_drm_queue { + struct xorg_list list; + xf86CrtcPtr crtc; + uint32_t seq; + void *data; + ScrnInfoPtr scrn; + ms_drm_handler_proc handler; + ms_drm_abort_proc abort; +}; + typedef struct _modesettingRec { int fd; @@ -70,6 +91,8 @@ typedef struct _modesettingRec { drmmode_rec drmmode; + drmEventContext event_context; + DamagePtr damage; Bool dirty_enabled; @@ -78,3 +101,24 @@ typedef struct _modesettingRec { } modesettingRec, *modesettingPtr; #define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate)) + +uint32_t ms_drm_queue_alloc(xf86CrtcPtr crtc, + void *data, + ms_drm_handler_proc handler, + ms_drm_abort_proc abort); + +xf86CrtcPtr ms_dri2_crtc_covering_drawable(DrawablePtr pDraw); +xf86CrtcPtr ms_covering_crtc(ScrnInfoPtr scrn, BoxPtr box, + xf86CrtcPtr desired, BoxPtr crtc_box_ret); + +int ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc); + +uint32_t ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect); +uint64_t ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence); + + +Bool ms_dri2_screen_init(ScreenPtr screen); +void ms_dri2_close_screen(ScreenPtr screen); + +Bool ms_vblank_screen_init(ScreenPtr screen); +void ms_vblank_close_screen(ScreenPtr screen); diff --git a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c index d959837..ef9009e 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c +++ b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.c @@ -116,7 +116,7 @@ dumb_bo_unmap(int fd, struct dumb_bo *bo) } #endif -static int +int dumb_bo_destroy(int fd, struct dumb_bo *bo) { struct drm_mode_destroy_dumb arg; @@ -137,8 +137,8 @@ dumb_bo_destroy(int fd, struct dumb_bo *bo) return 0; } -static struct dumb_bo * -dumb_get_bo_from_handle(int fd, int handle, int pitch, int size) +struct dumb_bo * +dumb_get_bo_from_fd(int fd, int handle, int pitch, int size) { struct dumb_bo *bo; int ret; @@ -164,7 +164,7 @@ drmmode_SetSlaveBO(PixmapPtr ppix, msPixmapPrivPtr ppriv = msGetPixmapPriv(drmmode, ppix); ppriv->backing_bo = - dumb_get_bo_from_handle(drmmode->fd, fd_handle, pitch, size); + dumb_get_bo_from_fd(drmmode->fd, fd_handle, pitch, size); if (!ppriv->backing_bo) return FALSE; @@ -582,6 +582,17 @@ static const xf86CrtcFuncsRec drmmode_crtc_funcs = { .shadow_create = drmmode_shadow_create, }; +static uint32_t +drmmode_crtc_vblank_pipe(int crtc_id) +{ + if (crtc_id > 1) + return crtc_id << DRM_VBLANK_HIGH_CRTC_SHIFT; + else if (crtc_id > 0) + return DRM_VBLANK_SECONDARY; + else + return 0; +} + static void drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) { @@ -596,6 +607,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int num) drmmode_crtc->mode_crtc = drmModeGetCrtc(drmmode->fd, drmmode->mode_res->crtcs[num]); drmmode_crtc->drmmode = drmmode; + drmmode_crtc->vblank_pipe = drmmode_crtc_vblank_pipe(num); crtc->driver_private = drmmode_crtc; } @@ -1183,6 +1195,11 @@ drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height) xf86DrvMsg(scrn->scrnIndex, X_INFO, "Allocate new frame buffer %dx%d stride\n", width, height); + if (drmmode->triple_buffer_pixmap) { + screen->DestroyPixmap(drmmode->triple_buffer_pixmap); + drmmode->triple_buffer_pixmap = NULL; + } + old_width = scrn->virtualX; old_height = scrn->virtualY; old_pitch = drmmode->front_bo->pitch; diff --git a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h index 438743b..987608c 100644 --- a/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h +++ b/xorg-server/hw/xfree86/drivers/modesetting/drmmode_display.h @@ -43,6 +43,7 @@ struct dumb_bo { typedef struct { int fd; unsigned fb_id; + unsigned old_fb_id; drmModeResPtr mode_res; drmModeFBPtr mode_fb; int cpp; @@ -58,17 +59,42 @@ typedef struct { Bool shadow_enable; void *shadow_fb; + /** + * A screen-sized pixmap when we're doing triple-buffered DRI2 + * pageflipping. + * + * One is shared between all drawables that flip to the front + * buffer, and it only gets reallocated when root pixmap size + * changes. + */ + PixmapPtr triple_buffer_pixmap; + + /** The GEM name for triple_buffer_pixmap */ + uint32_t triple_buffer_name; + DevPrivateKeyRec pixmapPrivateKeyRec; } drmmode_rec, *drmmode_ptr; typedef struct { drmmode_ptr drmmode; drmModeCrtcPtr mode_crtc; - int hw_id; + uint32_t vblank_pipe; struct dumb_bo *cursor_bo; unsigned rotate_fb_id; uint16_t lut_r[256], lut_g[256], lut_b[256]; DamagePtr slave_damage; + + /** + * @{ MSC (vblank count) handling for the PRESENT extension. + * + * The kernel's vblank counters are 32 bits and apparently full of + * lies, and we need to give a reliable 64-bit msc for GL, so we + * have to track and convert to a userland-tracked 64-bit msc. + */ + int32_t vblank_offset; + uint32_t msc_prev; + uint64_t msc_high; + /** @} */ } drmmode_crtc_private_rec, *drmmode_crtc_private_ptr; typedef struct { @@ -121,6 +147,9 @@ Bool drmmode_map_cursor_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); void drmmode_free_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode); void drmmode_get_default_bpp(ScrnInfoPtr pScrn, drmmode_ptr drmmmode, int *depth, int *bpp); +struct dumb_bo *dumb_get_bo_from_fd(int drm_fd, int fd, int pitch, int size); +int dumb_bo_destroy(int fd, struct dumb_bo *bo); + #ifndef DRM_CAP_DUMB_PREFERRED_DEPTH #define DRM_CAP_DUMB_PREFERRED_DEPTH 3 diff --git a/xorg-server/hw/xfree86/drivers/modesetting/vblank.c b/xorg-server/hw/xfree86/drivers/modesetting/vblank.c new file mode 100644 index 0000000..5031ef8 --- /dev/null +++ b/xorg-server/hw/xfree86/drivers/modesetting/vblank.c @@ -0,0 +1,383 @@ +/* + * Copyright © 2013 Keith Packard + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +/** @file vblank.c + * + * Support for tracking the DRM's vblank events. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include "dix-config.h" +#endif + +#include <unistd.h> +#include <xf86.h> +#include <xf86Crtc.h> +#include <poll.h> +#include "driver.h" +#include "drmmode_display.h" + +/** + * Tracking for outstanding events queued to the kernel. + * + * Each list entry is a struct ms_drm_queue, which has a uint32_t + * value generated from drm_seq that identifies the event and a + * reference back to the crtc/screen associated with the event. It's + * done this way rather than in the screen because we want to be able + * to drain the list of event handlers that should be called at server + * regen time, even though we don't close the drm fd and have no way + * to actually drain the kernel events. + */ +static struct xorg_list ms_drm_queue; +static uint32_t ms_drm_seq; + +struct ms_pageflip { + ScreenPtr screen; + Bool crtc_for_msc_ust; +}; + +static void ms_box_intersect(BoxPtr dest, BoxPtr a, BoxPtr b) +{ + dest->x1 = a->x1 > b->x1 ? a->x1 : b->x1; + dest->x2 = a->x2 < b->x2 ? a->x2 : b->x2; + if (dest->x1 >= dest->x2) { + dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; + return; + } + + dest->y1 = a->y1 > b->y1 ? a->y1 : b->y1; + dest->y2 = a->y2 < b->y2 ? a->y2 : b->y2; + if (dest->y1 >= dest->y2) + dest->x1 = dest->x2 = dest->y1 = dest->y2 = 0; +} + +static void ms_crtc_box(xf86CrtcPtr crtc, BoxPtr crtc_box) +{ + if (crtc->enabled) { + crtc_box->x1 = crtc->x; + crtc_box->x2 = + crtc->x + xf86ModeWidth(&crtc->mode, crtc->rotation); + crtc_box->y1 = crtc->y; + crtc_box->y2 = + crtc->y + xf86ModeHeight(&crtc->mode, crtc->rotation); + } else + crtc_box->x1 = crtc_box->x2 = crtc_box->y1 = crtc_box->y2 = 0; +} + +static int ms_box_area(BoxPtr box) +{ + return (int)(box->x2 - box->x1) * (int)(box->y2 - box->y1); +} + +/* + * Return the crtc covering 'box'. If two crtcs cover a portion of + * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc + * with greater coverage + */ + +xf86CrtcPtr +ms_covering_crtc(ScrnInfoPtr scrn, + BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret) +{ + xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); + xf86CrtcPtr crtc, best_crtc; + int coverage, best_coverage; + int c; + BoxRec crtc_box, cover_box; + + best_crtc = NULL; + best_coverage = 0; + crtc_box_ret->x1 = 0; + crtc_box_ret->x2 = 0; + crtc_box_ret->y1 = 0; + crtc_box_ret->y2 = 0; + for (c = 0; c < xf86_config->num_crtc; c++) { + crtc = xf86_config->crtc[c]; + + /* If the CRTC is off, treat it as not covering */ + if (!crtc->enabled) + continue; + + ms_crtc_box(crtc, &crtc_box); + ms_box_intersect(&cover_box, &crtc_box, box); + coverage = ms_box_area(&cover_box); + if (coverage && crtc == desired) { + *crtc_box_ret = crtc_box; + return crtc; + } + if (coverage > best_coverage) { + *crtc_box_ret = crtc_box; + best_crtc = crtc; + best_coverage = coverage; + } + } + return best_crtc; +} + +xf86CrtcPtr +ms_dri2_crtc_covering_drawable(DrawablePtr pDraw) +{ + ScreenPtr pScreen = pDraw->pScreen; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + BoxRec box, crtcbox; + xf86CrtcPtr crtc; + + box.x1 = pDraw->x; + box.y1 = pDraw->y; + box.x2 = box.x1 + pDraw->width; + box.y2 = box.y1 + pDraw->height; + + crtc = ms_covering_crtc(pScrn, &box, NULL, &crtcbox); + + /* Make sure the CRTC is valid and this is the real front buffer */ + if (crtc != NULL && !crtc->rotatedData) + return crtc; + + return NULL; +} + +static Bool +ms_get_kernel_ust_msc(xf86CrtcPtr crtc, + uint32_t *msc, uint64_t *ust) +{ + ScreenPtr screen = crtc->randr_crtc->pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + drmVBlank vbl; + int ret; + + /* Get current count */ + vbl.request.type = DRM_VBLANK_RELATIVE | drmmode_crtc->vblank_pipe; + vbl.request.sequence = 0; + vbl.request.signal = 0; + ret = drmWaitVBlank(ms->fd, &vbl); + if (ret) { + *msc = 0; + *ust = 0; + return FALSE; + } else { + *msc = vbl.reply.sequence; + *ust = (CARD64) vbl.reply.tval_sec * 1000000 + vbl.reply.tval_usec; + return TRUE; + } +} + +/** + * Convert a 32-bit kernel MSC sequence number to a 64-bit local sequence + * number, adding in the vblank_offset and high 32 bits, and dealing + * with 64-bit wrapping + */ +uint64_t +ms_kernel_msc_to_crtc_msc(xf86CrtcPtr crtc, uint32_t sequence) +{ + drmmode_crtc_private_rec *drmmode_crtc = crtc->driver_private; + sequence += drmmode_crtc->vblank_offset; + + if ((int32_t) (sequence - drmmode_crtc->msc_prev) < -0x40000000) + drmmode_crtc->msc_high += 0x100000000L; + drmmode_crtc->msc_prev = sequence; + return drmmode_crtc->msc_high + sequence; +} + +int +ms_get_crtc_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc) +{ + uint32_t kernel_msc; + + if (!ms_get_kernel_ust_msc(crtc, &kernel_msc, ust)) + return BadMatch; + *msc = ms_kernel_msc_to_crtc_msc(crtc, kernel_msc); + + return Success; +} + +#define MAX_VBLANK_OFFSET 1000 + +/** + * Convert a 64-bit adjusted MSC value into a 32-bit kernel sequence number, + * removing the high 32 bits and subtracting out the vblank_offset term. + * + * This also updates the vblank_offset when it notices that the value should + * change. + */ +uint32_t +ms_crtc_msc_to_kernel_msc(xf86CrtcPtr crtc, uint64_t expect) +{ + drmmode_crtc_private_rec *drmmode_crtc = crtc->driver_private; + uint64_t msc; + uint64_t ust; + int64_t diff; + + if (ms_get_crtc_ust_msc(crtc, &ust, &msc) == Success) { + diff = expect - msc; + + /* We're way off here, assume that the kernel has lost its mind + * and smack the vblank back to something sensible + */ + if (diff < -MAX_VBLANK_OFFSET || MAX_VBLANK_OFFSET < diff) { + drmmode_crtc->vblank_offset += (int32_t) diff; + if (drmmode_crtc->vblank_offset > -MAX_VBLANK_OFFSET && + drmmode_crtc->vblank_offset < MAX_VBLANK_OFFSET) + drmmode_crtc->vblank_offset = 0; + } + } + return (uint32_t) (expect - drmmode_crtc->vblank_offset); +} + +/** + * Check for pending DRM events and process them. + */ +static void +ms_drm_wakeup_handler(void *data, int err, void *mask) +{ + ScreenPtr screen = data; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + fd_set *read_mask = mask; + + if (data == NULL || err < 0) + return; + + if (FD_ISSET(ms->fd, read_mask)) + drmHandleEvent(ms->fd, &ms->event_context); +} + +/* + * Enqueue a potential drm response; when the associated response + * appears, we've got data to pass to the handler from here + */ +uint32_t +ms_drm_queue_alloc(xf86CrtcPtr crtc, + void *data, + ms_drm_handler_proc handler, + ms_drm_abort_proc abort) +{ + ScreenPtr screen = crtc->randr_crtc->pScreen; + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + struct ms_drm_queue *q; + + q = calloc(1, sizeof(struct ms_drm_queue)); + + if (!q) + return 0; + if (!ms_drm_seq) + ++ms_drm_seq; + q->seq = ms_drm_seq++; + q->scrn = scrn; + q->crtc = crtc; + q->data = data; + q->handler = handler; + q->abort = abort; + + xorg_list_add(&q->list, &ms_drm_queue); + + return q->seq; +} + +/** + * Abort one queued DRM entry, removing it + * from the list, calling the abort function and + * freeing the memory + */ +static void +ms_drm_abort_one(struct ms_drm_queue *q) +{ + xorg_list_del(&q->list); + q->abort(q->data); + free(q); +} + +/** + * Abort all queued entries on a specific scrn, used + * when resetting the X server + */ +static void +ms_drm_abort_scrn(ScrnInfoPtr scrn) +{ + struct ms_drm_queue *q, *tmp; + + xorg_list_for_each_entry_safe(q, tmp, &ms_drm_queue, list) { + if (q->scrn == scrn) + ms_drm_abort_one(q); + } +} + +/* + * General DRM kernel handler. Looks for the matching sequence number in the + * drm event queue and calls the handler for it. + */ +static void +ms_drm_handler(int fd, uint32_t frame, uint32_t sec, uint32_t usec, + void *user_ptr) +{ + struct ms_drm_queue *q, *tmp; + uint32_t user_data = (uint32_t) (intptr_t) user_ptr; + + xorg_list_for_each_entry_safe(q, tmp, &ms_drm_queue, list) { + if (q->seq == user_data) { + uint64_t msc; + + msc = ms_kernel_msc_to_crtc_msc(q->crtc, frame); + xorg_list_del(&q->list); + q->handler(msc, (uint64_t) sec * 1000000 + usec, q->data); + free(q); + break; + } + } +} + +Bool +ms_vblank_screen_init(ScreenPtr screen) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + + xorg_list_init(&ms_drm_queue); + + ms->event_context.version = DRM_EVENT_CONTEXT_VERSION; + ms->event_context.vblank_handler = ms_drm_handler; + ms->event_context.page_flip_handler = ms_drm_handler; + + /* We need to re-register the DRM fd for the synchronisation + * feedback on every server generation, so perform the + * registration within ScreenInit and not PreInit. + */ + AddGeneralSocket(ms->fd); + RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + ms_drm_wakeup_handler, screen); + + return TRUE; +} + +void +ms_vblank_close_screen(ScreenPtr screen) +{ + ScrnInfoPtr scrn = xf86ScreenToScrn(screen); + modesettingPtr ms = modesettingPTR(scrn); + + ms_drm_abort_scrn(scrn); + + RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + ms_drm_wakeup_handler, screen); + RemoveGeneralSocket(ms->fd); +} diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c index 0450822..8cd2079 100644 --- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c +++ b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.c @@ -251,7 +251,7 @@ fbdev2xfree_timing(struct fb_var_screeninfo *var, DisplayModePtr mode) /* open correct framebuffer device */ /** - * Try to find the framebuffer device for a given PCI device + * Try to find the framebuffer device for a given PCI device */ static int fbdev_open_pci(struct pci_device *pPci, char **namep) diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.c b/xorg-server/hw/xfree86/i2c/xf86i2c.c index 2d261d4..cf2cd09 100644 --- a/xorg-server/hw/xfree86/i2c/xf86i2c.c +++ b/xorg-server/hw/xfree86/i2c/xf86i2c.c @@ -1,7 +1,7 @@ /* * Copyright (C) 1998 Itai Nahshon, Michael Schimek * - * The original code was derived from and inspired by + * The original code was derived from and inspired by * the I2C driver from the Linux kernel. * (c) 1998 Gerd Knorr <kraxel(a)cs.tu-berlin.de> */ @@ -52,7 +52,7 @@ I2CUDelay(I2CBusPtr b, int usec) if (usec > 0) { X_GETTIMEOFDAY(&begin); do { - /* It would be nice to use {xf86}usleep, + /* It would be nice to use {xf86}usleep, * but usleep (1) takes >10000 usec ! */ X_GETTIMEOFDAY(&cur); @@ -74,7 +74,7 @@ I2CUDelay(I2CBusPtr b, int usec) #define RISEFALLTIME 2 /* usec, actually 300 to 1000 ns according to the i2c specs */ -/* Some devices will hold SCL low to slow down the bus or until +/* Some devices will hold SCL low to slow down the bus or until * ready for transmission. * * This condition will be noticed when the master tries to raise @@ -206,7 +206,7 @@ I2CReadBit(I2CBusPtr b, int *psda, int timeout) /* This is the default I2CPutByte function if not supplied by the driver. * * A single byte is sent to the device. - * The function returns FALSE if a timeout occurs, you should send + * The function returns FALSE if a timeout occurs, you should send * a stop condition afterwards to reset the bus. * * A timeout occurs, @@ -267,7 +267,7 @@ I2CPutByte(I2CDevPtr d, I2CByte data) * A single byte is read from the device. * The function returns FALSE if a timeout occurs, you should send * a stop condition afterwards to reset the bus. - * + * * A timeout occurs, * if the slave pulls SCL to slow down the bus more than ByteTimeout usecs, * or slows down the bus for more than b->BitTimeout usecs for each bit. @@ -275,7 +275,7 @@ I2CPutByte(I2CDevPtr d, I2CByte data) * ByteTimeout must be at least b->HoldTime, the other timeouts can be * zero according to the comment on I2CRaiseSCL. * - * For the <last> byte in a sequence the acknowledge bit NACK (1), + * For the <last> byte in a sequence the acknowledge bit NACK (1), * otherwise ACK (0) will be sent. */ @@ -311,11 +311,11 @@ I2CGetByte(I2CDevPtr d, I2CByte * data, Bool last) * * It creates the start condition, followed by the d->SlaveAddr. * Higher level functions must call this routine rather than - * I2CStart/PutByte because a hardware I2C master may not be able + * I2CStart/PutByte because a hardware I2C master may not be able * to send a slave address without a start condition. * * The same timeouts apply as with I2CPutByte and additional a - * StartTimeout, similar to the ByteTimeout but for the start + * StartTimeout, similar to the ByteTimeout but for the start * condition. * * In case of a timeout, the bus is left in a clean idle condition. @@ -325,7 +325,7 @@ I2CGetByte(I2CDevPtr d, I2CByte * data, Bool last) * in the least significant byte. This is, the slave address must include the * R/_W flag as least significant bit. * - * The most significant byte of the address will be sent _after_ the LSB, + * The most significant byte of the address will be sent _after_ the LSB, * but only if the LSB indicates: * a) an 11 bit address, this is LSB = 1111 0xxx. * b) a 'general call address', this is LSB = 0000 000x - see the I2C specs @@ -354,7 +354,7 @@ I2CAddress(I2CDevPtr d, I2CSlaveAddr addr) * ======================================================== */ -/* Function for probing. Just send the slave address +/* Function for probing. Just send the slave address * and return true if the device responds. The slave address * must have the lsb set to reflect a read (1) or write (0) access. * Don't expect a read- or write-only device will respond otherwise. @@ -403,7 +403,7 @@ xf86I2CProbeAddress(I2CBusPtr b, I2CSlaveAddr addr) * * The functions exits immediately when an error occures, * not proceeding any data left. However, step 3 will - * be executed anyway to leave the bus in clean idle state. + * be executed anyway to leave the bus in clean idle state. */ static Bool @@ -470,7 +470,7 @@ xf86I2CReadByte(I2CDevPtr d, I2CByte subaddr, I2CByte * pbyte) return xf86I2CWriteRead(d, &subaddr, 1, pbyte, 1); } -/* Read bytes from subsequent registers determined by the +/* Read bytes from subsequent registers determined by the * sub-address of the first register. */ @@ -480,7 +480,7 @@ xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte * pbyte, int n) return xf86I2CWriteRead(d, &subaddr, 1, pbyte, n); } -/* Read a word (high byte, then low byte) from one of the registers +/* Read a word (high byte, then low byte) from one of the registers * determined by its sub-address. */ @@ -511,7 +511,7 @@ xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte) return xf86I2CWriteRead(d, wb, 2, NULL, 0); } -/* Write bytes to subsequent registers determined by the +/* Write bytes to subsequent registers determined by the * sub-address of the first register. */ @@ -537,7 +537,7 @@ xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, return r; } -/* Write a word (high byte, then low byte) to one of the registers +/* Write a word (high byte, then low byte) to one of the registers * determined by its sub-address. */ @@ -553,7 +553,7 @@ xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word) return xf86I2CWriteRead(d, wb, 3, NULL, 0); } -/* Write a vector of bytes to not adjacent registers. This vector is, +/* Write a vector of bytes to not adjacent registers. This vector is, * 1st byte sub-address, 2nd byte value, 3rd byte sub-address asf. * This function is intended to initialize devices. Note this function * exits immediately when an error occurs, some registers may @@ -637,7 +637,7 @@ xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc) /* I2C transmissions are related to an I2CDevRec you must link to a * previously registered bus (see xf86I2CBusInit) before attempting * to read and write data. You may call xf86I2CProbeAddress first to - * see if the device in question is present on this bus. + * see if the device in question is present on this bus. * * xf86I2CDevInit will not allocate an I2CBusRec for you, instead you * may enter a pointer to a statically allocated I2CDevRec or the (modified) @@ -779,9 +779,9 @@ xf86DestroyI2CBusRec(I2CBusPtr b, Bool unalloc, Bool devs_too) Bool xf86I2CBusInit(I2CBusPtr b) { - /* I2C buses must be identified by a unique scrnIndex - * and name. If scrnIndex is unspecified (a negative value), - * then the name must be unique throughout the server. + /* I2C buses must be identified by a unique scrnIndex + * and name. If scrnIndex is unspecified (a negative value), + * then the name must be unique throughout the server. */ if (b->BusName == NULL || xf86I2CFindBus(b->scrnIndex, b->BusName) != NULL) diff --git a/xorg-server/hw/xfree86/i2c/xf86i2c.h b/xorg-server/hw/xfree86/i2c/xf86i2c.h index 26303ff..7b0ccdf 100644 --- a/xorg-server/hw/xfree86/i2c/xf86i2c.h +++ b/xorg-server/hw/xfree86/i2c/xf86i2c.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 1998 Itai Nahshon, Michael Schimek */ diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c index 7021bdd..fdf5bd8 100644 --- a/xorg-server/hw/xfree86/loader/loadmod.c +++ b/xorg-server/hw/xfree86/loader/loadmod.c @@ -918,7 +918,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist, goto LoadModule_fail; } - /* + /* * if the module name is not a full pathname, we need to * check the elements in the path */ @@ -938,7 +938,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist, } } - /* + /* * did we find the module? */ if (!found) { diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c index 87ba0b7..9d592a7 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.c +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c @@ -1072,7 +1072,7 @@ xf86DefaultScreenLimits(ScrnInfoPtr scrn, int *widthp, int *heightp, #define POSITION_UNSET -100000 /* - * check if the user configured any outputs at all + * check if the user configured any outputs at all * with either a position or a relative setting or a mode. */ static Bool @@ -1736,7 +1736,7 @@ xf86ProbeOutputModes(ScrnInfoPtr scrn, int maxX, int maxY) xf86ValidateModesReducedBlanking(scrn, default_modes); if (sync_source == sync_config) { - /* + /* * Check output and config modes against sync range from config file */ xf86ValidateModesSync(scrn, output_modes, &mon_rec); diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.h b/xorg-server/hw/xfree86/modes/xf86Crtc.h index eebe6f4..692bf40 100644 --- a/xorg-server/hw/xfree86/modes/xf86Crtc.h +++ b/xorg-server/hw/xfree86/modes/xf86Crtc.h @@ -242,7 +242,7 @@ struct _xf86Crtc { /** * Desired state of this CRTC * - * Set when this CRTC should be driving one or more outputs + * Set when this CRTC should be driving one or more outputs */ Bool enabled; @@ -304,7 +304,7 @@ struct _xf86Crtc { */ Bool cursor_argb; /** - * Track whether cursor is within CRTC range + * Track whether cursor is within CRTC range */ Bool cursor_in_range; /** @@ -608,7 +608,7 @@ struct _xf86Output { #else void *randr_output; #endif - /** + /** * Desired initial panning * Added in ABI version 2 */ @@ -922,7 +922,7 @@ extern _X_EXPORT void xf86CrtcSetScreenSubpixelOrder(ScreenPtr pScreen); /* - * Get a standard string name for a connector type + * Get a standard string name for a connector type */ extern _X_EXPORT const char *xf86ConnectorGetName(xf86ConnectorType connector); @@ -947,7 +947,7 @@ extern _X_EXPORT Bool * Called when anything on the screen is reconfigured. * * Reloads cursor images as needed, then adjusts cursor positions. - * + * * Driver should call this from crtc commit function. */ extern _X_EXPORT void diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c index 8a04dfc..b1c306a 100644 --- a/xorg-server/hw/xfree86/modes/xf86RandR12.c +++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c @@ -1072,7 +1072,7 @@ xf86RandR12CrtcNotify(RRCrtcPtr randr_crtc) randr_output = output->randr_output; randr_outputs[numOutputs++] = randr_output; /* - * We make copies of modes, so pointer equality + * We make copies of modes, so pointer equality * isn't sufficient */ for (j = 0; j < randr_output->numModes + randr_output->numUserModes; @@ -1890,7 +1890,7 @@ xf86RandR14ProviderDestroy(ScreenPtr screen, RRProviderPtr provider) { ScrnInfoPtr scrn = xf86ScreenToScrn(screen); xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); - + if (config->randr_provider == provider) { if (config->randr_provider->offload_sink) { DetachOffloadGPU(screen); diff --git a/xorg-server/hw/xfree86/modes/xf86cvt.c b/xorg-server/hw/xfree86/modes/xf86cvt.c index 8b7bb8b..b6c1bc8 100644 --- a/xorg-server/hw/xfree86/modes/xf86cvt.c +++ b/xorg-server/hw/xfree86/modes/xf86cvt.c @@ -54,7 +54,7 @@ * likely though). * * About margins; i'm sure that they are to be the bit between HDisplay and - * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and + * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and * VTotal, where the overscan colour is shown. FB seems to call _all_ blanking * outside sync "margin" for some reason. Since we prefer seeing proper * blanking instead of the overscan colour, and since the Crtc* values will @@ -154,7 +154,7 @@ xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, if (!Reduced) { /* simplified GTF calculation */ - /* 4) Minimum time of vertical sync + back porch interval (µs) + /* 4) Minimum time of vertical sync + back porch interval (µs) * default 550.0 */ #define CVT_MIN_VSYNC_BP 550.0 diff --git a/xorg-server/hw/xfree86/modes/xf86gtf.c b/xorg-server/hw/xfree86/modes/xf86gtf.c index 0a80784..17c2f32 100644 --- a/xorg-server/hw/xfree86/modes/xf86gtf.c +++ b/xorg-server/hw/xfree86/modes/xf86gtf.c @@ -5,11 +5,11 @@ * * Copyright (c) 2001, Andy Ritger aritger(a)nvidia.com * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * o Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * o Redistributions in binary form must reproduce the above copyright @@ -50,7 +50,7 @@ * of suitability for any purpose. The sample code contained within * this standard may be used without restriction. * - * + * * * The GTF EXCEL(TM) SPREADSHEET, a sample (and the definitive) * implementation of the GTF Timing Standard, is available at: @@ -147,7 +147,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins) * by the calculation must be halved, as the computation calculates * the number of vertical lines per field. In either case, the * number of lines is rounded to the nearest integer. - * + * * [V LINES RND] = IF([INT RQD?]="y", ROUND([V LINES]/2,0), * ROUND([V LINES],0)) */ @@ -183,7 +183,7 @@ xf86GTFMode(int h_pixels, int v_lines, float freq, int interlaced, int margins) margins ? rint(MARGIN_PERCENT / 100.0 * v_lines_rnd) : (0.0); /* 6. If interlace is required, then set variable [INTERLACE]=0.5: - * + * * [INTERLACE]=(IF([INT RQD?]="y",0.5,0)) */ diff --git a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c index 236def6..b4038bd 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c +++ b/xorg-server/hw/xfree86/os-support/bsd/alpha_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ diff --git a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c index 3a639b8..dd1020e 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/arm_video.c +++ b/xorg-server/hw/xfree86/os-support/bsd/arm_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ @@ -28,7 +28,7 @@ * * Copyright 1997 * Digital Equipment Corporation. All rights reserved. - * This software is furnished under license and may be used and copied only in + * This software is furnished under license and may be used and copied only in * accordance with the following terms and conditions. Subject to these * conditions, you may download, copy, install, use, modify and distribute * this software in source and/or binary form. No title or ownership is @@ -38,7 +38,7 @@ * this copyright notice and list of conditions as they appear in the * source file. * - * 2) No right is granted to use any trade name, trademark, or logo of Digital + * 2) No right is granted to use any trade name, trademark, or logo of Digital * Equipment Corporation. Neither the "Digital Equipment Corporation" * name nor any trademark or logo of Digital Equipment Corporation may be * used to endorse or promote products derived from this software without @@ -50,9 +50,9 @@ * In no event shall DIGITAL be liable for any damages whatsoever, and in * particular, DIGITAL shall not be liable for special, indirect, * consequential, or incidental damages or damages for lost profits, loss - * of revenue or loss of use, whether such damages arise in contract, + * of revenue or loss of use, whether such damages arise in contract, * negligence, tort, under statute, in equity, at law or otherwise, even - * if advised of the possibility of such damage. + * if advised of the possibility of such damage. * */ diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c index 1b92962..60a19d7 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_apm.c @@ -53,7 +53,7 @@ bsdToXF86(int type) } /* - * APM events can be requested direclty from /dev/apm + * APM events can be requested direclty from /dev/apm */ static int bsdPMGetEventFromOS(int fd, pmEvent * events, int num) diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c index f6643ee..19d1f48 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c +++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_bell.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Dawes - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Dawes + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Dawes make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Dawes make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID DAWES DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID DAWES BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c index c9f8233..38dfde1 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c +++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_init.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ @@ -173,7 +173,7 @@ xf86OpenConsole() if (!KeepTty) { /* * detaching the controlling tty solves problems of kbd character - * loss. This is not interesting for CO driver, because it is + * loss. This is not interesting for CO driver, because it is * exclusive. */ setpgrp(0, getpid()); @@ -631,7 +631,7 @@ int xf86ProcessArgument(int argc, char *argv[], int i) { /* - * Keep server from detaching from controlling tty. This is useful + * Keep server from detaching from controlling tty. This is useful * when debugging (so the server can receive keyboard signals. */ if (!strcmp(argv[i], "-keeptty")) { diff --git a/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 32ea489..1756612 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/xorg-server/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001 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 @@ -8,10 +8,10 @@ * 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. @@ -19,7 +19,7 @@ * 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 @@ -86,7 +86,7 @@ bsdToXF86(int type) } /* - * APM events can be requested direclty from /dev/apm + * APM events can be requested direclty from /dev/apm */ static int bsdPMGetEventFromOS(int kq, pmEvent * events, int num) @@ -113,9 +113,9 @@ bsdPMGetEventFromOS(int kq, pmEvent * events, int num) /* * If apmd(8) is running, he will get the events and handle them, - * so, we've nothing to do here. - * Otherwise, opening /dev/apmctl will succeed and we have to send the - * confirmations to /dev/apmctl. + * so, we've nothing to do here. + * Otherwise, opening /dev/apmctl will succeed and we have to send the + * confirmations to /dev/apmctl. */ static pmWait bsdPMConfirmEventToOs(int dummyfd, pmEvent event) diff --git a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c index 6c3bbcb..a38a7de 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/i386_video.c +++ b/xorg-server/hw/xfree86/os-support/bsd/i386_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ @@ -238,7 +238,7 @@ xf86DisableIO() if (amd64_iopl(FALSE) == 0) { ExtendedEnabled = FALSE; } - /* Otherwise, the X server has revoqued its root uid, + /* Otherwise, the X server has revoqued its root uid, and thus cannot give up IO privileges any more */ return; diff --git a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c index b1cf7eb..5a58da1 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c +++ b/xorg-server/hw/xfree86/os-support/bsd/ppc_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ diff --git a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c index 5bed017..3f8cccd 100644 --- a/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/xorg-server/hw/xfree86/os-support/bsd/sparc64_video.c @@ -6,19 +6,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of Rich Murphey and David Wexelblat - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of Rich Murphey and David Wexelblat + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. Rich Murphey and - * David Wexelblat make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * David Wexelblat make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF - * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * RICH MURPHEY AND DAVID WEXELBLAT DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL RICH MURPHEY OR DAVID WEXELBLAT BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ diff --git a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c index 2a96393..ac24f19 100644 --- a/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c +++ b/xorg-server/hw/xfree86/os-support/hurd/hurd_video.c @@ -40,11 +40,11 @@ #include "xf86OSpriv.h" /************************************************************************** - * Video Memory Mapping section + * Video Memory Mapping section ***************************************************************************/ /************************************************************************** - * I/O Permissions section + * I/O Permissions section ***************************************************************************/ /* diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c index e1fa3f8..2a28c6a 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_agp.c @@ -92,8 +92,8 @@ GARTInit(int screenNum) xf86ReleaseGART(-1); #if defined(linux) - /* Per Dave Jones, every effort will be made to keep the - * agpgart interface backwards compatible, so allow all + /* Per Dave Jones, every effort will be made to keep the + * agpgart interface backwards compatible, so allow all * future versions. */ if ( diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c b/xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c index f5917ee..6d12226 100644 --- a/xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/xorg-server/hw/xfree86/os-support/linux/lnx_kmod.c @@ -69,7 +69,7 @@ xf86LoadKernelModule(const char *modName) switch (pid = fork()) { case 0: /* child */ /* change real/effective user ID to 0/0 as we need to - * preinstall agpgart module for some DRM modules + * preinstall agpgart module for some DRM modules */ if (setreuid(0, 0)) { xf86Msg(X_WARNING, "LoadKernelModule: " diff --git a/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c index 73a8d55..49758f4 100644 --- a/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c +++ b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c @@ -387,7 +387,7 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data) LogMessage(X_INFO, "systemd-logind: got %s for %u:%u\n", pause ? "pause" : "resume", major, minor); - pdev = xf86_find_platform_device_by_devnum(major, minor); + pdev = xf86_find_platform_device_by_devnum(major, minor); if (!pdev) pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor); diff --git a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c index 254748f..4f4881c 100644 --- a/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/xorg-server/hw/xfree86/os-support/misc/SlowBcopy.c @@ -2,14 +2,14 @@ for Alpha Linux *******************************************************************************/ -/* +/* * Create a dependency that should be immune from the effect of register * renaming as is commonly seen in superscalar processors. This should * insert a minimum of 100-ns delays between reads/writes at clock rates * up to 100 MHz---GGL - * - * Slowbcopy(char *src, char *dst, int count) - * + * + * Slowbcopy(char *src, char *dst, int count) + * */ #ifdef HAVE_XORG_CONFIG_H diff --git a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c index eeacee9..de5fb9b 100644 --- a/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/xorg-server/hw/xfree86/os-support/shared/ioperm_noop.c @@ -22,7 +22,7 @@ */ /* - * Some platforms don't bother with I/O permissions, + * Some platforms don't bother with I/O permissions, * or the permissions are implicit with opening/enabling the console. */ diff --git a/xorg-server/hw/xfree86/os-support/shared/sigio.c b/xorg-server/hw/xfree86/os-support/shared/sigio.c index f3c153b..45949f7 100644 --- a/xorg-server/hw/xfree86/os-support/shared/sigio.c +++ b/xorg-server/hw/xfree86/os-support/shared/sigio.c @@ -10,11 +10,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -22,7 +22,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: Rickard E. (Rik) Faith <faith(a)valinux.com> */ /* diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c b/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c index 38fa5ec..4d4dbc1 100644 --- a/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c +++ b/xorg-server/hw/xfree86/os-support/solaris/sun_apm.c @@ -129,7 +129,7 @@ sunToXF86(int type) } /* - * APM events can be requested direclty from /dev/apm + * APM events can be requested direclty from /dev/apm */ static int sunPMGetEventFromOS(int fd, pmEvent * events, int num) diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h index 9120bd7..3a83f34 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSlib.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSlib.h @@ -15,19 +15,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of the above listed copyright holders - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of the above listed copyright holders + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. The above listed - * copyright holders make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * copyright holders make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY - * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD + * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE + * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY + * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ @@ -37,7 +37,7 @@ * * Copyright 1997 * Digital Equipment Corporation. All rights reserved. - * This software is furnished under license and may be used and copied only in + * This software is furnished under license and may be used and copied only in * accordance with the following terms and conditions. Subject to these * conditions, you may download, copy, install, use, modify and distribute * this software in source and/or binary form. No title or ownership is @@ -47,7 +47,7 @@ * this copyright notice and list of conditions as they appear in the * source file. * - * 2) No right is granted to use any trade name, trademark, or logo of Digital + * 2) No right is granted to use any trade name, trademark, or logo of Digital * Equipment Corporation. Neither the "Digital Equipment Corporation" * name nor any trademark or logo of Digital Equipment Corporation may be * used to endorse or promote products derived from this software without @@ -59,9 +59,9 @@ * In no event shall DIGITAL be liable for any damages whatsoever, and in * particular, DIGITAL shall not be liable for special, indirect, * consequential, or incidental damages or damages for lost profits, loss - * of revenue or loss of use, whether such damages arise in contract, + * of revenue or loss of use, whether such damages arise in contract, * negligence, tort, under statute, in equity, at law or otherwise, even - * if advised of the possibility of such damage. + * if advised of the possibility of such damage. * */ @@ -331,7 +331,7 @@ struct pcvtid { /* For PATH_MAX */ #include "misc.h" -/* +/* * Hack originally for ISC 2.2 POSIX headers, but may apply elsewhere, * and it's safe, so just do it. */ diff --git a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h index 822bab2..fa3ff0e 100644 --- a/xorg-server/hw/xfree86/os-support/xf86_OSproc.h +++ b/xorg-server/hw/xfree86/os-support/xf86_OSproc.h @@ -14,19 +14,19 @@ * documentation for any purpose is hereby granted without fee, provided that * the above copyright notice appear in all copies and that both that * copyright notice and this permission notice appear in supporting - * documentation, and that the names of the above listed copyright holders - * not be used in advertising or publicity pertaining to distribution of + * documentation, and that the names of the above listed copyright holders + * not be used in advertising or publicity pertaining to distribution of * the software without specific, written prior permission. The above listed - * copyright holders make no representations about the suitability of this - * software for any purpose. It is provided "as is" without express or + * copyright holders make no representations about the suitability of this + * software for any purpose. It is provided "as is" without express or * implied warranty. * - * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD - * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE - * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY - * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER - * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD + * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE + * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY + * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER + * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ @@ -36,7 +36,7 @@ * * Copyright 1997 * Digital Equipment Corporation. All rights reserved. - * This software is furnished under license and may be used and copied only in + * This software is furnished under license and may be used and copied only in * accordance with the following terms and conditions. Subject to these * conditions, you may download, copy, install, use, modify and distribute * this software in source and/or binary form. No title or ownership is @@ -46,7 +46,7 @@ * this copyright notice and list of conditions as they appear in the * source file. * - * 2) No right is granted to use any trade name, trademark, or logo of Digital + * 2) No right is granted to use any trade name, trademark, or logo of Digital * Equipment Corporation. Neither the "Digital Equipment Corporation" * name nor any trademark or logo of Digital Equipment Corporation may be * used to endorse or promote products derived from this software without @@ -58,9 +58,9 @@ * In no event shall DIGITAL be liable for any damages whatsoever, and in * particular, DIGITAL shall not be liable for special, indirect, * consequential, or incidental damages or damages for lost profits, loss - * of revenue or loss of use, whether such damages arise in contract, + * of revenue or loss of use, whether such damages arise in contract, * negligence, tort, under statute, in equity, at law or otherwise, even - * if advised of the possibility of such damage. + * if advised of the possibility of such damage. * */ diff --git a/xorg-server/hw/xfree86/parser/Configint.h b/xorg-server/hw/xfree86/parser/Configint.h index e853220..31035ae 100644 --- a/xorg-server/hw/xfree86/parser/Configint.h +++ b/xorg-server/hw/xfree86/parser/Configint.h @@ -1,17 +1,17 @@ /* - * + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2002 by The XFree86 Project, Inc. @@ -52,7 +52,7 @@ * authorization from the copyright holder(s) and author(s). */ -/* +/* * These definitions are used through out the configuration file parser, but * they should not be visible outside of the parser. */ @@ -122,7 +122,7 @@ else\ xf86parseError (__VA_ARGS__); CLEANUP (ptr); return NULL; \ } while (0) -/* +/* * These are defines for error messages to promote consistency. * error messages are preceded by the line number, section and file name, * so these messages should be about the specific keyword and syntax in error. diff --git a/xorg-server/hw/xfree86/parser/DRI.c b/xorg-server/hw/xfree86/parser/DRI.c index 6be32d7..9ed5b9e 100644 --- a/xorg-server/hw/xfree86/parser/DRI.c +++ b/xorg-server/hw/xfree86/parser/DRI.c @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,8 +23,8 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * - * + * + * */ #ifdef HAVE_XORG_CONFIG_H diff --git a/xorg-server/hw/xfree86/parser/Device.c b/xorg-server/hw/xfree86/parser/Device.c index 28c274d..7e49843 100644 --- a/xorg-server/hw/xfree86/parser/Device.c +++ b/xorg-server/hw/xfree86/parser/Device.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c index 24940a9..849bf92 100644 --- a/xorg-server/hw/xfree86/parser/Files.c +++ b/xorg-server/hw/xfree86/parser/Files.c @@ -1,16 +1,16 @@ -/* +/* * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -18,11 +18,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Flags.c b/xorg-server/hw/xfree86/parser/Flags.c index 71b50ac..5169665 100644 --- a/xorg-server/hw/xfree86/parser/Flags.c +++ b/xorg-server/hw/xfree86/parser/Flags.c @@ -1,16 +1,16 @@ -/* +/* * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -18,11 +18,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -100,7 +100,7 @@ xf86parseFlagsSection(void) case COMMENT: ptr->flg_comment = xf86addComment(ptr->flg_comment, xf86_lex_val.str); break; - /* + /* * these old keywords are turned into standard generic options. * we fall through here on purpose */ diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c index 1bfe5c1..cfacd4e 100644 --- a/xorg-server/hw/xfree86/parser/Input.c +++ b/xorg-server/hw/xfree86/parser/Input.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Layout.c b/xorg-server/hw/xfree86/parser/Layout.c index 994b31a..0ace5da 100644 --- a/xorg-server/hw/xfree86/parser/Layout.c +++ b/xorg-server/hw/xfree86/parser/Layout.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Module.c b/xorg-server/hw/xfree86/parser/Module.c index e2d9120..0dcf4ba 100644 --- a/xorg-server/hw/xfree86/parser/Module.c +++ b/xorg-server/hw/xfree86/parser/Module.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c index 8aebce0..0a8c081 100644 --- a/xorg-server/hw/xfree86/parser/Monitor.c +++ b/xorg-server/hw/xfree86/parser/Monitor.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -553,7 +553,7 @@ xf86parseMonitorSection(void) if ((token = xf86getSubToken(&(ptr->mon_comment))) != STRING) Error(QUOTE_MSG, "UseModes"); - /* add to the end of the list of modes sections + /* add to the end of the list of modes sections referenced here */ mptr = calloc(1, sizeof(XF86ConfModesLinkRec)); mptr->list.next = NULL; diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c index fe60d95..2f9d505 100644 --- a/xorg-server/hw/xfree86/parser/Pointer.c +++ b/xorg-server/hw/xfree86/parser/Pointer.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Screen.c b/xorg-server/hw/xfree86/parser/Screen.c index 0e9746a..9d8eda2 100644 --- a/xorg-server/hw/xfree86/parser/Screen.c +++ b/xorg-server/hw/xfree86/parser/Screen.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Vendor.c b/xorg-server/hw/xfree86/parser/Vendor.c index 2c870ae..4f6e510 100644 --- a/xorg-server/hw/xfree86/parser/Vendor.c +++ b/xorg-server/hw/xfree86/parser/Vendor.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/Video.c b/xorg-server/hw/xfree86/parser/Video.c index 93209c4..666b0ab 100644 --- a/xorg-server/hw/xfree86/parser/Video.c +++ b/xorg-server/hw/xfree86/parser/Video.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/read.c b/xorg-server/hw/xfree86/parser/read.c index 22f6e6a..327c02a 100644 --- a/xorg-server/hw/xfree86/parser/read.c +++ b/xorg-server/hw/xfree86/parser/read.c @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -68,7 +68,7 @@ static xf86ConfigSymTabRec TopLevelTab[] = { #define CLEANUP xf86freeConfig -/* +/* * This function resolves name references and reports errors if the named * objects cannot be found. */ @@ -221,7 +221,7 @@ xf86readConfigFile(void) #undef CLEANUP -/* +/* * adds an item to the end of the linked list. Any record whose first field * is a GenericListRec can be cast to this type and used with this function. * A pointer to the head of the list is returned to handle the addition of @@ -246,7 +246,7 @@ xf86addListItem(GenericListPtr head, GenericListPtr new) return new; } -/* +/* * Test if one chained list contains the other. * In this case both list have the same endpoint (provided they don't loop) */ diff --git a/xorg-server/hw/xfree86/parser/scan.c b/xorg-server/hw/xfree86/parser/scan.c index a6c1295..b8a08cf 100644 --- a/xorg-server/hw/xfree86/parser/scan.c +++ b/xorg-server/hw/xfree86/parser/scan.c @@ -1,16 +1,16 @@ -/* +/* * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -18,11 +18,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -241,7 +241,7 @@ xf86getNextLine(void) return ret; } -/* +/* * xf86getToken -- * Read next Token from the config file. Handle the global variable * pushToken. @@ -251,7 +251,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) { int c, i; - /* + /* * First check whether pushToken has a different value than LOCK_TOKEN. * In this case rBuf[] contains a valid STRING/TOKEN/NUMBER. But in the * oth * case the next token must be read from the input. @@ -266,9 +266,9 @@ xf86getToken(xf86ConfigSymTabRec * tab) c = configBuf[configPos]; - /* + /* * Get start of next Token. EOF is handled, - * whitespaces are skipped. + * whitespaces are skipped. */ again: @@ -344,7 +344,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) return DASH; } - /* + /* * Numbers are returned immediately ... */ if (isdigit(c)) { @@ -379,7 +379,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) return NUMBER; } - /* + /* * All Strings START with a \" ... */ else if (c == '\"') { @@ -394,7 +394,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) return STRING; } - /* + /* * ... and now we MUST have a valid token. The search is * handled later along with the pushed tokens. */ @@ -414,7 +414,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) } else { - /* + /* * Here we deal with pushed tokens. Reinitialize pushToken again. If * the pushed token was NUMBER || STRING return them again ... */ @@ -428,7 +428,7 @@ xf86getToken(xf86ConfigSymTabRec * tab) return temp; } - /* + /* * Joop, at last we have to lookup the token ... */ if (tab) { @@ -1018,7 +1018,7 @@ xf86setSection(const char *section) configSection = strdup(section); } -/* +/* * xf86getToken -- * Lookup a string if it is actually a token in disguise. */ @@ -1040,7 +1040,7 @@ StringToToken(const char *str, xf86ConfigSymTabRec * tab) return ERROR_TOKEN; } -/* +/* * Compare two names. The characters '_', ' ', and '\t' are ignored * in the comparison. */ diff --git a/xorg-server/hw/xfree86/parser/write.c b/xorg-server/hw/xfree86/parser/write.c index 472b27b..8792783 100644 --- a/xorg-server/hw/xfree86/parser/write.c +++ b/xorg-server/hw/xfree86/parser/write.c @@ -1,16 +1,16 @@ -/* +/* * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -18,11 +18,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/xorg-server/hw/xfree86/parser/xf86Optrec.h b/xorg-server/hw/xfree86/parser/xf86Optrec.h index ea0cb13..dfa9079 100644 --- a/xorg-server/hw/xfree86/parser/xf86Optrec.h +++ b/xorg-server/hw/xfree86/parser/xf86Optrec.h @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2001 by The XFree86 Project, Inc. @@ -52,7 +52,7 @@ * authorization from the copyright holder(s) and author(s). */ -/* +/* * This file contains the Option Record that is passed between the Parser, * and Module setup procs. */ diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h index 73187f3..43e1755 100644 --- a/xorg-server/hw/xfree86/parser/xf86Parser.h +++ b/xorg-server/hw/xfree86/parser/xf86Parser.h @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -52,7 +52,7 @@ * authorization from the copyright holder(s) and author(s). */ -/* +/* * This file contains the external interfaces for the XFree86 configuration * file parser. */ diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h index 8e15f12..9c44970 100644 --- a/xorg-server/hw/xfree86/parser/xf86tokens.h +++ b/xorg-server/hw/xfree86/parser/xf86tokens.h @@ -1,17 +1,17 @@ -/* - * +/* + * * Copyright (c) 1997 Metro Link Incorporated - * + * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), + * 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 @@ -19,11 +19,11 @@ * 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 Metro Link shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from Metro Link. - * + * */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. @@ -62,7 +62,7 @@ /* Undefine symbols that some OSs might define */ #undef IOBASE -/* +/* * Each token should have a unique value regardless of the section * it is used in. */ diff --git a/xorg-server/hw/xfree86/ramdac/IBM.c b/xorg-server/hw/xfree86/ramdac/IBM.c index 45876cf..6822be5 100644 --- a/xorg-server/hw/xfree86/ramdac/IBM.c +++ b/xorg-server/hw/xfree86/ramdac/IBM.c @@ -576,7 +576,7 @@ IBMramdac526LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); int i; - /* + /* * Output the cursor data. The realize function has put the planes into * their correct order, so we can just blast this out. */ @@ -591,7 +591,7 @@ IBMramdac640LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn); int i; - /* + /* * Output the cursor data. The realize function has put the planes into * their correct order, so we can just blast this out. */ diff --git a/xorg-server/hw/xfree86/ramdac/TI.c b/xorg-server/hw/xfree86/ramdac/TI.c index 2492bb5..f8081ca 100644 --- a/xorg-server/hw/xfree86/ramdac/TI.c +++ b/xorg-server/hw/xfree86/ramdac/TI.c @@ -21,7 +21,7 @@ * * Authors: Alan Hourihane, <alanh(a)fairlite.demon.co.uk> * - * Modified from IBM.c to support TI RAMDAC routines + * Modified from IBM.c to support TI RAMDAC routines * by Jens Owen, <jens(a)tungstengraphics.com>. */ diff --git a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c index fac6822..04496d5 100644 --- a/xorg-server/hw/xfree86/ramdac/xf86Cursor.c +++ b/xorg-server/hw/xfree86/ramdac/xf86Cursor.c @@ -332,8 +332,10 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, ScreenPriv->HotX = cursor->bits->xhot; ScreenPriv->HotY = cursor->bits->yhot; - if (!infoPtr->pScrn->vtSema) + if (!infoPtr->pScrn->vtSema) { ScreenPriv->SavedCursor = cursor; + return; + } if (infoPtr->pScrn->vtSema && xorg_list_is_empty(&pScreen->pixmap_dirty_list) && (ScreenPriv->ForceHWCursorCount || @@ -347,7 +349,7 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs, (cursor->bits->height <= infoPtr->MaxHeight) && (cursor->bits->width <= infoPtr->MaxWidth) && (!infoPtr->UseHWCursor || (*infoPtr->UseHWCursor) (pScreen, cursor)))))) { - + if (ScreenPriv->SWCursor) /* remove the SW cursor */ (*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen, NullCursor, x, y); diff --git a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c index 953c86a..be7154e 100644 --- a/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c +++ b/xorg-server/hw/xfree86/ramdac/xf86HWCurs.c @@ -214,7 +214,7 @@ xf86RecolorCursor(ScreenPtr pScreen, CursorPtr pCurs, Bool displayed) xf86CursorInfoPtr infoPtr = ScreenPriv->CursorInfoPtr; #ifdef ARGB_CURSOR - /* recoloring isn't applicable to ARGB cursors and drivers + /* recoloring isn't applicable to ARGB cursors and drivers shouldn't have to ignore SetCursorColors requests */ if (pCurs->bits->argb) return; diff --git a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h index 50a659a..af16b7f 100644 --- a/xorg-server/hw/xfree86/ramdac/xf86RamDac.h +++ b/xorg-server/hw/xfree86/ramdac/xf86RamDac.h @@ -12,8 +12,8 @@ typedef struct _RamDacRegRec { /* This is probably the nastiest assumption, we allocate 1024 slots for - * ramdac registers, should be enough. I've checked IBM and TVP series - * and they seem o.k + * ramdac registers, should be enough. I've checked IBM and TVP series + * and they seem o.k * Then we allocate 768 entries for the DAC too. IBM640 needs 1024 -FIXME */ unsigned short DacRegs[0x400]; /* register set */ diff --git a/xorg-server/hw/xfree86/sdksyms.sh b/xorg-server/hw/xfree86/sdksyms.sh index d9a4478..2305073 100644 --- a/xorg-server/hw/xfree86/sdksyms.sh +++ b/xorg-server/hw/xfree86/sdksyms.sh @@ -216,10 +216,7 @@ cat > sdksyms.c << EOF #include "mizerarc.h" #include "micoord.h" #include "mifillarc.h" -#include "mispans.h" -#include "miwideline.h" #include "mistruct.h" -#include "mifpoly.h" #include "mioverlay.h" diff --git a/xorg-server/hw/xfree86/shadowfb/shadowfb.h b/xorg-server/hw/xfree86/shadowfb/shadowfb.h index bcf59f9..b3dd448 100644 --- a/xorg-server/hw/xfree86/shadowfb/shadowfb.h +++ b/xorg-server/hw/xfree86/shadowfb/shadowfb.h @@ -26,7 +26,7 @@ extern _X_EXPORT Bool * ShadowFBInit2 is a more featureful refinement of the original shadowfb. * ShadowFBInit2 allows you to specify two callbacks, one to be called * immediately before an operation that modifies the framebuffer, and another - * to be called immediately after. + * to be called immediately after. * * Returns FALSE in the event of an error */ diff --git a/xorg-server/hw/xfree86/utils/gtf/gtf.c b/xorg-server/hw/xfree86/utils/gtf/gtf.c index 15503bb..e88387d 100644 --- a/xorg-server/hw/xfree86/utils/gtf/gtf.c +++ b/xorg-server/hw/xfree86/utils/gtf/gtf.c @@ -4,11 +4,11 @@ * * Copyright (c) 2001, Andy Ritger aritger(a)nvidia.com * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * o Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * o Redistributions in binary form must reproduce the above copyright @@ -33,7 +33,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * + * * * This program is based on the Generalized Timing Formula(GTF TM) * Standard Version: 1.0, Revision: 1.0 @@ -52,7 +52,7 @@ * of suitability for any purpose. The sample code contained within * this standard may be used without restriction. * - * + * * * The GTF EXCEL(TM) SPREADSHEET, a sample (and the definitive) * implementation of the GTF Timing Standard, is available at: @@ -77,12 +77,12 @@ * any experience with this, and 2) neither XServer modelines nor * fbset fb.modes provide an obvious way for margin timings to be * included in their mode descriptions (needs more investigation). - * + * * The GTF provides for computation of interlaced mode timings; * I've implemented the computations but not enabled them, yet. * I should probably enable and test this at some point. * - * + * * * TODO: * @@ -95,7 +95,7 @@ * o It would be nice if this were more general purpose to do things * outside the scope of the GTF: like generate double scan mode * timings, for example. - * + * * o Printing digits to the right of the decimal point when the * digits are 0 annoys me. * @@ -191,7 +191,7 @@ print_xf86_mode(mode * m) * to the portion of the hblank before and after the sync pulse * by conceptually wrapping the portion of the blank after the pulse * to infront of the visible region; ie: - * + * * * Timing description I'm accustomed to: * @@ -202,7 +202,7 @@ print_xf86_mode(mode * m) * |-------------------|_______| |_______ * * R SS SE FL - * + * * 1: visible image * 2: blank before sync (aka front porch) * 3: sync pulse @@ -216,10 +216,10 @@ print_xf86_mode(mode * m) * But the fb.modes format is: * * - * <--4--> <--------1--------> <--2--> <--3--> + * <--4--> <--------1--------> <--2--> <--3--> * _________ * _______|-------------------|_______| | - * + * * The fb.modes(8) manpage refers to <4> and <2> as the left and * right "margin" (as well as upper and lower margin in the vertical * direction) -- note that this has nothing to do with the term @@ -312,7 +312,7 @@ vert_refresh(int h_pixels, int v_lines, float freq, int interlaced, int margins) * by the calculation must be halved, as the computation calculates * the number of vertical lines per field. In either case, the * number of lines is rounded to the nearest integer. - * + * * [V LINES RND] = IF([INT RQD?]="y", ROUND([V LINES]/2,0), * ROUND([V LINES],0)) */ @@ -356,7 +356,7 @@ vert_refresh(int h_pixels, int v_lines, float freq, int interlaced, int margins) print_value(5, "[BOT MARGIN (LINES)]", bottom_margin); /* 6. If interlace is required, then set variable [INTERLACE]=0.5: - * + * * [INTERLACE]=(IF([INT RQD?]="y",0.5,0)) */ diff --git a/xorg-server/hw/xfree86/vbe/vbe.c b/xorg-server/hw/xfree86/vbe/vbe.c index d41e61b..5ea0197 100644 --- a/xorg-server/hw/xfree86/vbe/vbe.c +++ b/xorg-server/hw/xfree86/vbe/vbe.c @@ -3,10 +3,10 @@ * XFree86 vbe module * Copyright 2000 Egbert Eich * - * The mode query/save/set/restore functions from the vesa driver + * The mode query/save/set/restore functions from the vesa driver * have been moved here. * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) - * Authors: Paulo César Pereira de Andrade <pcpa(a)conectiva.com.br> + * Authors: Paulo César Pereira de Andrade <pcpa(a)conectiva.com.br> */ #ifdef HAVE_XORG_CONFIG_H diff --git a/xorg-server/hw/xfree86/vbe/vbe.h b/xorg-server/hw/xfree86/vbe/vbe.h index bc36533..c8fb4e4 100644 --- a/xorg-server/hw/xfree86/vbe/vbe.h +++ b/xorg-server/hw/xfree86/vbe/vbe.h @@ -3,10 +3,10 @@ * XFree86 vbe module * Copyright 2000 Egbert Eich * - * The mode query/save/set/restore functions from the vesa driver + * The mode query/save/set/restore functions from the vesa driver * have been moved here. * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) - * Authors: Paulo César Pereira de Andrade <pcpa(a)conectiva.com.br> + * Authors: Paulo César Pereira de Andrade <pcpa(a)conectiva.com.br> */ #ifndef _VBE_H diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.c b/xorg-server/hw/xfree86/vgahw/vgaHW.c index a64f4f8..7223fc0 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaHW.c +++ b/xorg-server/hw/xfree86/vgahw/vgaHW.c @@ -1109,7 +1109,7 @@ vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save) hwp->writeDacData(hwp, save->DAC[i]); if (readError) { - /* + /* * save the default lookup table */ memmove(save->DAC, defaultDAC, 768); @@ -1184,7 +1184,7 @@ vgaHWInit(ScrnInfoPtr scrninfp, DisplayModePtr mode) regp = &hwp->ModeReg; /* - * compute correct Hsync & Vsync polarity + * compute correct Hsync & Vsync polarity */ if ((mode->Flags & (V_PHSYNC | V_NHSYNC)) && (mode->Flags & (V_PVSYNC | V_NVSYNC))) { @@ -1439,7 +1439,7 @@ vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, CARD32 nExtBits = (nBits < 8) ? 0 : (nBits - 8); CARD32 ExtBitMask = ((1 << nExtBits) - 1) << 8; - /* If width is not known nBits should be 0. In this + /* If width is not known nBits should be 0. In this * case BitMask is set to 0 so we can check for it. */ CARD32 BitMask = (nBits < 7) ? 0 : ((1 << nExtBits) - 1); int VBlankStart = (mode->CrtcVBlankStart - 1) & 0xFF; @@ -1885,7 +1885,7 @@ vgaHWHandleColormaps(ScreenPtr pScreen) } /* ----------------------- DDC support ------------------------*/ -/* +/* * Adjust v_active, v_blank, v_sync, v_sync_end, v_blank_end, v_total * to read out EDID at a faster rate. Allowed maximum is 25kHz with * 20 usec v_sync active. Set positive v_sync polarity, turn off lightpen diff --git a/xorg-server/hw/xfree86/vgahw/vgaHW.h b/xorg-server/hw/xfree86/vgahw/vgaHW.h index 63a10f4..b979b85 100644 --- a/xorg-server/hw/xfree86/vgahw/vgaHW.h +++ b/xorg-server/hw/xfree86/vgahw/vgaHW.h @@ -116,7 +116,7 @@ typedef struct _vgaHWRec { = mmioreg */ void *FontInfo1; /* save area for fonts in plane 2 */ - void *FontInfo2; /* save area for fonts in + void *FontInfo2; /* save area for fonts in plane 3 */ void *TextInfo; /* save area for text */ vgaRegRec SavedReg; /* saved registers */ diff --git a/xorg-server/hw/xfree86/x86emu/debug.c b/xorg-server/hw/xfree86/x86emu/debug.c index 1a8d1d6..cbea994 100644 --- a/xorg-server/hw/xfree86/x86emu/debug.c +++ b/xorg-server/hw/xfree86/x86emu/debug.c @@ -103,11 +103,11 @@ disassemble_forward(u16 seg, u16 off, int n) * SINGLE_STEP(r,m); which disappear if DEBUG is not defined to * the preprocessor. The TRACE_REGS macro expands to: * - * if (debug&DEBUG_DISASSEMBLE) + * if (debug&DEBUG_DISASSEMBLE) * {just_disassemble(); goto EndOfInstruction;} * if (debug&DEBUG_TRACE) trace_regs(r,m); * - * ...... and at the last line of the routine. + * ...... and at the last line of the routine. * * EndOfInstruction: end_instr(); * diff --git a/xorg-server/hw/xfree86/x86emu/ops.c b/xorg-server/hw/xfree86/x86emu/ops.c index b50badb..853792e 100644 --- a/xorg-server/hw/xfree86/x86emu/ops.c +++ b/xorg-server/hw/xfree86/x86emu/ops.c @@ -5530,7 +5530,7 @@ x86emuOp_opc80_byte_RM_IMM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { @@ -5658,7 +5658,7 @@ x86emuOp_opc81_word_RM_IMM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { @@ -5690,7 +5690,7 @@ x86emuOp_opc81_word_RM_IMM(u8 X86EMU_UNUSED(op1)) } #endif /* - * Know operation, decode the mod byte to find the addressing + * Know operation, decode the mod byte to find the addressing * mode. */ switch (mod) { @@ -5853,7 +5853,7 @@ x86emuOp_opc82_byte_RM_IMM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { case 0: @@ -5977,7 +5977,7 @@ x86emuOp_opc83_word_RM_IMM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { case 0: @@ -7472,7 +7472,7 @@ x86emuOp_call_far_IMM(u8 X86EMU_UNUSED(op1)) CALL_TRACE(M.x86.saved_cs, M.x86.saved_ip, farseg, faroff, "FAR "); /* XXX - * + * * Hooked interrupt vectors calling into our "BIOS" will cause * problems unless all intersegment stuff is checked for BIOS * access. Check needed here. For moment, let it alone. @@ -8688,7 +8688,7 @@ x86emuOp_opcC0_byte_RM_MEM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { @@ -8797,7 +8797,7 @@ x86emuOp_opcC1_word_RM_MEM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { @@ -9700,7 +9700,7 @@ x86emuOp_opcD2_byte_RM_CL(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { case 0: @@ -9795,7 +9795,7 @@ x86emuOp_opcD3_word_RM_CL(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { case 0: @@ -11538,7 +11538,7 @@ x86emuOp_opcFE_byte_RM(u8 X86EMU_UNUSED(op1)) if (DEBUG_DECODE()) { /* XXX DECODE_PRINTF may be changed to something more general, so that it is important to leave the strings - in the same format, even though the result is that the + in the same format, even though the result is that the above test is done twice. */ switch (rh) { diff --git a/xorg-server/hw/xfree86/x86emu/prim_ops.c b/xorg-server/hw/xfree86/x86emu/prim_ops.c index 24f76b4..5604c7e 100644 --- a/xorg-server/hw/xfree86/x86emu/prim_ops.c +++ b/xorg-server/hw/xfree86/x86emu/prim_ops.c @@ -883,9 +883,9 @@ rcl_byte(u8 d, u8 s) /* s is the rotate distance. It varies from 0 - 8. */ /* have - CF B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 + CF B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 - want to rotate through the carry by "s" bits. We could + want to rotate through the carry by "s" bits. We could loop, but that's inefficient. So the width is 9, and we split into three parts: @@ -895,12 +895,12 @@ rcl_byte(u8 d, u8 s) The new rotate is done mod 9, and given this, for a rotation of n bits (mod 9) the new carry flag is - then located n bits from the MSB. The low part is + then located n bits from the MSB. The low part is then shifted up cnt bits, and the high part is or'd - in. Using CAPS for new values, and lowercase for the + in. Using CAPS for new values, and lowercase for the original values, this can be expressed as: - IF n > 0 + IF n > 0 1) CF <- b_(8-n) 2) B_(7) .. B_(n) <- b_(8-(n+1)) .. b_0 3) B_(n-1) <- cf @@ -912,17 +912,17 @@ rcl_byte(u8 d, u8 s) /* CF <- b_(8-n) */ cf = (d >> (8 - cnt)) & 0x1; - /* get the low stuff which rotated + /* get the low stuff which rotated into the range B_7 .. B_cnt */ /* B_(7) .. B_(n) <- b_(8-(n+1)) .. b_0 */ /* note that the right hand side done by the mask */ res = (d << cnt) & 0xff; - /* now the high stuff which rotated around + /* now the high stuff which rotated around into the positions B_cnt-2 .. B_0 */ /* B_(n-2) .. B_0 <- b_7 .. b_(8-(n-1)) */ - /* shift it downward, 7-(n-2) = 9-n positions. - and mask off the result before or'ing in. + /* shift it downward, 7-(n-2) = 9-n positions. + and mask off the result before or'ing in. */ mask = (1 << (cnt - 1)) - 1; res |= (d >> (9 - cnt)) & mask; @@ -934,7 +934,7 @@ rcl_byte(u8 d, u8 s) } /* set the new carry flag, based on the variable "cf" */ CONDITIONAL_SET_FLAG(cf, F_CF); - /* OVERFLOW is set *IFF* cnt==1, then it is the + /* OVERFLOW is set *IFF* cnt==1, then it is the xor of CF and the most significant bit. Blecck. */ /* parenthesized this expression since it appears to be causing OF to be misset */ @@ -1003,22 +1003,22 @@ rcr_byte(u8 d, u8 s) u32 mask, cf, ocf = 0; /* rotate right through carry */ - /* + /* s is the rotate distance. It varies from 0 - 8. - d is the byte object rotated. + d is the byte object rotated. - have + have - CF B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 + CF B_7 B_6 B_5 B_4 B_3 B_2 B_1 B_0 The new rotate is done mod 9, and given this, for a rotation of n bits (mod 9) the new carry flag is - then located n bits from the LSB. The low part is + then located n bits from the LSB. The low part is then shifted up cnt bits, and the high part is or'd - in. Using CAPS for new values, and lowercase for the + in. Using CAPS for new values, and lowercase for the original values, this can be expressed as: - IF n > 0 + IF n > 0 1) CF <- b_(n-1) 2) B_(8-(n+1)) .. B_(0) <- b_(7) .. b_(n) 3) B_(8-n) <- cf @@ -1033,7 +1033,7 @@ rcr_byte(u8 d, u8 s) /* note hackery here. Access_flag(..) evaluates to either 0 if flag not set non-zero if flag is set. - doing access_flag(..) != 0 casts that into either + doing access_flag(..) != 0 casts that into either 0..1 in any representation of the flags register (i.e. packed bit array or unpacked.) */ @@ -1044,19 +1044,19 @@ rcr_byte(u8 d, u8 s) /* B_(8-(n+1)) .. B_(0) <- b_(7) .. b_n */ /* note that the right hand side done by the mask - This is effectively done by shifting the + This is effectively done by shifting the object to the right. The result must be masked, - in case the object came in and was treated + in case the object came in and was treated as a negative number. Needed??? */ mask = (1 << (8 - cnt)) - 1; res = (d >> cnt) & mask; - /* now the high stuff which rotated around + /* now the high stuff which rotated around into the positions B_cnt-2 .. B_0 */ /* B_(7) .. B_(8-(n-1)) <- b_(n-2) .. b_(0) */ - /* shift it downward, 7-(n-2) = 9-n positions. - and mask off the result before or'ing in. + /* shift it downward, 7-(n-2) = 9-n positions. + and mask off the result before or'ing in. */ res |= (d << (9 - cnt)); @@ -1067,7 +1067,7 @@ rcr_byte(u8 d, u8 s) } /* set the new carry flag, based on the variable "cf" */ CONDITIONAL_SET_FLAG(cf, F_CF); - /* OVERFLOW is set *IFF* cnt==1, then it is the + /* OVERFLOW is set *IFF* cnt==1, then it is the xor of CF and the most significant bit. Blecck. */ /* parenthesized... */ if (cnt == 1) { @@ -1154,18 +1154,18 @@ rol_byte(u8 d, u8 s) register unsigned int res, cnt, mask; /* rotate left */ - /* + /* s is the rotate distance. It varies from 0 - 8. - d is the byte object rotated. + d is the byte object rotated. - have + have - CF B_7 ... B_0 + CF B_7 ... B_0 The new rotate is done mod 8. Much simpler than the "rcl" or "rcr" operations. - IF n > 0 + IF n > 0 1) B_(7) .. B_(n) <- b_(8-(n+1)) .. b_(0) 2) B_(n-1) .. B_(0) <- b_(7) .. b_(8-n) */ @@ -1256,17 +1256,17 @@ ror_byte(u8 d, u8 s) register unsigned int res, cnt, mask; /* rotate right */ - /* + /* s is the rotate distance. It varies from 0 - 8. - d is the byte object rotated. + d is the byte object rotated. - have + have - B_7 ... B_0 + B_7 ... B_0 The rotate is done mod 8. - IF n > 0 + IF n > 0 1) B_(8-(n+1)) .. B_(0) <- b_(7) .. b_(n) 2) B_(7) .. B_(8-n) <- b_(n-1) .. b_(0) */ @@ -1279,7 +1279,7 @@ ror_byte(u8 d, u8 s) mask = (1 << (8 - cnt)) - 1; res |= (d >> (cnt)) & mask; - /* set the new carry flag, Note that it is the low order + /* set the new carry flag, Note that it is the low order bit of the result!!! */ CONDITIONAL_SET_FLAG(res & 0x80, F_CF); /* OVERFLOW is set *IFF* s==1, then it is the diff --git a/xorg-server/hw/xfree86/x86emu/sys.c b/xorg-server/hw/xfree86/x86emu/sys.c index c514dde..5eba358 100644 --- a/xorg-server/hw/xfree86/x86emu/sys.c +++ b/xorg-server/hw/xfree86/x86emu/sys.c @@ -183,7 +183,7 @@ RETURNS: Byte value read from emulator memory. REMARKS: -Reads a byte value from the emulator memory. +Reads a byte value from the emulator memory. ****************************************************************************/ u8 X86API rdb(u32 addr) @@ -241,7 +241,7 @@ addr - Emulator memory address to read RETURNS: Long value read from emulator memory. REMARKS: -Reads a long value from the emulator memory. +Reads a long value from the emulator memory. ****************************************************************************/ u32 X86API rdl(u32 addr) @@ -323,7 +323,7 @@ addr - Emulator memory address to read val - Value to store REMARKS: -Writes a long value to emulator memory. +Writes a long value to emulator memory. ****************************************************************************/ void X86API wrl(u32 addr, u32 val) diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/regs.h b/xorg-server/hw/xfree86/x86emu/x86emu/regs.h index 3a7456e..c040259 100644 --- a/xorg-server/hw/xfree86/x86emu/x86emu/regs.h +++ b/xorg-server/hw/xfree86/x86emu/x86emu/regs.h @@ -109,7 +109,7 @@ struct i386_special_regs { u32 FLAGS; }; -/* +/* * Segment registers here represent the 16 bit quantities * CS, DS, ES, SS. */ @@ -196,8 +196,8 @@ struct i386_segment_regs { #define F_ALWAYS_ON (0x0002) /* flag bits always on */ /* - * Define a mask for only those flag bits we will ever pass back - * (via PUSHF) + * Define a mask for only those flag bits we will ever pass back + * (via PUSHF) */ #define F_MSK (FB_CF|FB_PF|FB_AF|FB_ZF|FB_SF|FB_TF|FB_IF|FB_DF|FB_OF) @@ -279,8 +279,8 @@ typedef struct { * Delayed flag set 3 bits (zero, signed, parity) * reserved 6 bits * interrupt # 8 bits instruction raised interrupt - * BIOS video segregs 4 bits - * Interrupt Pending 1 bits + * BIOS video segregs 4 bits + * Interrupt Pending 1 bits * Extern interrupt 1 bits * Halted 1 bits */ diff --git a/xorg-server/hw/xnest/Color.c b/xorg-server/hw/xnest/Color.c index 95c3343..8d9d356 100644 --- a/xorg-server/hw/xnest/Color.c +++ b/xorg-server/hw/xnest/Color.c @@ -239,7 +239,7 @@ xnestSetInstalledColormapWindows(ScreenPtr pScreen) xnestNumOldInstalledColormapWindows = icws.numWindows; #ifdef DUMB_WINDOW_MANAGERS - /* + /* This code is for dumb window managers. This will only work with default local visual colormaps. */ diff --git a/xorg-server/hw/xnest/GC.c b/xorg-server/hw/xnest/GC.c index 0ec60fc..96af6eb 100644 --- a/xorg-server/hw/xnest/GC.c +++ b/xorg-server/hw/xnest/GC.c @@ -194,11 +194,12 @@ xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects) BoxPtr pBox; XRectangle *pRects; - xnestDestroyClipHelper(pGC); + xnestDestroyClip(pGC); switch (type) { case CT_NONE: XSetClipMask(xnestDisplay, xnestGC(pGC), None); + pValue = NULL; break; case CT_REGION: @@ -224,11 +225,9 @@ xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects) * Need to change into region, so subsequent uses are with * current pixmap contents. */ - pGC->clientClip = - (void *) (*pGC->pScreen->BitmapToRegion) ((PixmapPtr) pValue); + pGC->clientClip = (*pGC->pScreen->BitmapToRegion) ((PixmapPtr) pValue); (*pGC->pScreen->DestroyPixmap) ((PixmapPtr) pValue); pValue = pGC->clientClip; - type = CT_REGION; break; case CT_UNSORTED: @@ -264,65 +263,34 @@ xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects) case CT_YSORTED: case CT_YXSORTED: case CT_YXBANDED: - - /* - * other parts of server can only deal with CT_NONE, - * CT_PIXMAP and CT_REGION client clips. - */ - pGC->clientClip = (void *) RegionFromRects(nRects, - (xRectangle *) pValue, - type); + /* server clip representation is a region */ + pGC->clientClip = RegionFromRects(nRects, (xRectangle *) pValue, type); free(pValue); pValue = pGC->clientClip; - type = CT_REGION; - break; } - pGC->clientClipType = type; pGC->clientClip = pValue; } void xnestDestroyClip(GCPtr pGC) { - xnestDestroyClipHelper(pGC); - - XSetClipMask(xnestDisplay, xnestGC(pGC), None); - - pGC->clientClipType = CT_NONE; - pGC->clientClip = NULL; -} - -void -xnestDestroyClipHelper(GCPtr pGC) -{ - switch (pGC->clientClipType) { - default: - case CT_NONE: - break; - - case CT_REGION: + if (pGC->clientClip) { RegionDestroy(pGC->clientClip); - break; + XSetClipMask(xnestDisplay, xnestGC(pGC), None); + pGC->clientClip = NULL; } } void xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc) { - RegionPtr pRgn; - - switch (pGCSrc->clientClipType) { - default: - case CT_NONE: - xnestDestroyClip(pGCDst); - break; - - case CT_REGION: - pRgn = RegionCreate(NULL, 1); + if (pGCSrc->clientClip) { + RegionPtr pRgn = RegionCreate(NULL, 1); RegionCopy(pRgn, pGCSrc->clientClip); xnestChangeClip(pGCDst, CT_REGION, pRgn, 0); - break; + } else { + xnestDestroyClip(pGCDst); } } diff --git a/xorg-server/hw/xnest/XNGC.h b/xorg-server/hw/xnest/XNGC.h index e2f10fb..974173e 100644 --- a/xorg-server/hw/xnest/XNGC.h +++ b/xorg-server/hw/xnest/XNGC.h @@ -37,7 +37,6 @@ void xnestCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst); void xnestDestroyGC(GCPtr pGC); void xnestChangeClip(GCPtr pGC, int type, void *pValue, int nRects); void xnestDestroyClip(GCPtr pGC); -void xnestDestroyClipHelper(GCPtr pGC); void xnestCopyClip(GCPtr pGCDst, GCPtr pGCSrc); #endif /* XNESTGC_H */ diff --git a/xorg-server/hw/xnest/Xnest.h b/xorg-server/hw/xnest/Xnest.h index adb9daf..37ea6e5 100644 --- a/xorg-server/hw/xnest/Xnest.h +++ b/xorg-server/hw/xnest/Xnest.h @@ -28,7 +28,7 @@ from the X Consortium. */ -/* +/* ** Machines with a 64 bit library interface and a 32 bit server require ** name changes to protect the guilty. */ diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c index 29c6438..3403436 100644 --- a/xorg-server/hw/xquartz/darwin.c +++ b/xorg-server/hw/xquartz/darwin.c @@ -343,16 +343,16 @@ DarwinMouseProc(DeviceIntPtr pPointer, int what) InitValuatorAxisStruct(pPointer, 1, axes_labels[1], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 0, 0, 0, Absolute); - InitValuatorAxisStruct(pPointer, 2, axes_labels[2], + InitValuatorAxisStruct(pPointer, 2, axes_labels[2], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 1, 0, 1, Relative); - InitValuatorAxisStruct(pPointer, 3, axes_labels[3], + InitValuatorAxisStruct(pPointer, 3, axes_labels[3], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 1, 0, 1, Relative); - InitValuatorAxisStruct(pPointer, 4, axes_labels[4], + InitValuatorAxisStruct(pPointer, 4, axes_labels[4], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 1, 0, 1, Relative); - InitValuatorAxisStruct(pPointer, 5, axes_labels[5], + InitValuatorAxisStruct(pPointer, 5, axes_labels[5], NO_AXIS_LIMITS, NO_AXIS_LIMITS, 1, 0, 1, Relative); diff --git a/xorg-server/hw/xquartz/darwinEvents.c b/xorg-server/hw/xquartz/darwinEvents.c index b41c6fd..5a5e4da 100644 --- a/xorg-server/hw/xquartz/darwinEvents.c +++ b/xorg-server/hw/xquartz/darwinEvents.c @@ -596,7 +596,7 @@ DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button, QueuePointerEvents(pDev, ev_type, ev_button, POINTER_ABSOLUTE, &valuators); DarwinPokeEQ(); - } darwinEvents_unlock(); + } darwinEvents_unlock(); } void @@ -645,7 +645,7 @@ DarwinSendScrollEvents(double scroll_x, double scroll_y) { QueuePointerEvents(darwinPointer, MotionNotify, 0, POINTER_RELATIVE, &valuators); DarwinPokeEQ(); - } darwinEvents_unlock(); + } darwinEvents_unlock(); } /* Send the appropriate KeyPress/KeyRelease events to GetKeyboardEvents to diff --git a/xorg-server/hw/xwayland/xwayland.c b/xorg-server/hw/xwayland/xwayland.c index 9132969..37d6d82 100644 --- a/xorg-server/hw/xwayland/xwayland.c +++ b/xorg-server/hw/xwayland/xwayland.c @@ -656,6 +656,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) return ret; } +_X_NORETURN static void _X_ATTRIBUTE_PRINTF(1, 0) xwl_log_handler(const char *format, va_list args) { diff --git a/xorg-server/hw/xwin/InitInput.c b/xorg-server/hw/xwin/InitInput.c index 3e9ee41..6cd9e06 100644 --- a/xorg-server/hw/xwin/InitInput.c +++ b/xorg-server/hw/xwin/InitInput.c @@ -52,7 +52,7 @@ DeviceIntPtr g_pwinKeyboard; /* * All of our keys generate up and down transition notifications, * so all of our keys can be used as modifiers. - * + * * An example of a modifier is mapping the A key to the Control key. * A has to be a legal modifier. I think. */ diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index e867119..fef46a9 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -628,9 +628,9 @@ OsVendorInit(void) if (!g_fLogInited) { /* keep this order. If LogInit fails it calls Abort which then calls - * ddxGiveUp where LogInit is called again and creates an infinite - * recursion. If we set g_fLogInited to TRUE before the init we - * avoid the second call + * ddxGiveUp where LogInit is called again and creates an infinite + * recursion. If we set g_fLogInited to TRUE before the init we + * avoid the second call */ g_fLogInited = TRUE; g_pszLogFile = LogInit(g_pszLogFile, NULL); @@ -885,7 +885,7 @@ ddxUseMsg(void) /* See Porting Layer Definition - p. 20 */ /* * Do any global initialization, then initialize each screen. - * + * * NOTE: We use ddxProcessArgument, so we don't need to touch argc and argv */ @@ -1004,7 +1004,7 @@ winCheckDisplayNumber(void) int nDisp; HANDLE mutex; char name[MAX_PATH]; - char *pszPrefix = '\0'; + const char *pszPrefix = '\0'; OSVERSIONINFO osvi = { 0 }; /* Check display range */ diff --git a/xorg-server/hw/xwin/ddraw.h b/xorg-server/hw/xwin/ddraw.h index 1871d95..4c9af77 100644 --- a/xorg-server/hw/xwin/ddraw.h +++ b/xorg-server/hw/xwin/ddraw.h @@ -1346,7 +1346,7 @@ extern "C" { /***************************************************************************** * IDirectDraw2 interface */ -/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of +/* Note: IDirectDraw2 cannot derive from IDirectDraw because the number of * arguments of SetDisplayMode has changed ! */ #undef INTERFACE @@ -1742,7 +1742,7 @@ extern "C" { /***************************************************************************** * IDirectDrawSurface2 interface */ -/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters +/* Cannot inherit from IDirectDrawSurface because the LPDIRECTDRAWSURFACE parameters * have been converted to LPDIRECTDRAWSURFACE2. */ #undef INTERFACE @@ -1861,7 +1861,7 @@ extern "C" { /***************************************************************************** * IDirectDrawSurface3 interface */ -/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters +/* Cannot inherit from IDirectDrawSurface2 because the LPDIRECTDRAWSURFACE2 parameters * have been converted to LPDIRECTDRAWSURFACE3. */ #undef INTERFACE diff --git a/xorg-server/hw/xwin/glx/glshim.c b/xorg-server/hw/xwin/glx/glshim.c index 7109196..df5a932 100644 --- a/xorg-server/hw/xwin/glx/glshim.c +++ b/xorg-server/hw/xwin/glx/glshim.c @@ -36,6 +36,7 @@ #endif #define GL_GLEXT_LEGACY +#define GL_GLEXT_PROTOTYPES #include <GL/gl.h> #undef GL_ARB_imaging #undef GL_VERSION_1_3 @@ -46,6 +47,8 @@ #include "glwindows.h" #include <glx/glxserver.h> +extern void *glXGetProcAddressARB(const char *); + static HMODULE hMod = NULL; /* diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h index ed1ad01..b7d20ca 100644 --- a/xorg-server/hw/xwin/win.h +++ b/xorg-server/hw/xwin/win.h @@ -706,7 +706,7 @@ extern FARPROC g_fpDirectDrawCreateClipper; winPrivWinPtr pWinPriv = winGetWindowPriv(pWin) /* - * wrapper macros + * wrapper macros */ #define _WIN_WRAP(priv, real, mem, func) {\ priv->mem = real->mem; \ diff --git a/xorg-server/hw/xwin/winSetAppUserModelID.c b/xorg-server/hw/xwin/winSetAppUserModelID.c index 41615e1..f9cb92c 100644 --- a/xorg-server/hw/xwin/winSetAppUserModelID.c +++ b/xorg-server/hw/xwin/winSetAppUserModelID.c @@ -90,7 +90,7 @@ winSetAppUserModelID(HWND hWnd, const char *AppID) return; } - winDebug("winSetAppUserMOdelID - hwnd 0x%08x appid '%s'\n", hWnd, AppID); + winDebug("winSetAppUserMOdelID - hwnd 0x%p appid '%s'\n", hWnd, AppID); hr = g_pSHGetPropertyStoreForWindow(hWnd, &IID_IPropertyStore, (void **) &pps); diff --git a/xorg-server/hw/xwin/winclipboard/xevents.c b/xorg-server/hw/xwin/winclipboard/xevents.c index d0077b8..33d52aa 100644 --- a/xorg-server/hw/xwin/winclipboard/xevents.c +++ b/xorg-server/hw/xwin/winclipboard/xevents.c @@ -126,7 +126,8 @@ void winClipboardInitMonitoredSelections(void) { /* Initialize static variables */ - for (int i = 0; i < CLIP_NUM_SELECTIONS; ++i) + int i; + for (i = 0; i < CLIP_NUM_SELECTIONS; ++i) s_iOwners[i] = None; lastOwnedSelectionIndex = CLIP_OWN_NONE; diff --git a/xorg-server/hw/xwin/wincmap.c b/xorg-server/hw/xwin/wincmap.c index 5dcc8bc..1bdc7df 100644 --- a/xorg-server/hw/xwin/wincmap.c +++ b/xorg-server/hw/xwin/wincmap.c @@ -270,7 +270,7 @@ winCreateColormap(ColormapPtr pmap) * FIXME: This is some evil hackery to help in handling some X clients * that expect the top pixel to be white. This "help" only lasts until * some client overwrites the top colormap entry. - * + * * We don't want to actually allocate the top entry, as that causes * problems with X clients that need 7 planes (128 colors) in the default * colormap, such as Magic 7.1. diff --git a/xorg-server/hw/xwin/winconfig.c b/xorg-server/hw/xwin/winconfig.c index a6d3c0a..321dfee 100644 --- a/xorg-server/hw/xwin/winconfig.c +++ b/xorg-server/hw/xwin/winconfig.c @@ -239,7 +239,7 @@ winConfigKeyboard(DeviceIntPtr pDevice) XkbGetRulesDflts(&g_winInfo.xkb); /* - * Query the windows autorepeat settings and change the xserver defaults. + * Query the windows autorepeat settings and change the xserver defaults. */ { int kbd_delay; @@ -277,7 +277,7 @@ winConfigKeyboard(DeviceIntPtr pDevice) layoutNum = strtoul(layoutName, (char **) NULL, 16); if ((layoutNum & 0xffff) == 0x411) { /* The japanese layouts know a lot of different IMEs which all have - different layout numbers set. Map them to a single entry. + different layout numbers set. Map them to a single entry. Same might apply for chinese, korean and other symbol languages too */ layoutNum = (layoutNum & 0xffff); @@ -358,7 +358,7 @@ winConfigKeyboard(DeviceIntPtr pDevice) kbdfrom = X_CMDLINE; /* - * Until the layout code is finished, I search for the keyboard + * Until the layout code is finished, I search for the keyboard * device and configure the server with it. */ @@ -653,7 +653,7 @@ winSetPercentOption(void *optlist, const char *name, double deflt) /* * Compare two strings for equality. This is caseinsensitive and - * The characters '_', ' ' (space) and '\t' (tab) are treated as + * The characters '_', ' ' (space) and '\t' (tab) are treated as * not existing. */ @@ -696,7 +696,7 @@ winNameCompare(const char *s1, const char *s2) #ifdef XWIN_XF86CONFIG /* - * Find the named option in the list. + * Find the named option in the list. * @return the pointer to the option record, or NULL if not found. */ diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c index 9f72016..6c5b21d 100644 --- a/xorg-server/hw/xwin/wincreatewnd.c +++ b/xorg-server/hw/xwin/wincreatewnd.c @@ -160,8 +160,8 @@ winCreateBoundingWindowWindowed(ScreenPtr pScreen) && !pScreenInfo->fMultiWindow #endif ) { - /* Try to handle startup via run.exe. run.exe instructs Windows to - * hide all created windows. Detect this case and make sure the + /* Try to handle startup via run.exe. run.exe instructs Windows to + * hide all created windows. Detect this case and make sure the * window is shown nevertheless */ STARTUPINFO startupInfo; diff --git a/xorg-server/hw/xwin/wincursor.c b/xorg-server/hw/xwin/wincursor.c index f3ac0f7..bddd6b7 100644 --- a/xorg-server/hw/xwin/wincursor.c +++ b/xorg-server/hw/xwin/wincursor.c @@ -106,7 +106,7 @@ winPointerWarpCursor(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) MapWindowPoints(pScreenPriv->hwndScreen, HWND_DESKTOP, (LPPOINT) &rcClient, 2); - /* + /* * Update the Windows cursor position so that we don't * immediately warp back to the current position. */ @@ -169,7 +169,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) pCursor->bits->width, pCursor->bits->height, pCursor->bits->xhot, pCursor->bits->yhot); - /* We can use only White and Black, so calc brightness of color + /* We can use only White and Black, so calc brightness of color * Also check if the cursor is inverted */ dForeY = BRIGHTNESS(pCursor->fore); dBackY = BRIGHTNESS(pCursor->back); @@ -184,8 +184,8 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) pCursor->bits->width, pCursor->bits->height); } - /* Get the number of bytes required to store the whole cursor image - * This is roughly (sm_cx * sm_cy) / 8 + /* Get the number of bytes required to store the whole cursor image + * This is roughly (sm_cx * sm_cy) / 8 * round up to 8 pixel boundary so we can convert whole bytes */ nBytes = bits_to_bytes(pScreenPriv->cursor.sm_cx) * pScreenPriv->cursor.sm_cy; @@ -199,7 +199,7 @@ winLoadCursor(ScreenPtr pScreen, CursorPtr pCursor, int screen) memset(pAnd, 0xFF, nBytes); pXor = calloc(1, nBytes); - /* Convert the X11 bitmap to a win32 bitmap + /* Convert the X11 bitmap to a win32 bitmap * The first is for an empty mask */ if (pCursor->bits->emptyMask) { int x, y, xmax = bits_to_bytes(nCX); diff --git a/xorg-server/hw/xwin/windialogs.c b/xorg-server/hw/xwin/windialogs.c index 61f7fe0..6fe3fc4 100644 --- a/xorg-server/hw/xwin/windialogs.c +++ b/xorg-server/hw/xwin/windialogs.c @@ -389,8 +389,8 @@ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv) } /* - * Display a notification to the user that the visual - * will not be displayed until the Windows display depth + * Display a notification to the user that the visual + * will not be displayed until the Windows display depth * is restored to the original value. */ g_hDlgDepthChange = CreateDialogParam(g_hInstance, @@ -411,7 +411,7 @@ winDisplayDepthChangeDialog(winPrivScreenPtr pScreenPriv) /* * Process messages for the dialog that is displayed for - * disruptive screen depth changes. + * disruptive screen depth changes. */ static INT_PTR CALLBACK @@ -437,8 +437,8 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message, s_pScreenInfo = s_pScreenPriv->pScreenInfo; #if CYGDEBUG - winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, " - "s_pScreenInfo: %08x\n", + winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, " + "s_pScreenInfo: %p\n", s_pScreenPriv, s_pScreenInfo); #endif @@ -481,7 +481,7 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message, case IDCANCEL: winDebug("winChangeDepthDlgProc - WM_COMMAND - IDOK or IDCANCEL\n"); - /* + /* * User dismissed the dialog, hide it until the * display mode is restored. */ diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h index 8b6b984..a61fd7a 100644 --- a/xorg-server/hw/xwin/winlayouts.h +++ b/xorg-server/hw/xwin/winlayouts.h @@ -23,7 +23,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* Definitions for various keyboard layouts from windows and their +/* Definitions for various keyboard layouts from windows and their * XKB settings. */ diff --git a/xorg-server/hw/xwin/winmsgwindow.c b/xorg-server/hw/xwin/winmsgwindow.c index 59f1da5..f5649b7 100644 --- a/xorg-server/hw/xwin/winmsgwindow.c +++ b/xorg-server/hw/xwin/winmsgwindow.c @@ -96,7 +96,6 @@ static HWND winCreateMsgWindow(void) { HWND hwndMsg; - wATOM winClass; // register window class { @@ -114,7 +113,7 @@ winCreateMsgWindow(void) wcx.lpszMenuName = NULL; wcx.lpszClassName = WINDOW_CLASS_X_MSG; wcx.hIconSm = NULL; - winClass = RegisterClassEx(&wcx); + RegisterClassEx(&wcx); } // Create the msg window. @@ -136,7 +135,7 @@ winCreateMsgWindow(void) return NULL; } - winDebug("winCreateMsgWindow - Created msg window hwnd 0x%x\n", hwndMsg); + winDebug("winCreateMsgWindow - Created msg window hwnd 0x%p\n", hwndMsg); return hwndMsg; } diff --git a/xorg-server/hw/xwin/winmultiwindowicons.c b/xorg-server/hw/xwin/winmultiwindowicons.c index 93d389d..c22e688 100644 --- a/xorg-server/hw/xwin/winmultiwindowicons.c +++ b/xorg-server/hw/xwin/winmultiwindowicons.c @@ -382,7 +382,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize) static int generation; uint32_t *icon, *icon_data = NULL; unsigned long int size; - unsigned long int type; + Atom type; int format; unsigned long int left; @@ -465,7 +465,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize) xImageIcon = XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height, 0xFFFFFFFF, ZPixmap); - winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id, + winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%p\n", id, xImageIcon); if (hints->icon_mask) diff --git a/xorg-server/hw/xwin/winmultiwindowshape.c b/xorg-server/hw/xwin/winmultiwindowshape.c index cb0f389..73afaea 100644 --- a/xorg-server/hw/xwin/winmultiwindowshape.c +++ b/xorg-server/hw/xwin/winmultiwindowshape.c @@ -47,7 +47,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind) winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - ErrorF("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind); + ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind); #endif WIN_UNWRAP(SetShape); diff --git a/xorg-server/hw/xwin/winmultiwindowwindow.c b/xorg-server/hw/xwin/winmultiwindowwindow.c index f2e7907..c22d690 100644 --- a/xorg-server/hw/xwin/winmultiwindowwindow.c +++ b/xorg-server/hw/xwin/winmultiwindowwindow.c @@ -286,7 +286,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask) winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - ErrorF("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin); + ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin); #endif WIN_UNWRAP(ChangeWindowAttributes); @@ -315,7 +315,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin) winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - ErrorF("winUnmapWindowMultiWindow - pWin: %08x\n", pWin); + ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin); #endif WIN_UNWRAP(UnrealizeWindow); @@ -346,7 +346,7 @@ winMapWindowMultiWindow(WindowPtr pWin) winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG - ErrorF("winMapWindowMultiWindow - pWin: %08x\n", pWin); + ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin); #endif WIN_UNWRAP(RealizeWindow); @@ -378,7 +378,7 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent) winScreenPriv(pScreen); winDebug - ("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n", + ("winReparentMultiWindow - pWin:%p XID:0x%x, reparent from pWin:%p XID:0x%x to pWin:%p XID:0x%x\n", pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id, pWin->parent, pWin->parent->drawable.id); @@ -409,7 +409,7 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib) winScreenPriv(pScreen); #if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG - winTrace("winRestackMultiWindow - %08x\n", pWin); + winTrace("winRestackMultiWindow - %p\n", pWin); #endif WIN_UNWRAP(RestackWindow); @@ -492,7 +492,7 @@ winCreateWindowsWindow(WindowPtr pWin) winInitMultiWindowClass(); - winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin, + winDebug("winCreateWindowsTopLevelWindow - pWin:%p XID:0x%x \n", pWin, pWin->drawable.id); iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN); @@ -618,7 +618,7 @@ winDestroyWindowsWindow(WindowPtr pWin) HICON hIcon; HICON hIconSm; - winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin, + winDebug("winDestroyWindowsWindow - pWin:%p XID:0x%x \n", pWin, pWin->drawable.id); /* Bail out if the Windows window handle is invalid */ @@ -700,7 +700,7 @@ winUpdateWindowsWindow(WindowPtr pWin) } /* - * winGetWindowID - + * winGetWindowID - */ XID @@ -720,7 +720,7 @@ winGetWindowID(WindowPtr pWin) } /* - * winFindWindow - + * winFindWindow - */ static void @@ -734,7 +734,7 @@ winFindWindow(void *value, XID id, void *cdata) } /* - * winReorderWindowsMultiWindow - + * winReorderWindowsMultiWindow - */ void diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c index e17a950..6599dfb 100644 --- a/xorg-server/hw/xwin/winmultiwindowwm.c +++ b/xorg-server/hw/xwin/winmultiwindowwm.c @@ -339,7 +339,7 @@ PopMessage(WMMsgQueuePtr pQueue, WMInfoPtr pWMInfo) #if 0 /* - * HaveMessage - + * HaveMessage - */ static Bool diff --git a/xorg-server/hw/xwin/winmultiwindowwndproc.c b/xorg-server/hw/xwin/winmultiwindowwndproc.c index 17823ba..d296f0f 100644 --- a/xorg-server/hw/xwin/winmultiwindowwndproc.c +++ b/xorg-server/hw/xwin/winmultiwindowwndproc.c @@ -140,7 +140,7 @@ ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp) * * minAspectX * dheight > minAspectY * dwidth * maxAspectX * dheight < maxAspectY * dwidth - * + * */ if (hints.flags & PAspect) { @@ -271,7 +271,7 @@ winRaiseWindow(WindowPtr pWin) BOOL oldstate = winInRaiseWindow; XID vlist[1] = { 0 }; winInRaiseWindow = TRUE; - /* Call configure window directly to make sure it gets processed + /* Call configure window directly to make sure it gets processed * in time */ ConfigureWindow(pWin, CWStackMode, vlist, serverClient); diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index 53abc16..5052927 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -625,7 +625,7 @@ winIconIsOverride(HICON hicon) * If @path is NULL, use the built-in default. */ static int -winPrefsLoadPreferences(char *path) +winPrefsLoadPreferences(const char *path) { FILE *prefFile = NULL; diff --git a/xorg-server/hw/xwin/winprefslex.l b/xorg-server/hw/xwin/winprefslex.l index fd13edc..9e6f0d6 100644 --- a/xorg-server/hw/xwin/winprefslex.l +++ b/xorg-server/hw/xwin/winprefslex.l @@ -37,8 +37,6 @@ #include <string.h> #include "winprefsyacc.h" -extern int yyparse(void); - extern void ErrorF (const char* /*f*/, ...); /* Copy the parsed string, must be free()d in yacc parser */ diff --git a/xorg-server/hw/xwin/winprefsyacc.y b/xorg-server/hw/xwin/winprefsyacc.y index 683fc44..9bb28ae 100644 --- a/xorg-server/hw/xwin/winprefsyacc.y +++ b/xorg-server/hw/xwin/winprefsyacc.y @@ -64,7 +64,7 @@ static void SetDefaultSysMenu (char *menu, int pos); static void SetTrayIcon (char *fname); static void OpenMenu(char *menuname); -static void AddMenuLine(char *name, MENUCOMMANDTYPE cmd, char *param); +static void AddMenuLine(const char *name, MENUCOMMANDTYPE cmd, const char *param); static void CloseMenu(void); static void OpenIcons(void); @@ -79,9 +79,10 @@ static void OpenSysMenu(void); static void AddSysMenuLine(char *matchstr, char *menuname, int pos); static void CloseSysMenu(void); -static int yyerror (char *s); +static int yyerror (const char *s); extern char *yytext; +extern int yylineno; extern int yylex(void); %} @@ -252,10 +253,8 @@ debug: DEBUGOUTPUT STRING NEWLINE { ErrorF("LoadPreferences: %s\n", $2); free($ * Errors in parsing abort and print log messages */ static int -yyerror (char *s) +yyerror (const char *s) { - extern int yylineno; /* Handled by flex internally */ - ErrorF("LoadPreferences: %s line %d\n", s, yylineno); return 1; } @@ -308,7 +307,7 @@ OpenMenu (char *menuname) } static void -AddMenuLine (char *text, MENUCOMMANDTYPE cmd, char *param) +AddMenuLine (const char *text, MENUCOMMANDTYPE cmd, const char *param) { if (menu.menuItem==NULL) menu.menuItem = malloc(sizeof(MENUITEM)); diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c index ed1773c..ce0aada 100644 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c @@ -185,7 +185,7 @@ winScreenInit(ScreenPtr pScreen, int argc, char **argv) /* Are we using multiple monitors? */ if (pScreenInfo->fMultipleMonitors) { - /* + /* * In this case, some of the defaults set in * winInitializeScreenDefaults() are not correct ... */ @@ -345,7 +345,7 @@ winFinishScreenInitFB(int i, ScreenPtr pScreen, int argc, char **argv) pVisual->vid != pScreen->rootVisual; pVisual++); pScreenPriv->pRootVisual = pVisual; - /* + /* * Setup points to the block and wakeup handlers. Pass a pointer * to the current screen as pWakeupdata. */ diff --git a/xorg-server/hw/xwin/winshaddd.c b/xorg-server/hw/xwin/winshaddd.c index 5f3b658..4904eb4 100644 --- a/xorg-server/hw/xwin/winshaddd.c +++ b/xorg-server/hw/xwin/winshaddd.c @@ -173,7 +173,7 @@ winReleasePrimarySurfaceShadowDD(ScreenPtr pScreen) /* * Create a DirectDraw surface for the shadow framebuffer; also create * a primary surface object so we can blit to the display. - * + * * Install a DirectDraw clipper on our primary surface object * that clips our blits to the unobscured client area of our display window. */ @@ -518,7 +518,7 @@ winShadowUpdateDD(ScreenPtr pScreen, shadowBufPtr pBuf) /* * Handle small regions with multiple blits, - * handle large regions by creating a clipping region and + * handle large regions by creating a clipping region and * doing a single blit constrained to that clipping region. */ if (pScreenInfo->dwClipUpdatesNBoxes == 0 @@ -619,7 +619,7 @@ winInitScreenShadowDD(ScreenPtr pScreen) /* * Call the wrapped CloseScreen function. - * + * * Free our resources and private structures. */ @@ -683,7 +683,7 @@ winCloseScreenShadowDD(ScreenPtr pScreen) /* * 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. diff --git a/xorg-server/hw/xwin/winshadddnl.c b/xorg-server/hw/xwin/winshadddnl.c index cb326dc..48599b2 100644 --- a/xorg-server/hw/xwin/winshadddnl.c +++ b/xorg-server/hw/xwin/winshadddnl.c @@ -184,7 +184,7 @@ winReleasePrimarySurfaceShadowDDNL(ScreenPtr pScreen) /* * Create a DirectDraw surface for the shadow framebuffer; also create * a primary surface object so we can blit to the display. - * + * * Install a DirectDraw clipper on our primary surface object * that clips our blits to the unobscured client area of our display window. */ @@ -216,7 +216,7 @@ winAllocateFBShadowDDNL(ScreenPtr pScreen) } /* - * Initialize the framebuffer memory so we don't get a + * Initialize the framebuffer memory so we don't get a * strange display at startup */ ZeroMemory(lpSurface, pScreenInfo->dwPaddedWidth * pScreenInfo->dwHeight); @@ -545,7 +545,7 @@ winShadowUpdateDDNL(ScreenPtr pScreen, shadowBufPtr pBuf) /* * Handle small regions with multiple blits, - * handle large regions by creating a clipping region and + * handle large regions by creating a clipping region and * doing a single blit constrained to that clipping region. */ if (pScreenInfo->dwClipUpdatesNBoxes == 0 @@ -988,7 +988,7 @@ winRedrawScreenShadowDDNL(ScreenPtr pScreen) /* Return immediately if we didn't get needed surfaces */ if (!pScreenPriv->pddsPrimary4 || !pScreenPriv->pddsShadow4) - return; + return FALSE; /* Get the origin of the window in the screen coords */ ptOrigin.x = pScreenInfo->dwXOffset; diff --git a/xorg-server/hw/xwin/winshadgdi.c b/xorg-server/hw/xwin/winshadgdi.c index 5c815eb..3d222ad 100644 --- a/xorg-server/hw/xwin/winshadgdi.c +++ b/xorg-server/hw/xwin/winshadgdi.c @@ -155,7 +155,7 @@ winQueryRGBBitsAndMasks(ScreenPtr pScreen) /* Color masks for 8 bpp are standardized */ if (GetDeviceCaps(pScreenPriv->hdcScreen, RASTERCAPS) & RC_PALETTE) { - /* + /* * RGB BPP for 8 bit palletes is always 8 * and the color masks are always 0. */ @@ -381,7 +381,7 @@ winAllocateFBShadowGDI(ScreenPtr pScreen) #if 0 return FALSE; #else - /* ago: ignore this error. The blit fails with wine, but does not + /* ago: ignore this error. The blit fails with wine, but does not * cause any problems later. */ fReturn = TRUE; @@ -474,7 +474,7 @@ winShadowUpdateGDI(ScreenPtr pScreen, shadowBufPtr pBuf) /* * Handle small regions with multiple blits, - * handle large regions by creating a clipping region and + * handle large regions by creating a clipping region and * doing a single blit constrained to that clipping region. */ if (!pScreenInfo->fMultiWindow && @@ -634,7 +634,7 @@ winCloseScreenShadowGDI(ScreenPtr pScreen) /* * 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. @@ -815,7 +815,7 @@ winActivateAppShadowGDI(ScreenPtr pScreen) */ if (pScreenPriv->fActive && pScreenInfo->fFullScreen) { /* - * Activating, attempt to bring our window + * Activating, attempt to bring our window * to the top of the display */ ShowWindow(pScreenPriv->hwndScreen, SW_RESTORE); diff --git a/xorg-server/hw/xwin/winwin32rootlesswndproc.c b/xorg-server/hw/xwin/winwin32rootlesswndproc.c index 001d0d2..f65811c 100644 --- a/xorg-server/hw/xwin/winwin32rootlesswndproc.c +++ b/xorg-server/hw/xwin/winwin32rootlesswndproc.c @@ -147,7 +147,7 @@ ConstrainSize(WinXSizeHints hints, int *widthp, int *heightp) * * minAspectX * dheight > minAspectY * dwidth * maxAspectX * dheight < maxAspectY * dwidth - * + * */ if (hints.flags & PAspect) { diff --git a/xorg-server/hw/xwin/winwindowswm.c b/xorg-server/hw/xwin/winwindowswm.c index 2805ff7..db41d6b 100644 --- a/xorg-server/hw/xwin/winwindowswm.c +++ b/xorg-server/hw/xwin/winwindowswm.c @@ -284,7 +284,7 @@ ProcWindowsWMReenableUpdate(ClientPtr client) { REQUEST_SIZE_MATCH(xWindowsWMReenableUpdateReq); - //winEnableUpdate(); + //winEnableUpdate(); return Success; } diff --git a/xorg-server/hw/xwin/winwndproc.c b/xorg-server/hw/xwin/winwndproc.c index 1b09921..0c434c9 100644 --- a/xorg-server/hw/xwin/winwndproc.c +++ b/xorg-server/hw/xwin/winwndproc.c @@ -403,7 +403,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) SetScrollInfo(hwnd, SB_VERT, &si, TRUE); /* - * NOTE: Scrollbars may have moved if they were at the + * NOTE: Scrollbars may have moved if they were at the * far right/bottom, so we query their current position. */ @@ -621,7 +621,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) int iBorderHeight, iBorderWidth; #if CYGDEBUG - winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n", + winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n", s_pScreenInfo); #endif @@ -1053,12 +1053,12 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) if (winIsFakeCtrl_L(message, wParam, lParam)) return 0; - /* + /* * Discard presses generated from Windows auto-repeat */ if (lParam & (1 << 30)) { switch (wParam) { - /* ago: Pressing LControl while RControl is pressed is + /* ago: Pressing LControl while RControl is pressed is * Indicated as repeat. Fix this! */ case VK_CONTROL: diff --git a/xorg-server/include/closure.h b/xorg-server/include/closure.h index 0a7dae6..0d941df 100644 --- a/xorg-server/include/closure.h +++ b/xorg-server/include/closure.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/colormap.h b/xorg-server/include/colormap.h index b89bbe1..5f6b97f 100644 --- a/xorg-server/include/colormap.h +++ b/xorg-server/include/colormap.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h index ac0c62e..53b61cb 100644 --- a/xorg-server/include/colormapst.h +++ b/xorg-server/include/colormapst.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/cursor.h b/xorg-server/include/cursor.h index 1e483ac..281d88b 100644 --- a/xorg-server/include/cursor.h +++ b/xorg-server/include/cursor.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/cursorstr.h b/xorg-server/include/cursorstr.h index 2157954..221cd70 100644 --- a/xorg-server/include/cursorstr.h +++ b/xorg-server/include/cursorstr.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -49,7 +49,7 @@ SOFTWARE. #include "cursor.h" #include "privates.h" -/* +/* * device-independent cursor storage */ diff --git a/xorg-server/include/dbus-core.h b/xorg-server/include/dbus-core.h index b2d6d1b..d6260dc 100644 --- a/xorg-server/include/dbus-core.h +++ b/xorg-server/include/dbus-core.h @@ -27,7 +27,7 @@ #define DBUS_CORE_H #ifdef NEED_DBUS -typedef struct DBusConnection DBusConnection; +#include <dbus/dbus.h> typedef void (*dbus_core_connect_hook) (DBusConnection * connection, void *data); diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h index 116da2e..991a3ce 100644 --- a/xorg-server/include/dix.h +++ b/xorg-server/include/dix.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/extension.h b/xorg-server/include/extension.h index 7c09af1..a4c09de 100644 --- a/xorg-server/include/extension.h +++ b/xorg-server/include/extension.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/extnsionst.h b/xorg-server/include/extnsionst.h index fbdb73c..636f0a8 100644 --- a/xorg-server/include/extnsionst.h +++ b/xorg-server/include/extnsionst.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -72,7 +72,7 @@ typedef struct _ExtensionEntry { PrivateRec *devPrivates; } ExtensionEntry; -/* +/* * The arguments may be different for extension event swapping functions. * Deal with this by casting when initializing the event's EventSwapVector[] * entries. diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h index eb0a583..53f9c29 100644 --- a/xorg-server/include/gc.h +++ b/xorg-server/include/gc.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h index 6358b8c..e48d610 100644 --- a/xorg-server/include/gcstruct.h +++ b/xorg-server/include/gcstruct.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -254,16 +254,15 @@ typedef struct _GC { unsigned int arcMode:1; unsigned int subWindowMode:1; unsigned int graphicsExposures:1; - unsigned int clientClipType:2; /* CT_<kind> */ unsigned int miTranslate:1; /* should mi things translate? */ unsigned int tileIsPixel:1; /* tile is solid pixel */ unsigned int fExpose:1; /* Call exposure handling */ unsigned int freeCompClip:1; /* Free composite clip */ unsigned int scratch_inuse:1; /* is this GC in a pool for reuse? */ - unsigned int unused:13; /* see comment above */ - unsigned long planemask; - unsigned long fgPixel; - unsigned long bgPixel; + unsigned int unused:15; /* see comment above */ + unsigned int planemask; + unsigned int fgPixel; + unsigned int bgPixel; /* * alas -- both tile and stipple must be here as they * are independently specifiable @@ -271,11 +270,11 @@ typedef struct _GC { PixUnion tile; PixmapPtr stipple; DDXPointRec patOrg; /* origin for (tile, stipple) */ - struct _Font *font; DDXPointRec clipOrg; - void *clientClip; - unsigned long stateChanges; /* masked with GC_<kind> */ - unsigned long serialNumber; + struct _Font *font; + RegionPtr clientClip; + unsigned int stateChanges; /* masked with GC_<kind> */ + unsigned int serialNumber; const GCFuncs *funcs; const GCOps *ops; PrivateRec *devPrivates; diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 35ceafa..bf22dc7 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index f6cfb04..568f5f9 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -159,7 +159,7 @@ typedef struct _OtherInputMasks { */ #define MasksPerDetailMask 8 /* 256 keycodes and 256 possible - modifier combinations, but only + modifier combinations, but only 3 buttons. */ typedef struct _DetailRec { /* Grab details may be bit masks */ @@ -174,9 +174,9 @@ union _GrabMask { }; /** - * Central struct for device grabs. + * Central struct for device grabs. * The same struct is used for both core grabs and device grabs, with - * different fields being set. + * different fields being set. * If the grab is a core grab (GrabPointer/GrabKeyboard), then the eventMask * is a combination of standard event masks (i.e. PointerMotionMask | * ButtonPressMask). diff --git a/xorg-server/include/list.h b/xorg-server/include/list.h index 455c670..39f1985 100644 --- a/xorg-server/include/list.h +++ b/xorg-server/include/list.h @@ -117,7 +117,7 @@ struct xorg_list { * Example: * xorg_list_init(&bar->list_of_foos); * - * @param The list to initialized. + * @param list The list to initialize */ static inline void xorg_list_init(struct xorg_list *list) diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h index 9c2f573..9b1c03a 100644 --- a/xorg-server/include/misc.h +++ b/xorg-server/include/misc.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. Copyright 1992, 1993 Data General Corporation; -Copyright 1992, 1993 OMRON Corporation +Copyright 1992, 1993 OMRON Corporation Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted without fee, provided that the @@ -51,9 +51,9 @@ above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that neither the name OMRON or DATA GENERAL be used in advertising or publicity pertaining to distribution of the software without specific, written prior -permission of the party whose name is to be used. Neither OMRON or +permission of the party whose name is to be used. Neither OMRON or DATA GENERAL make any representation about the suitability of this software -for any purpose. It is provided "as is" without express or implied warranty. +for any purpose. It is provided "as is" without express or implied warranty. OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, @@ -67,7 +67,7 @@ OF THIS SOFTWARE. #ifndef MISC_H #define MISC_H 1 /* - * X internal definitions + * X internal definitions * */ @@ -138,7 +138,7 @@ lswapl(uint32_t x) static inline uint16_t lswaps(uint16_t x) { - return ((x & 0xff) << 8) | ((x >> 8) & 0xff); + return (uint16_t)((x & 0xff) << 8) | ((x >> 8) & 0xff); } #undef min diff --git a/xorg-server/include/miscstruct.h b/xorg-server/include/miscstruct.h index dbab10f..589a6cb 100644 --- a/xorg-server/include/miscstruct.h +++ b/xorg-server/include/miscstruct.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h index e4ec4b1..3e68c49 100644 --- a/xorg-server/include/os.h +++ b/xorg-server/include/os.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h index 4b8fc24..9656c3a 100644 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h index 2bdff98..380e483 100644 --- a/xorg-server/include/pixmapstr.h +++ b/xorg-server/include/pixmapstr.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -67,7 +67,7 @@ typedef struct _Drawable { } DrawableRec; /* - * PIXMAP -- device dependent + * PIXMAP -- device dependent */ typedef struct _Pixmap { diff --git a/xorg-server/include/property.h b/xorg-server/include/property.h index cae4471..e350513 100644 --- a/xorg-server/include/property.h +++ b/xorg-server/include/property.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/propertyst.h b/xorg-server/include/propertyst.h index da99576..d8ca840 100644 --- a/xorg-server/include/propertyst.h +++ b/xorg-server/include/propertyst.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -49,7 +49,7 @@ SOFTWARE. #include "misc.h" #include "property.h" #include "privates.h" -/* +/* * PROPERTY -- property element */ diff --git a/xorg-server/include/region.h b/xorg-server/include/region.h index 11dd59e..14d283f 100644 --- a/xorg-server/include/region.h +++ b/xorg-server/include/region.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h index 4a0725d..515e93f 100644 --- a/xorg-server/include/regionstr.h +++ b/xorg-server/include/regionstr.h @@ -125,7 +125,7 @@ RegionEnd(RegionPtr reg) } static inline size_t -RegionSizeof(int n) +RegionSizeof(size_t n) { return (sizeof(RegDataRec) + ((n) * sizeof(BoxRec))); } diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index fe56bb2..772f363 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -26,13 +26,13 @@ Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -50,7 +50,7 @@ SOFTWARE. #include "dixaccess.h" /***************************************************************** - * STUFF FOR RESOURCES + * STUFF FOR RESOURCES *****************************************************************/ /* classes for Resource routines */ diff --git a/xorg-server/include/rgb.h b/xorg-server/include/rgb.h index ddfb1d8..449bc54 100644 --- a/xorg-server/include/rgb.h +++ b/xorg-server/include/rgb.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/screenint.h b/xorg-server/include/screenint.h index e61cd33..e383848 100644 --- a/xorg-server/include/screenint.h +++ b/xorg-server/include/screenint.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h index 269ff5a..faf0563 100644 --- a/xorg-server/include/scrnintstr.h +++ b/xorg-server/include/scrnintstr.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/selection.h b/xorg-server/include/selection.h index 37e4f5e..7a516f1 100644 --- a/xorg-server/include/selection.h +++ b/xorg-server/include/selection.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -51,7 +51,7 @@ SOFTWARE. #include "privates.h" /* - * Selection data structures + * Selection data structures */ typedef struct _Selection { diff --git a/xorg-server/include/servermd.h b/xorg-server/include/servermd.h index c88a542..a3b5c3a 100644 --- a/xorg-server/include/servermd.h +++ b/xorg-server/include/servermd.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -86,7 +86,7 @@ SOFTWARE. #endif #include <X11/Xfuncproto.h> -/* +/* * This returns the number of padding units, for depth d and width w. * For bitmaps this can be calculated with the macros above. * Other depths require either grovelling over the formats field of the diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h index 25caabb..9bd8e2f 100644 --- a/xorg-server/include/site.h +++ b/xorg-server/include/site.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -66,8 +66,8 @@ SOFTWARE. /* * The following constants are provided solely as a last line of defense. The * normal build ALWAYS overrides them using a special rule given in - * server/dix/Imakefile. If you want to change either of these constants, - * you should set the DefaultFontPath or DefaultRGBDatabase configuration + * server/dix/Imakefile. If you want to change either of these constants, + * you should set the DefaultFontPath or DefaultRGBDatabase configuration * parameters. * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE! */ @@ -76,7 +76,7 @@ SOFTWARE. #endif /* - * The following constants contain default values for all of the variables + * The following constants contain default values for all of the variables * that can be initialized on the server command line or in the environment. */ #define COMPILEDDEFAULTFONT "fixed" diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h index c123728..6daec85 100644 --- a/xorg-server/include/window.h +++ b/xorg-server/include/window.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h index 740f4a6..53eef37 100644 --- a/xorg-server/include/windowstr.h +++ b/xorg-server/include/windowstr.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/include/xkbfile.h b/xorg-server/include/xkbfile.h index 9f3b04c..f93d31a 100644 --- a/xorg-server/include/xkbfile.h +++ b/xorg-server/include/xkbfile.h @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index a4878fc..cc6307a 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/include/xkbstr.h b/xorg-server/include/xkbstr.h index 935330c..8d71557 100644 --- a/xorg-server/include/xkbstr.h +++ b/xorg-server/include/xkbstr.h @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -417,7 +417,7 @@ typedef struct _XkbKeyAliasRec { } XkbKeyAliasRec, *XkbKeyAliasPtr; /* - * Names for everything + * Names for everything */ typedef struct _XkbNamesRec { Atom keycodes; @@ -554,7 +554,7 @@ typedef struct _XkbChanges { } XkbChangesRec, *XkbChangesPtr; /* - * These data structures are used to construct a keymap from + * These data structures are used to construct a keymap from * a set of components or to list components in the server * database. */ @@ -587,8 +587,8 @@ typedef struct _XkbComponentList { } XkbComponentListRec, *XkbComponentListPtr; /* - * The following data structures describe and track changes to a - * non-keyboard extension device + * The following data structures describe and track changes to a + * non-keyboard extension device */ typedef struct _XkbDeviceLedInfo { unsigned short led_class; diff --git a/xorg-server/include/xsha1.h b/xorg-server/include/xsha1.h index aab7106..60c6a90 100644 --- a/xorg-server/include/xsha1.h +++ b/xorg-server/include/xsha1.h @@ -12,7 +12,7 @@ int x_sha1_update(void *ctx, void *data, int size); /* * Place the hash in result, and free ctx. - * Returns 0 on error, 1 on success. + * Returns 0 on error, 1 on success. */ int x_sha1_final(void *ctx, unsigned char result[20]); diff --git a/xorg-server/mi/Makefile.am b/xorg-server/mi/Makefile.am index 0cef779..110c3f5 100644 --- a/xorg-server/mi/Makefile.am +++ b/xorg-server/mi/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libmi.la if XORG sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \ - migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \ - mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h + migc.h mipointrst.h mizerarc.h micoord.h \ + mistruct.h mioverlay.h endif AM_CFLAGS = $(DIX_CFLAGS) @@ -16,7 +16,6 @@ libmi_la_SOURCES = \ micmap.h \ micoord.h \ micopy.c \ - micursor.c \ midash.c \ midispcur.c \ mieq.c \ @@ -24,7 +23,6 @@ libmi_la_SOURCES = \ mifillarc.c \ mifillarc.h \ mifillrct.c \ - mifpolycon.c \ mifpoly.h \ migc.c \ migc.h \ @@ -37,18 +35,13 @@ libmi_la_SOURCES = \ mipointrst.h \ mipoly.c \ mipoly.h \ - mipolycon.c \ - mipolygen.c \ mipolypnt.c \ mipolyrect.c \ mipolyseg.c \ mipolytext.c \ - mipolyutil.c \ mipushpxl.c \ miscanfill.h \ miscrinit.c \ - mispans.c \ - mispans.h \ misprite.c \ misprite.h \ mistruct.h \ diff --git a/xorg-server/mi/mi.h b/xorg-server/mi/mi.h index 5a455c9..db62c91 100644 --- a/xorg-server/mi/mi.h +++ b/xorg-server/mi/mi.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -288,22 +288,6 @@ extern _X_EXPORT void miFillPolygon(DrawablePtr /*dst */ , DDXPointPtr /*pPts */ ); -/* mipolycon.c */ - -extern _X_EXPORT Bool miFillConvexPoly(DrawablePtr /*dst */ , - GCPtr /*pgc */ , - int /*count */ , - DDXPointPtr /*ptsIn */ - ); - -/* mipolygen.c */ - -extern _X_EXPORT Bool miFillGeneralPoly(DrawablePtr /*dst */ , - GCPtr /*pgc */ , - int /*count */ , - DDXPointPtr /*ptsIn */ - ); - /* mipolypnt.c */ extern _X_EXPORT void miPolyPoint(DrawablePtr /*pDrawable */ , diff --git a/xorg-server/mi/miarc.c b/xorg-server/mi/miarc.c index e55108a..e8bc87e 100644 --- a/xorg-server/mi/miarc.c +++ b/xorg-server/mi/miarc.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -63,6 +63,22 @@ SOFTWARE. #include "mifillarc.h" #include <X11/Xfuncproto.h> +#define EPSILON 0.000001 +#define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON) +#define UNEQUAL(a,b) (fabs((a) - (b)) > EPSILON) +#define PTISEQUAL(a,b) (ISEQUAL(a.x,b.x) && ISEQUAL(a.y,b.y)) +#define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */ + +/* Point with sub-pixel positioning. */ +typedef struct _SppPoint { + double x, y; +} SppPointRec, *SppPointPtr; + +typedef struct _SppArc { + double x, y, width, height; + double angle1, angle2; +} SppArcRec, *SppArcPtr; + static double miDsin(double a); static double miDcos(double a); static double miDasin(double v); @@ -82,7 +98,7 @@ cbrt(double x) /* * some interesting sematic interpretation of the protocol: * - * Self intersecting arcs (i.e. those spanning 360 degrees) + * Self intersecting arcs (i.e. those spanning 360 degrees) * never join with other arcs, and are drawn without caps * (unless on/off dashed, in which case each dash segment * is capped, except when the last segment meets the @@ -99,21 +115,6 @@ cbrt(double x) * */ -#undef max -#undef min - -_X_INLINE static int -max(const int x, const int y) -{ - return x > y ? x : y; -} - -_X_INLINE static int -min(const int x, const int y) -{ - return x < y ? x : y; -} - struct bound { double min, max; }; @@ -353,7 +354,7 @@ of the two quadratics y^2 + ((b+A)/2)y + (Z + (bZ - d)/A) = 0 -where +where A = +/- sqrt(8Z + b^2 - 4c) b, c, d are the cubic, quadratic, and linear coefficients of the quartic @@ -1110,6 +1111,195 @@ miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs) } } +/* Find the index of the point with the smallest y.also return the + * smallest and largest y */ +static int +GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, int *by, int *ty) +{ + SppPointPtr ptMin; + double ymin, ymax; + SppPointPtr ptsStart = pts; + + ptMin = pts; + ymin = ymax = (pts++)->y; + + while (--n > 0) { + if (pts->y < ymin) { + ptMin = pts; + ymin = pts->y; + } + if (pts->y > ymax) + ymax = pts->y; + + pts++; + } + + *by = ICEIL(ymin + yFtrans); + *ty = ICEIL(ymax + yFtrans - 1); + return ptMin - ptsStart; +} + +/* + * miFillSppPoly written by Todd Newman; April. 1987. + * + * Fill a convex polygon. If the given polygon + * is not convex, then the result is undefined. + * The algorithm is to order the edges from smallest + * y to largest by partitioning the array into a left + * edge list and a right edge list. The algorithm used + * to traverse each edge is digital differencing analyzer + * line algorithm with y as the major axis. There's some funny linear + * interpolation involved because of the subpixel postioning. + */ +static void +miFillSppPoly(DrawablePtr dst, GCPtr pgc, int count, /* number of points */ + SppPointPtr ptsIn, /* the points */ + int xTrans, int yTrans, /* Translate each point by this */ + double xFtrans, double yFtrans /* translate before conversion + by this amount. This provides + a mechanism to match rounding + errors with any shape that must + meet the polygon exactly. + */ + ) +{ + double xl = 0.0, xr = 0.0, /* x vals of left and right edges */ + ml = 0.0, /* left edge slope */ + mr = 0.0, /* right edge slope */ + dy, /* delta y */ + i; /* loop counter */ + int y, /* current scanline */ + j, imin, /* index of vertex with smallest y */ + ymin, /* y-extents of polygon */ + ymax, *width, *FirstWidth, /* output buffer */ + *Marked; /* set if this vertex has been used */ + int left, right, /* indices to first endpoints */ + nextleft, nextright; /* indices to second endpoints */ + DDXPointPtr ptsOut, FirstPoint; /* output buffer */ + + if (pgc->miTranslate) { + xTrans += dst->x; + yTrans += dst->y; + } + + imin = GetFPolyYBounds(ptsIn, count, yFtrans, &ymin, &ymax); + + y = ymax - ymin + 1; + if ((count < 3) || (y <= 0)) + return; + ptsOut = FirstPoint = malloc(sizeof(DDXPointRec) * y); + width = FirstWidth = malloc(sizeof(int) * y); + Marked = malloc(sizeof(int) * count); + + if (!ptsOut || !width || !Marked) { + free(Marked); + free(width); + free(ptsOut); + return; + } + + for (j = 0; j < count; j++) + Marked[j] = 0; + nextleft = nextright = imin; + Marked[imin] = -1; + y = ICEIL(ptsIn[nextleft].y + yFtrans); + + /* + * loop through all edges of the polygon + */ + do { + /* add a left edge if we need to */ + if ((y > (ptsIn[nextleft].y + yFtrans) || + ISEQUAL(y, ptsIn[nextleft].y + yFtrans)) && + Marked[nextleft] != 1) { + Marked[nextleft]++; + left = nextleft++; + + /* find the next edge, considering the end conditions */ + if (nextleft >= count) + nextleft = 0; + + /* now compute the starting point and slope */ + dy = ptsIn[nextleft].y - ptsIn[left].y; + if (dy != 0.0) { + ml = (ptsIn[nextleft].x - ptsIn[left].x) / dy; + dy = y - (ptsIn[left].y + yFtrans); + xl = (ptsIn[left].x + xFtrans) + ml * max(dy, 0); + } + } + + /* add a right edge if we need to */ + if ((y > ptsIn[nextright].y + yFtrans) || + (ISEQUAL(y, ptsIn[nextright].y + yFtrans) + && Marked[nextright] != 1)) { + Marked[nextright]++; + right = nextright--; + + /* find the next edge, considering the end conditions */ + if (nextright < 0) + nextright = count - 1; + + /* now compute the starting point and slope */ + dy = ptsIn[nextright].y - ptsIn[right].y; + if (dy != 0.0) { + mr = (ptsIn[nextright].x - ptsIn[right].x) / dy; + dy = y - (ptsIn[right].y + yFtrans); + xr = (ptsIn[right].x + xFtrans) + mr * max(dy, 0); + } + } + + /* + * generate scans to fill while we still have + * a right edge as well as a left edge. + */ + i = (min(ptsIn[nextleft].y, ptsIn[nextright].y) + yFtrans) - y; + + if (i < EPSILON) { + if (Marked[nextleft] && Marked[nextright]) { + /* Arrgh, we're trapped! (no more points) + * Out, we've got to get out of here before this decadence saps + * our will completely! */ + break; + } + continue; + } + else { + j = (int) i; + if (!j) + j++; + } + while (j > 0) { + int cxl, cxr; + + ptsOut->y = (y) + yTrans; + + cxl = ICEIL(xl); + cxr = ICEIL(xr); + /* reverse the edges if necessary */ + if (xl < xr) { + *(width++) = cxr - cxl; + (ptsOut++)->x = cxl + xTrans; + } + else { + *(width++) = cxl - cxr; + (ptsOut++)->x = cxr + xTrans; + } + y++; + + /* increment down the edges */ + xl += ml; + xr += mr; + j--; + } + } while (y <= ymax); + + /* Finally, fill the spans we've collected */ + (*pgc->ops->FillSpans) (dst, pgc, + ptsOut - FirstPoint, FirstPoint, FirstWidth, 1); + free(Marked); + free(FirstWidth); + free(FirstPoint); +} static double angleBetween(SppPointRec center, SppPointRec point1, SppPointRec point2) { @@ -1291,7 +1481,7 @@ miArcCap(DrawablePtr pDraw, /* MIROUNDCAP -- a private helper function * Put Rounded cap on end. pCenter is the center of this end of the line * pEnd is the center of the other end of the line. pCorner is one of the - * two corners at this end of the line. + * two corners at this end of the line. * NOTE: pOtherCorner must be counter-clockwise from pCorner. */ /*ARGSUSED*/ static void @@ -1443,7 +1633,7 @@ miDatan2(double dy, double dx) * array. (For example, if we want to leave a spare point to make sectors * instead of segments.) So we pass in the malloc()ed chunk that contains the * array and an index saying where we should start stashing the points. - * If there isn't an array already, we just pass in a null pointer and + * If there isn't an array already, we just pass in a null pointer and * count on realloc() to handle the null pointer correctly. */ static int @@ -1462,7 +1652,7 @@ miGetArcPts(SppArcPtr parc, /* points to an arc */ SppPointPtr poly; /* The spec says that positive angles indicate counterclockwise motion. - * Given our coordinate system (with 0,0 in the upper left corner), + * Given our coordinate system (with 0,0 in the upper left corner), * the screen appears flipped in Y. The easiest fix is to negate the * angles given */ @@ -2548,7 +2738,7 @@ computeBound(struct arc_def *def, } /* - * this section computes the x value of the span at y + * this section computes the x value of the span at y * intersected with the specified face of the ellipse. * * this is the min/max X value over the set of normal @@ -2561,7 +2751,7 @@ computeBound(struct arc_def *def, * * compute the derivative with-respect-to ellipse_y and solve * for zero: - * + * * (w^2 - h^2) ellipse_y^3 + h^4 y * 0 = - ---------------------------------- * h w ellipse_y^2 sqrt (h^2 - ellipse_y^2) @@ -2588,7 +2778,7 @@ computeBound(struct arc_def *def, * * or (to use accelerators), * - * y0^3 (h^2 - w^2) - h^2 y (3y0^2 - 2h^2) + * y0^3 (h^2 - w^2) - h^2 y (3y0^2 - 2h^2) * */ diff --git a/xorg-server/mi/mibitblt.c b/xorg-server/mi/mibitblt.c index 114f72d..7243963 100644 --- a/xorg-server/mi/mibitblt.c +++ b/xorg-server/mi/mibitblt.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -66,7 +66,7 @@ SOFTWARE. extern int ffs(int); #endif -/* MICOPYAREA -- public entry for the CopyArea request +/* MICOPYAREA -- public entry for the CopyArea request * For each rectangle in the source region * get the pixels with GetSpans * set them in the destination with SetSpans @@ -253,7 +253,7 @@ miCopyArea(DrawablePtr pSrcDrawable, } /* MIGETPLANE -- gets a bitmap representing one plane of pDraw - * A helper used for CopyPlane and XY format GetImage + * A helper used for CopyPlane and XY format GetImage * No clever strategy here, we grab a scanline at a time, pull out the * bits and then stuff them in a 1 bit deep map. */ @@ -358,9 +358,9 @@ miGetPlane(DrawablePtr pDraw, int planeNum, /* number of the bitPlane */ } /* MIOPQSTIPDRAWABLE -- use pbits as an opaque stipple for pDraw. - * Drawing through the clip mask we SetSpans() the bits into a + * Drawing through the clip mask we SetSpans() the bits into a * bitmap and stipple those bits onto the destination drawable by doing a - * PolyFillRect over the whole drawable, + * PolyFillRect over the whole drawable, * then we invert the bitmap by copying it onto itself with an alu of * GXinvert, invert the foreground/background colors of the gc, and draw * the background bits. @@ -504,10 +504,10 @@ miOpqStipDrawable(DrawablePtr pDraw, GCPtr pGC, RegionPtr prgnSrc, } /* MICOPYPLANE -- public entry for the CopyPlane request. - * strategy: - * First build up a bitmap out of the bits requested + * strategy: + * First build up a bitmap out of the bits requested * build a source clip - * Use the bitmap we've built up as a Stipple for the destination + * Use the bitmap we've built up as a Stipple for the destination */ _X_COLD RegionPtr miCopyPlane(DrawablePtr pSrcDrawable, @@ -670,16 +670,16 @@ miGetImage(DrawablePtr pDraw, int sx, int sy, int w, int h, /* MIPUTIMAGE -- public entry for the PutImage request * Here we benefit from knowing the format of the bits pointed to by pImage, - * even if we don't know how pDraw represents them. - * Three different strategies are used depending on the format + * even if we don't know how pDraw represents them. + * Three different strategies are used depending on the format * XYBitmap Format: * we just use the Opaque Stipple helper function to cover the destination - * Note that this covers all the planes of the drawable with the + * Note that this covers all the planes of the drawable with the * foreground color (masked with the GC planemask) where there are 1 bits * and the background color (masked with the GC planemask) where there are * 0 bits * XYPixmap format: - * what we're called with is a series of XYBitmaps, but we only want + * what we're called with is a series of XYBitmaps, but we only want * each XYPixmap to update 1 plane, instead of updating all of them. * we set the foreground color to be all 1s and the background to all 0s * then for each plane, we set the plane mask to only effect that one diff --git a/xorg-server/mi/micopy.c b/xorg-server/mi/micopy.c index a52b0a7..2409c78 100644 --- a/xorg-server/mi/micopy.c +++ b/xorg-server/mi/micopy.c @@ -167,7 +167,7 @@ miDoCopy(DrawablePtr pSrcDrawable, /* Compute source clip region */ if (pSrcDrawable->type == DRAWABLE_PIXMAP) { - if ((pSrcDrawable == pDstDrawable) && (pGC->clientClipType == CT_NONE)) + if ((pSrcDrawable == pDstDrawable) && (!pGC->clientClip)) prgnSrcClip = miGetCompositeClip(pGC); else fastSrc = TRUE; @@ -186,8 +186,7 @@ miDoCopy(DrawablePtr pSrcDrawable, */ fastSrc = TRUE; } - else if ((pSrcDrawable == pDstDrawable) && - (pGC->clientClipType == CT_NONE)) { + else if ((pSrcDrawable == pDstDrawable) && (!pGC->clientClip)) { prgnSrcClip = miGetCompositeClip(pGC); } else { diff --git a/xorg-server/mi/micursor.c b/xorg-server/mi/micursor.c deleted file mode 100644 index 13ce776..0000000 --- a/xorg-server/mi/micursor.c +++ /dev/null @@ -1,68 +0,0 @@ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "scrnintstr.h" -#include "cursor.h" -#include "misc.h" -#include "mi.h" -#include "inputstr.h" - -void -miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, - CursorPtr pCurs, Bool displayed) -{ - /* - * This is guaranteed to correct any color-dependent state which may have - * been bound up in private state created by RealizeCursor - */ - pScr->UnrealizeCursor(pDev, pScr, pCurs); - pScr->RealizeCursor(pDev, pScr, pCurs); - if (displayed) - pScr->DisplayCursor(pDev, pScr, pCurs); -} diff --git a/xorg-server/mi/midash.c b/xorg-server/mi/midash.c index 78cbaf2..08f11aa 100644 --- a/xorg-server/mi/midash.c +++ b/xorg-server/mi/midash.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -49,7 +49,6 @@ SOFTWARE. #include "regionstr.h" #include "mistruct.h" -#include "mifpoly.h" void miStepDash(int dist, /* distance to step */ diff --git a/xorg-server/mi/midispcur.c b/xorg-server/mi/midispcur.c index 8cca5fe..50f0dd2 100644 --- a/xorg-server/mi/midispcur.c +++ b/xorg-server/mi/midispcur.c @@ -78,9 +78,9 @@ typedef struct { (miDCBufferPtr)dixLookupScreenPrivate(&dev->devPrivates, miDCDeviceKey, screen) : \ (miDCBufferPtr)dixLookupScreenPrivate(&GetMaster(dev, MASTER_POINTER)->devPrivates, miDCDeviceKey, screen)) -/* +/* * The core pointer buffer will point to the index of the virtual pointer - * in the pCursorBuffers array. + * in the pCursorBuffers array. */ typedef struct { CloseScreenProcPtr CloseScreen; diff --git a/xorg-server/mi/miexpose.c b/xorg-server/mi/miexpose.c index de8ee6c..fc4dbc0 100644 --- a/xorg-server/mi/miexpose.c +++ b/xorg-server/mi/miexpose.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -107,7 +107,7 @@ the region package can call this. #define RECTLIMIT 25 /* pick a number, any number > 8 */ #endif -/* miHandleExposures +/* miHandleExposures generate a region for exposures for areas that were copied from obscured or non-existent areas to non-obscured areas of the destination. Paint the background for the region, if the destination is a window. @@ -131,8 +131,8 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, RegionRec rgnExposed; /* exposed region, calculated source- relative, made dst relative to intersect with visible parts of - dest and send events to client, - and then screen relative to paint + dest and send events to client, + and then screen relative to paint the window background */ WindowPtr pSrcWin; @@ -230,7 +230,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, RegionIntersect(&rgnExposed, &rgnExposed, prgnDstClip); /* intersect with client clip region. */ - if (pGC->clientClipType == CT_REGION) + if (pGC->clientClip) RegionIntersect(&rgnExposed, &rgnExposed, pGC->clientClip); /* @@ -564,7 +564,7 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what) } /* MICLEARDRAWABLE -- sets the entire drawable to the background color of - * the GC. Useful when we have a scratch drawable and need to initialize + * the GC. Useful when we have a scratch drawable and need to initialize * it. */ void miClearDrawable(DrawablePtr pDraw, GCPtr pGC) diff --git a/xorg-server/mi/mifillarc.c b/xorg-server/mi/mifillarc.c index 08484d7..246d70f 100644 --- a/xorg-server/mi/mifillarc.c +++ b/xorg-server/mi/mifillarc.c @@ -36,7 +36,6 @@ Author: Bob Scheifler, MIT X Consortium #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" -#include "mifpoly.h" #include "mi.h" #include "mifillarc.h" @@ -51,7 +50,7 @@ Author: Bob Scheifler, MIT X Consortium #define Dsin(d) sin((double)d*(M_PI/11520.0)) #define Dcos(d) cos((double)d*(M_PI/11520.0)) -void +static void miFillArcSetup(xArc * arc, miFillArcRec * info) { info->y = arc->height >> 1; @@ -277,7 +276,7 @@ miGetPieEdge(xArc * arc, int angle, miSliceEdgePtr edge, Bool top, Bool left) miGetArcEdge(arc, edge, k, top, left); } -void +static void miFillArcSliceSetup(xArc * arc, miArcSliceRec * slice, GCPtr pGC) { int angle1, angle2; diff --git a/xorg-server/mi/mifillarc.h b/xorg-server/mi/mifillarc.h index 1478d18..61ab253 100644 --- a/xorg-server/mi/mifillarc.h +++ b/xorg-server/mi/mifillarc.h @@ -175,13 +175,4 @@ typedef struct _miArcSlice { #define miFillInArcLower(slw) (((iny + dy) != 0) && \ ((slw > 1) || (ine != inxk))) -extern _X_EXPORT void miFillArcSetup(xArc * /*arc */ , - miFillArcRec * /*info */ - ); - -extern _X_EXPORT void miFillArcSliceSetup(xArc * /*arc */ , - miArcSliceRec * /*slice */ , - GCPtr /*pGC */ - ); - #endif /* __MIFILLARC_H__ */ diff --git a/xorg-server/mi/mifillrct.c b/xorg-server/mi/mifillrct.c index faf6049..28f2322 100644 --- a/xorg-server/mi/mifillrct.c +++ b/xorg-server/mi/mifillrct.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mifpoly.h b/xorg-server/mi/mifpoly.h index f853fb4..3202476 100644 --- a/xorg-server/mi/mifpoly.h +++ b/xorg-server/mi/mifpoly.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -49,24 +49,6 @@ SOFTWARE. #include <X11/Xfuncproto.h> -#define EPSILON 0.000001 -#define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON) -#define UNEQUAL(a,b) (fabs((a) - (b)) > EPSILON) -#define WITHINHALF(a, b) (((a) - (b) > 0.0) ? (a) - (b) < 0.5 : \ - (b) - (a) <= 0.5) -#define ROUNDTOINT(x) ((int) (((x) > 0.0) ? ((x) + 0.5) : ((x) - 0.5))) -#define ISZERO(x) (fabs((x)) <= EPSILON) -#define PTISEQUAL(a,b) (ISEQUAL(a.x,b.x) && ISEQUAL(a.y,b.y)) -#define PTUNEQUAL(a,b) (UNEQUAL(a.x,b.x) || UNEQUAL(a.y,b.y)) -#define PtEqual(a, b) (((a).x == (b).x) && ((a).y == (b).y)) - -#define NotEnd 0 -#define FirstEnd 1 -#define SecondEnd 2 - -#define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */ -#define D2SECANT 5.21671526231167 /* 1/2*sin(11/2) - max extension per width */ - static _X_INLINE int ICEIL(double x) { @@ -75,28 +57,4 @@ ICEIL(double x) return ((x == _cTmp) || (x < 0.0)) ? _cTmp : _cTmp + 1; } -/* Point with sub-pixel positioning. In this case we use doubles, but - * see mifpolycon.c for other suggestions - */ -typedef struct _SppPoint { - double x, y; -} SppPointRec, *SppPointPtr; - -typedef struct _SppArc { - double x, y, width, height; - double angle1, angle2; -} SppArcRec, *SppArcPtr; - -/* mifpolycon.c */ - -extern _X_EXPORT void miFillSppPoly(DrawablePtr /*dst */ , - GCPtr /*pgc */ , - int /*count */ , - SppPointPtr /*ptsIn */ , - int /*xTrans */ , - int /*yTrans */ , - double /*xFtrans */ , - double /*yFtrans */ - ); - #endif /* __MIFPOLY_H__ */ diff --git a/xorg-server/mi/mifpolycon.c b/xorg-server/mi/mifpolycon.c deleted file mode 100644 index b133731..0000000 --- a/xorg-server/mi/mifpolycon.c +++ /dev/null @@ -1,249 +0,0 @@ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include <math.h> -#include <X11/X.h> -#include "gcstruct.h" -#include "windowstr.h" -#include "pixmapstr.h" -#include "mifpoly.h" - -static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, - int *by, int *ty); - -/* - * Written by Todd Newman; April. 1987. - * - * Fill a convex polygon. If the given polygon - * is not convex, then the result is undefined. - * The algorithm is to order the edges from smallest - * y to largest by partitioning the array into a left - * edge list and a right edge list. The algorithm used - * to traverse each edge is digital differencing analyzer - * line algorithm with y as the major axis. There's some funny linear - * interpolation involved because of the subpixel postioning. - */ -void -miFillSppPoly(DrawablePtr dst, GCPtr pgc, int count, /* number of points */ - SppPointPtr ptsIn, /* the points */ - int xTrans, int yTrans, /* Translate each point by this */ - double xFtrans, double yFtrans /* translate before conversion - by this amount. This provides - a mechanism to match rounding - errors with any shape that must - meet the polygon exactly. - */ - ) -{ - double xl = 0.0, xr = 0.0, /* x vals of left and right edges */ - ml = 0.0, /* left edge slope */ - mr = 0.0, /* right edge slope */ - dy, /* delta y */ - i; /* loop counter */ - int y, /* current scanline */ - j, imin, /* index of vertex with smallest y */ - ymin, /* y-extents of polygon */ - ymax, *width, *FirstWidth, /* output buffer */ - *Marked; /* set if this vertex has been used */ - int left, right, /* indices to first endpoints */ - nextleft, nextright; /* indices to second endpoints */ - DDXPointPtr ptsOut, FirstPoint; /* output buffer */ - - if (pgc->miTranslate) { - xTrans += dst->x; - yTrans += dst->y; - } - - imin = GetFPolyYBounds(ptsIn, count, yFtrans, &ymin, &ymax); - - y = ymax - ymin + 1; - if ((count < 3) || (y <= 0)) - return; - ptsOut = FirstPoint = malloc(sizeof(DDXPointRec) * y); - width = FirstWidth = malloc(sizeof(int) * y); - Marked = malloc(sizeof(int) * count); - - if (!ptsOut || !width || !Marked) { - free(Marked); - free(width); - free(ptsOut); - return; - } - - for (j = 0; j < count; j++) - Marked[j] = 0; - nextleft = nextright = imin; - Marked[imin] = -1; - y = ICEIL(ptsIn[nextleft].y + yFtrans); - - /* - * loop through all edges of the polygon - */ - do { - /* add a left edge if we need to */ - if ((y > (ptsIn[nextleft].y + yFtrans) || - ISEQUAL(y, ptsIn[nextleft].y + yFtrans)) && - Marked[nextleft] != 1) { - Marked[nextleft]++; - left = nextleft++; - - /* find the next edge, considering the end conditions */ - if (nextleft >= count) - nextleft = 0; - - /* now compute the starting point and slope */ - dy = ptsIn[nextleft].y - ptsIn[left].y; - if (dy != 0.0) { - ml = (ptsIn[nextleft].x - ptsIn[left].x) / dy; - dy = y - (ptsIn[left].y + yFtrans); - xl = (ptsIn[left].x + xFtrans) + ml * max(dy, 0); - } - } - - /* add a right edge if we need to */ - if ((y > ptsIn[nextright].y + yFtrans) || - (ISEQUAL(y, ptsIn[nextright].y + yFtrans) - && Marked[nextright] != 1)) { - Marked[nextright]++; - right = nextright--; - - /* find the next edge, considering the end conditions */ - if (nextright < 0) - nextright = count - 1; - - /* now compute the starting point and slope */ - dy = ptsIn[nextright].y - ptsIn[right].y; - if (dy != 0.0) { - mr = (ptsIn[nextright].x - ptsIn[right].x) / dy; - dy = y - (ptsIn[right].y + yFtrans); - xr = (ptsIn[right].x + xFtrans) + mr * max(dy, 0); - } - } - - /* - * generate scans to fill while we still have - * a right edge as well as a left edge. - */ - i = (min(ptsIn[nextleft].y, ptsIn[nextright].y) + yFtrans) - y; - - if (i < EPSILON) { - if (Marked[nextleft] && Marked[nextright]) { - /* Arrgh, we're trapped! (no more points) - * Out, we've got to get out of here before this decadence saps - * our will completely! */ - break; - } - continue; - } - else { - j = (int) i; - if (!j) - j++; - } - while (j > 0) { - int cxl, cxr; - - ptsOut->y = (y) + yTrans; - - cxl = ICEIL(xl); - cxr = ICEIL(xr); - /* reverse the edges if necessary */ - if (xl < xr) { - *(width++) = cxr - cxl; - (ptsOut++)->x = cxl + xTrans; - } - else { - *(width++) = cxl - cxr; - (ptsOut++)->x = cxr + xTrans; - } - y++; - - /* increment down the edges */ - xl += ml; - xr += mr; - j--; - } - } while (y <= ymax); - - /* Finally, fill the spans we've collected */ - (*pgc->ops->FillSpans) (dst, pgc, - ptsOut - FirstPoint, FirstPoint, FirstWidth, 1); - free(Marked); - free(FirstWidth); - free(FirstPoint); -} - -/* Find the index of the point with the smallest y.also return the - * smallest and largest y */ -static - int -GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, int *by, int *ty) -{ - SppPointPtr ptMin; - double ymin, ymax; - SppPointPtr ptsStart = pts; - - ptMin = pts; - ymin = ymax = (pts++)->y; - - while (--n > 0) { - if (pts->y < ymin) { - ptMin = pts; - ymin = pts->y; - } - if (pts->y > ymax) - ymax = pts->y; - - pts++; - } - - *by = ICEIL(ymin + yFtrans); - *ty = ICEIL(ymax + yFtrans - 1); - return ptMin - ptsStart; -} diff --git a/xorg-server/mi/migc.c b/xorg-server/mi/migc.c index 9bbe884..8fdd481 100644 --- a/xorg-server/mi/migc.c +++ b/xorg-server/mi/migc.c @@ -55,20 +55,9 @@ miDestroyGC(GCPtr pGC) void miDestroyClip(GCPtr pGC) { - if (pGC->clientClipType == CT_NONE) - return; - else if (pGC->clientClipType == CT_PIXMAP) { - (*pGC->pScreen->DestroyPixmap) ((PixmapPtr) (pGC->clientClip)); - } - else { - /* - * we know we'll never have a list of rectangles, since ChangeClip - * immediately turns them into a region - */ + if (pGC->clientClip) RegionDestroy(pGC->clientClip); - } pGC->clientClip = NULL; - pGC->clientClipType = CT_NONE; } void @@ -77,8 +66,7 @@ miChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) (*pGC->funcs->DestroyClip) (pGC); if (type == CT_PIXMAP) { /* convert the pixmap to a region */ - pGC->clientClip = (void *) BitmapToRegion(pGC->pScreen, - (PixmapPtr) pvalue); + pGC->clientClip = BitmapToRegion(pGC->pScreen, (PixmapPtr) pvalue); (*pGC->pScreen->DestroyPixmap) (pvalue); } else if (type == CT_REGION) { @@ -86,34 +74,21 @@ miChangeClip(GCPtr pGC, int type, void *pvalue, int nrects) pGC->clientClip = pvalue; } else if (type != CT_NONE) { - pGC->clientClip = (void *) RegionFromRects(nrects, - (xRectangle *) pvalue, - type); + pGC->clientClip = RegionFromRects(nrects, (xRectangle *) pvalue, type); free(pvalue); } - pGC->clientClipType = (type != CT_NONE && - pGC->clientClip) ? CT_REGION : CT_NONE; pGC->stateChanges |= GCClipMask; } void miCopyClip(GCPtr pgcDst, GCPtr pgcSrc) { - RegionPtr prgnNew; - - switch (pgcSrc->clientClipType) { - case CT_PIXMAP: - ((PixmapPtr) pgcSrc->clientClip)->refcnt++; - /* Fall through !! */ - case CT_NONE: - (*pgcDst->funcs->ChangeClip) (pgcDst, (int) pgcSrc->clientClipType, - pgcSrc->clientClip, 0); - break; - case CT_REGION: - prgnNew = RegionCreate(NULL, 1); + if (pgcSrc->clientClip) { + RegionPtr prgnNew = RegionCreate(NULL, 1); RegionCopy(prgnNew, (RegionPtr) (pgcSrc->clientClip)); - (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, (void *) prgnNew, 0); - break; + (*pgcDst->funcs->ChangeClip) (pgcDst, CT_REGION, prgnNew, 0); + } else { + (*pgcDst->funcs->ChangeClip) (pgcDst, CT_NONE, NULL, 0); } } @@ -149,7 +124,7 @@ miComputeCompositeClip(GCPtr pGC, DrawablePtr pDrawable) * regions. (this wins especially if many clients clip by children * and have no client clip.) */ - if (pGC->clientClipType == CT_NONE) { + if (!pGC->clientClip) { if (freeCompClip) RegionDestroy(pGC->pCompositeClip); pGC->pCompositeClip = pregWin; @@ -206,7 +181,7 @@ miComputeCompositeClip(GCPtr pGC, DrawablePtr pDrawable) pGC->pCompositeClip = RegionCreate(&pixbounds, 1); } - if (pGC->clientClipType == CT_REGION) { + if (pGC->clientClip) { if (pDrawable->x || pDrawable->y) { RegionTranslate(pGC->clientClip, pDrawable->x + pGC->clipOrg.x, diff --git a/xorg-server/mi/miglblt.c b/xorg-server/mi/miglblt.c index b53ab9c..0183e99 100644 --- a/xorg-server/mi/miglblt.c +++ b/xorg-server/mi/miglblt.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/miinitext.c b/xorg-server/mi/miinitext.c index 1d90516..5872bf5 100644 --- a/xorg-server/mi/miinitext.c +++ b/xorg-server/mi/miinitext.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mioverlay.c b/xorg-server/mi/mioverlay.c index eb8dda1..2b20fd7 100644 --- a/xorg-server/mi/mioverlay.c +++ b/xorg-server/mi/mioverlay.c @@ -1667,7 +1667,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin) freeTmpClip = FALSE; } freeCompClip = pGC->freeCompClip; - if (pGC->clientClipType == CT_NONE) { + if (!pGC->clientClip) { if (freeCompClip) RegionDestroy(pGC->pCompositeClip); pGC->pCompositeClip = pregWin; diff --git a/xorg-server/mi/mipointer.c b/xorg-server/mi/mipointer.c index 6fa416d..2bdd6ca 100644 --- a/xorg-server/mi/mipointer.c +++ b/xorg-server/mi/mipointer.c @@ -273,6 +273,20 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen, return TRUE; } +void +miRecolorCursor(DeviceIntPtr pDev, ScreenPtr pScr, + CursorPtr pCurs, Bool displayed) +{ + /* + * This is guaranteed to correct any color-dependent state which may have + * been bound up in private state created by RealizeCursor + */ + pScr->UnrealizeCursor(pDev, pScr, pCurs); + pScr->RealizeCursor(pDev, pScr, pCurs); + if (displayed) + pScr->DisplayCursor(pDev, pScr, pCurs); +} + /** * Set up sprite information for the device. * This function will be called once for each device after it is initialized @@ -539,10 +553,15 @@ miPointerMoveNoEvent(DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y) * The coordinates provided are always absolute. The parameter mode whether * it was relative or absolute movement that landed us at those coordinates. * + * If the cursor was constrained by a barrier, ET_Barrier* events may be + * generated and appended to the InternalEvent list provided. + * * @param pDev The device to move * @param mode Movement mode (Absolute or Relative) * @param[in,out] screenx The x coordinate in desktop coordinates * @param[in,out] screeny The y coordinate in desktop coordinates + * @param[in,out] nevents The number of events in events (before/after) + * @param[in,out] events The list of events before/after being constrained */ ScreenPtr miPointerSetPosition(DeviceIntPtr pDev, int mode, double *screenx, diff --git a/xorg-server/mi/mipoly.c b/xorg-server/mi/mipoly.c index 07d9818..a332376 100644 --- a/xorg-server/mi/mipoly.c +++ b/xorg-server/mi/mipoly.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -47,11 +47,6 @@ SOFTWARE. * mipoly.c * * Written by Brian Kelleher; June 1986 - * - * Draw polygons. This routine translates the point by the - * origin if pGC->miTranslate is non-zero, and calls - * to the appropriate routine to actually scan convert the - * polygon. */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -62,8 +57,622 @@ SOFTWARE. #include "gcstruct.h" #include "pixmapstr.h" #include "mi.h" +#include "miscanfill.h" +#include "mipoly.h" #include "regionstr.h" +/* + * Insert the given edge into the edge table. First we must find the correct + * bucket in the Edge table, then find the right slot in the bucket. Finally, + * we can insert it. + */ +static Bool +miInsertEdgeInET(EdgeTable * ET, EdgeTableEntry * ETE, int scanline, + ScanLineListBlock ** SLLBlock, int *iSLLBlock) +{ + EdgeTableEntry *start, *prev; + ScanLineList *pSLL, *pPrevSLL; + ScanLineListBlock *tmpSLLBlock; + + /* + * find the right bucket to put the edge into + */ + pPrevSLL = &ET->scanlines; + pSLL = pPrevSLL->next; + while (pSLL && (pSLL->scanline < scanline)) { + pPrevSLL = pSLL; + pSLL = pSLL->next; + } + + /* + * reassign pSLL (pointer to ScanLineList) if necessary + */ + if ((!pSLL) || (pSLL->scanline > scanline)) { + if (*iSLLBlock > SLLSPERBLOCK - 1) { + tmpSLLBlock = malloc(sizeof(ScanLineListBlock)); + if (!tmpSLLBlock) + return FALSE; + (*SLLBlock)->next = tmpSLLBlock; + tmpSLLBlock->next = NULL; + *SLLBlock = tmpSLLBlock; + *iSLLBlock = 0; + } + pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); + + pSLL->next = pPrevSLL->next; + pSLL->edgelist = NULL; + pPrevSLL->next = pSLL; + } + pSLL->scanline = scanline; + + /* + * now insert the edge in the right bucket + */ + prev = NULL; + start = pSLL->edgelist; + while (start && (start->bres.minor < ETE->bres.minor)) { + prev = start; + start = start->next; + } + ETE->next = start; + + if (prev) + prev->next = ETE; + else + pSLL->edgelist = ETE; + return TRUE; +} + +static void +miFreeStorage(ScanLineListBlock * pSLLBlock) +{ + ScanLineListBlock *tmpSLLBlock; + + while (pSLLBlock) { + tmpSLLBlock = pSLLBlock->next; + free(pSLLBlock); + pSLLBlock = tmpSLLBlock; + } +} + +/* + * CreateEdgeTable + * + * This routine creates the edge table for scan converting polygons. + * The Edge Table (ET) looks like: + * + * EdgeTable + * -------- + * | ymax | ScanLineLists + * |scanline|-->------------>-------------->... + * -------- |scanline| |scanline| + * |edgelist| |edgelist| + * --------- --------- + * | | + * | | + * V V + * list of ETEs list of ETEs + * + * where ETE is an EdgeTableEntry data structure, and there is one ScanLineList + * per scanline at which an edge is initially entered. + */ + +static Bool +miCreateETandAET(int count, DDXPointPtr pts, EdgeTable * ET, + EdgeTableEntry * AET, EdgeTableEntry * pETEs, + ScanLineListBlock * pSLLBlock) +{ + DDXPointPtr top, bottom; + DDXPointPtr PrevPt, CurrPt; + int iSLLBlock = 0; + + int dy; + + if (count < 2) + return TRUE; + + /* + * initialize the Active Edge Table + */ + AET->next = NULL; + AET->back = NULL; + AET->nextWETE = NULL; + AET->bres.minor = MININT; + + /* + * initialize the Edge Table. + */ + ET->scanlines.next = NULL; + ET->ymax = MININT; + ET->ymin = MAXINT; + pSLLBlock->next = NULL; + + PrevPt = &pts[count - 1]; + + /* + * for each vertex in the array of points. + * In this loop we are dealing with two vertices at + * a time -- these make up one edge of the polygon. + */ + while (count--) { + CurrPt = pts++; + + /* + * find out which point is above and which is below. + */ + if (PrevPt->y > CurrPt->y) { + bottom = PrevPt, top = CurrPt; + pETEs->ClockWise = 0; + } + else { + bottom = CurrPt, top = PrevPt; + pETEs->ClockWise = 1; + } + + /* + * don't add horizontal edges to the Edge table. + */ + if (bottom->y != top->y) { + pETEs->ymax = bottom->y - 1; /* -1 so we don't get last scanline */ + + /* + * initialize integer edge algorithm + */ + dy = bottom->y - top->y; + BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres); + + if (!miInsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock)) { + miFreeStorage(pSLLBlock->next); + return FALSE; + } + + ET->ymax = max(ET->ymax, PrevPt->y); + ET->ymin = min(ET->ymin, PrevPt->y); + pETEs++; + } + + PrevPt = CurrPt; + } + return TRUE; +} + +/* + * This routine moves EdgeTableEntries from the EdgeTable into the Active Edge + * Table, leaving them sorted by smaller x coordinate. + */ + +static void +miloadAET(EdgeTableEntry * AET, EdgeTableEntry * ETEs) +{ + EdgeTableEntry *pPrevAET; + EdgeTableEntry *tmp; + + pPrevAET = AET; + AET = AET->next; + while (ETEs) { + while (AET && (AET->bres.minor < ETEs->bres.minor)) { + pPrevAET = AET; + AET = AET->next; + } + tmp = ETEs->next; + ETEs->next = AET; + if (AET) + AET->back = ETEs; + ETEs->back = pPrevAET; + pPrevAET->next = ETEs; + pPrevAET = ETEs; + + ETEs = tmp; + } +} + +/* + * computeWAET + * + * This routine links the AET by the nextWETE (winding EdgeTableEntry) link for + * use by the winding number rule. The final Active Edge Table (AET) might + * look something like: + * + * AET + * ---------- --------- --------- + * |ymax | |ymax | |ymax | + * | ... | |... | |... | + * |next |->|next |->|next |->... + * |nextWETE| |nextWETE| |nextWETE| + * --------- --------- ^-------- + * | | | + * V-------------------> V---> ... + * + */ +static void +micomputeWAET(EdgeTableEntry * AET) +{ + EdgeTableEntry *pWETE; + int inside = 1; + int isInside = 0; + + AET->nextWETE = NULL; + pWETE = AET; + AET = AET->next; + while (AET) { + if (AET->ClockWise) + isInside++; + else + isInside--; + + if ((!inside && !isInside) || (inside && isInside)) { + pWETE->nextWETE = AET; + pWETE = AET; + inside = !inside; + } + AET = AET->next; + } + pWETE->nextWETE = NULL; +} + +/* + * Just a simple insertion sort using pointers and back pointers to sort the + * Active Edge Table. + */ + +static int +miInsertionSort(EdgeTableEntry * AET) +{ + EdgeTableEntry *pETEchase; + EdgeTableEntry *pETEinsert; + EdgeTableEntry *pETEchaseBackTMP; + int changed = 0; + + AET = AET->next; + while (AET) { + pETEinsert = AET; + pETEchase = AET; + while (pETEchase->back->bres.minor > AET->bres.minor) + pETEchase = pETEchase->back; + + AET = AET->next; + if (pETEchase != pETEinsert) { + pETEchaseBackTMP = pETEchase->back; + pETEinsert->back->next = AET; + if (AET) + AET->back = pETEinsert->back; + pETEinsert->next = pETEchase; + pETEchase->back->next = pETEinsert; + pETEchase->back = pETEinsert; + pETEinsert->back = pETEchaseBackTMP; + changed = 1; + } + } + return changed; +} + +/* Find the index of the point with the smallest y */ +static int +getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty) +{ + DDXPointPtr ptMin; + int ymin, ymax; + DDXPointPtr ptsStart = pts; + + ptMin = pts; + ymin = ymax = (pts++)->y; + + while (--n > 0) { + if (pts->y < ymin) { + ptMin = pts; + ymin = pts->y; + } + if (pts->y > ymax) + ymax = pts->y; + + pts++; + } + + *by = ymin; + *ty = ymax; + return ptMin - ptsStart; +} + +/* + * Written by Brian Kelleher; Dec. 1985. + * + * Fill a convex polygon. If the given polygon is not convex, then the result + * is undefined. The algorithm is to order the edges from smallest y to + * largest by partitioning the array into a left edge list and a right edge + * list. The algorithm used to traverse each edge is an extension of + * Bresenham's line algorithm with y as the major axis. For a derivation of + * the algorithm, see the author of this code. + */ +static Bool +miFillConvexPoly(DrawablePtr dst, GCPtr pgc, int count, DDXPointPtr ptsIn) +{ + int xl = 0, xr = 0; /* x vals of left and right edges */ + int dl = 0, dr = 0; /* decision variables */ + int ml = 0, m1l = 0; /* left edge slope and slope+1 */ + int mr = 0, m1r = 0; /* right edge slope and slope+1 */ + int incr1l = 0, incr2l = 0; /* left edge error increments */ + int incr1r = 0, incr2r = 0; /* right edge error increments */ + int dy; /* delta y */ + int y; /* current scanline */ + int left, right; /* indices to first endpoints */ + int i; /* loop counter */ + int nextleft, nextright; /* indices to second endpoints */ + DDXPointPtr ptsOut, FirstPoint; /* output buffer */ + int *width, *FirstWidth; /* output buffer */ + int imin; /* index of smallest vertex (in y) */ + int ymin; /* y-extents of polygon */ + int ymax; + + /* + * find leftx, bottomy, rightx, topy, and the index + * of bottomy. Also translate the points. + */ + imin = getPolyYBounds(ptsIn, count, &ymin, &ymax); + + dy = ymax - ymin + 1; + if ((count < 3) || (dy < 0)) + return TRUE; + ptsOut = FirstPoint = malloc(sizeof(DDXPointRec) * dy); + width = FirstWidth = malloc(sizeof(int) * dy); + if (!FirstPoint || !FirstWidth) { + free(FirstWidth); + free(FirstPoint); + return FALSE; + } + + nextleft = nextright = imin; + y = ptsIn[nextleft].y; + + /* + * loop through all edges of the polygon + */ + do { + /* + * add a left edge if we need to + */ + if (ptsIn[nextleft].y == y) { + left = nextleft; + + /* + * find the next edge, considering the end + * conditions of the array. + */ + nextleft++; + if (nextleft >= count) + nextleft = 0; + + /* + * now compute all of the random information + * needed to run the iterative algorithm. + */ + BRESINITPGON(ptsIn[nextleft].y - ptsIn[left].y, + ptsIn[left].x, ptsIn[nextleft].x, + xl, dl, ml, m1l, incr1l, incr2l); + } + + /* + * add a right edge if we need to + */ + if (ptsIn[nextright].y == y) { + right = nextright; + + /* + * find the next edge, considering the end + * conditions of the array. + */ + nextright--; + if (nextright < 0) + nextright = count - 1; + + /* + * now compute all of the random information + * needed to run the iterative algorithm. + */ + BRESINITPGON(ptsIn[nextright].y - ptsIn[right].y, + ptsIn[right].x, ptsIn[nextright].x, + xr, dr, mr, m1r, incr1r, incr2r); + } + + /* + * generate scans to fill while we still have + * a right edge as well as a left edge. + */ + i = min(ptsIn[nextleft].y, ptsIn[nextright].y) - y; + /* in case we're called with non-convex polygon */ + if (i < 0) { + free(FirstWidth); + free(FirstPoint); + return TRUE; + } + while (i-- > 0) { + ptsOut->y = y; + + /* + * reverse the edges if necessary + */ + if (xl < xr) { + *(width++) = xr - xl; + (ptsOut++)->x = xl; + } + else { + *(width++) = xl - xr; + (ptsOut++)->x = xr; + } + y++; + + /* increment down the edges */ + BRESINCRPGON(dl, xl, ml, m1l, incr1l, incr2l); + BRESINCRPGON(dr, xr, mr, m1r, incr1r, incr2r); + } + } while (y != ymax); + + /* + * Finally, fill the <remaining> spans + */ + (*pgc->ops->FillSpans) (dst, pgc, + ptsOut - FirstPoint, FirstPoint, FirstWidth, 1); + free(FirstWidth); + free(FirstPoint); + return TRUE; +} + +/* + * Written by Brian Kelleher; Oct. 1985 + * + * Routine to fill a polygon. Two fill rules are supported: frWINDING and + * frEVENODD. + */ +static Bool +miFillGeneralPoly(DrawablePtr dst, GCPtr pgc, int count, DDXPointPtr ptsIn) +{ + EdgeTableEntry *pAET; /* the Active Edge Table */ + int y; /* the current scanline */ + int nPts = 0; /* number of pts in buffer */ + EdgeTableEntry *pWETE; /* Winding Edge Table */ + ScanLineList *pSLL; /* Current ScanLineList */ + DDXPointPtr ptsOut; /* ptr to output buffers */ + int *width; + DDXPointRec FirstPoint[NUMPTSTOBUFFER]; /* the output buffers */ + int FirstWidth[NUMPTSTOBUFFER]; + EdgeTableEntry *pPrevAET; /* previous AET entry */ + EdgeTable ET; /* Edge Table header node */ + EdgeTableEntry AET; /* Active ET header node */ + EdgeTableEntry *pETEs; /* Edge Table Entries buff */ + ScanLineListBlock SLLBlock; /* header for ScanLineList */ + int fixWAET = 0; + + if (count < 3) + return TRUE; + + if (!(pETEs = malloc(sizeof(EdgeTableEntry) * count))) + return FALSE; + ptsOut = FirstPoint; + width = FirstWidth; + if (!miCreateETandAET(count, ptsIn, &ET, &AET, pETEs, &SLLBlock)) { + free(pETEs); + return FALSE; + } + pSLL = ET.scanlines.next; + + if (pgc->fillRule == EvenOddRule) { + /* + * for each scanline + */ + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL && y == pSLL->scanline) { + miloadAET(&AET, pSLL->edgelist); + pSLL = pSLL->next; + } + pPrevAET = &AET; + pAET = AET.next; + + /* + * for each active edge + */ + while (pAET) { + ptsOut->x = pAET->bres.minor; + ptsOut++->y = y; + *width++ = pAET->next->bres.minor - pAET->bres.minor; + nPts++; + + /* + * send out the buffer when its full + */ + if (nPts == NUMPTSTOBUFFER) { + (*pgc->ops->FillSpans) (dst, pgc, + nPts, FirstPoint, FirstWidth, 1); + ptsOut = FirstPoint; + width = FirstWidth; + nPts = 0; + } + EVALUATEEDGEEVENODD(pAET, pPrevAET, y); + EVALUATEEDGEEVENODD(pAET, pPrevAET, y); + } + miInsertionSort(&AET); + } + } + else { /* default to WindingNumber */ + + /* + * for each scanline + */ + for (y = ET.ymin; y < ET.ymax; y++) { + /* + * Add a new edge to the active edge table when we + * get to the next edge. + */ + if (pSLL && y == pSLL->scanline) { + miloadAET(&AET, pSLL->edgelist); + micomputeWAET(&AET); + pSLL = pSLL->next; + } + pPrevAET = &AET; + pAET = AET.next; + pWETE = pAET; + + /* + * for each active edge + */ + while (pAET) { + /* + * if the next edge in the active edge table is + * also the next edge in the winding active edge + * table. + */ + if (pWETE == pAET) { + ptsOut->x = pAET->bres.minor; + ptsOut++->y = y; + *width++ = pAET->nextWETE->bres.minor - pAET->bres.minor; + nPts++; + + /* + * send out the buffer + */ + if (nPts == NUMPTSTOBUFFER) { + (*pgc->ops->FillSpans) (dst, pgc, nPts, FirstPoint, + FirstWidth, 1); + ptsOut = FirstPoint; + width = FirstWidth; + nPts = 0; + } + + pWETE = pWETE->nextWETE; + while (pWETE != pAET) + EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); + pWETE = pWETE->nextWETE; + } + EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); + } + + /* + * reevaluate the Winding active edge table if we + * just had to resort it or if we just exited an edge. + */ + if (miInsertionSort(&AET) || fixWAET) { + micomputeWAET(&AET); + fixWAET = 0; + } + } + } + + /* + * Get any spans that we missed by buffering + */ + (*pgc->ops->FillSpans) (dst, pgc, nPts, FirstPoint, FirstWidth, 1); + free(pETEs); + miFreeStorage(SLLBlock.next); + return TRUE; +} + +/* + * Draw polygons. This routine translates the point by the origin if + * pGC->miTranslate is non-zero, and calls to the appropriate routine to + * actually scan convert the polygon. + */ void miFillPolygon(DrawablePtr dst, GCPtr pgc, int shape, int mode, int count, DDXPointPtr pPts) diff --git a/xorg-server/mi/mipoly.h b/xorg-server/mi/mipoly.h index e37fb48..d67a524 100644 --- a/xorg-server/mi/mipoly.h +++ b/xorg-server/mi/mipoly.h @@ -55,7 +55,7 @@ from The Open Group. * the polygon by incrementing the y coordinate. We * keep a list of edges which the current scanline crosses, * sorted by x. This list is called the Active Edge Table (AET) - * As we change the y-coordinate, we update each entry in + * As we change the y-coordinate, we update each entry in * in the active edge table to reflect the edges new xcoord. * This list must be sorted at each scanline in case * two edges intersect. @@ -171,23 +171,3 @@ typedef struct _ScanLineListBlock { pAET = pAET->next; \ } \ } - -/* mipolyutil.c */ - -extern _X_EXPORT Bool miCreateETandAET(int /*count */ , - DDXPointPtr /*pts */ , - EdgeTable * /*ET*/, - EdgeTableEntry * /*AET*/, - EdgeTableEntry * /*pETEs */ , - ScanLineListBlock * /*pSLLBlock */ - ); - -extern _X_EXPORT void miloadAET(EdgeTableEntry * /*AET*/, EdgeTableEntry * /*ETEs */ - ); - -extern _X_EXPORT void micomputeWAET(EdgeTableEntry * /*AET*/); - -extern _X_EXPORT int miInsertionSort(EdgeTableEntry * /*AET*/); - -extern _X_EXPORT void miFreeStorage(ScanLineListBlock * /*pSLLBlock */ - ); diff --git a/xorg-server/mi/mipolycon.c b/xorg-server/mi/mipolycon.c deleted file mode 100644 index e831633..0000000 --- a/xorg-server/mi/mipolycon.c +++ /dev/null @@ -1,235 +0,0 @@ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "gcstruct.h" -#include "pixmap.h" -#include "mi.h" -#include "miscanfill.h" - -static int getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty); - -/* - * convexpoly.c - * - * Written by Brian Kelleher; Dec. 1985. - * - * Fill a convex polygon. If the given polygon - * is not convex, then the result is undefined. - * The algorithm is to order the edges from smallest - * y to largest by partitioning the array into a left - * edge list and a right edge list. The algorithm used - * to traverse each edge is an extension of Bresenham's - * line algorithm with y as the major axis. - * For a derivation of the algorithm, see the author of - * this code. - */ -Bool -miFillConvexPoly(DrawablePtr dst, GCPtr pgc, int count, /* number of points */ - DDXPointPtr ptsIn /* the points */ - ) -{ - int xl = 0, xr = 0; /* x vals of left and right edges */ - int dl = 0, dr = 0; /* decision variables */ - int ml = 0, m1l = 0; /* left edge slope and slope+1 */ - int mr = 0, m1r = 0; /* right edge slope and slope+1 */ - int incr1l = 0, incr2l = 0; /* left edge error increments */ - int incr1r = 0, incr2r = 0; /* right edge error increments */ - int dy; /* delta y */ - int y; /* current scanline */ - int left, right; /* indices to first endpoints */ - int i; /* loop counter */ - int nextleft, nextright; /* indices to second endpoints */ - DDXPointPtr ptsOut, FirstPoint; /* output buffer */ - int *width, *FirstWidth; /* output buffer */ - int imin; /* index of smallest vertex (in y) */ - int ymin; /* y-extents of polygon */ - int ymax; - - /* - * find leftx, bottomy, rightx, topy, and the index - * of bottomy. Also translate the points. - */ - imin = getPolyYBounds(ptsIn, count, &ymin, &ymax); - - dy = ymax - ymin + 1; - if ((count < 3) || (dy < 0)) - return TRUE; - ptsOut = FirstPoint = malloc(sizeof(DDXPointRec) * dy); - width = FirstWidth = malloc(sizeof(int) * dy); - if (!FirstPoint || !FirstWidth) { - free(FirstWidth); - free(FirstPoint); - return FALSE; - } - - nextleft = nextright = imin; - y = ptsIn[nextleft].y; - - /* - * loop through all edges of the polygon - */ - do { - /* - * add a left edge if we need to - */ - if (ptsIn[nextleft].y == y) { - left = nextleft; - - /* - * find the next edge, considering the end - * conditions of the array. - */ - nextleft++; - if (nextleft >= count) - nextleft = 0; - - /* - * now compute all of the random information - * needed to run the iterative algorithm. - */ - BRESINITPGON(ptsIn[nextleft].y - ptsIn[left].y, - ptsIn[left].x, ptsIn[nextleft].x, - xl, dl, ml, m1l, incr1l, incr2l); - } - - /* - * add a right edge if we need to - */ - if (ptsIn[nextright].y == y) { - right = nextright; - - /* - * find the next edge, considering the end - * conditions of the array. - */ - nextright--; - if (nextright < 0) - nextright = count - 1; - - /* - * now compute all of the random information - * needed to run the iterative algorithm. - */ - BRESINITPGON(ptsIn[nextright].y - ptsIn[right].y, - ptsIn[right].x, ptsIn[nextright].x, - xr, dr, mr, m1r, incr1r, incr2r); - } - - /* - * generate scans to fill while we still have - * a right edge as well as a left edge. - */ - i = min(ptsIn[nextleft].y, ptsIn[nextright].y) - y; - /* in case we're called with non-convex polygon */ - if (i < 0) { - free(FirstWidth); - free(FirstPoint); - return TRUE; - } - while (i-- > 0) { - ptsOut->y = y; - - /* - * reverse the edges if necessary - */ - if (xl < xr) { - *(width++) = xr - xl; - (ptsOut++)->x = xl; - } - else { - *(width++) = xl - xr; - (ptsOut++)->x = xr; - } - y++; - - /* increment down the edges */ - BRESINCRPGON(dl, xl, ml, m1l, incr1l, incr2l); - BRESINCRPGON(dr, xr, mr, m1r, incr1r, incr2r); - } - } while (y != ymax); - - /* - * Finally, fill the <remaining> spans - */ - (*pgc->ops->FillSpans) (dst, pgc, - ptsOut - FirstPoint, FirstPoint, FirstWidth, 1); - free(FirstWidth); - free(FirstPoint); - return TRUE; -} - -/* - * Find the index of the point with the smallest y. - */ -static int -getPolyYBounds(DDXPointPtr pts, int n, int *by, int *ty) -{ - DDXPointPtr ptMin; - int ymin, ymax; - DDXPointPtr ptsStart = pts; - - ptMin = pts; - ymin = ymax = (pts++)->y; - - while (--n > 0) { - if (pts->y < ymin) { - ptMin = pts; - ymin = pts->y; - } - if (pts->y > ymax) - ymax = pts->y; - - pts++; - } - - *by = ymin; - *ty = ymax; - return ptMin - ptsStart; -} diff --git a/xorg-server/mi/mipolygen.c b/xorg-server/mi/mipolygen.c deleted file mode 100644 index 2031b42..0000000 --- a/xorg-server/mi/mipolygen.c +++ /dev/null @@ -1,213 +0,0 @@ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include <X11/X.h> -#include "gcstruct.h" -#include "miscanfill.h" -#include "mipoly.h" -#include "pixmap.h" -#include "mi.h" - -/* - * - * Written by Brian Kelleher; Oct. 1985 - * - * Routine to fill a polygon. Two fill rules are - * supported: frWINDING and frEVENODD. - * - * See fillpoly.h for a complete description of the algorithm. - */ - -Bool -miFillGeneralPoly(DrawablePtr dst, GCPtr pgc, int count, /* number of points */ - DDXPointPtr ptsIn /* the points */ - ) -{ - EdgeTableEntry *pAET; /* the Active Edge Table */ - int y; /* the current scanline */ - int nPts = 0; /* number of pts in buffer */ - EdgeTableEntry *pWETE; /* Winding Edge Table */ - ScanLineList *pSLL; /* Current ScanLineList */ - DDXPointPtr ptsOut; /* ptr to output buffers */ - int *width; - DDXPointRec FirstPoint[NUMPTSTOBUFFER]; /* the output buffers */ - int FirstWidth[NUMPTSTOBUFFER]; - EdgeTableEntry *pPrevAET; /* previous AET entry */ - EdgeTable ET; /* Edge Table header node */ - EdgeTableEntry AET; /* Active ET header node */ - EdgeTableEntry *pETEs; /* Edge Table Entries buff */ - ScanLineListBlock SLLBlock; /* header for ScanLineList */ - int fixWAET = 0; - - if (count < 3) - return TRUE; - - if (!(pETEs = malloc(sizeof(EdgeTableEntry) * count))) - return FALSE; - ptsOut = FirstPoint; - width = FirstWidth; - if (!miCreateETandAET(count, ptsIn, &ET, &AET, pETEs, &SLLBlock)) { - free(pETEs); - return FALSE; - } - pSLL = ET.scanlines.next; - - if (pgc->fillRule == EvenOddRule) { - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL && y == pSLL->scanline) { - miloadAET(&AET, pSLL->edgelist); - pSLL = pSLL->next; - } - pPrevAET = &AET; - pAET = AET.next; - - /* - * for each active edge - */ - while (pAET) { - ptsOut->x = pAET->bres.minor; - ptsOut++->y = y; - *width++ = pAET->next->bres.minor - pAET->bres.minor; - nPts++; - - /* - * send out the buffer when its full - */ - if (nPts == NUMPTSTOBUFFER) { - (*pgc->ops->FillSpans) (dst, pgc, - nPts, FirstPoint, FirstWidth, 1); - ptsOut = FirstPoint; - width = FirstWidth; - nPts = 0; - } - EVALUATEEDGEEVENODD(pAET, pPrevAET, y) - EVALUATEEDGEEVENODD(pAET, pPrevAET, y); - } - miInsertionSort(&AET); - } - } - else { /* default to WindingNumber */ - - /* - * for each scanline - */ - for (y = ET.ymin; y < ET.ymax; y++) { - /* - * Add a new edge to the active edge table when we - * get to the next edge. - */ - if (pSLL && y == pSLL->scanline) { - miloadAET(&AET, pSLL->edgelist); - micomputeWAET(&AET); - pSLL = pSLL->next; - } - pPrevAET = &AET; - pAET = AET.next; - pWETE = pAET; - - /* - * for each active edge - */ - while (pAET) { - /* - * if the next edge in the active edge table is - * also the next edge in the winding active edge - * table. - */ - if (pWETE == pAET) { - ptsOut->x = pAET->bres.minor; - ptsOut++->y = y; - *width++ = pAET->nextWETE->bres.minor - pAET->bres.minor; - nPts++; - - /* - * send out the buffer - */ - if (nPts == NUMPTSTOBUFFER) { - (*pgc->ops->FillSpans) (dst, pgc, nPts, FirstPoint, - FirstWidth, 1); - ptsOut = FirstPoint; - width = FirstWidth; - nPts = 0; - } - - pWETE = pWETE->nextWETE; - while (pWETE != pAET) - EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); - pWETE = pWETE->nextWETE; - } - EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET); - } - - /* - * reevaluate the Winding active edge table if we - * just had to resort it or if we just exited an edge. - */ - if (miInsertionSort(&AET) || fixWAET) { - micomputeWAET(&AET); - fixWAET = 0; - } - } - } - - /* - * Get any spans that we missed by buffering - */ - (*pgc->ops->FillSpans) (dst, pgc, nPts, FirstPoint, FirstWidth, 1); - free(pETEs); - miFreeStorage(SLLBlock.next); - return TRUE; -} diff --git a/xorg-server/mi/mipolypnt.c b/xorg-server/mi/mipolypnt.c index 086502b..4fa521d 100644 --- a/xorg-server/mi/mipolypnt.c +++ b/xorg-server/mi/mipolypnt.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mipolyrect.c b/xorg-server/mi/mipolyrect.c index e316ae0..8308225 100644 --- a/xorg-server/mi/mipolyrect.c +++ b/xorg-server/mi/mipolyrect.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mipolyseg.c b/xorg-server/mi/mipolyseg.c index d6f1807..7909b39 100644 --- a/xorg-server/mi/mipolyseg.c +++ b/xorg-server/mi/mipolyseg.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -61,7 +61,7 @@ SOFTWARE. * lines are drawn in the order listed. * * Walks the segments, compressing them into format for PolyLines. - * + * *****************************************************************/ void diff --git a/xorg-server/mi/mipolytext.c b/xorg-server/mi/mipolytext.c index 02c4588..f1e5ed8 100644 --- a/xorg-server/mi/mipolytext.c +++ b/xorg-server/mi/mipolytext.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mipolyutil.c b/xorg-server/mi/mipolyutil.c deleted file mode 100644 index 5e6301d..0000000 --- a/xorg-server/mi/mipolyutil.c +++ /dev/null @@ -1,369 +0,0 @@ -/*********************************************************** - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "regionstr.h" -#include "gc.h" -#include "miscanfill.h" -#include "mipoly.h" -#include "misc.h" /* MAXINT */ - -/* - * fillUtils.c - * - * Written by Brian Kelleher; Oct. 1985 - * - * This module contains all of the utility functions - * needed to scan convert a polygon. - * - */ - -/* - * InsertEdgeInET - * - * Insert the given edge into the edge table. - * First we must find the correct bucket in the - * Edge table, then find the right slot in the - * bucket. Finally, we can insert it. - * - */ -static Bool -miInsertEdgeInET(EdgeTable * ET, EdgeTableEntry * ETE, int scanline, - ScanLineListBlock ** SLLBlock, int *iSLLBlock) -{ - EdgeTableEntry *start, *prev; - ScanLineList *pSLL, *pPrevSLL; - ScanLineListBlock *tmpSLLBlock; - - /* - * find the right bucket to put the edge into - */ - pPrevSLL = &ET->scanlines; - pSLL = pPrevSLL->next; - while (pSLL && (pSLL->scanline < scanline)) { - pPrevSLL = pSLL; - pSLL = pSLL->next; - } - - /* - * reassign pSLL (pointer to ScanLineList) if necessary - */ - if ((!pSLL) || (pSLL->scanline > scanline)) { - if (*iSLLBlock > SLLSPERBLOCK - 1) { - tmpSLLBlock = malloc(sizeof(ScanLineListBlock)); - if (!tmpSLLBlock) - return FALSE; - (*SLLBlock)->next = tmpSLLBlock; - tmpSLLBlock->next = NULL; - *SLLBlock = tmpSLLBlock; - *iSLLBlock = 0; - } - pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]); - - pSLL->next = pPrevSLL->next; - pSLL->edgelist = NULL; - pPrevSLL->next = pSLL; - } - pSLL->scanline = scanline; - - /* - * now insert the edge in the right bucket - */ - prev = NULL; - start = pSLL->edgelist; - while (start && (start->bres.minor < ETE->bres.minor)) { - prev = start; - start = start->next; - } - ETE->next = start; - - if (prev) - prev->next = ETE; - else - pSLL->edgelist = ETE; - return TRUE; -} - -/* - * CreateEdgeTable - * - * This routine creates the edge table for - * scan converting polygons. - * The Edge Table (ET) looks like: - * - * EdgeTable - * -------- - * | ymax | ScanLineLists - * |scanline|-->------------>-------------->... - * -------- |scanline| |scanline| - * |edgelist| |edgelist| - * --------- --------- - * | | - * | | - * V V - * list of ETEs list of ETEs - * - * where ETE is an EdgeTableEntry data structure, - * and there is one ScanLineList per scanline at - * which an edge is initially entered. - * - */ - -Bool -miCreateETandAET(int count, DDXPointPtr pts, EdgeTable * ET, - EdgeTableEntry * AET, EdgeTableEntry * pETEs, - ScanLineListBlock * pSLLBlock) -{ - DDXPointPtr top, bottom; - DDXPointPtr PrevPt, CurrPt; - int iSLLBlock = 0; - - int dy; - - if (count < 2) - return TRUE; - - /* - * initialize the Active Edge Table - */ - AET->next = NULL; - AET->back = NULL; - AET->nextWETE = NULL; - AET->bres.minor = MININT; - - /* - * initialize the Edge Table. - */ - ET->scanlines.next = NULL; - ET->ymax = MININT; - ET->ymin = MAXINT; - pSLLBlock->next = NULL; - - PrevPt = &pts[count - 1]; - - /* - * for each vertex in the array of points. - * In this loop we are dealing with two vertices at - * a time -- these make up one edge of the polygon. - */ - while (count--) { - CurrPt = pts++; - - /* - * find out which point is above and which is below. - */ - if (PrevPt->y > CurrPt->y) { - bottom = PrevPt, top = CurrPt; - pETEs->ClockWise = 0; - } - else { - bottom = CurrPt, top = PrevPt; - pETEs->ClockWise = 1; - } - - /* - * don't add horizontal edges to the Edge table. - */ - if (bottom->y != top->y) { - pETEs->ymax = bottom->y - 1; /* -1 so we don't get last scanline */ - - /* - * initialize integer edge algorithm - */ - dy = bottom->y - top->y; - BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres); - - if (!miInsertEdgeInET(ET, pETEs, top->y, &pSLLBlock, &iSLLBlock)) { - miFreeStorage(pSLLBlock->next); - return FALSE; - } - - ET->ymax = max(ET->ymax, PrevPt->y); - ET->ymin = min(ET->ymin, PrevPt->y); - pETEs++; - } - - PrevPt = CurrPt; - } - return TRUE; -} - -/* - * loadAET - * - * This routine moves EdgeTableEntries from the - * EdgeTable into the Active Edge Table, - * leaving them sorted by smaller x coordinate. - * - */ - -void -miloadAET(EdgeTableEntry * AET, EdgeTableEntry * ETEs) -{ - EdgeTableEntry *pPrevAET; - EdgeTableEntry *tmp; - - pPrevAET = AET; - AET = AET->next; - while (ETEs) { - while (AET && (AET->bres.minor < ETEs->bres.minor)) { - pPrevAET = AET; - AET = AET->next; - } - tmp = ETEs->next; - ETEs->next = AET; - if (AET) - AET->back = ETEs; - ETEs->back = pPrevAET; - pPrevAET->next = ETEs; - pPrevAET = ETEs; - - ETEs = tmp; - } -} - -/* - * computeWAET - * - * This routine links the AET by the - * nextWETE (winding EdgeTableEntry) link for - * use by the winding number rule. The final - * Active Edge Table (AET) might look something - * like: - * - * AET - * ---------- --------- --------- - * |ymax | |ymax | |ymax | - * | ... | |... | |... | - * |next |->|next |->|next |->... - * |nextWETE| |nextWETE| |nextWETE| - * --------- --------- ^-------- - * | | | - * V-------------------> V---> ... - * - */ -void -micomputeWAET(EdgeTableEntry * AET) -{ - EdgeTableEntry *pWETE; - int inside = 1; - int isInside = 0; - - AET->nextWETE = NULL; - pWETE = AET; - AET = AET->next; - while (AET) { - if (AET->ClockWise) - isInside++; - else - isInside--; - - if ((!inside && !isInside) || (inside && isInside)) { - pWETE->nextWETE = AET; - pWETE = AET; - inside = !inside; - } - AET = AET->next; - } - pWETE->nextWETE = NULL; -} - -/* - * InsertionSort - * - * Just a simple insertion sort using - * pointers and back pointers to sort the Active - * Edge Table. - * - */ - -int -miInsertionSort(EdgeTableEntry * AET) -{ - EdgeTableEntry *pETEchase; - EdgeTableEntry *pETEinsert; - EdgeTableEntry *pETEchaseBackTMP; - int changed = 0; - - AET = AET->next; - while (AET) { - pETEinsert = AET; - pETEchase = AET; - while (pETEchase->back->bres.minor > AET->bres.minor) - pETEchase = pETEchase->back; - - AET = AET->next; - if (pETEchase != pETEinsert) { - pETEchaseBackTMP = pETEchase->back; - pETEinsert->back->next = AET; - if (AET) - AET->back = pETEinsert->back; - pETEinsert->next = pETEchase; - pETEchase->back->next = pETEinsert; - pETEchase->back = pETEinsert; - pETEinsert->back = pETEchaseBackTMP; - changed = 1; - } - } - return changed; -} - -/* - * Clean up our act. - */ -void -miFreeStorage(ScanLineListBlock * pSLLBlock) -{ - ScanLineListBlock *tmpSLLBlock; - - while (pSLLBlock) { - tmpSLLBlock = pSLLBlock->next; - free(pSLLBlock); - pSLLBlock = tmpSLLBlock; - } -} diff --git a/xorg-server/mi/mipushpxl.c b/xorg-server/mi/mipushpxl.c index 9a78f40..f6a1b52 100644 --- a/xorg-server/mi/mipushpxl.c +++ b/xorg-server/mi/mipushpxl.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/miscrinit.c b/xorg-server/mi/miscrinit.c index 327bd15..b53c7e4 100644 --- a/xorg-server/mi/miscrinit.c +++ b/xorg-server/mi/miscrinit.c @@ -45,7 +45,7 @@ from The Open Group. /* We use this structure to propogate some information from miScreenInit to * miCreateScreenResources. miScreenInit allocates the structure, fills it - * in, and puts it into pScreen->devPrivate. miCreateScreenResources + * in, and puts it into pScreen->devPrivate. miCreateScreenResources * extracts the info and frees the structure. We could've accomplished the * same thing by adding fields to the screen structure, but they would have * ended up being redundant, and would have exposed this mi implementation diff --git a/xorg-server/mi/mispans.c b/xorg-server/mi/mispans.c deleted file mode 100644 index 11c8a43..0000000 --- a/xorg-server/mi/mispans.c +++ /dev/null @@ -1,526 +0,0 @@ -/*********************************************************** - -Copyright 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "misc.h" -#include "pixmapstr.h" -#include "gcstruct.h" -#include "mispans.h" - -/* - -These routines maintain lists of Spans, in order to implement the -``touch-each-pixel-once'' rules of wide lines and arcs. - -Written by Joel McCormack, Summer 1989. - -*/ - -void -miInitSpanGroup(SpanGroup * spanGroup) -{ - spanGroup->size = 0; - spanGroup->count = 0; - spanGroup->group = NULL; - spanGroup->ymin = MAXSHORT; - spanGroup->ymax = MINSHORT; -} /* InitSpanGroup */ - -#define YMIN(spans) (spans->points[0].y) -#define YMAX(spans) (spans->points[spans->count-1].y) - -static void -miSubtractSpans(SpanGroup * spanGroup, Spans * sub) -{ - int i, subCount, spansCount; - int ymin, ymax, xmin, xmax; - Spans *spans; - DDXPointPtr subPt, spansPt; - int *subWid, *spansWid; - int extra; - - ymin = YMIN(sub); - ymax = YMAX(sub); - spans = spanGroup->group; - for (i = spanGroup->count; i; i--, spans++) { - if (YMIN(spans) <= ymax && ymin <= YMAX(spans)) { - subCount = sub->count; - subPt = sub->points; - subWid = sub->widths; - spansCount = spans->count; - spansPt = spans->points; - spansWid = spans->widths; - extra = 0; - for (;;) { - while (spansCount && spansPt->y < subPt->y) { - spansPt++; - spansWid++; - spansCount--; - } - if (!spansCount) - break; - while (subCount && subPt->y < spansPt->y) { - subPt++; - subWid++; - subCount--; - } - if (!subCount) - break; - if (subPt->y == spansPt->y) { - xmin = subPt->x; - xmax = xmin + *subWid; - if (xmin >= spansPt->x + *spansWid || spansPt->x >= xmax) { - ; - } - else if (xmin <= spansPt->x) { - if (xmax >= spansPt->x + *spansWid) { - memmove(spansPt, spansPt + 1, - sizeof *spansPt * (spansCount - 1)); - memmove(spansWid, spansWid + 1, - sizeof *spansWid * (spansCount - 1)); - spansPt--; - spansWid--; - spans->count--; - extra++; - } - else { - *spansWid = *spansWid - (xmax - spansPt->x); - spansPt->x = xmax; - } - } - else { - if (xmax >= spansPt->x + *spansWid) { - *spansWid = xmin - spansPt->x; - } - else { - if (!extra) { - DDXPointPtr newPt; - int *newwid; - -#define EXTRA 8 - newPt = - (DDXPointPtr) realloc(spans->points, - (spans->count + - EXTRA) * - sizeof(DDXPointRec)); - if (!newPt) - break; - spansPt = newPt + (spansPt - spans->points); - spans->points = newPt; - newwid = - (int *) realloc(spans->widths, - (spans->count + - EXTRA) * sizeof(int)); - if (!newwid) - break; - spansWid = newwid + (spansWid - spans->widths); - spans->widths = newwid; - extra = EXTRA; - } - memmove(spansPt + 1, spansPt, - sizeof *spansPt * (spansCount)); - memmove(spansWid + 1, spansWid, - sizeof *spansWid * (spansCount)); - spans->count++; - extra--; - *spansWid = xmin - spansPt->x; - spansWid++; - spansPt++; - *spansWid = *spansWid - (xmax - spansPt->x); - spansPt->x = xmax; - } - } - } - spansPt++; - spansWid++; - spansCount--; - } - } - } -} - -void -miAppendSpans(SpanGroup * spanGroup, SpanGroup * otherGroup, Spans * spans) -{ - int ymin, ymax; - int spansCount; - - spansCount = spans->count; - if (spansCount > 0) { - if (spanGroup->size == spanGroup->count) { - spanGroup->size = (spanGroup->size + 8) * 2; - spanGroup->group = (Spans *) - realloc(spanGroup->group, sizeof(Spans) * spanGroup->size); - } - - spanGroup->group[spanGroup->count] = *spans; - (spanGroup->count)++; - ymin = spans->points[0].y; - if (ymin < spanGroup->ymin) - spanGroup->ymin = ymin; - ymax = spans->points[spansCount - 1].y; - if (ymax > spanGroup->ymax) - spanGroup->ymax = ymax; - if (otherGroup && otherGroup->ymin < ymax && ymin < otherGroup->ymax) { - miSubtractSpans(otherGroup, spans); - } - } - else { - free(spans->points); - free(spans->widths); - } -} /* AppendSpans */ - -void -miFreeSpanGroup(SpanGroup * spanGroup) -{ - free(spanGroup->group); -} - -static void -QuickSortSpansX(DDXPointRec points[], int widths[], int numSpans) -{ - int x; - int i, j, m; - DDXPointPtr r; - -/* Always called with numSpans > 1 */ -/* Sorts only by x, as all y should be the same */ - -#define ExchangeSpans(a, b) \ -{ \ - DDXPointRec tpt; \ - int tw; \ - \ - tpt = points[a]; points[a] = points[b]; points[b] = tpt; \ - tw = widths[a]; widths[a] = widths[b]; widths[b] = tw; \ -} - - do { - if (numSpans < 9) { - /* Do insertion sort */ - int xprev; - - xprev = points[0].x; - i = 1; - do { /* while i != numSpans */ - x = points[i].x; - if (xprev > x) { - /* points[i] is out of order. Move into proper location. */ - DDXPointRec tpt; - int tw, k; - - for (j = 0; x >= points[j].x; j++) { - } - tpt = points[i]; - tw = widths[i]; - for (k = i; k != j; k--) { - points[k] = points[k - 1]; - widths[k] = widths[k - 1]; - } - points[j] = tpt; - widths[j] = tw; - x = points[i].x; - } /* if out of order */ - xprev = x; - i++; - } while (i != numSpans); - return; - } - - /* Choose partition element, stick in location 0 */ - m = numSpans / 2; - if (points[m].x > points[0].x) - ExchangeSpans(m, 0); - if (points[m].x > points[numSpans - 1].x) - ExchangeSpans(m, numSpans - 1); - if (points[m].x > points[0].x) - ExchangeSpans(m, 0); - x = points[0].x; - - /* Partition array */ - i = 0; - j = numSpans; - do { - r = &(points[i]); - do { - r++; - i++; - } while (i != numSpans && r->x < x); - r = &(points[j]); - do { - r--; - j--; - } while (x < r->x); - if (i < j) - ExchangeSpans(i, j); - } while (i < j); - - /* Move partition element back to middle */ - ExchangeSpans(0, j); - - /* Recurse */ - if (numSpans - j - 1 > 1) - QuickSortSpansX(&points[j + 1], &widths[j + 1], numSpans - j - 1); - numSpans = j; - } while (numSpans > 1); -} /* QuickSortSpans */ - -static int -UniquifySpansX(Spans * spans, DDXPointRec * newPoints, int *newWidths) -{ - int newx1, newx2, oldpt, i, y; - DDXPointRec *oldPoints; - int *oldWidths; - int *startNewWidths; - -/* Always called with numSpans > 1 */ -/* Uniquify the spans, and stash them into newPoints and newWidths. Return the - number of unique spans. */ - - startNewWidths = newWidths; - - oldPoints = spans->points; - oldWidths = spans->widths; - - y = oldPoints->y; - newx1 = oldPoints->x; - newx2 = newx1 + *oldWidths; - - for (i = spans->count - 1; i != 0; i--) { - oldPoints++; - oldWidths++; - oldpt = oldPoints->x; - if (oldpt > newx2) { - /* Write current span, start a new one */ - newPoints->x = newx1; - newPoints->y = y; - *newWidths = newx2 - newx1; - newPoints++; - newWidths++; - newx1 = oldpt; - newx2 = oldpt + *oldWidths; - } - else { - /* extend current span, if old extends beyond new */ - oldpt = oldpt + *oldWidths; - if (oldpt > newx2) - newx2 = oldpt; - } - } /* for */ - - /* Write final span */ - newPoints->x = newx1; - *newWidths = newx2 - newx1; - newPoints->y = y; - - return (newWidths - startNewWidths) + 1; -} /* UniquifySpansX */ - -static void -miDisposeSpanGroup(SpanGroup * spanGroup) -{ - int i; - Spans *spans; - - for (i = 0; i < spanGroup->count; i++) { - spans = spanGroup->group + i; - free(spans->points); - free(spans->widths); - } -} - -void -miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup * spanGroup) -{ - int i; - Spans *spans; - Spans *yspans; - int *ysizes; - int ymin, ylength; - - /* Outgoing spans for one big call to FillSpans */ - DDXPointPtr points; - int *widths; - int count; - - if (spanGroup->count == 0) - return; - - if (spanGroup->count == 1) { - /* Already should be sorted, unique */ - spans = spanGroup->group; - (*pGC->ops->FillSpans) - (pDraw, pGC, spans->count, spans->points, spans->widths, TRUE); - free(spans->points); - free(spans->widths); - } - else { - /* Yuck. Gross. Radix sort into y buckets, then sort x and uniquify */ - /* This seems to be the fastest thing to do. I've tried sorting on - both x and y at the same time rather than creating into all those - y buckets, but it was somewhat slower. */ - - ymin = spanGroup->ymin; - ylength = spanGroup->ymax - ymin + 1; - - /* Allocate Spans for y buckets */ - yspans = malloc(ylength * sizeof(Spans)); - ysizes = malloc(ylength * sizeof(int)); - - if (!yspans || !ysizes) { - free(yspans); - free(ysizes); - miDisposeSpanGroup(spanGroup); - return; - } - - for (i = 0; i != ylength; i++) { - ysizes[i] = 0; - yspans[i].count = 0; - yspans[i].points = NULL; - yspans[i].widths = NULL; - } - - /* Go through every single span and put it into the correct bucket */ - count = 0; - for (i = 0, spans = spanGroup->group; - i != spanGroup->count; i++, spans++) { - int index; - int j; - - for (j = 0, points = spans->points, widths = spans->widths; - j != spans->count; j++, points++, widths++) { - index = points->y - ymin; - if (index >= 0 && index < ylength) { - Spans *newspans = &(yspans[index]); - - if (newspans->count == ysizes[index]) { - DDXPointPtr newpoints; - int *newwidths; - - ysizes[index] = (ysizes[index] + 8) * 2; - newpoints = (DDXPointPtr) realloc(newspans->points, - ysizes[index] * - sizeof(DDXPointRec)); - newwidths = - (int *) realloc(newspans->widths, - ysizes[index] * sizeof(int)); - if (!newpoints || !newwidths) { - for (i = 0; i < ylength; i++) { - free(yspans[i].points); - free(yspans[i].widths); - } - free(yspans); - free(ysizes); - free(newpoints); - free(newwidths); - miDisposeSpanGroup(spanGroup); - return; - } - newspans->points = newpoints; - newspans->widths = newwidths; - } - newspans->points[newspans->count] = *points; - newspans->widths[newspans->count] = *widths; - (newspans->count)++; - } /* if y value of span in range */ - } /* for j through spans */ - count += spans->count; - free(spans->points); - spans->points = NULL; - free(spans->widths); - spans->widths = NULL; - } /* for i thorough Spans */ - - /* Now sort by x and uniquify each bucket into the final array */ - points = malloc(count * sizeof(DDXPointRec)); - widths = malloc(count * sizeof(int)); - if (!points || !widths) { - for (i = 0; i < ylength; i++) { - free(yspans[i].points); - free(yspans[i].widths); - } - free(yspans); - free(ysizes); - free(points); - free(widths); - return; - } - count = 0; - for (i = 0; i != ylength; i++) { - int ycount = yspans[i].count; - - if (ycount > 0) { - if (ycount > 1) { - QuickSortSpansX(yspans[i].points, yspans[i].widths, ycount); - count += UniquifySpansX - (&(yspans[i]), &(points[count]), &(widths[count])); - } - else { - points[count] = yspans[i].points[0]; - widths[count] = yspans[i].widths[0]; - count++; - } - free(yspans[i].points); - free(yspans[i].widths); - } - } - - (*pGC->ops->FillSpans) (pDraw, pGC, count, points, widths, TRUE); - free(points); - free(widths); - free(yspans); - free(ysizes); /* use (DE)xalloc for these? */ - } - - spanGroup->count = 0; - spanGroup->ymin = MAXSHORT; - spanGroup->ymax = MINSHORT; -} diff --git a/xorg-server/mi/mispans.h b/xorg-server/mi/mispans.h deleted file mode 100644 index f3148ff..0000000 --- a/xorg-server/mi/mispans.h +++ /dev/null @@ -1,87 +0,0 @@ -/*********************************************************** - -Copyright 1989, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -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 -OPEN GROUP 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 Open Group 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 Open Group. - -Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -******************************************************************/ - -#ifndef MISPANS_H -#define MISPANS_H - -typedef struct { - int count; /* number of spans */ - DDXPointPtr points; /* pointer to list of start points */ - int *widths; /* pointer to list of widths */ -} Spans; - -typedef struct { - int size; /* Total number of *Spans allocated */ - int count; /* Number of *Spans actually in group */ - Spans *group; /* List of Spans */ - int ymin, ymax; /* Min, max y values encountered */ -} SpanGroup; - -/* Initialize SpanGroup. MUST BE DONE before use. */ -extern _X_EXPORT void miInitSpanGroup(SpanGroup * /*spanGroup */ - ); - -/* Add a Spans to a SpanGroup. The spans MUST BE in y-sorted order */ -extern _X_EXPORT void miAppendSpans(SpanGroup * /*spanGroup */ , - SpanGroup * /*otherGroup */ , - Spans * /*spans */ - ); - -/* Paint a span group, insuring that each pixel is painted at most once */ -extern _X_EXPORT void miFillUniqueSpanGroup(DrawablePtr /*pDraw */ , - GCPtr /*pGC */ , - SpanGroup * /*spanGroup */ - ); - -/* Free up data in a span group. MUST BE DONE or you'll suffer memory leaks */ -extern _X_EXPORT void miFreeSpanGroup(SpanGroup * /*spanGroup */ - ); - -/* Rops which must use span groups */ -#define miSpansCarefulRop(rop) (((rop) & 0xc) == 0x8 || ((rop) & 0x3) == 0x2) -#define miSpansEasyRop(rop) (!miSpansCarefulRop(rop)) - -#endif /* MISPANS_H */ diff --git a/xorg-server/mi/mistruct.h b/xorg-server/mi/mistruct.h index 17f7d83..00856f1 100644 --- a/xorg-server/mi/mistruct.h +++ b/xorg-server/mi/mistruct.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mivaltree.c b/xorg-server/mi/mivaltree.c index 8e4e9a9..ea6889f 100644 --- a/xorg-server/mi/mivaltree.c +++ b/xorg-server/mi/mivaltree.c @@ -27,19 +27,19 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * - * Copyright 1987, 1988, 1989 by + * Copyright 1987, 1988, 1989 by * Digital Equipment Corporation, Maynard, Massachusetts, - * + * * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in + * both that copyright notice and this permission notice appear in * supporting documentation, and that the name of Digital not be * used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * + * software without specific, written prior permission. + * * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. - * + * ******************************************************************/ /* The panoramix components contained the following notice */ @@ -79,7 +79,7 @@ Equipment Corporation. ******************************************************************/ - /* + /* * Aug '86: Susan Angebranndt -- original code * July '87: Adam de Boor -- substantially modified and commented * Summer '89: Joel McCormack -- so fast you wouldn't believe it possible. diff --git a/xorg-server/mi/miwideline.c b/xorg-server/mi/miwideline.c index 29ba12c..452d74f 100644 --- a/xorg-server/mi/miwideline.c +++ b/xorg-server/mi/miwideline.c @@ -24,6 +24,25 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. +Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. + + All Rights Reserved + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of Digital not be +used in advertising or publicity pertaining to distribution of the +software without specific, written prior permission. + +DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. */ /* Author: Keith Packard, MIT X Consortium */ @@ -52,6 +71,505 @@ from The Open Group. #include "miwideline.h" #include "mi.h" +#if 0 +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#include "misc.h" +#include "pixmapstr.h" +#include "gcstruct.h" +#endif + +typedef struct { + int count; /* number of spans */ + DDXPointPtr points; /* pointer to list of start points */ + int *widths; /* pointer to list of widths */ +} Spans; + +typedef struct { + int size; /* Total number of *Spans allocated */ + int count; /* Number of *Spans actually in group */ + Spans *group; /* List of Spans */ + int ymin, ymax; /* Min, max y values encountered */ +} SpanGroup; + +/* Rops which must use span groups */ +#define miSpansCarefulRop(rop) (((rop) & 0xc) == 0x8 || ((rop) & 0x3) == 0x2) +#define miSpansEasyRop(rop) (!miSpansCarefulRop(rop)) + +/* + +These routines maintain lists of Spans, in order to implement the +``touch-each-pixel-once'' rules of wide lines and arcs. + +Written by Joel McCormack, Summer 1989. + +*/ + +static void +miInitSpanGroup(SpanGroup * spanGroup) +{ + spanGroup->size = 0; + spanGroup->count = 0; + spanGroup->group = NULL; + spanGroup->ymin = MAXSHORT; + spanGroup->ymax = MINSHORT; +} /* InitSpanGroup */ + +#define YMIN(spans) (spans->points[0].y) +#define YMAX(spans) (spans->points[spans->count-1].y) + +static void +miSubtractSpans(SpanGroup * spanGroup, Spans * sub) +{ + int i, subCount, spansCount; + int ymin, ymax, xmin, xmax; + Spans *spans; + DDXPointPtr subPt, spansPt; + int *subWid, *spansWid; + int extra; + + ymin = YMIN(sub); + ymax = YMAX(sub); + spans = spanGroup->group; + for (i = spanGroup->count; i; i--, spans++) { + if (YMIN(spans) <= ymax && ymin <= YMAX(spans)) { + subCount = sub->count; + subPt = sub->points; + subWid = sub->widths; + spansCount = spans->count; + spansPt = spans->points; + spansWid = spans->widths; + extra = 0; + for (;;) { + while (spansCount && spansPt->y < subPt->y) { + spansPt++; + spansWid++; + spansCount--; + } + if (!spansCount) + break; + while (subCount && subPt->y < spansPt->y) { + subPt++; + subWid++; + subCount--; + } + if (!subCount) + break; + if (subPt->y == spansPt->y) { + xmin = subPt->x; + xmax = xmin + *subWid; + if (xmin >= spansPt->x + *spansWid || spansPt->x >= xmax) { + ; + } + else if (xmin <= spansPt->x) { + if (xmax >= spansPt->x + *spansWid) { + memmove(spansPt, spansPt + 1, + sizeof *spansPt * (spansCount - 1)); + memmove(spansWid, spansWid + 1, + sizeof *spansWid * (spansCount - 1)); + spansPt--; + spansWid--; + spans->count--; + extra++; + } + else { + *spansWid = *spansWid - (xmax - spansPt->x); + spansPt->x = xmax; + } + } + else { + if (xmax >= spansPt->x + *spansWid) { + *spansWid = xmin - spansPt->x; + } + else { + if (!extra) { + DDXPointPtr newPt; + int *newwid; + +#define EXTRA 8 + newPt = + (DDXPointPtr) realloc(spans->points, + (spans->count + + EXTRA) * + sizeof(DDXPointRec)); + if (!newPt) + break; + spansPt = newPt + (spansPt - spans->points); + spans->points = newPt; + newwid = + (int *) realloc(spans->widths, + (spans->count + + EXTRA) * sizeof(int)); + if (!newwid) + break; + spansWid = newwid + (spansWid - spans->widths); + spans->widths = newwid; + extra = EXTRA; + } + memmove(spansPt + 1, spansPt, + sizeof *spansPt * (spansCount)); + memmove(spansWid + 1, spansWid, + sizeof *spansWid * (spansCount)); + spans->count++; + extra--; + *spansWid = xmin - spansPt->x; + spansWid++; + spansPt++; + *spansWid = *spansWid - (xmax - spansPt->x); + spansPt->x = xmax; + } + } + } + spansPt++; + spansWid++; + spansCount--; + } + } + } +} + +static void +miAppendSpans(SpanGroup * spanGroup, SpanGroup * otherGroup, Spans * spans) +{ + int ymin, ymax; + int spansCount; + + spansCount = spans->count; + if (spansCount > 0) { + if (spanGroup->size == spanGroup->count) { + spanGroup->size = (spanGroup->size + 8) * 2; + spanGroup->group = (Spans *) + realloc(spanGroup->group, sizeof(Spans) * spanGroup->size); + } + + spanGroup->group[spanGroup->count] = *spans; + (spanGroup->count)++; + ymin = spans->points[0].y; + if (ymin < spanGroup->ymin) + spanGroup->ymin = ymin; + ymax = spans->points[spansCount - 1].y; + if (ymax > spanGroup->ymax) + spanGroup->ymax = ymax; + if (otherGroup && otherGroup->ymin < ymax && ymin < otherGroup->ymax) { + miSubtractSpans(otherGroup, spans); + } + } + else { + free(spans->points); + free(spans->widths); + } +} /* AppendSpans */ + +static void +miFreeSpanGroup(SpanGroup * spanGroup) +{ + free(spanGroup->group); +} + +static void +QuickSortSpansX(DDXPointRec points[], int widths[], int numSpans) +{ + int x; + int i, j, m; + DDXPointPtr r; + +/* Always called with numSpans > 1 */ +/* Sorts only by x, as all y should be the same */ + +#define ExchangeSpans(a, b) \ +{ \ + DDXPointRec tpt; \ + int tw; \ + \ + tpt = points[a]; points[a] = points[b]; points[b] = tpt; \ + tw = widths[a]; widths[a] = widths[b]; widths[b] = tw; \ +} + + do { + if (numSpans < 9) { + /* Do insertion sort */ + int xprev; + + xprev = points[0].x; + i = 1; + do { /* while i != numSpans */ + x = points[i].x; + if (xprev > x) { + /* points[i] is out of order. Move into proper location. */ + DDXPointRec tpt; + int tw, k; + + for (j = 0; x >= points[j].x; j++) { + } + tpt = points[i]; + tw = widths[i]; + for (k = i; k != j; k--) { + points[k] = points[k - 1]; + widths[k] = widths[k - 1]; + } + points[j] = tpt; + widths[j] = tw; + x = points[i].x; + } /* if out of order */ + xprev = x; + i++; + } while (i != numSpans); + return; + } + + /* Choose partition element, stick in location 0 */ + m = numSpans / 2; + if (points[m].x > points[0].x) + ExchangeSpans(m, 0); + if (points[m].x > points[numSpans - 1].x) + ExchangeSpans(m, numSpans - 1); + if (points[m].x > points[0].x) + ExchangeSpans(m, 0); + x = points[0].x; + + /* Partition array */ + i = 0; + j = numSpans; + do { + r = &(points[i]); + do { + r++; + i++; + } while (i != numSpans && r->x < x); + r = &(points[j]); + do { + r--; + j--; + } while (x < r->x); + if (i < j) + ExchangeSpans(i, j); + } while (i < j); + + /* Move partition element back to middle */ + ExchangeSpans(0, j); + + /* Recurse */ + if (numSpans - j - 1 > 1) + QuickSortSpansX(&points[j + 1], &widths[j + 1], numSpans - j - 1); + numSpans = j; + } while (numSpans > 1); +} /* QuickSortSpans */ + +static int +UniquifySpansX(Spans * spans, DDXPointRec * newPoints, int *newWidths) +{ + int newx1, newx2, oldpt, i, y; + DDXPointRec *oldPoints; + int *oldWidths; + int *startNewWidths; + +/* Always called with numSpans > 1 */ +/* Uniquify the spans, and stash them into newPoints and newWidths. Return the + number of unique spans. */ + + startNewWidths = newWidths; + + oldPoints = spans->points; + oldWidths = spans->widths; + + y = oldPoints->y; + newx1 = oldPoints->x; + newx2 = newx1 + *oldWidths; + + for (i = spans->count - 1; i != 0; i--) { + oldPoints++; + oldWidths++; + oldpt = oldPoints->x; + if (oldpt > newx2) { + /* Write current span, start a new one */ + newPoints->x = newx1; + newPoints->y = y; + *newWidths = newx2 - newx1; + newPoints++; + newWidths++; + newx1 = oldpt; + newx2 = oldpt + *oldWidths; + } + else { + /* extend current span, if old extends beyond new */ + oldpt = oldpt + *oldWidths; + if (oldpt > newx2) + newx2 = oldpt; + } + } /* for */ + + /* Write final span */ + newPoints->x = newx1; + *newWidths = newx2 - newx1; + newPoints->y = y; + + return (newWidths - startNewWidths) + 1; +} /* UniquifySpansX */ + +static void +miDisposeSpanGroup(SpanGroup * spanGroup) +{ + int i; + Spans *spans; + + for (i = 0; i < spanGroup->count; i++) { + spans = spanGroup->group + i; + free(spans->points); + free(spans->widths); + } +} + +static void +miFillUniqueSpanGroup(DrawablePtr pDraw, GCPtr pGC, SpanGroup * spanGroup) +{ + int i; + Spans *spans; + Spans *yspans; + int *ysizes; + int ymin, ylength; + + /* Outgoing spans for one big call to FillSpans */ + DDXPointPtr points; + int *widths; + int count; + + if (spanGroup->count == 0) + return; + + if (spanGroup->count == 1) { + /* Already should be sorted, unique */ + spans = spanGroup->group; + (*pGC->ops->FillSpans) + (pDraw, pGC, spans->count, spans->points, spans->widths, TRUE); + free(spans->points); + free(spans->widths); + } + else { + /* Yuck. Gross. Radix sort into y buckets, then sort x and uniquify */ + /* This seems to be the fastest thing to do. I've tried sorting on + both x and y at the same time rather than creating into all those + y buckets, but it was somewhat slower. */ + + ymin = spanGroup->ymin; + ylength = spanGroup->ymax - ymin + 1; + + /* Allocate Spans for y buckets */ + yspans = malloc(ylength * sizeof(Spans)); + ysizes = malloc(ylength * sizeof(int)); + + if (!yspans || !ysizes) { + free(yspans); + free(ysizes); + miDisposeSpanGroup(spanGroup); + return; + } + + for (i = 0; i != ylength; i++) { + ysizes[i] = 0; + yspans[i].count = 0; + yspans[i].points = NULL; + yspans[i].widths = NULL; + } + + /* Go through every single span and put it into the correct bucket */ + count = 0; + for (i = 0, spans = spanGroup->group; + i != spanGroup->count; i++, spans++) { + int index; + int j; + + for (j = 0, points = spans->points, widths = spans->widths; + j != spans->count; j++, points++, widths++) { + index = points->y - ymin; + if (index >= 0 && index < ylength) { + Spans *newspans = &(yspans[index]); + + if (newspans->count == ysizes[index]) { + DDXPointPtr newpoints; + int *newwidths; + + ysizes[index] = (ysizes[index] + 8) * 2; + newpoints = (DDXPointPtr) realloc(newspans->points, + ysizes[index] * + sizeof(DDXPointRec)); + newwidths = + (int *) realloc(newspans->widths, + ysizes[index] * sizeof(int)); + if (!newpoints || !newwidths) { + for (i = 0; i < ylength; i++) { + free(yspans[i].points); + free(yspans[i].widths); + } + free(yspans); + free(ysizes); + free(newpoints); + free(newwidths); + miDisposeSpanGroup(spanGroup); + return; + } + newspans->points = newpoints; + newspans->widths = newwidths; + } + newspans->points[newspans->count] = *points; + newspans->widths[newspans->count] = *widths; + (newspans->count)++; + } /* if y value of span in range */ + } /* for j through spans */ + count += spans->count; + free(spans->points); + spans->points = NULL; + free(spans->widths); + spans->widths = NULL; + } /* for i thorough Spans */ + + /* Now sort by x and uniquify each bucket into the final array */ + points = malloc(count * sizeof(DDXPointRec)); + widths = malloc(count * sizeof(int)); + if (!points || !widths) { + for (i = 0; i < ylength; i++) { + free(yspans[i].points); + free(yspans[i].widths); + } + free(yspans); + free(ysizes); + free(points); + free(widths); + return; + } + count = 0; + for (i = 0; i != ylength; i++) { + int ycount = yspans[i].count; + + if (ycount > 0) { + if (ycount > 1) { + QuickSortSpansX(yspans[i].points, yspans[i].widths, ycount); + count += UniquifySpansX + (&(yspans[i]), &(points[count]), &(widths[count])); + } + else { + points[count] = yspans[i].points[0]; + widths[count] = yspans[i].widths[0]; + count++; + } + free(yspans[i].points); + free(yspans[i].widths); + } + } + + (*pGC->ops->FillSpans) (pDraw, pGC, count, points, widths, TRUE); + free(points); + free(widths); + free(yspans); + free(ysizes); /* use (DE)xalloc for these? */ + } + + spanGroup->count = 0; + spanGroup->ymin = MAXSHORT; + spanGroup->ymax = MINSHORT; +} + static Bool InitSpans(Spans * spans, size_t nspans) { @@ -273,7 +791,7 @@ miFillRectPolyHelper(DrawablePtr pDrawable, } } -/* static */ int +static int miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */ int dx, int dy, int xi, int yi, int left, PolyEdgePtr edge) { @@ -325,7 +843,7 @@ miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */ #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) -/* static */ int +static int miPolyBuildPoly(PolyVertexPtr vertices, PolySlopePtr slopes, int count, @@ -865,7 +1383,7 @@ miRoundJoinFace(LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge) return y; } -void +static void miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight, PolyEdgePtr edge1, PolyEdgePtr edge2, int *y1, int *y2, Bool *left1, Bool *left2) @@ -886,7 +1404,7 @@ miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight, *y2 = miRoundJoinFace(pRight, edge2, left2); } -int +static int miRoundCapClip(LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge) { int y; diff --git a/xorg-server/mi/miwideline.h b/xorg-server/mi/miwideline.h index 1105411..88bc3d6 100644 --- a/xorg-server/mi/miwideline.h +++ b/xorg-server/mi/miwideline.h @@ -28,7 +28,6 @@ from The Open Group. /* Author: Keith Packard, MIT X Consortium */ -#include "mispans.h" #include "mifpoly.h" /* for ICEIL */ /* @@ -92,28 +91,3 @@ typedef struct _LineFace { ValidateGC (pDrawable, pGC); \ } \ } - -extern _X_EXPORT void miRoundJoinClip(LineFacePtr /*pLeft */ , - LineFacePtr /*pRight */ , - PolyEdgePtr /*edge1 */ , - PolyEdgePtr /*edge2 */ , - int * /*y1 */ , - int * /*y2 */ , - Bool * /*left1 */ , - Bool * /*left2 */ - ); - -extern _X_EXPORT int miRoundCapClip(LineFacePtr /*face */ , - Bool /*isInt */ , - PolyEdgePtr /*edge */ , - Bool * /*leftEdge */ - ); - -extern _X_EXPORT int miPolyBuildEdge(double x0, double y0, double k, int dx, - int dy, int xi, int yi, int left, - PolyEdgePtr edge); -extern _X_EXPORT int miPolyBuildPoly(PolyVertexPtr vertices, - PolySlopePtr slopes, int count, int xi, - int yi, PolyEdgePtr left, - PolyEdgePtr right, int *pnleft, - int *pnright, int *h); diff --git a/xorg-server/mi/miwindow.c b/xorg-server/mi/miwindow.c index 0cf5046..a1af3a7 100644 --- a/xorg-server/mi/miwindow.c +++ b/xorg-server/mi/miwindow.c @@ -27,13 +27,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mizerclip.c b/xorg-server/mi/mizerclip.c index d05bf67..0ae9641 100644 --- a/xorg-server/mi/mizerclip.c +++ b/xorg-server/mi/mizerclip.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/mi/mizerline.c b/xorg-server/mi/mizerline.c index f30e012..5a24470 100644 --- a/xorg-server/mi/mizerline.c +++ b/xorg-server/mi/mizerline.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -235,7 +235,7 @@ miZeroLine(DrawablePtr pDraw, GCPtr pGC, int mode, /* Origin or Previous */ length = abs(new_x2 - new_x1); /* if we've clipped the endpoint, always draw the full length - * of the segment, because then the capstyle doesn't matter + * of the segment, because then the capstyle doesn't matter */ if (pt2_clipped) length++; @@ -295,7 +295,7 @@ miZeroLine(DrawablePtr pDraw, GCPtr pGC, int mode, /* Origin or Previous */ length = abs(new_y2 - new_y1); /* if we've clipped the endpoint, always draw the full length - * of the segment, because then the capstyle doesn't matter + * of the segment, because then the capstyle doesn't matter */ if (pt2_clipped) length++; diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c index 9bd9c84..6ef7f9d 100644 --- a/xorg-server/miext/damage/damage.c +++ b/xorg-server/miext/damage/damage.c @@ -1591,7 +1591,7 @@ miDamageCreate(DamagePtr pDamage) * Since we can't know if a GC has been validated against one of the affected * children, just bump them all to be safe. */ -static int +static int damageRegisterVisit(WindowPtr pWin, void *data) { pWin->drawable.serialNumber = NEXT_SERIAL_NUMBER; diff --git a/xorg-server/miext/rootless/rootless.h b/xorg-server/miext/rootless/rootless.h index a3f38b6..1be61cd 100644 --- a/xorg-server/miext/rootless/rootless.h +++ b/xorg-server/miext/rootless/rootless.h @@ -319,7 +319,7 @@ typedef struct _RootlessFrameProcs { Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs); /* - * Return the frame ID for the physical window displaying the given window. + * Return the frame ID for the physical window displaying the given window. * * create If true and the window has no frame, attempt to create one */ diff --git a/xorg-server/miext/rootless/rootlessGC.c b/xorg-server/miext/rootless/rootlessGC.c index 23ff393..4fba26c 100644 --- a/xorg-server/miext/rootless/rootlessGC.c +++ b/xorg-server/miext/rootless/rootlessGC.c @@ -297,7 +297,7 @@ RootlessCreateGC(GCPtr pGC) * All the others just unwrap and call. */ -// GCFUNC_UNRAP assumes funcs have been wrapped and +// GCFUNC_UNRAP assumes funcs have been wrapped and // does not assume ops have been wrapped #define GCFUNC_UNWRAP(pGC) \ RootlessGCRec *gcrec = (RootlessGCRec *) \ diff --git a/xorg-server/miext/rootless/rootlessValTree.c b/xorg-server/miext/rootless/rootlessValTree.c index c7c2c99..0f7b76c 100644 --- a/xorg-server/miext/rootless/rootlessValTree.c +++ b/xorg-server/miext/rootless/rootlessValTree.c @@ -29,19 +29,19 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * - * Copyright 1987, 1988, 1989 by + * Copyright 1987, 1988, 1989 by * Digital Equipment Corporation, Maynard, Massachusetts, - * + * * All Rights Reserved - * - * Permission to use, copy, modify, and distribute this software and its - * documentation for any purpose and without fee is hereby granted, + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, * provided that the above copyright notice appear in all copies and that - * both that copyright notice and this permission notice appear in + * both that copyright notice and this permission notice appear in * supporting documentation, and that the name of Digital not be * used in advertising or publicity pertaining to distribution of the - * software without specific, written prior permission. - * + * software without specific, written prior permission. + * * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group. * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS * SOFTWARE. - * + * ******************************************************************/ /* The panoramix components contained the following notice */ @@ -80,7 +80,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ - /* + /* * Aug '86: Susan Angebranndt -- original code * July '87: Adam de Boor -- substantially modified and commented * Summer '89: Joel McCormack -- so fast you wouldn't believe it possible. @@ -456,9 +456,9 @@ RootlessTreeObscured(WindowPtr pParent) * *----------------------------------------------------------------------- */ -/* +/* Quartz version: used for validate from root in rootless mode. - We need to make sure top-level windows don't clip each other, + We need to make sure top-level windows don't clip each other, and that top-level windows aren't clipped to the root window. */ /*ARGSUSED*/ @@ -491,9 +491,9 @@ RootlessMiValidateTree(WindowPtr pRoot, /* Parent to validate */ ErrorF("ValidateTree: BUSTED!\n"); } - /* - * Recursively compute the clips for all children of the root. - * They don't clip against each other or the root itself, so + /* + * Recursively compute the clips for all children of the root. + * They don't clip against each other or the root itself, so * childClip is always reset to that child's size. */ @@ -520,7 +520,7 @@ RootlessMiValidateTree(WindowPtr pRoot, /* Parent to validate */ RegionUninit(&childClip); - /* The root is never clipped by its children, so nothing on the root + /* The root is never clipped by its children, so nothing on the root is ever exposed by moving or mapping its children. */ RegionNull(&pRoot->valdata->after.exposed); RegionNull(&pRoot->valdata->after.borderExposed); diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c index 3dbd588..a8f296a 100644 --- a/xorg-server/miext/rootless/rootlessWindow.c +++ b/xorg-server/miext/rootless/rootlessWindow.c @@ -128,7 +128,7 @@ RootlessNativeWindowMoved(WindowPtr pWin) return; } - /* Don't want to do anything to the physical window (avoids + /* Don't want to do anything to the physical window (avoids notification-response feedback loops) */ no_configure_window = TRUE; @@ -477,7 +477,7 @@ RootlessRealizeWindow(WindowPtr pWin) /* * RootlessFrameForWindow - * Returns the frame ID for the physical window displaying the given window. + * Returns the frame ID for the physical window displaying the given window. * If CREATE is true and the window has no frame, attempt to create one. */ RootlessFrameID @@ -559,7 +559,7 @@ RootlessReorderWindow(WindowPtr pWin) RootlessStopDrawing(pWin, FALSE); - /* Find the next window above this one that has a mapped frame. + /* Find the next window above this one that has a mapped frame. * Only include cases where the windows are in the same category of * hittability to ensure offscreen windows dont get restacked * relative to onscreen ones (but that the offscreen ones maintain diff --git a/xorg-server/miext/shadow/shrotate.c b/xorg-server/miext/shadow/shrotate.c index 779a905..a0fc4ec 100644 --- a/xorg-server/miext/shadow/shrotate.c +++ b/xorg-server/miext/shadow/shrotate.c @@ -259,7 +259,7 @@ shadowUpdateRotatePacked(ScreenPtr pScreen, shadowBufPtr pBuf) p = pixelsPerBits; /* * Build one word of output from multiple inputs - * + * * Note that for 90/270 rotations, this will walk * down the shadow hitting each scanline once. * This is probably not very efficient. diff --git a/xorg-server/miext/sync/misyncfd.c b/xorg-server/miext/sync/misyncfd.c index 93ff85f..92f3b22 100644 --- a/xorg-server/miext/sync/misyncfd.c +++ b/xorg-server/miext/sync/misyncfd.c @@ -77,7 +77,7 @@ _X_EXPORT Bool miSyncFdScreenInit(ScreenPtr pScreen, if (!miSyncSetup(pScreen)) return FALSE; - + if (!dixPrivateKeyRegistered(&syncFdScreenPrivateKey)) { if (!dixRegisterPrivateKey(&syncFdScreenPrivateKey, PRIVATE_SCREEN, 0)) return FALSE; @@ -94,6 +94,6 @@ _X_EXPORT Bool miSyncFdScreenInit(ScreenPtr pScreen, priv->funcs = *funcs; dixSetPrivate(&pScreen->devPrivates, &syncFdScreenPrivateKey, priv); - + return TRUE; } diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c index 3eb15b9..86d96c8 100644 --- a/xorg-server/os/WaitFor.c +++ b/xorg-server/os/WaitFor.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -82,7 +82,7 @@ SOFTWARE. #define EINVAL WSAEINVAL #undef EBADF #define EBADF WSAENOTSOCK -/* Windows select does not set errno. Use GetErrno as wrapper for +/* Windows select does not set errno. Use GetErrno as wrapper for WSAGetLastError */ #define GetErrno WSAGetLastError #else @@ -167,7 +167,7 @@ WaitForSomething(int *pClientsReady) busfault_check(); #endif - /* We need a while loop here to handle + /* We need a while loop here to handle crashed connections and the screen saver timeout */ while (1) { /* deal with any blocked jobs */ @@ -343,14 +343,14 @@ WaitForSomething(int *pClientsReady) * ready, they are all returned. This means that an * aggressive client could take over the server. * This was not considered a big problem because - * aggressive clients can hose the server in so many + * aggressive clients can hose the server in so many * other ways :) */ client_priority = clients[client_index]->priority; if (nready == 0 || client_priority > highest_priority) { /* Either we found the first client, or we found * a client whose priority is greater than all others - * that have been found so far. Either way, we want + * that have been found so far. Either way, we want * to initialize the list of clients to contain just * this client. */ @@ -358,7 +358,7 @@ WaitForSomething(int *pClientsReady) highest_priority = client_priority; nready = 1; } - /* the following if makes sure that multiple same-priority + /* the following if makes sure that multiple same-priority * clients get batched together */ else if (client_priority == highest_priority) { diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c index 125f35f..5c510de 100644 --- a/xorg-server/os/access.c +++ b/xorg-server/os/access.c @@ -35,13 +35,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -201,7 +201,7 @@ static Bool NewHost(int /*family */ , /etc/X<display>.hosts, we've added a requested field to the HOST struct, and a LocalHostRequested variable. These default to FALSE, but are set to TRUE in ResetHosts when reading in /etc/X<display>.hosts. They are - checked in DisableLocalHost(), which is called to disable the default + checked in DisableLocalHost(), which is called to disable the default local host entries when stronger authentication is turned on. */ typedef struct _host { @@ -309,7 +309,7 @@ ifioctl(int fd, int cmd, char *arg) /* * DefineSelf (fd): * - * Define this host for access control. Find all the hosts the OS knows about + * Define this host for access control. Find all the hosts the OS knows about * for this fd and add them to the selfhosts list. */ @@ -712,7 +712,7 @@ DefineSelf(int fd) ) continue; - /* + /* * ignore 'localhost' entries as they're not useful * on the other end of the wire */ @@ -835,7 +835,7 @@ ResetHosts(const char *display) } saddr; #endif int family = 0; - void *addr; + void *addr = NULL; int len; siTypesInitialize(); @@ -928,8 +928,8 @@ ResetHosts(const char *display) len = a->ai_addrlen; f = ConvertAddr(a->ai_addr, &len, (void **) &addr); - if ((family == f) || - ((family == FamilyWild) && (f != -1))) { + if (addr && ((family == f) || + ((family == FamilyWild) && (f != -1)))) { NewHost(f, addr, len, FALSE); } } @@ -1010,7 +1010,7 @@ ComputeLocalClient(ClientPtr client) /* * Return the uid and all gids of a connected local client * Allocates a LocalClientCredRec - caller must call FreeLocalClientCreds - * + * * Used by localuser & localgroup ServerInterpreted access control forms below * Used by AuthAudit to log who local connections came from */ @@ -1037,8 +1037,8 @@ GetLocalClientCreds(ClientPtr client, LocalClientCredRec ** lccp) return -1; ci = ((OsCommPtr) client->osPrivate)->trans_conn; #if !(defined(sun) && defined(HAVE_GETPEERUCRED)) - /* Most implementations can only determine peer credentials for Unix - * domain sockets - Solaris getpeerucred can work with a bit more, so + /* Most implementations can only determine peer credentials for Unix + * domain sockets - Solaris getpeerucred can work with a bit more, so * we just let it tell us if the connection type is supported or not */ if (!_XSERVTransIsLocal(ci)) { @@ -1203,7 +1203,7 @@ ForEachHostInFamily(int family, Bool (*func) (unsigned char *addr, return FALSE; } -/* Add a host to the access control list. This is the internal interface +/* Add a host to the access control list. This is the internal interface * called when starting or resetting the server */ static Bool NewHost(int family, const void *addr, int len, int addingLocalHosts) @@ -1352,14 +1352,14 @@ CheckAddr(int family, const void *pAddr, unsigned length) return len; } -/* Check if a host is not in the access control list. +/* Check if a host is not in the access control list. * Returns 1 if host is invalid, 0 if we've found it. */ int InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) { int family; - void *addr; + void *addr = NULL; register HOST *selfhost, *host; if (!AccessEnabled) /* just let them in */ @@ -1370,7 +1370,7 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) if (family == FamilyLocal) { if (!LocalHostEnabled) { /* - * check to see if any local address is enabled. This + * check to see if any local address is enabled. This * implicitly enables local connections. */ for (selfhost = selfhosts; selfhost; selfhost = selfhost->next) { @@ -1386,12 +1386,12 @@ InvalidHost(register struct sockaddr *saddr, int len, ClientPtr client) } for (host = validhosts; host; host = host->next) { if (host->family == FamilyServerInterpreted) { - if (siAddrMatch(family, addr, len, host, client)) { + if (addr && siAddrMatch(family, addr, len, host, client)) { return 0; } } else { - if (addrEqual(family, addr, len, host)) + if (addr && addrEqual(family, addr, len, host)) return 0; } @@ -1474,7 +1474,7 @@ GetAccessControl(void) * See xc/doc/specs/SIAddresses for formal definitions of each type. */ -/* These definitions and the siTypeAdd function could be exported in the +/* These definitions and the siTypeAdd function could be exported in the * future to enable loading additional host types, but that was not done for * the initial implementation. */ @@ -1571,7 +1571,7 @@ siCheckAddr(const char *addrString, int length) valueString = (const char *) memchr(addrString, '\0', length); if (valueString != NULL) { /* Make sure the first string is a recognized address type, - * and the second string is a valid address of that type. + * and the second string is a valid address of that type. */ typelen = strlen(addrString) + 1; addrlen = length - typelen; @@ -1638,8 +1638,8 @@ siHostnameAddrMatch(int family, void *addr, int len, { Bool res = FALSE; -/* Currently only supports checking against IPv4 & IPv6 connections, but - * support for other address families, such as DECnet, could be added if +/* Currently only supports checking against IPv4 & IPv6 connections, but + * support for other address families, such as DECnet, could be added if * desired. */ #if defined(IPv6) && defined(AF_INET6) @@ -1648,7 +1648,7 @@ siHostnameAddrMatch(int family, void *addr, int len, struct addrinfo *addresses; struct addrinfo *a; int f, hostaddrlen; - void *hostaddr; + void *hostaddr = NULL; if (siAddrLen >= sizeof(hostname)) return FALSE; @@ -1659,7 +1659,7 @@ siHostnameAddrMatch(int family, void *addr, int len, for (a = addresses; a != NULL; a = a->ai_next) { hostaddrlen = a->ai_addrlen; f = ConvertAddr(a->ai_addr, &hostaddrlen, &hostaddr); - if ((f == family) && (len == hostaddrlen) && + if ((f == family) && (len == hostaddrlen) && hostaddr && (memcmp(addr, hostaddr, len) == 0)) { res = TRUE; break; @@ -1717,7 +1717,7 @@ siHostnameCheckAddr(const char *valueString, int length, void *typePriv) { /* Check conformance of hostname to RFC 2396 sec. 3.2.2 definition. * We do not use ctype functions here to avoid locale-specific - * character sets. Hostnames must be pure ASCII. + * character sets. Hostnames must be pure ASCII. */ int len = length; int i; @@ -1771,12 +1771,12 @@ siHostnameCheckAddr(const char *valueString, int length, void *typePriv) * * Currently supports only IPv6 literal address as specified in IETF RFC 3513 * - * Once draft-ietf-ipv6-scoping-arch-00.txt becomes an RFC, support will be + * Once draft-ietf-ipv6-scoping-arch-00.txt becomes an RFC, support will be * added for the scoped address format it specifies. */ -/* Maximum length of an IPv6 address string - increase when adding support - * for scoped address qualifiers. Includes room for trailing NUL byte. +/* Maximum length of an IPv6 address string - increase when adding support + * for scoped address qualifiers. Includes room for trailing NUL byte. */ #define SI_IPv6_MAXLEN INET6_ADDRSTRLEN diff --git a/xorg-server/os/busfault.c b/xorg-server/os/busfault.c index ac0268f..d4afa6d 100644 --- a/xorg-server/os/busfault.c +++ b/xorg-server/os/busfault.c @@ -47,7 +47,7 @@ struct busfault { void *context; }; -static Bool busfaulted; +static Bool busfaulted; static struct xorg_list busfaults; struct busfault * diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c index f915e12..da3397d 100644 --- a/xorg-server/os/connection.c +++ b/xorg-server/os/connection.c @@ -26,13 +26,13 @@ Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -421,7 +421,7 @@ CreateWellKnownSockets(void) } else { /* -displayfd and no explicit display number */ Bool found = 0; - for (i = 0; i < 65535 - X_TCP_PORT; i++) { + for (i = 0; i < 65536 - X_TCP_PORT; i++) { if (TryCreateSocket(i, &partial) && !partial) { found = 1; break; @@ -648,8 +648,8 @@ AuthorizationIDOfClient(ClientPtr client) * CARD8 byteOrder; * BYTE pad; * CARD16 majorVersion, minorVersion; - * CARD16 nbytesAuthProto; - * CARD16 nbytesAuthString; + * CARD16 nbytesAuthProto; + * CARD16 nbytesAuthString; * } xConnClientPrefix; * * It is hoped that eventually one protocol will be agreed upon. In the @@ -974,7 +974,7 @@ CloseDownFileDescriptor(OsCommPtr oc) /***************** * CheckConnections - * Some connection has died, go find which one and shut it down + * Some connection has died, go find which one and shut it down * The file descriptor has been closed, but is still in AllClients. * If would truly be wonderful if select() would put the bogus * file descriptors in the exception mask, but nooooo. So we have @@ -1035,7 +1035,7 @@ CheckConnections(void) /***************** * CloseDownConnection - * Delete client from AllClients and free resources + * Delete client from AllClients and free resources *****************/ void diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c index 8181a86..bb273bb 100644 --- a/xorg-server/os/io.c +++ b/xorg-server/os/io.c @@ -26,13 +26,13 @@ Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -448,7 +448,7 @@ ReadRequestFromClient(ClientPtr client) * buffer beyond the request we're returning to the caller. * If there is only a partial request, treat like buffer * is empty so that select() will be called again and other clients - * can get into the queue. + * can get into the queue. */ gotnow -= needed; diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 7348ad4..2e3b3f6 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -127,7 +127,7 @@ static char __crashreporter_info_buff__[4096] = { 0 }; static const char *__crashreporter_info__ __attribute__ ((__used__)) = &__crashreporter_info_buff__[0]; #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 -// This is actually a toolchain requirement, but I'm not sure the correct check, +// This is actually a toolchain requirement, but I'm not sure the correct check, // but it should be fine to just only include it for Leopard and later. This line // just tells the linker to never strip this symbol (such as for space optimization) asm(".desc ___crashreporter_info__, 0x10"); diff --git a/xorg-server/os/oscolor.c b/xorg-server/os/oscolor.c index a44ed3f..017aab1 100644 --- a/xorg-server/os/oscolor.c +++ b/xorg-server/os/oscolor.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/os/osdep.h b/xorg-server/os/osdep.h index 0ccdb62..77a5b53 100644 --- a/xorg-server/os/osdep.h +++ b/xorg-server/os/osdep.h @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 4d48ea9..ff0979a 100644 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -26,13 +26,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in +both that copyright notice and this permission notice appear in supporting documentation, and that the name of Digital not be used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. +software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -225,9 +225,9 @@ OsInit(void) fclose(stdin); fclose(stdout); # endif - /* - * If a write of zero bytes to stderr returns non-zero, i.e. -1, - * then writing to stderr failed, and we'll write somewhere else + /* + * If a write of zero bytes to stderr returns non-zero, i.e. -1, + * then writing to stderr failed, and we'll write somewhere else * instead. (Apparently this never happens in the Real World.) */ if (write(2, fname, 0) == -1) { diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c index 99616d9..b6e97c9 100644 --- a/xorg-server/os/xdmcp.c +++ b/xorg-server/os/xdmcp.c @@ -562,7 +562,7 @@ XdmcpRegisterDisplayClass(const char *name, int length) DisplayClass.data[i] = (CARD8) name[i]; } -/* +/* * initialize XDMCP; create the socket, compute the display * number, set up the state machine */ diff --git a/xorg-server/present/present.c b/xorg-server/present/present.c index 47566c7..ac9047e 100644 --- a/xorg-server/present/present.c +++ b/xorg-server/present/present.c @@ -91,7 +91,7 @@ present_flip_pending_pixmap(ScreenPtr screen) if (!screen_priv->flip_pending) return NULL; - + return screen_priv->flip_pending->pixmap; } @@ -372,7 +372,7 @@ present_set_tree_pixmap_visit(WindowPtr window, void *data) (*screen->SetWindowPixmap)(window, visit->new); return WT_WALKCHILDREN; } - + static void present_set_tree_pixmap(WindowPtr window, PixmapPtr pixmap) { @@ -866,7 +866,7 @@ present_pixmap(WindowPtr window, xorg_list_add(&vblank->event_queue, &present_exec_queue); vblank->queued = TRUE; - if (target_msc >= crtc_msc) { + if ((pixmap && target_msc >= crtc_msc) || (!pixmap && target_msc > crtc_msc)) { ret = present_queue_vblank(screen, target_crtc, vblank->event_id, target_msc); if (ret != Success) { xorg_list_del(&vblank->event_queue); @@ -929,7 +929,7 @@ present_notify_msc(WindowPtr window, 0, 0, NULL, NULL, NULL, - 0, + PresentOptionAsync, target_msc, divisor, remainder, NULL, 0); } diff --git a/xorg-server/randr/randrstr.h b/xorg-server/randr/randrstr.h index e142232..13e6a85 100644 --- a/xorg-server/randr/randrstr.h +++ b/xorg-server/randr/randrstr.h @@ -984,17 +984,17 @@ extern _X_EXPORT void #endif /* _RANDRSTR_H_ */ /* - + randr extension implementation structure Query state: ProcRRGetScreenInfo/ProcRRGetScreenResources RRGetInfo - + • Request configuration from driver, either 1.0 or 1.2 style • These functions only record state changes, all other actions are pended until RRTellChanged is called - + ->rrGetInfo 1.0: RRRegisterSize @@ -1009,15 +1009,15 @@ Query state: RROutputSetSubpixelOrder RROutputSetClones RRCrtcNotify - + • Must delay scanning configuration until after ->rrGetInfo returns because some drivers will call SetCurrentConfig in the middle of the ->rrGetInfo operation. - + 1.0: • Scan old configuration, mirror to new structures - + RRScanOldConfig RRCrtcCreate RROutputCreate @@ -1027,16 +1027,16 @@ Query state: RROldModeAdd • This adds modes one-at-a-time RRModeGet RRCrtcNotify - + • send events, reset pointer if necessary - + RRTellChanged WalkTree (sending events) - + • when layout has changed: RRPointerScreenConfigured RRSendConfigNotify - + Asynchronous state setting (1.2 only) When setting state asynchronously, the driver invokes the ->rrGetInfo function and then calls RRTellChanged to flush diff --git a/xorg-server/randr/rrprovider.c b/xorg-server/randr/rrprovider.c index 4507ba8..bbb8e51 100644 --- a/xorg-server/randr/rrprovider.c +++ b/xorg-server/randr/rrprovider.c @@ -159,7 +159,7 @@ ProcRRGetProviderInfo (ClientPtr client) ScreenPtr provscreen; RRProvider *providers; uint32_t *prov_cap; - + REQUEST_SIZE_MATCH(xRRGetProviderInfoReq); VERIFY_RR_PROVIDER(stuff->provider, provider, DixReadAccess); diff --git a/xorg-server/randr/rrtransform.c b/xorg-server/randr/rrtransform.c index f93181d..c8a2749 100644 --- a/xorg-server/randr/rrtransform.c +++ b/xorg-server/randr/rrtransform.c @@ -131,7 +131,7 @@ RRTransformRescale(struct pixman_f_transform *f_transform, double limit) /* * Compute the complete transformation matrix including - * client-specified transform, rotation/reflection values and the crtc + * client-specified transform, rotation/reflection values and the crtc * offset. * * Return TRUE if the resulting transform is not a simple translation. diff --git a/xorg-server/randr/rrtransform.h b/xorg-server/randr/rrtransform.h index 2269b4c..f811d2b 100644 --- a/xorg-server/randr/rrtransform.h +++ b/xorg-server/randr/rrtransform.h @@ -59,7 +59,7 @@ extern _X_EXPORT Bool /* * Compute the complete transformation matrix including - * client-specified transform, rotation/reflection values and the crtc + * client-specified transform, rotation/reflection values and the crtc * offset. * * Return TRUE if the resulting transform is not a simple translation. diff --git a/xorg-server/randr/rrxinerama.c b/xorg-server/randr/rrxinerama.c index 76d728c..26894a6 100644 --- a/xorg-server/randr/rrxinerama.c +++ b/xorg-server/randr/rrxinerama.c @@ -23,7 +23,7 @@ * This Xinerama implementation comes from the SiS driver which has * the following notice: */ -/* +/* * SiS driver main code * * Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria. diff --git a/xorg-server/record/record.c b/xorg-server/record/record.c index c900219..0a466e2 100644 --- a/xorg-server/record/record.c +++ b/xorg-server/record/record.c @@ -93,7 +93,7 @@ typedef union { } major; } RecordMinorOpRec, *RecordMinorOpPtr; -/* RecordClientsAndProtocolRec, nicknamed RCAP - holds all the client and +/* RecordClientsAndProtocolRec, nicknamed RCAP - holds all the client and * protocol selections passed in a single CreateContext or RegisterClients. * Generally, a context will have one of these from the create and an * additional one for each RegisterClients. RCAPs are freed when all their @@ -260,7 +260,7 @@ RecordFlushReplyBuffer(RecordContextPtr pContext, * is its length in bytes. * padlen is the number of pad bytes from a zeroed array. * futurelen is the number of bytes that will be sent in subsequent - * calls to this function to complete this protocol element. + * calls to this function to complete this protocol element. * In those subsequent calls, futurelen will be -1 to indicate * that the current data is a continuation of the same protocol * element. @@ -1020,8 +1020,8 @@ RecordUninstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient) * * Side Effects: * Recording hooks needed by client will be uninstalled if the context - * is enabled. The designated client will be removed from the - * pRCAP->pClientIDs array. If it was the only client on the RCAP, + * is enabled. The designated client will be removed from the + * pRCAP->pClientIDs array. If it was the only client on the RCAP, * the RCAP is removed from the context and freed. (Invariant: RCAPs * have at least one client.) */ @@ -1064,7 +1064,7 @@ RecordDeleteClientFromRCAP(RecordClientsAndProtocolPtr pRCAP, int position) * * Side Effects: * Recording hooks needed by client will be installed if the context - * is enabled. The designated client will be added to the + * is enabled. The designated client will be added to the * pRCAP->pClientIDs array, which may be realloced. * pRCAP->clientIDsSeparatelyAllocated may be set to 1 if there * is no more room to hold clients internal to the RCAP. @@ -1173,8 +1173,8 @@ RecordSanityCheckClientSpecifiers(ClientPtr client, XID *clientspecs, * pClientspecs is an array of CLIENTSPECs that have been sanity * checked. * pNumClientspecs is a pointer to the number of elements in pClientspecs. - * excludespec, if non-zero, is the resource id base of a client that - * should not be included in the expansion of XRecordAllClients or + * excludespec, if non-zero, is the resource id base of a client that + * should not be included in the expansion of XRecordAllClients or * XRecordCurrentClients. * * Returns: @@ -1379,7 +1379,7 @@ RecordSanityCheckRegisterClients(RecordContextPtr pContext, ClientPtr client, } /* end RecordSanityCheckRegisterClients */ /* This is a tactical structure used to gather information about all the sets - * (RecordSetPtr) that need to be created for an RCAP in the process of + * (RecordSetPtr) that need to be created for an RCAP in the process of * digesting a list of RECORDRANGEs (converting it to the internal * representation). */ @@ -1447,7 +1447,7 @@ RecordAllocIntervals(SetInfoPtr psi, int nIntervals) * Returns: BadAlloc if a memory allocation error occurred, else Success. * * Side Effects: - * The slice of pRanges indicated by byteoffset is stored in psi. + * The slice of pRanges indicated by byteoffset is stored in psi. * If pExtSetInfo is non-NULL, minor opcode intervals are stored * in an existing SetInfoRec if the major opcode interval matches, else * they are stored in a new SetInfoRec, and *pnExtSetInfo is @@ -2639,7 +2639,7 @@ SProcRecordDispatch(ClientPtr client) /* RecordConnectionSetupInfo * * Arguments: - * pContext is an enabled context that specifies recording of + * pContext is an enabled context that specifies recording of * connection setup info. * pci holds the connection setup info. * diff --git a/xorg-server/render/animcur.c b/xorg-server/render/animcur.c index 69f9f88..825ae1f 100644 --- a/xorg-server/render/animcur.c +++ b/xorg-server/render/animcur.c @@ -159,7 +159,7 @@ AnimCurScreenBlockHandler(ScreenPtr pScreen, /* * Not a simple Unwrap/Wrap as this - * isn't called along the DisplayCursor + * isn't called along the DisplayCursor * wrapper chain. */ DisplayCursor = pScreen->DisplayCursor; diff --git a/xorg-server/render/glyph.c b/xorg-server/render/glyph.c index ae38121..f3310db 100644 --- a/xorg-server/render/glyph.c +++ b/xorg-server/render/glyph.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/render/glyphstr.h b/xorg-server/render/glyphstr.h index 835c1a7..2df055d 100644 --- a/xorg-server/render/glyphstr.h +++ b/xorg-server/render/glyphstr.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/render/mipict.h b/xorg-server/render/mipict.h index a16dd31..23ce9e8 100644 --- a/xorg-server/render/mipict.h +++ b/xorg-server/render/mipict.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/render/picture.c b/xorg-server/render/picture.c index cd9bc74..711cbc7 100644 --- a/xorg-server/render/picture.c +++ b/xorg-server/render/picture.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/xorg-server/render/picture.h b/xorg-server/render/picture.h index c85353a..66c85c5 100644 --- a/xorg-server/render/picture.h +++ b/xorg-server/render/picture.h @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -129,7 +129,7 @@ typedef enum _PictFormatShort { } PictFormatShort; /* - * For dynamic indexed visuals (GrayScale and PseudoColor), these control the + * For dynamic indexed visuals (GrayScale and PseudoColor), these control the * selection of colors allocated for drawing to Pictures. The default * policy depends on the size of the colormap: * @@ -189,8 +189,8 @@ typedef pixman_fixed_1_16_t xFixed_1_16; typedef pixman_fixed_16_16_t xFixed_16_16; /* - * An unadorned "xFixed" is the same as xFixed_16_16, - * (since it's quite common in the code) + * An unadorned "xFixed" is the same as xFixed_16_16, + * (since it's quite common in the code) */ typedef pixman_fixed_t xFixed; diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c index 9ac4a98..e3031da 100644 --- a/xorg-server/render/render.c +++ b/xorg-server/render/render.c @@ -16,7 +16,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -1548,7 +1548,7 @@ ProcRenderCreateCursor(ClientPtr client) FreePicture(pPicture, 0); } /* - * Check whether the cursor can be directly supported by + * Check whether the cursor can be directly supported by * the core cursor code */ ncolor = 0; diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c index 31a408f..94d24a8 100644 --- a/xorg-server/xfixes/cursor.c +++ b/xorg-server/xfixes/cursor.c @@ -632,7 +632,7 @@ ReplaceCursor(CursorPtr pCursor, TestCursorFunc testCursor, void *closure) int resIndex; ReplaceCursorLookupRec rcl; - /* + /* * Cursors exist only in the resource database, windows and grabs. * All of these are always pointed at by the resource database. Walk * the whole thing looking for cursors @@ -735,7 +735,7 @@ SProcXFixesChangeCursorByName(ClientPtr client) /* * Routines for manipulating the per-screen hide counts list. - * This list indicates which clients have requested cursor hiding + * This list indicates which clients have requested cursor hiding * for that screen. */ @@ -772,7 +772,7 @@ createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen) pChc->pNext = cs->pCursorHideCounts; cs->pCursorHideCounts = pChc; - /* + /* * Create a resource for this element so it can be deleted * when the client goes away. */ @@ -784,7 +784,7 @@ createCursorHideCount(ClientPtr pClient, ScreenPtr pScreen) return Success; } -/* +/* * Delete the given hide-counts list element from its screen list. */ static void @@ -812,7 +812,7 @@ deleteCursorHideCount(CursorHideCountPtr pChcToDel, ScreenPtr pScreen) } } -/* +/* * Delete all the hide-counts list elements for this screen. */ static void @@ -848,9 +848,9 @@ ProcXFixesHideCursor(ClientPtr client) return ret; } - /* - * Has client hidden the cursor before on this screen? - * If so, just increment the count. + /* + * Has client hidden the cursor before on this screen? + * If so, just increment the count. */ pChc = findCursorHideCount(client, pWin->drawable.pScreen); @@ -859,8 +859,8 @@ ProcXFixesHideCursor(ClientPtr client) return Success; } - /* - * This is the first time this client has hid the cursor + /* + * This is the first time this client has hid the cursor * for this screen. */ ret = XaceHook(XACE_SCREEN_ACCESS, client, pWin->drawable.pScreen, @@ -912,7 +912,7 @@ ProcXFixesShowCursor(ClientPtr client) return rc; } - /* + /* * Has client hidden the cursor on this screen? * If not, generate an error. */ diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c index 4cfeee1..4492f12 100644 --- a/xorg-server/xfixes/region.c +++ b/xorg-server/xfixes/region.c @@ -222,20 +222,13 @@ ProcXFixesCreateRegionFromGC(ClientPtr client) if (rc != Success) return rc; - switch (pGC->clientClipType) { - case CT_PIXMAP: - pRegion = BitmapToRegion(pGC->pScreen, (PixmapPtr) pGC->clientClip); - if (!pRegion) - return BadAlloc; - break; - case CT_REGION: + if (pGC->clientClip) { pClip = (RegionPtr) pGC->clientClip; pRegion = XFixesRegionCopy(pClip); 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/xkb/XKBAlloc.c b/xorg-server/xkb/XKBAlloc.c index 20e0459..78c9837 100644 --- a/xorg-server/xkb/XKBAlloc.c +++ b/xorg-server/xkb/XKBAlloc.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/XKBGAlloc.c b/xorg-server/xkb/XKBGAlloc.c index 8880784..25917d3 100644 --- a/xorg-server/xkb/XKBGAlloc.c +++ b/xorg-server/xkb/XKBGAlloc.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/XKBMAlloc.c b/xorg-server/xkb/XKBMAlloc.c index 3ffd5da..37ed1a7 100644 --- a/xorg-server/xkb/XKBMAlloc.c +++ b/xorg-server/xkb/XKBMAlloc.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -357,7 +357,7 @@ XkbResizeKeyType(XkbDescPtr xkb, * might have to be enlarged. * If the key type decreased in size: * - keys that have a group width > the old width don't have to be - * resized (because they must have some other wider type associated + * resized (because they must have some other wider type associated * with some group). * + keys that have a group width == the old width might have to be * shrunk. diff --git a/xorg-server/xkb/XKBMisc.c b/xorg-server/xkb/XKBMisc.c index 6abd1d1..df268b5 100644 --- a/xorg-server/xkb/XKBMisc.c +++ b/xorg-server/xkb/XKBMisc.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxBeep.c b/xorg-server/xkb/ddxBeep.c index caf78c9..52353ea 100644 --- a/xorg-server/xkb/ddxBeep.c +++ b/xorg-server/xkb/ddxBeep.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxCtrls.c b/xorg-server/xkb/ddxCtrls.c index 0805fb2..964ac3d 100644 --- a/xorg-server/xkb/ddxCtrls.c +++ b/xorg-server/xkb/ddxCtrls.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxKillSrv.c b/xorg-server/xkb/ddxKillSrv.c index 1cabb1b..7c7e739 100644 --- a/xorg-server/xkb/ddxKillSrv.c +++ b/xorg-server/xkb/ddxKillSrv.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxLEDs.c b/xorg-server/xkb/ddxLEDs.c index 81b7b00..e5aecb5 100644 --- a/xorg-server/xkb/ddxLEDs.c +++ b/xorg-server/xkb/ddxLEDs.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxLoad.c b/xorg-server/xkb/ddxLoad.c index 1dc0e4e..f71815a 100644 --- a/xorg-server/xkb/ddxLoad.c +++ b/xorg-server/xkb/ddxLoad.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/ddxVT.c b/xorg-server/xkb/ddxVT.c index 6529102..f3cd26a 100644 --- a/xorg-server/xkb/ddxVT.c +++ b/xorg-server/xkb/ddxVT.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/maprules.c b/xorg-server/xkb/maprules.c index 6f5f8cc..28148d9 100644 --- a/xorg-server/xkb/maprules.c +++ b/xorg-server/xkb/maprules.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkb.c b/xorg-server/xkb/xkb.c index dc570f0..15c7f34 100644 --- a/xorg-server/xkb/xkb.c +++ b/xorg-server/xkb/xkb.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -3986,7 +3986,7 @@ _XkbSetNamesCheck(ClientPtr client, DeviceIntPtr dev, { XkbDescRec *xkb; CARD32 *tmp; - Atom bad; + Atom bad = None; tmp = data; xkb = dev->key->xkbInfo->desc; diff --git a/xorg-server/xkb/xkbAccessX.c b/xorg-server/xkb/xkbAccessX.c index 5f3de0d..7fd6a48 100644 --- a/xorg-server/xkb/xkbAccessX.c +++ b/xorg-server/xkb/xkbAccessX.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -598,7 +598,7 @@ AccessXFilterReleaseEvent(DeviceEvent *event, DeviceIntPtr keybd) Bool ignoreKeyEvent = FALSE; /* Don't transmit the KeyRelease if BounceKeys is on and - * this is the release of a key that was ignored due to + * this is the release of a key that was ignored due to * BounceKeys. */ if (ctrls->enabled_ctrls & XkbBounceKeysMask) { diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index c44f44b..2a196f1 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbEvents.c b/xorg-server/xkb/xkbEvents.c index cc9a535..0dbbd6c 100644 --- a/xorg-server/xkb/xkbEvents.c +++ b/xorg-server/xkb/xkbEvents.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbInit.c b/xorg-server/xkb/xkbInit.c index 06ec46e..30e10bd 100644 --- a/xorg-server/xkb/xkbInit.c +++ b/xorg-server/xkb/xkbInit.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -676,9 +676,9 @@ InitKeyboardDeviceStructFromString(DeviceIntPtr dev, /***====================================================================***/ /* - * Be very careful about what does and doesn't get freed by this - * function. To reduce fragmentation, XkbInitDevice allocates a - * single huge block per device and divides it up into most of the + * Be very careful about what does and doesn't get freed by this + * function. To reduce fragmentation, XkbInitDevice allocates a + * single huge block per device and divides it up into most of the * fixed-size structures for the device. Don't free anything that * is part of this larger block. */ diff --git a/xorg-server/xkb/xkbLEDs.c b/xorg-server/xkb/xkbLEDs.c index e1e22d1..4e16002 100644 --- a/xorg-server/xkb/xkbLEDs.c +++ b/xorg-server/xkb/xkbLEDs.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -47,8 +47,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * XkbIndicatorsToUpdate(dev,changed,check_devs_rtrn) * * Given a keyboard and a set of state components that have changed, - * this function returns the indicators on the default keyboard - * feedback that might be affected. It also reports whether or not + * this function returns the indicators on the default keyboard + * feedback that might be affected. It also reports whether or not * any extension devices might be affected in check_devs_rtrn. */ @@ -85,10 +85,10 @@ XkbIndicatorsToUpdate(DeviceIntPtr dev, * Bool *XkbApplyLEDChangeToKeyboard(xkbi,map,on,change) * - * Some indicators "drive" the keyboard when their state is explicitly + * Some indicators "drive" the keyboard when their state is explicitly * changed, as described in section 9.2.1 of the XKB protocol spec. - * This function updates the state and controls for the keyboard - * specified by 'xkbi' to reflect any changes that are required + * This function updates the state and controls for the keyboard + * specified by 'xkbi' to reflect any changes that are required * when the indicator described by 'map' is turned on or off. The * extent of the changes is reported in change, which must be defined. */ @@ -357,9 +357,9 @@ XkbUpdateAllDeviceIndicators(XkbChangesPtr changes, XkbEventCausePtr cause) * attempted change. If 'changes' is NULL, this function generates * XKB events to report any such changes to interested clients. * - * If 'cause' is non-NULL, it specifies the reason for the change, - * as reported in some XKB events. If it is NULL, this function - * assumes that the change is the result of a core protocol + * If 'cause' is non-NULL, it specifies the reason for the change, + * as reported in some XKB events. If it is NULL, this function + * assumes that the change is the result of a core protocol * ChangeKeyboardMapping request. */ @@ -407,7 +407,7 @@ XkbSetIndicators(DeviceIntPtr dev, * * Applies the indicator maps for any indicators specified in * 'update' from the default keyboard feedback on the device - * specified by 'dev.' + * specified by 'dev.' * * If 'changes' is NULL, this function generates and XKB events * required to report the necessary changes, otherwise it simply @@ -442,9 +442,9 @@ XkbUpdateIndicators(DeviceIntPtr dev, * XkbCheckIndicatorMaps(dev,sli,which) * * Updates the 'indicator accelerators' for the indicators specified - * by 'which' in the feedback specified by 'sli.' The indicator - * accelerators are internal to the server and are used to simplify - * and speed up the process of figuring out which indicators might + * by 'which' in the feedback specified by 'sli.' The indicator + * accelerators are internal to the server and are used to simplify + * and speed up the process of figuring out which indicators might * be affected by a particular change in keyboard state or controls. */ @@ -677,7 +677,7 @@ XkbCopySrvLedInfo(DeviceIntPtr from, * * Finds the XkbSrvLedInfoPtr for the specified 'class' and 'id' * on the device specified by 'dev.' If the class and id specify - * a valid device feedback, this function returns the existing + * a valid device feedback, this function returns the existing * feedback or allocates a new one. * */ @@ -839,7 +839,7 @@ XkbApplyLedNameChanges(DeviceIntPtr dev, * * Handles all of the secondary effects of the changes to the * feedback specified by 'sli' on the device specified by 'dev.' - * + * * If 'changed_maps' specifies any indicators, this function generates * XkbExtensionDeviceNotify events and possibly IndicatorMapNotify * events to report the changes, and recalculates the effective diff --git a/xorg-server/xkb/xkbPrKeyEv.c b/xorg-server/xkb/xkbPrKeyEv.c index b24fd6c..f7a6b4b 100644 --- a/xorg-server/xkb/xkbPrKeyEv.c +++ b/xorg-server/xkb/xkbPrKeyEv.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbSwap.c b/xorg-server/xkb/xkbSwap.c index 076da34..ecec63e 100644 --- a/xorg-server/xkb/xkbSwap.c +++ b/xorg-server/xkb/xkbSwap.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbUtils.c b/xorg-server/xkb/xkbUtils.c index c14a790..6019f0f 100644 --- a/xorg-server/xkb/xkbUtils.c +++ b/xorg-server/xkb/xkbUtils.c @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbfmisc.c b/xorg-server/xkb/xkbfmisc.c index d96ee4b..2ecdcd5 100644 --- a/xorg-server/xkb/xkbfmisc.c +++ b/xorg-server/xkb/xkbfmisc.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbgeom.h b/xorg-server/xkb/xkbgeom.h index 1999f5c..5ade436 100644 --- a/xorg-server/xkb/xkbgeom.h +++ b/xorg-server/xkb/xkbgeom.h @@ -6,19 +6,19 @@ software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbout.c b/xorg-server/xkb/xkbout.c index 7bb6cea..5f77ab0 100644 --- a/xorg-server/xkb/xkbout.c +++ b/xorg-server/xkb/xkbout.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkbtext.c b/xorg-server/xkb/xkbtext.c index fdf1d17..ffbc546 100644 --- a/xorg-server/xkb/xkbtext.c +++ b/xorg-server/xkb/xkbtext.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkb/xkmread.c b/xorg-server/xkb/xkmread.c index b6241b5..0b9f0ef 100644 --- a/xorg-server/xkb/xkmread.c +++ b/xorg-server/xkb/xkmread.c @@ -6,19 +6,19 @@ fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting - documentation, and that the name of Silicon Graphics not be - used in advertising or publicity pertaining to distribution + documentation, and that the name of Silicon Graphics not be + used in advertising or publicity pertaining to distribution of the software without specific prior written permission. - Silicon Graphics makes no representation about the suitability + Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - - SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + + SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL + DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/xorg-server/xkeyboard-config/README b/xorg-server/xkeyboard-config/README index 2be1ab6..2564025 100644 --- a/xorg-server/xkeyboard-config/README +++ b/xorg-server/xkeyboard-config/README @@ -1,28 +1,46 @@ X Keyboard Extension -------------------- -The X Keyboard Extension essentially replaces the core protocol definition -of the keyboard. The extension makes it possible to clearly and explicitly -specify most aspects of keyboard behaviour on a per-key basis and to more -closely track the logical and physical state of the keyboard. It also -includes a number of keyboard controls designed to make keyboards more -accessible to people with physical impairments. +The X Keyboard (XKB) Extension essentially replaces the core protocol +definition of a keyboard. The extension makes it possible to specify +clearly and explicitly most aspects of keyboard behaviour on a per-key +basis, and to track more closely the logical and physical state of a +keyboard. It also includes a number of keyboard controls designed to +make keyboards more accessible to people with physical impairments. -There are five types of components in the server database corresponding to -five xkb symbolic names (symbols, geometry, keycodes, compat, and types) -which determine the keyboard behaviour. These five components can be -combined into a resulting keyboard mapping using the 'rules' component. +There are five components that define a complete keyboard mapping: +symbols, geometry, keycodes, compat, and types; these five components +can be combined together using the 'rules' component of the database +provided by this project, xkeyboard-config. -The complete specification can be found in: - http://www.x.org/current/doc/kbproto/xkbproto.pdf +The complete specification for the XKB Extension can be found here: -For XKB configuration information, see the 'docs/README.config' file. + http://xfree86.org/current/XKBproto.pdf -For information on how to further enhance XKB configuration, see the -'docs/README.enhancing' file. +xkeyboard-config +---------------- -For information on how to replace an existing XKB configuration database -with XKeyboardConfig, see the 'docs/HOWTO.transition' file. +This project provides a consistent, well-structured, frequently +released, open source database of keyboard configuration data. The +project is targeted to XKB-based systems. + +For XKB configuration information, see: + + docs/README.config + +For information on how to enhance the database itself, see: + + docs/README.enhancing + +For information on how to replace an older XKB configuration database +with the one provided by this project, see: + + docs/HOWTO.transition + +For guidelines to making contributions to this project, see: -Contribution guidelines are described on: http://www.freedesktop.org/wiki/Software/XKeyboardConfig/Rules + +To submit bug reports (and patches), please use the bugzilla system: + + https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 07/13: libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit d6d5581d5fba846c8476ad4d593da662306765d7 Author: marha <marha(a)users.sourceforge.net> Date: Sat Oct 25 19:53:22 2014 +0200 libXft mesa xserver pixman xkeyboard-config git update 25 Oct 2014 xserver commit 16a32c53f6e9ad1f3284d4596edfa33e9efb740e xkeyboard-config commit 0d4c3d9d891536aa1ec4f1fff5e3df51cfd2718d pixman commit 594e6a6c93e92fcfb495e987aec5617f6c37f467 libXft commit e8a83226bc10afb587f6f34daac44d2ef809c85e mesa commit 13862812dc910a4ef57cb72cb9fe777ce3c14515 --- libXft/src/xftdpy.c | 4 + libXft/src/xftdraw.c | 71 +- libXft/src/xftint.h | 1 + mesalib/configure.ac | 12 +- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 6 + mesalib/docs/relnotes.html | 1 + mesalib/docs/relnotes/10.3.2.html | 115 +++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/scons/llvm.py | 16 +- mesalib/src/gallium/auxiliary/util/u_blitter.c | 77 +- mesalib/src/gallium/auxiliary/util/u_math.h | 2 +- mesalib/src/glsl/ast_array_index.cpp | 6 +- mesalib/src/glsl/ast_to_hir.cpp | 107 ++- mesalib/src/glsl/glsl_parser_extras.h | 4 +- mesalib/src/glsl/ir_uniform.h | 11 - mesalib/src/glsl/linker.cpp | 18 +- mesalib/src/glsl/lower_offset_array.cpp | 10 +- mesalib/src/glsl/main.cpp | 2 + mesalib/src/glsl/opt_array_splitting.cpp | 2 +- mesalib/src/glsl/standalone_scaffolding.cpp | 27 + mesalib/src/glsl/standalone_scaffolding.h | 3 + mesalib/src/mapi/glapi/gen/ARB_clip_control.xml | 25 + mesalib/src/mapi/glapi/gen/Makefile.am | 1 + mesalib/src/mapi/glapi/gen/gl_API.xml | 4 +- mesalib/src/mapi/glapi/gen/gl_gentable.py | 4 +- mesalib/src/mesa/drivers/common/meta.c | 9 + mesalib/src/mesa/drivers/common/meta.h | 3 + mesalib/src/mesa/main/attrib.c | 1 + mesalib/src/mesa/main/bufferobj.c | 4 +- mesalib/src/mesa/main/context.c | 12 + mesalib/src/mesa/main/dd.h | 3 +- mesalib/src/mesa/main/dlist.c | 26 + mesalib/src/mesa/main/extensions.c | 1 + mesalib/src/mesa/main/ff_fragment_shader.cpp | 14 +- mesalib/src/mesa/main/get.c | 1 + mesalib/src/mesa/main/get_hash_params.py | 2 + mesalib/src/mesa/main/mtypes.h | 7 +- mesalib/src/mesa/main/polygon.c | 2 - mesalib/src/mesa/main/shaderapi.c | 2 +- mesalib/src/mesa/main/shaderapi.h | 9 - mesalib/src/mesa/main/shaderimage.c | 2 +- mesalib/src/mesa/main/shaderobj.c | 28 +- mesalib/src/mesa/main/shaderobj.h | 6 +- mesalib/src/mesa/main/state.c | 25 +- mesalib/src/mesa/main/uniform_query.cpp | 74 +- mesalib/src/mesa/main/uniforms.c | 22 +- mesalib/src/mesa/main/uniforms.h | 2 +- mesalib/src/mesa/main/version.c | 2 - mesalib/src/mesa/main/viewport.c | 122 ++- mesalib/src/mesa/main/viewport.h | 6 + mesalib/src/mesa/math/m_matrix.c | 17 +- mesalib/src/mesa/math/m_matrix.h | 4 +- mesalib/src/mesa/program/ir_to_mesa.cpp | 2 +- .../src/mesa/state_tracker/st_atom_rasterizer.c | 25 +- mesalib/src/mesa/state_tracker/st_atom_viewport.c | 23 +- mesalib/src/mesa/state_tracker/st_cb_program.c | 2 - mesalib/src/mesa/state_tracker/st_debug.c | 1 + mesalib/src/mesa/state_tracker/st_debug.h | 1 + mesalib/src/mesa/state_tracker/st_extensions.c | 9 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 47 +- mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.h | 5 - mesalib/src/util/macros.h | 14 + mesalib/src/util/register_allocate.c | 2 +- pixman/pixman/pixman-mmx.c | 6 + xorg-server/Xext/panoramiXprocs.c | 2 +- xorg-server/configure.ac | 2 - xorg-server/fb/fbpict.c | 2 +- xorg-server/glx/glxdri2.c | 4 +- xorg-server/hw/kdrive/ephyr/ephyr.c | 12 +- xorg-server/hw/kdrive/ephyr/ephyrinit.c | 6 + xorg-server/hw/kdrive/ephyr/man/Xephyr.man | 3 + xorg-server/hw/xwin/InitOutput.c | 6 - xorg-server/hw/xwin/Makefile.am | 21 - xorg-server/hw/xwin/man/XWin.man | 4 - xorg-server/hw/xwin/win.h | 182 ----- xorg-server/hw/xwin/winclip.c | 42 - xorg-server/hw/xwin/wincreatewnd.c | 22 +- xorg-server/hw/xwin/winengine.c | 23 - xorg-server/hw/xwin/winfillsp.c | 842 -------------------- xorg-server/hw/xwin/winfont.c | 82 -- xorg-server/hw/xwin/wingc.c | 235 ------ xorg-server/hw/xwin/wingetsp.c | 171 ---- xorg-server/hw/xwin/winmisc.c | 63 -- xorg-server/hw/xwin/winnativegdi.c | 491 ------------ xorg-server/hw/xwin/winpfbdd.c | 620 -------------- xorg-server/hw/xwin/winpixmap.c | 223 ------ xorg-server/hw/xwin/winpolyline.c | 53 -- xorg-server/hw/xwin/winrop.c | 142 ---- xorg-server/hw/xwin/winscrinit.c | 139 ---- xorg-server/hw/xwin/winsetsp.c | 175 ---- xorg-server/hw/xwin/winwindow.c | 219 ----- xorg-server/hw/xwin/winwndproc.c | 12 +- xorg-server/mi/mibitblt.c | 13 +- xorg-server/mi/mifillrct.c | 2 +- xorg-server/os/utils.c | 1 + xorg-server/render/mipict.c | 34 +- xorg-server/render/mirect.c | 2 +- xorg-server/render/picture.c | 1 - xorg-server/render/picturestr.h | 3 +- xorg-server/xfixes/region.c | 14 +- xorg-server/xkeyboard-config/rules/base.xml.in | 12 + xorg-server/xkeyboard-config/symbols/keypad | 49 +- .../xkeyboard-config/symbols/macintosh_vndr/ch | 1 + .../xkeyboard-config/symbols/macintosh_vndr/dk | 2 +- .../xkeyboard-config/symbols/macintosh_vndr/it | 1 + .../xkeyboard-config/symbols/macintosh_vndr/us | 4 +- xorg-server/xkeyboard-config/symbols/ru | 71 ++ 108 files changed, 878 insertions(+), 4205 deletions(-) diff --git a/libXft/src/xftdpy.c b/libXft/src/xftdpy.c index c5b756e..62b1ccf 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 186bcb8..dfa97fb 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 1658977..c06ac3c 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 0ed9325..03f1bca 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 07d1d2c..6a988d5 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 244a7a3..0a491a2 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 d546e85..1c97edd 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 0000000..4c08f65 --- /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 64cbfae..67c3087 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 288a080..1e312f9 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 f3fe949..e59fa04 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 f95c111..0113fb1 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 49a8574..ff0c757 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 068af29..fe1e129 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 c8b9478..c14d74c 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 2f73528..b9ecf7c 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 47a722d..2d31801 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 5b48526..c30f801 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 feed100..9b36a1f 100644 --- a/mesalib/src/glsl/main.cpp +++ b/mesalib/src/glsl/main.cpp @@ -403,6 +403,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 ebb076b..9e73f3c 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 2b76dd1..67b0d0c 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 df783af..895dd27 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 0000000..ab1a388 --- /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"/> +  + </function> + +</category> + +</OpenGLAPI> diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am index 2fbc598..72e5095 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 73f2f75..534e6a0 100644 --- 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"/> - + + +<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 deffcee..06a5ebf 100644 --- 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 7a8e627..87532c1 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 2c9517b..6ecf3c0 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 d90e662..5345339 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 0ee8856..2bae1bc 100644 --- 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 5a8f718..25b9bfc 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 c07e83a..2f40915 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 5c7160d..4b7b060 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 f0e2f89..15d66a7 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 9bb706c..5591d57 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 0e2d8f6..6091efc 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 da35684..aa9f282 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 9f44eda..e1f1f1d 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 611cef6..76d6019 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 3e6f610..2be9092 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 17b05b3..047d256 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 9e62f42..dcbcca6 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 693e9a2..81bd782 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 d72919c..05ddfeb 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 80287c4..45bce78 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 1592c9b..fcb14c4 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 0d0cbf5..c307107 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 e7a370e..6575a52 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 71f7011..4951891 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 222ae30..d6a9e29 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 f2311c0..426e194 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 e512e45..9c9310d 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 dddce70..778d716 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 b3e04d7..5cd9058 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 a228538..5020978 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 7584f9b..5b99208 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 82e1fd1..faff9c4 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 8c15e18..de3e3a9 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 c1c4825..49b916f 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 5dd8278..aff3dde 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 a0da9f6..a4e2c8d 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 18f666f..5ed6407 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 40ebf02..ff37a7d 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 afab9dd..6cf7ce7 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 c7fd503..42826d9 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 aa3859f..0122ff3 100644 --- a/xorg-server/Xext/panoramiXprocs.c +++ b/xorg-server/Xext/panoramiXprocs.c @@ -1908,7 +1908,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 c697188..ac68f17 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 21baf89..f9c9917 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/glxdri2.c b/xorg-server/glx/glxdri2.c index c756bf5..5a8966f 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/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c index 8b88f3e..5761710 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) @@ -649,7 +650,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 @@ -1092,12 +1097,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 3693531..bcfb750 100644 --- 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; @@ -153,6 +154,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"); } @@ -360,6 +362,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 f14f6c8..c043790 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 88bc85a..e867119 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -735,12 +735,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 2c7fde3..0ea8ba7 100644 --- 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/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man index c71f6a1..a043ac2 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 7af35e7..ed1ad01 100644 --- a/xorg-server/hw/xwin/win.h +++ b/xorg-server/hw/xwin/win.h @@ -103,12 +103,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 @@ -304,12 +298,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 */ @@ -582,12 +570,6 @@ typedef struct _winPrivScreenRec { SetShapeProcPtr SetShape; winCursorRec cursor; - -#ifdef XWIN_NATIVEGDI - RealizeFontPtr RealizeFont; - UnrealizeFontPtr UnrealizeFont; -#endif - } winPrivScreenRec; #ifdef XWIN_MULTIWINDOWEXTWM @@ -775,15 +757,6 @@ void winBlockHandler(ScreenPtr pScreen, void *pTimeout, void *pReadMask); -#ifdef XWIN_NATIVEGDI -/* - * winclip.c - */ - -RegionPtr - winPixmapToRegionNativeGDI(PixmapPtr pPix); -#endif - #ifdef XWIN_CLIPBOARD /* * winclipboardinit.c @@ -859,52 +832,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 */ @@ -956,23 +883,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 */ @@ -994,60 +910,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 */ @@ -1058,26 +920,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 */ @@ -1112,30 +954,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 941e948..0000000 --- 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) -{ - ErrorF("winPixmapToRegion()\n"); - return NULL; -} diff --git a/xorg-server/hw/xwin/wincreatewnd.c b/xorg-server/hw/xwin/wincreatewnd.c index 6732dcb..9f72016 100644 --- a/xorg-server/hw/xwin/wincreatewnd.c +++ b/xorg-server/hw/xwin/wincreatewnd.c @@ -110,20 +110,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); @@ -474,12 +462,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 1f55ada..b473b3a 100644 --- 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) winErrorFVerb(2, "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; - winErrorFVerb(2, - "winDetectSupportedEngines - Windows NT, allowing PrimaryDD\n"); - } -#endif } /* Try to query for DirectDraw4 interface */ @@ -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\n"); } diff --git a/xorg-server/hw/xwin/winfillsp.c b/xorg-server/hw/xwin/winfillsp.c deleted file mode 100644 index bd0a15e..0000000 --- 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(a)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 7bcbce1..0000000 --- a/xorg-server/hw/xwin/winfont.c +++ /dev/null @@ -1,82 +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); - -#if CYGDEBUG - winTrace("winRealizeFont (%p, %p)\n", pScreen, pFont); -#endif - - 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); - -#if CYGDEBUG - winTrace("winUnrealizeFont (%p, %p)\n", pScreen, pFont); -#endif - - WIN_UNWRAP(UnrealizeFont); - if (pScreen->UnrealizeFont) - fResult = (*pScreen->UnrealizeFont) (pScreen, pFont); - WIN_WRAP(UnrealizeFont, winUnrealizeFontNativeGDI); - - return fResult; -#if CYGDEBUG - winDebug("winUnrealizeFont()\n"); -#endif - return TRUE; -} -#endif diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c deleted file mode 100644 index 5986e0a..0000000 --- a/xorg-server/hw/xwin/wingc.c +++ /dev/null @@ -1,235 +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 - */ - -#if 0 -static void - winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges); -#endif - -static void - -winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable); - -#if 0 -static void - winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst); -#endif - -static void - winDestroyGCNativeGDI(GCPtr pGC); - -#if 0 -static void - winChangeClipNativeGDI(GCPtr pGC, int nType, void *pValue, int nRects); - -static void - winDestroyClipNativeGDI(GCPtr pGC); - -static void - winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc); -#endif - -#if 0 -/* GC Handling Routines */ -const GCFuncs winGCFuncs = { - winValidateGCNativeGDI, - winChangeGCNativeGDI, - winCopyGCNativeGDI, - winDestroyGCNativeGDI, - winChangeClipNativeGDI, - winDestroyClipNativeGDI, - winCopyClipNativeGDI, -}; -#else -const GCFuncs winGCFuncs = { - winValidateGCNativeGDI, - miChangeGC, - miCopyGC, - winDestroyGCNativeGDI, - miChangeClip, - miDestroyClip, - miCopyClip, -}; -#endif - -/* Drawing Primitives */ -const GCOps winGCOps = { - winFillSpansNativeGDI, - winSetSpansNativeGDI, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - winPolyLineNativeGDI, - miPolySegment, - miPolyRectangle, - miPolyArc, - miFillPolygon, - miPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, -#if 0 - winImageGlyphBltNativeGDI, - winPolyGlyphBltNativeGDI, -#else - miImageGlyphBlt, - miPolyGlyphBlt, -#endif - 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; - -#if 0 - ErrorF("winCreateGCNativeGDI - depth: %d\n", pGC->depth); -#endif - - 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; -} - -#if 0 -/* See Porting Layer Definition - p. 45 */ -static void -winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges) -{ -#if 0 - ErrorF("winChangeGCNativeGDI () - Doing nothing\n"); -#endif -} -#endif - -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); - } -} - -#if 0 -/* See Porting Layer Definition - p. 46 */ -static void -winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst) -{ - -} -#endif - -/* 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); -} - -#if 0 -/* See Porting Layer Definition - p. 46 */ -static void -winChangeClipNativeGDI(GCPtr pGC, int nType, void *pValue, int nRects) -{ - -} - -/* See Porting Layer Definition - p. 47 */ -static void -winDestroyClipNativeGDI(GCPtr pGC) -{ - -} - -/* See Porting Layer Definition - p. 47 */ -static void -winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc) -{ - -} -#endif diff --git a/xorg-server/hw/xwin/wingetsp.c b/xorg-server/hw/xwin/wingetsp.c deleted file mode 100644 index 049e2c9..0000000 --- a/xorg-server/hw/xwin/wingetsp.c +++ /dev/null @@ -1,171 +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(a)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: -#if 0 - ErrorF("winGetSpans - DRAWABLE_PIXMAP %08x\n", pDrawable); -#endif - - 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); - -#if 0 - ErrorF("(%dx%dx%d) (%d,%d) w: %d\n", - pDrawable->width, pDrawable->height, pDrawable->depth, - pPoint->x, pPoint->y, *piWidth); -#endif - - /* 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: -#if 0 - ErrorF("winGetSpans - DRAWABLE_WINDOW\n"); -#endif - - /* 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); - -#if 0 - ErrorF("(%dx%dx%d) (%d,%d) w: %d\n", - pDrawable->width, pDrawable->height, pDrawable->depth, - pPoint->x, pPoint->y, *piWidth); -#endif - - /* 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 10f9732..bea6290 100644 --- 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) -{ - ErrorF("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 1859698..0000000 --- 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; - - ErrorF("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); - - ErrorF("winCloseScreenNativeGDI - Destroying window\n"); - - /* Delete tray icon, if we have one */ - if (!pScreenInfo->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); - - ErrorF("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 */ - ErrorF("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: - ErrorF("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; - } - -#if 1 - ErrorF("winInitVisualsNativeGDI - Returning\n"); -#endif - - 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 0106161..0000000 --- a/xorg-server/hw/xwin/winpfbdd.c +++ /dev/null @@ -1,620 +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; - - ErrorF("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; - } - - ErrorF("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); - - ErrorF("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"); - - ErrorF("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); - - ErrorF("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"); - - ErrorF("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; - - ErrorF("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) - 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; - - ErrorF("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: -#if CYGDEBUG - winDebug("winInitVisuals - Calling miSetVisualTypesAndMasks\n"); -#endif /* CYGDEBUG */ - if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth, - PseudoColorMask, - pScreenPriv->dwBitsPerRGB, - PseudoColor, - pScreenPriv->dwRedMask, - pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask)) { - ErrorF("winInitVisualsPrimaryDD - " - "miSetVisualTypesAndMasks failed\n"); - return FALSE; - } -#if CYGDEBUG - winDebug("winInitVisualsPrimaryDD - Returned from " - "miSetVisualTypesAndMasks\n"); -#endif /* CYGDEBUG */ - break; - - default: - ErrorF("winInitVisualsPrimaryDD - Unknown screen depth\n"); - return FALSE; - } - - ErrorF("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; - - ErrorF("\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 ef158c8..0000000 --- a/xorg-server/hw/xwin/winpixmap.c +++ /dev/null @@ -1,223 +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; - } - -#if CYGDEBUG - winDebug("winCreatePixmap () - w %d h %d d %d uh %d bw %d\n", - iWidth, iHeight, iDepth, usage_hint, - PixmapBytePad(iWidth, iDepth)); -#endif - - /* 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); - -#if CYGDEBUG - winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " - "screen: %08x\n", - pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen); -#endif - - return pPixmap; -} - -/* - * See Porting Layer Definition - p. 35 - * - * See mfb/mfbpixmap.c - mfbDestroyPixmap() - */ - -Bool -winDestroyPixmapNativeGDI(PixmapPtr pPixmap) -{ - winPrivPixmapPtr pPixmapPriv = NULL; - -#if CYGDEBUG - winDebug("winDestroyPixmapNativeGDI ()\n"); -#endif - - /* 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); - -#if CYGDEBUG - winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n", - pPixmapPriv->hBitmap); -#endif - - /* 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; -} - -#if 0 -/* - * Not used yet. - * See cfb/cfbpixmap.c - */ - -static void -winXRotatePixmapNativeGDI(PixmapPtr pPix, int rw) -{ - ErrorF("winXRotatePixmap()\n"); - /* fill in this function, look at CFB */ -} - -/* - * Not used yet. - * See cfb/cfbpixmap.c - */ -static void -winYRotatePixmapNativeGDI(PixmapPtr pPix, int rh) -{ - ErrorF("winYRotatePixmap()\n"); - /* fill in this function, look at CFB */ -} - -/* - * Not used yet. - * See cfb/cfbpixmap.c - */ - -static void -winCopyRotatePixmapNativeGDI(PixmapPtr psrcPix, PixmapPtr *ppdstPix, - int xrot, int yrot) -{ - ErrorF("winCopyRotatePixmap()\n"); - /* fill in this function, look at CFB */ -} -#endif diff --git a/xorg-server/hw/xwin/winpolyline.c b/xorg-server/hw/xwin/winpolyline.c deleted file mode 100644 index 8b7e106..0000000 --- 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) - return 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 1f9ff73..0000000 --- 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(a)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 23152cb..ed1773c 100644 --- a/xorg-server/hw/xwin/winscrinit.c +++ b/xorg-server/hw/xwin/winscrinit.c @@ -570,145 +570,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; - - ErrorF("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; - } - - ErrorF("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; - - ErrorF("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 11108cb..0000000 --- a/xorg-server/hw/xwin/winsetsp.c +++ /dev/null @@ -1,175 +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(a)fairlite.demon.co.uk> - */ - -#ifdef HAVE_XWIN_CONFIG_H -#include <xwin-config.h> -#endif -#include "win.h" - -/* 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; - BITMAPINFO *pbmi; - HRGN hrgn = NULL, combined = NULL; - int nbox; - BoxPtr pbox; - - nbox = RegionNumRects(pGC->pCompositeClip); - pbox = RegionRects(pGC->pCompositeClip); - - if (!nbox) - return; - - pbmi = malloc(sizeof(BITMAPINFO) + sizeof(RGBQUAD)); - - 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(pbmi, sizeof(BITMAPINFO)); - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biWidth = *piWidths; - pbmi->bmiHeader.biHeight = 1; - pbmi->bmiHeader.biPlanes = 1; - pbmi->bmiHeader.biBitCount = pDrawable->depth; - pbmi->bmiHeader.biCompression = BI_RGB; - - /* Setup color table for mono DIBs */ - if (pDrawable->depth == 1) { - RGBQUAD *bmiColors = &(pbmi->bmiColors[0]); - bmiColors[1].rgbBlue = 255; - bmiColors[1].rgbGreen = 255; - bmiColors[1].rgbRed = 255; - } - - StretchDIBits(pGCPriv->hdcMem, - pPoints->x, pPoints->y, - *piWidths, 1, - 0, 0, - *piWidths, 1, - pSrcs, - (BITMAPINFO *) pbmi, - 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(pbmi, sizeof(BITMAPINFO)); - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biWidth = *piWidths; - pbmi->bmiHeader.biHeight = 1; - pbmi->bmiHeader.biPlanes = 1; - pbmi->bmiHeader.biBitCount = pDrawable->depth; - pbmi->bmiHeader.biCompression = BI_RGB; - - /* Setup color table for mono DIBs */ - if (pDrawable->depth == 1) { - RGBQUAD *bmiColors = &(pbmi->bmiColors[0]); - bmiColors[1].rgbBlue = 255; - bmiColors[1].rgbGreen = 255; - bmiColors[1].rgbRed = 255; - } - - StretchDIBits(pGCPriv->hdc, - pPoints->x, pPoints->y, - *piWidths, 1, - 0, 0, - *piWidths, 1, - pSrcs, - (BITMAPINFO *) pbmi, - 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; - } - - free(pbmi); -} diff --git a/xorg-server/hw/xwin/winwindow.c b/xorg-server/hw/xwin/winwindow.c index 8c1c28f..934f6d8 100644 --- a/xorg-server/hw/xwin/winwindow.c +++ b/xorg-server/hw/xwin/winwindow.c @@ -49,225 +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); - -#if CYGDEBUG - winTrace("winCreateWindowNativeGDI (%p)\n", pWin); -#endif - - 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); - -#if CYGDEBUG - winTrace("winDestroyWindowNativeGDI (%p)\n", pWin); -#endif - - 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); - -#if CYGDEBUG - winTrace("winPositionWindowNativeGDI (%p)\n", pWin); -#endif - - 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); - -#if 0 - ErrorF("winCopyWindow\n"); -#endif - - /* 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; - -#if 0 - ErrorF("winCopyWindow - x1\tx2\ty1\ty2\tx\ty\n"); -#endif - - /* BitBlt each source to the destination point */ - for (i = nbox; --i >= 0; pBoxDst++, ppt++) { -#if 0 - ErrorF("winCopyWindow - %d\t%d\t%d\t%d\t%d\t%d\n", - pBoxDst->x1, pBoxDst->x2, pBoxDst->y1, pBoxDst->y2, - ppt->x, ppt->y); -#endif - - 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); - -#if CYGDEBUG - winTrace("winChangeWindowAttributesNativeGDI (%p)\n", pWin); -#endif - - 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); - -#if CYGDEBUG - winTrace("winUnmapWindowNativeGDI (%p)\n", pWin); -#endif - - 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); - -#if CYGDEBUG - winTrace("winMapWindowNativeGDI (%p)\n", pWin); -#endif - - 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 e3adb56..1b09921 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 */ ErrorF("winWindowProc - Disruptive change in depth\n"); diff --git a/xorg-server/mi/mibitblt.c b/xorg-server/mi/mibitblt.c index 08bd1c5..114f72d 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 79c4057..faf6049 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 80415c4..75769f1 100644 --- a/xorg-server/os/utils.c +++ b/xorg-server/os/utils.c @@ -1373,6 +1373,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 3959fc4..a725104 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 4e76972..a36d1d6 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 58535d4..cd9bc74 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 1278f62..177f87b 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 f9de525..4cfeee1 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 3fd0ce4..682f8c9 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 1efc02b..a266024 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 7948ab1..2f0b4cf 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(a)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 e464519..d3ba80d 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 3784b0e..17f78e9 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 81e4b77..58bfee5 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 c4f4818..37b61a7 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 -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 06/13: Solved difference in output between debug version and release version due to unitialised data
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit d17578910169acabae7e67a3da8f26b5ed608ce6 Author: marha <marha(a)users.sourceforge.net> Date: Thu Oct 23 17:09:50 2014 +0200 Solved difference in output between debug version and release version due to unitialised data --- libxkbfile/src/xkmout.c | 7 +++++++ xkbcomp/compat.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/libxkbfile/src/xkmout.c b/libxkbfile/src/xkmout.c old mode 100644 new mode 100755 index 91e66f4..de6d12d --- a/libxkbfile/src/xkmout.c +++ b/libxkbfile/src/xkmout.c @@ -336,6 +336,7 @@ char * name; if (type->level_names!=NULL) wire.nLevelNames= type->num_levels; else wire.nLevelNames= 0; + wire.pad = 0; tmp= fwrite(&wire,SIZEOF(xkmKeyTypeDesc),1,file); size+= tmp*SIZEOF(xkmKeyTypeDesc); for (n=0,entry= type->map;n<type->map_count;n++,entry++) { @@ -352,6 +353,7 @@ char * name; for (n=0,pre=type->preserve;n<type->map_count;n++,pre++) { p_entry.realMods= pre->real_mods; p_entry.virtualMods= pre->vmods; + p_entry.pad = 0; tmp= fwrite(&p_entry,SIZEOF(xkmModsDesc),1,file); size+= tmp*SIZEOF(xkmModsDesc); } @@ -455,6 +457,7 @@ unsigned tmp,size=0; if (info->group_compat&bit) { modsWire.realMods= xkb->compat->groups[i].real_mods; modsWire.virtualMods= xkb->compat->groups[i].vmods; + modsWire.pad = 0; fwrite(&modsWire,SIZEOF(xkmModsDesc),1,file); size+= SIZEOF(xkmModsDesc); } @@ -962,6 +965,7 @@ unsigned tmp,size= 0; sectionWire.num_rows= section->num_rows; sectionWire.num_doodads= section->num_doodads; sectionWire.num_overlays= section->num_overlays; + sectionWire.pad2 = 0; tmp= fwrite(&sectionWire,SIZEOF(xkmSectionDesc),1,file); size+= tmp*SIZEOF(xkmSectionDesc); if (section->rows) { @@ -975,6 +979,7 @@ unsigned tmp,size= 0; rowWire.left= row->left; rowWire.num_keys= row->num_keys; rowWire.vertical= row->vertical; + rowWire.pad = 0; tmp= fwrite(&rowWire,SIZEOF(xkmRowDesc),1,file); size+= tmp*SIZEOF(xkmRowDesc); for (k=0,key=row->keys;k<row->num_keys;k++,key++) { @@ -1027,6 +1032,7 @@ unsigned tmp,size= 0; wire.num_sections= geom->num_sections; wire.num_doodads= geom->num_doodads; wire.num_key_aliases= geom->num_key_aliases; + wire.pad1 = 0; size+= xkmPutCountedAtomString(dpy,file,geom->name); tmp= fwrite(&wire,SIZEOF(xkmGeometryDesc),1,file); size+= tmp*SIZEOF(xkmGeometryDesc); @@ -1069,6 +1075,7 @@ unsigned tmp,size= 0; xkmPointDesc ptWire; olWire.num_points= ol->num_points; olWire.corner_radius= ol->corner_radius; + olWire.pad = 0; tmp= fwrite(&olWire,SIZEOF(xkmOutlineDesc),1,file); size+= tmp*SIZEOF(xkmOutlineDesc); for (p=0,pt=ol->points;p<ol->num_points;p++,pt++) { diff --git a/xkbcomp/compat.c b/xkbcomp/compat.c old mode 100644 new mode 100755 index 3dd7658..f9402f1 --- a/xkbcomp/compat.c +++ b/xkbcomp/compat.c @@ -114,7 +114,11 @@ InitCompatInfo(CompatInfo * info, XkbDescPtr xkb) info->dflt.defs.fileID = info->fileID; info->dflt.defs.defined = 0; info->dflt.defs.merge = MergeOverride; + info->dflt.defs.next = NULL; info->dflt.interp.flags = 0; + info->dflt.interp.match = 0; + info->dflt.interp.mods = 0; + info->dflt.interp.sym = 0; info->dflt.interp.virtual_mod = XkbNoModifier; info->dflt.interp.act.type = XkbSA_NoAction; for (i = 0; i < XkbAnyActionDataSize; i++) -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 05/13: File ID can be larger then 8-bit
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit c1eb417e64d36393974ecb12eee2b88ebed69d2f Author: marha <marha(a)users.sourceforge.net> Date: Wed Oct 22 16:15:29 2014 +0200 File ID can be larger then 8-bit --- xkbcomp/misc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xkbcomp/misc.h b/xkbcomp/misc.h index 4fa4b6d..015ad5c 100644 --- a/xkbcomp/misc.h +++ b/xkbcomp/misc.h @@ -30,7 +30,7 @@ typedef struct _CommonInfo { unsigned short defined; - unsigned char fileID; + int fileID; unsigned char merge; struct _CommonInfo *next; } CommonInfo; -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 04/13: Merge remote-tracking branch 'origin/released'
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit 8cd093f61168a373d919c68e0ce4e04949fa4eb6 Merge: 9fc8524 a14858a Author: marha <marha(a)users.sourceforge.net> Date: Sun Oct 19 11:34:57 2014 +0200 Merge remote-tracking branch 'origin/released' Conflicts: openssl/Makefile openssl/crypto/opensslconf.h openssl/CHANGES | 51 +++ openssl/Configure | 6 + openssl/NEWS | 7 + openssl/README | 2 +- openssl/apps/makeapps.com | 21 +- openssl/apps/s_client.c | 10 + openssl/crypto/LPdir_vms.c | 7 +- openssl/crypto/LPdir_win.c | 48 ++- openssl/crypto/Makefile | 4 +- openssl/crypto/aes/asm/aesni-x86_64.pl | 52 +-- openssl/crypto/asn1/a_strex.c | 1 + openssl/crypto/bn/asm/x86_64-gcc.c | 8 +- openssl/crypto/bn/bn_exp.c | 9 +- openssl/crypto/bn/bn_nist.c | 6 +- openssl/crypto/bn/exptest.c | 45 ++- openssl/crypto/constant_time_locl.h | 216 +++++++++++++ openssl/crypto/constant_time_test.c | 330 ++++++++++++++++++++ openssl/crypto/crypto-lib.com | 67 ++-- openssl/crypto/dsa/dsa_ameth.c | 7 +- openssl/crypto/ebcdic.h | 7 + openssl/crypto/ec/ec.h | 2 +- openssl/crypto/ec/ec2_smpl.c | 9 +- openssl/crypto/ec/ec_ameth.c | 14 +- openssl/crypto/ec/ec_asn1.c | 40 ++- openssl/crypto/ec/ecp_mont.c | 9 +- openssl/crypto/ec/ecp_nist.c | 9 +- openssl/crypto/ec/ecp_smpl.c | 13 +- openssl/crypto/ec/ectest.c | 5 +- openssl/crypto/err/openssl.ec | 1 + openssl/crypto/evp/Makefile | 2 +- openssl/crypto/evp/e_aes.c | 2 +- openssl/crypto/evp/evp_enc.c | 56 ++-- openssl/crypto/install-crypto.com | 9 +- openssl/crypto/md5/asm/md5-x86_64.pl | 2 +- openssl/crypto/modes/modes.h | 6 + openssl/crypto/ocsp/ocsp_vfy.c | 7 +- openssl/crypto/opensslv.h | 13 +- openssl/crypto/ossl_typ.h | 7 + openssl/crypto/pkcs7/pkcs7.h | 4 - openssl/crypto/pqueue/pqueue.h | 6 + openssl/crypto/rsa/Makefile | 5 +- openssl/crypto/rsa/rsa.h | 1 + openssl/crypto/rsa/rsa_err.c | 1 + openssl/crypto/rsa/rsa_oaep.c | 150 +++++---- openssl/crypto/rsa/rsa_pk1.c | 103 ++++-- openssl/crypto/rsa/rsa_sign.c | 21 +- openssl/crypto/stack/safestack.h | 8 + openssl/doc/apps/c_rehash.pod | 81 +++++ openssl/doc/apps/dgst.pod | 68 +++- openssl/doc/crypto/BIO_s_accept.pod | 4 +- ...MS_sign_add1_signer.pod => CMS_add1_signer.pod} | 14 +- openssl/doc/crypto/EVP_DigestInit.pod | 30 +- openssl/doc/crypto/EVP_DigestVerifyInit.pod | 4 +- openssl/doc/crypto/EVP_EncryptInit.pod | 56 ++-- openssl/doc/crypto/EVP_PKEY_set1_RSA.pod | 8 +- openssl/doc/crypto/EVP_PKEY_sign.pod | 20 +- openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 15 +- openssl/e_os.h | 12 +- openssl/engines/makeengines.com | 23 +- openssl/makevms.com | 17 +- openssl/openssl.spec | 2 +- openssl/ssl/Makefile | 86 ++--- openssl/ssl/d1_both.c | 3 + openssl/ssl/d1_lib.c | 10 + openssl/ssl/d1_srtp.c | 93 ++---- openssl/ssl/dtls1.h | 3 +- openssl/ssl/s23_clnt.c | 12 +- openssl/ssl/s23_srvr.c | 21 +- openssl/ssl/s2_lib.c | 4 +- openssl/ssl/s3_cbc.c | 65 +--- openssl/ssl/s3_clnt.c | 250 +++++++++++---- openssl/ssl/s3_enc.c | 2 +- openssl/ssl/s3_lib.c | 40 ++- openssl/ssl/s3_pkt.c | 19 +- openssl/ssl/s3_srvr.c | 113 ++++--- openssl/ssl/srtp.h | 4 + openssl/ssl/ssl-lib.com | 21 +- openssl/ssl/ssl.h | 9 + openssl/ssl/ssl3.h | 7 +- openssl/ssl/ssl_err.c | 2 + openssl/ssl/ssl_lib.c | 75 ++++- openssl/ssl/t1_enc.c | 1 + openssl/ssl/t1_lib.c | 12 +- openssl/ssl/tls1.h | 15 +- openssl/test/Makefile | 22 +- openssl/test/constant_time_test.c | 1 + openssl/test/maketests.com | 5 +- openssl/test/tests.com | 14 +- openssl/test/testssl | 6 + openssl/util/mk1mf.pl | 1 + openssl/util/mkdef.pl | 6 +- openssl/util/ssleay.num | 8 +- 92 files changed, 2018 insertions(+), 675 deletions(-) diff --cc openssl/Configure index 7bbb568,6f0da76..76433b0 mode 100755,100644..100755 --- a/openssl/Configure +++ b/openssl/Configure -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 03/13: Update to openssl-1.0.1j
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit a14858a22f164b5accc4bd192a5d3de21d88e3d1 Author: marha <marha(a)users.sourceforge.net> Date: Sun Oct 19 11:31:33 2014 +0200 Update to openssl-1.0.1j --- openssl/CHANGES | 51 +++ openssl/Configure | 6 + openssl/Makefile | 2 +- openssl/NEWS | 7 + openssl/README | 2 +- openssl/apps/makeapps.com | 21 +- openssl/apps/s_client.c | 10 + openssl/crypto/LPdir_vms.c | 7 +- openssl/crypto/LPdir_win.c | 48 ++- openssl/crypto/Makefile | 4 +- openssl/crypto/aes/asm/aesni-x86_64.pl | 52 +-- openssl/crypto/asn1/a_strex.c | 1 + openssl/crypto/bn/asm/x86_64-gcc.c | 8 +- openssl/crypto/bn/bn_exp.c | 9 +- openssl/crypto/bn/bn_nist.c | 6 +- openssl/crypto/bn/exptest.c | 45 ++- openssl/crypto/constant_time_locl.h | 216 +++++++++++++ openssl/crypto/constant_time_test.c | 330 ++++++++++++++++++++ openssl/crypto/crypto-lib.com | 67 ++-- openssl/crypto/dsa/dsa_ameth.c | 7 +- openssl/crypto/ebcdic.h | 7 + openssl/crypto/ec/ec.h | 2 +- openssl/crypto/ec/ec2_smpl.c | 9 +- openssl/crypto/ec/ec_ameth.c | 14 +- openssl/crypto/ec/ec_asn1.c | 40 ++- openssl/crypto/ec/ecp_mont.c | 9 +- openssl/crypto/ec/ecp_nist.c | 9 +- openssl/crypto/ec/ecp_smpl.c | 13 +- openssl/crypto/ec/ectest.c | 5 +- openssl/crypto/err/openssl.ec | 1 + openssl/crypto/evp/Makefile | 2 +- openssl/crypto/evp/e_aes.c | 2 +- openssl/crypto/evp/evp_enc.c | 56 ++-- openssl/crypto/install-crypto.com | 9 +- openssl/crypto/md5/asm/md5-x86_64.pl | 2 +- openssl/crypto/modes/modes.h | 6 + openssl/crypto/ocsp/ocsp_vfy.c | 7 +- openssl/crypto/opensslconf.h | 6 + openssl/crypto/opensslv.h | 13 +- openssl/crypto/ossl_typ.h | 7 + openssl/crypto/pkcs7/pkcs7.h | 4 - openssl/crypto/pqueue/pqueue.h | 6 + openssl/crypto/rsa/Makefile | 5 +- openssl/crypto/rsa/rsa.h | 1 + openssl/crypto/rsa/rsa_err.c | 1 + openssl/crypto/rsa/rsa_oaep.c | 150 +++++---- openssl/crypto/rsa/rsa_pk1.c | 103 ++++-- openssl/crypto/rsa/rsa_sign.c | 21 +- openssl/crypto/stack/safestack.h | 8 + openssl/doc/apps/c_rehash.pod | 81 +++++ openssl/doc/apps/dgst.pod | 68 +++- openssl/doc/crypto/BIO_s_accept.pod | 4 +- ...MS_sign_add1_signer.pod => CMS_add1_signer.pod} | 14 +- openssl/doc/crypto/EVP_DigestInit.pod | 30 +- openssl/doc/crypto/EVP_DigestVerifyInit.pod | 4 +- openssl/doc/crypto/EVP_EncryptInit.pod | 56 ++-- openssl/doc/crypto/EVP_PKEY_set1_RSA.pod | 8 +- openssl/doc/crypto/EVP_PKEY_sign.pod | 20 +- openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod | 15 +- openssl/e_os.h | 12 +- openssl/engines/makeengines.com | 23 +- openssl/makevms.com | 17 +- openssl/openssl.spec | 2 +- openssl/ssl/Makefile | 86 ++--- openssl/ssl/d1_both.c | 3 + openssl/ssl/d1_lib.c | 10 + openssl/ssl/d1_srtp.c | 93 ++---- openssl/ssl/dtls1.h | 3 +- openssl/ssl/s23_clnt.c | 12 +- openssl/ssl/s23_srvr.c | 21 +- openssl/ssl/s2_lib.c | 4 +- openssl/ssl/s3_cbc.c | 65 +--- openssl/ssl/s3_clnt.c | 250 +++++++++++---- openssl/ssl/s3_enc.c | 2 +- openssl/ssl/s3_lib.c | 40 ++- openssl/ssl/s3_pkt.c | 19 +- openssl/ssl/s3_srvr.c | 113 ++++--- openssl/ssl/srtp.h | 4 + openssl/ssl/ssl-lib.com | 21 +- openssl/ssl/ssl.h | 9 + openssl/ssl/ssl3.h | 7 +- openssl/ssl/ssl_err.c | 2 + openssl/ssl/ssl_lib.c | 75 ++++- openssl/ssl/t1_enc.c | 1 + openssl/ssl/t1_lib.c | 12 +- openssl/ssl/tls1.h | 15 +- openssl/test/Makefile | 22 +- openssl/test/constant_time_test.c | 1 + openssl/test/maketests.com | 5 +- openssl/test/tests.com | 14 +- openssl/test/testssl | 6 + openssl/util/mk1mf.pl | 1 + openssl/util/mkdef.pl | 6 +- openssl/util/ssleay.num | 8 +- 94 files changed, 2025 insertions(+), 676 deletions(-) diff --git a/openssl/CHANGES b/openssl/CHANGES index 064c1d9..277b46f 100644 --- a/openssl/CHANGES +++ b/openssl/CHANGES @@ -2,6 +2,57 @@ OpenSSL CHANGES _______________ + Changes between 1.0.1i and 1.0.1j [15 Oct 2014] + + *) SRTP Memory Leak. + + A flaw in the DTLS SRTP extension parsing code allows an attacker, who + sends a carefully crafted handshake message, to cause OpenSSL to fail + to free up to 64k of memory causing a memory leak. This could be + exploited in a Denial Of Service attack. This issue affects OpenSSL + 1.0.1 server implementations for both SSL/TLS and DTLS regardless of + whether SRTP is used or configured. Implementations of OpenSSL that + have been compiled with OPENSSL_NO_SRTP defined are not affected. + + The fix was developed by the OpenSSL team. + (CVE-2014-3513) + [OpenSSL team] + + *) Session Ticket Memory Leak. + + When an OpenSSL SSL/TLS/DTLS server receives a session ticket the + integrity of that ticket is first verified. In the event of a session + ticket integrity check failing, OpenSSL will fail to free memory + causing a memory leak. By sending a large number of invalid session + tickets an attacker could exploit this issue in a Denial Of Service + attack. + (CVE-2014-3567) + [Steve Henson] + + *) Build option no-ssl3 is incomplete. + + When OpenSSL is configured with "no-ssl3" as a build option, servers + could accept and complete a SSL 3.0 handshake, and clients could be + configured to send them. + (CVE-2014-3568) + [Akamai and the OpenSSL team] + + *) Add support for TLS_FALLBACK_SCSV. + Client applications doing fallback retries should call + SSL_set_mode(s, SSL_MODE_SEND_FALLBACK_SCSV). + (CVE-2014-3566) + [Adam Langley, Bodo Moeller] + + *) Add additional DigestInfo checks. + + Reencode DigestInto in DER and check against the original when + verifying RSA signature: this will reject any improperly encoded + DigestInfo structures. + + Note: this is a precautionary measure and no attacks are currently known. + + [Steve Henson] + Changes between 1.0.1h and 1.0.1i [6 Aug 2014] *) Fix SRP buffer overrun vulnerability. Invalid parameters passed to the diff --git a/openssl/Configure b/openssl/Configure index 36844b7..6f0da76 100644 --- a/openssl/Configure +++ b/openssl/Configure @@ -1767,6 +1767,9 @@ open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslcon print OUT "/* opensslconf.h */\n"; print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n"; +print OUT "#ifdef __cplusplus\n"; +print OUT "extern \"C\" {\n"; +print OUT "#endif\n"; print OUT "/* OpenSSL was configured with the following options: */\n"; my $openssl_algorithm_defines_trans = $openssl_algorithm_defines; $openssl_experimental_defines =~ s/^\s*#\s*define\s+OPENSSL_NO_(.*)/#ifndef OPENSSL_EXPERIMENTAL_$1\n# ifndef OPENSSL_NO_$1\n# define OPENSSL_NO_$1\n# endif\n#endif/mg; @@ -1871,6 +1874,9 @@ while (<IN>) { print OUT $_; } } close(IN); +print OUT "#ifdef __cplusplus\n"; +print OUT "}\n"; +print OUT "#endif\n"; close(OUT); rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h"; rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n"; diff --git a/openssl/Makefile b/openssl/Makefile index 998c032..d475c12 100644 --- a/openssl/Makefile +++ b/openssl/Makefile @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=1.0.1i +VERSION=1.0.1j MAJOR=1 MINOR=0.1 SHLIB_VERSION_NUMBER=1.0.0 diff --git a/openssl/NEWS b/openssl/NEWS index 8b2be4b..512a667 100644 --- a/openssl/NEWS +++ b/openssl/NEWS @@ -5,6 +5,13 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 1.0.1i and OpenSSL 1.0.1j [15 Oct 2014] + + o Fix for CVE-2014-3513 + o Fix for CVE-2014-3567 + o Mitigation for CVE-2014-3566 (SSL protocol vulnerability) + o Fix for CVE-2014-3568 + Major changes between OpenSSL 1.0.1h and OpenSSL 1.0.1i [6 Aug 2014] o Fix for CVE-2014-3512 diff --git a/openssl/README b/openssl/README index b2cf1ce..cb90c9f 100644 --- a/openssl/README +++ b/openssl/README @@ -1,5 +1,5 @@ - OpenSSL 1.0.1i 6 Aug 2014 + OpenSSL 1.0.1j 15 Oct 2014 Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/openssl/apps/makeapps.com b/openssl/apps/makeapps.com index efc213c..71a3336 100644 --- a/openssl/apps/makeapps.com +++ b/openssl/apps/makeapps.com @@ -773,9 +773,12 @@ $ CCDEFS = "MONOLITH" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" -$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS +$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" +$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS +$ ENDIF $! $! Check To See If We Have A ZLIB Option. $! @@ -1064,6 +1067,18 @@ $! Finish up the definition of CC. $! $ IF COMPILER .EQS. "DECC" $ THEN +$! Not all compiler versions support MAYLOSEDATA3. +$ OPT_TEST = "MAYLOSEDATA3" +$ DEFINE /USER_MODE SYS$ERROR NL: +$ DEFINE /USER_MODE SYS$OUTPUT NL: +$ 'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT - + /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL: +$ IF ($SEVERITY) +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN - + CCDISABLEWARNINGS = CCDISABLEWARNINGS+ "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST +$ ENDIF $ IF CCDISABLEWARNINGS .NES. "" $ THEN $ CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))" diff --git a/openssl/apps/s_client.c b/openssl/apps/s_client.c index 4625467..c2e160c 100644 --- a/openssl/apps/s_client.c +++ b/openssl/apps/s_client.c @@ -337,6 +337,7 @@ static void sc_usage(void) BIO_printf(bio_err," -tls1_1 - just use TLSv1.1\n"); BIO_printf(bio_err," -tls1 - just use TLSv1\n"); BIO_printf(bio_err," -dtls1 - just use DTLSv1\n"); + BIO_printf(bio_err," -fallback_scsv - send TLS_FALLBACK_SCSV\n"); BIO_printf(bio_err," -mtu - set the link layer MTU\n"); BIO_printf(bio_err," -no_tls1_2/-no_tls1_1/-no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n"); BIO_printf(bio_err," -bugs - Switch on all SSL implementation bug workarounds\n"); @@ -617,6 +618,7 @@ int MAIN(int argc, char **argv) char *sess_out = NULL; struct sockaddr peer; int peerlen = sizeof(peer); + int fallback_scsv = 0; int enable_timeouts = 0 ; long socket_mtu = 0; #ifndef OPENSSL_NO_JPAKE @@ -823,6 +825,10 @@ int MAIN(int argc, char **argv) meth=DTLSv1_client_method(); socket_type=SOCK_DGRAM; } + else if (strcmp(*argv,"-fallback_scsv") == 0) + { + fallback_scsv = 1; + } else if (strcmp(*argv,"-timeout") == 0) enable_timeouts=1; else if (strcmp(*argv,"-mtu") == 0) @@ -1235,6 +1241,10 @@ bad: SSL_set_session(con, sess); SSL_SESSION_free(sess); } + + if (fallback_scsv) + SSL_set_mode(con, SSL_MODE_SEND_FALLBACK_SCSV); + #ifndef OPENSSL_NO_TLSEXT if (servername != NULL) { diff --git a/openssl/crypto/LPdir_vms.c b/openssl/crypto/LPdir_vms.c index 7613bd2..3582fa6 100644 --- a/openssl/crypto/LPdir_vms.c +++ b/openssl/crypto/LPdir_vms.c @@ -1,4 +1,3 @@ -/* $LP: LPlib/source/LPdir_vms.c,v 1.20 2004/08/26 13:36:05 _cvs_levitte Exp $ */ /* * Copyright (c) 2004, Richard Levitte <richard(a)levitte.org> * All rights reserved. @@ -88,6 +87,12 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) size_t filespeclen = strlen(directory); char *filespec = NULL; + if (filespeclen == 0) + { + errno = ENOENT; + return 0; + } + /* MUST be a VMS directory specification! Let's estimate if it is. */ if (directory[filespeclen-1] != ']' && directory[filespeclen-1] != '>' diff --git a/openssl/crypto/LPdir_win.c b/openssl/crypto/LPdir_win.c index 702dbc7..d5b5e2c 100644 --- a/openssl/crypto/LPdir_win.c +++ b/openssl/crypto/LPdir_win.c @@ -1,4 +1,3 @@ -/* $LP: LPlib/source/LPdir_win.c,v 1.10 2004/08/26 13:36:05 _cvs_levitte Exp $ */ /* * Copyright (c) 2004, Richard Levitte <richard(a)levitte.org> * All rights reserved. @@ -63,6 +62,16 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) errno = 0; if (*ctx == NULL) { + const char *extdir = directory; + char *extdirbuf = NULL; + size_t dirlen = strlen (directory); + + if (dirlen == 0) + { + errno = ENOENT; + return 0; + } + *ctx = (LP_DIR_CTX *)malloc(sizeof(LP_DIR_CTX)); if (*ctx == NULL) { @@ -71,15 +80,35 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) } memset(*ctx, '\0', sizeof(LP_DIR_CTX)); + if (directory[dirlen-1] != '*') + { + extdirbuf = (char *)malloc(dirlen + 3); + if (extdirbuf == NULL) + { + free(*ctx); + *ctx = NULL; + errno = ENOMEM; + return 0; + } + if (directory[dirlen-1] != '/' && directory[dirlen-1] != '\\') + extdir = strcat(strcpy (extdirbuf,directory),"/*"); + else + extdir = strcat(strcpy (extdirbuf,directory),"*"); + } + if (sizeof(TCHAR) != sizeof(char)) { TCHAR *wdir = NULL; /* len_0 denotes string length *with* trailing 0 */ - size_t index = 0,len_0 = strlen(directory) + 1; + size_t index = 0,len_0 = strlen(extdir) + 1; - wdir = (TCHAR *)malloc(len_0 * sizeof(TCHAR)); + wdir = (TCHAR *)calloc(len_0, sizeof(TCHAR)); if (wdir == NULL) { + if (extdirbuf != NULL) + { + free (extdirbuf); + } free(*ctx); *ctx = NULL; errno = ENOMEM; @@ -87,17 +116,23 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) } #ifdef LP_MULTIBYTE_AVAILABLE - if (!MultiByteToWideChar(CP_ACP, 0, directory, len_0, (WCHAR *)wdir, len_0)) + if (!MultiByteToWideChar(CP_ACP, 0, extdir, len_0, (WCHAR *)wdir, len_0)) #endif for (index = 0; index < len_0; index++) - wdir[index] = (TCHAR)directory[index]; + wdir[index] = (TCHAR)extdir[index]; (*ctx)->handle = FindFirstFile(wdir, &(*ctx)->ctx); free(wdir); } else - (*ctx)->handle = FindFirstFile((TCHAR *)directory, &(*ctx)->ctx); + { + (*ctx)->handle = FindFirstFile((TCHAR *)extdir, &(*ctx)->ctx); + } + if (extdirbuf != NULL) + { + free (extdirbuf); + } if ((*ctx)->handle == INVALID_HANDLE_VALUE) { @@ -114,7 +149,6 @@ const char *LP_find_file(LP_DIR_CTX **ctx, const char *directory) return 0; } } - if (sizeof(TCHAR) != sizeof(char)) { TCHAR *wdir = (*ctx)->ctx.cFileName; diff --git a/openssl/crypto/Makefile b/openssl/crypto/Makefile index a90809b..ee5bfbd 100644 --- a/openssl/crypto/Makefile +++ b/openssl/crypto/Makefile @@ -31,6 +31,7 @@ CPUID_OBJ=mem_clr.o LIBS= GENERAL=Makefile README crypto-lib.com install.com +TEST=constant_time_test.c LIB= $(TOP)/libcrypto.a SHARED_LIB= libcrypto$(SHLIB_EXT) @@ -43,7 +44,8 @@ SRC= $(LIBSRC) EXHEADER= crypto.h opensslv.h opensslconf.h ebcdic.h symhacks.h \ ossl_typ.h -HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h $(EXHEADER) +HEADER= cryptlib.h buildinf.h md32_common.h o_time.h o_str.h o_dir.h \ + constant_time_locl.h $(EXHEADER) ALL= $(GENERAL) $(SRC) $(HEADER) diff --git a/openssl/crypto/aes/asm/aesni-x86_64.pl b/openssl/crypto/aes/asm/aesni-x86_64.pl index 0dbb194..c9270df 100644 --- a/openssl/crypto/aes/asm/aesni-x86_64.pl +++ b/openssl/crypto/aes/asm/aesni-x86_64.pl @@ -525,6 +525,16 @@ $code.=<<___; .type aesni_ecb_encrypt,\@function,5 .align 16 aesni_ecb_encrypt: +___ +$code.=<<___ if ($win64); + lea -0x58(%rsp),%rsp + movaps %xmm6,(%rsp) + movaps %xmm7,0x10(%rsp) + movaps %xmm8,0x20(%rsp) + movaps %xmm9,0x30(%rsp) +.Lecb_enc_body: +___ +$code.=<<___; and \$-16,$len jz .Lecb_ret @@ -805,6 +815,16 @@ $code.=<<___; movups $inout5,0x50($out) .Lecb_ret: +___ +$code.=<<___ if ($win64); + movaps (%rsp),%xmm6 + movaps 0x10(%rsp),%xmm7 + movaps 0x20(%rsp),%xmm8 + movaps 0x30(%rsp),%xmm9 + lea 0x58(%rsp),%rsp +.Lecb_enc_ret: +___ +$code.=<<___; ret .size aesni_ecb_encrypt,.-aesni_ecb_encrypt ___ @@ -2730,28 +2750,9 @@ $code.=<<___; .extern __imp_RtlVirtualUnwind ___ $code.=<<___ if ($PREFIX eq "aesni"); -.type ecb_se_handler,\@abi-omnipotent -.align 16 -ecb_se_handler: - push %rsi - push %rdi - push %rbx - push %rbp - push %r12 - push %r13 - push %r14 - push %r15 - pushfq - sub \$64,%rsp - - mov 152($context),%rax # pull context->Rsp - - jmp .Lcommon_seh_tail -.size ecb_se_handler,.-ecb_se_handler - -.type ccm64_se_handler,\@abi-omnipotent +.type ecb_ccm64_se_handler,\@abi-omnipotent .align 16 -ccm64_se_handler: +ecb_ccm64_se_handler: push %rsi push %rdi push %rbx @@ -2788,7 +2789,7 @@ ccm64_se_handler: lea 0x58(%rax),%rax # adjust stack pointer jmp .Lcommon_seh_tail -.size ccm64_se_handler,.-ccm64_se_handler +.size ecb_ccm64_se_handler,.-ecb_ccm64_se_handler .type ctr32_se_handler,\@abi-omnipotent .align 16 @@ -2993,14 +2994,15 @@ ___ $code.=<<___ if ($PREFIX eq "aesni"); .LSEH_info_ecb: .byte 9,0,0,0 - .rva ecb_se_handler + .rva ecb_ccm64_se_handler + .rva .Lecb_enc_body,.Lecb_enc_ret # HandlerData[] .LSEH_info_ccm64_enc: .byte 9,0,0,0 - .rva ccm64_se_handler + .rva ecb_ccm64_se_handler .rva .Lccm64_enc_body,.Lccm64_enc_ret # HandlerData[] .LSEH_info_ccm64_dec: .byte 9,0,0,0 - .rva ccm64_se_handler + .rva ecb_ccm64_se_handler .rva .Lccm64_dec_body,.Lccm64_dec_ret # HandlerData[] .LSEH_info_ctr32: .byte 9,0,0,0 diff --git a/openssl/crypto/asn1/a_strex.c b/openssl/crypto/asn1/a_strex.c index ead37ac..8fb4193 100644 --- a/openssl/crypto/asn1/a_strex.c +++ b/openssl/crypto/asn1/a_strex.c @@ -568,6 +568,7 @@ int ASN1_STRING_to_UTF8(unsigned char **out, ASN1_STRING *in) mbflag |= MBSTRING_FLAG; stmp.data = NULL; stmp.length = 0; + stmp.flags = 0; ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING); if(ret < 0) return ret; *out = stmp.data; diff --git a/openssl/crypto/bn/asm/x86_64-gcc.c b/openssl/crypto/bn/asm/x86_64-gcc.c index acb0b40..31476ab 100644 --- a/openssl/crypto/bn/asm/x86_64-gcc.c +++ b/openssl/crypto/bn/asm/x86_64-gcc.c @@ -189,7 +189,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -200,7 +200,7 @@ BN_ULONG bn_add_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; @@ -212,7 +212,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int if (n <= 0) return 0; - asm ( + asm volatile ( " subq %2,%2 \n" ".p2align 4 \n" "1: movq (%4,%2,8),%0 \n" @@ -223,7 +223,7 @@ BN_ULONG bn_sub_words (BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,int " sbbq %0,%0 \n" : "=&a"(ret),"+c"(n),"=&r"(i) : "r"(rp),"r"(ap),"r"(bp) - : "cc" + : "cc", "memory" ); return ret&1; diff --git a/openssl/crypto/bn/bn_exp.c b/openssl/crypto/bn/bn_exp.c index 5e7eb33..611fa32 100644 --- a/openssl/crypto/bn/bn_exp.c +++ b/openssl/crypto/bn/bn_exp.c @@ -874,7 +874,14 @@ int BN_mod_exp_mont_word(BIGNUM *rr, BN_ULONG a, const BIGNUM *p, bits = BN_num_bits(p); if (bits == 0) { - ret = BN_one(rr); + /* x**0 mod 1 is still zero. */ + if (BN_is_one(m)) + { + ret = 1; + BN_zero(rr); + } + else + ret = BN_one(rr); return ret; } if (a == 0) diff --git a/openssl/crypto/bn/bn_nist.c b/openssl/crypto/bn/bn_nist.c index e22968d..abb1570 100644 --- a/openssl/crypto/bn/bn_nist.c +++ b/openssl/crypto/bn/bn_nist.c @@ -1088,9 +1088,9 @@ int BN_nist_mod_521(BIGNUM *r, const BIGNUM *a, const BIGNUM *field, /* ... and right shift */ for (val=t_d[0],i=0; i<BN_NIST_521_TOP-1; i++) { - tmp = val>>BN_NIST_521_RSHIFT; - val = t_d[i+1]; - t_d[i] = (tmp | val<<BN_NIST_521_LSHIFT) & BN_MASK2; + t_d[i] = ( val>>BN_NIST_521_RSHIFT | + (tmp=t_d[i+1])<<BN_NIST_521_LSHIFT ) & BN_MASK2; + val=tmp; } t_d[i] = val>>BN_NIST_521_RSHIFT; /* lower 521 bits */ diff --git a/openssl/crypto/bn/exptest.c b/openssl/crypto/bn/exptest.c index 074a8e8..5fa02a1 100644 --- a/openssl/crypto/bn/exptest.c +++ b/openssl/crypto/bn/exptest.c @@ -71,6 +71,43 @@ static const char rnd_seed[] = "string to make the random number generator think it has entropy"; +/* test_exp_mod_zero tests that x**0 mod 1 == 0. It returns zero on success. */ +static int test_exp_mod_zero() { + BIGNUM a, p, m; + BIGNUM r; + BN_CTX *ctx = BN_CTX_new(); + int ret = 1; + + BN_init(&m); + BN_one(&m); + + BN_init(&a); + BN_one(&a); + + BN_init(&p); + BN_zero(&p); + + BN_init(&r); + BN_mod_exp(&r, &a, &p, &m, ctx); + BN_CTX_free(ctx); + + if (BN_is_zero(&r)) + ret = 0; + else + { + printf("1**0 mod 1 = "); + BN_print_fp(stdout, &r); + printf(", should be 0\n"); + } + + BN_free(&r); + BN_free(&a); + BN_free(&p); + BN_free(&m); + + return ret; +} + int main(int argc, char *argv[]) { BN_CTX *ctx; @@ -190,7 +227,13 @@ int main(int argc, char *argv[]) ERR_remove_thread_state(NULL); CRYPTO_mem_leaks(out); BIO_free(out); - printf(" done\n"); + printf("\n"); + + if (test_exp_mod_zero() != 0) + goto err; + + printf("done\n"); + EXIT(0); err: ERR_load_crypto_strings(); diff --git a/openssl/crypto/constant_time_locl.h b/openssl/crypto/constant_time_locl.h new file mode 100644 index 0000000..c048393 --- /dev/null +++ b/openssl/crypto/constant_time_locl.h @@ -0,0 +1,216 @@ +/* crypto/constant_time_locl.h */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia(a)openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay(a)cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh(a)cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#ifndef HEADER_CONSTANT_TIME_LOCL_H +#define HEADER_CONSTANT_TIME_LOCL_H + +#include "e_os.h" /* For 'inline' */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * The boolean methods return a bitmask of all ones (0xff...f) for true + * and 0 for false. This is useful for choosing a value based on the result + * of a conditional in constant time. For example, + * + * if (a < b) { + * c = a; + * } else { + * c = b; + * } + * + * can be written as + * + * unsigned int lt = constant_time_lt(a, b); + * c = constant_time_select(lt, a, b); + */ + +/* + * Returns the given value with the MSB copied to all the other + * bits. Uses the fact that arithmetic shift shifts-in the sign bit. + * However, this is not ensured by the C standard so you may need to + * replace this with something else on odd CPUs. + */ +static inline unsigned int constant_time_msb(unsigned int a); + +/* + * Returns 0xff..f if a < b and 0 otherwise. + */ +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a >= b and 0 otherwise. + */ +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b); + +/* + * Returns 0xff..f if a == 0 and 0 otherwise. + */ +static inline unsigned int constant_time_is_zero(unsigned int a); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_is_zero_8(unsigned int a); + + +/* + * Returns 0xff..f if a == b and 0 otherwise. + */ +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b); +/* Signed integers. */ +static inline unsigned int constant_time_eq_int(int a, int b); +/* Convenience method for getting an 8-bit mask. */ +static inline unsigned char constant_time_eq_int_8(int a, int b); + + +/* + * Returns (mask & a) | (~mask & b). + * + * When |mask| is all 1s or all 0s (as returned by the methods above), + * the select methods return either |a| (if |mask| is nonzero) or |b| + * (if |mask| is zero). + */ +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b); +/* Convenience method for unsigned chars. */ +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b); +/* Convenience method for signed integers. */ +static inline int constant_time_select_int(unsigned int mask, int a, int b); + +static inline unsigned int constant_time_msb(unsigned int a) + { + return (unsigned int)((int)(a) >> (sizeof(int) * 8 - 1)); + } + +static inline unsigned int constant_time_lt(unsigned int a, unsigned int b) + { + unsigned int lt; + /* Case 1: msb(a) == msb(b). a < b iff the MSB of a - b is set.*/ + lt = ~(a ^ b) & (a - b); + /* Case 2: msb(a) != msb(b). a < b iff the MSB of b is set. */ + lt |= ~a & b; + return constant_time_msb(lt); + } + +static inline unsigned char constant_time_lt_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_lt(a, b)); + } + +static inline unsigned int constant_time_ge(unsigned int a, unsigned int b) + { + unsigned int ge; + /* Case 1: msb(a) == msb(b). a >= b iff the MSB of a - b is not set.*/ + ge = ~((a ^ b) | (a - b)); + /* Case 2: msb(a) != msb(b). a >= b iff the MSB of a is set. */ + ge |= a & ~b; + return constant_time_msb(ge); + } + +static inline unsigned char constant_time_ge_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_ge(a, b)); + } + +static inline unsigned int constant_time_is_zero(unsigned int a) + { + return constant_time_msb(~a & (a - 1)); + } + +static inline unsigned char constant_time_is_zero_8(unsigned int a) + { + return (unsigned char)(constant_time_is_zero(a)); + } + +static inline unsigned int constant_time_eq(unsigned int a, unsigned int b) + { + return constant_time_is_zero(a ^ b); + } + +static inline unsigned char constant_time_eq_8(unsigned int a, unsigned int b) + { + return (unsigned char)(constant_time_eq(a, b)); + } + +static inline unsigned int constant_time_eq_int(int a, int b) + { + return constant_time_eq((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned char constant_time_eq_int_8(int a, int b) + { + return constant_time_eq_8((unsigned)(a), (unsigned)(b)); + } + +static inline unsigned int constant_time_select(unsigned int mask, + unsigned int a, unsigned int b) + { + return (mask & a) | (~mask & b); + } + +static inline unsigned char constant_time_select_8(unsigned char mask, + unsigned char a, unsigned char b) + { + return (unsigned char)(constant_time_select(mask, a, b)); + } + +inline int constant_time_select_int(unsigned int mask, int a, int b) + { + return (int)(constant_time_select(mask, (unsigned)(a), (unsigned)(b))); + } + +#ifdef __cplusplus +} +#endif + +#endif /* HEADER_CONSTANT_TIME_LOCL_H */ diff --git a/openssl/crypto/constant_time_test.c b/openssl/crypto/constant_time_test.c new file mode 100644 index 0000000..d9c6a44 --- /dev/null +++ b/openssl/crypto/constant_time_test.c @@ -0,0 +1,330 @@ +/* crypto/constant_time_test.c */ +/* + * Utilities for constant-time cryptography. + * + * Author: Emilia Kasper (emilia(a)openssl.org) + * Based on previous work by Bodo Moeller, Emilia Kasper, Adam Langley + * (Google). + * ==================================================================== + * Copyright (c) 2014 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay(a)cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh(a)cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +#include "../crypto/constant_time_locl.h" + +#include <limits.h> +#include <stdio.h> +#include <stdlib.h> + +static const unsigned int CONSTTIME_TRUE = (unsigned)(~0); +static const unsigned int CONSTTIME_FALSE = 0; +static const unsigned char CONSTTIME_TRUE_8 = 0xff; +static const unsigned char CONSTTIME_FALSE_8 = 0; + +static int test_binary_op(unsigned int (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned c = op(a, b); + if (is_true && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(TRUE), got %du\n", op_name, a, b, CONSTTIME_TRUE, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %du " + "(FALSE), got %du\n", op_name, a, b, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_binary_op_8(unsigned char (*op)(unsigned int a, unsigned int b), + const char* op_name, unsigned int a, unsigned int b, int is_true) + { + unsigned char c = op(a, b); + if (is_true && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(TRUE), got %u\n", op_name, a, b, CONSTTIME_TRUE_8, c); + return 1; + } + else if (!is_true && c != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for %s(%du, %du): expected %u " + "(FALSE), got %u\n", op_name, a, b, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_is_zero(unsigned int a) + { + unsigned int c = constant_time_is_zero(a); + if (a == 0 && c != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (TRUE), got %du\n", a, CONSTTIME_TRUE, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %du (FALSE), got %du\n", a, CONSTTIME_FALSE, + c); + return 1; + } + return 0; + } + +static int test_is_zero_8(unsigned int a) + { + unsigned char c = constant_time_is_zero_8(a); + if (a == 0 && c != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (TRUE), got %u\n", a, CONSTTIME_TRUE_8, c); + return 1; + } + else if (a != 0 && c != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_is_zero(%du): " + "expected %u (FALSE), got %u\n", a, CONSTTIME_FALSE_8, + c); + return 1; + } + return 0; + } + +static int test_select(unsigned int a, unsigned int b) + { + unsigned int selected = constant_time_select(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(first value), got %du\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %du," + "%du): expected %du(second value), got %du\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_8(unsigned char a, unsigned char b) + { + unsigned char selected = constant_time_select_8(CONSTTIME_TRUE_8, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(first value), got %u\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_8(CONSTTIME_FALSE_8, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%u, %u," + "%u): expected %u(second value), got %u\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_select_int(int a, int b) + { + int selected = constant_time_select_int(CONSTTIME_TRUE, a, b); + if (selected != a) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(first value), got %d\n", + CONSTTIME_TRUE, a, b, a, selected); + return 1; + } + selected = constant_time_select_int(CONSTTIME_FALSE, a, b); + if (selected != b) + { + fprintf(stderr, "Test failed for constant_time_select(%du, %d," + "%d): expected %d(second value), got %d\n", + CONSTTIME_FALSE, a, b, b, selected); + return 1; + } + return 0; + } + +static int test_eq_int(int a, int b) + { + unsigned int equal = constant_time_eq_int(a, b); + if (a == b && equal != CONSTTIME_TRUE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(TRUE), got %du\n", + a, b, CONSTTIME_TRUE, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE) + { + fprintf(stderr, "Test failed for constant_time_eq_int(%d, %d): " + "expected %du(FALSE), got %du\n", + a, b, CONSTTIME_FALSE, equal); + return 1; + } + return 0; + } + +static int test_eq_int_8(int a, int b) + { + unsigned char equal = constant_time_eq_int_8(a, b); + if (a == b && equal != CONSTTIME_TRUE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(TRUE), got %u\n", + a, b, CONSTTIME_TRUE_8, equal); + return 1; + } + else if (a != b && equal != CONSTTIME_FALSE_8) + { + fprintf(stderr, "Test failed for constant_time_eq_int_8(%d, %d): " + "expected %u(FALSE), got %u\n", + a, b, CONSTTIME_FALSE_8, equal); + return 1; + } + return 0; + } + +static unsigned int test_values[] = {0, 1, 1024, 12345, 32000, UINT_MAX/2-1, + UINT_MAX/2, UINT_MAX/2+1, UINT_MAX-1, + UINT_MAX}; + +static unsigned char test_values_8[] = {0, 1, 2, 20, 32, 127, 128, 129, 255}; + +static int signed_test_values[] = {0, 1, -1, 1024, -1024, 12345, -12345, + 32000, -32000, INT_MAX, INT_MIN, INT_MAX-1, + INT_MIN+1}; + + +int main(int argc, char *argv[]) + { + unsigned int a, b, i, j; + int c, d; + unsigned char e, f; + int num_failed = 0, num_all = 0; + fprintf(stdout, "Testing constant time operations...\n"); + + for (i = 0; i < sizeof(test_values)/sizeof(int); ++i) + { + a = test_values[i]; + num_failed += test_is_zero(a); + num_failed += test_is_zero_8(a); + num_all += 2; + for (j = 0; j < sizeof(test_values)/sizeof(int); ++j) + { + b = test_values[j]; + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt", a, b, a < b); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", a, b, a < b); + num_failed += test_binary_op(&constant_time_lt, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op_8(&constant_time_lt_8, + "constant_time_lt_8", b, a, b < a); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", a, b, a >= b); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", a, b, a >= b); + num_failed += test_binary_op(&constant_time_ge, + "constant_time_ge", b, a, b >= a); + num_failed += test_binary_op_8(&constant_time_ge_8, + "constant_time_ge_8", b, a, b >= a); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", a, b, a == b); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", a, b, a == b); + num_failed += test_binary_op(&constant_time_eq, + "constant_time_eq", b, a, b == a); + num_failed += test_binary_op_8(&constant_time_eq_8, + "constant_time_eq_8", b, a, b == a); + num_failed += test_select(a, b); + num_all += 13; + } + } + + for (i = 0; i < sizeof(signed_test_values)/sizeof(int); ++i) + { + c = signed_test_values[i]; + for (j = 0; j < sizeof(signed_test_values)/sizeof(int); ++j) + { + d = signed_test_values[j]; + num_failed += test_select_int(c, d); + num_failed += test_eq_int(c, d); + num_failed += test_eq_int_8(c, d); + num_all += 3; + } + } + + for (i = 0; i < sizeof(test_values_8); ++i) + { + e = test_values_8[i]; + for (j = 0; j < sizeof(test_values_8); ++j) + { + f = test_values_8[j]; + num_failed += test_select_8(e, f); + num_all += 1; + } + } + + if (!num_failed) + { + fprintf(stdout, "ok (ran %d tests)\n", num_all); + return EXIT_SUCCESS; + } + else + { + fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all); + return EXIT_FAILURE; + } + } diff --git a/openssl/crypto/crypto-lib.com b/openssl/crypto/crypto-lib.com index dc8a8c1..a136f4b 100644 --- a/openssl/crypto/crypto-lib.com +++ b/openssl/crypto/crypto-lib.com @@ -111,8 +111,8 @@ $ ET_WHIRLPOOL = "WHRLPOOL" $ IF ARCH .EQS. "VAX" THEN ET_WHIRLPOOL = "" $ ENCRYPT_TYPES = "Basic,"+ - "OBJECTS,"+ - - "MD2,MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ - - "DES,AES,RC2,RC4,RC5,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ - + "MD4,MD5,SHA,MDC2,HMAC,RIPEMD,"+ET_WHIRLPOOL+","+ - + "DES,AES,RC2,RC4,IDEA,BF,CAST,CAMELLIA,SEED,MODES,"+ - "BN,EC,RSA,DSA,ECDSA,DH,ECDH,DSO,ENGINE,"+ - "BUFFER,BIO,STACK,LHASH,RAND,ERR,"+ - "EVP,EVP_2,EVP_3,ASN1,ASN1_2,PEM,X509,X509V3,"+ - @@ -204,11 +204,18 @@ $ GOSUB CHECK_OPT_FILE $! $! Define The Different Encryption "library" Strings. $! -$ APPS_DES = "DES/DES,CBC3_ENC" -$ APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE" +$!!! Test apps disabled, as they aren't supported at all, +$!!! not even in the unix build +$!!! APPS_DES = "DES/DES,CBC3_ENC" +$!!! APPS_PKCS7 = "ENC/ENC;DEC/DEC;SIGN/SIGN;VERIFY/VERIFY,EXAMPLE" $ -$ LIB_ = "cryptlib,mem,mem_clr,mem_dbg,cversion,ex_data,cpt_err,"+ - - "ebcdic,uid,o_time,o_str,o_dir,o_fips.c,o_init,fips_ers" +$! These variables are ordered as the SDIRS variable from the top Makefile.org +$! The contents of these variables are copied from the LIBOBJ variable in the +$! corresponding Makefile from each corresponding subdirectory, with .o stripped +$! and spaces replaced with commas. +$ LIB_ = "cryptlib,mem,mem_dbg,cversion,ex_data,cpt_err,ebcdic,"+ - + "uid,o_time,o_str,o_dir,o_fips.c,o_init,fips_ers,mem_clr" +$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref" $ LIB_MD2 = "md2_dgst,md2_one" $ LIB_MD4 = "md4_dgst,md4_one" $ LIB_MD5 = "md5_dgst,md5_one" @@ -225,13 +232,13 @@ $ LIB_DES = "set_key,ecb_enc,cbc_enc,"+ - "fcrypt,xcbc_enc,rpc_enc,cbc_cksm,"+ - "ede_cbcm_enc,des_old,des_old2,read2pwd" $ LIB_RC2 = "rc2_ecb,rc2_skey,rc2_cbc,rc2cfb64,rc2ofb64" -$ LIB_RC4 = "rc4_skey,rc4_enc,rc4_utl" +$ LIB_RC4 = "rc4_enc,rc4_skey,rc4_utl" $ LIB_RC5 = "rc5_skey,rc5_ecb,rc5_enc,rc5cfb64,rc5ofb64" $ LIB_IDEA = "i_cbc,i_cfb64,i_ofb64,i_ecb,i_skey" $ LIB_BF = "bf_skey,bf_ecb,bf_enc,bf_cfb64,bf_ofb64" $ LIB_CAST = "c_skey,c_ecb,c_enc,c_cfb64,c_ofb64" -$ LIB_CAMELLIA = "camellia,cmll_misc,cmll_ecb,cmll_cbc,cmll_ofb,"+ - - "cmll_cfb,cmll_ctr,cmll_utl" +$ LIB_CAMELLIA = "cmll_ecb,cmll_ofb,cmll_cfb,cmll_ctr,cmll_utl,"+ - + "camellia,cmll_misc,cmll_cbc" $ LIB_SEED = "seed,seed_ecb,seed_cbc,seed_cfb,seed_ofb" $ LIB_MODES = "cbc128,ctr128,cts128,cfb128,ofb128,gcm128,"+ - "ccm128,xts128" @@ -264,24 +271,23 @@ $ LIB_ENGINE = "eng_err,eng_lib,eng_list,eng_init,eng_ctrl,"+ - "eng_table,eng_pkey,eng_fat,eng_all,"+ - "tb_rsa,tb_dsa,tb_ecdsa,tb_dh,tb_ecdh,tb_rand,tb_store,"+ - "tb_cipher,tb_digest,tb_pkmeth,tb_asnmth,"+ - - "eng_openssl,eng_dyn,eng_cnf,eng_cryptodev,"+ - + "eng_openssl,eng_cnf,eng_dyn,eng_cryptodev,"+ - "eng_rsax,eng_rdrand" -$ LIB_AES = "aes_core,aes_misc,aes_ecb,aes_cbc,aes_cfb,aes_ofb,aes_ctr,"+ - - "aes_ige,aes_wrap" +$ LIB_AES = "aes_misc,aes_ecb,aes_cfb,aes_ofb,aes_ctr,aes_ige,aes_wrap,"+ - + "aes_core,aes_cbc" $ LIB_BUFFER = "buffer,buf_str,buf_err" $ LIB_BIO = "bio_lib,bio_cb,bio_err,"+ - "bss_mem,bss_null,bss_fd,"+ - "bss_file,bss_sock,bss_conn,"+ - "bf_null,bf_buff,b_print,b_dump,"+ - - "b_sock,bss_acpt,bf_nbio,bss_rtcp,bss_bio,bss_log,"+ - + "b_sock,bss_acpt,bf_nbio,bss_log,bss_bio,"+ - "bss_dgram,"+ - - "bf_lbuf" + "bf_lbuf,bss_rtcp" ! The last two are VMS specific $ LIB_STACK = "stack" $ LIB_LHASH = "lhash,lh_stats" $ LIB_RAND = "md_rand,randfile,rand_lib,rand_err,rand_egd,"+ - - "rand_vms" + "rand_vms" ! The last one is VMS specific $ LIB_ERR = "err,err_all,err_prn" -$ LIB_OBJECTS = "o_names,obj_dat,obj_lib,obj_err,obj_xref" $ LIB_EVP = "encode,digest,evp_enc,evp_key,evp_acnf,evp_cnf,"+ - "e_des,e_bf,e_idea,e_des3,e_camellia,"+ - "e_rc4,e_aes,names,e_seed,"+ - @@ -345,7 +351,7 @@ $ LIB_TS = "ts_err,ts_req_utils,ts_req_print,ts_rsp_utils,ts_rsp_print,"+ - $ LIB_JPAKE = "jpake,jpake_err" $ LIB_SRP = "srp_lib,srp_vfy" $ LIB_STORE = "str_err,str_lib,str_meth,str_mem" -$ LIB_CMAC = "cmac,cm_ameth.c,cm_pmeth" +$ LIB_CMAC = "cmac,cm_ameth,cm_pmeth" $! $! Setup exceptional compilations $! @@ -381,7 +387,7 @@ $ MODULE_NEXT: $! $! Extract The Module Name From The Encryption List. $! -$ MODULE_NAME = F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES) +$ MODULE_NAME = F$EDIT(F$ELEMENT(MODULE_COUNTER,",",ENCRYPT_TYPES),"COLLAPSE") $ IF MODULE_NAME.EQS."Basic" THEN MODULE_NAME = "" $ MODULE_NAME1 = MODULE_NAME $! @@ -465,7 +471,7 @@ $ THEN $! $! O.K, Extract The File Name From The File List. $! -$ FILE_NAME = F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE') +$ FILE_NAME = F$EDIT(F$ELEMENT(FILE_COUNTER,",",'LIB_MODULE'),"COLLAPSE") $! $! else $! @@ -492,7 +498,7 @@ $! SHOW SYMBOL APPLICATION* $! $ IF APPLICATION .NES. ";" $ THEN -$ FILE_NAME = F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS) +$ FILE_NAME = F$EDIT(F$ELEMENT(FILE_COUNTER,",",APPLICATION_OBJECTS),"COLLAPSE") $ IF FILE_NAME .EQS. "," $ THEN $ APPLICATION = "" @@ -1132,9 +1138,12 @@ $ CCDEFS = "TCPIP_TYPE_''P4',DSO_VMS" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" -$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS +$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" +$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS +$ ENDIF $! $! Check To See If We Have A ZLIB Option. $! @@ -1299,6 +1308,18 @@ $! Finish up the definition of CC. $! $ IF COMPILER .EQS. "DECC" $ THEN +$! Not all compiler versions support MAYLOSEDATA3. +$ OPT_TEST = "MAYLOSEDATA3" +$ DEFINE /USER_MODE SYS$ERROR NL: +$ DEFINE /USER_MODE SYS$OUTPUT NL: +$ 'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT - + /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL: +$ IF ($SEVERITY) +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN - + CCDISABLEWARNINGS = CCDISABLEWARNINGS+ "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST +$ ENDIF $ IF CCDISABLEWARNINGS .EQS. "" $ THEN $ CC4DISABLEWARNINGS = "DOLLARID" diff --git a/openssl/crypto/dsa/dsa_ameth.c b/openssl/crypto/dsa/dsa_ameth.c index 376156e..5af76ea 100644 --- a/openssl/crypto/dsa/dsa_ameth.c +++ b/openssl/crypto/dsa/dsa_ameth.c @@ -307,6 +307,12 @@ static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) unsigned char *dp = NULL; int dplen; + if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key) + { + DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS); + goto err; + } + params = ASN1_STRING_new(); if (!params) @@ -701,4 +707,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] = old_dsa_priv_encode } }; - diff --git a/openssl/crypto/ebcdic.h b/openssl/crypto/ebcdic.h index 6d65afc..85f3cf7 100644 --- a/openssl/crypto/ebcdic.h +++ b/openssl/crypto/ebcdic.h @@ -5,6 +5,10 @@ #include <sys/types.h> +#ifdef __cplusplus +extern "C" { +#endif + /* Avoid name clashes with other applications */ #define os_toascii _openssl_os_toascii #define os_toebcdic _openssl_os_toebcdic @@ -16,4 +20,7 @@ extern const unsigned char os_toebcdic[256]; void *ebcdic2ascii(void *dest, const void *srce, size_t count); void *ascii2ebcdic(void *dest, const void *srce, size_t count); +#ifdef __cplusplus +} +#endif #endif diff --git a/openssl/crypto/ec/ec.h b/openssl/crypto/ec/ec.h index dfe8710..572111f 100644 --- a/openssl/crypto/ec/ec.h +++ b/openssl/crypto/ec/ec.h @@ -629,7 +629,7 @@ int EC_POINT_cmp(const EC_GROUP *group, const EC_POINT *a, const EC_POINT *b, BN int EC_POINT_make_affine(const EC_GROUP *group, EC_POINT *point, BN_CTX *ctx); int EC_POINTs_make_affine(const EC_GROUP *group, size_t num, EC_POINT *points[], BN_CTX *ctx); -/** Computes r = generator * n sum_{i=0}^num p[i] * m[i] +/** Computes r = generator * n sum_{i=0}^{num-1} p[i] * m[i] * \param group underlying EC_GROUP object * \param r EC_POINT object for the result * \param n BIGNUM with the multiplier for the group generator (optional) diff --git a/openssl/crypto/ec/ec2_smpl.c b/openssl/crypto/ec/ec2_smpl.c index e0e59c7..62223cb 100644 --- a/openssl/crypto/ec/ec2_smpl.c +++ b/openssl/crypto/ec/ec2_smpl.c @@ -80,9 +80,6 @@ const EC_METHOD *EC_GF2m_simple_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gf2m_simple_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_characteristic_two_field, @@ -125,8 +122,12 @@ const EC_METHOD *EC_GF2m_simple_method(void) 0 /* field_decode */, 0 /* field_set_to_one */ }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gf2m_simple_method(); #endif + + return &ret; } diff --git a/openssl/crypto/ec/ec_ameth.c b/openssl/crypto/ec/ec_ameth.c index f715a23..1128376 100644 --- a/openssl/crypto/ec/ec_ameth.c +++ b/openssl/crypto/ec/ec_ameth.c @@ -453,14 +453,16 @@ static int do_EC_KEY_print(BIO *bp, const EC_KEY *x, int off, int ktype) if (ktype > 0) { public_key = EC_KEY_get0_public_key(x); - if ((pub_key = EC_POINT_point2bn(group, public_key, - EC_KEY_get_conv_form(x), NULL, ctx)) == NULL) + if (public_key != NULL) { - reason = ERR_R_EC_LIB; - goto err; - } - if (pub_key) + if ((pub_key = EC_POINT_point2bn(group, public_key, + EC_KEY_get_conv_form(x), NULL, ctx)) == NULL) + { + reason = ERR_R_EC_LIB; + goto err; + } buf_len = (size_t)BN_num_bytes(pub_key); + } } if (ktype == 2) diff --git a/openssl/crypto/ec/ec_asn1.c b/openssl/crypto/ec/ec_asn1.c index e94f34e..52d31c2 100644 --- a/openssl/crypto/ec/ec_asn1.c +++ b/openssl/crypto/ec/ec_asn1.c @@ -1183,29 +1183,46 @@ EC_KEY *d2i_ECPrivateKey(EC_KEY **a, const unsigned char **in, long len) goto err; } + if (ret->pub_key) + EC_POINT_clear_free(ret->pub_key); + ret->pub_key = EC_POINT_new(ret->group); + if (ret->pub_key == NULL) + { + ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB); + goto err; + } + if (priv_key->publicKey) { const unsigned char *pub_oct; - size_t pub_oct_len; + int pub_oct_len; - if (ret->pub_key) - EC_POINT_clear_free(ret->pub_key); - ret->pub_key = EC_POINT_new(ret->group); - if (ret->pub_key == NULL) + pub_oct = M_ASN1_STRING_data(priv_key->publicKey); + pub_oct_len = M_ASN1_STRING_length(priv_key->publicKey); + /* The first byte - point conversion form - must be present. */ + if (pub_oct_len <= 0) { - ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB); + ECerr(EC_F_D2I_ECPRIVATEKEY, EC_R_BUFFER_TOO_SMALL); goto err; } - pub_oct = M_ASN1_STRING_data(priv_key->publicKey); - pub_oct_len = M_ASN1_STRING_length(priv_key->publicKey); - /* save the point conversion form */ + /* Save the point conversion form. */ ret->conv_form = (point_conversion_form_t)(pub_oct[0] & ~0x01); if (!EC_POINT_oct2point(ret->group, ret->pub_key, - pub_oct, pub_oct_len, NULL)) + pub_oct, (size_t)(pub_oct_len), NULL)) + { + ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB); + goto err; + } + } + else + { + if (!EC_POINT_mul(ret->group, ret->pub_key, ret->priv_key, NULL, NULL, NULL)) { ECerr(EC_F_D2I_ECPRIVATEKEY, ERR_R_EC_LIB); goto err; } + /* Remember the original private-key-only encoding. */ + ret->enc_flag |= EC_PKEY_NO_PUBKEY; } ok = 1; @@ -1230,7 +1247,8 @@ int i2d_ECPrivateKey(EC_KEY *a, unsigned char **out) size_t buf_len=0, tmp_len; EC_PRIVATEKEY *priv_key=NULL; - if (a == NULL || a->group == NULL || a->priv_key == NULL) + if (a == NULL || a->group == NULL || a->priv_key == NULL || + (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key == NULL)) { ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_PASSED_NULL_PARAMETER); diff --git a/openssl/crypto/ec/ecp_mont.c b/openssl/crypto/ec/ecp_mont.c index f04f132..3c5ec19 100644 --- a/openssl/crypto/ec/ecp_mont.c +++ b/openssl/crypto/ec/ecp_mont.c @@ -72,9 +72,6 @@ const EC_METHOD *EC_GFp_mont_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gfp_mont_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_prime_field, @@ -114,8 +111,12 @@ const EC_METHOD *EC_GFp_mont_method(void) ec_GFp_mont_field_decode, ec_GFp_mont_field_set_to_one }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gfp_mont_method(); #endif + + return &ret; } diff --git a/openssl/crypto/ec/ecp_nist.c b/openssl/crypto/ec/ecp_nist.c index aad2d5f..db3b99e 100644 --- a/openssl/crypto/ec/ecp_nist.c +++ b/openssl/crypto/ec/ecp_nist.c @@ -73,9 +73,6 @@ const EC_METHOD *EC_GFp_nist_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gfp_nist_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_prime_field, @@ -115,8 +112,12 @@ const EC_METHOD *EC_GFp_nist_method(void) 0 /* field_decode */, 0 /* field_set_to_one */ }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gfp_nist_method(); #endif + + return &ret; } int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src) diff --git a/openssl/crypto/ec/ecp_smpl.c b/openssl/crypto/ec/ecp_smpl.c index ef52854..2d1f357 100644 --- a/openssl/crypto/ec/ecp_smpl.c +++ b/openssl/crypto/ec/ecp_smpl.c @@ -73,9 +73,6 @@ const EC_METHOD *EC_GFp_simple_method(void) { -#ifdef OPENSSL_FIPS - return fips_ec_gfp_simple_method(); -#else static const EC_METHOD ret = { EC_FLAGS_DEFAULT_OCT, NID_X9_62_prime_field, @@ -115,8 +112,12 @@ const EC_METHOD *EC_GFp_simple_method(void) 0 /* field_decode */, 0 /* field_set_to_one */ }; - return &ret; +#ifdef OPENSSL_FIPS + if (FIPS_mode()) + return fips_ec_gfp_simple_method(); #endif + + return &ret; } @@ -1317,8 +1318,8 @@ int ec_GFp_simple_points_make_affine(const EC_GROUP *group, size_t num, EC_POINT { for (i = 0; i < num; i++) { - if (prod_Z[i] != NULL) - BN_clear_free(prod_Z[i]); + if (prod_Z[i] == NULL) break; + BN_clear_free(prod_Z[i]); } OPENSSL_free(prod_Z); } diff --git a/openssl/crypto/ec/ectest.c b/openssl/crypto/ec/ectest.c index 82c8c8b..d1bf980 100644 --- a/openssl/crypto/ec/ectest.c +++ b/openssl/crypto/ec/ectest.c @@ -251,14 +251,15 @@ static void group_order_tests(EC_GROUP *group) if (!EC_POINT_is_at_infinity(group, Q)) ABORT; /* Exercise EC_POINTs_mul, including corner cases. */ + if (EC_POINT_is_at_infinity(group, P)) ABORT; scalars[0] = n1; points[0] = Q; /* => infinity */ scalars[1] = n2; points[1] = P; /* => -P */ scalars[2] = n1; points[2] = Q; /* => infinity */ scalars[3] = n2; points[3] = Q; /* => infinity */ scalars[4] = n1; points[4] = P; /* => P */ scalars[5] = n2; points[5] = Q; /* => infinity */ - if (!EC_POINTs_mul(group, Q, NULL, 5, points, scalars, ctx)) ABORT; - if (!EC_POINT_is_at_infinity(group, Q)) ABORT; + if (!EC_POINTs_mul(group, P, NULL, 6, points, scalars, ctx)) ABORT; + if (!EC_POINT_is_at_infinity(group, P)) ABORT; } fprintf(stdout, "ok\n"); diff --git a/openssl/crypto/err/openssl.ec b/openssl/crypto/err/openssl.ec index e0554b4..bafbc35 100644 --- a/openssl/crypto/err/openssl.ec +++ b/openssl/crypto/err/openssl.ec @@ -71,6 +71,7 @@ R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION 1070 R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 R SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 +R SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 R SSL_R_TLSV1_ALERT_USER_CANCELLED 1090 R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 R SSL_R_TLSV1_UNSUPPORTED_EXTENSION 1110 diff --git a/openssl/crypto/evp/Makefile b/openssl/crypto/evp/Makefile index 5d0c6b7..fa25bff 100644 --- a/openssl/crypto/evp/Makefile +++ b/openssl/crypto/evp/Makefile @@ -383,7 +383,7 @@ evp_enc.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h evp_enc.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h evp_enc.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h evp_enc.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h -evp_enc.o: ../cryptlib.h evp_enc.c evp_locl.h +evp_enc.o: ../constant_time_locl.h ../cryptlib.h evp_enc.c evp_locl.h evp_err.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h evp_err.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h evp_err.o: ../../include/openssl/err.h ../../include/openssl/evp.h diff --git a/openssl/crypto/evp/e_aes.c b/openssl/crypto/evp/e_aes.c index 07bf83a..dc3c2a1 100644 --- a/openssl/crypto/evp/e_aes.c +++ b/openssl/crypto/evp/e_aes.c @@ -166,7 +166,7 @@ extern unsigned int OPENSSL_ia32cap_P[2]; #define VPAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) #endif #ifdef BSAES_ASM -#define BSAES_CAPABLE VPAES_CAPABLE +#define BSAES_CAPABLE (OPENSSL_ia32cap_P[1]&(1<<(41-32))) #endif /* * AES-NI section diff --git a/openssl/crypto/evp/evp_enc.c b/openssl/crypto/evp/evp_enc.c index 0c54f05..7b1842a 100644 --- a/openssl/crypto/evp/evp_enc.c +++ b/openssl/crypto/evp/evp_enc.c @@ -67,6 +67,7 @@ #ifdef OPENSSL_FIPS #include <openssl/fips.h> #endif +#include "constant_time_locl.h" #include "evp_locl.h" #ifdef OPENSSL_FIPS @@ -500,21 +501,21 @@ int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) { - int i,n; - unsigned int b; + unsigned int i, b; + unsigned char pad, padding_good; *outl=0; if (ctx->cipher->flags & EVP_CIPH_FLAG_CUSTOM_CIPHER) { - i = M_do_cipher(ctx, out, NULL, 0); - if (i < 0) + int ret = M_do_cipher(ctx, out, NULL, 0); + if (ret < 0) return 0; else - *outl = i; + *outl = ret; return 1; } - b=ctx->cipher->block_size; + b=(unsigned int)(ctx->cipher->block_size); if (ctx->flags & EVP_CIPH_NO_PADDING) { if(ctx->buf_len) @@ -533,28 +534,34 @@ int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) return(0); } OPENSSL_assert(b <= sizeof ctx->final); - n=ctx->final[b-1]; - if (n == 0 || n > (int)b) - { - EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_BAD_DECRYPT); - return(0); - } - for (i=0; i<n; i++) + pad=ctx->final[b-1]; + + padding_good = (unsigned char)(~constant_time_is_zero_8(pad)); + padding_good &= constant_time_ge_8(b, pad); + + for (i = 1; i < b; ++i) { - if (ctx->final[--b] != n) - { - EVPerr(EVP_F_EVP_DECRYPTFINAL_EX,EVP_R_BAD_DECRYPT); - return(0); - } + unsigned char is_pad_index = constant_time_lt_8(i, pad); + unsigned char pad_byte_good = constant_time_eq_8(ctx->final[b-i-1], pad); + padding_good &= constant_time_select_8(is_pad_index, pad_byte_good, 0xff); } - n=ctx->cipher->block_size-n; - for (i=0; i<n; i++) - out[i]=ctx->final[i]; - *outl=n; + + /* + * At least 1 byte is always padding, so we always write b - 1 + * bytes to avoid a timing leak. The caller is required to have |b| + * bytes space in |out| by the API contract. + */ + for (i = 0; i < b - 1; ++i) + out[i] = ctx->final[i] & padding_good; + /* Safe cast: for a good padding, EVP_MAX_IV_LENGTH >= b >= pad */ + *outl = padding_good & ((unsigned char)(b - pad)); + return padding_good & 1; } else - *outl=0; - return(1); + { + *outl = 0; + return 1; + } } void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx) @@ -678,4 +685,3 @@ int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in) return in->cipher->ctrl((EVP_CIPHER_CTX *)in, EVP_CTRL_COPY, 0, out); return 1; } - diff --git a/openssl/crypto/install-crypto.com b/openssl/crypto/install-crypto.com index 85b3d58..d19081d 100644 --- a/openssl/crypto/install-crypto.com +++ b/openssl/crypto/install-crypto.com @@ -75,13 +75,13 @@ $! $ sdirs := , - 'archd', - objects, - - md2, md4, md5, sha, mdc2, hmac, ripemd, whrlpool, - - des, aes, rc2, rc4, rc5, idea, bf, cast, camellia, seed, - + md4, md5, sha, mdc2, hmac, ripemd, whrlpool, - + des, aes, rc2, rc4, idea, bf, cast, camellia, seed, - bn, ec, rsa, dsa, ecdsa, dh, ecdh, dso, engine, - buffer, bio, stack, lhash, rand, err, - evp, asn1, pem, x509, x509v3, conf, txt_db, pkcs7, pkcs12, comp, ocsp, - ui, krb5, - - store, cms, pqueue, ts, jpake + cms, pqueue, ts, jpake, srp, store, cmac $! $ exheader_ := crypto.h, opensslv.h, ebcdic.h, symhacks.h, ossl_typ.h $ exheader_'archd' := opensslconf.h @@ -139,6 +139,9 @@ $ exheader_cms := cms.h $ exheader_pqueue := pqueue.h $ exheader_ts := ts.h $ exheader_jpake := jpake.h +$ exheader_srp := srp.h +$ exheader_store := store.h +$ exheader_cmac := cmac.h $ libs := ssl_libcrypto $! $ exe_dir := [-.'archd'.exe.crypto] diff --git a/openssl/crypto/md5/asm/md5-x86_64.pl b/openssl/crypto/md5/asm/md5-x86_64.pl index f11224d..381bf77 100644 --- a/openssl/crypto/md5/asm/md5-x86_64.pl +++ b/openssl/crypto/md5/asm/md5-x86_64.pl @@ -108,6 +108,7 @@ sub round4_step EOF } +no warnings qw(uninitialized); my $flavour = shift; my $output = shift; if ($flavour =~ /\./) { $output = $flavour; undef $flavour; } @@ -119,7 +120,6 @@ $0 =~ m/(.*[\/\\])[^\/\\]+$/; my $dir=$1; my $xlate; ( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or die "can't locate x86_64-xlate.pl"; -no warnings qw(uninitialized); open OUT,"| \"$^X\" $xlate $flavour $output"; *STDOUT=*OUT; diff --git a/openssl/crypto/modes/modes.h b/openssl/crypto/modes/modes.h index f18215b..7773c25 100644 --- a/openssl/crypto/modes/modes.h +++ b/openssl/crypto/modes/modes.h @@ -7,6 +7,9 @@ #include <stddef.h> +#ifdef __cplusplus +extern "C" { +#endif typedef void (*block128_f)(const unsigned char in[16], unsigned char out[16], const void *key); @@ -133,3 +136,6 @@ typedef struct xts128_context XTS128_CONTEXT; int CRYPTO_xts128_encrypt(const XTS128_CONTEXT *ctx, const unsigned char iv[16], const unsigned char *inp, unsigned char *out, size_t len, int enc); +#ifdef __cplusplus +} +#endif diff --git a/openssl/crypto/ocsp/ocsp_vfy.c b/openssl/crypto/ocsp/ocsp_vfy.c index 2767183..fc0d4cc 100644 --- a/openssl/crypto/ocsp/ocsp_vfy.c +++ b/openssl/crypto/ocsp/ocsp_vfy.c @@ -436,8 +436,11 @@ static int ocsp_req_find_signer(X509 **psigner, OCSP_REQUEST *req, X509_NAME *nm if(!(flags & OCSP_NOINTERN)) { signer = X509_find_by_subject(req->optionalSignature->certs, nm); - *psigner = signer; - return 1; + if (signer) + { + *psigner = signer; + return 1; + } } signer = X509_find_by_subject(certs, nm); diff --git a/openssl/crypto/opensslconf.h b/openssl/crypto/opensslconf.h index 57abb87..7513d14 100644 --- a/openssl/crypto/opensslconf.h +++ b/openssl/crypto/opensslconf.h @@ -1,6 +1,9 @@ /* opensslconf.h */ /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ +#ifdef __cplusplus +extern "C" { +#endif /* OpenSSL was configured with the following options: */ #ifndef OPENSSL_DOING_MAKEDEPEND @@ -233,3 +236,6 @@ YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ +#ifdef __cplusplus +} +#endif diff --git a/openssl/crypto/opensslv.h b/openssl/crypto/opensslv.h index 2411505..f375967 100644 --- a/openssl/crypto/opensslv.h +++ b/openssl/crypto/opensslv.h @@ -1,6 +1,10 @@ #ifndef HEADER_OPENSSLV_H #define HEADER_OPENSSLV_H +#ifdef __cplusplus +extern "C" { +#endif + /* Numeric release version identifier: * MNNFFPPS: major minor fix patch status * The status nibble has one of the values 0 for development, 1 to e for betas @@ -25,11 +29,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000109fL +#define OPENSSL_VERSION_NUMBER 0x100010afL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1i-fips 6 Aug 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j-fips 15 Oct 2014" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1i 6 Aug 2014" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j 15 Oct 2014" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT @@ -86,4 +90,7 @@ #define SHLIB_VERSION_NUMBER "1.0.0" +#ifdef __cplusplus +} +#endif #endif /* HEADER_OPENSSLV_H */ diff --git a/openssl/crypto/ossl_typ.h b/openssl/crypto/ossl_typ.h index ea9227f..12cdd43 100644 --- a/openssl/crypto/ossl_typ.h +++ b/openssl/crypto/ossl_typ.h @@ -55,6 +55,10 @@ #ifndef HEADER_OPENSSL_TYPES_H #define HEADER_OPENSSL_TYPES_H +#ifdef __cplusplus +extern "C" { +#endif + #include <openssl/e_os2.h> #ifdef NO_ASN1_TYPEDEFS @@ -199,4 +203,7 @@ typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; typedef struct ocsp_response_st OCSP_RESPONSE; typedef struct ocsp_responder_id_st OCSP_RESPID; +#ifdef __cplusplus +} +#endif #endif /* def HEADER_OPENSSL_TYPES_H */ diff --git a/openssl/crypto/pkcs7/pkcs7.h b/openssl/crypto/pkcs7/pkcs7.h index 04f6037..5d54c4a 100644 --- a/openssl/crypto/pkcs7/pkcs7.h +++ b/openssl/crypto/pkcs7/pkcs7.h @@ -233,10 +233,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7) (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped) #define PKCS7_type_is_data(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_data) #define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) -#define PKCS7_type_is_encrypted(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted) - -#define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) #define PKCS7_set_detached(p,v) \ PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL) diff --git a/openssl/crypto/pqueue/pqueue.h b/openssl/crypto/pqueue/pqueue.h index 87fc903..26b5348 100644 --- a/openssl/crypto/pqueue/pqueue.h +++ b/openssl/crypto/pqueue/pqueue.h @@ -64,6 +64,9 @@ #include <stdlib.h> #include <string.h> +#ifdef __cplusplus +extern "C" { +#endif typedef struct _pqueue *pqueue; typedef struct _pitem @@ -91,4 +94,7 @@ pitem *pqueue_next(piterator *iter); void pqueue_print(pqueue pq); int pqueue_size(pqueue pq); +#ifdef __cplusplus +} +#endif #endif /* ! HEADER_PQUEUE_H */ diff --git a/openssl/crypto/rsa/Makefile b/openssl/crypto/rsa/Makefile index f798d2f..e8121a4 100644 --- a/openssl/crypto/rsa/Makefile +++ b/openssl/crypto/rsa/Makefile @@ -212,7 +212,7 @@ rsa_oaep.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_oaep.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h rsa_oaep.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h rsa_oaep.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h -rsa_oaep.o: ../cryptlib.h rsa_oaep.c +rsa_oaep.o: ../constant_time_locl.h ../cryptlib.h rsa_oaep.c rsa_pk1.o: ../../e_os.h ../../include/openssl/asn1.h rsa_pk1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h rsa_pk1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h @@ -221,7 +221,8 @@ rsa_pk1.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h rsa_pk1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h rsa_pk1.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h rsa_pk1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -rsa_pk1.o: ../../include/openssl/symhacks.h ../cryptlib.h rsa_pk1.c +rsa_pk1.o: ../../include/openssl/symhacks.h ../constant_time_locl.h +rsa_pk1.o: ../cryptlib.h rsa_pk1.c rsa_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h rsa_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h rsa_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h diff --git a/openssl/crypto/rsa/rsa.h b/openssl/crypto/rsa/rsa.h index 5f269e5..11853fe 100644 --- a/openssl/crypto/rsa/rsa.h +++ b/openssl/crypto/rsa/rsa.h @@ -559,6 +559,7 @@ void ERR_load_RSA_strings(void); #define RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE 158 #define RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 148 #define RSA_R_PADDING_CHECK_FAILED 114 +#define RSA_R_PKCS_DECODING_ERROR 159 #define RSA_R_P_NOT_PRIME 128 #define RSA_R_Q_NOT_PRIME 129 #define RSA_R_RSA_OPERATIONS_NOT_SUPPORTED 130 diff --git a/openssl/crypto/rsa/rsa_err.c b/openssl/crypto/rsa/rsa_err.c index 46e0bf9..9da79d9 100644 --- a/openssl/crypto/rsa/rsa_err.c +++ b/openssl/crypto/rsa/rsa_err.c @@ -175,6 +175,7 @@ static ERR_STRING_DATA RSA_str_reasons[]= {ERR_REASON(RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE),"operation not allowed in fips mode"}, {ERR_REASON(RSA_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE),"operation not supported for this keytype"}, {ERR_REASON(RSA_R_PADDING_CHECK_FAILED) ,"padding check failed"}, +{ERR_REASON(RSA_R_PKCS_DECODING_ERROR) ,"pkcs decoding error"}, {ERR_REASON(RSA_R_P_NOT_PRIME) ,"p not prime"}, {ERR_REASON(RSA_R_Q_NOT_PRIME) ,"q not prime"}, {ERR_REASON(RSA_R_RSA_OPERATIONS_NOT_SUPPORTED),"rsa operations not supported"}, diff --git a/openssl/crypto/rsa/rsa_oaep.c b/openssl/crypto/rsa/rsa_oaep.c index af4d24a..c363331 100644 --- a/openssl/crypto/rsa/rsa_oaep.c +++ b/openssl/crypto/rsa/rsa_oaep.c @@ -18,6 +18,7 @@ * an equivalent notion. */ +#include "constant_time_locl.h" #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) #include <stdio.h> @@ -95,92 +96,117 @@ int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen, const unsigned char *from, int flen, int num, const unsigned char *param, int plen) { - int i, dblen, mlen = -1; - const unsigned char *maskeddb; - int lzero; - unsigned char *db = NULL, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH]; - unsigned char *padded_from; - int bad = 0; - - if (--num < 2 * SHA_DIGEST_LENGTH + 1) - /* 'num' is the length of the modulus, i.e. does not depend on the - * particular ciphertext. */ - goto decoding_err; + int i, dblen, mlen = -1, one_index = 0, msg_index; + unsigned int good, found_one_byte; + const unsigned char *maskedseed, *maskeddb; + /* |em| is the encoded message, zero-padded to exactly |num| bytes: + * em = Y || maskedSeed || maskedDB */ + unsigned char *db = NULL, *em = NULL, seed[EVP_MAX_MD_SIZE], + phash[EVP_MAX_MD_SIZE]; - lzero = num - flen; - if (lzero < 0) - { - /* signalling this error immediately after detection might allow - * for side-channel attacks (e.g. timing if 'plen' is huge - * -- cf. James H. Manger, "A Chosen Ciphertext Attack on RSA Optimal - * Asymmetric Encryption Padding (OAEP) [...]", CRYPTO 2001), - * so we use a 'bad' flag */ - bad = 1; - lzero = 0; - flen = num; /* don't overflow the memcpy to padded_from */ - } + if (tlen <= 0 || flen <= 0) + return -1; - dblen = num - SHA_DIGEST_LENGTH; - db = OPENSSL_malloc(dblen + num); - if (db == NULL) + /* + * |num| is the length of the modulus; |flen| is the length of the + * encoded message. Therefore, for any |from| that was obtained by + * decrypting a ciphertext, we must have |flen| <= |num|. Similarly, + * num < 2 * SHA_DIGEST_LENGTH + 2 must hold for the modulus + * irrespective of the ciphertext, see PKCS #1 v2.2, section 7.1.2. + * This does not leak any side-channel information. + */ + if (num < flen || num < 2 * SHA_DIGEST_LENGTH + 2) + goto decoding_err; + + dblen = num - SHA_DIGEST_LENGTH - 1; + db = OPENSSL_malloc(dblen); + em = OPENSSL_malloc(num); + if (db == NULL || em == NULL) { RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, ERR_R_MALLOC_FAILURE); - return -1; + goto cleanup; } - /* Always do this zero-padding copy (even when lzero == 0) - * to avoid leaking timing info about the value of lzero. */ - padded_from = db + dblen; - memset(padded_from, 0, lzero); - memcpy(padded_from + lzero, from, flen); + /* + * Always do this zero-padding copy (even when num == flen) to avoid + * leaking that information. The copy still leaks some side-channel + * information, but it's impossible to have a fixed memory access + * pattern since we can't read out of the bounds of |from|. + * + * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. + */ + memset(em, 0, num); + memcpy(em + num - flen, from, flen); - maskeddb = padded_from + SHA_DIGEST_LENGTH; + /* + * The first byte must be zero, however we must not leak if this is + * true. See James H. Manger, "A Chosen Ciphertext Attack on RSA + * Optimal Asymmetric Encryption Padding (OAEP) [...]", CRYPTO 2001). + */ + good = constant_time_is_zero(em[0]); + + maskedseed = em + 1; + maskeddb = em + 1 + SHA_DIGEST_LENGTH; if (MGF1(seed, SHA_DIGEST_LENGTH, maskeddb, dblen)) - return -1; + goto cleanup; for (i = 0; i < SHA_DIGEST_LENGTH; i++) - seed[i] ^= padded_from[i]; - + seed[i] ^= maskedseed[i]; + if (MGF1(db, dblen, seed, SHA_DIGEST_LENGTH)) - return -1; + goto cleanup; for (i = 0; i < dblen; i++) db[i] ^= maskeddb[i]; if (!EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1(), NULL)) - return -1; + goto cleanup; + + good &= constant_time_is_zero(CRYPTO_memcmp(db, phash, SHA_DIGEST_LENGTH)); - if (CRYPTO_memcmp(db, phash, SHA_DIGEST_LENGTH) != 0 || bad) + found_one_byte = 0; + for (i = SHA_DIGEST_LENGTH; i < dblen; i++) + { + /* Padding consists of a number of 0-bytes, followed by a 1. */ + unsigned int equals1 = constant_time_eq(db[i], 1); + unsigned int equals0 = constant_time_is_zero(db[i]); + one_index = constant_time_select_int(~found_one_byte & equals1, + i, one_index); + found_one_byte |= equals1; + good &= (found_one_byte | equals0); + } + + good &= found_one_byte; + + /* + * At this point |good| is zero unless the plaintext was valid, + * so plaintext-awareness ensures timing side-channels are no longer a + * concern. + */ + if (!good) goto decoding_err; + + msg_index = one_index + 1; + mlen = dblen - msg_index; + + if (tlen < mlen) + { + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_DATA_TOO_LARGE); + mlen = -1; + } else { - for (i = SHA_DIGEST_LENGTH; i < dblen; i++) - if (db[i] != 0x00) - break; - if (i == dblen || db[i] != 0x01) - goto decoding_err; - else - { - /* everything looks OK */ - - mlen = dblen - ++i; - if (tlen < mlen) - { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_DATA_TOO_LARGE); - mlen = -1; - } - else - memcpy(to, db + i, mlen); - } + memcpy(to, db + msg_index, mlen); + goto cleanup; } - OPENSSL_free(db); - return mlen; decoding_err: - /* to avoid chosen ciphertext attacks, the error message should not reveal - * which kind of decoding error happened */ + /* To avoid chosen ciphertext attacks, the error message should not reveal + * which kind of decoding error happened. */ RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR); +cleanup: if (db != NULL) OPENSSL_free(db); - return -1; + if (em != NULL) OPENSSL_free(em); + return mlen; } int PKCS1_MGF1(unsigned char *mask, long len, diff --git a/openssl/crypto/rsa/rsa_pk1.c b/openssl/crypto/rsa/rsa_pk1.c index 8560755..c2da56f 100644 --- a/openssl/crypto/rsa/rsa_pk1.c +++ b/openssl/crypto/rsa/rsa_pk1.c @@ -56,6 +56,8 @@ * [including the GNU Public Licence.] */ +#include "constant_time_locl.h" + #include <stdio.h> #include "cryptlib.h" #include <openssl/bn.h> @@ -181,44 +183,87 @@ int RSA_padding_add_PKCS1_type_2(unsigned char *to, int tlen, int RSA_padding_check_PKCS1_type_2(unsigned char *to, int tlen, const unsigned char *from, int flen, int num) { - int i,j; - const unsigned char *p; + int i; + /* |em| is the encoded message, zero-padded to exactly |num| bytes */ + unsigned char *em = NULL; + unsigned int good, found_zero_byte; + int zero_index = 0, msg_index, mlen = -1; - p=from; - if ((num != (flen+1)) || (*(p++) != 02)) - { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_BLOCK_TYPE_IS_NOT_02); - return(-1); - } -#ifdef PKCS1_CHECK - return(num-11); -#endif + if (tlen < 0 || flen < 0) + return -1; - /* scan over padding data */ - j=flen-1; /* one for type. */ - for (i=0; i<j; i++) - if (*(p++) == 0) break; + /* PKCS#1 v1.5 decryption. See "PKCS #1 v2.2: RSA Cryptography + * Standard", section 7.2.2. */ - if (i == j) + if (flen > num) + goto err; + + if (num < 11) + goto err; + + em = OPENSSL_malloc(num); + if (em == NULL) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_NULL_BEFORE_BLOCK_MISSING); - return(-1); + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, ERR_R_MALLOC_FAILURE); + return -1; } + memset(em, 0, num); + /* + * Always do this zero-padding copy (even when num == flen) to avoid + * leaking that information. The copy still leaks some side-channel + * information, but it's impossible to have a fixed memory access + * pattern since we can't read out of the bounds of |from|. + * + * TODO(emilia): Consider porting BN_bn2bin_padded from BoringSSL. + */ + memcpy(em + num - flen, from, flen); - if (i < 8) + good = constant_time_is_zero(em[0]); + good &= constant_time_eq(em[1], 2); + + found_zero_byte = 0; + for (i = 2; i < num; i++) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_BAD_PAD_BYTE_COUNT); - return(-1); + unsigned int equals0 = constant_time_is_zero(em[i]); + zero_index = constant_time_select_int(~found_zero_byte & equals0, i, zero_index); + found_zero_byte |= equals0; } - i++; /* Skip over the '\0' */ - j-=i; - if (j > tlen) + + /* + * PS must be at least 8 bytes long, and it starts two bytes into |em|. + * If we never found a 0-byte, then |zero_index| is 0 and the check + * also fails. + */ + good &= constant_time_ge((unsigned int)(zero_index), 2 + 8); + + /* Skip the zero byte. This is incorrect if we never found a zero-byte + * but in this case we also do not copy the message out. */ + msg_index = zero_index + 1; + mlen = num - msg_index; + + /* For good measure, do this check in constant time as well; it could + * leak something if |tlen| was assuming valid padding. */ + good &= constant_time_ge((unsigned int)(tlen), (unsigned int)(mlen)); + + /* + * We can't continue in constant-time because we need to copy the result + * and we cannot fake its length. This unavoidably leaks timing + * information at the API boundary. + * TODO(emilia): this could be addressed at the call site, + * see BoringSSL commit 0aa0767340baf925bda4804882aab0cb974b2d26. + */ + if (!good) { - RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2,RSA_R_DATA_TOO_LARGE); - return(-1); + mlen = -1; + goto err; } - memcpy(to,p,(unsigned int)j); - return(j); - } + memcpy(to, em + msg_index, mlen); +err: + if (em != NULL) + OPENSSL_free(em); + if (mlen == -1) + RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2, RSA_R_PKCS_DECODING_ERROR); + return mlen; + } diff --git a/openssl/crypto/rsa/rsa_sign.c b/openssl/crypto/rsa/rsa_sign.c index b6f6037..225bcfe 100644 --- a/openssl/crypto/rsa/rsa_sign.c +++ b/openssl/crypto/rsa/rsa_sign.c @@ -151,6 +151,25 @@ int RSA_sign(int type, const unsigned char *m, unsigned int m_len, return(ret); } +/* + * Check DigestInfo structure does not contain extraneous data by reencoding + * using DER and checking encoding against original. + */ +static int rsa_check_digestinfo(X509_SIG *sig, const unsigned char *dinfo, int dinfolen) + { + unsigned char *der = NULL; + int derlen; + int ret = 0; + derlen = i2d_X509_SIG(sig, &der); + if (derlen <= 0) + return 0; + if (derlen == dinfolen && !memcmp(dinfo, der, derlen)) + ret = 1; + OPENSSL_cleanse(der, derlen); + OPENSSL_free(der); + return ret; + } + int int_rsa_verify(int dtype, const unsigned char *m, unsigned int m_len, unsigned char *rm, size_t *prm_len, @@ -228,7 +247,7 @@ int int_rsa_verify(int dtype, const unsigned char *m, if (sig == NULL) goto err; /* Excess data can be used to create forgeries */ - if(p != s+i) + if(p != s+i || !rsa_check_digestinfo(sig, s, i)) { RSAerr(RSA_F_INT_RSA_VERIFY,RSA_R_BAD_SIGNATURE); goto err; diff --git a/openssl/crypto/stack/safestack.h b/openssl/crypto/stack/safestack.h index ea3aa0d..bc194cb 100644 --- a/openssl/crypto/stack/safestack.h +++ b/openssl/crypto/stack/safestack.h @@ -57,6 +57,10 @@ #include <openssl/stack.h> +#ifdef __cplusplus +extern "C" { +#endif + #ifndef CHECKED_PTR_OF #define CHECKED_PTR_OF(type, p) \ ((void*) (1 ? p : (type*)0)) @@ -2660,4 +2664,8 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) #define lh_SSL_SESSION_free(lh) LHM_lh_free(SSL_SESSION,lh) /* End of util/mkstack.pl block, you may now edit :-) */ + +#ifdef __cplusplus +} +#endif #endif /* !defined HEADER_SAFESTACK_H */ diff --git a/openssl/doc/apps/c_rehash.pod b/openssl/doc/apps/c_rehash.pod new file mode 100644 index 0000000..c564e86 --- /dev/null +++ b/openssl/doc/apps/c_rehash.pod @@ -0,0 +1,81 @@ +=pod + +=for comment +Original text by James Westby, contributed under the OpenSSL license. + +=head1 NAME + +c_rehash - Create symbolic links to files named by the hash values + +=head1 SYNOPSIS + +B<c_rehash> +[ I<directory>...] + +=head1 DESCRIPTION + +B<c_rehash> scans directories and calculates a hash value of each C<.pem> +file in the specified directory list and creates symbolic links +for each file, where the name of the link is the hash value. +This utility is useful as many programs that use OpenSSL require +directories to be set up like this in order to find certificates. + +If any directories are named on the command line, then those are +processed in turn. If not, then the B<SSL_CERT_DIR> environment variable +is consulted; this shold be a colon-separated list of directories, +like the Unix B<PATH> variable. +If that is not set then the default directory (installation-specific +but often B</usr/local/ssl/certs>) is processed. + +In order for a directory to be processed, the user must have write +permissions on that directory, otherwise it will be skipped. +The links created are of the form C<HHHHHHHH.D>, where each B<H> +is a hexadecimal character and B<D> is a single decimal digit. +When processing a directory, B<c_rehash> will first remove all links +that have a name in that syntax. If you have links in that format +used for other purposes, they will be removed. +Hashes for CRL's look similar except the letter B<r> appears after +the period, like this: C<HHHHHHHH.rD>. + +Multiple objects may have the same hash; they will be indicated by +incrementing the B<D> value. Duplicates are found by comparing the +full SHA-1 fingerprint. A warning will be displayed if a duplicate +is found. + +A warning will also be displayed if there are B<.pem> files that +cannot be parsed as either a certificate or a CRL. + +The program uses the B<openssl> program to compute the hashes and +fingerprints. If not found in the user's B<PATH>, then set the +B<OPENSSL> environment variable to the full pathname. +Any program can be used, it will be invoked as follows for either +a certificate or CRL: + + $OPENSSL x509 -hash -fingerprint -noout -in FFFFFF + $OPENSSL crl -hash -fingerprint -noout -in FFFFFF + +where B<FFFFFF> is the filename. It must output the hash of the +file on the first line, and the fingerprint on the second, +optionally prefixed with some text and an equals sign. + +=head1 ENVIRONMENT + +=over + +=item B<OPENSSL> + +The path to an executable to use to generate hashes and +fingerprints (see above). + +=item B<SSL_CERT_DIR> + +Colon separated list of directories to operate on. +Ignored if directories are listed on the command line. + +=back + +=head1 SEE ALSO + +L<openssl(1)|openssl(1)>, +L<crl(1)|crl(1)>. +L<x509(1)|x509(1)>. diff --git a/openssl/doc/apps/dgst.pod b/openssl/doc/apps/dgst.pod index b035edf..2414c53 100644 --- a/openssl/doc/apps/dgst.pod +++ b/openssl/doc/apps/dgst.pod @@ -2,16 +2,17 @@ =head1 NAME -dgst, md5, md4, md2, sha1, sha, mdc2, ripemd160 - message digests +dgst, sha, sha1, mdc2, ripemd160, sha224, sha256, sha384, sha512, md2, md4, md5, dss1 - message digests =head1 SYNOPSIS B<openssl> B<dgst> -[B<-md5|-md4|-md2|-sha1|-sha|-mdc2|-ripemd160|-dss1>] +[B<-sha|-sha1|-mdc2|-ripemd160|-sha224|-sha256|-sha384|-sha512|-md2|-md4|-md5|-dss1>] [B<-c>] [B<-d>] [B<-hex>] [B<-binary>] +[B<-r>] [B<-out filename>] [B<-sign filename>] [B<-keyform arg>] @@ -20,17 +21,19 @@ B<openssl> B<dgst> [B<-prverify filename>] [B<-signature filename>] [B<-hmac key>] +[B<-non-fips-allow>] +[B<-fips-fingerprint>] [B<file...>] -[B<md5|md4|md2|sha1|sha|mdc2|ripemd160>] -[B<-c>] -[B<-d>] -[B<file...>] +B<openssl> +[I<digest>] +[B<...>] =head1 DESCRIPTION The digest functions output the message digest of a supplied file or files -in hexadecimal form. They can also be used for digital signing and verification. +in hexadecimal. The digest functions also generate and verify digital +signatures using message digests. =head1 OPTIONS @@ -48,12 +51,17 @@ print out BIO debugging information. =item B<-hex> digest is to be output as a hex dump. This is the default case for a "normal" -digest as opposed to a digital signature. +digest as opposed to a digital signature. See NOTES below for digital +signatures using B<-hex>. =item B<-binary> output the digest or signature in binary form. +=item B<-r> + +output the digest in the "coreutils" format used by programs like B<sha1sum>. + =item B<-out filename> filename to output to, or standard output by default. @@ -64,8 +72,8 @@ digitally sign the digest using the private key in "filename". =item B<-keyform arg> -Specifies the key format to sign digest with. Only PEM and ENGINE -formats are supported by the B<dgst> command. +Specifies the key format to sign digest with. The DER, PEM, P12, +and ENGINE formats are supported. =item B<-engine id> @@ -117,7 +125,7 @@ Following options are supported by both by B<HMAC> and B<gost-mac>: =over 8 =item B<key:string> - + Specifies MAC key as alphnumeric string (use if key contain printable characters only). String length must conform to any restrictions of the MAC algorithm for example exactly 32 chars for gost-mac. @@ -138,6 +146,15 @@ Multiple files can be specified separated by a OS-dependent character. The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for all others. +=item B<-non-fips-allow> + +enable use of non-FIPS algorithms such as MD5 even in FIPS mode. + +=item B<-fips-fingerprint> + +compute HMAC using a specific key +for certain OpenSSL-FIPS operations. + =item B<file...> file or files to digest. If no files are specified then standard input is @@ -145,18 +162,41 @@ used. =back + +=head1 EXAMPLES + +To create a hex-encoded message digest of a file: + openssl dgst -md5 -hex file.txt + +To sign a file using SHA-256 with binary file output: + openssl dgst -sha256 -sign privatekey.pem -out signature.sign file.txt + +To verify a signature: + openssl dgst -sha256 -verify publickey.pem \ + -signature signature.sign \ + file.txt + + =head1 NOTES The digest of choice for all new applications is SHA1. Other digests are however still widely used. -If you wish to sign or verify data using the DSA algorithm then the dss1 -digest must be used. +When signing a file, B<dgst> will automatically determine the algorithm +(RSA, ECC, etc) to use for signing based on the private key's ASN.1 info. +When verifying signatures, it only handles the RSA, DSA, or ECDSA signature +itself, not the related data to identify the signer and algorithm used in +formats such as x.509, CMS, and S/MIME. A source of random numbers is required for certain signing algorithms, in -particular DSA. +particular ECDSA and DSA. The signing and verify options should only be used if a single file is being signed or verified. +Hex signatures cannot be verified using B<openssl>. Instead, use "xxd -r" +or similar program to transform the hex signature into a binary signature +prior to verification. + + =cut diff --git a/openssl/doc/crypto/BIO_s_accept.pod b/openssl/doc/crypto/BIO_s_accept.pod index 7b63e46..b80b6ae 100644 --- a/openssl/doc/crypto/BIO_s_accept.pod +++ b/openssl/doc/crypto/BIO_s_accept.pod @@ -59,8 +59,8 @@ the accept socket. See L<BIO_s_fd(3)|BIO_s_fd(3)> BIO_set_accept_port() uses the string B<name> to set the accept port. The port is represented as a string of the form "host:port", where "host" is the interface to use and "port" is the port. -Either or both values can be "*" which is interpreted as meaning -any interface or port respectively. "port" has the same syntax +The host can be can be "*" which is interpreted as meaning +any interface; "port" has the same syntax as the port specified in BIO_set_conn_port() for connect BIOs, that is it can be a numerical port string or a string to lookup using getservbyname() and a string table. diff --git a/openssl/doc/crypto/CMS_sign_add1_signer.pod b/openssl/doc/crypto/CMS_add1_signer.pod similarity index 85% rename from openssl/doc/crypto/CMS_sign_add1_signer.pod rename to openssl/doc/crypto/CMS_add1_signer.pod index bda3ca2..a055b82 100644 --- a/openssl/doc/crypto/CMS_sign_add1_signer.pod +++ b/openssl/doc/crypto/CMS_add1_signer.pod @@ -2,20 +2,20 @@ =head1 NAME - CMS_sign_add1_signer, CMS_SignerInfo_sign - add a signer to a CMS_ContentInfo signed data structure. + CMS_add1_signer, CMS_SignerInfo_sign - add a signer to a CMS_ContentInfo signed data structure. =head1 SYNOPSIS #include <openssl/cms.h> - CMS_SignerInfo *CMS_sign_add1_signer(CMS_ContentInfo *cms, X509 *signcert, EVP_PKEY *pkey, const EVP_MD *md, unsigned int flags); + CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms, X509 *signcert, EVP_PKEY *pkey, const EVP_MD *md, unsigned int flags); int CMS_SignerInfo_sign(CMS_SignerInfo *si); =head1 DESCRIPTION -CMS_sign_add1_signer() adds a signer with certificate B<signcert> and private +CMS_add1_signer() adds a signer with certificate B<signcert> and private key B<pkey> using message digest B<md> to CMS_ContentInfo SignedData structure B<cms>. @@ -36,7 +36,7 @@ are both set. =head1 NOTES -The main purpose of CMS_sign_add1_signer() is to provide finer control +The main purpose of CMS_add1_signer() is to provide finer control over a CMS signed data structure where the simpler CMS_sign() function defaults are not appropriate. For example if multiple signers or non default digest algorithms are needed. New attributes can also be added using the returned @@ -80,13 +80,13 @@ bit AES, 128 bit AES, triple DES, 128 bit RC2, 64 bit RC2, DES and 40 bit RC2. If any of these algorithms is not available then it will not be included: for example the GOST algorithms will not be included if the GOST ENGINE is not loaded. -CMS_sign_add1_signer() returns an internal pointer to the CMS_SignerInfo +CMS_add1_signer() returns an internal pointer to the CMS_SignerInfo structure just added, this can be used to set additional attributes before it is finalized. =head1 RETURN VALUES -CMS_sign1_add_signers() returns an internal pointer to the CMS_SignerInfo +CMS_add1_signer() returns an internal pointer to the CMS_SignerInfo structure just added or NULL if an error occurs. =head1 SEE ALSO @@ -96,6 +96,6 @@ L<CMS_final(3)|CMS_final(3)>, =head1 HISTORY -CMS_sign_add1_signer() was added to OpenSSL 0.9.8 +CMS_add1_signer() was added to OpenSSL 0.9.8 =cut diff --git a/openssl/doc/crypto/EVP_DigestInit.pod b/openssl/doc/crypto/EVP_DigestInit.pod index 310c65e..ac526bb 100644 --- a/openssl/doc/crypto/EVP_DigestInit.pod +++ b/openssl/doc/crypto/EVP_DigestInit.pod @@ -26,13 +26,13 @@ EVP digest routines int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx); void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx); - int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); + int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in); int EVP_DigestInit(EVP_MD_CTX *ctx, const EVP_MD *type); int EVP_DigestFinal(EVP_MD_CTX *ctx, unsigned char *md, unsigned int *s); - int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); + int EVP_MD_CTX_copy(EVP_MD_CTX *out,EVP_MD_CTX *in); #define EVP_MAX_MD_SIZE 64 /* SHA512 */ @@ -136,10 +136,10 @@ reasons. EVP_md2(), EVP_md5(), EVP_sha(), EVP_sha1(), EVP_sha224(), EVP_sha256(), EVP_sha384(), EVP_sha512(), EVP_mdc2() and EVP_ripemd160() return B<EVP_MD> structures for the MD2, MD5, SHA, SHA1, SHA224, SHA256, SHA384, SHA512, MDC2 -and RIPEMD160 digest algorithms respectively. +and RIPEMD160 digest algorithms respectively. EVP_dss() and EVP_dss1() return B<EVP_MD> structures for SHA and SHA1 digest -algorithms but using DSS (DSA) for the signature algorithm. Note: there is +algorithms but using DSS (DSA) for the signature algorithm. Note: there is no need to use these pseudo-digests in OpenSSL 1.0.0 and later, they are however retained for compatibility. @@ -177,21 +177,21 @@ The B<EVP> interface to message digests should almost always be used in preference to the low level interfaces. This is because the code then becomes transparent to the digest used and much more flexible. -New applications should use the SHA2 digest algorithms such as SHA256. +New applications should use the SHA2 digest algorithms such as SHA256. The other digest algorithms are still in common use. For most applications the B<impl> parameter to EVP_DigestInit_ex() will be set to NULL to use the default digest implementation. -The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are +The functions EVP_DigestInit(), EVP_DigestFinal() and EVP_MD_CTX_copy() are obsolete but are retained to maintain compatibility with existing code. New -applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and +applications should use EVP_DigestInit_ex(), EVP_DigestFinal_ex() and EVP_MD_CTX_copy_ex() because they can efficiently reuse a digest context instead of initializing and cleaning it up on each call and allow non default implementations of digests to be specified. In OpenSSL 0.9.7 and later if digest contexts are not cleaned up after use -memory leaks will occur. +memory leaks will occur. Stack allocation of EVP_MD_CTX structures is common, for example: @@ -245,15 +245,19 @@ digest name passed on the command line. EVP_MD_CTX_destroy(mdctx); printf("Digest is: "); - for(i = 0; i < md_len; i++) printf("%02x", md_value[i]); + for(i = 0; i < md_len; i++) + printf("%02x", md_value[i]); printf("\n"); + + /* Call this once before exit. */ + EVP_cleanup(); + exit(0); } =head1 SEE ALSO -L<evp(3)|evp(3)>, L<hmac(3)|hmac(3)>, L<md2(3)|md2(3)>, -L<md5(3)|md5(3)>, L<mdc2(3)|mdc2(3)>, L<ripemd(3)|ripemd(3)>, -L<sha(3)|sha(3)>, L<dgst(1)|dgst(1)> +L<dgst(1)|dgst(1)>, +L<evp(3)|evp(3)> =head1 HISTORY @@ -269,7 +273,7 @@ EVP_dss(), EVP_dss1(), EVP_mdc2() and EVP_ripemd160() were changed to return truely const EVP_MD * in OpenSSL 0.9.7. The link between digests and signing algorithms was fixed in OpenSSL 1.0 and -later, so now EVP_sha1() can be used with RSA and DSA, there is no need to +later, so now EVP_sha1() can be used with RSA and DSA; there is no need to use EVP_dss1() any more. OpenSSL 1.0 and later does not include the MD2 digest algorithm in the diff --git a/openssl/doc/crypto/EVP_DigestVerifyInit.pod b/openssl/doc/crypto/EVP_DigestVerifyInit.pod index f224488..cfeccd9 100644 --- a/openssl/doc/crypto/EVP_DigestVerifyInit.pod +++ b/openssl/doc/crypto/EVP_DigestVerifyInit.pod @@ -38,7 +38,7 @@ or a negative value for failure. In particular a return value of -2 indicates the operation is not supported by the public key algorithm. Unlike other functions the return value 0 from EVP_DigestVerifyFinal() only -indicates that the signature did not not verify successfully (that is tbs did +indicates that the signature did not verify successfully (that is tbs did not match the original data or the signature was of invalid form) it is not an indication of a more serious error. @@ -59,7 +59,7 @@ For some key types and parameters the random number generator must be seeded or the operation will fail. The call to EVP_DigestVerifyFinal() internally finalizes a copy of the digest -context. This means that calls to EVP_VerifyUpdate() and EVP_VerifyFinal() can +context. This means that EVP_VerifyUpdate() and EVP_VerifyFinal() can be called later to digest and verify additional data. Since only a copy of the digest context is ever finalized the context must diff --git a/openssl/doc/crypto/EVP_EncryptInit.pod b/openssl/doc/crypto/EVP_EncryptInit.pod index d11e054..4e22edc 100644 --- a/openssl/doc/crypto/EVP_EncryptInit.pod +++ b/openssl/doc/crypto/EVP_EncryptInit.pod @@ -387,27 +387,7 @@ for certain common S/MIME ciphers (RC2, DES, triple DES) in CBC mode. =head1 EXAMPLES -Get the number of rounds used in RC5: - - int nrounds; - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GET_RC5_ROUNDS, 0, &nrounds); - -Get the RC2 effective key length: - - int key_bits; - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GET_RC2_KEY_BITS, 0, &key_bits); - -Set the number of rounds used in RC5: - - int nrounds; - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC5_ROUNDS, nrounds, NULL); - -Set the effective key length used in RC2: - - int key_bits; - EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_SET_RC2_KEY_BITS, key_bits, NULL); - -Encrypt a string using blowfish: +Encrypt a string using IDEA: int do_crypt(char *outfile) { @@ -421,8 +401,9 @@ Encrypt a string using blowfish: char intext[] = "Some Crypto Text"; EVP_CIPHER_CTX ctx; FILE *out; + EVP_CIPHER_CTX_init(&ctx); - EVP_EncryptInit_ex(&ctx, EVP_bf_cbc(), NULL, key, iv); + EVP_EncryptInit_ex(&ctx, EVP_idea_cbc(), NULL, key, iv); if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, strlen(intext))) { @@ -451,28 +432,34 @@ Encrypt a string using blowfish: } The ciphertext from the above example can be decrypted using the B<openssl> -utility with the command line: +utility with the command line (shown on two lines for clarity): - S<openssl bf -in cipher.bin -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -d> + openssl idea -d <filename + -K 000102030405060708090A0B0C0D0E0F -iv 0102030405060708 -General encryption, decryption function example using FILE I/O and RC2 with an -80 bit key: +General encryption and decryption function example using FILE I/O and AES128 +with a 128-bit key: int do_crypt(FILE *in, FILE *out, int do_encrypt) { /* Allow enough space in output buffer for additional block */ - inbuf[1024], outbuf[1024 + EVP_MAX_BLOCK_LENGTH]; + unsigned char inbuf[1024], outbuf[1024 + EVP_MAX_BLOCK_LENGTH]; int inlen, outlen; + EVP_CIPHER_CTX ctx; /* Bogus key and IV: we'd normally set these from * another source. */ - unsigned char key[] = "0123456789"; - unsigned char iv[] = "12345678"; - /* Don't set key or IV because we will modify the parameters */ + unsigned char key[] = "0123456789abcdeF"; + unsigned char iv[] = "1234567887654321"; + + /* Don't set key or IV right away; we want to check lengths */ EVP_CIPHER_CTX_init(&ctx); - EVP_CipherInit_ex(&ctx, EVP_rc2(), NULL, NULL, NULL, do_encrypt); - EVP_CIPHER_CTX_set_key_length(&ctx, 10); - /* We finished modifying parameters so now we can set key and IV */ + EVP_CipherInit_ex(&ctx, EVP_aes_128_cbc(), NULL, NULL, NULL, + do_encrypt); + OPENSSL_assert(EVP_CIPHER_CTX_key_length(&ctx) == 16); + OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx) == 16); + + /* Now we can set key and IV */ EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt); for(;;) @@ -511,4 +498,7 @@ EVP_DecryptInit_ex(), EVP_DecryptFinal_ex(), EVP_CipherInit_ex(), EVP_CipherFinal_ex() and EVP_CIPHER_CTX_set_padding() appeared in OpenSSL 0.9.7. +IDEA appeared in OpenSSL 0.9.7 but was often disabled due to +patent concerns; the last patents expired in 2012. + =cut diff --git a/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod b/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod index 2db692e..6f10175 100644 --- a/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod +++ b/openssl/doc/crypto/EVP_PKEY_set1_RSA.pod @@ -37,7 +37,7 @@ EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and EVP_PKEY_get1_EC_KEY() return the referenced key in B<pkey> or B<NULL> if the key is not of the correct type. -EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() +EVP_PKEY_assign_RSA(), EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() and EVP_PKEY_assign_EC_KEY() also set the referenced key to B<key> however these use the supplied B<key> internally and so B<key> will be freed when the parent B<pkey> is freed. @@ -54,8 +54,8 @@ In accordance with the OpenSSL naming convention the key obtained from or assigned to the B<pkey> using the B<1> functions must be freed as well as B<pkey>. -EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() -EVP_PKEY_assign_EC_KEY() are implemented as macros. +EVP_PKEY_assign_RSA(), EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() +and EVP_PKEY_assign_EC_KEY() are implemented as macros. =head1 RETURN VALUES @@ -66,7 +66,7 @@ EVP_PKEY_get1_RSA(), EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and EVP_PKEY_get1_EC_KEY() return the referenced key or B<NULL> if an error occurred. -EVP_PKEY_assign_RSA() EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() +EVP_PKEY_assign_RSA(), EVP_PKEY_assign_DSA(), EVP_PKEY_assign_DH() and EVP_PKEY_assign_EC_KEY() return 1 for success and 0 for failure. =head1 SEE ALSO diff --git a/openssl/doc/crypto/EVP_PKEY_sign.pod b/openssl/doc/crypto/EVP_PKEY_sign.pod index a044f2c..21974b4 100644 --- a/openssl/doc/crypto/EVP_PKEY_sign.pod +++ b/openssl/doc/crypto/EVP_PKEY_sign.pod @@ -28,9 +28,14 @@ B<sig> and the amount of data written to B<siglen>. =head1 NOTES +EVP_PKEY_sign() does not hash the data to be signed, and therefore is +normally used to sign digests. For signing arbitrary messages, see the +L<EVP_DigestSignInit(3)|EVP_DigestSignInit(3)> and +L<EVP_SignInit(3)|EVP_SignInit(3)> signing interfaces instead. + After the call to EVP_PKEY_sign_init() algorithm specific control operations can be performed to set any appropriate parameters for the -operation. +operation (see L<EVP_PKEY_CTX_ctrl(3)|EVP_PKEY_CTX_ctrl(3)>). The function EVP_PKEY_sign() can be called more than once on the same context if several operations are performed using the same parameters. @@ -49,13 +54,17 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: #include <openssl/rsa.h> EVP_PKEY_CTX *ctx; + /* md is a SHA-256 digest in this example. */ unsigned char *md, *sig; - size_t mdlen, siglen; + size_t mdlen = 32, siglen; EVP_PKEY *signing_key; - /* NB: assumes signing_key, md and mdlen are already set up - * and that signing_key is an RSA private key + + /* + * NB: assumes signing_key and md are set up before the next + * step. signing_key must be an RSA private key and md must + * point to the SHA-256 digest to be signed. */ - ctx = EVP_PKEY_CTX_new(signing_key); + ctx = EVP_PKEY_CTX_new(signing_key, NULL /* no engine */); if (!ctx) /* Error occurred */ if (EVP_PKEY_sign_init(ctx) <= 0) @@ -83,6 +92,7 @@ Sign data using RSA with PKCS#1 padding and SHA256 digest: =head1 SEE ALSO L<EVP_PKEY_CTX_new(3)|EVP_PKEY_CTX_new(3)>, +L<EVP_PKEY_CTX_ctrl(3)|EVP_PKEY_CTX_ctrl(3)>, L<EVP_PKEY_encrypt(3)|EVP_PKEY_encrypt(3)>, L<EVP_PKEY_decrypt(3)|EVP_PKEY_decrypt(3)>, L<EVP_PKEY_verify(3)|EVP_PKEY_verify(3)>, diff --git a/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod b/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod index b34c68a..7a27eef 100644 --- a/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod +++ b/openssl/doc/ssl/SSL_CTX_set_tmp_dh_callback.pod @@ -48,12 +48,13 @@ even if he gets hold of the normal (certified) key, as this key was only used for signing. In order to perform a DH key exchange the server must use a DH group -(DH parameters) and generate a DH key. The server will always generate a new -DH key during the negotiation, when the DH parameters are supplied via -callback and/or when the SSL_OP_SINGLE_DH_USE option of -L<SSL_CTX_set_options(3)|SSL_CTX_set_options(3)> is set. It will -immediately create a DH key, when DH parameters are supplied via -SSL_CTX_set_tmp_dh() and SSL_OP_SINGLE_DH_USE is not set. In this case, +(DH parameters) and generate a DH key. +The server will always generate a new DH key during the negotiation +if either the DH parameters are supplied via callback or the +SSL_OP_SINGLE_DH_USE option of SSL_CTX_set_options(3) is set (or both). +It will immediately create a DH key if DH parameters are supplied via +SSL_CTX_set_tmp_dh() and SSL_OP_SINGLE_DH_USE is not set. +In this case, it may happen that a key is generated on initialization without later being needed, while on the other hand the computer time during the negotiation is being saved. @@ -139,7 +140,7 @@ partly left out.) dh_tmp = dh_512; break; case 1024: - if (!dh_1024) + if (!dh_1024) dh_1024 = get_dh1024(); dh_tmp = dh_1024; break; diff --git a/openssl/e_os.h b/openssl/e_os.h index 6a0aad1..733155e 100644 --- a/openssl/e_os.h +++ b/openssl/e_os.h @@ -373,7 +373,16 @@ static unsigned int _strlen31(const char *str) # define check_winnt() (1) #else # define check_winnt() (GetVersion() < 0x80000000) -#endif +#endif + +/* + * Visual Studio: inline is available in C++ only, however + * __inline is available for C, see + * http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx + */ +#if defined(_MSC_VER) && !defined(__cplusplus) && !defined(inline) +# define inline __inline +#endif #else /* The non-microsoft world */ @@ -738,4 +747,3 @@ struct servent *getservbyname(const char *name, const char *proto); #endif #endif - diff --git a/openssl/engines/makeengines.com b/openssl/engines/makeengines.com index 6329fbb..4838e38 100644 --- a/openssl/engines/makeengines.com +++ b/openssl/engines/makeengines.com @@ -155,7 +155,7 @@ $ ENGINE_ = "engine_vector.mar" $ TV_OBJ_NAME = OBJ_DIR + F$PARSE(ENGINE_,,,"NAME","SYNTAX_ONLY") + ".OBJ" $ TV_OBJ = ",''TV_OBJ_NAME'" $ ENDIF -$ ENGINE_4758CCA = "e_4758cca" +$ ENGINE_4758cca = "e_4758cca" $ ENGINE_aep = "e_aep" $ ENGINE_atalla = "e_atalla" $ ENGINE_cswift = "e_cswift" @@ -756,9 +756,12 @@ $ CCDEFS = "TCPIP_TYPE_''OPT_TCPIP_LIB',DSO_VMS" $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS -$ CCDISABLEWARNINGS = "" !!! "LONGLONGTYPE,LONGLONGSUFX" -$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS +$ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX" +$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS +$ ENDIF $! $! Check To See If We Have A ZLIB Option. $! @@ -922,6 +925,18 @@ $! Finish up the definition of CC. $! $ IF COMPILER .EQS. "DECC" $ THEN +$! Not all compiler versions support MAYLOSEDATA3. +$ OPT_TEST = "MAYLOSEDATA3" +$ DEFINE /USER_MODE SYS$ERROR NL: +$ DEFINE /USER_MODE SYS$OUTPUT NL: +$ 'CC' /NOCROSS_REFERENCE /NOLIST /NOOBJECT - + /WARNINGS = DISABLE = ('OPT_TEST', EMPTYFILE) NL: +$ IF ($SEVERITY) +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN - + CCDISABLEWARNINGS = CCDISABLEWARNINGS+ "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS+ OPT_TEST +$ ENDIF $ IF CCDISABLEWARNINGS .NES. "" $ THEN $ CCDISABLEWARNINGS = " /WARNING=(DISABLE=(" + CCDISABLEWARNINGS + "))" diff --git a/openssl/makevms.com b/openssl/makevms.com index de1dbd9..11db2f1 100644 --- a/openssl/makevms.com +++ b/openssl/makevms.com @@ -283,6 +283,7 @@ $ CONFIG_LOGICALS := AES,- MD4,- MD5,- MDC2,- + NEXTPROTONEG,- OCSP,- PSK,- RC2,- @@ -340,7 +341,12 @@ $ CONFIG_DISABLE_RULES := RIJNDAEL/AES;- DH/GOST;- /STATIC_ENGINE;- /KRB5;- - /EC_NISTP_64_GCC_128 + /EC_NISTP_64_GCC_128;- + /GMP;- + /MD2;- + /RC5;- + /RFC3779;- + /SCTP $ CONFIG_ENABLE_RULES := ZLIB_DYNAMIC/ZLIB;- /THREADS $ @@ -706,8 +712,8 @@ $! $ SDIRS := , - 'ARCHD', - OBJECTS, - - MD2, MD4, MD5, SHA, MDC2, HMAC, RIPEMD, WHRLPOOL, - - DES, AES, RC2, RC4, RC5, IDEA, BF, CAST, CAMELLIA, SEED, MODES, - + MD4, MD5, SHA, MDC2, HMAC, RIPEMD, WHRLPOOL, - + DES, AES, RC2, RC4, IDEA, BF, CAST, CAMELLIA, SEED, MODES, - BN, EC, RSA, DSA, ECDSA, DH, ECDH, DSO, ENGINE, - BUFFER, BIO, STACK, LHASH, RAND, ERR, - EVP, ASN1, PEM, X509, X509V3, CONF, TXT_DB, PKCS7, PKCS12, - @@ -819,8 +825,9 @@ $ @CRYPTO-LIB LIBRARY 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" - $! $! Build The [.xxx.EXE.CRYPTO]*.EXE Test Applications. $! -$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" - - "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'" +$!!! DISABLED, as these test programs lack any support +$!!!$ @CRYPTO-LIB APPS 'DEBUGGER' "''COMPILER'" "''TCPIP_TYPE'" - +$!!! "''ISSEVEN'" "''BUILDPART'" "''POINTER_SIZE'" "''ZLIB'" $! $! Go Back To The Main Directory. $! diff --git a/openssl/openssl.spec b/openssl/openssl.spec index a7e2776..706fb5d 100644 --- a/openssl/openssl.spec +++ b/openssl/openssl.spec @@ -7,7 +7,7 @@ Release: 1 Summary: Secure Sockets Layer and cryptography libraries and tools Name: openssl #Version: %{libmaj}.%{libmin}.%{librel} -Version: 1.0.1i +Version: 1.0.1j Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz License: OpenSSL Group: System Environment/Libraries diff --git a/openssl/ssl/Makefile b/openssl/ssl/Makefile index bffd928..8dd390e 100644 --- a/openssl/ssl/Makefile +++ b/openssl/ssl/Makefile @@ -547,26 +547,27 @@ s3_both.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_both.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_both.o: ../include/openssl/tls1.h ../include/openssl/x509.h s3_both.o: ../include/openssl/x509_vfy.h s3_both.c ssl_locl.h -s3_cbc.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_cbc.o: ../include/openssl/buffer.h ../include/openssl/comp.h -s3_cbc.o: ../include/openssl/crypto.h ../include/openssl/dsa.h -s3_cbc.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_cbc.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_cbc.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_cbc.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_cbc.o: ../include/openssl/kssl.h ../include/openssl/lhash.h -s3_cbc.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h -s3_cbc.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h -s3_cbc.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h -s3_cbc.o: ../include/openssl/pem.h ../include/openssl/pem2.h -s3_cbc.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h -s3_cbc.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_cbc.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_cbc.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_cbc.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_cbc.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_cbc.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_cbc.o: ../include/openssl/x509_vfy.h s3_cbc.c ssl_locl.h +s3_cbc.o: ../crypto/constant_time_locl.h ../e_os.h ../include/openssl/asn1.h +s3_cbc.o: ../include/openssl/bio.h ../include/openssl/buffer.h +s3_cbc.o: ../include/openssl/comp.h ../include/openssl/crypto.h +s3_cbc.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h +s3_cbc.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +s3_cbc.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +s3_cbc.o: ../include/openssl/err.h ../include/openssl/evp.h +s3_cbc.o: ../include/openssl/hmac.h ../include/openssl/kssl.h +s3_cbc.o: ../include/openssl/lhash.h ../include/openssl/md5.h +s3_cbc.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h +s3_cbc.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h +s3_cbc.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h +s3_cbc.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h +s3_cbc.o: ../include/openssl/pqueue.h ../include/openssl/rsa.h +s3_cbc.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s3_cbc.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +s3_cbc.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +s3_cbc.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +s3_cbc.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +s3_cbc.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h s3_cbc.c +s3_cbc.o: ssl_locl.h s3_clnt.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h s3_clnt.o: ../include/openssl/bn.h ../include/openssl/buffer.h s3_clnt.o: ../include/openssl/comp.h ../include/openssl/crypto.h @@ -671,28 +672,29 @@ s3_pkt.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h s3_pkt.o: ../include/openssl/stack.h ../include/openssl/symhacks.h s3_pkt.o: ../include/openssl/tls1.h ../include/openssl/x509.h s3_pkt.o: ../include/openssl/x509_vfy.h s3_pkt.c ssl_locl.h -s3_srvr.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h -s3_srvr.o: ../include/openssl/bn.h ../include/openssl/buffer.h -s3_srvr.o: ../include/openssl/comp.h ../include/openssl/crypto.h -s3_srvr.o: ../include/openssl/dh.h ../include/openssl/dsa.h -s3_srvr.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h -s3_srvr.o: ../include/openssl/ec.h ../include/openssl/ecdh.h -s3_srvr.o: ../include/openssl/ecdsa.h ../include/openssl/err.h -s3_srvr.o: ../include/openssl/evp.h ../include/openssl/hmac.h -s3_srvr.o: ../include/openssl/krb5_asn.h ../include/openssl/kssl.h -s3_srvr.o: ../include/openssl/lhash.h ../include/openssl/md5.h -s3_srvr.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h -s3_srvr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h -s3_srvr.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h -s3_srvr.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h -s3_srvr.o: ../include/openssl/pqueue.h ../include/openssl/rand.h -s3_srvr.o: ../include/openssl/rsa.h ../include/openssl/safestack.h -s3_srvr.o: ../include/openssl/sha.h ../include/openssl/srtp.h -s3_srvr.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h -s3_srvr.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h -s3_srvr.o: ../include/openssl/stack.h ../include/openssl/symhacks.h -s3_srvr.o: ../include/openssl/tls1.h ../include/openssl/x509.h -s3_srvr.o: ../include/openssl/x509_vfy.h kssl_lcl.h s3_srvr.c ssl_locl.h +s3_srvr.o: ../crypto/constant_time_locl.h ../e_os.h ../include/openssl/asn1.h +s3_srvr.o: ../include/openssl/bio.h ../include/openssl/bn.h +s3_srvr.o: ../include/openssl/buffer.h ../include/openssl/comp.h +s3_srvr.o: ../include/openssl/crypto.h ../include/openssl/dh.h +s3_srvr.o: ../include/openssl/dsa.h ../include/openssl/dtls1.h +s3_srvr.o: ../include/openssl/e_os2.h ../include/openssl/ec.h +s3_srvr.o: ../include/openssl/ecdh.h ../include/openssl/ecdsa.h +s3_srvr.o: ../include/openssl/err.h ../include/openssl/evp.h +s3_srvr.o: ../include/openssl/hmac.h ../include/openssl/krb5_asn.h +s3_srvr.o: ../include/openssl/kssl.h ../include/openssl/lhash.h +s3_srvr.o: ../include/openssl/md5.h ../include/openssl/obj_mac.h +s3_srvr.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h +s3_srvr.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h +s3_srvr.o: ../include/openssl/pem.h ../include/openssl/pem2.h +s3_srvr.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h +s3_srvr.o: ../include/openssl/rand.h ../include/openssl/rsa.h +s3_srvr.o: ../include/openssl/safestack.h ../include/openssl/sha.h +s3_srvr.o: ../include/openssl/srtp.h ../include/openssl/ssl.h +s3_srvr.o: ../include/openssl/ssl2.h ../include/openssl/ssl23.h +s3_srvr.o: ../include/openssl/ssl3.h ../include/openssl/stack.h +s3_srvr.o: ../include/openssl/symhacks.h ../include/openssl/tls1.h +s3_srvr.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h kssl_lcl.h +s3_srvr.o: s3_srvr.c ssl_locl.h ssl_algs.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h ssl_algs.o: ../include/openssl/buffer.h ../include/openssl/comp.h ssl_algs.o: ../include/openssl/crypto.h ../include/openssl/dsa.h diff --git a/openssl/ssl/d1_both.c b/openssl/ssl/d1_both.c index 89cdca8..2e4250f 100644 --- a/openssl/ssl/d1_both.c +++ b/openssl/ssl/d1_both.c @@ -1492,6 +1492,9 @@ dtls1_process_heartbeat(SSL *s) /* Read type and payload length first */ if (1 + 2 + 16 > s->s3->rrec.length) return 0; /* silently discard */ + if (s->s3->rrec.length > SSL3_RT_MAX_PLAIN_LENGTH) + return 0; /* silently discard per RFC 6520 sec. 4 */ + hbtype = *p++; n2s(p, payload); if (1 + 2 + payload + 16 > s->s3->rrec.length) diff --git a/openssl/ssl/d1_lib.c b/openssl/ssl/d1_lib.c index 6bde16f..82ca653 100644 --- a/openssl/ssl/d1_lib.c +++ b/openssl/ssl/d1_lib.c @@ -266,6 +266,16 @@ long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg) case DTLS_CTRL_LISTEN: ret = dtls1_listen(s, parg); break; + case SSL_CTRL_CHECK_PROTO_VERSION: + /* For library-internal use; checks that the current protocol + * is the highest enabled version (according to s->ctx->method, + * as version negotiation may have changed s->method). */ +#if DTLS_MAX_VERSION != DTLS1_VERSION +# error Code needs update for DTLS_method() support beyond DTLS1_VERSION. +#endif + /* Just one protocol version is supported so far; + * fail closed if the version is not as expected. */ + return s->version == DTLS_MAX_VERSION; default: ret = ssl3_ctrl(s, cmd, larg, parg); diff --git a/openssl/ssl/d1_srtp.c b/openssl/ssl/d1_srtp.c index ab9c419..535539b 100644 --- a/openssl/ssl/d1_srtp.c +++ b/openssl/ssl/d1_srtp.c @@ -168,25 +168,6 @@ static int find_profile_by_name(char *profile_name, return 1; } -static int find_profile_by_num(unsigned profile_num, - SRTP_PROTECTION_PROFILE **pptr) - { - SRTP_PROTECTION_PROFILE *p; - - p=srtp_known_profiles; - while(p->name) - { - if(p->id == profile_num) - { - *pptr=p; - return 0; - } - p++; - } - - return 1; - } - static int ssl_ctx_make_profiles(const char *profiles_string,STACK_OF(SRTP_PROTECTION_PROFILE) **out) { STACK_OF(SRTP_PROTECTION_PROFILE) *profiles; @@ -209,11 +190,19 @@ static int ssl_ctx_make_profiles(const char *profiles_string,STACK_OF(SRTP_PROTE if(!find_profile_by_name(ptr,&p, col ? col-ptr : (int)strlen(ptr))) { + if (sk_SRTP_PROTECTION_PROFILE_find(profiles,p) >= 0) + { + SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES,SSL_R_BAD_SRTP_PROTECTION_PROFILE_LIST); + sk_SRTP_PROTECTION_PROFILE_free(profiles); + return 1; + } + sk_SRTP_PROTECTION_PROFILE_push(profiles,p); } else { SSLerr(SSL_F_SSL_CTX_MAKE_PROFILES,SSL_R_SRTP_UNKNOWN_PROTECTION_PROFILE); + sk_SRTP_PROTECTION_PROFILE_free(profiles); return 1; } @@ -305,13 +294,12 @@ int ssl_add_clienthello_use_srtp_ext(SSL *s, unsigned char *p, int *len, int max int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al) { - SRTP_PROTECTION_PROFILE *cprof,*sprof; - STACK_OF(SRTP_PROTECTION_PROFILE) *clnt=0,*srvr; + SRTP_PROTECTION_PROFILE *sprof; + STACK_OF(SRTP_PROTECTION_PROFILE) *srvr; int ct; int mki_len; - int i,j; - int id; - int ret; + int i, srtp_pref; + unsigned int id; /* Length value + the MKI length */ if(len < 3) @@ -341,22 +329,32 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al return 1; } + srvr=SSL_get_srtp_profiles(s); + s->srtp_profile = NULL; + /* Search all profiles for a match initially */ + srtp_pref = sk_SRTP_PROTECTION_PROFILE_num(srvr); - clnt=sk_SRTP_PROTECTION_PROFILE_new_null(); - while(ct) { n2s(d,id); ct-=2; len-=2; - if(!find_profile_by_num(id,&cprof)) + /* + * Only look for match in profiles of higher preference than + * current match. + * If no profiles have been have been configured then this + * does nothing. + */ + for (i = 0; i < srtp_pref; i++) { - sk_SRTP_PROTECTION_PROFILE_push(clnt,cprof); - } - else - { - ; /* Ignore */ + sprof = sk_SRTP_PROTECTION_PROFILE_value(srvr, i); + if (sprof->id == id) + { + s->srtp_profile = sprof; + srtp_pref = i; + break; + } } } @@ -371,36 +369,7 @@ int ssl_parse_clienthello_use_srtp_ext(SSL *s, unsigned char *d, int len,int *al return 1; } - srvr=SSL_get_srtp_profiles(s); - - /* Pick our most preferred profile. If no profiles have been - configured then the outer loop doesn't run - (sk_SRTP_PROTECTION_PROFILE_num() = -1) - and so we just return without doing anything */ - for(i=0;i<sk_SRTP_PROTECTION_PROFILE_num(srvr);i++) - { - sprof=sk_SRTP_PROTECTION_PROFILE_value(srvr,i); - - for(j=0;j<sk_SRTP_PROTECTION_PROFILE_num(clnt);j++) - { - cprof=sk_SRTP_PROTECTION_PROFILE_value(clnt,j); - - if(cprof->id==sprof->id) - { - s->srtp_profile=sprof; - *al=0; - ret=0; - goto done; - } - } - } - - ret=0; - -done: - if(clnt) sk_SRTP_PROTECTION_PROFILE_free(clnt); - - return ret; + return 0; } int ssl_add_serverhello_use_srtp_ext(SSL *s, unsigned char *p, int *len, int maxlen) diff --git a/openssl/ssl/dtls1.h b/openssl/ssl/dtls1.h index e65d501..192c5de 100644 --- a/openssl/ssl/dtls1.h +++ b/openssl/ssl/dtls1.h @@ -84,6 +84,8 @@ extern "C" { #endif #define DTLS1_VERSION 0xFEFF +#define DTLS_MAX_VERSION DTLS1_VERSION + #define DTLS1_BAD_VER 0x0100 #if 0 @@ -284,4 +286,3 @@ typedef struct dtls1_record_data_st } #endif #endif - diff --git a/openssl/ssl/s23_clnt.c b/openssl/ssl/s23_clnt.c index 2b93c63..86ab3de 100644 --- a/openssl/ssl/s23_clnt.c +++ b/openssl/ssl/s23_clnt.c @@ -125,9 +125,11 @@ static const SSL_METHOD *ssl23_get_client_method(int ver) if (ver == SSL2_VERSION) return(SSLv2_client_method()); #endif +#ifndef OPENSSL_NO_SSL3 if (ver == SSL3_VERSION) return(SSLv3_client_method()); - else if (ver == TLS1_VERSION) +#endif + if (ver == TLS1_VERSION) return(TLSv1_client_method()); else if (ver == TLS1_1_VERSION) return(TLSv1_1_client_method()); @@ -698,6 +700,7 @@ static int ssl23_get_server_hello(SSL *s) { /* we have sslv3 or tls1 (server hello or alert) */ +#ifndef OPENSSL_NO_SSL3 if ((p[2] == SSL3_VERSION_MINOR) && !(s->options & SSL_OP_NO_SSLv3)) { @@ -712,7 +715,9 @@ static int ssl23_get_server_hello(SSL *s) s->version=SSL3_VERSION; s->method=SSLv3_client_method(); } - else if ((p[2] == TLS1_VERSION_MINOR) && + else +#endif + if ((p[2] == TLS1_VERSION_MINOR) && !(s->options & SSL_OP_NO_TLSv1)) { s->version=TLS1_VERSION; @@ -736,6 +741,9 @@ static int ssl23_get_server_hello(SSL *s) goto err; } + /* ensure that TLS_MAX_VERSION is up-to-date */ + OPENSSL_assert(s->version <= TLS_MAX_VERSION); + if (p[0] == SSL3_RT_ALERT && p[5] != SSL3_AL_WARNING) { /* fatal alert */ diff --git a/openssl/ssl/s23_srvr.c b/openssl/ssl/s23_srvr.c index 2901a6b..93ca7d5 100644 --- a/openssl/ssl/s23_srvr.c +++ b/openssl/ssl/s23_srvr.c @@ -127,9 +127,11 @@ static const SSL_METHOD *ssl23_get_server_method(int ver) if (ver == SSL2_VERSION) return(SSLv2_server_method()); #endif +#ifndef OPENSSL_NO_SSL3 if (ver == SSL3_VERSION) return(SSLv3_server_method()); - else if (ver == TLS1_VERSION) +#endif + if (ver == TLS1_VERSION) return(TLSv1_server_method()); else if (ver == TLS1_1_VERSION) return(TLSv1_1_server_method()); @@ -421,6 +423,9 @@ int ssl23_get_client_hello(SSL *s) } } + /* ensure that TLS_MAX_VERSION is up-to-date */ + OPENSSL_assert(s->version <= TLS_MAX_VERSION); + #ifdef OPENSSL_FIPS if (FIPS_mode() && (s->version < TLS1_VERSION)) { @@ -597,6 +602,12 @@ int ssl23_get_client_hello(SSL *s) if ((type == 2) || (type == 3)) { /* we have SSLv3/TLSv1 (type 2: SSL2 style, type 3: SSL3/TLS style) */ + s->method = ssl23_get_server_method(s->version); + if (s->method == NULL) + { + SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,SSL_R_UNSUPPORTED_PROTOCOL); + goto err; + } if (!ssl_init_wbio_buffer(s,1)) goto err; @@ -624,14 +635,6 @@ int ssl23_get_client_hello(SSL *s) s->s3->rbuf.left=0; s->s3->rbuf.offset=0; } - if (s->version == TLS1_2_VERSION) - s->method = TLSv1_2_server_method(); - else if (s->version == TLS1_1_VERSION) - s->method = TLSv1_1_server_method(); - else if (s->version == TLS1_VERSION) - s->method = TLSv1_server_method(); - else - s->method = SSLv3_server_method(); #if 0 /* ssl3_get_client_hello does this */ s->client_version=(v[0]<<8)|v[1]; #endif diff --git a/openssl/ssl/s2_lib.c b/openssl/ssl/s2_lib.c index c0bdae5..c63be30 100644 --- a/openssl/ssl/s2_lib.c +++ b/openssl/ssl/s2_lib.c @@ -391,6 +391,8 @@ long ssl2_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_GET_SESSION_REUSED: ret=s->hit; break; + case SSL_CTRL_CHECK_PROTO_VERSION: + return ssl3_ctrl(s, SSL_CTRL_CHECK_PROTO_VERSION, larg, parg); default: break; } @@ -437,7 +439,7 @@ int ssl2_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p) if (p != NULL) { l=c->id; - if ((l & 0xff000000) != 0x02000000) return(0); + if ((l & 0xff000000) != 0x02000000 && l != SSL3_CK_FALLBACK_SCSV) return(0); p[0]=((unsigned char)(l>>16L))&0xFF; p[1]=((unsigned char)(l>> 8L))&0xFF; p[2]=((unsigned char)(l ))&0xFF; diff --git a/openssl/ssl/s3_cbc.c b/openssl/ssl/s3_cbc.c index 443a31e..11f13ad 100644 --- a/openssl/ssl/s3_cbc.c +++ b/openssl/ssl/s3_cbc.c @@ -53,6 +53,7 @@ * */ +#include "../crypto/constant_time_locl.h" #include "ssl_locl.h" #include <openssl/md5.h> @@ -67,37 +68,6 @@ * supported by TLS.) */ #define MAX_HASH_BLOCK_SIZE 128 -/* Some utility functions are needed: - * - * These macros return the given value with the MSB copied to all the other - * bits. They use the fact that arithmetic shift shifts-in the sign bit. - * However, this is not ensured by the C standard so you may need to replace - * them with something else on odd CPUs. */ -#define DUPLICATE_MSB_TO_ALL(x) ( (unsigned)( (int)(x) >> (sizeof(int)*8-1) ) ) -#define DUPLICATE_MSB_TO_ALL_8(x) ((unsigned char)(DUPLICATE_MSB_TO_ALL(x))) - -/* constant_time_lt returns 0xff if a<b and 0x00 otherwise. */ -static unsigned constant_time_lt(unsigned a, unsigned b) - { - a -= b; - return DUPLICATE_MSB_TO_ALL(a); - } - -/* constant_time_ge returns 0xff if a>=b and 0x00 otherwise. */ -static unsigned constant_time_ge(unsigned a, unsigned b) - { - a -= b; - return DUPLICATE_MSB_TO_ALL(~a); - } - -/* constant_time_eq_8 returns 0xff if a==b and 0x00 otherwise. */ -static unsigned char constant_time_eq_8(unsigned a, unsigned b) - { - unsigned c = a ^ b; - c--; - return DUPLICATE_MSB_TO_ALL_8(c); - } - /* ssl3_cbc_remove_padding removes padding from the decrypted, SSLv3, CBC * record in |rec| by updating |rec->length| in constant time. * @@ -126,8 +96,8 @@ int ssl3_cbc_remove_padding(const SSL* s, padding_length = good & (padding_length+1); rec->length -= padding_length; rec->type |= padding_length<<8; /* kludge: pass padding length */ - return (int)((good & 1) | (~good & -1)); -} + return constant_time_select_int(good, 1, -1); + } /* tls1_cbc_remove_padding removes the CBC padding from the decrypted, TLS, CBC * record in |rec| in constant time and returns 1 if the padding is valid and @@ -208,7 +178,7 @@ int tls1_cbc_remove_padding(const SSL* s, for (i = 0; i < to_check; i++) { - unsigned char mask = constant_time_ge(padding_length, i); + unsigned char mask = constant_time_ge_8(padding_length, i); unsigned char b = rec->data[rec->length-1-i]; /* The final |padding_length+1| bytes should all have the value * |padding_length|. Therefore the XOR should be zero. */ @@ -216,20 +186,14 @@ int tls1_cbc_remove_padding(const SSL* s, } /* If any of the final |padding_length+1| bytes had the wrong value, - * one or more of the lower eight bits of |good| will be cleared. We - * AND the bottom 8 bits together and duplicate the result to all the - * bits. */ - good &= good >> 4; - good &= good >> 2; - good &= good >> 1; - good <<= sizeof(good)*8-1; - good = DUPLICATE_MSB_TO_ALL(good); - + * one or more of the lower eight bits of |good| will be cleared. + */ + good = constant_time_eq(0xff, good & 0xff); padding_length = good & (padding_length+1); rec->length -= padding_length; rec->type |= padding_length<<8; /* kludge: pass padding length */ - return (int)((good & 1) | (~good & -1)); + return constant_time_select_int(good, 1, -1); } /* ssl3_cbc_copy_mac copies |md_size| bytes from the end of |rec| to |out| in @@ -296,8 +260,8 @@ void ssl3_cbc_copy_mac(unsigned char* out, memset(rotated_mac, 0, md_size); for (i = scan_start, j = 0; i < orig_len; i++) { - unsigned char mac_started = constant_time_ge(i, mac_start); - unsigned char mac_ended = constant_time_ge(i, mac_end); + unsigned char mac_started = constant_time_ge_8(i, mac_start); + unsigned char mac_ended = constant_time_ge_8(i, mac_end); unsigned char b = rec->data[i]; rotated_mac[j++] |= b & mac_started & ~mac_ended; j &= constant_time_lt(j,md_size); @@ -683,12 +647,12 @@ void ssl3_cbc_digest_record( b = data[k-header_length]; k++; - is_past_c = is_block_a & constant_time_ge(j, c); - is_past_cp1 = is_block_a & constant_time_ge(j, c+1); + is_past_c = is_block_a & constant_time_ge_8(j, c); + is_past_cp1 = is_block_a & constant_time_ge_8(j, c+1); /* If this is the block containing the end of the * application data, and we are at the offset for the * 0x80 value, then overwrite b with 0x80. */ - b = (b&~is_past_c) | (0x80&is_past_c); + b = constant_time_select_8(is_past_c, 0x80, b); /* If this the the block containing the end of the * application data and we're past the 0x80 value then * just write zero. */ @@ -704,7 +668,8 @@ void ssl3_cbc_digest_record( if (j >= md_block_size - md_length_size) { /* If this is index_b, write a length byte. */ - b = (b&~is_block_b) | (is_block_b&length_bytes[j-(md_block_size-md_length_size)]); + b = constant_time_select_8( + is_block_b, length_bytes[j-(md_block_size-md_length_size)], b); } block[j] = b; } diff --git a/openssl/ssl/s3_clnt.c b/openssl/ssl/s3_clnt.c index ea0c82d..263e634 100644 --- a/openssl/ssl/s3_clnt.c +++ b/openssl/ssl/s3_clnt.c @@ -326,9 +326,9 @@ int ssl3_connect(SSL *s) break; } #endif - /* Check if it is anon DH/ECDH */ + /* Check if it is anon DH/ECDH, SRP auth */ /* or PSK */ - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) && + if (!(s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL|SSL_aSRP)) && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { ret=ssl3_get_server_certificate(s); @@ -1277,8 +1277,8 @@ int ssl3_get_key_exchange(SSL *s) #endif EVP_MD_CTX md_ctx; unsigned char *param,*p; - int al,i,j,param_len,ok; - long n,alg_k,alg_a; + int al,j,ok; + long i,param_len,n,alg_k,alg_a; EVP_PKEY *pkey=NULL; const EVP_MD *md = NULL; #ifndef OPENSSL_NO_RSA @@ -1354,36 +1354,48 @@ int ssl3_get_key_exchange(SSL *s) s->session->sess_cert=ssl_sess_cert_new(); } + /* Total length of the parameters including the length prefix */ param_len=0; + alg_k=s->s3->tmp.new_cipher->algorithm_mkey; alg_a=s->s3->tmp.new_cipher->algorithm_auth; EVP_MD_CTX_init(&md_ctx); + al=SSL_AD_DECODE_ERROR; + #ifndef OPENSSL_NO_PSK if (alg_k & SSL_kPSK) { char tmp_id_hint[PSK_MAX_IDENTITY_LEN+1]; - al=SSL_AD_HANDSHAKE_FAILURE; + param_len = 2; + if (param_len > n) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } n2s(p,i); - param_len=i+2; + /* Store PSK identity hint for later use, hint is used * in ssl3_send_client_key_exchange. Assume that the * maximum length of a PSK identity hint can be as * long as the maximum length of a PSK identity. */ if (i > PSK_MAX_IDENTITY_LEN) { + al=SSL_AD_HANDSHAKE_FAILURE; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_DATA_LENGTH_TOO_LONG); goto f_err; } - if (param_len > n) + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, SSL_R_BAD_PSK_IDENTITY_HINT_LENGTH); goto f_err; } + param_len += i; + /* If received PSK identity hint contains NULL * characters, the hint is truncated from the first * NULL. p may not be ending with NULL, so create a @@ -1395,6 +1407,7 @@ int ssl3_get_key_exchange(SSL *s) s->ctx->psk_identity_hint = BUF_strdup(tmp_id_hint); if (s->ctx->psk_identity_hint == NULL) { + al=SSL_AD_HANDSHAKE_FAILURE; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, ERR_R_MALLOC_FAILURE); goto f_err; } @@ -1407,14 +1420,22 @@ int ssl3_get_key_exchange(SSL *s) #ifndef OPENSSL_NO_SRP if (alg_k & SSL_kSRP) { - n2s(p,i); - param_len=i+2; + param_len = 2; if (param_len > n) { - al=SSL_AD_DECODE_ERROR; + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + n2s(p,i); + + if (i > n - param_len) + { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_N_LENGTH); goto f_err; } + param_len += i; + if (!(s->srp_ctx.N=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1422,14 +1443,24 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + + if (2 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 2; + n2s(p,i); - param_len+=i+2; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_G_LENGTH); goto f_err; } + param_len += i; + if (!(s->srp_ctx.g=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1437,15 +1468,25 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + + if (1 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 1; + i = (unsigned int)(p[0]); p++; - param_len+=i+1; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_S_LENGTH); goto f_err; } + param_len += i; + if (!(s->srp_ctx.s=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1453,14 +1494,23 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + if (2 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 2; + n2s(p,i); - param_len+=i+2; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_SRP_B_LENGTH); goto f_err; } + param_len += i; + if (!(s->srp_ctx.B=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1498,14 +1548,23 @@ int ssl3_get_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_MALLOC_FAILURE); goto err; } - n2s(p,i); - param_len=i+2; + + param_len = 2; if (param_len > n) { - al=SSL_AD_DECODE_ERROR; + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + n2s(p,i); + + if (i > n - param_len) + { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_MODULUS_LENGTH); goto f_err; } + param_len += i; + if (!(rsa->n=BN_bin2bn(p,i,rsa->n))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1513,14 +1572,23 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + if (2 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 2; + n2s(p,i); - param_len+=i+2; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_RSA_E_LENGTH); goto f_err; } + param_len += i; + if (!(rsa->e=BN_bin2bn(p,i,rsa->e))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1552,14 +1620,23 @@ int ssl3_get_key_exchange(SSL *s) SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_DH_LIB); goto err; } - n2s(p,i); - param_len=i+2; + + param_len = 2; if (param_len > n) { - al=SSL_AD_DECODE_ERROR; + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + n2s(p,i); + + if (i > n - param_len) + { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_P_LENGTH); goto f_err; } + param_len += i; + if (!(dh->p=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1567,14 +1644,23 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + if (2 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 2; + n2s(p,i); - param_len+=i+2; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_G_LENGTH); goto f_err; } + param_len += i; + if (!(dh->g=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1582,14 +1668,23 @@ int ssl3_get_key_exchange(SSL *s) } p+=i; + if (2 > n - param_len) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + param_len += 2; + n2s(p,i); - param_len+=i+2; - if (param_len > n) + + if (i > n - param_len) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_DH_PUB_KEY_LENGTH); goto f_err; } + param_len += i; + if (!(dh->pub_key=BN_bin2bn(p,i,NULL))) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_BN_LIB); @@ -1641,12 +1736,19 @@ int ssl3_get_key_exchange(SSL *s) */ /* XXX: For now we only support named (not generic) curves - * and the ECParameters in this case is just three bytes. + * and the ECParameters in this case is just three bytes. We + * also need one byte for the length of the encoded point */ - param_len=3; - if ((param_len > n) || - (*p != NAMED_CURVE_TYPE) || - ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) + param_len=4; + if (param_len > n) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + + if ((*p != NAMED_CURVE_TYPE) || + ((curve_nid = tls1_ec_curve_id2nid(*(p + 2))) == 0)) { al=SSL_AD_INTERNAL_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNABLE_TO_FIND_ECDH_PARAMETERS); @@ -1688,15 +1790,15 @@ int ssl3_get_key_exchange(SSL *s) encoded_pt_len = *p; /* length of encoded point */ p+=1; - param_len += (1 + encoded_pt_len); - if ((param_len > n) || + + if ((encoded_pt_len > n - param_len) || (EC_POINT_oct2point(group, srvr_ecpoint, p, encoded_pt_len, bn_ctx) == 0)) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_BAD_ECPOINT); goto f_err; } + param_len += encoded_pt_len; n-=param_len; p+=encoded_pt_len; @@ -1739,7 +1841,15 @@ int ssl3_get_key_exchange(SSL *s) { if (TLS1_get_version(s) >= TLS1_2_VERSION) { - int sigalg = tls12_get_sigid(pkey); + int sigalg; + if (2 > n) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } + + sigalg = tls12_get_sigid(pkey); /* Should never happen */ if (sigalg == -1) { @@ -1757,7 +1867,6 @@ int ssl3_get_key_exchange(SSL *s) if (md == NULL) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_UNKNOWN_DIGEST); - al=SSL_AD_DECODE_ERROR; goto f_err; } #ifdef SSL_DEBUG @@ -1768,15 +1877,21 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); } else md = EVP_sha1(); - + + if (2 > n) + { + SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE, + SSL_R_LENGTH_TOO_SHORT); + goto f_err; + } n2s(p,i); n-=2; j=EVP_PKEY_size(pkey); + /* Check signature length. If n is 0 then signature is empty */ if ((i != n) || (n > j) || (n <= 0)) { /* wrong packet length */ - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_WRONG_SIGNATURE_LENGTH); goto f_err; } @@ -1785,6 +1900,7 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); if (pkey->type == EVP_PKEY_RSA && TLS1_get_version(s) < TLS1_2_VERSION) { int num; + unsigned int size; j=0; q=md_buf; @@ -1797,9 +1913,9 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); EVP_DigestUpdate(&md_ctx,&(s->s3->client_random[0]),SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx,&(s->s3->server_random[0]),SSL3_RANDOM_SIZE); EVP_DigestUpdate(&md_ctx,param,param_len); - EVP_DigestFinal_ex(&md_ctx,q,(unsigned int *)&i); - q+=i; - j+=i; + EVP_DigestFinal_ex(&md_ctx,q,&size); + q+=size; + j+=size; } i=RSA_verify(NID_md5_sha1, md_buf, j, p, n, pkey->pkey.rsa); @@ -1835,8 +1951,8 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); } else { - if (!(alg_a & SSL_aNULL) && !(alg_k & SSL_kPSK)) - /* aNULL or kPSK do not need public keys */ + /* aNULL, aSRP or kPSK do not need public keys */ + if (!(alg_a & (SSL_aNULL|SSL_aSRP)) && !(alg_k & SSL_kPSK)) { SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_INTERNAL_ERROR); goto err; @@ -1844,7 +1960,6 @@ fprintf(stderr, "USING TLSv1.2 HASH %s\n", EVP_MD_name(md)); /* still data left over */ if (n != 0) { - al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,SSL_R_EXTRA_DATA_IN_MESSAGE); goto f_err; } @@ -2846,7 +2961,11 @@ int ssl3_send_client_key_exchange(SSL *s) #ifndef OPENSSL_NO_PSK else if (alg_k & SSL_kPSK) { - char identity[PSK_MAX_IDENTITY_LEN]; + /* The callback needs PSK_MAX_IDENTITY_LEN + 1 bytes + * to return a \0-terminated identity. The last byte + * is for us for simulating strnlen. */ + char identity[PSK_MAX_IDENTITY_LEN + 2]; + size_t identity_len; unsigned char *t = NULL; unsigned char psk_or_pre_ms[PSK_MAX_PSK_LEN*2+4]; unsigned int pre_ms_len = 0, psk_len = 0; @@ -2860,8 +2979,9 @@ int ssl3_send_client_key_exchange(SSL *s) goto err; } + memset(identity, 0, sizeof(identity)); psk_len = s->psk_client_callback(s, s->ctx->psk_identity_hint, - identity, PSK_MAX_IDENTITY_LEN, + identity, sizeof(identity) - 1, psk_or_pre_ms, sizeof(psk_or_pre_ms)); if (psk_len > PSK_MAX_PSK_LEN) { @@ -2875,7 +2995,14 @@ int ssl3_send_client_key_exchange(SSL *s) SSL_R_PSK_IDENTITY_NOT_FOUND); goto psk_err; } - + identity[PSK_MAX_IDENTITY_LEN + 1] = '\0'; + identity_len = strlen(identity); + if (identity_len > PSK_MAX_IDENTITY_LEN) + { + SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, + ERR_R_INTERNAL_ERROR); + goto psk_err; + } /* create PSK pre_master_secret */ pre_ms_len = 2+psk_len+2+psk_len; t = psk_or_pre_ms; @@ -2909,14 +3036,13 @@ int ssl3_send_client_key_exchange(SSL *s) s->session->master_key_length = s->method->ssl3_enc->generate_master_secret(s, s->session->master_key, - psk_or_pre_ms, pre_ms_len); - n = strlen(identity); - s2n(n, p); - memcpy(p, identity, n); - n+=2; + psk_or_pre_ms, pre_ms_len); + s2n(identity_len, p); + memcpy(p, identity, identity_len); + n = 2 + identity_len; psk_err = 0; psk_err: - OPENSSL_cleanse(identity, PSK_MAX_IDENTITY_LEN); + OPENSSL_cleanse(identity, sizeof(identity)); OPENSSL_cleanse(psk_or_pre_ms, sizeof(psk_or_pre_ms)); if (psk_err != 0) { diff --git a/openssl/ssl/s3_enc.c b/openssl/ssl/s3_enc.c index 9962677..9db45af 100644 --- a/openssl/ssl/s3_enc.c +++ b/openssl/ssl/s3_enc.c @@ -900,7 +900,7 @@ int ssl3_alert_code(int code) case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(SSL3_AD_HANDSHAKE_FAILURE); case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(SSL3_AD_HANDSHAKE_FAILURE); case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); + case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); default: return(-1); } } - diff --git a/openssl/ssl/s3_lib.c b/openssl/ssl/s3_lib.c index 4835bef..3f17453 100644 --- a/openssl/ssl/s3_lib.c +++ b/openssl/ssl/s3_lib.c @@ -3355,6 +3355,33 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) #endif #endif /* !OPENSSL_NO_TLSEXT */ + + case SSL_CTRL_CHECK_PROTO_VERSION: + /* For library-internal use; checks that the current protocol + * is the highest enabled version (according to s->ctx->method, + * as version negotiation may have changed s->method). */ + if (s->version == s->ctx->method->version) + return 1; + /* Apparently we're using a version-flexible SSL_METHOD + * (not at its highest protocol version). */ + if (s->ctx->method->version == SSLv23_method()->version) + { +#if TLS_MAX_VERSION != TLS1_2_VERSION +# error Code needs update for SSLv23_method() support beyond TLS1_2_VERSION. +#endif + if (!(s->options & SSL_OP_NO_TLSv1_2)) + return s->version == TLS1_2_VERSION; + if (!(s->options & SSL_OP_NO_TLSv1_1)) + return s->version == TLS1_1_VERSION; + if (!(s->options & SSL_OP_NO_TLSv1)) + return s->version == TLS1_VERSION; + if (!(s->options & SSL_OP_NO_SSLv3)) + return s->version == SSL3_VERSION; + if (!(s->options & SSL_OP_NO_SSLv2)) + return s->version == SSL2_VERSION; + } + return 0; /* Unexpected state; fail closed. */ + default: break; } @@ -3714,6 +3741,7 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void)) break; #endif #endif + default: return(0); } @@ -3822,10 +3850,15 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, emask_k = cert->export_mask_k; emask_a = cert->export_mask_a; #ifndef OPENSSL_NO_SRP - mask_k=cert->mask_k | s->srp_ctx.srp_Mask; - emask_k=cert->export_mask_k | s->srp_ctx.srp_Mask; + if (s->srp_ctx.srp_Mask & SSL_kSRP) + { + mask_k |= SSL_kSRP; + emask_k |= SSL_kSRP; + mask_a |= SSL_aSRP; + emask_a |= SSL_aSRP; + } #endif - + #ifdef KSSL_DEBUG /* printf("ssl3_choose_cipher %d alg= %lx\n", i,c->algorithms);*/ #endif /* KSSL_DEBUG */ @@ -4291,4 +4324,3 @@ long ssl_get_algorithm2(SSL *s) return SSL_HANDSHAKE_MAC_SHA256 | TLS1_PRF_SHA256; return alg2; } - diff --git a/openssl/ssl/s3_pkt.c b/openssl/ssl/s3_pkt.c index eff7356..4c9285f 100644 --- a/openssl/ssl/s3_pkt.c +++ b/openssl/ssl/s3_pkt.c @@ -273,6 +273,12 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) return(n); } +/* MAX_EMPTY_RECORDS defines the number of consecutive, empty records that will + * be processed per call to ssl3_get_record. Without this limit an attacker + * could send empty records at a faster rate than we can process and cause + * ssl3_get_record to loop forever. */ +#define MAX_EMPTY_RECORDS 32 + /* Call this to get a new input record. * It will return <= 0 if more data is needed, normally due to an error * or non-blocking IO. @@ -293,6 +299,7 @@ static int ssl3_get_record(SSL *s) short version; unsigned mac_size, orig_len; size_t extra; + unsigned empty_record_count = 0; rr= &(s->s3->rrec); sess=s->session; @@ -523,7 +530,17 @@ printf("\n"); s->packet_length=0; /* just read a 0 length packet */ - if (rr->length == 0) goto again; + if (rr->length == 0) + { + empty_record_count++; + if (empty_record_count > MAX_EMPTY_RECORDS) + { + al=SSL_AD_UNEXPECTED_MESSAGE; + SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_RECORD_TOO_SMALL); + goto f_err; + } + goto again; + } #if 0 fprintf(stderr, "Ultimate Record type=%d, Length=%d\n", rr->type, rr->length); diff --git a/openssl/ssl/s3_srvr.c b/openssl/ssl/s3_srvr.c index 2867501..c23d987 100644 --- a/openssl/ssl/s3_srvr.c +++ b/openssl/ssl/s3_srvr.c @@ -154,6 +154,7 @@ #include <stdio.h> #include "ssl_locl.h" #include "kssl_lcl.h" +#include "../crypto/constant_time_locl.h" #include <openssl/buffer.h> #include <openssl/rand.h> #include <openssl/objects.h> @@ -410,9 +411,8 @@ int ssl3_accept(SSL *s) case SSL3_ST_SW_CERT_B: /* Check if it is anon DH or anon ECDH, */ /* normal PSK or KRB5 or SRP */ - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) - && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK) - && !(s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5)) + if (!(s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL|SSL_aKRB5|SSL_aSRP)) + && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { ret=ssl3_send_server_certificate(s); if (ret <= 0) goto end; @@ -515,7 +515,9 @@ int ssl3_accept(SSL *s) * (against the specs, but s3_clnt.c accepts this for SSL 3) */ !(s->verify_mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT)) || /* never request cert in Kerberos ciphersuites */ - (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) + (s->s3->tmp.new_cipher->algorithm_auth & SSL_aKRB5) || + /* don't request certificate for SRP auth */ + (s->s3->tmp.new_cipher->algorithm_auth & SSL_aSRP) /* With normal PSK Certificates and * Certificate Requests are omitted */ || (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) @@ -1846,7 +1848,7 @@ int ssl3_send_server_key_exchange(SSL *s) n+=2+nr[i]; } - if (!(s->s3->tmp.new_cipher->algorithm_auth & SSL_aNULL) + if (!(s->s3->tmp.new_cipher->algorithm_auth & (SSL_aNULL|SSL_aSRP)) && !(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kPSK)) { if ((pkey=ssl_get_sign_pkey(s,s->s3->tmp.new_cipher,&md)) @@ -2166,6 +2168,10 @@ int ssl3_get_client_key_exchange(SSL *s) #ifndef OPENSSL_NO_RSA if (alg_k & SSL_kRSA) { + unsigned char rand_premaster_secret[SSL_MAX_MASTER_KEY_LENGTH]; + int decrypt_len; + unsigned char decrypt_good, version_good; + /* FIX THIS UP EAY EAY EAY EAY */ if (s->s3->tmp.use_rsa_tmp) { @@ -2213,54 +2219,61 @@ int ssl3_get_client_key_exchange(SSL *s) n=i; } - i=RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING); - - al = -1; - - if (i != SSL_MAX_MASTER_KEY_LENGTH) - { - al=SSL_AD_DECODE_ERROR; - /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_RSA_DECRYPT); */ - } - - if ((al == -1) && !((p[0] == (s->client_version>>8)) && (p[1] == (s->client_version & 0xff)))) - { - /* The premaster secret must contain the same version number as the - * ClientHello to detect version rollback attacks (strangely, the - * protocol does not offer such protection for DH ciphersuites). - * However, buggy clients exist that send the negotiated protocol - * version instead if the server does not support the requested - * protocol version. - * If SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */ - if (!((s->options & SSL_OP_TLS_ROLLBACK_BUG) && - (p[0] == (s->version>>8)) && (p[1] == (s->version & 0xff)))) - { - al=SSL_AD_DECODE_ERROR; - /* SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,SSL_R_BAD_PROTOCOL_VERSION_NUMBER); */ + /* We must not leak whether a decryption failure occurs because + * of Bleichenbacher's attack on PKCS #1 v1.5 RSA padding (see + * RFC 2246, section 7.4.7.1). The code follows that advice of + * the TLS RFC and generates a random premaster secret for the + * case that the decrypt fails. See + * https://tools.ietf.org/html/rfc5246#section-7.4.7.1 */ - /* The Klima-Pokorny-Rosa extension of Bleichenbacher's attack - * (http://eprint.iacr.org/2003/052/) exploits the version - * number check as a "bad version oracle" -- an alert would - * reveal that the plaintext corresponding to some ciphertext - * made up by the adversary is properly formatted except - * that the version number is wrong. To avoid such attacks, - * we should treat this just like any other decryption error. */ - } + /* should be RAND_bytes, but we cannot work around a failure. */ + if (RAND_pseudo_bytes(rand_premaster_secret, + sizeof(rand_premaster_secret)) <= 0) + goto err; + decrypt_len = RSA_private_decrypt((int)n,p,p,rsa,RSA_PKCS1_PADDING); + ERR_clear_error(); + + /* decrypt_len should be SSL_MAX_MASTER_KEY_LENGTH. + * decrypt_good will be 0xff if so and zero otherwise. */ + decrypt_good = constant_time_eq_int_8(decrypt_len, SSL_MAX_MASTER_KEY_LENGTH); + + /* If the version in the decrypted pre-master secret is correct + * then version_good will be 0xff, otherwise it'll be zero. + * The Klima-Pokorny-Rosa extension of Bleichenbacher's attack + * (http://eprint.iacr.org/2003/052/) exploits the version + * number check as a "bad version oracle". Thus version checks + * are done in constant time and are treated like any other + * decryption error. */ + version_good = constant_time_eq_8(p[0], (unsigned)(s->client_version>>8)); + version_good &= constant_time_eq_8(p[1], (unsigned)(s->client_version&0xff)); + + /* The premaster secret must contain the same version number as + * the ClientHello to detect version rollback attacks + * (strangely, the protocol does not offer such protection for + * DH ciphersuites). However, buggy clients exist that send the + * negotiated protocol version instead if the server does not + * support the requested protocol version. If + * SSL_OP_TLS_ROLLBACK_BUG is set, tolerate such clients. */ + if (s->options & SSL_OP_TLS_ROLLBACK_BUG) + { + unsigned char workaround_good; + workaround_good = constant_time_eq_8(p[0], (unsigned)(s->version>>8)); + workaround_good &= constant_time_eq_8(p[1], (unsigned)(s->version&0xff)); + version_good |= workaround_good; + } + + /* Both decryption and version must be good for decrypt_good + * to remain non-zero (0xff). */ + decrypt_good &= version_good; + + /* Now copy rand_premaster_secret over p using + * decrypt_good_mask. */ + for (i = 0; i < (int) sizeof(rand_premaster_secret); i++) + { + p[i] = constant_time_select_8(decrypt_good, p[i], + rand_premaster_secret[i]); } - if (al != -1) - { - /* Some decryption failure -- use random value instead as countermeasure - * against Bleichenbacher's attack on PKCS #1 v1.5 RSA padding - * (see RFC 2246, section 7.4.7.1). */ - ERR_clear_error(); - i = SSL_MAX_MASTER_KEY_LENGTH; - p[0] = s->client_version >> 8; - p[1] = s->client_version & 0xff; - if (RAND_pseudo_bytes(p+2, i-2) <= 0) /* should be RAND_bytes, but we cannot work around a failure */ - goto err; - } - s->session->master_key_length= s->method->ssl3_enc->generate_master_secret(s, s->session->master_key, diff --git a/openssl/ssl/srtp.h b/openssl/ssl/srtp.h index c0cf33e..24f2330 100644 --- a/openssl/ssl/srtp.h +++ b/openssl/ssl/srtp.h @@ -130,6 +130,8 @@ extern "C" { #define SRTP_NULL_SHA1_80 0x0005 #define SRTP_NULL_SHA1_32 0x0006 +#ifndef OPENSSL_NO_SRTP + int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles); int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles); SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); @@ -137,6 +139,8 @@ SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl); SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); +#endif + #ifdef __cplusplus } #endif diff --git a/openssl/ssl/ssl-lib.com b/openssl/ssl/ssl-lib.com index 05bda75..7303bc4 100644 --- a/openssl/ssl/ssl-lib.com +++ b/openssl/ssl/ssl-lib.com @@ -213,16 +213,16 @@ $ ENDIF $! $! Define The Different SSL "library" Files. $! -$ LIB_SSL = "s2_meth,s2_srvr,s2_clnt,s2_lib,s2_enc,s2_pkt,"+ - - "s3_meth,s3_srvr,s3_clnt,s3_lib,s3_enc,s3_pkt,s3_both,s3_cbc,"+ - - "s23_meth,s23_srvr,s23_clnt,s23_lib,s23_pkt,"+ - - "t1_meth,t1_srvr,t1_clnt,t1_lib,t1_enc,"+ - - "d1_meth,d1_srvr,d1_clnt,d1_lib,d1_pkt,"+ - +$ LIB_SSL = "s2_meth, s2_srvr, s2_clnt, s2_lib, s2_enc, s2_pkt,"+ - + "s3_meth, s3_srvr, s3_clnt, s3_lib, s3_enc, s3_pkt, s3_both, s3_cbc,"+ - + "s23_meth,s23_srvr,s23_clnt,s23_lib, s23_pkt,"+ - + "t1_meth, t1_srvr, t1_clnt, t1_lib, t1_enc,"+ - + "d1_meth, d1_srvr, d1_clnt, d1_lib, d1_pkt,"+ - "d1_both,d1_enc,d1_srtp,"+ - "ssl_lib,ssl_err2,ssl_cert,ssl_sess,"+ - "ssl_ciph,ssl_stat,ssl_rsa,"+ - "ssl_asn1,ssl_txt,ssl_algs,"+ - - "bio_ssl,ssl_err,kssl,tls_srp,t1_reneg" + "bio_ssl,ssl_err,kssl,tls_srp,t1_reneg,ssl_utst" $! $ COMPILEWITH_CC5 = "" $! @@ -240,7 +240,7 @@ $ NEXT_FILE: $! $! O.K, Extract The File Name From The File List. $! -$ FILE_NAME = F$ELEMENT(FILE_COUNTER,",",LIB_SSL) +$ FILE_NAME = F$EDIT(F$ELEMENT(FILE_COUNTER,",",LIB_SSL),"COLLAPSE") $! $! Check To See If We Are At The End Of The File List. $! @@ -858,8 +858,11 @@ $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS $ CCEXTRAFLAGS = "" $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS $ CCDISABLEWARNINGS = "" !!! "MAYLOSEDATA3" !!! "LONGLONGTYPE,LONGLONGSUFX,FOUNDCR" -$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN - - CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," + USER_CCDISABLEWARNINGS +$ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" +$ THEN +$ IF CCDISABLEWARNINGS .NES. "" THEN CCDISABLEWARNINGS = CCDISABLEWARNINGS + "," +$ CCDISABLEWARNINGS = CCDISABLEWARNINGS + USER_CCDISABLEWARNINGS +$ ENDIF $! $! Check To See If We Have A ZLIB Option. $! diff --git a/openssl/ssl/ssl.h b/openssl/ssl/ssl.h index b73da5e..b78a1cc 100644 --- a/openssl/ssl/ssl.h +++ b/openssl/ssl/ssl.h @@ -653,6 +653,10 @@ struct ssl_session_st */ #define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020L #define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040L +/* Send TLS_FALLBACK_SCSV in the ClientHello. + * To be set by applications that reconnect with a downgraded protocol + * version; see draft-ietf-tls-downgrade-scsv-00 for details. */ +#define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080L /* Note: SSL[_CTX]_set_{options,mode} use |= op on the previous value, * they cannot be used to clear bits. */ @@ -1511,6 +1515,7 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE #define SSL_AD_BAD_CERTIFICATE_HASH_VALUE TLS1_AD_BAD_CERTIFICATE_HASH_VALUE #define SSL_AD_UNKNOWN_PSK_IDENTITY TLS1_AD_UNKNOWN_PSK_IDENTITY /* fatal */ +#define SSL_AD_INAPPROPRIATE_FALLBACK TLS1_AD_INAPPROPRIATE_FALLBACK /* fatal */ #define SSL_ERROR_NONE 0 #define SSL_ERROR_SSL 1 @@ -1621,6 +1626,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) #define SSL_CTRL_GET_EXTRA_CHAIN_CERTS 82 #define SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS 83 +#define SSL_CTRL_CHECK_PROTO_VERSION 119 + #define DTLSv1_get_timeout(ssl, arg) \ SSL_ctrl(ssl,DTLS_CTRL_GET_TIMEOUT,0, (void *)arg) #define DTLSv1_handle_timeout(ssl) \ @@ -2379,6 +2386,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_HTTPS_PROXY_REQUEST 155 #define SSL_R_HTTP_REQUEST 156 #define SSL_R_ILLEGAL_PADDING 283 +#define SSL_R_INAPPROPRIATE_FALLBACK 373 #define SSL_R_INCONSISTENT_COMPRESSION 340 #define SSL_R_INVALID_CHALLENGE_LENGTH 158 #define SSL_R_INVALID_COMMAND 280 @@ -2525,6 +2533,7 @@ void ERR_load_SSL_strings(void); #define SSL_R_TLSV1_ALERT_DECRYPTION_FAILED 1021 #define SSL_R_TLSV1_ALERT_DECRYPT_ERROR 1051 #define SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION 1060 +#define SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK 1086 #define SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY 1071 #define SSL_R_TLSV1_ALERT_INTERNAL_ERROR 1080 #define SSL_R_TLSV1_ALERT_NO_RENEGOTIATION 1100 diff --git a/openssl/ssl/ssl3.h b/openssl/ssl/ssl3.h index 37f19e3..85f1504 100644 --- a/openssl/ssl/ssl3.h +++ b/openssl/ssl/ssl3.h @@ -128,9 +128,14 @@ extern "C" { #endif -/* Signalling cipher suite value: from draft-ietf-tls-renegotiation-03.txt */ +/* Signalling cipher suite value from RFC 5746 + * (TLS_EMPTY_RENEGOTIATION_INFO_SCSV) */ #define SSL3_CK_SCSV 0x030000FF +/* Signalling cipher suite value from draft-ietf-tls-downgrade-scsv-00 + * (TLS_FALLBACK_SCSV) */ +#define SSL3_CK_FALLBACK_SCSV 0x03005600 + #define SSL3_CK_RSA_NULL_MD5 0x03000001 #define SSL3_CK_RSA_NULL_SHA 0x03000002 #define SSL3_CK_RSA_RC4_40_MD5 0x03000003 diff --git a/openssl/ssl/ssl_err.c b/openssl/ssl/ssl_err.c index d2f0dec..1b7eb47 100644 --- a/openssl/ssl/ssl_err.c +++ b/openssl/ssl/ssl_err.c @@ -383,6 +383,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {ERR_REASON(SSL_R_HTTPS_PROXY_REQUEST) ,"https proxy request"}, {ERR_REASON(SSL_R_HTTP_REQUEST) ,"http request"}, {ERR_REASON(SSL_R_ILLEGAL_PADDING) ,"illegal padding"}, +{ERR_REASON(SSL_R_INAPPROPRIATE_FALLBACK),"inappropriate fallback"}, {ERR_REASON(SSL_R_INCONSISTENT_COMPRESSION),"inconsistent compression"}, {ERR_REASON(SSL_R_INVALID_CHALLENGE_LENGTH),"invalid challenge length"}, {ERR_REASON(SSL_R_INVALID_COMMAND) ,"invalid command"}, @@ -529,6 +530,7 @@ static ERR_STRING_DATA SSL_str_reasons[]= {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPTION_FAILED),"tlsv1 alert decryption failed"}, {ERR_REASON(SSL_R_TLSV1_ALERT_DECRYPT_ERROR),"tlsv1 alert decrypt error"}, {ERR_REASON(SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION),"tlsv1 alert export restriction"}, +{ERR_REASON(SSL_R_TLSV1_ALERT_INAPPROPRIATE_FALLBACK),"tlsv1 alert inappropriate fallback"}, {ERR_REASON(SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY),"tlsv1 alert insufficient security"}, {ERR_REASON(SSL_R_TLSV1_ALERT_INTERNAL_ERROR),"tlsv1 alert internal error"}, {ERR_REASON(SSL_R_TLSV1_ALERT_NO_RENEGOTIATION),"tlsv1 alert no renegotiation"}, diff --git a/openssl/ssl/ssl_lib.c b/openssl/ssl/ssl_lib.c index 82a2c80..3f66fc0 100644 --- a/openssl/ssl/ssl_lib.c +++ b/openssl/ssl/ssl_lib.c @@ -1387,6 +1387,8 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, if (sk == NULL) return(0); q=p; + if (put_cb == NULL) + put_cb = s->method->put_cipher_by_char; for (i=0; i<sk_SSL_CIPHER_num(sk); i++) { @@ -1411,24 +1413,36 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p, !(s->srp_ctx.srp_Mask & SSL_kSRP)) continue; #endif /* OPENSSL_NO_SRP */ - j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p); + j = put_cb(c,p); p+=j; } - /* If p == q, no ciphers and caller indicates an error. Otherwise - * add SCSV if not renegotiating. - */ - if (p != q && !s->renegotiate) + /* If p == q, no ciphers; caller indicates an error. + * Otherwise, add applicable SCSVs. */ + if (p != q) { - static SSL_CIPHER scsv = + if (!s->renegotiate) { - 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 - }; - j = put_cb ? put_cb(&scsv,p) : ssl_put_cipher_by_char(s,&scsv,p); - p+=j; + static SSL_CIPHER scsv = + { + 0, NULL, SSL3_CK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + j = put_cb(&scsv,p); + p+=j; #ifdef OPENSSL_RI_DEBUG - fprintf(stderr, "SCSV sent by client\n"); + fprintf(stderr, "TLS_EMPTY_RENEGOTIATION_INFO_SCSV sent by client\n"); #endif - } + } + + if (s->mode & SSL_MODE_SEND_FALLBACK_SCSV) + { + static SSL_CIPHER scsv = + { + 0, NULL, SSL3_CK_FALLBACK_SCSV, 0, 0, 0, 0, 0, 0, 0, 0, 0 + }; + j = put_cb(&scsv,p); + p+=j; + } + } return(p-q); } @@ -1439,11 +1453,12 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, const SSL_CIPHER *c; STACK_OF(SSL_CIPHER) *sk; int i,n; + if (s->s3) s->s3->send_connection_binding = 0; n=ssl_put_cipher_by_char(s,NULL,NULL); - if ((num%n) != 0) + if (n == 0 || (num%n) != 0) { SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST); return(NULL); @@ -1458,7 +1473,7 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, for (i=0; i<num; i+=n) { - /* Check for SCSV */ + /* Check for TLS_EMPTY_RENEGOTIATION_INFO_SCSV */ if (s->s3 && (n != 3 || !p[0]) && (p[n-2] == ((SSL3_CK_SCSV >> 8) & 0xff)) && (p[n-1] == (SSL3_CK_SCSV & 0xff))) @@ -1478,6 +1493,23 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, continue; } + /* Check for TLS_FALLBACK_SCSV */ + if ((n != 3 || !p[0]) && + (p[n-2] == ((SSL3_CK_FALLBACK_SCSV >> 8) & 0xff)) && + (p[n-1] == (SSL3_CK_FALLBACK_SCSV & 0xff))) + { + /* The SCSV indicates that the client previously tried a higher version. + * Fail if the current version is an unexpected downgrade. */ + if (!SSL_ctrl(s, SSL_CTRL_CHECK_PROTO_VERSION, 0, NULL)) + { + SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST,SSL_R_INAPPROPRIATE_FALLBACK); + if (s->s3) + ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_INAPPROPRIATE_FALLBACK); + goto err; + } + continue; + } + c=ssl_get_cipher_by_char(s,p); p+=n; if (c != NULL) @@ -2944,15 +2976,26 @@ SSL_CTX *SSL_get_SSL_CTX(const SSL *ssl) SSL_CTX *SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx) { + CERT *ocert = ssl->cert; if (ssl->ctx == ctx) return ssl->ctx; #ifndef OPENSSL_NO_TLSEXT if (ctx == NULL) ctx = ssl->initial_ctx; #endif - if (ssl->cert != NULL) - ssl_cert_free(ssl->cert); ssl->cert = ssl_cert_dup(ctx->cert); + if (ocert != NULL) + { + int i; + /* Copy negotiated digests from original */ + for (i = 0; i < SSL_PKEY_NUM; i++) + { + CERT_PKEY *cpk = ocert->pkeys + i; + CERT_PKEY *rpk = ssl->cert->pkeys + i; + rpk->digest = cpk->digest; + } + ssl_cert_free(ocert); + } CRYPTO_add(&ctx->references,1,CRYPTO_LOCK_SSL_CTX); if (ssl->ctx != NULL) SSL_CTX_free(ssl->ctx); /* decrement reference count */ diff --git a/openssl/ssl/t1_enc.c b/openssl/ssl/t1_enc.c index 1427484..1923cf3 100644 --- a/openssl/ssl/t1_enc.c +++ b/openssl/ssl/t1_enc.c @@ -1241,6 +1241,7 @@ int tls1_alert_code(int code) case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE); case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(TLS1_AD_BAD_CERTIFICATE_HASH_VALUE); case SSL_AD_UNKNOWN_PSK_IDENTITY:return(TLS1_AD_UNKNOWN_PSK_IDENTITY); + case SSL_AD_INAPPROPRIATE_FALLBACK:return(TLS1_AD_INAPPROPRIATE_FALLBACK); #if 0 /* not appropriate for TLS, not used for DTLS */ case DTLS1_AD_MISSING_HANDSHAKE_MESSAGE: return (DTLS1_AD_MISSING_HANDSHAKE_MESSAGE); diff --git a/openssl/ssl/t1_lib.c b/openssl/ssl/t1_lib.c index 022a4fb..d6aff4b 100644 --- a/openssl/ssl/t1_lib.c +++ b/openssl/ssl/t1_lib.c @@ -643,7 +643,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, unsigned c #endif #ifndef OPENSSL_NO_SRTP - if(SSL_get_srtp_profiles(s)) + if(SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) { int el; @@ -806,7 +806,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf, unsigned c #endif #ifndef OPENSSL_NO_SRTP - if(s->srtp_profile) + if(SSL_IS_DTLS(s) && s->srtp_profile) { int el; @@ -1444,7 +1444,8 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in /* session ticket processed earlier */ #ifndef OPENSSL_NO_SRTP - else if (type == TLSEXT_TYPE_use_srtp) + else if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s) + && type == TLSEXT_TYPE_use_srtp) { if(ssl_parse_clienthello_use_srtp_ext(s, data, size, al)) @@ -1698,7 +1699,7 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in } #endif #ifndef OPENSSL_NO_SRTP - else if (type == TLSEXT_TYPE_use_srtp) + else if (SSL_IS_DTLS(s) && type == TLSEXT_TYPE_use_srtp) { if(ssl_parse_serverhello_use_srtp_ext(s, data, size, al)) @@ -2347,7 +2348,10 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, HMAC_Final(&hctx, tick_hmac, NULL); HMAC_CTX_cleanup(&hctx); if (CRYPTO_memcmp(tick_hmac, etick + eticklen, mlen)) + { + EVP_CIPHER_CTX_cleanup(&ctx); return 2; + } /* Attempt to decrypt session data */ /* Move p after IV to start of encrypted ticket, update length */ p = etick + 16 + EVP_CIPHER_CTX_iv_length(&ctx); diff --git a/openssl/ssl/tls1.h b/openssl/ssl/tls1.h index c992091..6ae8876 100644 --- a/openssl/ssl/tls1.h +++ b/openssl/ssl/tls1.h @@ -159,17 +159,19 @@ extern "C" { #define TLS1_ALLOW_EXPERIMENTAL_CIPHERSUITES 0 +#define TLS1_VERSION 0x0301 +#define TLS1_1_VERSION 0x0302 #define TLS1_2_VERSION 0x0303 -#define TLS1_2_VERSION_MAJOR 0x03 -#define TLS1_2_VERSION_MINOR 0x03 +#define TLS_MAX_VERSION TLS1_2_VERSION + +#define TLS1_VERSION_MAJOR 0x03 +#define TLS1_VERSION_MINOR 0x01 -#define TLS1_1_VERSION 0x0302 #define TLS1_1_VERSION_MAJOR 0x03 #define TLS1_1_VERSION_MINOR 0x02 -#define TLS1_VERSION 0x0301 -#define TLS1_VERSION_MAJOR 0x03 -#define TLS1_VERSION_MINOR 0x01 +#define TLS1_2_VERSION_MAJOR 0x03 +#define TLS1_2_VERSION_MINOR 0x03 #define TLS1_get_version(s) \ ((s->version >> 8) == TLS1_VERSION_MAJOR ? s->version : 0) @@ -187,6 +189,7 @@ extern "C" { #define TLS1_AD_PROTOCOL_VERSION 70 /* fatal */ #define TLS1_AD_INSUFFICIENT_SECURITY 71 /* fatal */ #define TLS1_AD_INTERNAL_ERROR 80 /* fatal */ +#define TLS1_AD_INAPPROPRIATE_FALLBACK 86 /* fatal */ #define TLS1_AD_USER_CANCELLED 90 #define TLS1_AD_NO_RENEGOTIATION 100 /* codes 110-114 are from RFC3546 */ diff --git a/openssl/test/Makefile b/openssl/test/Makefile index 9fb62cf..685a691 100644 --- a/openssl/test/Makefile +++ b/openssl/test/Makefile @@ -63,7 +63,8 @@ IGETEST= igetest JPAKETEST= jpaketest SRPTEST= srptest ASN1TEST= asn1test -HEARTBEATTEST= heartbeat_test +HEARTBEATTEST= heartbeat_test +CONSTTIMETEST= constant_time_test TESTS= alltests @@ -75,7 +76,7 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(ECDSATEST)$(EXE_EXT) $(ECDHTEST) $(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \ $(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \ $(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \ - $(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) + $(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT) $(CONSTTIMETEST)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -87,7 +88,8 @@ OBJ= $(BNTEST).o $(ECTEST).o $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \ $(MDC2TEST).o $(RMDTEST).o \ $(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(EXPTEST).o $(RSATEST).o \ - $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(HEARTBEATTEST).o + $(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o \ + $(HEARTBEATTEST).o $(CONSTTIMETEST).o SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ @@ -97,7 +99,7 @@ SRC= $(BNTEST).c $(ECTEST).c $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \ $(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(EXPTEST).c $(RSATEST).c \ $(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \ - $(HEARTBEATTEST).c + $(HEARTBEATTEST).c $(CONSTTIMETEST).c EXHEADER= HEADER= $(EXHEADER) @@ -140,7 +142,7 @@ alltests: \ test_enc test_x509 test_rsa test_crl test_sid \ test_gen test_req test_pkcs7 test_verify test_dh test_dsa \ test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \ - test_jpake test_srp test_cms test_heartbeat + test_jpake test_srp test_cms test_heartbeat test_constant_time test_evp: ../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt @@ -324,6 +326,10 @@ test_srp: $(SRPTEST)$(EXE_EXT) test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT) ../util/shlib_wrap.sh ./$(HEARTBEATTEST) +test_constant_time: $(CONSTTIMETEST)$(EXE_EXT) + @echo "Test constant time utilites" + ../util/shlib_wrap.sh ./$(CONSTTIMETEST) + lint: lint -DLINT $(INCLUDES) $(SRC)>fluff @@ -485,6 +491,9 @@ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) +$(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o + @target=$(CONSTTIMETEST) $(BUILD_CMD) + #$(AESTEST).o: $(AESTEST).c # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c @@ -530,6 +539,9 @@ bntest.o: ../include/openssl/stack.h ../include/openssl/symhacks.h bntest.o: ../include/openssl/x509.h ../include/openssl/x509_vfy.h bntest.c casttest.o: ../e_os.h ../include/openssl/cast.h ../include/openssl/e_os2.h casttest.o: ../include/openssl/opensslconf.h casttest.c +constant_time_test.o: ../crypto/constant_time_locl.h ../e_os.h +constant_time_test.o: ../include/openssl/e_os2.h +constant_time_test.o: ../include/openssl/opensslconf.h constant_time_test.c destest.o: ../include/openssl/des.h ../include/openssl/des_old.h destest.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h destest.o: ../include/openssl/ossl_typ.h ../include/openssl/safestack.h diff --git a/openssl/test/constant_time_test.c b/openssl/test/constant_time_test.c new file mode 120000 index 0000000..519f2f3 --- /dev/null +++ b/openssl/test/constant_time_test.c @@ -0,0 +1 @@ +../crypto/constant_time_test.c \ No newline at end of file diff --git a/openssl/test/maketests.com b/openssl/test/maketests.com index 9b64cba..97e0c3b 100644 --- a/openssl/test/maketests.com +++ b/openssl/test/maketests.com @@ -6,6 +6,7 @@ $! A-Com Computing, Inc. $! byer(a)mail.all-net.net $! $! Changes by Richard Levitte <richard(a)levitte.org> +$! Zoltan Arpadffy <arpadffy(a)polarhome.com> $! $! This command files compiles and creates all the various different $! "test" programs for the different types of encryption for OpenSSL. @@ -147,7 +148,7 @@ $ TEST_FILES = "BNTEST,ECTEST,ECDSATEST,ECDHTEST,IDEATEST,"+ - "RANDTEST,DHTEST,ENGINETEST,"+ - "BFTEST,CASTTEST,SSLTEST,EXPTEST,DSATEST,RSA_TEST,"+ - "EVP_TEST,IGETEST,JPAKETEST,SRPTEST,"+ - - "ASN1TEST" + "ASN1TEST,HEARTBEAT_TEST,CONSTANT_TIME_TEST" $! Should we add MTTEST,PQ_TEST,LH_TEST,DIVTEST,TABTEST as well? $! $! Additional directory information. @@ -185,6 +186,8 @@ $ T_D_IGETEST := [-.test] $ T_D_JPAKETEST := [-.crypto.jpake] $ T_D_SRPTEST := [-.crypto.srp] $ T_D_ASN1TEST := [-.test] +$ T_D_HEARTBEAT_TEST := [-.ssl] +$ T_D_CONSTANT_TIME_TEST := [-.crypto] $! $ TCPIP_PROGRAMS = ",," $ IF COMPILER .EQS. "VAXC" THEN - diff --git a/openssl/test/tests.com b/openssl/test/tests.com index a840d50..39a7bfa 100644 --- a/openssl/test/tests.com +++ b/openssl/test/tests.com @@ -56,7 +56,7 @@ $ tests := - test_enc,test_x509,test_rsa,test_crl,test_sid,- test_gen,test_req,test_pkcs7,test_verify,test_dh,test_dsa,- test_ss,test_ca,test_engine,test_evp,test_ssl,test_tsa,test_ige,- - test_jpake,test_srp,test_cms + test_jpake,test_srp,test_cms,test_heartbeat,test_constant_time $ endif $ tests = f$edit(tests,"COLLAPSE") $ @@ -95,6 +95,8 @@ $ IGETEST := igetest $ JPAKETEST := jpaketest $ SRPTEST := srptest $ ASN1TEST := asn1test +$ HEARTBEATTEST := heartbeat_test +$ CONSTTIMETEST := constant_time_test $! $ tests_i = 0 $ loop_tests: @@ -366,10 +368,20 @@ $ test_srp: $ write sys$output "Test SRP" $ mcr 'texe_dir''srptest' $ return +$ test_heartbeat: +$ write sys$output "Test HEARTBEAT" +$ mcr 'texe_dir''heartbeattest' +$ return +$ test_constant_time: +$ write sys$output "Test constant time utilities" +$ mcr 'texe_dir''consttimetest' +$ return $ $ $ exit: +$ on error then goto exit2 ! In case openssl.exe didn't build. $ mcr 'exe_dir'openssl version -a +$ exit2: $ set default '__save_default' $ deassign sslroot $ exit diff --git a/openssl/test/testssl b/openssl/test/testssl index 4e8542b..9fb89a3 100644 --- a/openssl/test/testssl +++ b/openssl/test/testssl @@ -173,6 +173,12 @@ else echo test tls1 with SRP via BIO pair $ssltest -bio_pair -tls1 -cipher SRP -srpuser test -srppass abc123 + + echo test tls1 with SRP auth + $ssltest -tls1 -cipher aSRP -srpuser test -srppass abc123 + + echo test tls1 with SRP auth via BIO pair + $ssltest -bio_pair -tls1 -cipher aSRP -srpuser test -srppass abc123 fi exit 0 diff --git a/openssl/util/mk1mf.pl b/openssl/util/mk1mf.pl index bcd00ba..f0c2df0 100644 --- a/openssl/util/mk1mf.pl +++ b/openssl/util/mk1mf.pl @@ -1145,6 +1145,7 @@ sub read_options "dll" => \$shlib, "shared" => 0, "no-sctp" => 0, + "no-srtp" => 0, "no-gmp" => 0, "no-rfc3779" => 0, "no-montasm" => 0, diff --git a/openssl/util/mkdef.pl b/openssl/util/mkdef.pl index 79d4de8..1eaa7b8 100644 --- a/openssl/util/mkdef.pl +++ b/openssl/util/mkdef.pl @@ -117,6 +117,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", "SSL_INTERN", # SCTP "SCTP", + # SRTP + "SRTP", # Unit testing "UNIT_TEST"); @@ -138,7 +140,7 @@ my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; -my $no_nextprotoneg; my $no_sctp; +my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_unit_test; my $fips; @@ -238,6 +240,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-jpake$/) { $no_jpake=1; } elsif (/^no-srp$/) { $no_srp=1; } elsif (/^no-sctp$/) { $no_sctp=1; } + elsif (/^no-srtp$/) { $no_srtp=1; } elsif (/^no-unit-test$/){ $no_unit_test=1; } } @@ -1209,6 +1212,7 @@ sub is_valid if ($keyword eq "JPAKE" && $no_jpake) { return 0; } if ($keyword eq "SRP" && $no_srp) { return 0; } if ($keyword eq "SCTP" && $no_sctp) { return 0; } + if ($keyword eq "SRTP" && $no_srtp) { return 0; } if ($keyword eq "UNIT_TEST" && $no_unit_test) { return 0; } if ($keyword eq "DEPRECATED" && $no_deprecated) { return 0; } diff --git a/openssl/util/ssleay.num b/openssl/util/ssleay.num index 1c05a3c..dd21e95 100644 --- a/openssl/util/ssleay.num +++ b/openssl/util/ssleay.num @@ -310,14 +310,14 @@ TLSv1_2_method 350 EXIST::FUNCTION: SSL_SESSION_get_id_len 351 NOEXIST::FUNCTION: kssl_ctx_get0_client_princ 352 EXIST::FUNCTION:KRB5 SSL_export_keying_material 353 EXIST::FUNCTION:TLSEXT -SSL_set_tlsext_use_srtp 354 EXIST::FUNCTION: +SSL_set_tlsext_use_srtp 354 EXIST::FUNCTION:SRTP SSL_CTX_set_next_protos_advertised_cb 355 EXIST:!VMS:FUNCTION:NEXTPROTONEG SSL_CTX_set_next_protos_adv_cb 355 EXIST:VMS:FUNCTION:NEXTPROTONEG SSL_get0_next_proto_negotiated 356 EXIST::FUNCTION:NEXTPROTONEG -SSL_get_selected_srtp_profile 357 EXIST::FUNCTION: -SSL_CTX_set_tlsext_use_srtp 358 EXIST::FUNCTION: +SSL_get_selected_srtp_profile 357 EXIST::FUNCTION:SRTP +SSL_CTX_set_tlsext_use_srtp 358 EXIST::FUNCTION:SRTP SSL_select_next_proto 359 EXIST::FUNCTION:NEXTPROTONEG -SSL_get_srtp_profiles 360 EXIST::FUNCTION: +SSL_get_srtp_profiles 360 EXIST::FUNCTION:SRTP SSL_CTX_set_next_proto_select_cb 361 EXIST:!VMS:FUNCTION:NEXTPROTONEG SSL_CTX_set_next_proto_sel_cb 361 EXIST:VMS:FUNCTION:NEXTPROTONEG SSL_SESSION_get_compress_id 362 EXIST::FUNCTION: -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 02/13: Merge remote-tracking branch 'origin/released'
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit 9fc852414dd4e841c4e2229f55a3e41abca64ac5 Merge: 8d44af7 fa5a6df Author: marha <marha(a)users.sourceforge.net> Date: Sun Oct 19 11:18:56 2014 +0200 Merge remote-tracking branch 'origin/released' Conflicts: mesalib/src/mesa/main/bufferobj.c mesalib/configure.ac | 38 ++--- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 12 ++ mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.2.9.html | 101 +++++++++++++ mesalib/docs/relnotes/10.3.1.html | 158 ++++++++++++++++++++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/src/glsl/README | 16 +- mesalib/src/mesa/drivers/common/meta_blit.c | 1 + mesalib/src/mesa/main/bufferobj.c | 21 ++- mesalib/src/mesa/main/bufferobj.h | 2 +- mesalib/src/mesa/main/dd.h | 2 +- mesalib/src/mesa/main/mtypes.h | 13 ++ mesalib/src/mesa/main/shared.c | 2 +- mesalib/src/mesa/main/teximage.c | 6 + .../src/mesa/state_tracker/st_cb_bufferobjects.c | 4 +- mesalib/src/mesa/state_tracker/st_cb_eglimage.c | 3 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 13 +- mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 2 +- mesalib/src/mesa/state_tracker/st_texture.c | 6 +- mesalib/src/mesa/state_tracker/st_texture.h | 3 +- mesalib/src/mesa/state_tracker/st_vdpau.c | 4 +- mesalib/src/mesa/vbo/vbo_exec_api.c | 2 +- mesalib/src/mesa/vbo/vbo_save_api.c | 4 +- 24 files changed, 355 insertions(+), 63 deletions(-) diff --cc mesalib/src/mesa/drivers/common/meta_blit.c index c6616d9,01cb532..01cb532 mode 100755,100644..100755 --- a/mesalib/src/mesa/drivers/common/meta_blit.c +++ b/mesalib/src/mesa/drivers/common/meta_blit.c diff --cc mesalib/src/mesa/main/bufferobj.c index c29a8c7,0ee8856..c88744a mode 100644,100644..100755 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@@ -388,8 -388,8 +388,8 @@@ convert_clear_buffer_data(struct gl_con * * Default callback for the \c dd_function_table::NewBufferObject() hook. */ -static struct gl_buffer_object * +struct gl_buffer_object * - _mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target ) + _mesa_new_buffer_object(struct gl_context *ctx, GLuint name) { struct gl_buffer_object *obj; -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

[vcxsrv] 01/13: mesa git update 19 oct 2014
by git-admin＠x2go.org 09 Mar '15

09 Mar '15

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 1.16.2.0 in repository vcxsrv. commit fa5a6df66cfe9b19014ea9d2fca35b762f457041 Author: marha <marha(a)users.sourceforge.net> Date: Sun Oct 19 11:17:56 2014 +0200 mesa git update 19 oct 2014 mesa commit 6212d2402df4ad0658cbb98ce889e35ef5f32fa3 --- mesalib/configure.ac | 38 ++--- mesalib/docs/GL3.txt | 2 +- mesalib/docs/index.html | 12 ++ mesalib/docs/relnotes.html | 2 + mesalib/docs/relnotes/10.2.9.html | 101 +++++++++++++ mesalib/docs/relnotes/10.3.1.html | 158 ++++++++++++++++++++ mesalib/docs/relnotes/10.4.html | 1 + mesalib/src/glsl/README | 16 +- mesalib/src/mesa/drivers/common/meta_blit.c | 1 + mesalib/src/mesa/main/bufferobj.c | 21 ++- mesalib/src/mesa/main/bufferobj.h | 2 +- mesalib/src/mesa/main/dd.h | 2 +- mesalib/src/mesa/main/mtypes.h | 13 ++ mesalib/src/mesa/main/shared.c | 2 +- mesalib/src/mesa/main/teximage.c | 6 + .../src/mesa/state_tracker/st_cb_bufferobjects.c | 4 +- mesalib/src/mesa/state_tracker/st_cb_eglimage.c | 3 +- mesalib/src/mesa/state_tracker/st_cb_texture.c | 13 +- mesalib/src/mesa/state_tracker/st_gen_mipmap.c | 2 +- mesalib/src/mesa/state_tracker/st_texture.c | 6 +- mesalib/src/mesa/state_tracker/st_texture.h | 3 +- mesalib/src/mesa/state_tracker/st_vdpau.c | 4 +- mesalib/src/mesa/vbo/vbo_exec_api.c | 2 +- mesalib/src/mesa/vbo/vbo_save_api.c | 4 +- 24 files changed, 355 insertions(+), 63 deletions(-) diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 680dff4..0ed9325 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1126,14 +1126,13 @@ if test "x$enable_dri" = xyes; then fi # Check for expat - PKG_CHECK_EXISTS([expat], [have_expat=yes], [have_expat=no]) - if test "x$have_expat" = "xyes"; then - PKG_CHECK_MODULES([EXPAT], [expat], [], - AC_MSG_ERROR([Expat required for DRI.])) - else - # expat version 2.0 and earlier do not provide expat.pc - EXPAT_LIBS=-lexpat - fi + PKG_CHECK_MODULES([EXPAT], [expat], [], + # expat version 2.0 and earlier do not provide expat.pc + [AC_CHECK_HEADER([expat.h],[], + [AC_MSG_ERROR([Expat headers required for DRI not found])]) + AC_CHECK_LIB([expat],[XML_ParserCreate],[], + [AC_MSG_ERROR([Expat library required for DRI not found])]) + EXPAT_LIBS="-lexpat"]) DRICOMMON_NEED_LIBDRM=no # If we are building any DRI driver other than swrast. @@ -1438,7 +1437,6 @@ AM_CONDITIONAL(HAVE_ST_OMX, test "x$enable_omx" = xyes) if test "x$enable_va" = xyes; then PKG_CHECK_MODULES([VA], [libva >= 0.35.0 x11-xcb xcb-dri2 >= $XCBDRI2_REQUIRED], [VA_LIBS="`$PKG_CONFIG --libs x11-xcb xcb-dri2`"]) - GALLIUM_STATE_TRACKERS_DIRS="$GALLIUM_STATE_TRACKERS_DIRS va" enable_gallium_loader=$enable_shared_pipe_drivers fi AM_CONDITIONAL(HAVE_ST_VA, test "x$enable_va" = xyes) @@ -1786,38 +1784,30 @@ if test "x$enable_gallium_tests" = xyes; then fi AM_CONDITIONAL(HAVE_GALLIUM_TESTS, test "x$enable_gallium_tests" = xyes) -VDPAU_LIB_INSTALL_DIR_DEFAULT='' -if test "x$enable_vdpau" = xyes; then - VDPAU_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=moduledir vdpau` -fi - dnl Directory for VDPAU libs AC_ARG_WITH([vdpau-libdir], [AS_HELP_STRING([--with-vdpau-libdir=DIR], - [directory for the VDPAU libraries @<:@default=`pkg-config --variable=moduledir vdpau`@:>@])], + [directory for the VDPAU libraries @<:@default=${libdir}/vdpau@:>@])], [VDPAU_LIB_INSTALL_DIR="$withval"], - [VDPAU_LIB_INSTALL_DIR="$VDPAU_LIB_INSTALL_DIR_DEFAULT"]) + [VDPAU_LIB_INSTALL_DIR='${libdir}/vdpau']) AC_SUBST([VDPAU_LIB_INSTALL_DIR]) -OMX_LIB_INSTALL_DIR_DEFAULT='' -if test "x$enable_omx" = xyes; then - OMX_LIB_INSTALL_DIR_DEFAULT=`$PKG_CONFIG --variable=pluginsdir libomxil-bellagio` -fi +dnl Directory for OMX libs AC_ARG_WITH([omx-libdir], [AS_HELP_STRING([--with-omx-libdir=DIR], - [directory for the OMX libraries @<:@default=`pkg-config --variable=pluginsdir libomxil-bellagio`@:>@])], + [directory for the OMX libraries])], [OMX_LIB_INSTALL_DIR="$withval"], - [OMX_LIB_INSTALL_DIR="$OMX_LIB_INSTALL_DIR_DEFAULT"]) + [OMX_LIB_INSTALL_DIR=`$PKG_CONFIG --define-variable=libdir=\$libdir --variable=pluginsdir libomxil-bellagio`]) AC_SUBST([OMX_LIB_INSTALL_DIR]) dnl Directory for VA libs AC_ARG_WITH([va-libdir], [AS_HELP_STRING([--with-va-libdir=DIR], - [directory for the VA libraries @<:@default=`pkg-config libva --variable=driverdir`@:>@])], + [directory for the VA libraries @<:@${libdir}/dri@:>@])], [VA_LIB_INSTALL_DIR="$withval"], - [VA_LIB_INSTALL_DIR=`pkg-config libva --variable=driverdir`]) + [VA_LIB_INSTALL_DIR="${libdir}/dri"]) AC_SUBST([VA_LIB_INSTALL_DIR]) dnl diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt index 5adc759..07d1d2c 100644 --- a/mesalib/docs/GL3.txt +++ b/mesalib/docs/GL3.txt @@ -110,7 +110,7 @@ GL 4.0, GLSL 4.00: - Interpolation functions DONE () - New overload resolution rules DONE GL_ARB_gpu_shader_fp64 started (Dave) - GL_ARB_sample_shading DONE (i965, nv50, nvc0, radeonsi) + GL_ARB_sample_shading DONE (i965, nv50, nvc0, r600, radeonsi) GL_ARB_shader_subroutine not started GL_ARB_tessellation_shader started (Chris, Ilia) GL_ARB_texture_buffer_object_rgb32 DONE (i965, nvc0, r600, radeonsi, llvmpipe, softpipe) diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html index 98162bb..244a7a3 100644 --- a/mesalib/docs/index.html +++ b/mesalib/docs/index.html @@ -16,6 +16,18 @@ <h1>News</h1> +<h2>October 12, 2014</h2> +<p> +<a href="relnotes/10.2.9.html">Mesa 10.2.9</a> +and <a href="relnotes/10.3.1.html">Mesa 10.3.1</a> are released. + +These are bug-fix releases from the 10.2 and 10.3 branches, respectively. +<br> +NOTE: It is anticipated that 10.2.9 will be the final release in the 10.2 +series. Users of 10.2 are encouraged to migrate to the 10.3 series in order +to obtain future fixes. +</p> + <h2>September 19, 2014</h2> <p> <a href="relnotes/10.3.html">Mesa 10.3</a> is released. This is a new diff --git a/mesalib/docs/relnotes.html b/mesalib/docs/relnotes.html index 0a4c3de..d546e85 100644 --- a/mesalib/docs/relnotes.html +++ b/mesalib/docs/relnotes.html @@ -21,6 +21,8 @@ The release notes summarize what's new or changed in each Mesa release. </p> <ul> +<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> <li><a href="relnotes/10.2.8.html">10.2.8 release notes</a> <li><a href="relnotes/10.2.7.html">10.2.7 release notes</a> diff --git a/mesalib/docs/relnotes/10.2.9.html b/mesalib/docs/relnotes/10.2.9.html new file mode 100644 index 0000000..7a9f639 --- /dev/null +++ b/mesalib/docs/relnotes/10.2.9.html @@ -0,0 +1,101 @@ +<!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.2.9 Release Notes / October 12, 2014</h1> + +<p> +Mesa 10.2.9 is a bug fix release which fixes bugs found since the 10.2.8 release. +This is the final planned release for the 10.2 branch. +</p> +<p> +Mesa 10.2.9 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> +f8d62857eed8f604a57710c58a8ffcfb8dab2dc4977ec27c956c7c4fd14032f6 MesaLib-10.2.9.tar.gz +f6031f8b7113a92325b60635c504c510490eebb2e707119bbff7bd86aa34657d MesaLib-10.2.9.tar.bz2 +11c0ef4f3308fc29d9f15a77fd8f4842a946fce9e830250a1c95b171a446171a MesaLib-10.2.9.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=79462">Bug 79462</a> - [NVC0/Codegen] Shader compilation falis in spill logic</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83570">Bug 83570</a> - Glyphy demo throws unhandled Integer division by zero exception</li> + +</ul> + +<h2>Changes</h2> +<p>Andreas Pokorny (2):</p> +<ul> + <li>egl/drm: expose KHR_image_pixmap extension</li> + <li>i915: Fix black buffers when importing prime fds</li> +</ul> + +<p>Emil Velikov (2):</p> +<ul> + <li>docs: Add sha256 sums for the 10.2.8 release</li> + <li>Update VERSION to 10.2.9</li> +</ul> + +<p>Ilia Mirkin (1):</p> +<ul> + <li>nv50/ir: avoid deleting pseudo instructions too early</li> +</ul> + +<p>Marek Olšák (3):</p> +<ul> + <li>radeonsi: release GS rings at context destruction</li> + <li>radeonsi: properly destroy the GS copy shader and scratch_bo for compute</li> + <li>st/dri: remove GALLIUM_MSAA and __GL_FSAA_MODE environment variables</li> +</ul> + +<p>Roland Scheidegger (1):</p> +<ul> + <li>gallivm: fix idiv</li> +</ul> + +<p>Thomas Hellstrom (1):</p> +<ul> + <li>st/xa: Fix regression in xa_yuv_planar_blit()</li> +</ul> + +<p>Tom Stellard (1):</p> +<ul> + <li>configure.ac: Compute LLVM_VERSION_PATCH using llvm-config</li> +</ul> + +<p>rconde (1):</p> +<ul> + <li>gallivm,tgsi: fix idiv by zero crash</li> +</ul> + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes/10.3.1.html b/mesalib/docs/relnotes/10.3.1.html new file mode 100644 index 0000000..7de0506 --- /dev/null +++ b/mesalib/docs/relnotes/10.3.1.html @@ -0,0 +1,158 @@ +<!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.1 Release Notes / October 12, 2014</h1> + +<p> +Mesa 10.3.1 is a bug fix release which fixes bugs found since the 10.3 release. +</p> +<p> +Mesa 10.3.1 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> +155afcbad17be8bb80282c761b957d5cc716c14a1fa16c4f5ee04e76df729c6d MesaLib-10.3.1.tar.gz +b081d077d717e5d56f2d59677490856052c41573e50378ff86d6c72456714add MesaLib-10.3.1.tar.bz2 +07a14febfed06412d519e091a62d24513fee6745f1a6f8a8f1956bfe04b77d15 MesaLib-10.3.1.zip +</pre> + +<h2>New features</h2> +<p>None</p> + +<h2>Bug fixes</h2> + +<p>This list is likely incomplete.</p> + +<ul> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=79462">Bug 79462</a> - [NVC0/Codegen] Shader compilation falis in spill logic</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=82932">Bug 82932</a> - [SNB+ Bisected]Ogles3conform ES3-CTS.shaders.indexing.vector_subscript.vec3_static_loop_subscript_write_direct_read_vertex fails</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83506">Bug 83506</a> - [UBO] row_major layout ignored inside structures</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83533">Bug 83533</a> - [UBO] nested structures don't get appropriate padding</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83570">Bug 83570</a> - Glyphy demo throws unhandled Integer division by zero exception</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=83741">Bug 83741</a> - [UBO] row_major layout partially ignored for arrays of structures</li> + +<li><a href="https://bugs.freedesktop.org/show_bug.cgi?id=84178">Bug 84178</a> - Big glamor regression in Xorg server 1.6.99.1 GIT: x11perf 1.5 Test: PutImage XY 500x500 Square</li> + +</ul> + +<h2>Changes</h2> + +<p>Andreas Pokorny (2):</p> +<ul> + <li>egl/drm: expose KHR_image_pixmap extension</li> + <li>i915: Fix black buffers when importing prime fds</li> +</ul> + +<p>Brian Paul (1):</p> +<ul> + <li>mesa: fix prog_optimize.c assertions triggered by SWZ opcode</li> +</ul> + +<p>Emil Velikov (2):</p> +<ul> + <li>docs: Add 10.3 sha256 sums, news item and link release notes</li> + <li>Update VERSION to 10.3.1</li> +</ul> + +<p>Ian Romanick (4):</p> +<ul> + <li>glsl: Make sure fields after small structs have correct padding</li> + <li>glsl: Make sure row-major array-of-structure get correct layout</li> + <li>glsl: Round struct size up to at least 16 bytes</li> + <li>glsl: Strip arrayness from ir_type_dereference_variable too</li> +</ul> + +<p>Ilia Mirkin (5):</p> +<ul> + <li>nv50/ir: avoid deleting pseudo instructions too early</li> + <li>gm107/ir: fix manual TXD for array targets</li> + <li>gm107/ir: fix texture argument order</li> + <li>gm107/ir: add support for indirect const buffer selection</li> + <li>gm107/ir: take relative pfetch offset into account</li> +</ul> + +<p>Keith Packard (1):</p> +<ul> + <li>glx/dri3: Provide error diagnostics when DRI3 allocation fails</li> +</ul> + +<p>Kenneth Graunke (2):</p> +<ul> + <li>mesa: Use proper structure for glGet*(GL_TEXTURE_COORD_ARRAY*).</li> + <li>mesa: Set correct array element in vbo_exec_vtx_init.</li> +</ul> + +<p>Marek Olšák (3):</p> +<ul> + <li>radeonsi: release GS rings at context destruction</li> + <li>radeonsi: properly destroy the GS copy shader and scratch_bo for compute</li> + <li>st/dri: remove GALLIUM_MSAA and __GL_FSAA_MODE environment variables</li> +</ul> + +<p>Michel Dänzer (1):</p> +<ul> + <li>st/mesa: Use PIPE_USAGE_STAGING for GL_STATIC/DYNAMIC/STREAM_READ buffers</li> +</ul> + +<p>Richard Sandiford (2):</p> +<ul> + <li>mesa: Fix alpha component in unpack_R8G8B8X8_SRGB.</li> + <li>swrast: Fix handling of MESA_FORMAT_L8A8_SRGB for big-endian</li> +</ul> + +<p>Roland Scheidegger (1):</p> +<ul> + <li>gallivm: fix idiv</li> +</ul> + +<p>Thomas Hellstrom (1):</p> +<ul> + <li>st/xa: Fix regression in xa_yuv_planar_blit()</li> +</ul> + +<p>Tom Stellard (2):</p> +<ul> + <li>clover: Add support to mem objects for multiple destructor callbacks v2</li> + <li>configure.ac: Compute LLVM_VERSION_PATCH using llvm-config</li> +</ul> + +<p>Tomasz Figa (3):</p> +<ul> + <li>util: Include in Android builds</li> + <li>st/mesa: Generate format_info.c in Android builds</li> + <li>st/mesa: Fix paths used in Android builds</li> +</ul> + +<p>rconde (1):</p> +<ul> + <li>gallivm,tgsi: fix idiv by zero crash</li> +</ul> + +</div> +</body> +</html> diff --git a/mesalib/docs/relnotes/10.4.html b/mesalib/docs/relnotes/10.4.html index e6813d3..64cbfae 100644 --- a/mesalib/docs/relnotes/10.4.html +++ b/mesalib/docs/relnotes/10.4.html @@ -44,6 +44,7 @@ Note: some of the new features are only available with certain drivers. </p> <ul> +<li>GL_ARB_sample_shading on r600</li> <li>GL_ARB_texture_view on nv50, nvc0</li> </ul> diff --git a/mesalib/src/glsl/README b/mesalib/src/glsl/README index 0a0afcc..2f93f12 100644 --- a/mesalib/src/glsl/README +++ b/mesalib/src/glsl/README @@ -8,7 +8,7 @@ passed straight through. See glcpp/* 2) lex and yacc-based parser takes the preprocessed string and generates the AST (abstract syntax tree). Almost no checking is -performed in this stage. See glsl_lexer.lpp and glsl_parser.ypp. +performed in this stage. See glsl_lexer.ll and glsl_parser.yy. 3) The AST is converted to "HIR". This is the intermediate representation of the compiler. Constructors are generated, function @@ -34,7 +34,7 @@ linked in. 7) The driver performs code generation out of the IR, taking a linked shader program and producing a compiled program for each stage. See -ir_to_mesa.cpp for Mesa IR code generation. +../mesa/program/ir_to_mesa.cpp for Mesa IR code generation. FAQ: @@ -126,7 +126,7 @@ optimizations like CSE where one must navigate an expression tree. Q: Why no SSA representation? -A: Converting an IR tree to SSA form makes dead code elmimination, +A: Converting an IR tree to SSA form makes dead code elimination, common subexpression elimination, and many other optimizations much easier. However, in our primarily vector-based language, there's some major questions as to how it would work. Do we do SSA on the scalar @@ -134,9 +134,9 @@ or vector level? If we do it at the vector level, we're going to end up with many different versions of the variable when encountering code like: -(assign (constant bool (1)) (swiz x (var_ref __retval) ) (var_ref a) ) -(assign (constant bool (1)) (swiz y (var_ref __retval) ) (var_ref b) ) -(assign (constant bool (1)) (swiz z (var_ref __retval) ) (var_ref c) ) +(assign (constant bool (1)) (swiz x (var_ref __retval) ) (var_ref a) ) +(assign (constant bool (1)) (swiz y (var_ref __retval) ) (var_ref b) ) +(assign (constant bool (1)) (swiz z (var_ref __retval) ) (var_ref c) ) If every masked update of a component relies on the previous value of the variable, then we're probably going to be quite limited in our @@ -183,7 +183,7 @@ ir_validate.cpp (check users have the right types) You may also need to update the backends if they will see the new expr type: -../mesa/shaders/ir_to_mesa.cpp +../mesa/program/ir_to_mesa.cpp You can then use the new expression from builtins (if all backends would rather see it), or scan the IR and convert to use your new @@ -225,4 +225,4 @@ Initially, there really wasn't one. We have since adopted one: - Files that implement a class that is used throught the code should take the name of that class (e.g., ir_hierarchical_visitor.cpp). - Files that contain code not fitting in one of the previous - categories should have a sensible name (e.g., glsl_parser.ypp). + categories should have a sensible name (e.g., glsl_parser.yy). diff --git a/mesalib/src/mesa/drivers/common/meta_blit.c b/mesalib/src/mesa/drivers/common/meta_blit.c index c6616d9..01cb532 100644 --- a/mesalib/src/mesa/drivers/common/meta_blit.c +++ b/mesalib/src/mesa/drivers/common/meta_blit.c @@ -134,6 +134,7 @@ setup_glsl_msaa_blit_scaled_shader(struct gl_context *ctx, break; default: _mesa_problem(ctx, "Unsupported sample count %d\n", samples); + unreachable("Unsupported sample count"); } /* Create sample map string. */ diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index b6879ce..0ee8856 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -389,14 +389,14 @@ convert_clear_buffer_data(struct gl_context *ctx, * Default callback for the \c dd_function_table::NewBufferObject() hook. */ static struct gl_buffer_object * -_mesa_new_buffer_object( struct gl_context *ctx, GLuint name, GLenum target ) +_mesa_new_buffer_object(struct gl_context *ctx, GLuint name) { struct gl_buffer_object *obj; (void) ctx; obj = MALLOC_STRUCT(gl_buffer_object); - _mesa_initialize_buffer_object(ctx, obj, name, target); + _mesa_initialize_buffer_object(ctx, obj, name); return obj; } @@ -494,12 +494,10 @@ _mesa_reference_buffer_object_(struct gl_context *ctx, * Initialize a buffer object to default values. */ void -_mesa_initialize_buffer_object( struct gl_context *ctx, - struct gl_buffer_object *obj, - GLuint name, GLenum target ) +_mesa_initialize_buffer_object(struct gl_context *ctx, + struct gl_buffer_object *obj, + GLuint name) { - (void) target; - memset(obj, 0, sizeof(struct gl_buffer_object)); mtx_init(&obj->Mutex, mtx_plain); obj->RefCount = 1; @@ -906,7 +904,7 @@ _mesa_handle_bind_buffer_gen(struct gl_context *ctx, * never used before, allocate a buffer object now. */ ASSERT(ctx->Driver.NewBufferObject); - buf = ctx->Driver.NewBufferObject(ctx, buffer, target); + buf = ctx->Driver.NewBufferObject(ctx, buffer); if (!buf) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", caller); return false; @@ -2652,6 +2650,12 @@ set_ubo_binding(struct gl_context *ctx, binding->Offset = offset; binding->Size = size; binding->AutomaticSize = autoSize; + + /* If this is a real buffer object, mark it has having been used + * at some point as a UBO. + */ + if (size >= 0) + bufObj->UsageHistory |= USAGE_UNIFORM_BUFFER; } /** @@ -2764,6 +2768,7 @@ set_atomic_buffer_binding(struct gl_context *ctx, } else { binding->Offset = offset; binding->Size = size; + bufObj->UsageHistory |= USAGE_ATOMIC_COUNTER_BUFFER; } } diff --git a/mesalib/src/mesa/main/bufferobj.h b/mesalib/src/mesa/main/bufferobj.h index 0779605..fe294fc 100644 --- a/mesalib/src/mesa/main/bufferobj.h +++ b/mesalib/src/mesa/main/bufferobj.h @@ -103,7 +103,7 @@ _mesa_multi_bind_lookup_bufferobj(struct gl_context *ctx, extern void _mesa_initialize_buffer_object(struct gl_context *ctx, struct gl_buffer_object *obj, - GLuint name, GLenum target); + GLuint name); extern void _mesa_reference_buffer_object_(struct gl_context *ctx, diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h index c130b14..c07e83a 100644 --- a/mesalib/src/mesa/main/dd.h +++ b/mesalib/src/mesa/main/dd.h @@ -602,7 +602,7 @@ struct dd_function_table { */ /*@{*/ struct gl_buffer_object * (*NewBufferObject)(struct gl_context *ctx, - GLuint buffer, GLenum target); + GLuint buffer); void (*DeleteBuffer)( struct gl_context *ctx, struct gl_buffer_object *obj ); diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 5e9453b..9f44eda 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1465,6 +1465,16 @@ struct gl_buffer_mapping { /** + * Usages we've seen for a buffer object. + */ +typedef enum { + USAGE_UNIFORM_BUFFER = 0x1, + USAGE_TEXTURE_BUFFER = 0x2, + USAGE_ATOMIC_COUNTER_BUFFER = 0x4, +} gl_buffer_usage; + + +/** * GL_ARB_vertex/pixel_buffer_object buffer object */ struct gl_buffer_object @@ -1481,6 +1491,7 @@ struct gl_buffer_object GLboolean Written; /**< Ever written to? (for debugging) */ GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */ GLboolean Immutable; /**< GL_ARB_buffer_storage */ + gl_buffer_usage UsageHistory; /**< How has this buffer been used so far? */ struct gl_buffer_mapping Mappings[MAP_COUNT]; }; @@ -4060,6 +4071,8 @@ struct gl_driver_flags */ uint64_t NewUniformBuffer; + uint64_t NewTextureBuffer; + /** * gl_context::AtomicBufferBindings */ diff --git a/mesalib/src/mesa/main/shared.c b/mesalib/src/mesa/main/shared.c index 7ef932f..f74a823 100644 --- a/mesalib/src/mesa/main/shared.c +++ b/mesalib/src/mesa/main/shared.c @@ -86,7 +86,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx) shared->SamplerObjects = _mesa_NewHashTable(); /* Allocate the default buffer object */ - shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0); + shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0); /* Create default texture objects */ for (i = 0; i < NUM_TEXTURE_TARGETS; i++) { diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c index c0298af..4f4bb11 100644 --- a/mesalib/src/mesa/main/teximage.c +++ b/mesalib/src/mesa/main/teximage.c @@ -4652,6 +4652,12 @@ texbufferrange(struct gl_context *ctx, GLenum target, GLenum internalFormat, texObj->BufferSize = size; } _mesa_unlock_texture(ctx, texObj); + + ctx->NewDriverState |= ctx->DriverFlags.NewTextureBuffer; + + if (bufObj) { + bufObj->UsageHistory |= USAGE_TEXTURE_BUFFER; + } } diff --git a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c index d53602c..55f3644 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -54,14 +54,14 @@ * internal structure where somehow shared. */ static struct gl_buffer_object * -st_bufferobj_alloc(struct gl_context *ctx, GLuint name, GLenum target) +st_bufferobj_alloc(struct gl_context *ctx, GLuint name) { struct st_buffer_object *st_obj = ST_CALLOC_STRUCT(st_buffer_object); if (!st_obj) return NULL; - _mesa_initialize_buffer_object(ctx, &st_obj->Base, name, target); + _mesa_initialize_buffer_object(ctx, &st_obj->Base, name); return &st_obj->Base; } diff --git a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c index 34eb809..8531afb 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_eglimage.c +++ b/mesalib/src/mesa/state_tracker/st_cb_eglimage.c @@ -96,6 +96,7 @@ st_bind_surface(struct gl_context *ctx, GLenum target, struct gl_texture_image *texImage, struct pipe_surface *ps) { + struct st_context *st = st_context(ctx); struct st_texture_object *stObj; struct st_texture_image *stImage; GLenum internalFormat; @@ -124,7 +125,7 @@ st_bind_surface(struct gl_context *ctx, GLenum target, /* FIXME create a non-default sampler view from the pipe_surface? */ pipe_resource_reference(&stObj->pt, ps->texture); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); pipe_resource_reference(&stImage->pt, stObj->pt); stObj->width0 = ps->width; diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c index dfa188a..a8dbb78 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_texture.c +++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c @@ -152,10 +152,11 @@ static void st_DeleteTextureObject(struct gl_context *ctx, struct gl_texture_object *texObj) { + struct st_context *st = st_context(ctx); struct st_texture_object *stObj = st_texture_object(texObj); pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); st_texture_free_sampler_views(stObj); _mesa_delete_texture_object(ctx, texObj); } @@ -512,7 +513,7 @@ st_AllocTextureImageBuffer(struct gl_context *ctx, /* The parent texture object does not have space for this image */ pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); if (!guess_and_alloc_texture(st, stObj, stImage)) { /* Probably out of memory. @@ -1571,13 +1572,13 @@ st_finalize_texture(struct gl_context *ctx, if (!st_obj) { pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); return GL_TRUE; } if (st_obj->buffer != stObj->pt) { pipe_resource_reference(&stObj->pt, st_obj->buffer); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); stObj->width0 = stObj->pt->width0 / _mesa_get_format_bytes(tObj->_BufferObjectFormat); stObj->height0 = 1; stObj->depth0 = 1; @@ -1598,7 +1599,7 @@ st_finalize_texture(struct gl_context *ctx, firstImage->pt != stObj->pt && (!stObj->pt || firstImage->pt->last_level >= stObj->pt->last_level)) { pipe_resource_reference(&stObj->pt, firstImage->pt); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); } /* If this texture comes from a window system, there is nothing else to do. */ @@ -1646,7 +1647,7 @@ st_finalize_texture(struct gl_context *ctx, * gallium texture now. We'll make a new one below. */ pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); st->dirty.st |= ST_NEW_FRAMEBUFFER; } } diff --git a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c index 18cf504..26e1c21 100644 --- a/mesalib/src/mesa/state_tracker/st_gen_mipmap.c +++ b/mesalib/src/mesa/state_tracker/st_gen_mipmap.c @@ -124,7 +124,7 @@ st_generate_mipmap(struct gl_context *ctx, GLenum target, /* release the old tex (will likely be freed too) */ pipe_resource_reference(&oldTex, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); } else { /* Make sure that the base texture image data is present in the diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c index 5996b7d..ada9841 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.c +++ b/mesalib/src/mesa/state_tracker/st_texture.c @@ -519,12 +519,14 @@ st_texture_release_sampler_view(struct st_context *st, } void -st_texture_release_all_sampler_views(struct st_texture_object *stObj) +st_texture_release_all_sampler_views(struct st_context *st, + struct st_texture_object *stObj) { GLuint i; + /* XXX This should use sampler_views[i]->pipe, not st->pipe */ for (i = 0; i < stObj->num_sampler_views; ++i) - pipe_sampler_view_reference(&stObj->sampler_views[i], NULL); + pipe_sampler_view_release(st->pipe, &stObj->sampler_views[i]); } diff --git a/mesalib/src/mesa/state_tracker/st_texture.h b/mesalib/src/mesa/state_tracker/st_texture.h index ce1cf8b..d66afcb 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.h +++ b/mesalib/src/mesa/state_tracker/st_texture.h @@ -255,7 +255,8 @@ st_texture_release_sampler_view(struct st_context *st, struct st_texture_object *stObj); extern void -st_texture_release_all_sampler_views(struct st_texture_object *stObj); +st_texture_release_all_sampler_views(struct st_context *st, + struct st_texture_object *stObj); void st_texture_free_sampler_views(struct st_texture_object *stObj); diff --git a/mesalib/src/mesa/state_tracker/st_vdpau.c b/mesalib/src/mesa/state_tracker/st_vdpau.c index 8c10cda..6ccaf3e 100644 --- a/mesalib/src/mesa/state_tracker/st_vdpau.c +++ b/mesalib/src/mesa/state_tracker/st_vdpau.c @@ -139,7 +139,7 @@ st_vdpau_map_surface(struct gl_context *ctx, GLenum target, GLenum access, texFormat); pipe_resource_reference(&stObj->pt, res); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); pipe_resource_reference(&stImage->pt, res); u_sampler_view_default_template(&templ, res, res->format); @@ -172,7 +172,7 @@ st_vdpau_unmap_surface(struct gl_context *ctx, GLenum target, GLenum access, struct st_texture_image *stImage = st_texture_image(texImage); pipe_resource_reference(&stObj->pt, NULL); - st_texture_release_all_sampler_views(stObj); + st_texture_release_all_sampler_views(st, stObj); pipe_resource_reference(&stImage->pt, NULL); _mesa_dirty_texobj(ctx, texObj); diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index 2871100..5f8250e 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -997,7 +997,7 @@ void vbo_use_buffer_objects(struct gl_context *ctx) /* Allocate a real buffer object now */ _mesa_reference_buffer_object(ctx, &exec->vtx.bufferobj, NULL); - exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName, target); + exec->vtx.bufferobj = ctx->Driver.NewBufferObject(ctx, bufName); if (!ctx->Driver.BufferData(ctx, target, size, NULL, usage, GL_MAP_WRITE_BIT | GL_DYNAMIC_STORAGE_BIT | diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c index 1c6b919..848eeda 100644 --- a/mesalib/src/mesa/vbo/vbo_save_api.c +++ b/mesalib/src/mesa/vbo/vbo_save_api.c @@ -191,9 +191,7 @@ alloc_vertex_store(struct gl_context *ctx) * user. Perhaps there could be a special number for internal * buffers: */ - vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx, - VBO_BUF_ID, - GL_ARRAY_BUFFER_ARB); + vertex_store->bufferobj = ctx->Driver.NewBufferObject(ctx, VBO_BUF_ID); if (vertex_store->bufferobj) { save->out_of_memory = !ctx->Driver.BufferData(ctx, -- Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
54
Older →

Jump to page: