kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile warnings

Browse Source
This commit is contained in:
Kearwood Gilbert
2023-11-23 21:46:12 -08:00
parent 67d8e6773a
commit cb998d73f0
12 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kraken/KRCamera.h
View File

@@ -64,9 +64,9 @@ public:
const KRViewport& getViewport() const; const KRViewport& getViewport() const;
virtual std::string getElementName(); virtual std::string getElementName() override;
virtual tinyxml2::XMLElement* saveXML(tinyxml2::XMLNode* parent); virtual tinyxml2::XMLElement* saveXML(tinyxml2::XMLNode* parent) override;
virtual void loadXML(tinyxml2::XMLElement* e); virtual void loadXML(tinyxml2::XMLElement* e) override;
std::string getDebugText(); std::string getDebugText();

2
kraken/KRDeviceManager.cpp
View File

@@ -93,7 +93,7 @@ KRDeviceManager::initialize()
// VK_KHR_surface and VK_KHR_win32_surface // VK_KHR_surface and VK_KHR_win32_surface
char* extensions[] = { const char* extensions[] = {
"VK_KHR_surface", "VK_KHR_surface",
#if KRENGINE_DEBUG_GPU_LABELS #if KRENGINE_DEBUG_GPU_LABELS
"VK_EXT_debug_utils", "VK_EXT_debug_utils",

2
kraken/KRMeshManager.cpp
View File

@@ -553,7 +553,7 @@ void KRMeshManager::KRVBOData::load(VkCommandBuffer& commandBuffer)
#if KRENGINE_DEBUG_GPU_LABELS #if KRENGINE_DEBUG_GPU_LABELS
char debug_label[KRENGINE_DEBUG_GPU_LABEL_MAX_LEN]; char debug_label[KRENGINE_DEBUG_GPU_LABEL_MAX_LEN];
char* type_label = ""; const char* type_label = "";
switch (m_type) { switch (m_type) {
case vbo_type::STREAMING: case vbo_type::STREAMING:

2
kraken/KRPresentationThread.cpp
View File

@@ -132,7 +132,7 @@ void KRPresentationThread::renderFrame()
if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || resized) { if (result == VK_ERROR_OUT_OF_DATE_KHR || result == VK_SUBOPTIMAL_KHR || resized) {
// TODO - Must explicitly detect resize and trigger swapchain re-creation as well // TODO - Must explicitly detect resize and trigger swapchain re-creation as well
vkDeviceWaitIdle(device.m_logicalDevice); vkDeviceWaitIdle(device.m_logicalDevice);
if (surface.recreateSwapChain() != VK_SUCCESS) { if (surface.recreateSwapChain() != KR_SUCCESS) {
m_activeState = PresentThreadState::error; m_activeState = PresentThreadState::error;
} }
break; break;

4
kraken/KRShader.cpp
View File

@@ -102,6 +102,10 @@ VkShaderStageFlagBits getShaderStageFlagBitsFromShaderStage(ShaderStage stage)
return VK_SHADER_STAGE_MISS_BIT_KHR; return VK_SHADER_STAGE_MISS_BIT_KHR;
case ShaderStage::rcall: case ShaderStage::rcall:
return VK_SHADER_STAGE_CALLABLE_BIT_KHR; return VK_SHADER_STAGE_CALLABLE_BIT_KHR;
case ShaderStage::ShaderStageCount:
case ShaderStage::Invalid:
// Suppress warning
break;
} }
return (VkShaderStageFlagBits)0; return (VkShaderStageFlagBits)0;
} }

4
kraken/KRTexture2D.h
View File

@@ -45,8 +45,8 @@ class KRTexture2D : public KRTexture
public: public:
KRTexture2D(KRContext& context, mimir::Block* data, std::string name); KRTexture2D(KRContext& context, mimir::Block* data, std::string name);
virtual ~KRTexture2D(); virtual ~KRTexture2D();
virtual bool save(const std::string& path); virtual bool save(const std::string& path) override;
virtual bool save(mimir::Block& data); virtual bool save(mimir::Block& data) override;
virtual bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) = 0; virtual bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) = 0;
virtual hydra::Vector2i getDimensions() const = 0; virtual hydra::Vector2i getDimensions() const = 0;

16
kraken/KRTextureAnimated.h
View File

@@ -41,17 +41,17 @@ class KRTextureAnimated : public KRTexture
public: public:
KRTextureAnimated(KRContext& context, std::string name); KRTextureAnimated(KRContext& context, std::string name);
virtual ~KRTextureAnimated(); virtual ~KRTextureAnimated();
virtual std::string getExtension(); virtual std::string getExtension() override;
virtual bool save(const std::string& path); virtual bool save(const std::string& path) override;
virtual bool save(Block& data); virtual bool save(Block& data) override;
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage); virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage) override;
virtual long getReferencedMemSize(); virtual long getReferencedMemSize() override;
virtual bool isAnimated(); virtual bool isAnimated() override;
virtual void resize(int max_dim); virtual void resize(int max_dim) override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;

10
kraken/KRTextureCube.h
View File

@@ -40,12 +40,12 @@ class KRTextureCube : public KRTexture
public: public:
KRTextureCube(KRContext& context, std::string name); KRTextureCube(KRContext& context, std::string name);
virtual ~KRTextureCube(); virtual ~KRTextureCube();
virtual std::string getExtension(); virtual std::string getExtension() override;
virtual bool save(const std::string& path); virtual bool save(const std::string& path) override;
virtual bool save(mimir::Block& data); virtual bool save(mimir::Block& data) override;
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage); virtual void resetPoolExpiry(float lodCoverage, texture_usage_t textureUsage) override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;

4
kraken/KRTextureKTX.h
View File

@@ -41,11 +41,11 @@ public:
KRTextureKTX(KRContext& context, Block* data, std::string name); KRTextureKTX(KRContext& context, Block* data, std::string name);
KRTextureKTX(KRContext& context, std::string name, unsigned int internal_format, unsigned int base_internal_format, int width, int height, const std::list<Block*>& blocks); KRTextureKTX(KRContext& context, std::string name, unsigned int internal_format, unsigned int base_internal_format, int width, int height, const std::list<Block*>& blocks);
virtual ~KRTextureKTX(); virtual ~KRTextureKTX();
virtual std::string getExtension(); virtual std::string getExtension() override;
bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override; bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual hydra::Vector2i getDimensions() const override; virtual hydra::Vector2i getDimensions() const override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;

4
kraken/KRTextureKTX2.h
View File

@@ -38,11 +38,11 @@ class KRTextureKTX2 : public KRTexture2D
public: public:
KRTextureKTX2(KRContext& context, mimir::Block* data, std::string name); KRTextureKTX2(KRContext& context, mimir::Block* data, std::string name);
virtual ~KRTextureKTX2(); virtual ~KRTextureKTX2();
virtual std::string getExtension(); virtual std::string getExtension() override;
bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override; bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual hydra::Vector2i getDimensions() const override; virtual hydra::Vector2i getDimensions() const override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;

4
kraken/KRTexturePVR.h
View File

@@ -38,11 +38,11 @@ class KRTexturePVR : public KRTexture2D
public: public:
KRTexturePVR(KRContext& context, mimir::Block* data, std::string name); KRTexturePVR(KRContext& context, mimir::Block* data, std::string name);
virtual ~KRTexturePVR(); virtual ~KRTexturePVR();
virtual std::string getExtension(); virtual std::string getExtension() override;
bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override; bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual hydra::Vector2i getDimensions() const override; virtual hydra::Vector2i getDimensions() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;

6
kraken/KRTextureTGA.h
View File

@@ -40,15 +40,15 @@ class KRTextureTGA : public KRTexture2D
public: public:
KRTextureTGA(KRContext& context, Block* data, std::string name); KRTextureTGA(KRContext& context, Block* data, std::string name);
virtual ~KRTextureTGA(); virtual ~KRTextureTGA();
virtual std::string getExtension(); virtual std::string getExtension() override;
bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override; bool uploadTexture(KRDevice& device, VkImage& image, int lod_max_dim, int& current_lod_max_dim, bool premultiply_alpha = false) override;
#if !TARGET_OS_IPHONE && !defined(ANDROID) #if !TARGET_OS_IPHONE && !defined(ANDROID)
virtual KRTexture* compress(bool premultiply_alpha = false); virtual KRTexture* compress(bool premultiply_alpha = false) override;
#endif #endif
virtual long getMemRequiredForSize(int max_dim); virtual long getMemRequiredForSize(int max_dim) override;
virtual hydra::Vector2i getDimensions() const override; virtual hydra::Vector2i getDimensions() const override;
virtual VkFormat getFormat() const override; virtual VkFormat getFormat() const override;
virtual int getFaceCount() const override; virtual int getFaceCount() const override;