From f95d819a476eb877d57c250c6e4219974ccc0dd4 Mon Sep 17 00:00:00 2001 From: Sergey Lipskiy Date: Wed, 9 Aug 2017 12:55:22 +0700 Subject: [PATCH] Up shader storage version. --- src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp | 5 ++--- src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp b/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp index b7bd761e..dc7baf0d 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp +++ b/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.cpp @@ -64,7 +64,6 @@ char * - GL version string uint32 - number of shaders shaders in binary form */ -static const u32 ShaderStorageFormatVersion = 0x11U; bool ShaderStorage::saveShadersStorage(const graphics::Combiners & _combiners) const { wchar_t fileName[PLUGIN_PATH_SIZE]; @@ -80,7 +79,7 @@ bool ShaderStorage::saveShadersStorage(const graphics::Combiners & _combiners) c if (!fout) return false; - fout.write((char*)&ShaderStorageFormatVersion, sizeof(ShaderStorageFormatVersion)); + fout.write((char*)&m_formatVersion, sizeof(m_formatVersion)); const u32 configOptionsBitSet = _getConfigOptionsBitSet(); fout.write((char*)&configOptionsBitSet, sizeof(configOptionsBitSet)); @@ -179,7 +178,7 @@ bool ShaderStorage::loadShadersStorage(graphics::Combiners & _combiners) try { u32 version; fin.read((char*)&version, sizeof(version)); - if (version != ShaderStorageFormatVersion) + if (version != m_formatVersion) return false; u32 optionsSet; diff --git a/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h b/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h index 46840b03..677a8d9b 100644 --- a/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h +++ b/src/Graphics/OpenGLContext/GLSL/glsl_ShaderStorage.h @@ -17,6 +17,7 @@ namespace glsl { bool loadShadersStorage(graphics::Combiners & _combiners); private: + const u32 m_formatVersion = 0x12U; const opengl::GLInfo & m_glinfo; opengl::CachedUseProgram * m_useProgram; };