summaryrefslogtreecommitdiff
path: root/src/glx/x11
AgeCommit message (Collapse)Author
2010-01-13DRI2: don't send DRI2 requests the server doesn't know aboutJesse Barnes
At init time, NULL out the hooks that send the server new requests. DRI2 never supported these extensions, so this preserves old behavior on old servers with new Mesa.
2010-01-13GLX/DRI2: pass X drawable ID insteadJesse Barnes
These happened to be the same in my testing since I was using apps that depend on the GLX 1.2 behavior where X and GLX drawables are interchangeable.
2010-01-11Merge branch 'master' of ssh://people.freedesktop.org/~jbarnes/mesaJesse Barnes
Conflicts due to DRI1 removal: src/mesa/drivers/dri/intel/intel_context.c src/mesa/drivers/dri/intel/intel_screen.c
2010-01-08DRI2/GLX: add INTEL_swap_event supportJesse Barnes
Add event support for the GLX swap buffers event, along with DRI2 protocol support for generating GLX swap buffers events in the direct rendered case. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-08DRI2: add SwapInterval supportJesse Barnes
Add support for the DRI2SwapInterval protocol request. This allows direct rendered clients to control their swap interval per the SGI_swap_control extension. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-08DRI2: add OML_sync_control supportJesse Barnes
Add OML_sync_control support, along with a simple program for testing it. This means adding support for the DRI2GetMSC, DRI2WaitMSC and DRI2WaitSBC requests. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-08DRI2: add SwapBuffers supportJesse Barnes
Support the new DRI2 protocol request, DRI2SwapBuffers, in both direct and indirect rendering context. This request allows the display server to optimize back->front swaps (e.g. through page flipping) and allows us to more easily support other GLX features like swap interval and the OML sync extension in DRI2. Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-01-05Merge branch 'remove-intel-dri1'Kristian Høgsberg
* remove-intel-dri1: intel: intelScreenContext() is no longer used intel: Remove remaining dri2.enabled tests intel: Drop more cliprect bookkeeping intel: Remove struct intel_framebuffer intel: Remove client-side vblank code intel: Drop intelWindowMoved() intel: Drop batchbuffer cliprect_mode tracking intel: Drop DRI1 static regions intel: Use depth buffer from ctx.DrawBuffer in copypix_src_region() intel: Drop LOCK/UNLOCK_HARDWARE() intel: Drop DRI1 SwapBuffer implementation intel: Drop DRI1 CopySubBuffer implementation intel: Drop DRI1 support Push __driDriverExtensions out of dri_util.c and into the drivers Remove leftover __DRI{screen,drawable,context}Private references Check for libdrm_$chipset.pc when needed
2010-01-04Remove leftover __DRI{screen,drawable,context}Private referencesKristian Høgsberg
As part of the DRI driver interface rewrite I merged __DRIscreenPrivate and __DRIscreen, and likewise for __DRIdrawablePrivate and __DRIcontextPrivate. I left typedefs in place though, to avoid renaming all the *Private use internal to the driver. That was probably a mistake, and it turns out a one-line find+sed combo can do the mass rename. Better late than never.
2010-01-03apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSXJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-01-03glxcmds: Fix comment about __DRI_ALLOCATEJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-27Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
2009-12-23glx: Add XF86DRI[Open|Close]FullScreen prototypes to xf86dri.h.Vinson Lee
2009-12-23glx: Move declaration outside for loop.Vinson Lee
2009-12-22glx: Compile dri2.c only if GLX_DIRECT_RENDERING is defined.Vinson Lee
2009-12-06glx: Prevent potential null pointer deference in driCreateContext.Vinson Lee
(cherry picked from commit 4b0b250aae6ae7d48cd24f9d91d05ab58086c4b2)
2009-11-06GLX: Change GLX client vendor string to "Mesa Project and SGI"Ian Romanick
This change allows a certain closed-source browser plug-in to work with open-source drivers.
2009-11-02glx: Fix memory leak if XF86DRICreateDrawable() failsVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com>
2009-10-22glx: don't destroy context immediately if it's currently boundBrian Paul
According to the GLXDestroyContext() man page, the context should not immediately be destroyed if it's bound to some thread. Wait until it's unbound to really delete it. The code for doing the later part is already present in MakeContextCurrent() so no change was needed there.
2009-09-30glx: fix glXQueryContext(GLX_RENDER_TYPE)Brian Paul
The renderType parameter to CreateContext() was never used. Also, it was often passed as zero. Now when it's zero we check if the context is RGBA or CI mode and set it accordingly. Fixes bug 24211.
2009-09-29glx: indentation fixesBrian Paul
2009-09-28Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
2009-09-28Fix build on non GLIBC platforms (FreeBSD at least)Robert Noland
Build was broken by commit 9666529b5a5be1fcde82caadc2fe2efa5ea81e49 I'm not certain that this is entirely the correct fix since the demo from bug #23774 seemed to work before the commit that broke the build. Signed-off-by: Robert Noland <rnoland@2hip.net> Signed-off-by: Brian Paul <brianp@vmware.com>
2009-09-22Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul
Conflicts: src/mesa/main/bufferobj.c
2009-09-22glx: include string.h to silence missing memset() prototype warningBrian Paul
2009-09-21GLX: Warn only once about applications calling GLX 1.3 functionsTormod Volden
The warnings introduced in 1f309c40b8065b8729fce631540c66e4b50b84df would pour out generously from some applications. This patch adds a "warn once" wrapper macro, heavily inspired by src/mesa/drivers/dri/r600/radeon_debug.h Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2009-09-20Merge branch 'mesa_7_5_branch' into mesa_7_6_branchNicolai Hähnle
2009-09-16glx: Use initstate_r / random_r instead of corrupting global random number stateIan Romanick
Previously srandom and random were used. This cause the global random number generator state to be modified. This caused problems for applications that called srandom before calling into GLX. By using local state the global state is left unmodified. This should fix bug #23774.
2009-09-15Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branchIan Romanick
2009-09-15GLX: Complain when buggy applications call GLX 1.3 functions.Ian Romanick
2009-08-30Merge branch 'mesa_7_5_branch'Michel Dänzer
Conflicts: src/glx/x11/glxcmds.c
2009-08-30glx/x11: Fix glXCreateGLXPixmap for direct rendering.Michel Dänzer
Fixes progs/xdemos/glxpixmap modified to use direct rendering.
2009-08-22glx/dri2: Always use X drawable ID for DRI2 protocol.Michel Dänzer
Fixes protocol errors in cases where the GLX ID is different.
2009-08-21glx: initialize some local vars to silence warnings with -O3Brian Paul
2009-08-13glx: indent -br -i3 -npcs --no-tabsRALOVICH, Kristóf
Some manual intervention applied since XEXT_* and other macro magic fooled indent. Auto generated files were also skipped.
2009-08-11glx: fix signedness warningRALOVICH, Kristóf
2009-08-11mesa/glapi: regenerated files from gl_API.xmlBrian Paul
2009-07-30Merge branch 'mesa_7_5_branch'Brian Paul
2009-07-28glx: assign per screen driver configs (DRISW)RALOVICH, Kristóf
2009-07-28glx: assign per screen driver configs (DRI)RALOVICH, Kristóf
2009-07-28glx: assign per screen driver configs (DRI2)RALOVICH, Kristóf
2009-07-28glx: properly release DRI configsRALOVICH, Kristóf
Release per screen DRI driver configs during screen destruction.
2009-07-28glx: cache DRI configs in __GLXscreenConfigsRecRALOVICH, Kristóf
2009-07-27glx: remove XTHREADS supportRALOVICH, Kristóf
2009-11-23glx: Prevent potential null pointer deference in driCreateContext.Vinson Lee
2009-11-17ARB_fbo: Enable extensions related to GL_ARB_framebuffer_object for GLXIan Romanick
2009-11-17ARB_fbo: Add missing GLX render opcode for glFramebufferTextureLayerEXTIan Romanick
Also regenerate the GLX protocol files from this change.
2009-11-17ARB_fbo: Regenerate files from previous commits.Ian Romanick
2009-07-07GLX/DRI1: Mark GLX visuals with depth != screen depth non-conformant.Michel Dänzer
Such visuals are subject to automatic compositing in the X server, so DRI1 can't render to them properly.
2009-07-04Merge branch 'mesa_7_5_branch'Jakob Bornecrantz