mirror of
https://github.com/AleziaKurdis/overte.git
synced 2025-04-05 22:53:02 +02:00
fix padding, remove unused function
This commit is contained in:
parent
b2665cbd4e
commit
a7be389aed
2 changed files with 2 additions and 18 deletions
|
@ -188,24 +188,8 @@ public:
|
|||
_minMip == other._minMip &&
|
||||
_maxMip == other._maxMip;
|
||||
}
|
||||
|
||||
DataSerializer &operator<<(DataSerializer &dsd) {
|
||||
dsd << _borderColor;
|
||||
dsd << _maxAnisotropy;
|
||||
dsd << _filter;
|
||||
dsd << _comparisonFunc;
|
||||
dsd << _wrapModeU;
|
||||
dsd << _wrapModeV;
|
||||
dsd << _wrapModeW;
|
||||
dsd << _mipOffset;
|
||||
dsd << _minMip;
|
||||
dsd << _maxMip;
|
||||
return dsd;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
Sampler() {}
|
||||
Sampler(const Filter filter, const WrapMode wrap = WRAP_REPEAT) : _desc(filter, wrap) {}
|
||||
Sampler(const Desc& desc) : _desc(desc) {}
|
||||
|
|
|
@ -93,7 +93,6 @@ struct GPUKTXPayload {
|
|||
uint8_t usagetype = 0;
|
||||
|
||||
dsr >> version;
|
||||
dsr.skipPadding(1);
|
||||
|
||||
if (version > CURRENT_VERSION) {
|
||||
// If we try to load a version that we don't know how to parse,
|
||||
|
@ -109,13 +108,14 @@ struct GPUKTXPayload {
|
|||
_usage = gpu::Texture::Usage(usageData);
|
||||
|
||||
dsr >> usagetype;
|
||||
dsr.skipPadding(1);
|
||||
_usageType = (TextureUsageType)usagetype;
|
||||
|
||||
if (version >= 2) {
|
||||
dsr >> _originalSize;
|
||||
}
|
||||
|
||||
dsr.skipPadding(PADDING);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue