aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--src/gpu/GrCacheID.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gpu/GrCacheID.cpp b/src/gpu/GrCacheID.cpp
index a75054a806..87917ac995 100644
--- a/src/gpu/GrCacheID.cpp
+++ b/src/gpu/GrCacheID.cpp
@@ -8,6 +8,9 @@
#include "GrTypes.h"
#include "SkThread.h" // for sk_atomic_inc
+// Well, the dummy_ "fix" caused a warning on windows, so hiding all of it
+// until we can find a universal fix.
+#if 0
// This used to be a global scope, but we got a warning about unused variable
// so we moved it into here. We just want it to compile, so we can test the
// static asserts.
@@ -17,6 +20,7 @@ static inline void dummy_function_to_avoid_unused_var_warning() {
GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey.fData64));
GR_STATIC_ASSERT(sizeof(kAssertKey.fData8) == sizeof(kAssertKey));
}
+#endif
GrCacheID::Domain GrCacheID::GenerateDomain() {
static int32_t gNextDomain = kInvalid_Domain + 1;