frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Fix some screen_xy offsets to be the right way around.

This commit is contained in:
Eric Anholt 2009-08-24 09:10:14 -07:00 committed by Zhigang Gong
parent 44e4599b83
commit 5fadea5d9c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glamor/glamor_putimage.c
View File

@ -111,7 +111,7 @@ glamor_put_image(DrawablePtr drawable, GCPtr gc, int depth, int x, int y,
continue; continue;
src = bits + (y1 - y) * src_stride + (x1 - x) * (bpp / 8); src = bits + (y1 - y) * src_stride + (x1 - x) * (bpp / 8);
glRasterPos2i(x1 + pixmap->screen_x, y1 + pixmap->screen_y); glRasterPos2i(x1 - pixmap->screen_x, y1 - pixmap->screen_y);
glDrawPixels(x2 - x1, glDrawPixels(x2 - x1,
y2 - y1, y2 - y1,
format, type, format, type,

11
glamor/glamor_tile.c
View File

@ -92,10 +92,10 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
int x2 = x + width; int x2 = x + width;
int y1 = y; int y1 = y;
int y2 = y + height; int y2 = y + height;
int tile_x1 = tile_x + tile->screen_x; int tile_x1 = tile_x - tile->screen_x;
int tile_x2 = tile_x + tile->screen_x + width; int tile_x2 = tile_x - tile->screen_x + width;
int tile_y1 = tile_y + tile->screen_y; int tile_y1 = tile_y - tile->screen_y;
int tile_y2 = tile_y + tile->screen_y + height; int tile_y2 = tile_y - tile->screen_y + height;
glamor_pixmap_private *tile_priv = glamor_get_pixmap_private(tile); glamor_pixmap_private *tile_priv = glamor_get_pixmap_private(tile);
if (glamor_priv->tile_prog == 0) { if (glamor_priv->tile_prog == 0) {
@ -121,9 +121,6 @@ glamor_tile(PixmapPtr pixmap, PixmapPtr tile,
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
tile_x += tile->screen_x;
tile_y += tile->screen_y;
glBegin(GL_TRIANGLE_FAN); glBegin(GL_TRIANGLE_FAN);
glMultiTexCoord2f(0, tile_x1, tile_y1); glMultiTexCoord2f(0, tile_x1, tile_y1);
glVertex2f(x1, y1); glVertex2f(x1, y1);