From 2463f8abd9662e08438e23e5c0d0f958ea4fe54e Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 28 Oct 2012 16:45:51 +0100 Subject: [PATCH] Do not inline combine_two_samples(); util.h has way too many files depending on it, leading to poor incremental compile times. --- util.cpp | 14 ++++++++++++++ util.h | 14 +------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/util.cpp b/util.cpp index 0d852e7..c6517c9 100644 --- a/util.cpp +++ b/util.cpp @@ -124,3 +124,17 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m) m(0,2), m(1,2), m(2,2)); return buf; } + +void combine_two_samples(float w1, float w2, float *offset, float *total_weight) +{ + assert(w1 * w2 >= 0.0f); // Should not have differing signs. + if (fabs(w1 + w2) < 1e-6) { + *offset = 0.5f; + *total_weight = 0.0f; + } else { + *offset = w2 / (w1 + w2); + *total_weight = w1 + w2; + } + assert(*offset >= 0.0f); + assert(*offset <= 1.0f); +} diff --git a/util.h b/util.h index 432171a..414c208 100644 --- a/util.h +++ b/util.h @@ -36,19 +36,7 @@ std::string output_glsl_mat3(const std::string &name, const Eigen::Matrix3d &m); // Calculate where to sample, and with what weight, if one wants to use // the GPU's bilinear hardware to sample w1 * x[0] + w2 * x[1]. -static inline void combine_two_samples(float w1, float w2, float *offset, float *total_weight) -{ - assert(w1 * w2 >= 0.0f); // Should not have differing signs. - if (fabs(w1 + w2) < 1e-6) { - *offset = 0.5f; - *total_weight = 0.0f; - } else { - *offset = w2 / (w1 + w2); - *total_weight = w1 + w2; - } - assert(*offset >= 0.0f); - assert(*offset <= 1.0f); -} +void combine_two_samples(float w1, float w2, float *offset, float *total_weight); #ifdef NDEBUG #define check_error() -- 2.39.2