aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-11-16 11:01:18 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-11-16 11:01:18 -0800
commit3c2d32b8e27820a6e149d9ded67cbdf2411cc5c9 (patch)
treebe93bf1035eb199e1c9df4ffbe8b8961eb9ecba0 /src
parent05b48e2a24ae78312c80ed94195f0b705fdb0547 (diff)
Revert of Switch uses of SkChecksum::Compute to Murmur3. (patchset #2 id:20001 of https://codereview.chromium.org/1436973003/ )
Reason for revert: gotta put back *compute = 0. Original issue's description: > Switch uses of SkChecksum::Compute to Murmur3. > > SkChecksum::Compute is a very, very poorly distributed hash function. > This replaces all remaining uses with Murmur3. > > The only interesting stuff is in src/gpu. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/1d024a3c909ae5cefa5e8b339e2b52dc73ee85ac > > Committed: https://skia.googlesource.com/skia/+/540e95483d285b555e9b1a73d18c16e7d7c0deba TBR=bsalomon@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1448023005
Diffstat (limited to 'src')
-rw-r--r--src/core/SkPictureFlat.h4
-rw-r--r--src/gpu/GrProgramDesc.h3
-rw-r--r--src/gpu/GrResourceCache.cpp8
3 files changed, 8 insertions, 7 deletions
diff --git a/src/core/SkPictureFlat.h b/src/core/SkPictureFlat.h
index 8befca0538..98a43ecb57 100644
--- a/src/core/SkPictureFlat.h
+++ b/src/core/SkPictureFlat.h
@@ -179,7 +179,7 @@ class SkFlatData;
class SkFlatController : public SkRefCnt {
public:
-
+
SkFlatController(uint32_t writeBufferFlags = 0);
virtual ~SkFlatController();
@@ -357,7 +357,7 @@ private:
fIndex = index;
fFlatSize = size;
fTopBot[0] = SK_ScalarNaN; // Mark as unwritten.
- fChecksum = SkChecksum::Murmur3(this->data(), size);
+ fChecksum = SkChecksum::Compute((uint32_t*)this->data(), size);
}
int fIndex;
diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h
index 9641195354..05b52cc7cd 100644
--- a/src/gpu/GrProgramDesc.h
+++ b/src/gpu/GrProgramDesc.h
@@ -107,7 +107,8 @@ protected:
*(this->atOffset<uint32_t, GrProgramDesc::kLengthOffset>()) = SkToU32(keyLength);
uint32_t* checksum = this->atOffset<uint32_t, GrProgramDesc::kChecksumOffset>();
- *checksum = SkChecksum::Murmur3(fKey.begin(), keyLength);
+ *checksum = 0;
+ *checksum = SkChecksum::Compute(reinterpret_cast<uint32_t*>(fKey.begin()), keyLength);
}
// The key, stored in fKey, is composed of four parts:
diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index 4a0c9b2b36..cb6bcf75fd 100644
--- a/src/gpu/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
@@ -42,7 +42,7 @@ GrUniqueKey::Domain GrUniqueKey::GenerateDomain() {
}
uint32_t GrResourceKeyHash(const uint32_t* data, size_t size) {
- return SkChecksum::Murmur3(data, size);
+ return SkChecksum::Compute(data, size);
}
//////////////////////////////////////////////////////////////////////////////
@@ -564,7 +564,7 @@ uint32_t GrResourceCache::getNextTimestamp() {
int currP = 0;
int currNP = 0;
while (currP < sortedPurgeableResources.count() &&
- currNP < fNonpurgeableResources.count()) {
+ currNP < fNonpurgeableResources.count()) {
uint32_t tsP = sortedPurgeableResources[currP]->cacheAccess().timestamp();
uint32_t tsNP = fNonpurgeableResources[currNP]->cacheAccess().timestamp();
SkASSERT(tsP != tsNP);
@@ -596,10 +596,10 @@ uint32_t GrResourceCache::getNextTimestamp() {
// count should be the next timestamp we return.
SkASSERT(fTimestamp == SkToU32(count));
-
+
// The historical timestamps of flushes are now invalid.
this->resetFlushTimestamps();
- }
+ }
}
return fTimestamp++;
}