diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-22 20:52:04 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-22 20:55:09 +0400 |
commit | 553ec988e7a44046c86ec1528c357269e4f23f7f (patch) | |
tree | c79c9585023b14bda2c29100577eabed7d38923d /intern/cycles/render/film.cpp | |
parent | 742911314322e5dae3a07469d0ca53b61427f978 (diff) |
Revert "Cycles: Implement Mitchell-Netravali pixel filter"
As it appears we can't really use mitchell filter together with the
current filter importance sampling,
This reverts commit 742911314322e5dae3a07469d0ca53b61427f978.
Diffstat (limited to 'intern/cycles/render/film.cpp')
-rw-r--r-- | intern/cycles/render/film.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/intern/cycles/render/film.cpp b/intern/cycles/render/film.cpp index 76a92d3d704..19f959d4ea1 100644 --- a/intern/cycles/render/film.cpp +++ b/intern/cycles/render/film.cpp @@ -198,29 +198,6 @@ static float filter_func_gaussian(float v, float width) return expf(-2.0f*v*v); } -static float filter_func_mitchell(float v, float width) -{ - (void)width; /* Ignored. */ - - /* B = 1, C = 0 - cubic B-spline */ - /* B = 1/3, C = 1/3 - recommended */ - /* B = 0, C = 1/2 - Catmull-Rom spline */ - const float B = 1.0f / 3.0f; - const float C = 1.0f / 3.0f; - - const float ax = fabsf(v); - if (ax < 1.0f) { - return ((12.0f - 9.0f * B - 6 * C) * ax * ax * ax + - (-18.0f + 12.0f * B + 6.0f * C) * ax * ax + - (6.0f - 2.0f * B)) / 6.0f; - } else if ((ax >= 1.0f) && (ax < 2.0f)) { - return ((-B - 6.0f * C) * ax * ax * ax + - (6.0f * B + 30.0f * C) * ax * ax + (-12.0f * B - 48.0f * C) * - ax + (8.0f * B + 24.0f * C)) / 6.0f; - } - return 0.0f; -} - static vector<float> filter_table(FilterType type, float width) { const int filter_table_size = FILTER_TABLE_SIZE-1; @@ -236,9 +213,6 @@ static vector<float> filter_table(FilterType type, float width) case FILTER_GAUSSIAN: filter_func = filter_func_gaussian; break; - case FILTER_MITCHELL: - filter_func = filter_func_mitchell; - break; default: assert(0); } |