xserver: Branch 'master' - 4 commits
Adam Jackson
ajax at kemper.freedesktop.org
Tue Nov 7 21:01:07 UTC 2017
glamor/glamor.c | 38 +++++++++++++-------------------------
glamor/glamor_priv.h | 16 ++++------------
hw/dmx/dmxinit.c | 16 +++++-----------
hw/dmx/glxProxy/glxext.c | 2 ++
hw/xwayland/xwayland-glamor.c | 4 ----
5 files changed, 24 insertions(+), 52 deletions(-)
New commits:
commit 9bd5a198dc5383d0d2a1e28f7aa4270132eca5db
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Jul 11 15:37:07 2017 -0400
glamor: Remove unused glamor_create_screen_resources
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index cf4a76a7f..9fd110ed2 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -346,25 +346,6 @@ fallback:
}
-/**
- * Creates any pixmaps used internally by glamor, since those can't be
- * allocated at ScreenInit time.
- */
-static Bool
-glamor_create_screen_resources(ScreenPtr screen)
-{
- glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
- Bool ret = TRUE;
-
- screen->CreateScreenResources =
- glamor_priv->saved_procs.create_screen_resources;
- if (screen->CreateScreenResources)
- ret = screen->CreateScreenResources(screen);
- screen->CreateScreenResources = glamor_create_screen_resources;
-
- return ret;
-}
-
static Bool
glamor_check_instruction_count(int gl_version)
{
@@ -665,10 +646,6 @@ glamor_init(ScreenPtr screen, unsigned int flags)
glamor_set_debug_level(&glamor_debug_level);
- glamor_priv->saved_procs.create_screen_resources =
- screen->CreateScreenResources;
- screen->CreateScreenResources = glamor_create_screen_resources;
-
if (!glamor_font_init(screen))
goto fail;
@@ -764,8 +741,6 @@ glamor_close_screen(ScreenPtr screen)
glamor_sync_close(screen);
glamor_composite_glyphs_fini(screen);
screen->CloseScreen = glamor_priv->saved_procs.close_screen;
- screen->CreateScreenResources =
- glamor_priv->saved_procs.create_screen_resources;
screen->CreateGC = glamor_priv->saved_procs.create_gc;
screen->CreatePixmap = glamor_priv->saved_procs.create_pixmap;
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index ea4ea7151..ce50abd04 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -163,7 +163,6 @@ enum glamor_gl_flavor {
struct glamor_saved_procs {
CloseScreenProcPtr close_screen;
- CreateScreenResourcesProcPtr create_screen_resources;
CreateGCProcPtr create_gc;
CreatePixmapProcPtr create_pixmap;
DestroyPixmapProcPtr destroy_pixmap;
commit 081675f7ffda0cce20b395874d6e5755fb6600a0
Author: Adam Jackson <ajax at redhat.com>
Date: Fri Jul 14 14:52:01 2017 -0400
glamor: Un-inline glamor_[gs]et_screen_private
text data bss dec hex filename
2134764 45210 128704 2308678 233a46 build/hw/kdrive/ephyr/Xephyr.before
2129972 45210 128704 2303886 23278e build/hw/kdrive/ephyr/Xephyr.after
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index b70759b65..cf4a76a7f 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -40,6 +40,19 @@ DevPrivateKeyRec glamor_screen_private_key;
DevPrivateKeyRec glamor_pixmap_private_key;
DevPrivateKeyRec glamor_gc_private_key;
+glamor_screen_private *
+glamor_get_screen_private(ScreenPtr screen)
+{
+ return (glamor_screen_private *)
+ dixLookupPrivate(&screen->devPrivates, &glamor_screen_private_key);
+}
+
+void
+glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
+{
+ dixSetPrivate(&screen->devPrivates, &glamor_screen_private_key, priv);
+}
+
/**
* glamor_get_drawable_pixmap() returns a backing pixmap for a given drawable.
*
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index ad54b3197..ea4ea7151 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -496,18 +496,11 @@ typedef struct {
extern DevPrivateKeyRec glamor_gc_private_key;
extern DevPrivateKeyRec glamor_screen_private_key;
-static inline glamor_screen_private *
-glamor_get_screen_private(ScreenPtr screen)
-{
- return (glamor_screen_private *)
- dixLookupPrivate(&screen->devPrivates, &glamor_screen_private_key);
-}
+extern glamor_screen_private *
+glamor_get_screen_private(ScreenPtr screen);
-static inline void
-glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv)
-{
- dixSetPrivate(&screen->devPrivates, &glamor_screen_private_key, priv);
-}
+extern void
+glamor_set_screen_private(ScreenPtr screen, glamor_screen_private *priv);
static inline glamor_gc_private *
glamor_get_gc_private(GCPtr gc)
commit 6dff5e5d49a21bc749e44f0e8cb390690ece750d
Author: Adam Jackson <ajax at redhat.com>
Date: Mon Jul 10 10:56:58 2017 -0400
xwayland: Stop printing the EGL version
It doesn't matter, none of this matters.
Acked-by: Olivier Fourdan <ofourdan at redhat.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 260e4e0d8..8ffb40d6f 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -269,7 +269,6 @@ static void
xwl_drm_init_egl(struct xwl_screen *xwl_screen)
{
EGLint major, minor;
- const char *version;
static const EGLint config_attribs_core[] = {
EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR,
EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT_KHR,
@@ -305,9 +304,6 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
eglBindAPI(EGL_OPENGL_API);
- version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
- ErrorF("glamor: EGL version %s:\n", version);
-
xwl_screen->egl_context = eglCreateContext(xwl_screen->egl_display,
NULL, EGL_NO_CONTEXT, config_attribs_core);
if (!xwl_screen->egl_context)
commit c57f63829f0077b5a3e5968f8405e087a4490485
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Sep 13 15:44:15 2017 -0400
dmx: Use noGlxExtension like other DDXes
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index 24bb875fb..d1ffcc538 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -532,12 +532,12 @@ dmxDisplayInit(DMXScreenInfo * dmxScreen)
dmxGetPixmapFormats(dmxScreen);
}
-static void dmxAddExtensions(Bool glxSupported)
+static void dmxAddExtensions(void)
{
const ExtensionModule dmxExtensions[] = {
{ DMXExtensionInit, DMX_EXTENSION_NAME, NULL },
#ifdef GLXEXT
- { GlxExtensionInit, "GLX", &glxSupported },
+ { GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
@@ -551,12 +551,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
int i;
static unsigned long dmxGeneration = 0;
-#ifdef GLXEXT
- static Bool glxSupported = TRUE;
-#else
- const Bool glxSupported = FALSE;
-#endif
-
if (dmxGeneration != serverGeneration) {
int vendrel = VENDOR_RELEASE;
int major, minor, year, month, day;
@@ -676,17 +670,17 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
#ifdef GLXEXT
/* Check if GLX extension exists on all back-end servers */
for (i = 0; i < dmxNumScreens; i++)
- glxSupported &= (dmxScreens[i].glxMajorOpcode > 0);
+ noGlxExtension |= (dmxScreens[i].glxMajorOpcode == 0);
#endif
if (serverGeneration == 1)
- dmxAddExtensions(glxSupported);
+ dmxAddExtensions();
/* Tell dix layer about the backend displays */
for (i = 0; i < dmxNumScreens; i++) {
#ifdef GLXEXT
- if (glxSupported) {
+ if (!noGlxExtension) {
/*
* Builds GLX configurations from the list of visuals
* supported by the back-end server, and give that
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index ca9780f99..49848bbff 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -47,6 +47,8 @@
#include "extinit.h"
#include "glx_extinit.h"
+int noGlxExtension;
+
/*
** Forward declarations.
*/
More information about the xorg-commit
mailing list