Skip to content

T
tile_processor_gpu
Commit 35987171 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

textures bug fix

parent 8d03d500
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 24 deletions
src/TileProcessor.cuh
View file @ 35987171
...@@ -265,10 +265,20 @@ def printTextureBlend(transform_size): ...@@ -265,10 +265,20 @@ def printTextureBlend(transform_size):
a *= blend1d[j] a *= blend1d[j]
elif dir[0]<0: elif dir[0]<0:
a *= blend1d[ts2m1 - j] a *= blend1d[ts2m1 - j]
else:
if (j >= transform_size):
a*= blend1d[j - transform_size] # 8->0
else:
a*= blend1d[transform_size - 1 -j] # 7->0
if dir[1] > 0: if dir[1] > 0:
a *= blend1d[i] a *= blend1d[i]
elif dir[1]<0: elif dir[1]<0:
a *= blend1d[ts2m1 - i] a *= blend1d[ts2m1 - i]
else:
if (i >= transform_size):
a*= blend1d[i - transform_size] # 8->0
else:
a*= blend1d[transform_size - 1 -i] # 7->0
alphabBlend[m][indx] = a; alphabBlend[m][indx] = a;
floats_in_line0=8 # 16 #8 floats_in_line0=8 # 16 #8
...@@ -457,22 +467,22 @@ __constant__ float LoG_corr[64]={ // modify if needed high-pass filter before co ...@@ -457,22 +467,22 @@ __constant__ float LoG_corr[64]={ // modify if needed high-pass filter before co
1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f, 1.00000000f
}; };
__constant__ float textureBlend[8][32] = { __constant__ float textureBlend[8][32] = {
{0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, {0.240485f, 0.313023f, 0.368542f, 0.398588f, 0.398588f, 0.368542f, 0.313023f, 0.240485f,
0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.132783f, 0.172835f, 0.203490f, 0.220080f, 0.220080f, 0.203490f, 0.172835f, 0.132783f,
0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.050352f, 0.065540f, 0.077165f, 0.083456f, 0.083456f, 0.077165f, 0.065540f, 0.050352f,
0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f}, 0.005741f, 0.007472f, 0.008798f, 0.009515f, 0.009515f, 0.008798f, 0.007472f, 0.005741f},
{0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.003867f, 0.033913f, 0.089431f, 0.161970f, {0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.003867f, 0.033913f, 0.089431f, 0.161970f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.002135f, 0.018725f, 0.049379f, 0.089431f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.002135f, 0.018725f, 0.049379f, 0.089431f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000810f, 0.007101f, 0.018725f, 0.033913f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000810f, 0.007101f, 0.018725f, 0.033913f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000092f, 0.000810f, 0.002135f, 0.003867f}, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000092f, 0.000810f, 0.002135f, 0.003867f},
{0.009607f, 0.084265f, 0.222215f, 0.402455f, {0.005741f, 0.050352f, 0.132783f, 0.240485f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.007472f, 0.065540f, 0.172835f, 0.313023f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.008798f, 0.077165f, 0.203490f, 0.368542f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.009515f, 0.083456f, 0.220080f, 0.398588f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.009515f, 0.083456f, 0.220080f, 0.398588f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.008798f, 0.077165f, 0.203490f, 0.368542f,
0.009607f, 0.084265f, 0.222215f, 0.402455f, 0.007472f, 0.065540f, 0.172835f, 0.313023f,
0.009607f, 0.084265f, 0.222215f, 0.402455f}, 0.005741f, 0.050352f, 0.132783f, 0.240485f},
{0.000000f, 0.000000f, 0.000000f, 0.000000f, {0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
...@@ -481,22 +491,22 @@ __constant__ float textureBlend[8][32] = { ...@@ -481,22 +491,22 @@ __constant__ float textureBlend[8][32] = {
0.000810f, 0.007101f, 0.018725f, 0.033913f, 0.000810f, 0.007101f, 0.018725f, 0.033913f,
0.002135f, 0.018725f, 0.049379f, 0.089431f, 0.002135f, 0.018725f, 0.049379f, 0.089431f,
0.003867f, 0.033913f, 0.089431f, 0.161970f}, 0.003867f, 0.033913f, 0.089431f, 0.161970f},
{0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, 0.009607f, {0.005741f, 0.007472f, 0.008798f, 0.009515f, 0.009515f, 0.008798f, 0.007472f, 0.005741f,
0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.084265f, 0.050352f, 0.065540f, 0.077165f, 0.083456f, 0.083456f, 0.077165f, 0.065540f, 0.050352f,
0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.222215f, 0.132783f, 0.172835f, 0.203490f, 0.220080f, 0.220080f, 0.203490f, 0.172835f, 0.132783f,
0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f, 0.402455f}, 0.240485f, 0.313023f, 0.368542f, 0.398588f, 0.398588f, 0.368542f, 0.313023f, 0.240485f},
{0.003867f, 0.002135f, 0.000810f, 0.000092f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, {0.003867f, 0.002135f, 0.000810f, 0.000092f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.033913f, 0.018725f, 0.007101f, 0.000810f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.033913f, 0.018725f, 0.007101f, 0.000810f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.089431f, 0.049379f, 0.018725f, 0.002135f, 0.000000f, 0.000000f, 0.000000f, 0.000000f, 0.089431f, 0.049379f, 0.018725f, 0.002135f, 0.000000f, 0.000000f, 0.000000f, 0.000000f,
0.161970f, 0.089431f, 0.033913f, 0.003867f, 0.000000f, 0.000000f, 0.000000f, 0.000000f}, 0.161970f, 0.089431f, 0.033913f, 0.003867f, 0.000000f, 0.000000f, 0.000000f, 0.000000f},
{0.402455f, 0.222215f, 0.084265f, 0.009607f, {0.240485f, 0.132783f, 0.050352f, 0.005741f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.313023f, 0.172835f, 0.065540f, 0.007472f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.368542f, 0.203490f, 0.077165f, 0.008798f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.398588f, 0.220080f, 0.083456f, 0.009515f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.398588f, 0.220080f, 0.083456f, 0.009515f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.368542f, 0.203490f, 0.077165f, 0.008798f,
0.402455f, 0.222215f, 0.084265f, 0.009607f, 0.313023f, 0.172835f, 0.065540f, 0.007472f,
0.402455f, 0.222215f, 0.084265f, 0.009607f}, 0.240485f, 0.132783f, 0.050352f, 0.005741f},
{0.161970f, 0.089431f, 0.033913f, 0.003867f, {0.161970f, 0.089431f, 0.033913f, 0.003867f,
0.089431f, 0.049379f, 0.018725f, 0.002135f, 0.089431f, 0.049379f, 0.018725f, 0.002135f,
0.033913f, 0.018725f, 0.007101f, 0.000810f, 0.033913f, 0.018725f, 0.007101f, 0.000810f,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment