Re: [PATCH 2/8] glamor: the render Composite hook must call SourceValidate

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

Re: [PATCH 3/8] glamor: Stop calling eglMakeCurrent (.., EGL_NO_SURFACE)

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

Re: [PATCH 4/8] glamor: SetWindowPixmap is not related to RENDER

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

Re: [PATCH 02/16] glamor: Compute supported GLSL version and save in screen private

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 ---

Re: [PATCH 04/16] glamor: Replace fallback preparation code

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 ---

Re: [PATCH 05/16] glamor: Add glamor_program based fill/set/get spans

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

Re: [PATCH 02/16] glamor: Compute supported GLSL version and save in screen private

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

Re: [PATCH 06/16] glamor: Add glamor_program based poly_fill_rect

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 ---

[PULL] Reviewed glamor changes

/~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

[PULL] glamor fixes, cleanups, and your polypoint.

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

[PATCH] Revert glx: Make sure we get an FBConfig the root window's visual.

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

Re: [PATCH 06/10] glamor: Select VBO path by ARB_mbr extension.

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

Re: [PATCH xserver] xfree86: glamor_egl subdir must be distributed - breaks distcheck

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 ___

Re: [PATCH 06/20] glamor: Add infrastructure for generating shaders on the fly

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

Re: [PATCH 07/20] glamor: Add simple upload/download functions in glamor_transfer

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 ---

Re: [PATCH 07/20] glamor: Add simple upload/download functions in glamor_transfer

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

Re: [PATCH 08/20] glamor: Add new path for migrating pixmaps in/out of CPU memory

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

Re: [PATCH 11/20] glamor: Add glamor_program based poly_fill_rect

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 +++

Re: [PATCH 14/20] glamor: stub out lines

Keith Packard kei...@keithp.com writes: Use mi line code for now x11perf -vseg100: x before + after +--+ | + x | | +

Re: [PATCH 15/20] glamor: Provide a placeholder for glamor_pushpixels

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

Re: [PATCH] glamor: Move up glamor_priv-flags assignment in glamor_init()

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

[PULL] glamor megaseries

) 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

Re: [PATCH 01/10] ephyr: Deal with non-root visual for window

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

Re: [PATCH 06/10] glamor: Add infrastructure for generating shaders on the fly

* 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

Re: [PATCH] Xge: remove warning messages about missing Xge extension event translations

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

Re: [PATCH 21/27] glamor: Improve the performance of PushPixels by, well, pushing pixels.

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

Re: [PATCH 05/27] glamor: Do glyph private init at screeninit time, and other stuff at CSR.

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

Re: glamor performance regression

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

Re: [PATCH 16/27] glamor: Replace some goofy enum-likes with a real enum.

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

Re: [PATCH 1/2] glamor_*gl_has_extension: Move strlen after check for NULL string

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

Re: [PATCH 18/27] glamor: Allow nested mapping of pixmaps.

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

Re: [PATCH 05/27] glamor: Do glyph private init at screeninit time, and other stuff at CSR.

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

[PATCH 04/27] glamor: Move the EGL image to the normal pixmap private.

There's no reason to hide EGL from the rest of glamor, now that we have epoxy. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_egl.c | 89 +++- glamor/glamor_priv.h | 7 + 2 files changed, 47 insertions(+), 49 deletions(-) diff

glamor-server subset patch bomb

keithp said he was tired of the glamor stuff trickling in and wanted to just review it all at once and be done. I know I hate reviewing giant patch series, but who am I to argue with someone who says they want to do more review? This series fixes a bunch of CopyPlane XTS tests in Xephyr, thanks

[PATCH 06/27] sync: Add a header include necessary to use misyncstr.h

Signed-off-by: Eric Anholt e...@anholt.net --- miext/sync/misyncstr.h | 1 + 1 file changed, 1 insertion(+) diff --git a/miext/sync/misyncstr.h b/miext/sync/misyncstr.h index b5bf6fd..ad69e8e 100644 --- a/miext/sync/misyncstr.h +++ b/miext/sync/misyncstr.h @@ -29,6 +29,7 @@ #define

[PATCH 09/27] glamor: Drop duplicated lines for getting pixmap state in GetImage.

No change in generated code size -- apparently the compiler figured it out. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_getimage.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/glamor/glamor_getimage.c b/glamor/glamor_getimage.c index 5609e70..a932473 100644 --- a/glamor

[PATCH 21/27] glamor: Improve the performance of PushPixels by, well, pushing pixels.

Otherwise, mi will fall back to GetSpans()ing the bitmap, walking the bitmap, computing spans to be filled, and calling FillSpans(). Improves x11perf -f8text by 759.373% +/- 3.33096% (n=166) Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_glyphblt.c | 115

[PATCH 08/27] glamor: Return the stride/size for glamor_dri3_name_from_pixmap(), too.

Just like for a caller of glamor_dri3_fd_from_pixmap(), otherwise the consumer of that named buffer has no idea what GL chose for the stride. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 4 ++-- glamor/glamor.h | 3 ++- glamor/glamor_egl.c | 4 ++-- 3 files changed, 6

[PATCH 02/27] glamor: Drop the set of the context to NULL at the end of glamor ops.

The theory here was that it (which I copied from EGL) existed to fix up context switching with indirect GLX. But indirect GLX won't even try to set the context again unless its lastContext field is cleared, so we need to solve this a different way. Signed-off-by: Eric Anholt e...@anholt.net

[PATCH 13/27] glamor: Rename a variable to be more descriptive.

The valid_ prefix was used above to describe our allocation that gets reused multiple times, which is totally unrelated. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fill.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/glamor/glamor_fill.c b/glamor

[PATCH 10/27] glamor: Fix stack overflow in glamor_solid vertex handling.

ARRAY_SIZE(vertices) is 32 (floating point values), so we need to divide by the number of floats in a box like we do in the overflow case below. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fill.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glamor

[PATCH 12/27] glamor: Fix some integer overflow errors.

Imagine a nbox that was (UINT_MAX + small number) / (4 * 2 * sizeof(float)). We'd malloc a few bytes after the integer overflow, but glamor_set_normalize_vcoords would write over gigabytes of heap. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fill.c | 4 ++-- 1 file changed, 2

[PATCH 01/27] xephyr: Don't forget to glViewport() before drawing the screen.

, not the size of the xephyr screen. Signed-off-by: Eric Anholt e...@anholt.net --- hw/kdrive/ephyr/ephyr_glamor_glx.c | 15 +++ hw/kdrive/ephyr/ephyr_glamor_glx.h | 10 ++ hw/kdrive/ephyr/hostx.c| 4 3 files changed, 29 insertions(+) diff --git a/hw/kdrive/ephyr

[PATCH 07/27] glamor: Drop the body of the function for enabling DRI3 extensions.

The flag is already being set at glamor_egl_screen_init() time, so no need for the driver to separately call this. That said, leave the function around to keep the ABI compatibility. --- glamor/glamor.h | 8 glamor/glamor_egl.c | 7 +-- 2 files changed, 1 insertion(+), 14

[PATCH 17/27] glamor: Drop unused GLAMOR_ACCESS_WO.

Nothing was using it, and it was going to complicate the glamor_prepare_access bugfixing I'm going to do next. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 11 +-- glamor/glamor_priv.h | 1 - 2 files changed, 1 insertion(+), 11 deletions(-) diff --git

[PATCH 22/27] glamor: Improve the performance of PolyGlyphBlt.

-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_glyphblt.c | 138 +++ 1 file changed, 138 insertions(+) diff --git a/glamor/glamor_glyphblt.c b/glamor/glamor_glyphblt.c index 0a99a95..5d785a0 100644 --- a/glamor/glamor_glyphblt.c +++ b/glamor

[PATCH 16/27] glamor: Replace some goofy enum-likes with a real enum.

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 +- glamor/glamor_priv.h | 25 - 2 files changed, 17 insertions(+), 10

[PATCH 25/27] glamor: Add an assert about an invariant the upload code relies on.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index f4782e6..ff07483 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -725,6 +725,7

[PATCH 23/27] glamor: Improve the performance of line fallbacks.

% +/- 9.8968% (n=5) Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_polylines.c | 27 ++- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/glamor/glamor_polylines.c b/glamor/glamor_polylines.c index 697fc9e..1adf45d 100644 --- a/glamor

[PATCH 19/27] glamor: Rely on nested mappings to handle src==dst and !prepare bugs.

Now that the core deals with that for us, we can avoid all this extra carefulness. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_addtraps.c | 2 +- glamor/glamor_copyarea.c | 14 ++ glamor/glamor_copyplane.c| 13 +++-- glamor/glamor_core.c

[PATCH 14/27] glamor: Rename more solid fill variables to clean up the code.

Now the error path of allocation is more obvious: We leave things in the a-few-boxes-at-a-time stack memory state. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_fill.c | 34 -- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/glamor

[PATCH 26/27] glamor: Don't forget to unmap our PBOs before usng them to upload.

were only getting reaped at PBO destroy time, after the upload. If the GL implementation wasn't coherent, it would have used stale data to do the texture upload. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff

[PATCH 18/27] glamor: Allow nested mapping of pixmaps.

would result in trying to umap the inner and failing. By allowing nested mappings, we can fix both problems by not requiring the care from the caller, plus we can allow a simpler nesting of all the prepares in one if statement. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_core.c

[PATCH 15/27] glamor: Fix up doxygen for glamor_fill.c.

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

[PATCH 03/27] glamor: Use epoxy_has_egl_extension() instead of rolling our own.

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

[PATCH 20/27] glamor: Add missing prepares on the GC during fb fallbacks.

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

[PATCH 05/27] glamor: Do glyph private init at screeninit time, and other stuff at CSR.

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

[PATCH 11/27] glamor: Drop bogus _X_UNLIKELY.

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

[PATCH 27/27] glamor: Apply debug labels to our shaders.

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

Re: [PATCH 5/9] glamor: Track the next vertex offset as we go for non-AA traps.

Keith Packard kei...@keithp.com writes: Markus Wick mar...@selfnet.de writes: Am 2014-03-09 05:07, schrieb Eric Anholt: +vb += i * glamor_priv-vb_stride / 4; This should be / sizeof(float) instead. presumably GLfloat? We've been pretty good about not using the ugly GL types so far

Re: [PATCH 9/9] glamor: Use buffer_storage

Markus Wick mar...@selfnet.de writes: Am 2014-03-09 05:07, schrieb Eric Anholt: diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c index be2c2af..f736cbe 100644 --- a/glamor/glamor_vbo.c +++ b/glamor/glamor_vbo.c @@ -52,7 +52,49 @@ glamor_get_vbo_space(ScreenPtr screen, unsigned size

[PULL] glamor cleanups and VBO changes (and glx fix)

FBConfig attributes to 0 by default. (2014-03-10 13:31:14 -0700) Eric Anholt (14): glamor: remove dead global variable. glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE. glamor: Add a note about

Re: [PATCH 7/9] glamor: Extract the streamed vertex data code used by Render.

Markus Wick mar...@selfnet.de writes: Am 2014-03-09 05:07, schrieb Eric Anholt: diff --git a/glamor/glamor_vbo.c b/glamor/glamor_vbo.c new file mode 100644 index 000..be2c2af --- /dev/null +++ b/glamor/glamor_vbo.c @@ -0,0 +1,138 @@ +/* + * Copyright © 2014 Intel Corporation

Re: [PULL] glamor cleanups and VBO changes (and glx fix)

Eric Anholt e...@anholt.net writes: keithp said he was comfortable with the level of review on these, so here goes. I dropped the two changes from the two series that didn't get review comments: glViewport() in ephyr, and dropping glXMakeCurrent(None). The following changes since commit

[PATCH 8/9] glamor: Fix requested composite VBO size.

The argument to setup_composte_vbo is the number of verts. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_render.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 7829977..63bddfd 100644 --- a/glamor

[PATCH 5/9] glamor: Track the next vertex offset as we go for non-AA traps.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_trapezoid.c | 25 ++--- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c index 7bbee4b..a774c37 100644 --- a/glamor/glamor_trapezoid.c +++ b/glamor

[PATCH 9/9] glamor: Use buffer_storage

changes. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 2 ++ glamor/glamor_priv.h | 1 + glamor/glamor_vbo.c | 51 +-- 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index

[PATCH 1/9] glamor: Drop the set of the context to NULL at the end of glamor ops.

The theory here was that it (which I copied from EGL) existed to fix up context switching with indirect GLX. But indirect GLX won't even try to set the context again unless its lastContext field is cleared, so we need to solve this a different way. Signed-off-by: Eric Anholt e...@anholt.net

[PATCH 2/9] glamor: Don't forget to set GL_INVALIDATE_RANGE_BIT on GL_ARB_mbr.

We don't need any current contents of the buffer, and this allows an implementation to make a temporary BO for a streamed upload if it wants to. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_render.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glamor

[PATCH 6/9] glamor: Track the next vertex offset as we go for AA traps.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_trapezoid.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/glamor/glamor_trapezoid.c b/glamor/glamor_trapezoid.c index a774c37..4d2360d 100644 --- a/glamor/glamor_trapezoid.c +++ b/glamor

[PATCH 7/9] glamor: Extract the streamed vertex data code used by Render.

. - Add a comment about resize behavior. - Move glamor_vbo.c init code to glamor_vbo.c from glamor_render.c. (Derived from Markus's changes, but the GLES2 fix dropped almost all of the code in the functions). Signed-off-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am| 1

[PULL] non-glamor build fix

I've got a few other patches with review on the list currently, but I want to give a little more time for anyone that cares to respond. A build fix seems important enough that we should shove it in now, though. The following changes since commit 78e508c9379b3976ac8e76b7aaa90ba86ad4e443: dix:

Re: [PATCH 1/6] xephyr: Build support for rendering with glamor using a -glamor option.

Jon TURNEY jon.tur...@dronecode.org.uk writes: On 25/02/2014 01:47, Eric Anholt wrote: v2: Avoid making the Ximage for the screen that we'll never use, and drive the screen pixmap creation for glamor ourselves. Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Keith Packard kei

[PATCH 3/6] glamor: Add a note about the state of GL_ARB_map_buffer_range.

GLES2 Xephyr is failing due to lack of glMapBuffer() with the read bits set, and I decided to see if we can just switch everything to glMapBufferRange(). I'm undecided, and it largely depends on whether we find people are interested in using glamor for the windows X server. Signed-off-by: Eric

[PATCH 5/6] glamor: Fix a mismatched glamor_get/put_context().

We don't call GL in this function any more, so we can just drop the get. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_gradient.c | 5 - 1 file changed, 5 deletions(-) diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 9f6f1b1..6a7b528 100644 --- a/glamor

[PATCH 4/6] dix: Remove incorrect comment about privates.

PRIVATE_ALL was apparently dropped before this comment was added in commit 495fc3eb2d6c98bde82ae1278f89fcf131fd9bf8. Signed-off-by: Eric Anholt e...@anholt.net --- dix/privates.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dix/privates.c b/dix/privates.c index

[PATCH 2/6] glamor: Fix a spelling mistake in GLAMOR_PIXMAP_FBO_NOT_EXACT_SIZE.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 2 +- glamor/glamor_render.c | 2 +- glamor/glamor_utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index f1440f3..119e4d9 100644 --- a/glamor

[PATCH 6/6] xephyr: Don't forget to glViewport() before drawing the screen.

Fixes misrendering with cairogears. I had noticed the failure while trying to figure out what was going on with traps. Cairogears was apparently putting its results on the screen through putimage, which is a texture upload, so the last GL drawing was done to the size of the cairogears window,

little glamor cleanups (and a dix cleanup)

Here are some trivial patches from the glamor-server branch for review. I'm planning to send out the VBO changes next, which get us closer to making glamor not actually suck for performance. These are on the glamor-cleanups branch of my tree, branched from glamor-pull-request.

[PATCH 1/6] glamor: remove dead global variable.

Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor_pixmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 77197b5..f1440f3 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -697,7 +697,6

[PATCH] glx: Clear new FBConfig attributes to 0 by default.

system, which as you might guess was slightly lower performance than expected. Signed-off-by: Eric Anholt e...@anholt.net --- glx/glxdricommon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 69d4b29..62cce13 100644 --- a/glx

[PULL] glamor xephyr and xorg changes

changes up to da08316605b26830b4d8f8fb2d9e69471cdc80ab: glamor: Add support for DRI3. (2014-03-05 13:10:24 -0800) Eric Anholt (6): xephyr: Build support for rendering with glamor using a -glamor option. xephyr: Pass

Re: [PATCH 1/2] xf86Config: Fix warning: declaration of 'Pointer' shadows a global

pusehd the reviewed change for inputproto yet. I'd rather see that land. Patch 2/2 is: Reviewed-by: Eric Anholt e...@anholt.net (I had similar, but it got nitpicked and I just don't care what type gets used). pgpZYCmRHVfI_.pgp Description: PGP signature

[PATCH 5/6 v2] glamor: Rename the DRI-related pixmap functions.

-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 10 +- glamor/glamor.h | 53 + glamor/glamor_egl.c | 12 ++-- 3 files changed, 40 insertions(+), 35 deletions(-) diff --git a/glamor/glamor.c b/glamor/glamor.c index

Re: [PATCH 6/6] glamor: Add support for DRI3.

davya...@free.fr writes: Hi, While for XWayland we want to provide our own dri3_open, we still want to have glamor enabling the dri3 support That is rather a GLAMOR_NO_DRI3_SETUP flag and +if (glamor_egl-dri3_capable !(glamor_priv-flags GLAMOR_NO_DRI3)) { +/* Tell the

[PATCH 4/6] xorg: Connect up the glamor XV code, xorg DDX-only for now.

the xv ABI later). v3: Fix last minute breakage of having reintroduced xf86ScrnToScreen (one of the compat macros). Just use the drawable's pScreen instead. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am| 1 - glamor/glamor.h | 5

[PATCH 2/6] xephyr: Pass incoming XCB events to the Xlib event filter.

This is the same thing that Qt ended up doing to get DRI2's event mangling to happen despite using an XCB event loop. Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Keith Packard kei...@keithp.com --- hw/kdrive/ephyr/ephyr.c| 3 +++ hw/kdrive/ephyr/ephyr_glamor_glx.c | 39

glamor: Enabling xephyr and Xorg.

Here's a short series to make the server glamor stuff actually testable. I'm now running glamor for my normal desktop, and the xephyr bits work too. I pulled out changes that would have required more from the intel 2d driver: now it's just a matter of not linking to the external module's

[PATCH 3/6] xorg: Build a glamor_egl module.

-by: Eric Anholt e...@anholt.net --- configure.ac | 11 +++ glamor/glamor_eglmodule.c | 3 ++- hw/xfree86/Makefile.am| 7 ++- hw/xfree86/glamor_egl/Makefile.am | 39 +++ include/dix-config.h.in | 3 +++ 5

[PATCH 1/6] xephyr: Build support for rendering with glamor using a -glamor option.

v2: Avoid making the Ximage for the screen that we'll never use, and drive the screen pixmap creation for glamor ourselves. Signed-off-by: Eric Anholt e...@anholt.net Reviewed-by: Keith Packard kei...@keithp.com (v1) --- configure.ac | 3 + glamor/glamor.c

[PATCH 6/6] glamor: Add support for DRI3.

discussion with keithp was that if the driver's dri3_open for a provider on a different screen, that's a core dri3 bug. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.h | 4 +- glamor/glamor_egl.c | 78 +++ hw

[PATCH 5/6] glamor: Rename the DRI-related pixmap functions.

There was confusion over whether they should have egl in the name, and they had DRI3 in the name even though they're useful to have without DRI3. Signed-off-by: Eric Anholt e...@anholt.net --- glamor/glamor.c | 10 +- glamor/glamor.h | 54

[PATCH 4/6] xorg: Connect up the glamor XV code, xorg DDX-only for now.

the xv ABI later). Signed-off-by: Eric Anholt e...@anholt.net --- glamor/Makefile.am| 1 - glamor/glamor.h | 5 - glamor/glamor_eglmodule.c | 2 +- glamor/glamor_xv.c| 17 ++--- hw/xfree86/glamor_egl/Makefile.am | 1 + 5

Re: [PATCH] exa: Fix a warning when enabling DEBUG_TRACE_FALL

Reviewed-by: Eric Anholt e...@anholt.net pgptLseT_DeD7.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-devel

Re: [PATCH 09/15] glamor: Unifdef the picture-format-to-format-and-type functions.

Keith Packard kei...@keithp.com writes: Eric Anholt e...@anholt.net writes: There's no way these should be in a header file, but I'll leave that cleanup until later. I don't understand this comment; did you flip the order of 08/15 and 09/15 at some point and not rewrite it? Yep

[PULL] reviewed glamor changes

changes up to 3d71df48e70884deccb293cf1fcffbdba8efd94b: glamor: Move the EGL DRI3 code to GLAMOR_HAS_GBM. (2014-02-14 18:30:01 -0800) Eric Anholt (17): glamor: Convert to using libepoxy. glamor: Rename glamor_get

Re: [PATCH] glx: Ignore unused function warnings

Keith Packard kei...@keithp.com writes: indirect_dispatch_swap.c, which is autogenerated from a mesa script, contains the function 'bswap_CARD64', which is never used in the file. While it would be nice to fix this upstream, that's hard, so this change causes these warnings to be ignored for

Re: [PATCH] ephyr: Repaint entire screen when colormap is updated

Keith Packard kei...@keithp.com writes: Any time the colormap is changed, the entire screen needs to be repainted to match. Revviewed-by: Eric Anholt e...@anholt.net pgp4JvCVe4emQ.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

Re: [PATCH 04/15] glamor: Drop a bunch of GLES2 ifdefs.

Michel Dänzer mic...@daenzer.net writes: On Mon, 2014-02-03 at 11:03 -0800, Eric Anholt wrote: Now that we're using epoxy, we can write code using both desktop and ES symbols and decide what to use at runtime. Nice. diff --git a/glamor/glamor_copyarea.c b/glamor/glamor_copyarea.c index

Re: [PATCH] ephyr: Repaint entire screen when colormap is updated

DamageReportDamage() to be used instead, but this is safe because we're using DamageReportNone (and leaving the blockhandler to do our paint). Reviewed-by: Eric Anholt e...@anholt.net pgp8_m0ybxCFV.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org

<    4   5   6   7   8   9   10   11   >