aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/Sk4px.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-08-12 10:23:37 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-08-12 10:23:37 -0700
commitb07bee3121680b53b98b780ac08d14d374dd4c6f (patch)
tree2435afdba0713eb7b7325bbb334c731abbd8fa81 /src/core/Sk4px.h
parent58d890bd45a201477ec6c4ba0ae61c574b4e5aef (diff)
Refactor to put SkXfermode_opts inside SK_OPTS_NS.
Without this refactor I was getting warnings previously about having code inside namespace SK_OPTS_NS (e.g. namespace sse2, namespace neon) referring to code inside an anonymous namespace (Sk4px, SkPMFloat, Sk4f, etc) [1]. That low-level code was in an anonymous namespace to allow multiple independent copies of its methods to be instantiated without the linker getting confused / offended about violating the One Definition Rule. This was only happening in Debug mode where the methods were not being inlined. To fix this all, I've force-inlined the methods of the low-level code and removed the anonymous namespace. BUG=skia:4117 [1] Here is what those errors looked like: In file included from ../../../../src/core/SkOpts.cpp:18:0: ../../../../src/opts/SkXfermode_opts.h:193:7: error: 'portable::Sk4pxXfermode' has a field 'portable::Sk4pxXfermode::fProc4' whose type uses the anonymous namespace [-Werror] class Sk4pxXfermode : public SkProcCoeffXfermode { ^ ../../../../src/opts/SkXfermode_opts.h:193:7: error: 'portable::Sk4pxXfermode' has a field 'portable::Sk4pxXfermode::fAAProc4' whose type uses the anonymous namespace [-Werror] ../../../../src/opts/SkXfermode_opts.h:235:7: error: 'portable::SkPMFloatXfermode' has a field 'portable::SkPMFloatXfermode::fProcF' whose type uses the anonymous namespace [-Werror] class SkPMFloatXfermode : public SkProcCoeffXfermode { ^ cc1plus: all warnings being treated as errors Review URL: https://codereview.chromium.org/1286093004
Diffstat (limited to 'src/core/Sk4px.h')
-rw-r--r--src/core/Sk4px.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/src/core/Sk4px.h b/src/core/Sk4px.h
index ffde1af504..1c8ed0df71 100644
--- a/src/core/Sk4px.h
+++ b/src/core/Sk4px.h
@@ -12,13 +12,6 @@
#include "SkColor.h"
#include "SkColorPriv.h"
-// This file may be included multiple times by .cpp files with different flags, leading
-// to different definitions. Usually that doesn't matter because it's all inlined, but
-// in Debug modes the compilers may not inline everything. So wrap everything in an
-// anonymous namespace to give each includer their own silo of this code (or the linker
-// will probably pick one randomly for us, which is rarely correct).
-namespace {
-
// 1, 2 or 4 SkPMColors, generally vectorized.
class Sk4px : public Sk16b {
public:
@@ -226,8 +219,6 @@ private:
typedef Sk16b INHERITED;
};
-} // namespace
-
#ifdef SKNX_NO_SIMD
#include "../opts/Sk4px_none.h"
#else