diff options
| author | Eric Anholt <eric@anholt.net> | 2014-06-16 07:24:09 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-07-17 17:35:48 -0700 |
| commit | 9ddcb20f47b5e199989c8990512b0bca1354af86 (patch) | |
| tree | b023b18aa7bfb655f2380afc4851be3cb6e6ce65 /glamor | |
| parent | b03a581d8cbe3f29140935063b865285e2a00333 (diff) | |
glamor: Drop the "are we doing a series of blits or draws" logic.
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@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor.c | 5 | ||||
| -rw-r--r-- | glamor/glamor_points.c | 3 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 7 | ||||
| -rw-r--r-- | glamor/glamor_render.c | 2 | ||||
| -rw-r--r-- | glamor/glamor_text.c | 6 |
5 files changed, 0 insertions, 23 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index 5e6003df6..a82c46fdf 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 d4525e294..84383d254 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 dc4f9b842..2a9eccef4 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 add376f11..b212fe1fc 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 6e02b9aa8..59cd0fdc8 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: |