File melonds_compute-shader-renderer_filemode.patch of Package melonds

Overview Repositories Revisions Requests Users Attributes Meta

File melonds_compute-shader-renderer_filemode.patch of Package melonds (Revision 4d3e01c83cce22589c354eca8405631d)

Currently displaying revision 4d3e01c83cce22589c354eca8405631d , Show latest

From 673f2c96d8d46b8bbe9a3c3d58ea85627b888779 Mon Sep 17 00:00:00 2001
From: v-fox <virtuousfox@gmail.com>
Date: Tue, 29 Aug 2023 14:42:25 +0500
Subject: [PATCH 2/2] replacement of FileMode to fix regression due to
 https://github.com/melonDS-emu/melonDS/pull/1800/

---
 src/OpenGLSupport.cpp | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/OpenGLSupport.cpp b/src/OpenGLSupport.cpp
index 4cb0e97..7130c7d 100644
--- a/src/OpenGLSupport.cpp
+++ b/src/OpenGLSupport.cpp
@@ -26,8 +26,7 @@
 #define XXH_STATIC_LINKING_ONLY
 #include "xxhash/xxhash.h"
 
-using Platform::Log;
-using Platform::LogLevel;
+using namespace Platform;
 
 namespace OpenGL
 {
@@ -73,7 +72,7 @@ void LoadShaderCache()
 {
     // for now the shader cache only contains only compute shaders
     // because they take the longest to compile
-    FILE* file = Platform::OpenLocalFile("shadercache", "rb");
+    FileHandle* file = OpenLocalFile("shadercache", FileMode::Read);
     if (file == nullptr)
     {
         Log(LogLevel::Error, "Could not find shader cache\n");
@@ -81,19 +80,19 @@ void LoadShaderCache()
     }
 
     u32 magic, version, numPrograms;
-    if (fread(&magic, 4, 1, file) != 1 || magic != ShaderCacheMagic)
+    if (FileRead(&magic, 4, 1, file) != 1 || magic != ShaderCacheMagic)
     {
         Log(LogLevel::Error, "Shader cache file has invalid magic\n");
         goto fileInvalid;
     }
 
-    if (fread(&version, 4, 1, file) != 1 || version != ShaderCacheVersion)
+    if (FileRead(&version, 4, 1, file) != 1 || version != ShaderCacheVersion)
     {
         Log(LogLevel::Error, "Shader cache file has bad version\n");
         goto fileInvalid;
     }
 
-    if (fread(&numPrograms, 4, 1, file) != 1)
+    if (FileRead(&numPrograms, 4, 1, file) != 1)
     {
         Log(LogLevel::Error, "Shader cache file invalid program count\n");
         goto fileInvalid;
@@ -107,9 +106,9 @@ void LoadShaderCache()
 
         u32 length, binaryFormat;
         u64 sourceHash;
-        error -= fread(&sourceHash, 8, 1, file);
-        error -= fread(&length, 4, 1, file);
-        error -= fread(&binaryFormat, 4, 1, file);
+        error -= FileRead(&sourceHash, 8, 1, file);
+        error -= FileRead(&length, 4, 1, file);
+        error -= FileRead(&binaryFormat, 4, 1, file);
 
         if (error != 0)
         {
@@ -118,7 +117,7 @@ void LoadShaderCache()
         }
 
         u8* data = new u8[length];
-        if (fread(data, length, 1, file) != 1)
+        if (FileRead(data, length, 1, file) != 1)
         {
             Log(LogLevel::Error, "Could not read shader cache entry data\n");
             delete[] data;
@@ -130,14 +129,14 @@ void LoadShaderCache()
     }
 
 fileInvalid:
-    fclose(file);
+    CloseFile(file);
 }
 
 void SaveShaderCache()
 {
-    FILE* file = Platform::OpenLocalFile("shadercache", "rb+");
+    FileHandle* file = OpenLocalFile("shadercache", FileMode::ReadWriteExisting);
     if (file == nullptr)
-        file = Platform::OpenLocalFile("shadercache", "wb");
+        file = OpenLocalFile("shadercache", FileMode::Write);
 
     if (file == nullptr)
     {
@@ -147,9 +146,9 @@ void SaveShaderCache()
 
     int written = 3;
     u32 magic = ShaderCacheMagic, version = ShaderCacheVersion, numPrograms = ShaderCache.size();
-    written -= fwrite(&magic, 4, 1, file);
-    written -= fwrite(&version, 4, 1, file);
-    written -= fwrite(&numPrograms, 4, 1, file);
+    written -= FileWrite(&magic, 4, 1, file);
+    written -= FileWrite(&version, 4, 1, file);
+    written -= FileWrite(&numPrograms, 4, 1, file);
 
     if (written != 0)
     {
@@ -157,7 +156,7 @@ void SaveShaderCache()
         goto writeError;
     }
 
-    fseek(file, 0, SEEK_END);
+    FileRewind(file);
 
     printf("new shaders %d\n", NewShaders.size());
 
@@ -166,10 +165,10 @@ void SaveShaderCache()
         int error = 4;
         auto it = ShaderCache.find(newShader);
 
-        error -= fwrite(&it->first, 8, 1, file);
-        error -= fwrite(&it->second.Length, 4, 1, file);
-        error -= fwrite(&it->second.BinaryFormat, 4, 1, file);
-        error -= fwrite(it->second.Data, it->second.Length, 1, file);
+        error -= FileWrite(&it->first, 8, 1, file);
+        error -= FileWrite(&it->second.Length, 4, 1, file);
+        error -= FileWrite(&it->second.BinaryFormat, 4, 1, file);
+        error -= FileWrite(it->second.Data, it->second.Length, 1, file);
 
         if (error != 0)
         {
@@ -179,7 +178,7 @@ void SaveShaderCache()
     }
 
 writeError:
-    fclose(file);
+    CloseFile(file);
 
     NewShaders.clear();
 }
-- 
2.41.0

Places

File melonds_compute-shader-renderer_filemode.patch of Package melonds (Revision 4d3e01c83cce22589c354eca8405631d)

Places