Eric Anholt <[email protected]> writes: > keithp was saying he was holding the merge window open for a few last > bits of glamor and wayland stuff for 1.16. This is as far as I was able > to review of keithp's code today.
I'm still waiting for Xwayland today. Note that x11perf -all crashes
because of the glamor putimage code, so I'd love to get the new version
of that merged for 1.16 as well as a bug fix.
> Eric Anholt (1):
> Revert "glx: Make sure we get an FBConfig the root window's visual."
>
> Keith Packard (14):
> glamor: glamor_poly_point_nf cannot fail for non-DDX pixmaps
> glamor: SetWindowPixmap is not related to RENDER
> glamor: Initialize XV shaders from glamor_xv_init instead of glamor_init
> glamor: Public polyLines function is glamor_poly_lines_nf
> glamor: Remove warning message when pixmap cannot be stored in a texture
> glamor: Bail from composite when pixmap cannot be uploaded
> fb: Publish fbGlyphs and fbUnrealizeGlyph
> glamor: Compute supported GLSL version and save in screen private
> glamor: Use plain GLSL 1.20 features for fill code.
I squashed in a patch for this; the vertex shader needed to see the
fill_size uniform now:
diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c
index cdd95ea..0f4d0f0 100644
--- a/glamor/glamor_program.c
+++ b/glamor/glamor_program.c
@@ -107,6 +107,7 @@ static glamor_location_var location_vars[] = {
{
.location = glamor_program_location_fill,
.vs_vars = ("uniform vec2 fill_offset;\n"
+ "uniform vec2 fill_size;\n"
"varying vec2 fill_pos;\n"),
.fs_vars = ("uniform sampler2D sampler;\n"
"uniform vec2 fill_size;\n"
> glamor: Add simple upload/download functions in glamor_transfer
> glamor: Add glamor_program based fill/set/get spans
> glamor: Add glamor_program based poly_fill_rect
> glamor: Use glamor_program for glamor_glyphblt
> glamor: Add glamor_program based poly_text and image_text
Merged (with minor fix above):
84f9774..3c34dd3 master -> master
--
[email protected]
pgp4lSUQaYbc5.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
