Commit graph

25 commits

Author SHA1 Message Date
Keith Packard
c83e842d62 Build against DRI_TEX_BUFFER_VERSION 1
setTexBuffer2 isn't present in this version of the structure, so don't try
to call it.

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit a7a93c12f9)
2009-07-26 12:33:14 -07:00
Kristian Høgsberg
e34a12b18f Support setTexBuffer2 in AIGLX.
Fixes broken GLX_tfp, specifically, lets compositors ignore un-defined
alpha channel for pixmaps.
(cherry picked from commit 91b697efde)
2009-07-26 12:32:48 -07:00
Ian Romanick
ee6ce7e4cc glx: Inialize best_score before calculating visual scores
This bug was pointed out by Peter Åstrand.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
(cherry picked from commit 4039603413)
2009-07-26 12:25:50 -07:00
Alan Hourihane
5cae7f5a60 glx: fix retval checks when failures occur for drawable creation.
(cherry picked from commit a26c77ff43)
2009-07-26 12:25:39 -07:00
Eric Anholt
0fd4d26240 glx: Replace broken GLX visual setup with a fixed "all" mode.
With trying to match depths so that you didn't end up with a depth 24
fbconfig for the 32-bit composite visual, I broke the alpha bits on the depth
24 X visual, which angered other applications.  But in fixing that, the
pickFBconfigs code for "minimal" also could end up breaking GLX visuals if
the same FBconfig was chosen for more than one X visual.
We have no reason to not expose as many visuals as possible, but the old
"all" mode didn't match any existing X visuals to GLX visuals, so normal
GL apps didn't work at all.

Instead, replace it with a simple combination of the two modes: Create GLX
visuals by picking unique FBconfigs with as many features as possible for
each X visual in order.  Then, for all remaining FBconfigs that are
appropriate for display, add a corresponding X and GLX visual.

This gets all applications (even ones that aren't smart enough to do FBconfigs)
get all the options to get the visual configuration they want.  The only
potential downside is that the composite ARGB visual is unique and gets a
nearly full-featured GLX visual (except that the root visual might have taken
the tastiest FBconfig), which means that a dumb compositing manager could
waste resources. Write compositing managers using FBconfigs instead, please.
(cherry picked from commit c40bad88475debf7a1774e22dce835577ad32154)

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 516f8e2cad)
2009-07-26 12:25:11 -07:00
Eric Anholt
7f9df0c932 glx: Don't match fbconfigs to visuals with mismatched channel masks.
This fixes at least one known bug, where the depth 32 visual would end up
with a depth 24 fbconfig attached, angering compiz.
(cherry picked from commit 5100d829a4)
2009-07-26 12:24:52 -07:00
Jeremy Huddleston
31a20a573b GLX: Make sure the types match for ALIAS in indirect_reqsize.c 2009-06-06 22:17:44 -07:00
Jeremy Huddleston
b4adec886c GLX: Purge glxint.h usage
Change (__GLXvisualConfig *) to (void *) in ABI compat stubs.
2009-05-29 14:44:40 -07:00
Jeremy Huddleston
e587436cf2 GLX: Purge some glxint.h usage in glxcmds.c
This is related to d0b249f1c5 in the 1.4 branch and was ok'd by krh
2009-05-29 14:27:46 -07:00
Jeremy Huddleston
7df46d26fd GL/glx: WRITE_PAIR the GLX_SAMPLE_BUFFERS_SGIS, and GLX_SAMPLES_SGIS mode data.
More recent versions of glxcmds.c already do this.

This enables glxinfo to correctly detect the multisampling with output like so
from glxinfo -v:
 multiSample=6  multiSampleBuffers=1
(cherry picked from commit 5bc78b9f96)
2008-11-05 19:22:42 -08:00
Jeremy Huddleston
fec491e316 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-11-05 19:20:26 -08:00
Michel Dänzer
b8fd8da1ad AIGLX: Reinstate call to driver texOffsetFinish hook.
It was accidentally lost when factoring out __glXDRIdoReleaseTexImage, so this
is a regression fix and should probably be backported to server-1.5-branch.
(cherry picked from commit a4d62bbf21)
2008-11-05 13:48:30 -05:00
Jeremy Huddleston
01fcbc410d GL: LP64 related casting fixes from Bob Murphy
(cherry picked from commit 0afd2ca49b)
2008-10-31 19:05:28 -07:00
Adam Jackson
f75163e5f6 Bug #18159: Spell "anisotropic" correctly
(cherry picked from commit 81e197b2a5)
2008-10-27 09:46:52 -04:00
Alan Hourihane
af8cef461c only build dri2 when DRI2 is enabled 2008-09-24 14:24:36 +01:00
Daniel Drake
05472534cf Don't abort if swrast library is not present
GLX is enabled by default, but the current swrast behaviour causes X
to abort with fatal error if the swrast dri library dlopen fails.

Handle the case where the swrast library is not present, and do not
register the GLX extension unless at least one screen has a usable
GL provider.
(cherry picked from commit eff25430b4)
2008-08-29 14:38:43 -04:00
Kristian Høgsberg
78f50cd575 Fix driGetConfigAttribIndex unaligned access to GLboolean.
We don't actually send the float mode so just drop it.  Drop a couple of
other unused or redundant fields from GLXconfig.
2008-08-26 10:58:35 -04:00
Dave Miller
5930aeb45e glx: fix crash in driGetConfigAttribIndex
Don't access GLboolean via int pointers
2008-08-09 16:47:49 +10:00
Roland Scheidegger
14a033f032 glx: copy msaa visual capabilities
(cherry picked from commit 49751fee3b)
2008-07-23 13:49:58 -04:00
Kristian Høgsberg
2d6022bd40 Need to unref pixmaps backing pbuffers too.
(cherry picked from commit facb255fa9)
2008-07-21 17:16:00 -04:00
Kristian Høgsberg
e4cfdc07f4 Fix embarrasing GLXPixmap leak.
(cherry picked from commit d5ae85b5b7)
2008-07-21 17:14:08 -04:00
Adam Jackson
6ec12077ef Distcheck fixes. 2008-06-30 11:17:53 -04:00
George Sapountzis
6e278e3944 glx: missing swrast is fatal
(cherry picked from commit 877e6c35ff)
2008-06-26 16:14:52 -04:00
George Sapountzis
0845476521 glx: drop stray glcore.h include
(cherry picked from commit 1345c93ad4)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
a194718e9d Move GL/glx on level up now that it's the only thing left under GL.
(cherry picked from commit c3eb5b80d8)
2008-06-26 16:14:52 -04:00