[Bf-blender-cvs] [2018df9939d] blender2.8: Eevee: MinmaxZ: Avoid unecessary conversions.
Clément Foucault
noreply at git.blender.org
Fri Aug 18 15:42:48 CEST 2017
Commit: 2018df9939d302dc6ebec0f4eb61e6d50bee07c2
Author: Clément Foucault
Date: Fri Aug 18 14:23:25 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB2018df9939d302dc6ebec0f4eb61e6d50bee07c2
Eevee: MinmaxZ: Avoid unecessary conversions.
===================================================================
M source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
index 71e249e1599..ce6f3568cdf 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_minmaxz_frag.glsl
@@ -42,9 +42,9 @@ void main()
val = minmax(val, val4);
/* if we are reducing an odd-width texture then fetch the edge texels */
- if (((mipsize.x & 1) != 0) && (int(gl_FragCoord.x)*2 == mipsize.x-3)) {
+ if (((mipsize.x & 1) != 0) && (texelPos.x == mipsize.x - 3)) {
/* if both edges are odd, fetch the top-left corner texel */
- if (((mipsize.y & 1) != 0) && (int(gl_FragCoord.y)*2 == mipsize.y-3)) {
+ if (((mipsize.y & 1) != 0) && (texelPos.y == mipsize.y - 3)) {
val = minmax(val, sampleLowerMip(texelPos + ivec2(2, 2)));
}
float val2 = sampleLowerMip(texelPos + ivec2(2, 0));
@@ -53,7 +53,7 @@ void main()
val = minmax(val, val3);
}
/* if we are reducing an odd-height texture then fetch the edge texels */
- if (((mipsize.y & 1) != 0) && (int(gl_FragCoord.y)*2 == mipsize.y-3)) {
+ if (((mipsize.y & 1) != 0) && (texelPos.y == mipsize.y - 3)) {
float val2 = sampleLowerMip(texelPos + ivec2(0, 2));
float val3 = sampleLowerMip(texelPos + ivec2(1, 2));
val = minmax(val, val2);
More information about the Bf-blender-cvs
mailing list