From 87db150d8a572d8983a234663aaaab9cb8b6c98d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 1 Jun 2017 10:07:55 -0700 Subject: [PATCH] glamor: Remove the "delayed fallback" code. The usage of this died with the old core rendering code. Signed-off-by: Eric Anholt Reviewed-by: Keith Packard --- glamor/glamor_debug.h | 29 ----------------------------- glamor/glamor_priv.h | 2 -- 2 files changed, 31 deletions(-) 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;