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

glamor: fix repeat-reflect case in linear gradient shader 

If _pt_distance is negative, it causes the final distance to be negative
in the repeat-reflect case.  Moving the scaling by _pt_distance earlier
avoids this problem, and simplifies some equations as a bonus.

Bugzilla: https://bugs.freedesktop.org/98508
Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Jeff Smith 2018-01-26 06:25:19 -06:00 committed by Adam Jackson
parent 9b7b8720eb
commit 3e377e238f
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glamor/glamor_gradient.c
View File

@ -456,7 +456,6 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
"float get_stop_len()\n"\ "float get_stop_len()\n"\
"{\n"\ "{\n"\
" vec3 tmp = vec3(source_texture.x, source_texture.y, 1.0);\n"\ " vec3 tmp = vec3(source_texture.x, source_texture.y, 1.0);\n"\
" float len_percentage;\n"\
" float distance;\n"\ " float distance;\n"\
" float _p1_distance;\n"\ " float _p1_distance;\n"\
" float _pt_distance;\n"\ " float _pt_distance;\n"\
@ -482,19 +481,17 @@ _glamor_create_linear_gradient_program(ScreenPtr screen, int stops_count,
" _pt_distance = pt_distance * source_texture_trans.z;\n"\ " _pt_distance = pt_distance * source_texture_trans.z;\n"\
" } \n"\ " } \n"\
" \n"\ " \n"\
" distance = distance - _p1_distance; \n"\ " distance = (distance - _p1_distance) / _pt_distance;\n"\
" \n"\ " \n"\
" if(repeat_type == %d){\n" /* repeat normal*/\ " if(repeat_type == %d){\n" /* repeat normal*/\
" distance = mod(distance, _pt_distance);\n"\ " distance = fract(distance);\n"\
" }\n"\ " }\n"\
" \n"\ " \n"\
" if(repeat_type == %d) {\n" /* repeat reflect*/\ " if(repeat_type == %d) {\n" /* repeat reflect*/\
" distance = abs(mod(distance + _pt_distance, 2.0 * _pt_distance) - _pt_distance);\n"\ " distance = abs(fract(distance * 0.5 + 0.5) * 2.0 - 1.0);\n"\
" }\n"\ " }\n"\
" \n"\ " \n"\
" len_percentage = distance/(_pt_distance);\n"\ " return distance;\n"\
" \n"\
" return len_percentage;\n"\
"}\n"\ "}\n"\
"\n"\ "\n"\
"void main()\n"\ "void main()\n"\