summaryrefslogtreecommitdiff
path: root/src/glx/glxcmds.c
AgeCommit message (Collapse)Author
2011-02-26glx: Don't do the implicit glFlush in SwapBuffers if it's the wrong drawable.Eric Anholt
The GLX Spec says you only implicitly glFlush if the drawable being swapped is the current context's drawable.
2011-02-11glx: Put null check before usenobled
'dpy' was being checked for null *after* it was already used once. Also add a null check for psc, and drop gc's redundant initialization.
2011-01-20glapi: Fix OpenGL and OpenGL ES interop.Chia-I Wu
When --enable-shared-glapi is specified, libGL will share libglapi with OpenGL ES instead of defining its own copy of glapi. This makes sure an app will get only one copy of glapi in its address space. The new option is disabled by default. When enabled, libGL and libglapi must be built from the same source tree and distributed together. This requirement comes from the fact that the dispatch offsets used by these libraries are re-assigned whenever GLAPI XMLs are changed. For GLX, indirect rendering for has_different_protocol() functions is tricky. A has_different_protocol() function is assigned only one dispatch offset, yet each entry point needs a different protocol opcode. It cannot be supported by the shared glapi. The fix to this is to make glXGetProcAddress handle such functions specially before calling _glapi_get_proc_address. Note that these files are automatically generated/re-generated src/glx/indirect.c src/glx/indirect.h src/mapi/glapi/glapi_mapi_tmp.h
2010-09-08glx: Drop broken drawable garbage collectionKristian Høgsberg
Doesn't work for pixmaps, was looking up the GLX XID and was never thread safe. Instead, just destroy the client side structures when the drawable is no long current for a context.
2010-09-07glx: Set an all NULL vtable for dummyContextKristian Høgsberg
This reverts 6a6e6d7b0a84e20f9754af02a575ae34081d310c and initializes dummyContext with an all NULL vtable. The context vtable pointer is supposed to always be non-NULL, but the vtable entries can be NULL.
2010-09-07glx: Fix compilation with out xf86vidmodeKristian Høgsberg
2010-09-07Fix crashes when some GLX API entrypoints are called with no current context.Michel Dänzer
I was hitting this with gliv. The GLX spec explicitly mentions that glXWaitX, glXWaitGL and glXUseXFont calls are ignored when there's no current context. Not sure what if anything the GLX_EXT_texture_from_pixmap spec says about this, but I think ignoring the calls makes more sense than crashing there as well. :)
2010-09-07Make XF86VIDMODE extension optionalJon TURNEY
Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded. Also use that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the XF86VIDMODE extension is found by pkgconfig. This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to be mandatory, but is now optional. Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the complier when glxcmds.c is compiled, so are not affected by this change Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2010-09-07Some fixes for GLX_INDIRECT_RENDERING only buildJon TURNEY
This fixes some of the build issues with GLX_INDIRECT_RENDERING but !GLX_DIRECT_RENDERING due to recent changes. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-07-29glx: Fix copy/paste bug in glXWaitX and glXWaitGLKristian Høgsberg
https://bugs.freedesktop.org/show_bug.cgi?id=29304
2010-07-28glx: Split indirect and applegl implementations into different filesKristian Høgsberg
2010-07-28glx: Move bind and unbind to context vtableKristian Høgsberg
2010-07-28glx: Rename __GLXcontext and __GLXdisplayPrivate to struct types.Kristian Høgsberg
2010-07-28glx: Rename __GLXscreenConfigs to struct glx_screenKristian Høgsberg
Because double underscores in private type names is painful.
2010-07-28glx: Use _X_EXPORT instead of our own PUBLIC macroKristian Høgsberg
We're an X client library, so we can use Xfuncproto.h.
2010-07-28glx: Rename glcontextmodes.[ch] to glxconfig.[ch]Kristian Høgsberg
2010-07-28glx: Rename __GLcontextModes to struct glx_configKristian Høgsberg
With this rename, we use 'config' consitently to refer to GLX configurations instead of the modes/configs/visual mess before.
2010-07-26glx: Drop debug fprintf that snug in with the previous commitKristian Høgsberg
2010-07-26glx: Enable copy subbuffer patch when GLX_DIRECT_RENDERING is #definedKristian Høgsberg
Depending on __DRI_COPY_SUB_BUFFER doesn't work when we no longer include dri_interface.h. https://bugs.freedesktop.org/show_bug.cgi?id=29264
2010-07-23glx: Don't destroy context with XID 0Kristian Høgsberg
We use XID 0 to indicate the context has already been destroyed, but it's currently bound.
2010-07-23glx: Refactor and simplify context creationKristian Høgsberg
This lets us better separate context creation between the different backends.
2010-07-23glx: Move context destroy to context vtableKristian Høgsberg
2010-07-22glx: Drop screen argument to GetGLXDRIDrawableKristian Høgsberg
We'll just get it from the returned drawable when we need it.
2010-07-22glx: Move WaitGL, WaitX, UseXFont to context vtable functionsKristian Høgsberg
2010-07-22glx: Allocate the __GLXcontext in the DRI driversKristian Høgsberg
2010-07-21glx: Move last few dri_interface.h types out of glxclient.h and drop includeKristian Høgsberg
2010-07-19glx: Move drawHash to display privateKristian Høgsberg
The XIDs are display wide so the natural location of the hash is here. This way we don't have to lookup in each of the screen hashes.
2010-07-19glx: Move __DRIdrawable pointers to DRI drawable privatesKristian Høgsberg
2010-07-19glx: Remove support for MESA_swap_frame_usageKristian Høgsberg
The extension never worked, the implementation returns GLX_BAD_CONTEXT when enabling the frame tracking.
2010-07-19glx: Move DRI1 specific extensions and code to DRI1 screen privateKristian Høgsberg
2010-07-19glx: Drop support for GLX_MESA_allocate_memoryKristian Høgsberg
Only r200 implemented it.
2010-07-19glx: Add screen privates for dri drivers and moved some fields thereKristian Høgsberg
GLXscreenConfigs is badly named and a dumping ground for a lot of stuff. This patch creates private screen structs for the dri drivers and moves some of their fields over there.
2010-05-21glx: Split tfp functions out to context vtableKristian Høgsberg
This introduces a new per-context vtable, which lets us clean up all the #ifdef's a bit and move the DRI2 specific implementation into dri2_glx.c.
2010-05-07glx: Get GLX_SCREEN first in __glXQueryContextInfo()Kristian Høgsberg
And lookup the GLX screen for the context. Otherwise we'll end up jumping through a NULL-pointer once we try to look up the visual or config for the shared context. https://bugs.freedesktop.org/show_bug.cgi?id=14245
2010-05-05darwin: Fix buildJeremy Huddleston
This is a regression from e42d84eaba228d4d96a46d116c6ca24581e29439 https://bugs.freedesktop.org/show_bug.cgi?id=27929 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 4d63be67f320839d115987211d0d9b4297f6d17d)
2010-04-28glx: Fix buildJakob Bornecrantz
2010-04-28Merge branch '7.8'Brian Paul
Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
2010-04-27darwin: Use clientattribJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-27apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-27apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-09glx: Fix config chooser logic for 'mask' matchingKristian Høgsberg
When matching attributes using the 'mask' matching criteria, the spec says that "Only GLXFBConfigs for which the set bits of attribute include all the bits that are set in the requested value are considered. (Additional bits might be set in the attribute)." The current test returns true if the two bit masks have bits in common, specifically it matches even if the requested value has bits set that are not set in the fbconfig attribute. For example, an application asking for GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT | GLX_PBUFFER_BIT, as glxpbdemo does, will match fbconfigs that don't support pbuffer rendering, as long as they support pixmap rendering. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2010-04-09glx: Fix config chooser logic for 'mask' matchingKristian Høgsberg
When matching attributes using the 'mask' matching criteria, the spec says that "Only GLXFBConfigs for which the set bits of attribute include all the bits that are set in the requested value are considered. (Additional bits might be set in the attribute)." The current test returns true if the two bit masks have bits in common, specifically it matches even if the requested value has bits set that are not set in the fbconfig attribute. For example, an application asking for GLX_DRAWABLE_TYPE, GLX_PIXMAP_BIT | GLX_PBUFFER_BIT, as glxpbdemo does, will match fbconfigs that don't support pbuffer rendering, as long as they support pixmap rendering. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2010-04-04Merge branch '7.8'Ian Romanick
2010-04-02glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.Vinson Lee
Add ifdef guards around variables of types defined only for GLX_DIRECT_RENDERING.
2010-04-01Revert accidental commits from the xquartz treeJeremy Huddleston
This reverts commit 9aadc793f3db64cefa0b08f18abad424a659dacc. This reverts commit 69ea4e7718efb60b6b0d795a355cebd6712ceac1. This reverts commit dbe8b013936d977ec63d6607bfd2fc6772d29787. This reverts commit 23215ef4d60a86d9f3b3fdc08e3fdadc59e98890. This reverts commit 9495e3703062d1ddaf3161f4efc23f0b51284d9b. This reverts commit 0594cf70883b64692ba617d85f4f9b4e636e5c2b. This reverts commit 86a7978d37393ee34f876569ac06ffdb8d7289ae. This reverts commit 437902ce978cde9a0e1aa260f12dc232a8501c42.
2010-04-01apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.Vinson Lee
driContext field for __GLXcontextRec struct is only defined if GLX_DIRECT_RENDERING is set.
2010-03-22GLX/OML: honor OML semantics even if target, divisor and remainder are 0Jesse Barnes
This change passes a remainder of 1 to the server with the DRI2SwapBuffers request, causing it to honor the OML semantics for the swap rather than falling through to glXSwapBuffers behavior. The remainder actually ends up ignored since the divisor is 0, but we need to differentiate the OML and standard behavior somehow. Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
2010-03-05GLX: remove debug prints from glXWaitForMscOML dispatchJesse Barnes
Leftover from earlier commit.