summaryrefslogtreecommitdiff
path: root/src/glx
AgeCommit message (Collapse)Author
2010-04-23Merge branch '7.8'Ian Romanick
2010-04-23Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig ↵Aaron Plattner
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>
2010-04-23Merge branch '7.8'Michel Dänzer
2010-04-23glx/dri2: Fix build with dri2proto which doesn't define X_DRI2SwapInterval.Michel Dänzer
2010-04-22DRI2/GLX: check for vblank_mode in DRI2 GLX codeJesse Barnes
Re-add support for the vblank_mode environment and configuration variable. Useful for benchmarking and app control.
2010-04-22DRI2: add config query extensionJesse Barnes
Add a new DRI2 configuration query extension. Allows for DRI2 client code to query for common DRI2 configuration options.
2010-04-19Merge branch '7.8'Jesse Barnes
2010-04-19DRI2: check for swapAvailable before using swap interval protocolJesse Barnes
This should have been part of the last change...
2010-04-19Merge branch '7.8'Jesse Barnes
2010-04-19DRI2: synchronize swap interval with server at startup timeJesse Barnes
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).
2010-04-14Initialize DRI2 swap interval to 0Michael Schmidt
https://bugs.freedesktop.org/show_bug.cgi?id=27628
2010-04-14Initialize DRI2 swap interval to 0Michael Schmidt
https://bugs.freedesktop.org/show_bug.cgi?id=27628
2010-04-13Merge branch '7.8'Jesse Barnes
2010-04-13DRI2: report swap events correctly in direct rendered caseJesse Barnes
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.
2010-04-09glx: Support direct rendering pbuffersKristian Høgsberg
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.
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-04Update to final names from GLX_INTEL_swap_event specIan Romanick
Fixes bug #27454.
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-01GLX/DRI2: pass GLX drawable ID to dri2InvalidateBuffersJesse Barnes
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.
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: Use mesa gl.h rather than generating one.Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2010-04-01apple: Integrate our libGL into the existing build system betterJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01apple: Remove duplicate headers that already exist in mesa.Jeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
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-30Merge branch '7.8'Michel Dänzer
Conflicts: Makefile src/mesa/main/version.h Resolved by keeping version strings from master (also in the intel driver).
2010-03-30glx/dri2: Fix debug build with old dri2proto.Michel Dänzer
Apparently the higher compiler optimization level in non-debug builds was eliminating the unused functions referencing the unresolved DRI2 symbols...
2010-03-28drisw: probably better hack for stride and some commentsGeorge Sapountzis
2010-03-27drisw: update commentGeorge Sapountzis
2010-03-27drisw: add comment to libGL about strideGeorge Sapountzis
2010-03-27drisw: make stride issue profoundGeorge Sapountzis
2010-03-27glx: try swrastg_dri, if swrast_dri failsGeorge Sapountzis
This needs a patch for xserver/glx also. An enviroment variable will be added at some point, it chould be for swrastg only or all gallium drivers.
2010-03-22glx: Suppress BadDrawable from DRI2CopyRegionKristian Høgsberg
This can happen when an X window is destroyed behind our back. We use DRI2CopyRegion behind the scenes in many places (like flushing the fake front to the real front) so we have to ignore X errors triggered in that case. The glean test cases trigger this consistently as they don't destroy the GLX drawable nicely, they just destroy the X window.
2010-03-22glx: Suppress BadDrawable from DRI2CopyRegionKristian Høgsberg
This can happen when an X window is destroyed behind our back. We use DRI2CopyRegion behind the scenes in many places (like flushing the fake front to the real front) so we have to ignore X errors triggered in that case. The glean test cases trigger this consistently as they don't destroy the GLX drawable nicely, they just destroy the X window.
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-21glx: minor cosmeticGeorge Sapountzis
2010-03-21glx: swapBuffers prototype has changedGeorge Sapountzis
2010-03-12glx/single2.c: Don't call __builtin_expect on non-gnu compilersAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-03-05glx: Move initialization of ext_list_first_time to where it's storage is ↵Brian Paul
allocated Move the initialization of ext_list_first_time from all of the DRI loader's CreateScreen routines, to where the storage for the screen config is allocated. It needs to get set in the screen-config even if DRI is forced off using LIBGL_ALWAYS_INDIRECT, so that psc->direct_support is initialized correctly, otherwise __glXExtensionBitIsEnabled() always returns FALSE Specifically, this causes a problem with an X server which advertises GLX<=1.2, and the GLX_SGIX_fbconfig extension. glXGetFBConfigFromVisualSGIX() uses __glXExtensionBitIsEnabled() to check if the GLX_SGIX_fbconfig extension is available, but that function won't return correct information because that data has never been initialized, because ext_list_first_time was never set... Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit 96ab4d2b84178209ee59017458d9964b32b7e183)
2010-03-05glx: Move initialization of ext_list_first_time to where it's storage is ↵Jon TURNEY
allocated Move the initialization of ext_list_first_time from all of the DRI loader's CreateScreen routines, to where the storage for the screen config is allocated. It needs to get set in the screen-config even if DRI is forced off using LIBGL_ALWAYS_INDIRECT, so that psc->direct_support is initialized correctly, otherwise __glXExtensionBitIsEnabled() always returns FALSE Specifically, this causes a problem with an X server which advertises GLX<=1.2, and the GLX_SGIX_fbconfig extension. glXGetFBConfigFromVisualSGIX() uses __glXExtensionBitIsEnabled() to check if the GLX_SGIX_fbconfig extension is available, but that function won't return correct information because that data has never been initialized, because ext_list_first_time was never set... Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
2010-03-05DRI2: expose OML_sync_control if possibleJesse Barnes
If the server supports the OML related protocol, enable support for the extension.
2010-03-05GLX: remove debug prints from glXWaitForMscOML dispatchJesse Barnes
Leftover from earlier commit.
2010-03-03Fix unmatched parenthesis introduce by previous commitsIan Romanick
I wasn't careful enough when removing support for GCC versions earlier than 3.3.0. I could have sworn that I compile tested before pushing, but apparently not. FAIL. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-03Remove support for GCC older than 3.3.0 from generated sourcesIan Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-03Remove support for GCC older than 3.3.0Ian Romanick
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-02glx: replace assertion with conditionalBrian Paul
See fd.o bug 26832.