diff options
author | Zack Rusin <zackr@vmware.com> | 2009-10-23 01:05:23 -0400 |
---|---|---|
committer | Zack Rusin <zackr@vmware.com> | 2009-10-23 11:11:00 -0400 |
commit | bec5230a1ff3998d0f184fc2b7437b51082c329f (patch) | |
tree | 1fc3f5f2a085b365ecb6991b0ab97351f2530a4f /src/gallium/state_trackers/xorg/xorg_composite.c | |
parent | d4d4733e6c312f2a8e9977b06fc554904407c456 (diff) |
st/xorg: lots of fixes related to compositing
fixes transformations, rendering with multiple bound textures, xrender
matrix conversions plus some cleanups
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_composite.c')
-rw-r--r-- | src/gallium/state_trackers/xorg/xorg_composite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c index e039bb12b6..7366fa7b85 100644 --- a/src/gallium/state_trackers/xorg/xorg_composite.c +++ b/src/gallium/state_trackers/xorg/xorg_composite.c @@ -371,15 +371,15 @@ static INLINE boolean matrix_from_pict_transform(PictTransform *trans, float *ma return FALSE; matrix[0] = XFixedToDouble(trans->matrix[0][0]); - matrix[1] = XFixedToDouble(trans->matrix[0][1]); - matrix[2] = XFixedToDouble(trans->matrix[0][2]); + matrix[3] = XFixedToDouble(trans->matrix[0][1]); + matrix[6] = XFixedToDouble(trans->matrix[0][2]); - matrix[3] = XFixedToDouble(trans->matrix[1][0]); + matrix[1] = XFixedToDouble(trans->matrix[1][0]); matrix[4] = XFixedToDouble(trans->matrix[1][1]); - matrix[5] = XFixedToDouble(trans->matrix[1][2]); + matrix[7] = XFixedToDouble(trans->matrix[1][2]); - matrix[6] = XFixedToDouble(trans->matrix[2][0]); - matrix[7] = XFixedToDouble(trans->matrix[2][1]); + matrix[2] = XFixedToDouble(trans->matrix[2][0]); + matrix[5] = XFixedToDouble(trans->matrix[2][1]); matrix[8] = XFixedToDouble(trans->matrix[2][2]); return TRUE; |