GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence some warnings

Browse Source
This commit is contained in:
Georg Hagen
2025-02-08 16:16:03 +01:00
parent 123c6ecc9b
commit afd2c8043e
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openVulkanoCpp/IO/Archive/IArchiveWriter.hpp
View File

@@ -52,7 +52,7 @@ namespace OpenVulkano
bool AddFile(const char* inArchiveName, const void* buffer, size_t length)
{
FileDescription description = FileDescription::MakeDescriptionForFile(inArchiveName, length);
FileDescription description = FileDescription::MkFile(inArchiveName, length);
return AddFile(description, buffer);
}
@@ -64,7 +64,7 @@ namespace OpenVulkano
if (buffer.first == nullptr) continue;
size += buffer.second;
}
const FileDescription description = FileDescription::MakeDescriptionForFile(fileName, size);
const FileDescription description = FileDescription::MkFile(fileName, size);
return AddFile(description, buffers);
}

4
openVulkanoCpp/Image/YuvUtils.hpp
View File

@@ -13,9 +13,9 @@ namespace OpenVulkano
{
namespace YuvUtils
{
inline void NV12FromChromaPlanes(unsigned char* __restrict src, unsigned char* __restrict dest, int chromaChannelPixelCount)
inline void NV12FromChromaPlanes(unsigned char* __restrict src, unsigned char* __restrict dest, size_t chromaChannelPixelCount)
{
for(int i = 0; i < chromaChannelPixelCount; i++)
for(size_t i = 0; i < chromaChannelPixelCount; i++)
{
dest[i * 2] = src[i];
dest[i * 2 + 1] = src[i + chromaChannelPixelCount];

4
openVulkanoCpp/Scene/DataFormat.cpp
View File

@@ -242,8 +242,8 @@ namespace OpenVulkano
{
if (format == m_format)
{
return format >= BC1_RGB_UNORM_BLOCK && format <= ASTC_12x12_SRGB_BLOCK
|| format >= ASTC_4x4_SFLOAT_BLOCK && format <= PVRTC2_4BPP_SRGB_BLOCK_IMG;
return (format >= BC1_RGB_UNORM_BLOCK && format <= ASTC_12x12_SRGB_BLOCK) ||
(format >= ASTC_4x4_SFLOAT_BLOCK && format <= PVRTC2_4BPP_SRGB_BLOCK_IMG);
}
}
return false;

10
openVulkanoCpp/Scene/Export/MeshWriter.cpp
View File

@@ -54,18 +54,18 @@ namespace OpenVulkano::Scene
std::stringstream objContents;
WriteObjContents(geometry, DEFAULT_OBJ_MATERIAL_NAME, objContents);
std::string objContentsStr = objContents.str();
FileDescription objDesc = FileDescription::MakeDescriptionForFile("model.obj", objContentsStr.size());
FileDescription objDesc = FileDescription::MkFile("model.obj", objContentsStr.size());
zipWriter.AddFile(objDesc, objContentsStr.data());
}
{
FileDescription mtlDesc = FileDescription::MakeDescriptionForFile("material.mtl", DEFAULT_OBJ_MATERIAL_CONTENTS.size());
FileDescription mtlDesc = FileDescription::MkFile("material.mtl", DEFAULT_OBJ_MATERIAL_CONTENTS.size());
zipWriter.AddFile(mtlDesc, DEFAULT_OBJ_MATERIAL_CONTENTS.data());
}
if (!texturePath.empty() && std::filesystem::exists(texturePath))
{
MemMappedFile textureFile(texturePath);
FileDescription texDesc = FileDescription::MakeDescriptionForFile("texture.png", textureFile.Size());
FileDescription texDesc = FileDescription::MkFile("texture.png", textureFile.Size());
zipWriter.AddFile(texDesc, textureFile.Data());
}
}
@@ -78,14 +78,14 @@ namespace OpenVulkano::Scene
std::stringstream usdFile;
WriteUsdContents(usdFile, geometry);
std::string usdFileStr = usdFile.str();
FileDescription usdDesc = FileDescription::MakeDescriptionForFile("geometry.usda", usdFileStr.size());
FileDescription usdDesc = FileDescription::MkFile("geometry.usda", usdFileStr.size());
zipWriter.AddFile(usdDesc, usdFileStr.data());
}
if (!texturePath.empty() && std::filesystem::exists(texturePath))
{
MemMappedFile textureFile(texturePath);
FileDescription texDesc = FileDescription::MakeDescriptionForFile("texture.png", textureFile.Size());
FileDescription texDesc = FileDescription::MkFile("texture.png", textureFile.Size());
zipWriter.AddFile(texDesc, textureFile.Data());
}
}

2
openVulkanoCpp/Scene/Geometry.cpp
View File

@@ -154,7 +154,7 @@ namespace OpenVulkano::Scene
indices = nullptr;
}
uint32_t Geometry::GetIndex(uint32_t index) const
uint32_t Geometry::GetIndex(size_t index) const
{
uint32_t result = 0;

2
openVulkanoCpp/Scene/Geometry.hpp
View File

@@ -56,7 +56,7 @@ namespace OpenVulkano
Vertex* GetVertices() const { return vertices; }
void* GetIndices() const { return indices; }
uint32_t GetIndex(uint32_t index) const;
uint32_t GetIndex(size_t index) const;
uint16_t* GetIndices16() const { return static_cast<uint16_t*>(indices); }
uint32_t* GetIndices32() const { return static_cast<uint32_t*>(indices); }
uint32_t GetIndexCount() const { return indexCount; }