[PATCH 5/5] glamor: Drop the "are we doing a series of blits or draws" logic.

[Eric Anholt]

It's unused since keithp's copy acceleration code completely replaced
glamor_copyarea.c and removed the blit path.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 glamor/glamor.c        | 5 -----
 glamor/glamor_points.c | 3 ---
 glamor/glamor_priv.h   | 7 -------
 glamor/glamor_render.c | 2 --
 glamor/glamor_text.c   | 6 ------
 5 files changed, 23 deletions(-)

diff --git a/glamor/glamor.c b/glamor/glamor.c
index 5e6003d..a82c46f 100644
--- a/glamor/glamor.c
+++ b/glamor/glamor.c
@@ -250,11 +250,6 @@ glamor_block_handler(ScreenPtr screen)
     glamor_priv->tick++;
     glFlush();
     glamor_fbo_expire(glamor_priv);
-    if (glamor_priv->state == RENDER_STATE
-        && glamor_priv->render_idle_cnt++ > RENDER_IDEL_MAX) {
-        glamor_priv->state = IDLE_STATE;
-        glamor_priv->render_idle_cnt = 0;
-    }
 }
 
 static void
diff --git a/glamor/glamor_points.c b/glamor/glamor_points.c
index d4525e2..84383d2 100644
--- a/glamor/glamor_points.c
+++ b/glamor/glamor_points.c
@@ -105,9 +105,6 @@ glamor_poly_point_gl(DrawablePtr drawable, GCPtr gc, int mode, int npt, DDXPoint
     glDisable(GL_COLOR_LOGIC_OP);
     glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
 
-    glamor_priv->state = RENDER_STATE;
-    glamor_priv->render_idle_cnt = 0;
-
     return TRUE;
 
 bail_ctx:
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index dc4f9b8..2a9ecce 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -194,11 +194,6 @@ struct glamor_saved_procs {
 #define GLAMOR_TICK_AFTER(t0, t1) 	\
 	(((int)(t1) - (int)(t0)) < 0)
 
-#define IDLE_STATE 0
-#define RENDER_STATE 1
-#define BLIT_STATE 2
-#define RENDER_IDEL_MAX 32
-
 typedef struct glamor_screen_private {
     unsigned int tick;
     enum glamor_gl_flavor gl_flavor;
@@ -288,8 +283,6 @@ typedef struct glamor_screen_private {
     char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
     int delayed_fallback_pending;
     int flags;
-    int state;
-    unsigned int render_idle_cnt;
     ScreenPtr screen;
     int dri3_enabled;
 
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index add376f..b212fe1 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1313,8 +1313,6 @@ glamor_composite_with_shader(CARD8 op,
     glDisableVertexAttribArray(GLAMOR_VERTEX_MASK);
     glDisable(GL_BLEND);
     DEBUGF("finish rendering.\n");
-    glamor_priv->state = RENDER_STATE;
-    glamor_priv->render_idle_cnt = 0;
     if (saved_source_format)
         source->format = saved_source_format;
 
diff --git a/glamor/glamor_text.c b/glamor/glamor_text.c
index 6e02b9a..59cd0fd 100644
--- a/glamor/glamor_text.c
+++ b/glamor/glamor_text.c
@@ -293,9 +293,6 @@ glamor_poly_text(DrawablePtr drawable, GCPtr gc,
 
     glDisable(GL_COLOR_LOGIC_OP);
 
-    glamor_priv->state = RENDER_STATE;
-    glamor_priv->render_idle_cnt = 0;
-
     *final_pos = x;
     return TRUE;
 
@@ -493,9 +490,6 @@ glamor_image_text(DrawablePtr drawable, GCPtr gc,
     (void) glamor_text(drawable, gc, glamor_font, prog,
                        x, y, count, chars, charinfo, sixteen);
 
-    glamor_priv->state = RENDER_STATE;
-    glamor_priv->render_idle_cnt = 0;
-
     return TRUE;
 
 bail:
-- 
2.0.0