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

suggested fixes

Browse source
This commit is contained in:
HifiExperiments 2024-06-21 15:30:49 -07:00
parent 548a41171d
commit e1546ac3d0
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,19 +64,16 @@ struct GPUKTXPayload {
void serialize(DataSerializer &ser) { void serialize(DataSerializer &ser) {
ser << CURRENT_VERSION; ser << CURRENT_VERSION;
ser.addPadding(1);
ser << _samplerDesc; ser << _samplerDesc;
uint32_t usageData = (uint32_t)_usage._flags.to_ulong(); uint32_t usageData = (uint32_t)_usage._flags.to_ulong();
ser << usageData; ser << usageData;
ser << ((uint8_t)_usageType); ser << ((uint8_t)_usageType);
ser.addPadding(1);
ser << _originalSize; ser << _originalSize;
ser.addPadding(PADDING);
// The +1 is here because we're adding the CURRENT_VERSION at the top, but since it's declared as a static
// const, it's not actually part of the class' size.
assert(ser.length() == GPUKTXPayload::SIZE); assert(ser.length() == GPUKTXPayload::SIZE);
} }
@ -109,7 +106,7 @@ struct GPUKTXPayload {
dsr >> _samplerDesc; dsr >> _samplerDesc;
dsr >> usageData; dsr >> usageData;
_usage._flags = gpu::Texture::Usage::Flags(usageData); _usage = gpu::Texture::Usage(usageData);
dsr >> usagetype; dsr >> usagetype;
dsr.skipPadding(1); dsr.skipPadding(1);

4
libraries/render-utils/src/Model.cpp
View file

@ -1949,9 +1949,7 @@ void Blender::run() {
blendedMeshSizes.push_back(numVertsInMesh); blendedMeshSizes.push_back(numVertsInMesh);
// initialize offsets to zero // initialize offsets to zero
for(BlendshapeOffsetUnpacked &bou : unpackedBlendshapeOffsets) { memset(unpackedBlendshapeOffsets.data(), 0, numVertsInMesh * sizeof(BlendshapeOffsetUnpacked));
bou.clear();
}
// for each blendshape in this mesh, accumulate the offsets into unpackedBlendshapeOffsets. // for each blendshape in this mesh, accumulate the offsets into unpackedBlendshapeOffsets.
const float NORMAL_COEFFICIENT_SCALE = 0.01f; const float NORMAL_COEFFICIENT_SCALE = 0.01f;

4
libraries/shared/src/SerDes.h
View file

@ -105,7 +105,7 @@ class DataSerializer {
* *
* Since this is mostly intended to be used for networking, we default to the largest probable MTU here. * Since this is mostly intended to be used for networking, we default to the largest probable MTU here.
*/ */
static const int DEFAULT_SIZE = 1500; static const int DEFAULT_SIZE = 1500;
/** /**
* @brief Character to use for padding. * @brief Character to use for padding.
@ -113,7 +113,7 @@ class DataSerializer {
* Padding should be ignored, so it doesn't matter what we go with here, but it can be useful to set it * Padding should be ignored, so it doesn't matter what we go with here, but it can be useful to set it
* to something that would be distinctive in a dump. * to something that would be distinctive in a dump.
*/ */
static const char PADDING_CHAR = 0xAA; static const char PADDING_CHAR = (char)0xAA;
/** /**
* @brief Construct a dynamically allocated serializer * @brief Construct a dynamically allocated serializer