sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix bicubic map sampling to convert the sampled color to monochrome before using it to calculate the derivative.

Browse Source
This commit is contained in:
Antony Riakiotakis 2012-01-31 22:12:33 +00:00
parent ac07669900
commit 6f46692e76
2 changed files with 1612 additions and 1536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/gpu/intern/gpu_shader_material.glsl
View File

@ -1230,6 +1230,11 @@ void mtex_bump_tap3( vec3 texco, sampler2D ima, float hScale,
void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale, void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale,
out float dBs, out float dBt ) out float dBs, out float dBt )
{ {
float Hl;
float Hr;
float Hd;
float Hu;
vec2 TexDx = dFdx(texco.xy); vec2 TexDx = dFdx(texco.xy);
vec2 TexDy = dFdy(texco.xy); vec2 TexDy = dFdy(texco.xy);
@ -1238,10 +1243,10 @@ void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale,
vec2 STd = texco.xy - 0.5 * TexDy ; vec2 STd = texco.xy - 0.5 * TexDy ;
vec2 STu = texco.xy + 0.5 * TexDy ; vec2 STu = texco.xy + 0.5 * TexDy ;
float Hl = texture2D(ima, STl).x; rgbtobw(texture2D(ima, STl), Hl);
float Hr = texture2D(ima, STr).x; rgbtobw(texture2D(ima, STr), Hr);
float Hd = texture2D(ima, STd).x; rgbtobw(texture2D(ima, STd), Hd);
float Hu = texture2D(ima, STu).x; rgbtobw(texture2D(ima, STu), Hu);
vec2 dHdxy = vec2(Hr - Hl, Hu - Hd); vec2 dHdxy = vec2(Hr - Hl, Hu - Hd);
float fBlend = clamp(1.0-textureQueryLOD(ima, texco.xy).x, 0.0, 1.0); float fBlend = clamp(1.0-textureQueryLOD(ima, texco.xy).x, 0.0, 1.0);
@ -1255,8 +1260,6 @@ void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale,
ivec2 iTexLoc = ivec2(floor(fTexLoc)); ivec2 iTexLoc = ivec2(floor(fTexLoc));
vec2 t = clamp(fTexLoc - iTexLoc, 0.0, 1.0); // sat just to be pedantic vec2 t = clamp(fTexLoc - iTexLoc, 0.0, 1.0); // sat just to be pedantic
ivec2 iTexLocMod = iTexLoc + ivec2(-1, -1);
/******************************************************************************************* /*******************************************************************************************
* This block will replace the one below when one channel textures are properly supported. * * This block will replace the one below when one channel textures are properly supported. *
******************************************************************************************* *******************************************************************************************
@ -1270,11 +1273,13 @@ void mtex_bump_bicubic( vec3 texco, sampler2D ima, float hScale,
vSamplesUR.w, vSamplesUR.x, vSamplesLR.w, vSamplesLR.x, vSamplesUR.w, vSamplesUR.x, vSamplesLR.w, vSamplesLR.x,
vSamplesUR.z, vSamplesUR.y, vSamplesLR.z, vSamplesLR.y); vSamplesUR.z, vSamplesUR.y, vSamplesLR.z, vSamplesLR.y);
*/ */
ivec2 iTexLocMod = iTexLoc + ivec2(-1, -1);
mat4 H; mat4 H;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
for(int j = 0; j < 4; j++){ for(int j = 0; j < 4; j++){
mtex_rgbtoint(texelFetch(ima, (iTexLocMod + ivec2(i,j)), 0), H[i][j]); rgbtobw(texelFetch(ima, (iTexLocMod + ivec2(i,j)), 0), H[i][j]);
} }
} }

3127
source/blender/gpu/intern/gpu_shader_material.glsl.c
View File

File diff suppressed because it is too large Load Diff