Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix padding, remove unused function

Browse source
This commit is contained in:
HifiExperiments 2025-01-11 20:08:31 -08:00
parent b2665cbd4e
commit a7be389aed
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/gpu/src/gpu/Texture.h
View file

@ -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) {}

4
libraries/gpu/src/gpu/Texture_ktx.cpp
View file

@ -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;
}