diff options
Diffstat (limited to 'glamor/glamor_rects.c')
| -rw-r--r-- | glamor/glamor_rects.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/glamor/glamor_rects.c b/glamor/glamor_rects.c index 7161921de..c8c92be17 100644 --- a/glamor/glamor_rects.c +++ b/glamor/glamor_rects.c @@ -65,7 +65,7 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable, &glamor_facet_polyfillrect_130); if (!prog) - goto bail_ctx; + goto bail; /* Set up the vertex buffers for the points */ @@ -87,7 +87,7 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable, &glamor_facet_polyfillrect_120); if (!prog) - goto bail_ctx; + goto bail; /* Set up the vertex buffers for the points */ @@ -139,14 +139,11 @@ glamor_poly_fill_rect_gl(DrawablePtr drawable, } glDisable(GL_SCISSOR_TEST); - glDisable(GL_COLOR_LOGIC_OP); if (glamor_priv->glsl_version >= 130) glVertexAttribDivisor(GLAMOR_VERTEX_POS, 0); glDisableVertexAttribArray(GLAMOR_VERTEX_POS); return TRUE; -bail_ctx: - glDisable(GL_COLOR_LOGIC_OP); bail: return FALSE; } |