Commit graph

646 commits

Author SHA1 Message Date
Kristian Høgsberg
7a0bcba9f9 glx: Suppress BadDrawable from DRI2CopyRegion
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-22 22:03:38 -04:00
Jesse Barnes
8f4f2a0c36 GLX/OML: honor OML semantics even if target, divisor and remainder are 0
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-22 16:41:17 -07:00
George Sapountzis
2b5a6e083c glx: minor cosmetic 2010-03-21 13:21:45 +02:00
George Sapountzis
2d1641b191 glx: swapBuffers prototype has changed 2010-03-21 13:21:45 +02:00
Alan Coopersmith
57c378a531 glx/single2.c: Don't call __builtin_expect on non-gnu compilers
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-03-12 10:28:13 -08:00
Jon TURNEY
96ab4d2b84 glx: Move initialization of ext_list_first_time to where it's storage is 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-05 17:11:23 -07:00
Jesse Barnes
1ca968363d DRI2: expose OML_sync_control if possible
If the server supports the OML related protocol, enable support for the
extension.
2010-03-05 11:22:05 -08:00
Jesse Barnes
6b3145d6ee GLX: remove debug prints from glXWaitForMscOML dispatch
Leftover from earlier commit.
2010-03-05 11:22:04 -08:00
Ian Romanick
6d9a9e57dc Fix unmatched parenthesis introduce by previous commits
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-03 17:50:11 -08:00
Ian Romanick
f7dde2c131 Remove support for GCC older than 3.3.0 from generated sources
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-03 16:26:32 -08:00
Ian Romanick
016fc30839 Remove support for GCC older than 3.3.0
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2010-03-03 16:26:32 -08:00
Brian Paul
5f40a7aed1 glx: replace assertion with conditional
See fd.o bug 26832.
2010-03-02 07:38:15 -07:00
Vinson Lee
706fffbff5 glx: Add assert to check input to memcpy. 2010-02-27 20:23:17 -08:00
Markus Fleschutz
83f1183e76 glx: fix incorrect array stack memory allocation
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.
2010-02-26 10:34:21 -07:00
Chia-I Wu
4cb13b433c glapi: Generated GLX sources should use glapidispatch.h.
Fix glX_proto_recv.py and glX_proto_send.py, and regenerate the sources.
2010-02-25 21:32:45 +08:00
Kristian Høgsberg
07b07b4d72 glapi: GL_OES_EGL_image autogenerated files 2010-02-24 13:38:55 -05:00
kleinerm
251bf298bf glx: Fix some typos in pointer checking for OML_sync_control entry points.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Brian Paul <brianp@vmware.com>
2010-02-23 13:35:05 -07:00
Kristian Høgsberg
32f2fd1c5d Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versions 2010-02-19 12:03:01 -05:00
Kenneth Graunke
26f8fad145 Remove _mesa_memset in favor of plain memset.
This may break the SUNOS4 build, but it's no longer relevant.
2010-02-19 09:18:57 -05:00
Ian Romanick
7ccbeb41ac Merge commit '381d5e209815235911c4aab516037c868c8f695f'
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-17 11:40:38 -08:00
Kristian Høgsberg
846cf49522 glx: Fix a couple of warnings 2010-02-16 10:38:50 -05:00
Kristian Høgsberg
215d0dae61 glx: Only register wire handlers for the events the server supports 2010-02-16 10:38:50 -05:00
Francisco Jerez
61d26bc82e dri2: Event driven buffer validation.
When a buffer invalidation event is received from the X server, the
"invalidate" hook of the DRI2 flush extension is executed: A generic
implementation (dri2InvalidateDrawable) is provided that just bumps
the "pStamp" sequence number in __DRIdrawableRec.

For old servers not supporting buffer invalidation events, the
invalidate hook will be called before flushing the fake front/back
buffer (that's typically once per frame -- not a lot worse than the
situation we were in before).

No effort has been made on preserving backwards compatibility with
version 2 of the flush extension, but I think it's acceptable because
AFAIK no released stack is making use of it.

Signed-off-by: Kristian Høgsberg <krh@bitplanet.net>
2010-02-16 10:38:50 -05:00
Kristian Høgsberg
97ec6076f5 glx: Move GetGLXDRIDrawable() prototype to glxclient.h 2010-02-16 10:38:49 -05:00
Vinson Lee
86d98fa4a2 glx: Silence uninitialized variable warning. 2010-02-14 21:03:23 -08:00
Ian Romanick
d46d30f997 glx: Pass fbconfig ID or visual ID to CreateContext
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-11 15:40:29 -08:00
Ian Romanick
c3db1d621e glx: Use the screen parameter everywhere instead of vis->screen, etc. 2010-02-11 15:40:29 -08:00
Ian Romanick
52cf8db428 glx: Move work of converting a visual to an fbconfig
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-11 15:40:29 -08:00
Ian Romanick
bc7b2f0dc3 glx: Re-indent CreateContext after the previous commit 2010-02-11 15:40:29 -08:00
Ian Romanick
2243029eee glx: Handle imported contexts outside of CreateContext
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-11 15:40:29 -08:00
Ian Romanick
7bcfb66000 glx: Pass screen number as parameter to CreateContext
Passing the screen parameter to CreateContext will simplify a couple
of changes that are coming.
2010-02-11 15:40:29 -08:00
Ian Romanick
8bffadbc83 glx: Pass opcode to CreateContext instead of use_glx_1_3 parameter
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-11 15:40:29 -08:00
Ian Romanick
68fef18439 glx: Fix interval test in glXSwapIntervalMESA
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-11 15:40:29 -08:00
Ian Romanick
1add5354d0 glx: Change type to eliminate 'comparison between signed and unsigned' warning 2010-02-11 15:40:29 -08:00
Ian Romanick
71a6fb15ce glx: Add casts to eliminate 'comparison between signed and unsigned' warnings 2010-02-11 15:40:28 -08:00
Ian Romanick
26b2bee79d glx: Eliminate several 'unused variable' warnings in glxcmds.c. 2010-02-11 15:40:28 -08:00
Ian Romanick
2b4e009ed5 glx: Use wrapper macro to detect direct rendering
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-11 15:40:28 -08:00
Kristian Høgsberg
2ecbe4e208 glx: Fix TOP setting in src/glx Makefile
Argh, forgot to commit this fix before pushing.
2010-02-09 10:21:45 -05:00
Kristian Høgsberg
6e8897ff9f Retire miniglx and move the actual glx code up to src/glx 2010-02-09 09:58:36 -05:00
Francisco Jerez
8b0b5ace48 glx: Fix SwapBuffers regression introduced by 01923fb72d.
After that commit, some dri2 protocol symbols were being checked from
places that weren't including dri2proto.h, effectively disabling some
valuable SwapBuffers codepaths.
2010-02-08 23:29:15 +00:00
Keith Whitwell
01923fb72d glx: permit building with older protocol headers
I'd like to be able to build mesa on current distro releases without
having to upgrade from the standard dri2proto and glproto headers.  With
this change I'm able to build on ancient releases such as Ubuntu 9-10...

In general, it would be nice to be able to build-test mesa to check for
unintended breakages without having to follow the external dependencies
of every group working on the codebase.

Seems to introduce no changes to the build of libglapi.a when tested against
new versions of the headers.
2010-02-08 13:05:35 +00:00
Kristian Høgsberg
697e22146d glx: Don't mark the XF86DRI functions PUBLIC 2010-02-05 12:01:28 -05:00
Vinson Lee
e3a99e8522 glx: Remove unnecessary headers. 2010-02-01 00:22:50 -08:00
Rodolfo Ribeiro Gomes
81cca6d453 glx: fix possible memory leaks in dri2CreateScreen()
Original patch fixed up by Brian Paul.
2010-01-29 08:36:47 -07:00
Chia-I Wu
146931769c glx: Build GLX normally.
GLX was built specially and before Mesa core because libglapi.a could
not be built with IN_DRI_DRIVER defined.  This is no longer the case
since 6e99e6ddbf.

It works fine in my (limited) testing with both direct and indirect
rendering.  I also compare the outputs after preprocessing (gcc -E) with
or without this commit, and they are identical.
2010-01-26 11:03:54 +08:00
Robert Bragg
7a9329ba99 mesa: misc GLX_INTEL_swap_event fixes
Fixup a few issues found through testing:
  - update GLX names to match glproto
  - register DRI2WireToEvent so it actually gets called

Signed-off-by: Robert Bragg <robert@linux.intel.com>
2010-01-25 15:40:56 -08:00
Dave Airlie
782b6885c2 Merge branch 'arb_half_float_vertex' 2010-01-23 12:29:33 +10:00
Dave Airlie
1ac5fd594a glapi: add GL_HALF_FLOAT enum support.
Regenerate enums files and GLX indirect.

Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-01-23 12:28:32 +10:00
Brian Paul
cd8614b028 Merge branch 'mesa_7_7_branch'
Conflicts:
	src/gallium/auxiliary/draw/draw_context.c
	src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c
	src/gallium/auxiliary/pipebuffer/Makefile
	src/gallium/auxiliary/pipebuffer/SConscript
	src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
	src/gallium/auxiliary/tgsi/tgsi_scan.c
	src/gallium/drivers/i915/i915_surface.c
	src/gallium/drivers/i915/i915_texture.c
	src/gallium/drivers/llvmpipe/lp_setup.c
	src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
	src/gallium/drivers/llvmpipe/lp_texture.c
	src/gallium/drivers/softpipe/sp_prim_vbuf.c
	src/gallium/state_trackers/xorg/xorg_dri2.c
	src/gallium/winsys/drm/intel/gem/intel_drm_api.c
	src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
	src/gallium/winsys/drm/radeon/core/radeon_drm.c
	src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c
	src/mesa/state_tracker/st_cb_clear.c
2010-01-22 12:17:02 -07:00
Chia-I Wu
bdd2500805 Do not include glapi/dispatch.h outside Mesa core.
Include the glapi*.h directly instead.  glapi/dispatch.h became a Mesa
core header since 22884db174.
2010-01-21 17:48:38 +08:00