xserver: Branch 'master' - 4 commits
Eric Anholt
anholt at kemper.freedesktop.org
Sat Jun 3 00:47:47 UTC 2017
glamor/glamor.c | 14 -----------
glamor/glamor.h | 6 ----
glamor/glamor_core.c | 5 ---
glamor/glamor_debug.h | 29 -----------------------
glamor/glamor_egl.c | 5 ---
glamor/glamor_priv.h | 3 --
hw/xfree86/drivers/modesetting/drmmode_display.c | 5 ---
hw/xwayland/xwayland-glamor.c | 2 -
8 files changed, 2 insertions(+), 67 deletions(-)
New commits:
commit 87db150d8a572d8983a234663aaaab9cb8b6c98d
Author: Eric Anholt <eric at anholt.net>
Date: Thu Jun 1 10:07:55 2017 -0700
glamor: Remove the "delayed fallback" code.
The usage of this died with the old core rendering code.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/glamor/glamor_debug.h b/glamor/glamor_debug.h
index 638bee20c..f64c44832 100644
--- a/glamor/glamor_debug.h
+++ b/glamor/glamor_debug.h
@@ -29,8 +29,6 @@
#ifndef __GLAMOR_DEBUG_H__
#define __GLAMOR_DEBUG_H__
-#define GLAMOR_DELAYED_STRING_MAX 64
-
#define GLAMOR_DEBUG_NONE 0
#define GLAMOR_DEBUG_UNIMPL 0
#define GLAMOR_DEBUG_FALLBACK 1
@@ -72,33 +70,6 @@ AbortServer(void)
"Glamor fallback", \
##__VA_ARGS__);} while(0)
-#define glamor_delayed_fallback(_screen_, _format_,...) \
- do { \
- if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) { \
- glamor_screen_private *_glamor_priv_; \
- _glamor_priv_ = glamor_get_screen_private(_screen_); \
- _glamor_priv_->delayed_fallback_pending = 1; \
- snprintf(_glamor_priv_->delayed_fallback_string, \
- GLAMOR_DELAYED_STRING_MAX, \
- "glamor delayed fallback: \t%s " _format_ , \
- __FUNCTION__, ##__VA_ARGS__); } } while(0)
-
-#define glamor_clear_delayed_fallbacks(_screen_) \
- do { \
- if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) { \
- glamor_screen_private *_glamor_priv_; \
- _glamor_priv_ = glamor_get_screen_private(_screen_); \
- _glamor_priv_->delayed_fallback_pending = 0; } } while(0)
-
-#define glamor_report_delayed_fallbacks(_screen_) \
- do { \
- if (glamor_debug_level >= GLAMOR_DEBUG_FALLBACK) { \
- glamor_screen_private *_glamor_priv_; \
- _glamor_priv_ = glamor_get_screen_private(_screen_); \
- LogMessageVerb(X_INFO, 0, "%s", \
- _glamor_priv_->delayed_fallback_string); \
- _glamor_priv_->delayed_fallback_pending = 0; } } while(0)
-
#define DEBUGF(str, ...) do {} while(0)
//#define DEBUGF(str, ...) ErrorF(str, ##__VA_ARGS__)
#define DEBUGRegionPrint(x) do {} while (0)
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 79962a5c1..07a98efeb 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -282,8 +282,6 @@ typedef struct glamor_screen_private {
int radial_max_nstops;
struct glamor_saved_procs saved_procs;
- char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
- int delayed_fallback_pending;
int flags;
ScreenPtr screen;
int dri3_enabled;
commit 72ddad7a97fa062bf9967d221c9a5520ebe33352
Author: Eric Anholt <eric at anholt.net>
Date: Wed May 17 11:36:07 2017 -0700
glamor: Drop glamor_set_screen_pixmap().
All that was left here was updating the FBO's size. However, the FBO
size was always set correctly already through
glamor_set_pixmap_texture() from whoever had attached a new BO to the
pixmap.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index 1cdc23e0b..91236e29c 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -114,19 +114,6 @@ glamor_set_pixmap_texture(PixmapPtr pixmap, unsigned int tex)
glamor_pixmap_attach_fbo(pixmap, fbo);
}
-void
-glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
-{
- glamor_pixmap_private *pixmap_priv;
- glamor_screen_private *glamor_priv;
-
- glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
- pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
-
- pixmap_priv->fbo->width = screen_pixmap->drawable.width;
- pixmap_priv->fbo->height = screen_pixmap->drawable.height;
-}
-
uint32_t
glamor_get_pixmap_texture(PixmapPtr pixmap)
{
diff --git a/glamor/glamor.h b/glamor/glamor.h
index b4fd76a6a..4ad28df17 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -103,12 +103,6 @@ extern _X_EXPORT void glamor_fini(ScreenPtr screen);
* Otherwise, the glamor internal structure will not be freed.*/
extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen);
-/* Let glamor to know the screen's fbo. The low level
- * driver should already assign a tex
- * to this pixmap through the set_pixmap_texture. */
-extern _X_EXPORT void glamor_set_screen_pixmap(PixmapPtr screen_pixmap,
- PixmapPtr *back_pixmap);
-
extern _X_EXPORT uint32_t glamor_get_pixmap_texture(PixmapPtr pixmap);
extern _X_EXPORT void glamor_set_pixmap_texture(PixmapPtr pixmap,
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 193a04409..b0d3e9efe 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -144,7 +144,6 @@ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
"Failed to create textured screen.");
return FALSE;
}
- glamor_set_screen_pixmap(screen_pixmap, NULL);
return TRUE;
}
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 850888c94..aa6baae09 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -1919,11 +1919,6 @@ drmmode_glamor_handle_new_screen_pixmap(drmmode_ptr drmmode)
if (!drmmode_set_pixmap_bo(drmmode, screen_pixmap, &drmmode->front_bo))
return FALSE;
-#ifdef GLAMOR_HAS_GBM
- if (drmmode->glamor)
- glamor_set_screen_pixmap(screen_pixmap, NULL);
-#endif
-
return TRUE;
}
diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
index 63f230369..87622839e 100644
--- a/hw/xwayland/xwayland-glamor.c
+++ b/hw/xwayland/xwayland-glamor.c
@@ -243,8 +243,6 @@ xwl_glamor_create_screen_resources(ScreenPtr screen)
xwl_glamor_create_pixmap(screen, screen->width, screen->height,
screen->rootDepth,
CREATE_PIXMAP_USAGE_BACKING_PIXMAP);
- if (screen->devPrivate)
- glamor_set_screen_pixmap(screen->devPrivate, NULL);
}
SetRootClip(screen, xwl_screen->root_clip_mode);
commit 49b12cb7360608b14caef5facb12f146d0bd15e6
Author: Eric Anholt <eric at anholt.net>
Date: Wed May 17 11:33:16 2017 -0700
glamor: Stop tracking the screen_fbo.
This means we no longer get "s" for on-screen drawing in glamor_debug,
and there's only "m" (CPU memory) or "f" (Any GPU memory, aka FBOs).
That seems fine to me.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/glamor/glamor.c b/glamor/glamor.c
index 2467443e0..1cdc23e0b 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -122,7 +122,6 @@ glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
glamor_priv = glamor_get_screen_private(screen_pixmap->drawable.pScreen);
pixmap_priv = glamor_get_pixmap_private(screen_pixmap);
- glamor_priv->screen_fbo = pixmap_priv->fbo->fb;
pixmap_priv->fbo->width = screen_pixmap->drawable.width;
pixmap_priv->fbo->height = screen_pixmap->drawable.height;
diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c
index 610ae71f3..cb315e2d1 100644
--- a/glamor/glamor_core.c
+++ b/glamor/glamor_core.c
@@ -40,12 +40,9 @@ glamor_get_drawable_location(const DrawablePtr drawable)
{
PixmapPtr pixmap = glamor_get_drawable_pixmap(drawable);
glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
- glamor_screen_private *glamor_priv =
- glamor_get_screen_private(drawable->pScreen);
+
if (pixmap_priv->gl_fbo == GLAMOR_FBO_UNATTACHED)
return 'm';
- if (pixmap_priv->fbo->fb == glamor_priv->screen_fbo)
- return 's';
else
return 'f';
}
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index a90879a7b..79962a5c1 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -281,7 +281,6 @@ typedef struct glamor_screen_private {
int linear_max_nstops;
int radial_max_nstops;
- int screen_fbo;
struct glamor_saved_procs saved_procs;
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
int delayed_fallback_pending;
commit fd0d2523a33620b36cd478925ddac5cf70f9c409
Author: Eric Anholt <eric at anholt.net>
Date: Tue May 9 15:33:21 2017 -0700
glamor_egl: Stop saving the EGL major/minor version.
We don't use them for anything.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 354c30f68..193a04409 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -50,7 +50,6 @@
struct glamor_egl_screen_private {
EGLDisplay display;
EGLContext context;
- EGLint major, minor;
char *device_path;
CreateScreenResourcesProcPtr CreateScreenResources;
@@ -648,8 +647,7 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
goto error;
}
- if (!eglInitialize
- (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
+ if (!eglInitialize(glamor_egl->display, NULL, NULL)) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
glamor_egl->display = EGL_NO_DISPLAY;
goto error;
More information about the xorg-commit
mailing list