aboutsummaryrefslogtreecommitdiffstats
path: root/src/glx/glxcmds.c
Commit message (Collapse)AuthorAgeFilesLines
...
* glx: Use _X_EXPORT instead of our own PUBLIC macroKristian Høgsberg2010-07-281-39/+39
| | | | We're an X client library, so we can use Xfuncproto.h.
* glx: Rename glcontextmodes.[ch] to glxconfig.[ch]Kristian Høgsberg2010-07-281-1/+0
|
* glx: Rename __GLcontextModes to struct glx_configKristian Høgsberg2010-07-281-106/+99
| | | | | With this rename, we use 'config' consitently to refer to GLX configurations instead of the modes/configs/visual mess before.
* glx: Drop debug fprintf that snug in with the previous commitKristian Høgsberg2010-07-261-2/+0
|
* glx: Enable copy subbuffer patch when GLX_DIRECT_RENDERING is #definedKristian Høgsberg2010-07-261-1/+3
| | | | | | | 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
* glx: Don't destroy context with XID 0Kristian Høgsberg2010-07-231-1/+3
| | | | | We use XID 0 to indicate the context has already been destroyed, but it's currently bound.
* glx: Refactor and simplify context creationKristian Høgsberg2010-07-231-177/+150
| | | | | This lets us better separate context creation between the different backends.
* glx: Move context destroy to context vtableKristian Høgsberg2010-07-231-67/+37
|
* glx: Drop screen argument to GetGLXDRIDrawableKristian Høgsberg2010-07-221-33/+25
| | | | We'll just get it from the returned drawable when we need it.
* glx: Move WaitGL, WaitX, UseXFont to context vtable functionsKristian Høgsberg2010-07-221-82/+66
|
* glx: Allocate the __GLXcontext in the DRI driversKristian Høgsberg2010-07-221-51/+57
|
* glx: Move last few dri_interface.h types out of glxclient.h and drop includeKristian Høgsberg2010-07-211-6/+3
|
* glx: Move drawHash to display privateKristian Høgsberg2010-07-191-26/+16
| | | | | 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.
* glx: Move __DRIdrawable pointers to DRI drawable privatesKristian Høgsberg2010-07-191-1/+1
|
* glx: Remove support for MESA_swap_frame_usageKristian Høgsberg2010-07-191-107/+0
| | | | | The extension never worked, the implementation returns GLX_BAD_CONTEXT when enabling the frame tracking.
* glx: Move DRI1 specific extensions and code to DRI1 screen privateKristian Høgsberg2010-07-191-110/+3
|
* glx: Drop support for GLX_MESA_allocate_memoryKristian Høgsberg2010-07-191-71/+0
| | | | Only r200 implemented it.
* glx: Add screen privates for dri drivers and moved some fields thereKristian Høgsberg2010-07-191-11/+11
| | | | | | 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.
* glx: Split tfp functions out to context vtableKristian Høgsberg2010-05-211-40/+41
| | | | | 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.
* 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
* 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 <[email protected]> (cherry picked from commit 4d63be67f320839d115987211d0d9b4297f6d17d)
* glx: Fix buildJakob Bornecrantz2010-04-281-1/+1
|
* Merge branch '7.8'Brian Paul2010-04-281-28/+175
|\ | | | | | | | | | | | | Conflicts: src/glx/dri2_glx.c src/glx/glx_pbuffer.c
| * darwin: Use clientattribJeremy Huddleston2010-04-271-2/+0
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston2010-04-271-52/+45
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-271-14/+170
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * 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: 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-041-3/+59
|\|
| * 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.
| * Revert accidental commits from the xquartz treeJeremy Huddleston2010-04-011-184/+27
| | | | | | | | | | | | | | | | | | | | | | 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: Change ifdefs for DRI to be DRI && !APPLEJeremy Huddleston2010-04-011-55/+45
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
| * apple: Initial import of libGL for OSX from AppleSGLX svn repository.Jeremy Huddleston2010-04-011-14/+181
| | | | | | | | 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.
* | 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: remove debug prints from glXWaitForMscOML dispatchJesse Barnes2010-03-051-4/+0
| | | | Leftover from earlier commit.
* 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]>
* 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
| |
| * glx: Handle imported contexts outside of CreateContextIan Romanick2010-02-111-16/+10
| | | | | | | | | | | | | | | | 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.
| * glx: Pass screen number as parameter to CreateContextIan Romanick2010-02-111-7/+16
| | | | | | | | | | Passing the screen parameter to CreateContext will simplify a couple of changes that are coming.
| * glx: Pass opcode to CreateContext instead of use_glx_1_3 parameterIan Romanick2010-02-111-8/+23
| | | | | | | | | | | | 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.
| * glx: Fix interval test in glXSwapIntervalMESAIan Romanick2010-02-111-4/+0
| | | | | | | | | | | | | | | | 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.
| * glx: Change type to eliminate 'comparison between signed and unsigned' warningIan Romanick2010-02-111-1/+2
| |
| * glx: Add casts to eliminate 'comparison between signed and unsigned' warningsIan Romanick2010-02-111-7/+8
| |
| * glx: Eliminate several 'unused variable' warnings in glxcmds.c.Ian Romanick2010-02-111-0/+11
| |
| * glx: Use wrapper macro to detect direct renderingIan Romanick2010-02-111-24/+8
| | | | | | | | | | | | | | 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.