andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

glamor: Rename the *y_inverted helpers to not say "inverted".

Browse Source 
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2016-01-26 13:34:00 -08:00
parent 1fcb6f4cbf
commit f7c24e6ac3
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
glamor/glamor_utils.h
View File

@ -36,9 +36,9 @@
#include "mipict.h" #include "mipict.h"
#define v_from_x_coord_x(_xscale_, _x_) ( 2 * (_x_) * (_xscale_) - 1.0) #define v_from_x_coord_x(_xscale_, _x_) ( 2 * (_x_) * (_xscale_) - 1.0)
#define v_from_x_coord_y_inverted(_yscale_, _y_) (2 * (_y_) * (_yscale_) - 1.0) #define v_from_x_coord_y(_yscale_, _y_) (2 * (_y_) * (_yscale_) - 1.0)
#define t_from_x_coord_x(_xscale_, _x_) ((_x_) * (_xscale_)) #define t_from_x_coord_x(_xscale_, _x_) ((_x_) * (_xscale_))
#define t_from_x_coord_y_inverted(_yscale_, _y_) ((_y_) * (_yscale_)) #define t_from_x_coord_y(_yscale_, _y_) ((_y_) * (_yscale_))
#define pixmap_priv_get_dest_scale(pixmap, _pixmap_priv_, _pxscale_, _pyscale_) \ #define pixmap_priv_get_dest_scale(pixmap, _pixmap_priv_, _pxscale_, _pyscale_) \
do { \ do { \
@ -311,7 +311,7 @@
texcoord) \ texcoord) \
do { \ do { \
(texcoord)[0] = t_from_x_coord_x(xscale, _tx_); \ (texcoord)[0] = t_from_x_coord_x(xscale, _tx_); \
(texcoord)[1] = t_from_x_coord_y_inverted(yscale, _ty_); \ (texcoord)[1] = t_from_x_coord_y(yscale, _ty_); \
DEBUGF("normalized point tx %f ty %f \n", (texcoord)[0], \ DEBUGF("normalized point tx %f ty %f \n", (texcoord)[0], \
(texcoord)[1]); \ (texcoord)[1]); \
} while(0) } while(0)
@ -330,7 +330,7 @@
tx += fbo_x_off; \ tx += fbo_x_off; \
ty += fbo_y_off; \ ty += fbo_y_off; \
(texcoord)[0] = t_from_x_coord_x(xscale, tx); \ (texcoord)[0] = t_from_x_coord_x(xscale, tx); \
(texcoord)[1] = t_from_x_coord_y_inverted(yscale, ty); \ (texcoord)[1] = t_from_x_coord_y(yscale, ty); \
DEBUGF("normalized tx %f ty %f \n", (texcoord)[0], (texcoord)[1]); \ DEBUGF("normalized tx %f ty %f \n", (texcoord)[0], (texcoord)[1]); \
} while(0) } while(0)
@ -482,8 +482,8 @@
(vertices)[1 * stride] = _t2_ = t_from_x_coord_x(xscale, tx2); \ (vertices)[1 * stride] = _t2_ = t_from_x_coord_x(xscale, tx2); \
(vertices)[2 * stride] = _t2_; \ (vertices)[2 * stride] = _t2_; \
(vertices)[3 * stride] = _t0_; \ (vertices)[3 * stride] = _t0_; \
(vertices)[1] = _t1_ = t_from_x_coord_y_inverted(yscale, ty1); \ (vertices)[1] = _t1_ = t_from_x_coord_y(yscale, ty1); \
(vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y_inverted(yscale, ty2); \ (vertices)[2 * stride + 1] = _t5_ = t_from_x_coord_y(yscale, ty2); \
(vertices)[1 * stride + 1] = _t1_; \ (vertices)[1 * stride + 1] = _t1_; \
(vertices)[3 * stride + 1] = _t5_; \ (vertices)[3 * stride + 1] = _t5_; \
} while(0) } while(0)
@ -562,8 +562,8 @@
(vertices)[2] = t_from_x_coord_x(xscale, x2); \ (vertices)[2] = t_from_x_coord_x(xscale, x2); \
(vertices)[6] = (vertices)[2]; \ (vertices)[6] = (vertices)[2]; \
(vertices)[4] = (vertices)[0]; \ (vertices)[4] = (vertices)[0]; \
(vertices)[1] = t_from_x_coord_y_inverted(yscale, y1); \ (vertices)[1] = t_from_x_coord_y(yscale, y1); \
(vertices)[7] = t_from_x_coord_y_inverted(yscale, y2); \ (vertices)[7] = t_from_x_coord_y(yscale, y2); \
(vertices)[3] = (vertices)[1]; \ (vertices)[3] = (vertices)[1]; \
(vertices)[5] = (vertices)[7]; \ (vertices)[5] = (vertices)[7]; \
} while(0) } while(0)
@ -596,7 +596,7 @@
vertices) \ vertices) \
do { \ do { \
(vertices)[0] = v_from_x_coord_x(xscale, x); \ (vertices)[0] = v_from_x_coord_x(xscale, x); \
(vertices)[1] = v_from_x_coord_y_inverted(yscale, y); \ (vertices)[1] = v_from_x_coord_y(yscale, y); \
} while(0) } while(0)
#define glamor_set_normalize_tri_vcoords(xscale, yscale, vtx, \ #define glamor_set_normalize_tri_vcoords(xscale, yscale, vtx, \
@ -639,11 +639,9 @@
x2 + fbo_x_off); \ x2 + fbo_x_off); \
(vertices)[2 * stride] = _t2_; \ (vertices)[2 * stride] = _t2_; \
(vertices)[3 * stride] = _t0_; \ (vertices)[3 * stride] = _t0_; \
(vertices)[1] = _t1_ = v_from_x_coord_y_inverted(yscale, \ (vertices)[1] = _t1_ = v_from_x_coord_y(yscale, y1 + fbo_y_off); \
y1 + fbo_y_off); \
(vertices)[2 * stride + 1] = _t5_ = \ (vertices)[2 * stride + 1] = _t5_ = \
v_from_x_coord_y_inverted(yscale, \ v_from_x_coord_y(yscale, y2 + fbo_y_off); \
y2 + fbo_y_off); \
(vertices)[1 * stride + 1] = _t1_; \ (vertices)[1 * stride + 1] = _t1_; \
(vertices)[3 * stride + 1] = _t5_; \ (vertices)[3 * stride + 1] = _t5_; \
} while(0) } while(0)
@ -675,8 +673,8 @@
(vertices)[2] = v_from_x_coord_x(xscale, x2); \ (vertices)[2] = v_from_x_coord_x(xscale, x2); \
(vertices)[6] = (vertices)[2]; \ (vertices)[6] = (vertices)[2]; \
(vertices)[4] = (vertices)[0]; \ (vertices)[4] = (vertices)[0]; \
(vertices)[1] = v_from_x_coord_y_inverted(yscale, y1); \ (vertices)[1] = v_from_x_coord_y(yscale, y1); \
(vertices)[7] = v_from_x_coord_y_inverted(yscale, y2); \ (vertices)[7] = v_from_x_coord_y(yscale, y2); \
(vertices)[3] = (vertices)[1]; \ (vertices)[3] = (vertices)[1]; \
(vertices)[5] = (vertices)[7]; \ (vertices)[5] = (vertices)[7]; \
} while(0) } while(0)
@ -685,7 +683,7 @@
pt) \ pt) \
do { \ do { \
(pt)[0] = t_from_x_coord_x(xscale, x); \ (pt)[0] = t_from_x_coord_x(xscale, x); \
(pt)[1] = t_from_x_coord_y_inverted(yscale, y); \ (pt)[1] = t_from_x_coord_y(yscale, y); \
} while(0) } while(0)
#define glamor_set_circle_centre(width, height, x, y, \ #define glamor_set_circle_centre(width, height, x, y, \