| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When --enable-shared-glapi is specified, libGL will share libglapi with
OpenGL ES instead of defining its own copy of glapi. This makes sure an
app will get only one copy of glapi in its address space.
The new option is disabled by default. When enabled, libGL and libglapi
must be built from the same source tree and distributed together. This
requirement comes from the fact that the dispatch offsets used by these
libraries are re-assigned whenever GLAPI XMLs are changed.
For GLX, indirect rendering for has_different_protocol() functions is
tricky. A has_different_protocol() function is assigned only one
dispatch offset, yet each entry point needs a different protocol opcode.
It cannot be supported by the shared glapi. The fix to this is to make
glXGetProcAddress handle such functions specially before calling
_glapi_get_proc_address.
Note that these files are automatically generated/re-generated
src/glx/indirect.c
src/glx/indirect.h
src/mapi/glapi/glapi_mapi_tmp.h
|
|
|
|
|
|
| |
Doesn't work for pixmaps, was looking up the GLX XID and was never thread
safe. Instead, just destroy the client side structures when the
drawable is no long current for a context.
|
|
|
|
|
|
| |
This reverts 6a6e6d7b0a84e20f9754af02a575ae34081d310c and initializes
dummyContext with an all NULL vtable. The context vtable pointer is
supposed to always be non-NULL, but the vtable entries can be NULL.
|
| |
|
|
|
|
|
|
|
|
|
| |
I was hitting this with gliv.
The GLX spec explicitly mentions that glXWaitX, glXWaitGL and glXUseXFont calls
are ignored when there's no current context. Not sure what if anything the
GLX_EXT_texture_from_pixmap spec says about this, but I think ignoring the
calls makes more sense than crashing there as well. :)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Code in glx/glxcmds.c which uses the XF86VIDMODE extension is already guarded. Also use
that guard to control inclusion of the xf86vmode.h header, and only enable that guard if the
XF86VIDMODE extension is found by pkgconfig.
This changes the behaviour on platforms which XF86VIDMODE exists, in that XF86VIDMODE used to
be mandatory, but is now optional.
Presumably other build systems are already arranging for -DXF86VIDMODE to be supplied to the
complier when glxcmds.c is compiled, so are not affected by this change
Signed-off-by: Jon TURNEY <[email protected]>
|
|
|
|
|
|
|
| |
This fixes some of the build issues with GLX_INDIRECT_RENDERING but !GLX_DIRECT_RENDERING due to recent changes.
Signed-off-by: Jon TURNEY <[email protected]>
Signed-off-by: Kristian Høgsberg <[email protected]>
|
|
|
|
| |
https://bugs.freedesktop.org/show_bug.cgi?id=29304
|
| |
|
| |
|
| |
|
|
|
|
| |
Because double underscores in private type names is painful.
|
|
|
|
| |
We're an X client library, so we can use Xfuncproto.h.
|
| |
|
|
|
|
|
| |
With this rename, we use 'config' consitently to refer to GLX configurations
instead of the modes/configs/visual mess before.
|
| |
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
| |
We use XID 0 to indicate the context has already been destroyed, but it's
currently bound.
|
|
|
|
|
| |
This lets us better separate context creation between the different
backends.
|
| |
|
|
|
|
| |
We'll just get it from the returned drawable when we need it.
|
| |
|
| |
|
| |
|
|
|
|
|
| |
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.
|
| |
|
|
|
|
|
| |
The extension never worked, the implementation returns GLX_BAD_CONTEXT
when enabling the frame tracking.
|
| |
|
|
|
|
| |
Only r200 implemented it.
|
|
|
|
|
|
| |
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.
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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)
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/glx/dri2_glx.c
src/glx/glx_pbuffer.c
|
| |
| |
| |
| | |
Signed-off-by: Jeremy Huddleston <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Jeremy Huddleston <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Jeremy Huddleston <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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]>
|
|\| |
|
| |
| |
| |
| |
| | |
Add ifdef guards around variables of types defined only for
GLX_DIRECT_RENDERING.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Signed-off-by: Jeremy Huddleston <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Jeremy Huddleston <[email protected]>
|
| |
| |
| |
| |
| | |
driContext field for __GLXcontextRec struct is only defined if
GLX_DIRECT_RENDERING is set.
|
|/
|
|
|
|
|
|
|
|
|
| |
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]>
|
|
|
|
| |
Leftover from earlier commit.
|
|
|
|
|
| |
Signed-off-by: Mario Kleiner <[email protected]>
Signed-off-by: Brian Paul <[email protected]>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|