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

glamor: Clean up formatting of RepeatFix shader code. 

All sorts of weird indentation, and some cuddled conditional
statements deep in the if tree.

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-27 11:10:14 -08:00
parent 20cb5b2d65
commit 990a8ee013
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glamor/glamor_render.c
View File

@ -81,13 +81,16 @@ glamor_create_composite_fs(struct shader_key *key)
" else if (repeat == RepeatNormal) \n" " else if (repeat == RepeatNormal) \n"
" rel_tex = floor(rel_tex) + (fract(rel_tex) / wh.xy); \n" " rel_tex = floor(rel_tex) + (fract(rel_tex) / wh.xy); \n"
" else if (repeat == RepeatPad) { \n" " else if (repeat == RepeatPad) { \n"
" if (rel_tex.x >= 1.0) rel_tex.x = 1.0 - wh.z * wh.x / 2.; \n" " if (rel_tex.x >= 1.0) \n"
" else if(rel_tex.x < 0.0) rel_tex.x = 0.0; \n" " rel_tex.x = 1.0 - wh.z * wh.x / 2.; \n"
" if (rel_tex.y >= 1.0) rel_tex.y = 1.0 - wh.w * wh.y / 2.; \n" " else if (rel_tex.x < 0.0) \n"
" else if(rel_tex.y < 0.0) rel_tex.y = 0.0; \n" " rel_tex.x = 0.0; \n"
" if (rel_tex.y >= 1.0) \n"
" rel_tex.y = 1.0 - wh.w * wh.y / 2.; \n"
" else if (rel_tex.y < 0.0) \n"
" rel_tex.y = 0.0; \n"
" rel_tex = rel_tex / wh.xy; \n" " rel_tex = rel_tex / wh.xy; \n"
" } \n" " } else if (repeat == RepeatReflect) {\n"
" else if(repeat == RepeatReflect) {\n"
" if ((1.0 - mod(abs(floor(rel_tex.x)), 2.0)) < 0.001)\n" " if ((1.0 - mod(abs(floor(rel_tex.x)), 2.0)) < 0.001)\n"
" rel_tex.x = 2.0 - (1.0 - fract(rel_tex.x)) / wh.x;\n" " rel_tex.x = 2.0 - (1.0 - fract(rel_tex.x)) / wh.x;\n"
" else \n" " else \n"