AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix wrapped content keys for npot textures.

Browse Source 
Review URL: https://codereview.chromium.org/879193002
This commit is contained in:
bsalomon 2015-01-28 11:39:48 -08:00 committed by Commit bot
parent 9c3f17d6e8
commit 3bd12efdcf
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
include/gpu/GrResourceKey.h
View File

@ -23,14 +23,10 @@ public:
size_t size() const {
this->validate();
SkASSERT(this->isValid());
return this->internalSize();
}
const uint32_t* data() const {
this->validate();
return &fKey[kMetaDataCnt];
}
protected:
static const uint32_t kInvalidDomain = 0;
@ -63,6 +59,15 @@ protected:
uint32_t domain() const { return fKey[kDomainAndSize_MetaDataIdx] & 0xffff; }
/** size of the key data, excluding meta-data (hash, domain, etc). */
size_t dataSize() const { return this->size() - 4 * kMetaDataCnt; }
/** ptr to the key data, excluding meta-data (hash, domain, etc). */
const uint32_t* data() const {
this->validate();
return &fKey[kMetaDataCnt];
}
/** Used to initialize a key. */
class Builder {
public:
@ -101,16 +106,6 @@ protected:
};
private:
size_t internalSize() const {
return fKey[kDomainAndSize_MetaDataIdx] >> 16;
}
void validate() const {
SkASSERT(fKey[kHash_MetaDataIdx] ==
GrResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
this->internalSize() - sizeof(uint32_t)));
}
enum MetaDataIdx {
kHash_MetaDataIdx,
// The key domain and size are packed into a single uint32_t.
@ -120,6 +115,17 @@ private:
};
static const uint32_t kMetaDataCnt = kLastMetaDataIdx + 1;
size_t internalSize() const {
return fKey[kDomainAndSize_MetaDataIdx] >> 16;
}
void validate() const {
SkASSERT(fKey[kHash_MetaDataIdx] ==
GrResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
this->internalSize() - sizeof(uint32_t)));
SkASSERT(SkIsAlign4(this->internalSize()));
}
friend class TestResource; // For unit test to access kMetaDataCnt.
// bmp textures require 4 uint32_t values.
@ -213,12 +219,18 @@ public:
/** Used to build a key that wraps another key and adds additional data. */
Builder(GrContentKey* key, const GrContentKey& innerKey, Domain domain,
int extraData32Cnt)
: INHERITED::Builder(key, domain, (SkToInt(innerKey.size()) >> 2) + extraData32Cnt) {
int innerKeyCnt = SkToInt(innerKey.size()) >> 2;
: INHERITED::Builder(key, domain, Data32CntForInnerKey(innerKey) + extraData32Cnt) {
// add the inner key to the end of the key so that op[] can be indexed normally.
for (int i = 0; i < innerKeyCnt; ++i) {
this->operator[](extraData32Cnt + i) = innerKey.data()[i];
}
uint32_t* innerKeyData = &this->operator[](extraData32Cnt);
const uint32_t* srcData = innerKey.data();
(*innerKeyData++) = innerKey.domain();
memcpy(innerKeyData, srcData, innerKey.dataSize());
}
private:
static int Data32CntForInnerKey(const GrContentKey& innerKey) {
// key data + domain
return SkToInt((innerKey.dataSize() >> 2) + 1);
}
};
};