summaryrefslogtreecommitdiff
path: root/src/glx/glxcmds.c
AgeCommit message (Collapse)Author
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.
2010-02-23glx: Fix some typos in pointer checking for OML_sync_control entry points.kleinerm
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de> Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-17Merge commit '381d5e209815235911c4aab516037c868c8f695f'Ian Romanick
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.
2010-02-16glx: Move GetGLXDRIDrawable() prototype to glxclient.hKristian Høgsberg
2010-02-11glx: Pass fbconfig ID or visual ID to CreateContextIan Romanick
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).
2010-02-11glx: Use the screen parameter everywhere instead of vis->screen, etc.Ian Romanick
2010-02-11glx: Move work of converting a visual to an fbconfigIan Romanick
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.
2010-02-11glx: Re-indent CreateContext after the previous commitIan Romanick
2010-02-11glx: Handle imported contexts outside of CreateContextIan Romanick
A long time ago I was a bit over-agressive in refactoring context creation into a single function. The creation code for glXImportContextEXT does not belong in CreateContext because it does not use any GLX protocol. The big if-statement for the import case routed around almost the entire function anyway.
2010-02-11glx: Pass screen number as parameter to CreateContextIan Romanick
Passing the screen parameter to CreateContext will simplify a couple of changes that are coming.
2010-02-11glx: Pass opcode to CreateContext instead of use_glx_1_3 parameterIan Romanick
Passing the opcode directly instead of having CreateContext infer it from the value of fbconfig and the use_glx_1_3 flag will simplify some changes that are coming.
2010-02-11glx: Fix interval test in glXSwapIntervalMESAIan Romanick
It appears that, in spite of what the spec says, the interval parameter to glXSwapIntervalMESA has been an unsigned int since day-1. This made the 'if (interval < 0)' test useless. The test is removed and the spec is updated to note that the interval is an unsigned value.
2010-02-11glx: Change type to eliminate 'comparison between signed and unsigned' warningIan Romanick
2010-02-11glx: Add casts to eliminate 'comparison between signed and unsigned' warningsIan Romanick
2010-02-11glx: Eliminate several 'unused variable' warnings in glxcmds.c.Ian Romanick
2010-02-11glx: Use wrapper macro to detect direct renderingIan Romanick
The wrapper macro GC_IS_DIRECT is used in CreateContext and a couple other places to eliminate the need for some of the '#ifdef GLX_DIRECT_RENDERING' madness. There appear to be a *LOT* of places in glxcmds.c where '#ifdef GLX_DIRECT_RENDERING' is missing.
2010-02-09Retire miniglx and move the actual glx code up to src/glxKristian Høgsberg