AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r100/r200: fix Y coord flipping in accelerated blits

Browse Source
This commit is contained in:
Alex Deucher
2010-01-19 19:13:26 -05:00
parent 1bb6b1d9db
commit 76cf261832
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r200/r200_blit.c
+5 -6
View File
@@ -241,9 +241,8 @@ static inline void calc_tex_coords(float img_width, float img_height,
buf[3] = buf[2] + reg_height / img_height;
if (flip_y)
{
float tmp = buf[2];
buf[2] = 1.0 - buf[3];
buf[3] = 1.0 - tmp;
buf[2] = 1.0 - buf[1];
buf[3] = 1.0 - buf[3];
}
}
@@ -266,17 +265,17 @@ static inline void emit_draw_packet(struct r200_context *r200,
verts[0] = dst_x_offset;
verts[1] = dst_y_offset + reg_height;
verts[2] = texcoords[0];
verts[3] = texcoords[2];
verts[3] = texcoords[3];
verts[4] = dst_x_offset + reg_width;
verts[5] = dst_y_offset + reg_height;
verts[6] = texcoords[1];
verts[7] = texcoords[2];
verts[7] = texcoords[3];
verts[8] = dst_x_offset + reg_width;
verts[9] = dst_y_offset;
verts[10] = texcoords[1];
verts[11] = texcoords[3];
verts[11] = texcoords[2];
BEGIN_BATCH(14);
OUT_BATCH(R200_CP_CMD_3D_DRAW_IMMD_2 | (12 << 16));
src/mesa/drivers/dri/radeon/radeon_blit.c
+5 -6
View File
@@ -234,9 +234,8 @@ static inline void calc_tex_coords(float img_width, float img_height,
buf[3] = buf[2] + reg_height / img_height;
if (flip_y)
{
float tmp = buf[2];
buf[2] = 1.0 - buf[3];
buf[3] = 1.0 - tmp;
buf[2] = 1.0 - buf[2];
buf[3] = 1.0 - buf[3];
}
}
@@ -259,17 +258,17 @@ static inline void emit_draw_packet(struct r100_context *r100,
verts[0] = dst_x_offset;
verts[1] = dst_y_offset + reg_height;
verts[2] = texcoords[0];
verts[3] = texcoords[2];
verts[3] = texcoords[3];
verts[4] = dst_x_offset + reg_width;
verts[5] = dst_y_offset + reg_height;
verts[6] = texcoords[1];
verts[7] = texcoords[2];
verts[7] = texcoords[3];
verts[8] = dst_x_offset + reg_width;
verts[9] = dst_y_offset;
verts[10] = texcoords[1];
verts[11] = texcoords[3];
verts[11] = texcoords[2];
BEGIN_BATCH(15);
OUT_BATCH(RADEON_CP_PACKET3_3D_DRAW_IMMD | (13 << 16));