From 4dc2a8ca12a178e439875ee42f6b420d5ffaefb9 Mon Sep 17 00:00:00 2001 From: Stephen Saunders Date: Mon, 12 Dec 2022 17:35:51 -0500 Subject: [PATCH] Fix compileshaders.cmake to reference USE_VULKAN, fix missing override warning in Model_local.h --- neo/compileshaders.cmake | 2 +- neo/renderer/Model_local.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neo/compileshaders.cmake b/neo/compileshaders.cmake index 575cacda..69f405f1 100644 --- a/neo/compileshaders.cmake +++ b/neo/compileshaders.cmake @@ -100,7 +100,7 @@ function(compile_shaders) --compiler ${FXC_EXECUTABLE}) endif() - if (params_SPIRV_DXC AND USE_NVRHI_VULKAN) + if (params_SPIRV_DXC AND USE_VULKAN) if (NOT DXC_SPIRV_EXECUTABLE) message(FATAL_ERROR "compile_shaders: DXC for SPIR-V not found --- please set DXC_SPIRV_EXECUTABLE to the full path to the DXC binary") endif() diff --git a/neo/renderer/Model_local.h b/neo/renderer/Model_local.h index 48dc426f..c25e423d 100644 --- a/neo/renderer/Model_local.h +++ b/neo/renderer/Model_local.h @@ -218,7 +218,7 @@ class idRenderModelMD5 : public idRenderModelStatic { friend class idRenderModelGLTF; public: - void InitFromFile( const char* fileName, const idImportOptions* options ); + void InitFromFile( const char* fileName, const idImportOptions* options ) override; bool LoadBinaryModel( idFile* file, const ID_TIME_T sourceTimeStamp ) override; void WriteBinaryModel( idFile* file, ID_TIME_T* _timeStamp = NULL ) const override; dynamicModel_t IsDynamicModel() const override;