1.17 status and schedule

[Keith Packard]

Axel Davy <axel.davy at ens.fr> writes:

> Actually we went up with a solution, the final patch wasn't sent to ml 
> for a reason
> I don't know or remember.
>
> Recently someone else complaint of the bug and I linked him to a 
> preliminary patch we had,
> and it fixed it for him.
> The preliminary patch was 
> http://markus.members.selfnet.de/xorg/xwayland.patch
>

That's this patch:

diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 54af275..b127b96 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -170,6 +170,7 @@ glamor_create_texture_from_image(ScreenPtr screen,
     glBindTexture(GL_TEXTURE_2D, *texture);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 
     glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, image);
     glBindTexture(GL_TEXTURE_2D, 0);
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 4be883f..7c2bd08 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -137,6 +137,10 @@ xwl_glamor_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, int depth)
 
     glGenTextures(1, &xwl_pixmap->texture);
     glBindTexture(GL_TEXTURE_2D, xwl_pixmap->texture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
+
     glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, xwl_pixmap->image);
     glBindTexture(GL_TEXTURE_2D, 0);

Eric says that we probably need the MIN_FILTER and MAG_FILTER bits, or
you'll probably get black, but the MAX_LEVEL changes aren't necessary.

> I think there was a more recent one, but I couldn't find it.

Let me know.

-- 
-keith
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 810 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20150110/9c5fc0d5/attachment.sig>