From d8c2662bf452a82c8fcbdd1c95a40ee34d2c32ca Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Feb 2010 22:48:28 -0600 Subject: [PATCH] glamor: Set active texture in finishaccess drawing. --- glamor/glamor_core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/glamor/glamor_core.c b/glamor/glamor_core.c index ca7add4ac..b0a64f2ef 100644 --- a/glamor/glamor_core.c +++ b/glamor/glamor_core.c @@ -171,9 +171,6 @@ void glamor_set_transform_for_pixmap(PixmapPtr pixmap, glamor_transform_uniforms *uniform_locations) { - ScreenPtr screen = pixmap->drawable.pScreen; - PixmapPtr screen_pixmap = screen->GetScreenPixmap(screen); - glUniform1fARB(uniform_locations->x_bias, -pixmap->drawable.width / 2.0f); glUniform1fARB(uniform_locations->x_scale, 2.0f / pixmap->drawable.width); glUniform1fARB(uniform_locations->y_bias, -pixmap->drawable.height / 2.0f); @@ -489,6 +486,7 @@ glamor_finish_access(DrawablePtr drawable) pixmap->drawable.bitsPerPixel); glGenTextures(1, &tex); + glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, tex); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pixmap->drawable.width, pixmap->drawable.height, 0,