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>
This commit is contained in:
parent
b03a581d8c
commit
9ddcb20f47
|
@ -250,11 +250,6 @@ glamor_block_handler(ScreenPtr screen)
|
||||||
glamor_priv->tick++;
|
glamor_priv->tick++;
|
||||||
glFlush();
|
glFlush();
|
||||||
glamor_fbo_expire(glamor_priv);
|
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
|
static void
|
||||||
|
|
|
@ -105,9 +105,6 @@ glamor_poly_point_gl(DrawablePtr drawable, GCPtr gc, int mode, int npt, DDXPoint
|
||||||
glDisable(GL_COLOR_LOGIC_OP);
|
glDisable(GL_COLOR_LOGIC_OP);
|
||||||
glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
|
glDisableVertexAttribArray(GLAMOR_VERTEX_POS);
|
||||||
|
|
||||||
glamor_priv->state = RENDER_STATE;
|
|
||||||
glamor_priv->render_idle_cnt = 0;
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
bail_ctx:
|
bail_ctx:
|
||||||
|
|
|
@ -194,11 +194,6 @@ struct glamor_saved_procs {
|
||||||
#define GLAMOR_TICK_AFTER(t0, t1) \
|
#define GLAMOR_TICK_AFTER(t0, t1) \
|
||||||
(((int)(t1) - (int)(t0)) < 0)
|
(((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 {
|
typedef struct glamor_screen_private {
|
||||||
unsigned int tick;
|
unsigned int tick;
|
||||||
enum glamor_gl_flavor gl_flavor;
|
enum glamor_gl_flavor gl_flavor;
|
||||||
|
@ -288,8 +283,6 @@ typedef struct glamor_screen_private {
|
||||||
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
|
char delayed_fallback_string[GLAMOR_DELAYED_STRING_MAX + 1];
|
||||||
int delayed_fallback_pending;
|
int delayed_fallback_pending;
|
||||||
int flags;
|
int flags;
|
||||||
int state;
|
|
||||||
unsigned int render_idle_cnt;
|
|
||||||
ScreenPtr screen;
|
ScreenPtr screen;
|
||||||
int dri3_enabled;
|
int dri3_enabled;
|
||||||
|
|
||||||
|
|
|
@ -1313,8 +1313,6 @@ glamor_composite_with_shader(CARD8 op,
|
||||||
glDisableVertexAttribArray(GLAMOR_VERTEX_MASK);
|
glDisableVertexAttribArray(GLAMOR_VERTEX_MASK);
|
||||||
glDisable(GL_BLEND);
|
glDisable(GL_BLEND);
|
||||||
DEBUGF("finish rendering.\n");
|
DEBUGF("finish rendering.\n");
|
||||||
glamor_priv->state = RENDER_STATE;
|
|
||||||
glamor_priv->render_idle_cnt = 0;
|
|
||||||
if (saved_source_format)
|
if (saved_source_format)
|
||||||
source->format = saved_source_format;
|
source->format = saved_source_format;
|
||||||
|
|
||||||
|
|
|
@ -293,9 +293,6 @@ glamor_poly_text(DrawablePtr drawable, GCPtr gc,
|
||||||
|
|
||||||
glDisable(GL_COLOR_LOGIC_OP);
|
glDisable(GL_COLOR_LOGIC_OP);
|
||||||
|
|
||||||
glamor_priv->state = RENDER_STATE;
|
|
||||||
glamor_priv->render_idle_cnt = 0;
|
|
||||||
|
|
||||||
*final_pos = x;
|
*final_pos = x;
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
@ -493,9 +490,6 @@ glamor_image_text(DrawablePtr drawable, GCPtr gc,
|
||||||
(void) glamor_text(drawable, gc, glamor_font, prog,
|
(void) glamor_text(drawable, gc, glamor_font, prog,
|
||||||
x, y, count, chars, charinfo, sixteen);
|
x, y, count, chars, charinfo, sixteen);
|
||||||
|
|
||||||
glamor_priv->state = RENDER_STATE;
|
|
||||||
glamor_priv->render_idle_cnt = 0;
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
bail:
|
bail:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user