Fix compileshaders.cmake to reference USE_VULKAN, fix missing override warning in Model_local.h

This commit is contained in:
Stephen Saunders 2022-12-12 17:35:51 -05:00
parent 3f8bc0a568
commit 4dc2a8ca12
2 changed files with 2 additions and 2 deletions

View file

@ -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()

View file

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