ChangeSet ID: 21403 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/22 09:01:55
Modified files: dlls/wined3d : vertexshader.c pixelshader.c
Log message: Oliver Stieber oliver_stieber@yahoo.co.uk Corrects an error in the _m3xm3 shader function in pixel and vertex shaders.
Patch: http://cvs.winehq.org/patch.py?id=21403
Old revision New revision Changes Path 1.16 1.17 +2 -2 wine/dlls/wined3d/vertexshader.c 1.2 1.3 +2 -2 wine/dlls/wined3d/pixelshader.c
Index: wine/dlls/wined3d/vertexshader.c diff -u -p wine/dlls/wined3d/vertexshader.c:1.16 wine/dlls/wined3d/vertexshader.c:1.17 --- wine/dlls/wined3d/vertexshader.c:1.16 22 Nov 2005 15: 1:55 -0000 +++ wine/dlls/wined3d/vertexshader.c 22 Nov 2005 15: 1:55 -0000 @@ -325,8 +325,8 @@ void vshader_m3x4(WINED3DSHADERVECTOR* d }
void vshader_m3x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX33 mat) { - d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[2][2] * s0->z; - d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[2][2] * s0->z; + d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = 1.0f; VSTRACE(("executing m3x3(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x)); Index: wine/dlls/wined3d/pixelshader.c diff -u -p wine/dlls/wined3d/pixelshader.c:1.2 wine/dlls/wined3d/pixelshader.c:1.3 --- wine/dlls/wined3d/pixelshader.c:1.2 22 Nov 2005 15: 1:55 -0000 +++ wine/dlls/wined3d/pixelshader.c 22 Nov 2005 15: 1:55 -0000 @@ -373,8 +373,8 @@ void pshader_m3x4(WINED3DSHADERVECTOR* d }
void pshader_m3x3(WINED3DSHADERVECTOR* d, WINED3DSHADERVECTOR* s0, D3DMATRIX33 mat) { - d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[2][2] * s0->z; - d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[2][2] * s0->z; + d->x = mat[0][0] * s0->x + mat[0][1] * s0->y + mat[0][2] * s0->z; + d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z; d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z; d->w = 1.0f; PSTRACE(("executing m3x3(1): mat=(%f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], s0->x, d->x));