summaryrefslogtreecommitdiffstats
path: root/src/glx
Commit message (Collapse)AuthorAgeFilesLines
* 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 <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
| * apple: Integrate our libGL into the existing build system betterJeremy Huddleston2010-04-013-74/+113
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston2010-04-0116-121/+106
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Remove duplicate headers that already exist in mesa.Jeremy Huddleston2010-04-017-20231/+0
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-0170-38/+71587
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * glx: Fix compilation errors on non-GLX_DIRECT_RENDERING builds.Vinson Lee2010-04-011-3/+22
| | | | | | | | | | driContext field for __GLXcontextRec struct is only defined if GLX_DIRECT_RENDERING is set.
* | Merge branch '7.8'Michel Dänzer2010-03-301-0/+13
|\| | | | | | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h Resolved by keeping version strings from master (also in the intel driver).
| * glx/dri2: Fix debug build with old dri2proto.Michel Dänzer2010-03-301-0/+13
| | | | | | | | | | Apparently the higher compiler optimization level in non-debug builds was eliminating the unused functions referencing the unresolved DRI2 symbols...
| * glx: Suppress BadDrawable from DRI2CopyRegionKristian Høgsberg2010-03-221-1/+14
| | | | | | | | | | | | | | | | | | | | 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.
| * glx: Move initialization of ext_list_first_time to where it's storage is ↵Brian Paul2010-03-054-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit 96ab4d2b84178209ee59017458d9964b32b7e183)
* | drisw: probably better hack for stride and some commentsGeorge Sapountzis2010-03-281-59/+30
| |
* | drisw: update commentGeorge Sapountzis2010-03-271-9/+15
| |
* | drisw: add comment to libGL about strideGeorge Sapountzis2010-03-271-1/+9
| |
* | drisw: make stride issue profoundGeorge Sapountzis2010-03-271-31/+61
| |
* | glx: try swrastg_dri, if swrast_dri failsGeorge Sapountzis2010-03-271-2/+15
| | | | | | | | | | 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.
* | glx: Suppress BadDrawable from DRI2CopyRegionKristian Høgsberg2010-03-221-1/+14
| | | | | | | | | | | | | | | | | | | | 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.
* | GLX/OML: honor OML semantics even if target, divisor and remainder are 0Jesse Barnes2010-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
* | glx: minor cosmeticGeorge Sapountzis2010-03-211-5/+8
| |
* | glx: swapBuffers prototype has changedGeorge Sapountzis2010-03-211-2/+9
| |
* | glx/single2.c: Don't call __builtin_expect on non-gnu compilersAlan Coopersmith2010-03-121-0/+3
| | | | | | | | Signed-off-by: Alan Coopersmith <[email protected]>
* | glx: Move initialization of ext_list_first_time to where it's storage is ↵Jon TURNEY2010-03-054-9/+3
|/ | | | | | | | | | | | | | | | | | | | | | 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 <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* DRI2: expose OML_sync_control if possibleJesse Barnes2010-03-051-0/+3
| | | | | If the server supports the OML related protocol, enable support for the extension.
* GLX: remove debug prints from glXWaitForMscOML dispatchJesse Barnes2010-03-051-4/+0
| | | | Leftover from earlier commit.
* Fix unmatched parenthesis introduce by previous commitsIan Romanick2010-03-033-3/+3
| | | | | | | | 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 <[email protected]>
* Remove support for GCC older than 3.3.0 from generated sourcesIan Romanick2010-03-034-6/+6
| | | | Signed-off-by: Ian Romanick <[email protected]>
* Remove support for GCC older than 3.3.0Ian Romanick2010-03-034-4/+4
| | | | Signed-off-by: Ian Romanick <[email protected]>
* glx: replace assertion with conditionalBrian Paul2010-03-021-2/+2
| | | | See fd.o bug 26832.
* glx: Add assert to check input to memcpy.Vinson Lee2010-02-271-0/+1
|
* glx: fix incorrect array stack memory allocationMarkus Fleschutz2010-02-261-1/+2
| | | | | | | The array stack space wasn't allocated to the proper size. Fixes out of bounds memory writes when the client/array stack depth exceeds one. See fd.o bug 26768.
* glapi: Generated GLX sources should use glapidispatch.h.Chia-I Wu2010-02-251-1/+1
| | | | Fix glX_proto_recv.py and glX_proto_send.py, and regenerate the sources.
* glapi: GL_OES_EGL_image autogenerated filesKristian Høgsberg2010-02-241-2/+1
|
* glx: Fix some typos in pointer checking for OML_sync_control entry points.kleinerm2010-02-231-3/+3
| | | | | Signed-off-by: Mario Kleiner <[email protected]> Signed-off-by: Brian Paul <[email protected]>
* Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versionsKristian Høgsberg2010-02-192-33/+4
|
* Remove _mesa_memset in favor of plain memset.Kenneth Graunke2010-02-191-5/+2
| | | | This may break the SUNOS4 build, but it's no longer relevant.
* Merge commit '381d5e209815235911c4aab516037c868c8f695f'Ian Romanick2010-02-171-137/+143
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges the patches from the series "[PATCH 00/14] More client-side GLX house cleaning" that were posted to the mesa3d-dev mailing list. See http://marc.info/?l=mesa3d-dev&m=126582985214612&w=2 Patches 01 through 04 eliminate a bunch of annoying warnings that I get when building Mesa. Patch 05 fixes an inconsistency between the implementation of glXSwapIntervalMESA and the spec. I chose to favor the code over the spec in this case. This also eliminated a warning. Patches 06 through 12 clean up the way that context creation is performed on the client. When support for GLX_SGIX_fbconfig and the related GLX 1.3 functions was added, I refactored a bunch nuts-and-bolts of context creation to CreateContext. The refactor was a good idea, I just didn't do it right. Patches 13 and 14 update glxgears_fbconfig to use GLX 1.3 interfaces.
| * glx: Pass fbconfig ID or visual ID to CreateContextIan Romanick2010-02-111-10/+10
| | | | | | | | | | | | Pass either the fbconfig ID or the visual ID, as appropriate, to CreateContext. Now CreateContext does not derefernce fbconfig or vis (which no longer exists as a parameter).
| * glx: Use the screen parameter everywhere instead of vis->screen, etc.Ian Romanick2010-02-111-5/+3
| |
| * glx: Move work of converting a visual to an fbconfigIan Romanick2010-02-111-31/+29
| | | | | | | | | | | | | | For the direct rendering case, the DRI createContext function wants an fbconfig. When glXCreateContext is called, we have to convert the visual to an fbconfig. This work was done in CreateContext, but it makes more sense for it to be done in glXCreateContext.
| * glx: Re-indent CreateContext after the previous commitIan Romanick2010-02-111-96/+95
| |