Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_fill.c | 18 +-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c
index f8b39a5..a3f0f29 100644
--- a/glamor/glamor_fill.c
+++ b/glamor/glamor_fill.c
@@ -27,10
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_egl.c | 31 +++
1 file changed, 7 insertions(+), 24 deletions(-)
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 05e6bd0..13799fc 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
We had regressions in CopyPlane reported by xts5, because we were
(successfully!) dereferencing the null pixmap-devPrivate.ptr for a
tile or stipple without having done a prepare.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_copyarea.c | 4 +++-
glamor/glamor_copyplane.c | 4
need to tell glamor to initialize glyphs. We do retain the
old public symbol so they can keep running with no changes.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor.c | 30 ++
glamor/glamor.h | 8
glamor/glamor_glyphs.c | 21
nbox 4 is actually quite common for spans handling.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_fill.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/glamor/glamor_fill.c b/glamor/glamor_fill.c
index 75c952c..aaa7783 100644
--- a/glamor/glamor_fill.c
+++ b
This will help tools like fips, apitrace, or INTEL_DEBUG=shader_time
provide useful information about the shaders in use.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor.c | 1 +
glamor/glamor_core.c | 20 +---
glamor/glamor_fill.c | 2
Markus Wick mar...@selfnet.de writes:
Am 2014-03-11 22:30, schrieb Eric Anholt:
diff --git a/glamor/glamor.h b/glamor/glamor.h
index e25dc73..9cda46d 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -131,14 +131,6 @@ extern _X_EXPORT void
glamor_set_screen_pixmap(PixmapPtr
Markus Wick mar...@selfnet.de writes:
I didn't find any issues in this patch, but I don't see the point:
Do we really want to convert a pixmap with 1 bit per pixel into a list
of enabled pixels on cpu?
Isn't it as easy to upload this pixmap as texture and do everything else
in the pixel
Michel Dänzer mic...@daenzer.net writes:
On Mit, 2014-03-12 at 17:37 -0700, Eric Anholt wrote:
Markus Wick mar...@selfnet.de writes:
Am 2014-03-11 22:30, schrieb Eric Anholt:
diff --git a/glamor/glamor.h b/glamor/glamor.h
index e25dc73..9cda46d 100644
--- a/glamor/glamor.h
+++ b
Michel Dänzer mic...@daenzer.net writes:
On Mon, 2014-03-10 at 14:10 -0700, Keith Packard wrote:
commit 25be6b384298a7769fedb6d9b5bdc370398c9c95
Author: Eric Anholt e...@anholt.net
Date: Sun Jan 12 07:18:50 2014 +0800
glamor: Fix a mismatched glamor_get/put_context().
We
Markus Wick mar...@selfnet.de writes:
Am 2014-03-11 22:30, schrieb Eric Anholt:
This unpacks the bitfield into an int size, but my experience has been
that packing bitfields doesn't matter for performance.
Signed-off-by: Eric Anholt e...@anholt.net
---
glamor/glamor_fbo.c | 2
it against null.
[glamor/glamor_egl.c:620] - [glamor/glamor_egl.c:622]:
(warning) Possible null pointer dereference: extension - otherwise
it is redundant to check it against null.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Eric Anholt e...@anholt.net
Markus Wick mar...@selfnet.de writes:
Am 2014-03-11 22:30, schrieb Eric Anholt:
The common pattern is to do nested if statements making calls to
prepare_access() and then pop those mappings back off in each set of
braces. Some cases checked for src == dst to avoid leaking mappings
to feed
Xlib all events, in case they those events happen to be ones that DRI2
GL is supposed to silently consume).
Reviewed-by: Eric Anholt e...@anholt.net
pgpAvAivNRodJ.pgp
Description: PGP signature
___
xorg-devel@lists.x.org: X.Org development
Archives
91dbd0af5bf8712d5b5409d82779cd3351660caf
Author: Eric Anholt e...@anholt.net
Date: Fri Mar 14 13:10:04 2014 -0700
glx: Make sure we get an FBConfig the root window's visual.
Signed-off-by: Eric Anholt e...@anholt.net
diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c
b/hw/kdrive/ephyr/ephyr_glamor_glx.c
* v_matrix.xz + v_matrix.yw;\n \
+#dst .zw = vec2(0.0,1.0);\n
+
+#endif /* _GLAMOR_TRANSFORM_H_ */
--
1.9.0
Patch 2-5 are:
Reviewed-by: Eric Anholt e...@anholt.net
I'm going afk for a bit, then I'll be back for more review.
pgp7iYpG8ziJJ.pgp
Description: PGP signature
Michel Dänzer mic...@daenzer.net writes:
From: Michel Dänzer michel.daen...@amd.com
It wasn't assigned yet when it was tested for GLAMOR_NO_DRI3.
Reviewed and sent it out in the big pull request. Thanks!
pgpI6B8hn2YsG.pgp
Description: PGP signature
)
Alan Coopersmith (1):
Remove duplicate assignment of repeat_type_uniform_location
Eric Anholt (29):
xephyr: Don't forget to glViewport() before drawing the screen.
glamor: Drop the set of the context to NULL at the end
Keith Packard kei...@keithp.com writes:
This just adds a bunch of support code to construct shaders from
'facets', which bundle attributes needed for each layer of the
rendering system. At this point, that includes only the primtive and
the fill stuff.
Signed-off-by: Keith Packard
Markus Wick mar...@selfnet.de writes:
Am 2014-03-19 06:09, schrieb Keith Packard:
These use glTexSubimage2D for upload and glReadPixels for
download. There are a variety of interfaces to the basic function as
needed by the callers.
Signed-off-by: Keith Packard kei...@keithp.com
---
Daniel Stone dan...@fooishbar.org writes:
Hi,
On 19 March 2014 05:09, Keith Packard kei...@keithp.com wrote:
+glPixelStorei(GL_UNPACK_ROW_LENGTH, byte_stride / bytes_per_pixel);
This isn't natively supported on GLES; it requires
GL_EXT_unpack_subimage, which isn't available on the vast
Keith Packard kei...@keithp.com writes:
I couldn't get the existing paths to work and they made no sense, so I
just wrote new ones.
Signed-off-by: Keith Packard kei...@keithp.com
---
glamor/Makefile.am | 2 +
glamor/glamor_prepare.c | 167
Keith Packard kei...@keithp.com writes:
This accelerates poly_fill_rect using GPU-based geometry computation
Signed-off-by: Keith Packard kei...@keithp.com
diff --git a/glamor/glamor_rects.c b/glamor/glamor_rects.c
new file mode 100644
index 000..22bb313
--- /dev/null
+++
Keith Packard kei...@keithp.com writes:
Use mi line code for now
x11perf -vseg100:
x before
+ after
+--+
| + x |
| +
Keith Packard kei...@keithp.com writes:
This just calls miPushPixels until glamor uses FBOs for bitmaps
The only cases that PushPixels() is called that I can find:
- miglblt.c
We're doing hand-accelerated glyph blits, so that's gone.
- miarc.c
I tried a few likely x11perfs and nothing hit
This reverts commit b5a61239e2fef167c229154d7919ff862503e3f3.
Not only did I screw up and introduce a warning, it turns out
glXChooseFBConfig() explicitly ignores this attribute. Thanks, GLX.
Signed-off-by: Eric Anholt e...@anholt.net
---
hw/kdrive/ephyr/ephyr_glamor_glx.c | 1 -
1 file
Markus Wick mar...@selfnet.de writes:
The mbr path was hard coded enabled for desktop gl and disabled for gles.
But there are both, desktop without mbr and mobiles with mbr.
I've pulled patches 1-9 for my next pull request, but I think in this
patch we should also apply this:
diff --git
Gaetan Nadon mems...@videotron.ca writes:
Signed-off-by: Gaetan Nadon mems...@videotron.ca
I've reviewed these two patches of yours and they'll be in my next pull
request. Thanks!
pgp9fgS47vd1t.pgp
Description: PGP signature
___
PolyPoint implementation (2014-03-26 12:58:40
-0700)
Eric Anholt (1):
kdrive: Remove duplicated definitions of some XV-related structs.
Gaetan Nadon (2):
ephyr: typo where () should be $() in the Makefile - breaks make
Keith Packard kei...@keithp.com writes:
This call is required for correct operation of the Render extension,
in particular it is necessary for software cursors and Composite to
work correctly.
Signed-off-by: Keith Packard kei...@keithp.com
---
glamor/glamor_render.c | 4
1 file
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 use indirect
GLX. I never quite got my patchset for global GL context management
finished (I think I
day. But this patch is:
Reviewed-by: Eric Anholt e...@anholt.net
pgpI6zafhPHtn.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/xorg
Keith Packard kei...@keithp.com writes:
This currently computes the GLSL version in a fairly naïve fashion,
and leaves that in the screen private for other users. This will let
us update the version computation in one place later on.
Signed-off-by: Keith Packard kei...@keithp.com
---
Keith Packard kei...@keithp.com writes:
These offer a simpler and more efficient means for temporarily
transitioning to CPU-accessible memory for fallback implementations.
diff --git a/glamor/glamor_prepare.c b/glamor/glamor_prepare.c
new file mode 100644
index 000..97029f9
---
Keith Packard kei...@keithp.com writes:
This accelerates spans operations using GPU-based geometry computation
Signed-off-by: Keith Packard kei...@keithp.com
+static Bool
+glamor_fill_spans_gl(DrawablePtr drawable,
+ GCPtr gc,
+ int n, DDXPointPtr
Eric Anholt e...@anholt.net writes:
Keith Packard kei...@keithp.com writes:
This currently computes the GLSL version in a fairly naïve fashion,
and leaves that in the screen private for other users. This will let
us update the version computation in one place later on.
Signed-off-by: Keith
Keith Packard kei...@keithp.com writes:
This accelerates poly_fill_rect using GPU-based geometry computation
Signed-off-by: Keith Packard kei...@keithp.com
I applied the same quads fix as for spans:
diff --git a/glamor/glamor_rects.c b/glamor/glamor_rects.c
index 8b50129..7731ede 100644
---
/~anholt/xserver glamor-pull-request
for you to fetch changes up to 588a9d02dbed7713da28ecd5239712fa6d39d1c9:
glamor: Add glamor_program based poly_text and image_text (2014-04-02
15:10:00 -0700)
Eric Anholt (1):
Revert glx: Make
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?
: 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
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
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
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
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
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
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
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
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
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:
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
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:
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
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
101 - 200 of 1093 matches
Mail list logo