xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Sep 15 19:21:04 UTC 2021
configure.ac | 3
glamor/Makefile.am | 1
glamor/glamor.c | 30 --
glamor/glamor_context.h | 27 --
glamor/glamor_egl.c | 16 -
glamor/glamor_glx.c | 68 -----
glamor/meson.build | 1
hw/kdrive/ephyr/Makefile.am | 4
hw/kdrive/ephyr/ephyr.c | 5
hw/kdrive/ephyr/ephyr.h | 5
hw/kdrive/ephyr/ephyr_glamor.c | 378 ++++++++++++++++++++++++++++
hw/kdrive/ephyr/ephyr_glamor.h | 22 -
hw/kdrive/ephyr/ephyr_glamor_glx.c | 429 --------------------------------
hw/kdrive/ephyr/hostx.c | 25 -
hw/kdrive/ephyr/meson.build | 3
hw/xwayland/xwayland-glamor-eglstream.c | 41 ---
hw/xwayland/xwayland-glamor-gbm.c | 7
17 files changed, 419 insertions(+), 646 deletions(-)
New commits:
commit ecdf21035ec1990ff7ae378b1d6c310a5b3036dc
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Jul 9 17:14:47 2021 -0400
glamor: Assume EGL in glamor_context
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/glamor/glamor_context.h b/glamor/glamor_context.h
index 47b87e620..50986971c 100644
--- a/glamor/glamor_context.h
+++ b/glamor/glamor_context.h
@@ -21,29 +21,26 @@
* IN THE SOFTWARE.
*/
+#ifndef GLAMOR_CONTEXT_H
+#define GLAMOR_CONTEXT_H
+
+#include <epoxy/egl.h>
+
/**
* @file glamor_context.h
*
* This is the struct of state required for context switching in
- * glamor. It has to use types that don't require including either
- * server headers or Xlib headers, since it will be included by both
- * the server and the GLX (xlib) code.
+ * glamor. Initially this was abstracted away from EGL, and
+ * presumably it would need to be again if someone wanted to use
+ * glamor with WGL/CGL.
*/
struct glamor_context {
- /** Either an EGLDisplay or an Xlib Display */
- void *display;
-
- /** Either a GLXContext or an EGLContext. */
- void *ctx;
-
- /** The EGLSurface we should MakeCurrent to */
- void *drawable;
-
- /** The GLXDrawable we should MakeCurrent to */
- uint32_t drawable_xid;
+ EGLDisplay display;
+ EGLContext ctx;
+ EGLSurface surface;
void (*make_current)(struct glamor_context *glamor_ctx);
};
-Bool glamor_glx_screen_init(struct glamor_context *glamor_ctx);
+#endif
commit 7d5b4c5405c3fb1a1b7906c02ced81880916199e
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Aug 17 12:41:08 2021 -0400
glamor: Require EGL_KHR_no_config_context
This is not actually a change for xwayland with gbm, or for xfree86 with
big-GL, but we do change them as well to use EGL_NO_CONFIG_KHR
explicitly.
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 6e0fc6596..60d0df893 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -933,8 +933,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
{
struct glamor_egl_screen_private *glamor_egl;
const GLubyte *renderer;
- EGLConfig egl_config;
- int n;
glamor_egl = calloc(sizeof(*glamor_egl), 1);
if (glamor_egl == NULL)
@@ -977,6 +975,7 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
}
GLAMOR_CHECK_EGL_EXTENSION(KHR_surfaceless_context);
+ GLAMOR_CHECK_EGL_EXTENSION(KHR_no_config_context);
if (eglBindAPI(EGL_OPENGL_API)) {
static const EGLint config_attribs_core[] = {
@@ -993,12 +992,13 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
};
glamor_egl->context = eglCreateContext(glamor_egl->display,
- NULL, EGL_NO_CONTEXT,
+ EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT,
config_attribs_core);
if (glamor_egl->context == EGL_NO_CONTEXT)
glamor_egl->context = eglCreateContext(glamor_egl->display,
- NULL, EGL_NO_CONTEXT,
+ EGL_NO_CONFIG_KHR,
+ EGL_NO_CONTEXT,
config_attribs);
}
@@ -1029,14 +1029,8 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
goto error;
}
- if (!eglChooseConfig(glamor_egl->display, NULL, &egl_config, 1, &n)) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR,
- "glamor: No acceptable EGL configs found\n");
- goto error;
- }
-
glamor_egl->context = eglCreateContext(glamor_egl->display,
- egl_config, EGL_NO_CONTEXT,
+ EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT,
config_attribs);
if (glamor_egl->context == EGL_NO_CONTEXT) {
diff --git a/hw/kdrive/ephyr/ephyr_glamor.c b/hw/kdrive/ephyr/ephyr_glamor.c
index 44e48ff59..724611d69 100644
--- a/hw/kdrive/ephyr/ephyr_glamor.c
+++ b/hw/kdrive/ephyr/ephyr_glamor.c
@@ -325,7 +325,7 @@ ephyr_glamor_screen_init(xcb_window_t win, xcb_visualid_t vid)
context_attribs[i++] = ephyr_glamor_gles2 ? 0 : 1;
context_attribs[i++] = EGL_NONE;
- ctx = eglCreateContext(glamor->dpy, config, EGL_NO_CONTEXT,
+ ctx = eglCreateContext(glamor->dpy, EGL_NO_CONFIG_KHR, EGL_NO_CONTEXT,
context_attribs);
if (ctx == NULL)
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index 8151d7776..28666460d 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -989,8 +989,10 @@ xwl_glamor_eglstream_init_egl(struct xwl_screen *xwl_screen)
#endif
eglBindAPI(EGL_OPENGL_API);
- xwl_screen->egl_context = eglCreateContext(
- xwl_screen->egl_display, config, EGL_NO_CONTEXT, attrib_list);
+ xwl_screen->egl_context = eglCreateContext(xwl_screen->egl_display,
+ EGL_NO_CONFIG_KHR,
+ EGL_NO_CONTEXT,
+ attrib_list);
if (xwl_screen->egl_context == EGL_NO_CONTEXT) {
ErrorF("Failed to create main EGL context: 0x%x\n", eglGetError());
goto error;
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
index 12d820e44..b829cbd34 100644
--- a/hw/xwayland/xwayland-glamor-gbm.c
+++ b/hw/xwayland/xwayland-glamor-gbm.c
@@ -785,12 +785,12 @@ xwl_glamor_try_big_gl_api(struct xwl_screen *xwl_screen)
eglBindAPI(EGL_OPENGL_API);
xwl_screen->egl_context =
- eglCreateContext(xwl_screen->egl_display, NULL,
+ eglCreateContext(xwl_screen->egl_display, EGL_NO_CONFIG_KHR,
EGL_NO_CONTEXT, config_attribs_core);
if (xwl_screen->egl_context == EGL_NO_CONTEXT)
xwl_screen->egl_context =
- eglCreateContext(xwl_screen->egl_display, NULL,
+ eglCreateContext(xwl_screen->egl_display, EGL_NO_CONFIG_KHR,
EGL_NO_CONTEXT, NULL);
if (!xwl_glamor_try_to_make_context_current(xwl_screen)) {
@@ -824,7 +824,8 @@ xwl_glamor_try_gles_api(struct xwl_screen *xwl_screen)
eglBindAPI(EGL_OPENGL_ES_API);
- xwl_screen->egl_context = eglCreateContext(xwl_screen->egl_display, NULL,
+ xwl_screen->egl_context = eglCreateContext(xwl_screen->egl_display,
+ EGL_NO_CONFIG_KHR,
EGL_NO_CONTEXT, gles_attribs);
if (!xwl_glamor_try_to_make_context_current(xwl_screen)) {
commit abda3f42337118f5e904853c60221f4775b75e05
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 12 15:31:02 2021 -0400
wayland/streams: Don't open-code glamor_compile_glsl_prog
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
index b678eaa10..8151d7776 100644
--- a/hw/xwayland/xwayland-glamor-eglstream.c
+++ b/hw/xwayland/xwayland-glamor-eglstream.c
@@ -99,37 +99,6 @@ xwl_eglstream_get(struct xwl_screen *xwl_screen)
&xwl_eglstream_private_key);
}
-static GLint
-xwl_eglstream_compile_glsl_prog(GLenum type, const char *source)
-{
- GLint ok;
- GLint prog;
-
- prog = glCreateShader(type);
- glShaderSource(prog, 1, (const GLchar **) &source, NULL);
- glCompileShader(prog);
- glGetShaderiv(prog, GL_COMPILE_STATUS, &ok);
- if (!ok) {
- GLchar *info;
- GLint size;
-
- glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size);
- info = malloc(size);
- if (info) {
- glGetShaderInfoLog(prog, size, NULL, info);
- ErrorF("Failed to compile %s: %s\n",
- type == GL_FRAGMENT_SHADER ? "FS" : "VS", info);
- ErrorF("Program source:\n%s", source);
- free(info);
- }
- else
- ErrorF("Failed to get shader compilation info.\n");
- FatalError("GLSL compile failure\n");
- }
-
- return prog;
-}
-
static GLuint
xwl_eglstream_build_glsl_prog(GLuint vs, GLuint fs)
{
@@ -775,8 +744,8 @@ xwl_eglstream_init_shaders(struct xwl_screen *xwl_screen)
0, 0,
};
- vs = xwl_eglstream_compile_glsl_prog(GL_VERTEX_SHADER, blit_vs_src);
- fs = xwl_eglstream_compile_glsl_prog(GL_FRAGMENT_SHADER, blit_fs_src);
+ vs = glamor_compile_glsl_prog(GL_VERTEX_SHADER, blit_vs_src);
+ fs = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, blit_fs_src);
xwl_eglstream->blit_prog = xwl_eglstream_build_glsl_prog(vs, fs);
glDeleteShader(vs);
commit 22772f0068aad2b18b2dafe538b24a9816409c7b
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 12 15:29:25 2021 -0400
ephyr: Don't open-code glamor_compile_glsl_prog
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/hw/kdrive/ephyr/ephyr_glamor.c b/hw/kdrive/ephyr/ephyr_glamor.c
index 1e22cbd02..44e48ff59 100644
--- a/hw/kdrive/ephyr/ephyr_glamor.c
+++ b/hw/kdrive/ephyr/ephyr_glamor.c
@@ -69,37 +69,6 @@ struct ephyr_glamor {
GLuint vao, vbo;
};
-static GLint
-ephyr_glamor_compile_glsl_prog(GLenum type, const char *source)
-{
- GLint ok;
- GLint prog;
-
- prog = glCreateShader(type);
- glShaderSource(prog, 1, (const GLchar **) &source, NULL);
- glCompileShader(prog);
- glGetShaderiv(prog, GL_COMPILE_STATUS, &ok);
- if (!ok) {
- GLchar *info;
- GLint size;
-
- glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size);
- info = malloc(size);
- if (info) {
- glGetShaderInfoLog(prog, size, NULL, info);
- ErrorF("Failed to compile %s: %s\n",
- type == GL_FRAGMENT_SHADER ? "FS" : "VS", info);
- ErrorF("Program source:\n%s", source);
- free(info);
- }
- else
- ErrorF("Failed to get shader compilation info.\n");
- FatalError("GLSL compile failure\n");
- }
-
- return prog;
-}
-
static GLuint
ephyr_glamor_build_glsl_prog(GLuint vs, GLuint fs)
{
@@ -156,8 +125,8 @@ ephyr_glamor_setup_texturing_shader(struct ephyr_glamor *glamor)
GLuint fs, vs, prog;
- vs = ephyr_glamor_compile_glsl_prog(GL_VERTEX_SHADER, vs_source);
- fs = ephyr_glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, fs_source);
+ vs = glamor_compile_glsl_prog(GL_VERTEX_SHADER, vs_source);
+ fs = glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, fs_source);
prog = ephyr_glamor_build_glsl_prog(vs, fs);
glamor->texture_shader = prog;
commit ea92cd2272b93cef53a08df8aa6c68817b88b8ca
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Jul 2 15:27:44 2021 -0400
glamor: Don't open-code epoxy_glsl_version()
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index 65fb132e5..9dcef5fac 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -618,10 +618,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
{
glamor_screen_private *glamor_priv;
int gl_version;
- int glsl_major, glsl_minor;
int max_viewport_size[2];
- const char *shading_version_string;
- int shading_version_offset;
PictureScreenPtr ps = GetPictureScreenIfSet(screen);
@@ -683,29 +680,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_priv->is_core_profile =
gl_version >= 31 && !epoxy_has_gl_extension("GL_ARB_compatibility");
- shading_version_string = (char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
-
- if (!shading_version_string) {
- LogMessage(X_WARNING,
- "glamor%d: Failed to get GLSL version\n",
- screen->myNum);
- goto fail;
- }
-
- shading_version_offset = 0;
- if (strncmp("OpenGL ES GLSL ES ", shading_version_string, 18) == 0)
- shading_version_offset = 18;
-
- if (sscanf(shading_version_string + shading_version_offset,
- "%i.%i",
- &glsl_major,
- &glsl_minor) != 2) {
- LogMessage(X_WARNING,
- "glamor%d: Failed to parse GLSL version string %s\n",
- screen->myNum, shading_version_string);
- goto fail;
- }
- glamor_priv->glsl_version = glsl_major * 100 + glsl_minor;
+ glamor_priv->glsl_version = epoxy_glsl_version();
if (glamor_priv->is_gles) {
/* Force us back to the base version of our programs on an ES
commit 07fa12ad1d7018df92285b7f27dea0f128ef86c8
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Jul 1 15:40:19 2021 -0400
ephyr/glamor: Port to EGL
There's no real benefit to using GLX, and the other DDXes are using EGL
already, so let's converge on EGL so we can concentrate the fixes in one
place.
We go to some effort to avoid being the thing that requires libX11 here.
We prefer EGL_EXT_platform_xcb over _x11, and if forced to use the
latter we'll ask the dynamic linker for XGetXCBConnection and
XOpenDisplay rather than link against xlib stuff ourselves. Xephyr is
now a pure XCB application if it can be.
Reviewed-by: Emma Anholt <emma at anholt.net>
diff --git a/configure.ac b/configure.ac
index 09e7a06ef..e3fa6f4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2192,9 +2192,6 @@ if test "$KDRIVE" = yes; then
if test "x$DRI" = xyes && test "x$GLX" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBDRM xcb-glx xcb-xf86dri > 1.6"
fi
- if test "x$GLAMOR" = xyes; then
- XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS x11-xcb"
- fi
if test "x$XEPHYR" = xauto; then
PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
diff --git a/glamor/Makefile.am b/glamor/Makefile.am
index aaf0aab17..7069fbd16 100644
--- a/glamor/Makefile.am
+++ b/glamor/Makefile.am
@@ -13,7 +13,6 @@ libglamor_la_SOURCES = \
glamor_debug.h \
glamor_font.c \
glamor_font.h \
- glamor_glx.c \
glamor_composite_glyphs.c \
glamor_image.c \
glamor_lines.c \
diff --git a/glamor/glamor.c b/glamor/glamor.c
index da2ea94ba..65fb132e5 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -670,9 +670,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
* register correct close screen function. */
if (flags & GLAMOR_USE_EGL_SCREEN) {
glamor_egl_screen_init(screen, &glamor_priv->ctx);
- } else {
- if (!glamor_glx_screen_init(&glamor_priv->ctx))
- goto fail;
}
glamor_make_current(glamor_priv);
diff --git a/glamor/glamor_glx.c b/glamor/glamor_glx.c
deleted file mode 100644
index 7107c7c17..000000000
--- a/glamor/glamor_glx.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include <epoxy/glx.h>
-#include "glamor_context.h"
-
-/**
- * @file glamor_glx.c
- *
- * GLX context management for glamor.
- *
- * This has to be kept separate from the server sources because of
- * Xlib's conflicting definition of CARD32 and similar typedefs.
- */
-
-static void
-glamor_glx_make_current(struct glamor_context *glamor_ctx)
-{
- /* There's only a single global dispatch table in Mesa. EGL, GLX,
- * and AIGLX's direct dispatch table manipulation don't talk to
- * each other. We need to set the context to NULL first to avoid
- * GLX's no-op context change fast path when switching back to
- * GLX.
- */
- glXMakeCurrent(glamor_ctx->display, None, None);
-
- glXMakeCurrent(glamor_ctx->display, glamor_ctx->drawable_xid,
- glamor_ctx->ctx);
-}
-
-
-Bool
-glamor_glx_screen_init(struct glamor_context *glamor_ctx)
-{
- glamor_ctx->ctx = glXGetCurrentContext();
- if (!glamor_ctx->ctx)
- return False;
-
- glamor_ctx->display = glXGetCurrentDisplay();
- if (!glamor_ctx->display)
- return False;
-
- glamor_ctx->drawable_xid = glXGetCurrentDrawable();
-
- glamor_ctx->make_current = glamor_glx_make_current;
-
- return True;
-}
diff --git a/glamor/meson.build b/glamor/meson.build
index 268af593e..4a3f6241a 100644
--- a/glamor/meson.build
+++ b/glamor/meson.build
@@ -4,7 +4,6 @@ srcs_glamor = [
'glamor_core.c',
'glamor_dash.c',
'glamor_font.c',
- 'glamor_glx.c',
'glamor_composite_glyphs.c',
'glamor_image.c',
'glamor_lines.c',
diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am
index d12559b39..a3d6b1c02 100644
--- a/hw/kdrive/ephyr/Makefile.am
+++ b/hw/kdrive/ephyr/Makefile.am
@@ -41,8 +41,8 @@ GLAMOR_XV_SRCS = ephyr_glamor_xv.c
endif
GLAMOR_SRCS = \
- ephyr_glamor_glx.c \
- ephyr_glamor_glx.h \
+ ephyr_glamor.c \
+ ephyr_glamor.h \
$(GLAMOR_XV_SRCS) \
$()
endif
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index c503ad6a6..9236252b2 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -39,7 +39,7 @@
#ifdef GLAMOR
#include "glamor.h"
#endif
-#include "ephyr_glamor_glx.h"
+#include "ephyr_glamor.h"
#include "glx_extinit.h"
#include "xkbsrv.h"
@@ -1171,9 +1171,6 @@ ephyrXcbProcessEvents(Bool queued_only)
}
if (xev) {
- if (ephyr_glamor)
- ephyr_glamor_process_event(xev);
-
free(xev);
}
}
diff --git a/hw/kdrive/ephyr/ephyr.h b/hw/kdrive/ephyr/ephyr.h
index 587a48dc7..8833de8a9 100644
--- a/hw/kdrive/ephyr/ephyr.h
+++ b/hw/kdrive/ephyr/ephyr.h
@@ -71,6 +71,7 @@ typedef struct _ephyrScrPriv {
xcb_window_t win;
xcb_window_t win_pre_existing; /* Set via -parent option like xnest */
xcb_window_t peer_win; /* Used for GL; should be at most one */
+ xcb_visualid_t vid;
xcb_image_t *ximg;
Bool win_explicit_position;
int win_x, win_y;
@@ -87,10 +88,6 @@ typedef struct _ephyrScrPriv {
ScreenBlockHandlerProcPtr BlockHandler;
- /**
- * Per-screen Xlib-using state for glamor (private to
- * ephyr_glamor_glx.c)
- */
struct ephyr_glamor *glamor;
} EphyrScrPriv;
diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.c b/hw/kdrive/ephyr/ephyr_glamor.c
similarity index 57%
rename from hw/kdrive/ephyr/ephyr_glamor_glx.c
rename to hw/kdrive/ephyr/ephyr_glamor.c
index 40b80cbe7..1e22cbd02 100644
--- a/hw/kdrive/ephyr/ephyr_glamor_glx.c
+++ b/hw/kdrive/ephyr/ephyr_glamor.c
@@ -21,25 +21,20 @@
* IN THE SOFTWARE.
*/
-/** @file ephyr_glamor_glx.c
+/** @file ephyr_glamor.c
*
- * Separate file for hiding Xlib and GLX-using parts of xephyr from
- * the rest of the server-struct-aware build.
+ * Glamor support and EGL setup.
*/
#include <stdlib.h>
-#include <X11/Xlib.h>
-#include <X11/Xlibint.h>
-#undef Xcalloc
-#undef Xrealloc
-#undef Xfree
-#include <X11/Xlib-xcb.h>
+#include <stdint.h>
+#include <xcb/xcb.h>
#include <xcb/xcb_aux.h>
#include <pixman.h>
-#include <epoxy/glx.h>
-#include "ephyr_glamor_glx.h"
+#include "glamor_egl.h"
+#include "glamor_priv.h"
+#include "ephyr_glamor.h"
#include "os.h"
-#include <X11/Xproto.h>
/* until we need geometry shaders GL3.1 should suffice. */
/* Xephyr has its own copy of this for build reasons */
@@ -47,15 +42,8 @@
#define GLAMOR_GL_CORE_VER_MINOR 1
/** @{
*
- * global state for Xephyr with glamor.
- *
- * Xephyr can render with multiple windows, but all the windows have
- * to be on the same X connection and all have to have the same
- * visual.
+ * global state for Xephyr with glamor, all of which is arguably a bug.
*/
-static Display *dpy;
-static XVisualInfo *visual_info;
-static GLXFBConfig fb_config;
Bool ephyr_glamor_gles2;
Bool ephyr_glamor_skip_present;
/** @} */
@@ -64,9 +52,10 @@ Bool ephyr_glamor_skip_present;
* Per-screen state for Xephyr with glamor.
*/
struct ephyr_glamor {
- GLXContext ctx;
- Window win;
- GLXWindow glx_win;
+ EGLDisplay dpy;
+ EGLContext ctx;
+ xcb_window_t win;
+ EGLSurface egl_win;
GLuint tex;
@@ -178,16 +167,86 @@ ephyr_glamor_setup_texturing_shader(struct ephyr_glamor *glamor)
assert(glamor->texture_shader_texcoord_loc != -1);
}
+#ifndef EGL_PLATFORM_XCB_EXT
+#define EGL_PLATFORM_XCB_EXT 0x31DC
+#endif
+
+#include <dlfcn.h>
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+
+/* (loud booing)
+ *
+ * keeping this as a static variable is bad form, we _could_ have zaphod heads
+ * on different displays (for example). but other bits of Xephyr are already
+ * broken for that case, and fixing that would entail fixing the rest of the
+ * contortions with hostx.c anyway, so this works for now.
+ */
+static EGLDisplay edpy = EGL_NO_DISPLAY;
+
xcb_connection_t *
ephyr_glamor_connect(void)
{
- dpy = XOpenDisplay(NULL);
- if (!dpy)
- return NULL;
+ int major = 0, minor = 0;
+
+ /*
+ * Try pure xcb first. If that doesn't work but we can find XOpenDisplay,
+ * fall back to xlib. This lets us potentially not load libX11 at all, if
+ * the EGL is also pure xcb.
+ */
+
+ if (epoxy_has_egl_extension(EGL_NO_DISPLAY, "EGL_EXT_platform_xcb")) {
+ xcb_connection_t *conn = xcb_connect(NULL, NULL);
+ EGLDisplay dpy = glamor_egl_get_display(EGL_PLATFORM_XCB_EXT, conn);
+
+ if (dpy == EGL_NO_DISPLAY) {
+ xcb_disconnect(conn);
+ return NULL;
+ }
+
+ edpy = dpy;
+ eglInitialize(dpy, &major, &minor);
+ return conn;
+ }
+
+ if (epoxy_has_egl_extension(EGL_NO_DISPLAY, "EGL_EXT_platform_x11") ||
+ epoxy_has_egl_extension(EGL_NO_DISPLAY, "EGL_KHR_platform_x11)")) {
+ void *lib = NULL;
+ xcb_connection_t *ret = NULL;
+ void *(*x_open_display)(void *) =
+ (void *) dlsym(RTLD_DEFAULT, "XOpenDisplay");
+ xcb_connection_t *(*x_get_xcb_connection)(void *) =
+ (void *) dlsym(RTLD_DEFAULT, "XGetXCBConnection");
+
+ if (x_open_display == NULL)
+ return NULL;
+
+ if (x_get_xcb_connection == NULL) {
+ lib = dlopen("libX11-xcb.so.1", RTLD_LOCAL | RTLD_LAZY);
+ x_get_xcb_connection =
+ (void *) dlsym(lib, "XGetXCBConnection");
+ }
+
+ if (x_get_xcb_connection == NULL)
+ goto out;
- XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
+ void *xdpy = x_open_display(NULL);
+ EGLDisplay dpy = glamor_egl_get_display(EGL_PLATFORM_X11_KHR, xdpy);
+ if (dpy == EGL_NO_DISPLAY)
+ goto out;
+
+ edpy = dpy;
+ eglInitialize(dpy, &major, &minor);
+ ret = x_get_xcb_connection(xdpy);
+out:
+ if (lib)
+ dlclose(lib);
+
+ return ret;
+ }
- return XGetXCBConnection(dpy);
+ return NULL;
}
void
@@ -221,7 +280,7 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
if (ephyr_glamor_skip_present)
return;
- glXMakeCurrent(dpy, glamor->glx_win, glamor->ctx);
+ eglMakeCurrent(glamor->dpy, glamor->egl_win, glamor->egl_win, glamor->ctx);
glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &old_vao);
glBindVertexArray(glamor->vao);
@@ -238,53 +297,12 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
glBindVertexArray(old_vao);
- glXSwapBuffers(dpy, glamor->glx_win);
-}
-
-/**
- * Xlib-based handling of xcb events for glamor.
- *
- * We need to let the Xlib event filtering run on the event so that
- * Mesa's dri2_glx.c userspace event mangling gets run, and we
- * correctly get our invalidate events propagated into the driver.
- */
-void
-ephyr_glamor_process_event(xcb_generic_event_t *xev)
-{
-
- uint32_t response_type = xev->response_type & 0x7f;
- /* Note the types on wire_to_event: there's an Xlib XEvent (with
- * the broken types) that it returns, and a protocol xEvent that
- * it inspects.
- */
- Bool (*wire_to_event)(Display *dpy, XEvent *ret, xEvent *event);
-
- XLockDisplay(dpy);
- /* Set the event handler to NULL to get access to the current one. */
- wire_to_event = XESetWireToEvent(dpy, response_type, NULL);
- if (wire_to_event) {
- XEvent processed_event;
-
- /* OK they had an event handler. Plug it back in, and call
- * through to it.
- */
- XESetWireToEvent(dpy, response_type, wire_to_event);
- xev->sequence = LastKnownRequestProcessed(dpy);
- wire_to_event(dpy, &processed_event, (xEvent *)xev);
- }
- XUnlockDisplay(dpy);
-}
-
-static int
-ephyr_glx_error_handler(Display * _dpy, XErrorEvent * ev)
-{
- return 0;
+ eglSwapBuffers(glamor->dpy, glamor->egl_win);
}
struct ephyr_glamor *
-ephyr_glamor_glx_screen_init(xcb_window_t win)
+ephyr_glamor_screen_init(xcb_window_t win, xcb_visualid_t vid)
{
- int (*oldErrorHandler) (Display *, XErrorEvent *);
static const float position[] = {
-1, -1,
1, -1,
@@ -297,9 +315,9 @@ ephyr_glamor_glx_screen_init(xcb_window_t win)
};
GLint old_vao;
- GLXContext ctx;
+ EGLContext ctx;
struct ephyr_glamor *glamor;
- GLXWindow glx_win;
+ EGLSurface egl_win;
glamor = calloc(1, sizeof(struct ephyr_glamor));
if (!glamor) {
@@ -307,56 +325,49 @@ ephyr_glamor_glx_screen_init(xcb_window_t win)
return NULL;
}
- glx_win = glXCreateWindow(dpy, fb_config, win, NULL);
-
- if (ephyr_glamor_gles2) {
- static const int context_attribs[] = {
- GLX_CONTEXT_MAJOR_VERSION_ARB, 2,
- GLX_CONTEXT_MINOR_VERSION_ARB, 0,
- GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_ES_PROFILE_BIT_EXT,
- 0,
- };
- if (epoxy_has_glx_extension(dpy, DefaultScreen(dpy),
- "GLX_EXT_create_context_es2_profile")) {
- ctx = glXCreateContextAttribsARB(dpy, fb_config, NULL, True,
- context_attribs);
- } else {
- FatalError("Xephyr -glamor_gles2 requires "
- "GLX_EXT_create_context_es2_profile\n");
- }
- } else {
- if (epoxy_has_glx_extension(dpy, DefaultScreen(dpy),
- "GLX_ARB_create_context")) {
- static const int context_attribs[] = {
- GLX_CONTEXT_PROFILE_MASK_ARB,
- GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
- GLX_CONTEXT_MAJOR_VERSION_ARB,
- GLAMOR_GL_CORE_VER_MAJOR,
- GLX_CONTEXT_MINOR_VERSION_ARB,
- GLAMOR_GL_CORE_VER_MINOR,
- 0,
- };
- oldErrorHandler = XSetErrorHandler(ephyr_glx_error_handler);
- ctx = glXCreateContextAttribsARB(dpy, fb_config, NULL, True,
- context_attribs);
- XSync(dpy, False);
- XSetErrorHandler(oldErrorHandler);
- } else {
- ctx = NULL;
- }
+ const EGLint config_attribs[] = {
+ EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
+ EGL_NATIVE_VISUAL_ID, vid,
+ EGL_NONE,
+ };
+ EGLConfig config = EGL_NO_CONFIG_KHR;
+ int num_configs = 0;
+
+ /* (loud booing (see above)) */
+ glamor->dpy = edpy;
+
+ eglChooseConfig(glamor->dpy, config_attribs, &config, 1, &num_configs);
+ if (num_configs != 1)
+ FatalError("Unable to find an EGLConfig for vid %#x\n", vid);
+
+ egl_win = eglCreatePlatformWindowSurfaceEXT(glamor->dpy, config,
+ &win, NULL);
+
+ if (ephyr_glamor_gles2)
+ eglBindAPI(EGL_OPENGL_ES_API);
+ else
+ eglBindAPI(EGL_OPENGL_API);
+
+ EGLint context_attribs[5];
+ int i = 0;
+ context_attribs[i++] = EGL_CONTEXT_MAJOR_VERSION;
+ context_attribs[i++] = ephyr_glamor_gles2 ? 2 : 3;
+ context_attribs[i++] = EGL_CONTEXT_MINOR_VERSION;
+ context_attribs[i++] = ephyr_glamor_gles2 ? 0 : 1;
+ context_attribs[i++] = EGL_NONE;
+
+ ctx = eglCreateContext(glamor->dpy, config, EGL_NO_CONTEXT,
+ context_attribs);
- if (!ctx)
- ctx = glXCreateContext(dpy, visual_info, NULL, True);
- }
if (ctx == NULL)
- FatalError("glXCreateContext failed\n");
+ FatalError("eglCreateContext failed\n");
- if (!glXMakeCurrent(dpy, glx_win, ctx))
- FatalError("glXMakeCurrent failed\n");
+ if (!eglMakeCurrent(glamor->dpy, egl_win, egl_win, ctx))
+ FatalError("eglMakeCurrent failed\n");
glamor->ctx = ctx;
glamor->win = win;
- glamor->glx_win = glx_win;
+ glamor->egl_win = egl_win;
ephyr_glamor_setup_texturing_shader(glamor);
glGenVertexArrays(1, &glamor->vao);
@@ -375,48 +386,17 @@ ephyr_glamor_glx_screen_init(xcb_window_t win)
}
void
-ephyr_glamor_glx_screen_fini(struct ephyr_glamor *glamor)
+ephyr_glamor_screen_fini(struct ephyr_glamor *glamor)
{
- glXMakeCurrent(dpy, None, NULL);
- glXDestroyContext(dpy, glamor->ctx);
- glXDestroyWindow(dpy, glamor->glx_win);
+ eglMakeCurrent(glamor->dpy,
+ EGL_NO_SURFACE, EGL_NO_SURFACE,
+ EGL_NO_CONTEXT);
+ eglDestroyContext(glamor->dpy, glamor->ctx);
+ eglDestroySurface(glamor->dpy, glamor->egl_win);
free(glamor);
}
-xcb_visualtype_t *
-ephyr_glamor_get_visual(void)
-{
- xcb_screen_t *xscreen =
- xcb_aux_get_screen(XGetXCBConnection(dpy), DefaultScreen(dpy));
- int attribs[] = {
- GLX_RENDER_TYPE, GLX_RGBA_BIT,
- GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
- GLX_RED_SIZE, 1,
- GLX_GREEN_SIZE, 1,
- GLX_BLUE_SIZE, 1,
- GLX_DOUBLEBUFFER, 1,
- None
- };
- int event_base = 0, error_base = 0, nelements;
- GLXFBConfig *fbconfigs;
-
- if (!glXQueryExtension (dpy, &error_base, &event_base))
- FatalError("Couldn't find GLX extension\n");
-
- fbconfigs = glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &nelements);
- if (!nelements)
- FatalError("Couldn't choose an FBConfig\n");
- fb_config = fbconfigs[0];
- free(fbconfigs);
-
- visual_info = glXGetVisualFromFBConfig(dpy, fb_config);
- if (visual_info == NULL)
- FatalError("Couldn't get RGB visual\n");
-
- return xcb_aux_find_visual_by_id(xscreen, visual_info->visualid);
-}
-
void
ephyr_glamor_set_window_size(struct ephyr_glamor *glamor,
unsigned width, unsigned height)
diff --git a/hw/kdrive/ephyr/ephyr_glamor_glx.h b/hw/kdrive/ephyr/ephyr_glamor.h
similarity index 82%
rename from hw/kdrive/ephyr/ephyr_glamor_glx.h
rename to hw/kdrive/ephyr/ephyr_glamor.h
index 0c238cf5b..fc4a80d9f 100644
--- a/hw/kdrive/ephyr/ephyr_glamor_glx.h
+++ b/hw/kdrive/ephyr/ephyr_glamor.h
@@ -21,13 +21,6 @@
* IN THE SOFTWARE.
*/
-/**
- * ephyr_glamor_glx.h
- *
- * Prototypes exposed by ephyr_glamor_glx.c, without including any
- * server headers.
- */
-
#include <xcb/xcb.h>
#include "dix-config.h"
@@ -40,14 +33,11 @@ ephyr_glamor_connect(void);
void
ephyr_glamor_set_texture(struct ephyr_glamor *ephyr_glamor, uint32_t tex);
-xcb_visualtype_t *
-ephyr_glamor_get_visual(void);
-
struct ephyr_glamor *
-ephyr_glamor_glx_screen_init(xcb_window_t win);
+ephyr_glamor_screen_init(xcb_window_t win, xcb_visualid_t vid);
void
-ephyr_glamor_glx_screen_fini(struct ephyr_glamor *glamor);
+ephyr_glamor_screen_fini(struct ephyr_glamor *glamor);
#ifdef GLAMOR
void
@@ -58,9 +48,6 @@ void
ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
struct pixman_region16 *damage);
-void
-ephyr_glamor_process_event(xcb_generic_event_t *xev);
-
#else /* !GLAMOR */
static inline void
@@ -75,9 +62,4 @@ ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
{
}
-static inline void
-ephyr_glamor_process_event(xcb_generic_event_t *xev)
-{
-}
-
#endif /* !GLAMOR */
diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c
index a5b2e344e..f9cb6980f 100644
--- a/hw/kdrive/ephyr/hostx.c
+++ b/hw/kdrive/ephyr/hostx.c
@@ -57,7 +57,7 @@
#ifdef GLAMOR
#include <epoxy/gl.h>
#include "glamor.h"
-#include "ephyr_glamor_glx.h"
+#include "ephyr_glamor.h"
#endif
#include "ephyrlog.h"
#include "ephyr.h"
@@ -556,21 +556,7 @@ hostx_init(void)
HostX.winroot = xscreen->root;
HostX.gc = xcb_generate_id(HostX.conn);
HostX.depth = xscreen->root_depth;
-#ifdef GLAMOR
- if (ephyr_glamor) {
- HostX.visual = ephyr_glamor_get_visual();
- if (HostX.visual->visual_id != xscreen->root_visual) {
- attrs[1] = xcb_generate_id(HostX.conn);
- attr_mask |= XCB_CW_COLORMAP;
- xcb_create_colormap(HostX.conn,
- XCB_COLORMAP_ALLOC_NONE,
- attrs[1],
- HostX.winroot,
- HostX.visual->visual_id);
- }
- } else
-#endif
- HostX.visual = xcb_aux_find_visual_by_id(xscreen,xscreen->root_visual);
+ HostX.visual = xcb_aux_find_visual_by_id(xscreen, xscreen->root_visual);
xcb_create_gc(HostX.conn, HostX.gc, HostX.winroot, 0, NULL);
cookie_WINDOW_STATE = xcb_intern_atom(HostX.conn, FALSE,
@@ -586,6 +572,7 @@ hostx_init(void)
EphyrScrPriv *scrpriv = screen->driver;
scrpriv->win = xcb_generate_id(HostX.conn);
+ scrpriv->vid = xscreen->root_visual;
scrpriv->server_depth = HostX.depth;
scrpriv->ximg = NULL;
scrpriv->win_x = 0;
@@ -1570,11 +1557,11 @@ ephyr_glamor_init(ScreenPtr screen)
KdScreenInfo *kd_screen = pScreenPriv->screen;
EphyrScrPriv *scrpriv = kd_screen->driver;
- scrpriv->glamor = ephyr_glamor_glx_screen_init(scrpriv->win);
+ scrpriv->glamor = ephyr_glamor_screen_init(scrpriv->win, scrpriv->vid);
ephyr_glamor_set_window_size(scrpriv->glamor,
scrpriv->win_width, scrpriv->win_height);
- if (!glamor_init(screen, 0)) {
+ if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN)) {
FatalError("Failed to initialize glamor\n");
return FALSE;
}
@@ -1660,7 +1647,7 @@ ephyr_glamor_fini(ScreenPtr screen)
EphyrScrPriv *scrpriv = kd_screen->driver;
glamor_fini(screen);
- ephyr_glamor_glx_screen_fini(scrpriv->glamor);
+ ephyr_glamor_screen_fini(scrpriv->glamor);
scrpriv->glamor = NULL;
}
#endif
diff --git a/hw/kdrive/ephyr/meson.build b/hw/kdrive/ephyr/meson.build
index 9e329ba67..dff1dfb68 100644
--- a/hw/kdrive/ephyr/meson.build
+++ b/hw/kdrive/ephyr/meson.build
@@ -23,13 +23,12 @@ xephyr_dep = [
xephyr_glamor = []
if build_glamor
- srcs += 'ephyr_glamor_glx.c'
+ srcs += 'ephyr_glamor.c'
if build_xv
srcs += 'ephyr_glamor_xv.c'
endif
xephyr_glamor += glamor
xephyr_glamor += glamor_egl_stubs
- xephyr_dep += dependency('x11-xcb')
xephyr_dep += epoxy_dep
endif
More information about the xorg-commit
mailing list