Merge branch 'vechro/aa-fix' into 'master'

Fix MSAA x16

See merge request veloren/veloren!613
This commit is contained in:
Imbris 2019-10-22 00:58:43 +00:00
commit 9e7fa0ed4f

View File

@ -13,12 +13,12 @@ vec4 aa_apply(sampler2DMS tex, vec2 fragCoord, vec2 resolution) {
vec4 sample8 = texelFetch(tex, texel_coord, 7);
vec4 sample9 = texelFetch(tex, texel_coord, 8);
vec4 sample10 = texelFetch(tex, texel_coord, 9);
vec4 sample11 = texelFetch(tex, texel_coord, 11);
vec4 sample12 = texelFetch(tex, texel_coord, 12);
vec4 sample13 = texelFetch(tex, texel_coord, 13);
vec4 sample14 = texelFetch(tex, texel_coord, 14);
vec4 sample15 = texelFetch(tex, texel_coord, 15);
vec4 sample16 = texelFetch(tex, texel_coord, 16);
vec4 sample11 = texelFetch(tex, texel_coord, 10);
vec4 sample12 = texelFetch(tex, texel_coord, 11);
vec4 sample13 = texelFetch(tex, texel_coord, 12);
vec4 sample14 = texelFetch(tex, texel_coord, 13);
vec4 sample15 = texelFetch(tex, texel_coord, 14);
vec4 sample16 = texelFetch(tex, texel_coord, 15);
// Average Samples
vec4 msaa_color = (