summaryrefslogtreecommitdiffstats
path: root/src/glx
Commit message (Collapse)AuthorAgeFilesLines
* glx: fix indentation and remove extraneous breakBrian Paul2010-06-021-2/+1
|
* glx: reformat and silence unused expression warningBrian Paul2010-06-021-1/+2
|
* glx: Invalidate drawable in glXBindTexImageEXT() if we don't get eventsKristian Høgsberg2010-05-211-0/+9
| | | | | When we don't get invalidate events, we need to invalidate a drawable before using it for tfp to make sure we have uptodate buffers.
* glx: Split tfp functions out to context vtableKristian Høgsberg2010-05-214-40/+99
| | | | | 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.
* dri2_glx: Put the invalidate b/c code back inKristian Høgsberg2010-05-181-6/+13
| | | | | | | | | | The backwards compatibility code calls the DRI driver invalidate hook on swap buffer and flush front buffer. This lets the DRI driver rely on invalidate callbacks and drop the glViewport() hack, even if the server doesn't send invalidate events. This is essentially a revert of 2d00d16da7f5d2255cb37b48edaf4cbb9ca7e930, except that we now also pass the __DRI_USE_INVALIDATE extension even when the server doesn't have DRI2 invalidate events.
* dri2_glx: Terminate loader extension list outside #ifdefKristian Høgsberg2010-05-181-1/+1
|
* glx: Provide the __DRI_USE_INVALIDATE extension to the driver when we canKristian Høgsberg2010-05-111-14/+25
| | | | | | | When we have DRI2 protocol at least 2.3, we get an event from the server when the back buffers get invalidated. When that's the case let the driver know that it can rely on invalidate instead of the glViewport polling.
* glx: Only call DRI2 invalidate when necessaryKristian Høgsberg2010-05-101-12/+4
| | | | | | | | | We only need this when the server may have swapped the buffers or when we receive an invalidate event from the server. The default behaviour is still that the DRI driver will invalidate its own buffers when glViewport is called. https://bugs.freedesktop.org/show_bug.cgi?id=27277
* glx: Get GLX_SCREEN first in __glXQueryContextInfo()Kristian Høgsberg2010-05-071-3/+10
| | | | | | | | 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
* apple: Move glapi to mapi.Vinson Lee2010-05-061-1/+2
| | | | | This was missed in commit 296adbd545b8efd38c9ed508166b2de2764a444b. Fixes darwin build.
* glapi: Move to src/mapi/.Chia-I Wu2010-05-071-3/+4
| | | | Move glapi to src/mapi/{glapi,es1api,es2api}.
* darwin: Fix buildJeremy Huddleston2010-05-051-4/+4
| | | | | | | | | 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)
* glx: fix regression with GLX_USE_GLDave Airlie2010-05-031-0/+3
| | | | update for fbconfig_style_tags
* glx: Fix buildJakob Bornecrantz2010-04-281-1/+1
|
* Merge branch '7.8'Brian Paul2010-04-2868-94/+53469
|\ | | | | | | | | | | | | Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
| * glx: Initialize have_back.Pierre Willenbrok2010-04-271-0/+1
| | | | | | | | Signed-off-by: Brian Paul <brianp@vmware.com>
| * Buildfixes to work around issues in OpenGL.frameworkJeremy Huddleston2010-04-2711-135/+60
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * Update OpenGL specsJeremy Huddleston2010-04-2710-274/+2522
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * apple: Use mesa gl.h rather than generating one.Jeremy Huddleston2010-04-277-181/+48
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
| * apple: Integrate our libGL into the existing build system betterJeremy Huddleston2010-04-272-74/+111
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * darwin: Use clientattribJeremy Huddleston2010-04-273-3/+3
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston2010-04-2717-120/+108
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| * apple: Remove duplicate headers that already exist in mesa.Jeremy Huddleston2010-04-277-20231/+0
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
| * apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-2770-40/+71580
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
* | Initialize have_back.Pierre Willenbrock2010-04-271-0/+1
| | | | | | | | | | | | There is a user somewhere that tests it before its initial set. Signed-off-by: Eric Anholt <eric@anholt.net>
* | Merge branch '7.8'Ian Romanick2010-04-231-0/+2
|\ \ | |/
| * Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig ↵Aaron Plattner2010-04-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tags. __glXInitializeVisualConfigFromTags doesn't skip the payload of unrecognized tags. Instead, it treats the value as if it were the next tag, which can happen if the server's GLX extension is not Mesa's. For example, this falls down when NVIDIA sends a GLX_FLOAT_COMPONENTS_NV = 0 pair, causing __glXInitializeVisualConfigFromTags to bail out early. Signed-off-by: Aaron Plattner <aplattner@nvidia.com> Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
* | Merge branch '7.8'Michel Dänzer2010-04-231-0/+2
|\ \ | |/
| * glx/dri2: Fix build with dri2proto which doesn't define X_DRI2SwapInterval.Michel Dänzer2010-04-231-0/+2
| |
* | DRI2/GLX: check for vblank_mode in DRI2 GLX codeJesse Barnes2010-04-221-2/+39
| | | | | | | | | | Re-add support for the vblank_mode environment and configuration variable. Useful for benchmarking and app control.
* | DRI2: add config query extensionJesse Barnes2010-04-222-0/+9
| | | | | | | | | | Add a new DRI2 configuration query extension. Allows for DRI2 client code to query for common DRI2 configuration options.
* | Merge branch '7.8'Jesse Barnes2010-04-191-1/+7
|\ \ | |/
| * DRI2: check for swapAvailable before using swap interval protocolJesse Barnes2010-04-191-1/+7
| | | | | | | | This should have been part of the last change...
* | Merge branch '7.8'Jesse Barnes2010-04-191-1/+6
|\ \ | |/
| * DRI2: synchronize swap interval with server at startup timeJesse Barnes2010-04-191-1/+6
| | | | | | | | | | | | | | In the direct rendered case, we need to tell the server our initial swap interval. If we don't, the local and server values will be out of sync, since the server and client defaults may be different (as they were before this patch).
| * Initialize DRI2 swap interval to 0Michael Schmidt2010-04-141-0/+1
| | | | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=27628
* | Initialize DRI2 swap interval to 0Michael Schmidt2010-04-141-0/+1
| | | | | | | | https://bugs.freedesktop.org/show_bug.cgi?id=27628
* | Merge branch '7.8'Jesse Barnes2010-04-131-2/+1
|\ \ | |/
| * DRI2: report swap events correctly in direct rendered caseJesse Barnes2010-04-131-2/+1
| | | | | | | | | | | | | | In the direct rendered case, we need to convert DRI2 swap complete events to GLX events for the client to consume. This path had what looks like a stray "& 0x75" from some earlier debugging that prevented clients from seeing the right event code.
| * glx: Fix config chooser logic for 'mask' matchingKristian Høgsberg2010-04-091-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | glx: Support direct rendering pbuffersKristian Høgsberg2010-04-091-103/+123
| | | | | | | | | | | | | | | | We've supported indirect rendering pbuffers for a while, but not direct rendering pbuffers. The way we do this is by creating a hidden pixmap and wrap that in a GLX pbuffer. This only works when we have DRI2 on the server, but if the server doesn't have DRI2, it won't expose configs with pbuffer bits enabled.
* | glx: Fix config chooser logic for 'mask' matchingKristian Høgsberg2010-04-091-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '7.8'Ian Romanick2010-04-042-2/+2
|\ \ | |/
| * Update to final names from GLX_INTEL_swap_event specIan Romanick2010-04-042-2/+2
| | | | | | | | Fixes bug #27454.
* | Merge branch '7.8'Ian Romanick2010-04-042-5/+61
|\ \ | |/
| * glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.Vinson Lee2010-04-021-2/+39
| | | | | | | | | | Add ifdef guards around variables of types defined only for GLX_DIRECT_RENDERING.
| * GLX/DRI2: pass GLX drawable ID to dri2InvalidateBuffersJesse Barnes2010-04-011-2/+2
| | | | | | | | | | | | | | | | The IDs will be the same in the case where an X window is used directly as a GLX drawable, but will fail if a new GLX drawable is created explicitly, as with glxgears_fbconfig. Fixes fdo bug #27190.
| * Revert accidental commits from the xquartz treeJeremy Huddleston2010-04-0170-51303/+94
| | | | | | | | | | | | | | | | | | | | | | 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.
| * apple: Use mesa gl.h rather than generating one.Jeremy Huddleston2010-04-017-181/+48
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
| * apple: Integrate our libGL into the existing build system betterJeremy Huddleston2010-04-013-74/+113
| | | | | | | | Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>