Main: GpuProgramManager - bump Microcode cache version

paroj · paroj · commit 3f3a4be1b0e0 · 2024-03-05T22:11:32.000+01:00
as we changed the disk format for D3D11 in 14.2
diff --git a/OgreMain/src/OgreGpuProgramManager.cpp b/OgreMain/src/OgreGpuProgramManager.cpp
@@ -351,7 +351,7 @@ namespace {
         }
         
         StreamSerialiser serialiser(stream);
-        serialiser.writeChunkBegin(CACHE_CHUNK_ID, 2);
+        serialiser.writeChunkBegin(CACHE_CHUNK_ID, 3);
 
         // write the size of the array
         uint32 sizeOfArray = static_cast<uint32>(mMicrocodeCache.size());
@@ -391,9 +391,10 @@ namespace {
             return;
         }
 
-        if(chunk->id != CACHE_CHUNK_ID || chunk->version != 2)
+        if(chunk->id != CACHE_CHUNK_ID || chunk->version != 3)
         {
             LogManager::getSingleton().logWarning("Invalid Microcode Cache");
+            serialiser.readChunkEnd(CACHE_CHUNK_ID);
             return;
         }
         // write the size of the array

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ namespace {`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`StreamSerialiser serialiser(stream);`
`354`		`- serialiser.writeChunkBegin(CACHE_CHUNK_ID, 2);`
	`354`	`+ serialiser.writeChunkBegin(CACHE_CHUNK_ID, 3);`
`355`	`355`
`356`	`356`	`// write the size of the array`
`357`	`357`	`uint32 sizeOfArray = static_cast<uint32>(mMicrocodeCache.size());`
`@@ -391,9 +391,10 @@ namespace {`
`391`	`391`	`return;`
`392`	`392`	`}`
`393`	`393`
`394`		`- if(chunk->id != CACHE_CHUNK_ID \|\| chunk->version != 2)`
	`394`	`+ if(chunk->id != CACHE_CHUNK_ID \|\| chunk->version != 3)`
`395`	`395`	`{`
`396`	`396`	`LogManager::getSingleton().logWarning("Invalid Microcode Cache");`
	`397`	`+ serialiser.readChunkEnd(CACHE_CHUNK_ID);`
`397`	`398`	`return;`
`398`	`399`	`}`
`399`	`400`	`// write the size of the array`