bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T43388, fix T40369: Cycles baking not antialiasing textures.

Browse Source 
This re-enables the AA jittering, but with proper clamping so that u >= 0,
v >= 0 and u+v <= 1.

Differential Revision: https://developer.blender.org/D1254
This commit is contained in:
Lukas Stockner 2016-02-21 14:14:52 +01:00 committed by Brecht Van Lommel
parent a447421dec
commit c359343f8d
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/kernel/kernel_bake.h
View File

@ -16,8 +16,6 @@
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
#undef USE_BAKE_JITTER
#ifndef __NO_BAKING__ #ifndef __NO_BAKING__
ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng, ccl_device void compute_light_pass(KernelGlobals *kg, ShaderData *sd, PathRadiance *L, RNG rng,
@ -180,15 +178,16 @@ ccl_device bool is_aa_pass(ShaderEvalType type)
/* this helps with AA but it's not the real solution as it does not AA the geometry /* this helps with AA but it's not the real solution as it does not AA the geometry
* but it's better than nothing, thus committed */ * but it's better than nothing, thus committed */
ccl_device_inline float bake_clamp_mirror_repeat(float u) ccl_device_inline float bake_clamp_mirror_repeat(float u, float max)
{ {
/* use mirror repeat (like opengl texture) so that if the barycentric /* use mirror repeat (like opengl texture) so that if the barycentric
* coordinate goes past the end of the triangle it is not always clamped * coordinate goes past the end of the triangle it is not always clamped
* to the same value, gives ugly patterns */ * to the same value, gives ugly patterns */
u /= max;
float fu = floorf(u); float fu = floorf(u);
u = u - fu; u = u - fu;
return (((int)fu) & 1)? 1.0f - u: u; return ((((int)fu) & 1)? 1.0f - u: u) * max;
} }
ccl_device_inline float3 kernel_bake_shader_bsdf(KernelGlobals *kg, ccl_device_inline float3 kernel_bake_shader_bsdf(KernelGlobals *kg,
@ -282,7 +281,6 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
/* random number generator */ /* random number generator */
RNG rng = cmj_hash(offset + i, kernel_data.integrator.seed); RNG rng = cmj_hash(offset + i, kernel_data.integrator.seed);
#ifdef USE_BAKE_JITTER
float filter_x, filter_y; float filter_x, filter_y;
if(sample == 0) { if(sample == 0) {
filter_x = filter_y = 0.5f; filter_x = filter_y = 0.5f;
@ -293,10 +291,9 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg, ccl_global uint4 *input,
/* subpixel u/v offset */ /* subpixel u/v offset */
if(sample > 0) { if(sample > 0) {
u = bake_clamp_mirror_repeat(u + dudx*(filter_x - 0.5f) + dudy*(filter_y - 0.5f)); u = bake_clamp_mirror_repeat(u + dudx*(filter_x - 0.5f) + dudy*(filter_y - 0.5f), 1.0f);
v = bake_clamp_mirror_repeat(v + dvdx*(filter_x - 0.5f) + dvdy*(filter_y - 0.5f)); v = bake_clamp_mirror_repeat(v + dvdx*(filter_x - 0.5f) + dvdy*(filter_y - 0.5f), 1.0f - u);
} }
#endif
/* triangle */ /* triangle */
int shader; int shader;