global screen private.
Signed-off-by: Eric Anholt e...@anholt.net
---
Xext/xvdix.h | 1 -
hw/kdrive/src/kxv.c| 12 +---
hw/xfree86/common/xf86xv.c | 14 +++---
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index
Signed-off-by: Eric Anholt e...@anholt.net
---
Xext/xvdix.h | 1 -
Xext/xvmain.c | 2 --
hw/kdrive/src/kxv.c| 18 +-
hw/kdrive/src/kxv.h| 1 +
hw/xfree86/common/xf86xv.c | 19 ++-
hw/xfree86/common
Signed-off-by: Eric Anholt e...@anholt.net
---
Xext/xvdix.h | 1 -
Xext/xvmain.c | 22 --
2 files changed, 23 deletions(-)
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2437eb4..ddd8abb 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -259,7 +259,6 @@ extern _X_EXPORT int
Keith Packard kei...@keithp.com writes:
This hooks up SHM sync fences to complete the requirements for DRI3
running on Glamor.
Signed-off-by: Keith Packard kei...@keithp.com
This looks equivalent to what I had in my Xephyr DRI3 branch.
Reviewed-by: Eric Anholt e...@anholt.net
to fetch changes up to 6d4954884908ea9894fcfe9836db1ba7bb45be61:
Merge remote-tracking branch 'origin/master' into glamor-next (2014-07-17
18:07:26 -0700)
Eric Anholt (20):
xorg: Remove duplicated definitions of some XV-related
if
the device is already claimed. Meaning that a user could not
make things work even with a .conf file to explicitly specify
the driver to use.
Series is:
Tested-by: Eric Anholt e...@anholt.net
(it gets the modesetting driver up and running on the Pi).
pgpPXvqK4wHAl.pgp
Description: PGP signature
, here's a revert for 1.16.
Reviewed-by: Eric Anholt e...@anholt.net
pgpu2JaiEqqYW.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo
The corresponding code was deleted in
2ff41008494e6c5909c058f1f80b4f66617dada1 (2012)
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_priv.h | 6 --
1 file changed, 6 deletions(-)
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 61f393d..dc4f9b8 100644
These were replaced by the new glamor_prepare.c code.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_pixmap.c | 129 -
glamor/glamor_priv.h | 5 --
2 files changed, 134 deletions(-)
diff --git a/glamor/glamor_pixmap.c b/glamor
It's unused since keithp's copy acceleration code completely replaced
glamor_copyarea.c and removed the blit path.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor.c| 5 -
glamor/glamor_points.c | 3 ---
glamor/glamor_priv.h | 7 ---
glamor/glamor_render.c | 2
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_pixmap.c | 314 -
glamor/glamor_priv.h | 15 ---
2 files changed, 329 deletions(-)
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 00e3827..2275ede 100644
Unused since the glamor_prepare.c replacement of glamor_finish_access().
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_pixmap.c | 7 ---
glamor/glamor_priv.h | 10 --
2 files changed, 17 deletions(-)
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
-by: Eric Anholt e...@anholt.net
---
Of the pile of patches I've sent today, this is the only one intended
for -fixes.
glamor/glamor_vbo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c
index c678559..e906101 100644
--- a/glamor
wrapping
Fixes all of the screen wrappers in the VGA arbiter.
[PATCH 5/5] hw/xfree86: Let xf86Rotate leave the BlockHandler
Finally, removes the rotate block handler when possible.
Sorry, I misplaced this series. It looks great.
Reviewed-by: Eric Anholt e...@anholt.net
pgpSxQtxAObxl.pgp
All users of glamor had the same value set, and it complicated things
for no reason.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor.c | 5 --
glamor/glamor.h | 8 +-
glamor/glamor_gradient.c | 19 ++--
glamor/glamor_pixmap.c| 77
We're not drawing, and we're not initially setting up the texture for
later drawing.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_transfer.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
index 4eea902..8914155 100644
After keithp's change to drop the old glamor_fill() code, nothing ever
changed these values.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_glyphs.c| 4 ++--
glamor/glamor_priv.h | 1 -
glamor/glamor_trapezoid.c | 3 +--
glamor/glamor_utils.c | 9 +++--
4 files
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_transfer.c | 45 ++---
1 file changed, 10 insertions(+), 35 deletions(-)
diff --git a/glamor/glamor_transfer.c b/glamor/glamor_transfer.c
index ad875c9..4eea902 100644
--- a/glamor
If this path needed the filters set, so would all the other
glDrawArrays() callers. But they don't.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_spans.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/glamor/glamor_spans.c b/glamor/glamor_spans.c
index 46ba6c3..582d11d
a11bbd875f3f90a3d02d727778cb1d3524cf59fd
found at anholt-pub
but git fetch anholt-pub glamor-fixes got me that commit back, so I
don't know what's going on.
Eric Anholt (1):
glamor: Don't leak a prepare_access_gc() in putimage fallbacks.
Markus Wick (2):
glamor: Fix no-mipmap allocations
Keith Packard kei...@keithp.com writes:
Drawing all of the spans in one driver call is a considerable
performance improvement, which we can do unless the arcs are
double-dashed, in which case overlapping dashes should draw the latter
arc contents.
Signed-off-by: Keith Packard
Keith Packard kei...@keithp.com writes:
Michel Dänzer mic...@daenzer.net writes:
AFAICT these are all the relevant fixes which went into the standalone
glamor tree since it was imported into the xserver tree.
We're already a few days overdue for the non-critical bug fix
window, and I'd
It turns out putimage doesn't use the GC tile or stipple anyway, so
there's no need to do this.
Signed-off-by: Eric Anholt e...@anholt.net
---
I didn't see a followup email from either of you, so how about this
patch for the fixes tree?
glamor/glamor_image.c | 3 +--
1 file changed, 1
Keith Packard kei...@keithp.com writes:
Markus Wick mar...@selfnet.de writes:
The max size of renderbuffers and texture often match by accident, but as we
always use textures, we should check for the right flag.
Also check for viewport size as this may be lower and we want to
render to
Keith Packard kei...@keithp.com writes:
Eric Anholt e...@anholt.net writes:
I wanted to be able to hack on the glamor XV code on a single system,
so I had to build Xephyr support for it. This branch (glamor-xv of my
tree) is less aggressive than my initial attempt at XV sanity (all-xv
Keith Packard kei...@keithp.com writes:
Markus Wick mar...@selfnet.de writes:
Am 2014-05-06 00:02, schrieb Keith Packard:
+static const char on_off_fs_exec[] =
+ float pattern = texture2D(dash, vec2(dash_offset,
0.5)).w;\n
+ if (pattern == 0.0)\n
+
Disabling asserts is something the user gets to manage.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_priv.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 96635be..c56c559 100644
--- a/glamor/glamor_priv.h
+++ b/glamor
Keith Packard kei...@keithp.com writes:
Michel Dänzer mic...@daenzer.net writes:
On 06.05.2014 07:02, Keith Packard wrote:
+static Bool
+glamor_copy_gl(DrawablePtr src,
+ DrawablePtr dst,
+ GCPtr gc,
+ BoxPtr box,
+ int nbox,
+
Michel Dänzer mic...@daenzer.net writes:
On 06.05.2014 03:10, Eric Anholt wrote:
Here's a series for fixing almost all the warnings I get with
--enable-debug. I had been building X without --enable-debug (and
thus without asserts)
AFAICT xserver doesn't #define NDEBUG in general, so
walter harms wha...@bfs.de writes:
Am 05.05.2014 22:09, schrieb Eric Anholt:
I want to expose this from Xephyr as well, both to be able to test XV
changes rapidly, and beause the XV passthrough to the host's overlay
really doesn't work out well when we glXSwapBuffers() over the
colorkey
walter harms wha...@bfs.de writes:
Am 06.05.2014 00:02, schrieb Keith Packard:
This allocates span data for all of the provided arcs and draws the
whole set in one call, rather than doing them one at a time. For
modern hardware, this is a significant performance improvement.
Signed-off-by:
Signed-off-by: Keith Packard kei...@keithp.com
There's some mess in the commit message from a squash.
The code looks good now and I'd like to just get some comments touched up.
However, regardless of what you decide to do with my comment suggestions,
Reviewed-by: Eric Anholt e...@anholt.net
Keith Packard kei...@keithp.com writes:
This uses the same shaders as glamor_poly_glyph_blt.
Signed-off-by: Keith Packard kei...@keithp.com
---
glamor/glamor_glyphblt.c | 131
++-
1 file changed, 49 insertions(+), 82 deletions(-)
diff --git
Keith Packard kei...@keithp.com writes:
Here's the current set of glamor patches to be added post 1.16.
-keith
Patches 1, 7, 8, 9 are also:
Reviewed-by: Eric Anholt e...@anholt.net
pgp12e2Y8F8hJ.pgp
Description: PGP signature
___
xorg-devel
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/xfree86/x86emu/debug.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/hw/xfree86/x86emu/debug.c b/hw/xfree86/x86emu/debug.c
index 1a8d1d6..fce09f8 100644
--- a/hw/xfree86/x86emu/debug.c
+++ b/hw/xfree86/x86emu/debug.c
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/xfree86/common/xf86Events.c | 2 +-
hw/xfree86/common/xf86Helper.c | 4 ++--
hw/xfree86/dri/dri.c | 2 +-
hw/xfree86/os-support/linux/lnx_video.c | 2 +-
hw/xfree86/os-support/shared/bios_mmap.c | 2
These have never been used in the history of the tree, and were
producing string literal const loss warnings.
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/src/kinput.c | 35 ---
1 file changed, 35 deletions(-)
diff --git a/hw/kdrive/src/kinput.c b/hw
Here's a series for fixing almost all the warnings I get with
--enable-debug. I had been building X without --enable-debug (and
thus without asserts) because mesa forces -O0 with --enable-debug, so
my normal config script wasn't using the flag.
Remaining warnings include the dead bswap64 in glx
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/ephyr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index def50d8..11b5ae9 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -954,7 +954,7
Now that we don't have to worry about the generic adaptors code,
there's no need to have a list of pointers to different sets of
adaptors.
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/ephyrvideo.c | 20 ++--
hw/kdrive/src/kxv.c | 8
hw/kdrive
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/ephyrvideo.c | 10 +-
hw/kdrive/src/kxv.c | 30 --
hw/kdrive/src/kxv.h | 8 ++--
3 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/hw/kdrive/ephyr/ephyrvideo.c
These were field-for-field identical, so we can just typedef them to
be the same, and memcpy their contents.
v2: Fix missed strdup().
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/xfree86/common/xf86xv.c | 53 +++---
hw/xfree86/common/xf86xv.h | 36
was broken on xf86-video-intel anyway.
To reproduce, run without a compositor, and use another window to clip
the top half of your XV output on the glamor XV adaptor: the rendering
got confused about which half of the window was being drawn to.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor
I couldn't find any callers in the history of the tree.
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/ephyrvideo.c | 6 +-
hw/kdrive/src/kxv.c | 43 ---
hw/kdrive/src/kxv.h | 9 -
3 files changed, 1
I want to expose this from Xephyr as well, both to be able to test XV
changes rapidly, and beause the XV passthrough to the host's overlay
really doesn't work out well when we glXSwapBuffers() over the
colorkey.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/Makefile.am
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/Makefile.am | 5 +
hw/kdrive/ephyr/ephyr.c | 4 +-
hw/kdrive/ephyr/ephyr.h | 10 ++
hw/kdrive/ephyr/ephyr_glamor_xv.c | 244 ++
4 files changed, 262 insertions(+), 1
No code modifies it at runtime, and it's common to store string
literals to it.
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/src/kxv.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/kdrive/src/kxv.h b/hw/kdrive/src/kxv.h
index e50615b..3a49a65 100644
I wanted to be able to hack on the glamor XV code on a single system,
so I had to build Xephyr support for it. This branch (glamor-xv of my
tree) is less aggressive than my initial attempt at XV sanity (all-xv
of my tree), but it does get glamor XV working on both Xephyr and
intel, and fixes
The following changes since commit 42a4873cc7fe0c7a729e48f806e877c4dac5c07f:
hw/xfree86: Video Driver ABI version 18.0 (2014-05-01 16:53:57 -0700)
are available in the git repository at:
git://people.freedesktop.org/~anholt/xserver glamor-fixes
for you to fetch changes up to
.
Signed-off-by: Eric Anholt e...@anholt.net
Reviewed-by: Keith Packard kei...@keithp.com
---
glamor/glamor_segment.c | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/glamor/glamor_segment.c b/glamor/glamor_segment.c
index 84b27ac..53f7da0 100644
--- a/glamor
Keith Packard kei...@keithp.com writes:
Was interpreting the incoming chars as 8-bits instead of 16-bits,
resulting in the wrong characters being drawn.
Signed-off-by: Keith Packard kei...@keithp.com
Reviewed-by: Eric Anholt e...@anholt.net
pgpP_elJ4tTxY.pgp
Description: PGP signature
Keith Packard kei...@keithp.com writes:
Eric Anholt e...@anholt.net writes:
Keith Packard kei...@keithp.com writes:
glamor_transfer had some hard-coded depth to format/type conversions
which may not match the format used with render. This switches to
using the same formats as the render
Keith Packard kei...@keithp.com writes:
Eric Anholt e...@anholt.net writes:
Keith Packard kei...@keithp.com writes:
Because uxa doesn't just use glamor directly, it keeps these two
functions from being wrapped so that they get called
automatically. Publishing these will allow uxa to call
Keith Packard kei...@keithp.com writes:
When accessing a 16-bit font with firstRow 0 with 8-bit text, check
to see if the font has a default character and return that for every
incoming character.
Reviewed-by: Eric Anholt e...@anholt.net
pgpHIpFMLJjh2.pgp
Description: PGP signature
Keith Packard kei...@keithp.com writes:
Because uxa doesn't just use glamor directly, it keeps these two
functions from being wrapped so that they get called
automatically. Publishing these will allow uxa to call them directly.
Instead of making uxa get more complicated, let's just move the
Keith Packard kei...@keithp.com writes:
GetGlyphs is supposed to always return the full list of characters
when there is a default character available. However, if an
application opens a 16-bit two dimensional font and then draws with
8-bit requests, GetGlyphs will return zero glyphs if there
Keith Packard kei...@keithp.com writes:
glamor_transfer had some hard-coded depth to format/type conversions
which may not match the format used with render. This switches to
using the same formats as the render portion of glamor.
glamor_get_tex_format_type_from_pixmap() looks hopelessly
James Cloos cl...@jhcloos.com writes:
Does preventing indirect glx prevent glx over x over tcp?
(Not a criticism of the patch; I don't remember whether direct is
possible w/o shared mem.)
Yes. But if you wanted either performance functionality, you'd be
rendering locally using direct
Keith Packard kei...@keithp.com writes:
Adam Jackson a...@nwnk.net writes:
On Fri, 2014-04-18 at 11:40 -0700, Eric Anholt wrote:
@@ -545,9 +541,8 @@ _glamor_copy_n_to_n(DrawablePtr src,
fail:
-glamor_get_context(glamor_priv);
+glamor_make_current(glamor_priv
gives you a chance to disable indirect GLX
in environments where you just don't need it.
I put in both the '+' and '-' arguments right now, so that it's easy
to patch the value to change the default policy.
Signed-off-by: Eric Anholt e...@anholt.net
Acked-by: Julien Cristau jcris...@debian.org
---
I
After changing the get/putimage code in glamor, we found a render
regression that was surprisingly not caught by rendercheck.
v2: Add a variant with using the GC to invert the bits that were put,
which reproduces the problem on master.
---
Makefile.am | 1 +
main.c |
Michel Dänzer mic...@daenzer.net writes:
From: Anthony Waters awate...@gmail.com
The method __glamor_upload_pixmap_to_texture was updated to support a
stride parameter for the data being uploaded to a texture. This
required correctly setting the alignment from 4 to a value based on the
Anthony Waters awate...@gmail.com writes:
Patch 4 and 5 can be dropped, I looked at Keith's code and it does the same
thing already (also tested OpenTTD and it works with Keith's code). Patch
1 is still valid.
I'm currently running xts against the following glamor-fixes set:
.
(2014-04-23 10:41:19 -0700)
Anthony Waters (1):
glamor: Fix coordinates handling for composite source/mask pictures
Eric Anholt (12):
glamor: Fix a missing set of the GL context.
glx: Move the GLX variable caching what
Michel Dänzer mic...@daenzer.net writes:
On 22.04.2014 04:08, Eric Anholt wrote:
I think the must-do items for glamor in 1.16 will be done.
As I mentioned before, there's also at least one fix for a memory leak
in copy_n_to_n that needs to be ported from the standalone glamor tree
Keith Packard kei...@keithp.com writes:
When a flip (or unflip) is pending and a flip request comes in, leave
it queued until the pending flip completes and then execute it.
Signed-off-by: Keith Packard kei...@keithp.com
---
present/present.c | 126
)
Eric Anholt (1):
glamor: Fix accelerated rendering of GTK's ARGB vs xBGR composites.
Jamey Sharp (1):
Make glamor build with --enable-debug.
glamor/glamor_core.c | 2 +-
glamor/glamor_render.c | 10 ++
2 files
gives you a chance to disable indirect GLX
in environments where you just don't need it.
I put in both the '+' and '-' arguments right now, so that it's easy
to patch the value to change the default policy.
Signed-off-by: Eric Anholt e...@anholt.net
Acked-by: Julien Cristau jcris...@debian.org
Jamey Sharp ja...@minilop.net writes:
Bad anholt, no biscuit. Broken in commit
4c9a20072552c52b3763bd73e7a7e9b9cb8b4993.
Applied this to my -fixes tree, which I expect to send pull-request for
today.
pgpKeoY_SrHjF.pgp
Description: PGP signature
___
Jamey Sharp ja...@minilop.net writes:
I haven't understood enough of the implementation to see how to fix
this, but I can reliably crash Xephyr this way:
hw/kdrive/ephyr/Xephyr :1 -screen 1024x768 -glamor
DISPLAY=:1 x11perf -shmputxy10
Without the -glamor option to Xephyr, the x11perf
There is some complicated code to support tweaking the format as we
upload from a SHM pixmap (aka the GTK icon cache), but if we weren't
sourcing from a SHM pixmap we just forgot to check that the formats
matched at all.
We could potentially be a little more discerning here (xRGB source and
ARGB
We only store string literals here.
---
rendercheck.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rendercheck.h b/rendercheck.h
index 6cae450..7da59a5 100644
--- a/rendercheck.h
+++ b/rendercheck.h
@@ -64,7 +64,7 @@ typedef struct _picture_info {
struct op_info {
They never find real bugs in my experience.
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index 4fa5a63..4ec7a8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install
---
rendercheck.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rendercheck.h b/rendercheck.h
index 34d06c5..6cae450 100644
--- a/rendercheck.h
+++ b/rendercheck.h
@@ -194,9 +194,6 @@ trans_srccoords_test_2(Display *dpy, picture_info *win,
picture_info *white,
Bool
---
main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/main.c b/main.c
index 9a97d72..241c03d 100644
--- a/main.c
+++ b/main.c
@@ -26,9 +26,6 @@
#include string.h
#include getopt.h
-extern int num_ops;
-extern int num_colors;
-
Bool is_verbose = FALSE, minimalrendering = FALSE;
Trying to make all the callchain related to these const is too hard, and it's
not like marking things const helps either the developer or the compiler.
---
t_repeat.c | 2 +-
t_srccoords.c | 2 +-
t_tsrccoords.c | 2 +-
t_tsrccoords2.c | 2 +-
tests.c | 4 ++--
5 files changed, 6
Signed-off-by: Eric Anholt e...@anholt.net
---
COPYING | 19 +++
Makefile.am | 1 +
main.c| 2 +
rendercheck.h | 4 ++
t_gtk_argb_xbgr.c | 150 ++
tests.c | 10
6 files changed, 186
keithp sent me some code for a new test that reproduced a bug he was
experiencing in glamor, so I pulled out rendercheck to add the testcase to it
and found that it was really verbose with all the new warnings. The new
warnings didn't appear to reveal actual bugs, though.
This was apparently copy and pasted from the 1x1 repeat code above.
---
tests.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests.c b/tests.c
index f722bc6..e2ae645 100644
--- a/tests.c
+++ b/tests.c
@@ -390,14 +390,12 @@ do_tests(Display *dpy, picture_info *win)
errx(1,
This simplifies the manual strcatting mess and avoids potential overflow
issues.
---
Makefile.am | 1 +
main.c| 23 ---
rendercheck.h | 2 +-
t_blend.c | 6 --
t_fill.c | 7 ---
tests.c | 27 +++
6 files changed, 29
Michel Dänzer mic...@daenzer.net writes:
On 19.04.2014 03:39, Eric Anholt wrote:
Here it is, at long last. I was stumped for several days with a weird
fbo incomplete that was happening after my first round of fixes, and
it took a day's detour of cooking up a Xephyr with DRI3 to get a fast
The attack surface for indirect GLX is huge, and it's of no use to
most people (if you get an indirect GL context, you're better served
by a immediate X error than actually trying to use an indirect GL
context and finding out that it doesn't support doing anything you
want, slowly). This flag
There is some complicated code to support tweaking the format as we
upload from a SHM pixmap (aka the GTK icon cache), but if we weren't
sourcing from a SHM pixmap we just forgot to check that the formats
matched at all.
We could potentially be a little more discerning here (xRGB source and
ARGB
to master, they
also be included in any future stable point releases.
These two are:
Reviewed-by: Eric Anholt e...@anholt.net
pgpi3zvcRI2ap.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_glx.c | 8
1 file changed, 8 insertions(+)
diff --git a/glamor/glamor_glx.c b/glamor/glamor_glx.c
index db8e661..7107c7c 100644
--- a/glamor/glamor_glx.c
+++ b/glamor/glamor_glx.c
@@ -36,6 +36,14 @@
static void
This hook calls unbindContext in the DRI driver interface, which
unsets the dispatch table, regardless of whether the context argument
was the current one or not.
Signed-off-by: Eric Anholt e...@anholt.net
---
glx/glxext.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
-by: Eric Anholt e...@anholt.net
---
glx/glxdri2.c | 61 +++---
glx/glxdriswrast.c | 10 +
2 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 94476dd..7b368d2 100644
--- a/glx/glxdri2.c
Now that we have the DIX global state for the current context, we
don't need to track nesting to try to reduce MakeCurrent overhead.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor.c | 6 ++
glamor/glamor_context.h | 9 +
glamor/glamor_copyarea.c | 13
-by: Eric Anholt e...@anholt.net
---
dix/dixutils.c | 25 +
glx/glxcmds.c | 11 +--
glx/glxext.c| 26 +++---
glx/glxserver.h | 1 -
include/dix.h | 2 ++
5 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/dix/dixutils.c b/dix
Here it is, at long last. I was stumped for several days with a weird
fbo incomplete that was happening after my first round of fixes, and
it took a day's detour of cooking up a Xephyr with DRI3 to get a fast
debug environment and figure out what was going on (xephyr-glamor-egl
is that branch. I
Fixes a usage of the wrong context with swrast GLX's GetImage entrypoint.
---
glamor/glamor_pixmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c
index 371e486..54b414b 100644
--- a/glamor/glamor_pixmap.c
+++
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_egl.c | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index d37de9b..9b6b323 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -166,10 +166,14
This gets us some more context changes that are needed to make sure
the two sides render to the right drawables and manipulate the right
objects.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_egl.c | 14 ++
glamor/glamor_glx.c | 6 --
glamor/glamor_utils.h
We want to make sure that lastGLContext is set correctly during
makeCurrent, because we may have recursive GL context changes in the
DRI2 interfaces due to glamor.
Signed-off-by: Eric Anholt e...@anholt.net
---
glx/glxcmds.c | 6 ++
glx/glxext.c | 3 ++-
2 files changed, 4 insertions(+), 5
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_egl.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 1755d23..54af275 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -97,8 +97,15
Keith Packard kei...@keithp.com writes:
xf86Rotate, it was delaying unwrapping the BlockHandler until after
calling xf86RotateRedisplay. If there was a software cursor on the
screen, the redisplay operation would cause cursor to be removed from
the frame buffer and the misprite block handler
Michel Dänzer mic...@daenzer.net writes:
On Mit, 2014-04-02 at 11:46 -0700, Eric Anholt wrote:
Keith Packard kei...@keithp.com writes:
This eliminates a huge cost when using EGL.
Signed-off-by: Keith Packard kei...@keithp.com
It also, as far as I've heard, causes segfaults when you
Jon TURNEY jon.tur...@dronecode.org.uk writes:
Unfortunately, Cygwin defines RTLD_DEFAULT (for glibc compatibility), but
can't
provide dladdr(), so add a check for dladdr()
This patch is:
Reviewed-by: Eric Anholt e...@anholt.net
I'm confused why you'd be building DRI driver code on cygwin
: dix_main (main.c:163)
Signed-off-by: Eric Anholt e...@anholt.net
---
os/busfault.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/os/busfault.c b/os/busfault.c
index 43bb6ea..ac0268f 100644
--- a/os/busfault.c
+++ b/os/busfault.c
@@ -142,6 +142,7 @@ busfault_init(void
Matt Dew mar...@osource.org writes:
Hey folks,
Any body have any thing more for xserver stable? Either 1.15.1 or 1.14.6?
Current plan is one week from today for releases.
It would be nice to get 96a28e9c914d7ae9b269f73a27b99cbd3c465ac8 picked
back. Should I send pull requests?
701 - 800 of 1094 matches
Mail list logo