From 5c02bc59dbd6670a6100035e8dbd10f4e1ac7198 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sun, 8 Dec 2019 22:28:13 -0300
Subject: [PATCH] Speed up level loading Don't flush every texture just because
the palette MAY have changed
---
src/hardware/r_opengl/ogl_win.c | 15 +++++----------
src/sdl/ogl_sdl.c | 13 +++++--------
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/src/hardware/r_opengl/ogl_win.c b/src/hardware/r_opengl/ogl_win.c
index 90376f2765..e4a71734be 100644
--- a/src/hardware/r_opengl/ogl_win.c
+++ b/src/hardware/r_opengl/ogl_win.c
@@ -566,18 +566,13 @@ EXPORT void HWRAPI(FinishUpdate) (INT32 waitvbl)
// -----------------+
EXPORT void HWRAPI(SetPalette) (RGBA_t *pal)
{
- INT32 i;
-
- for (i = 0; i < 256; i++)
+ size_t palsize = (sizeof(RGBA_t) * 256);
+ // on a palette change, you have to reload all of the textures
+ if (memcmp(&myPaletteData, pal, palsize))
{
- myPaletteData[i].s.red = pal[i].s.red;
- myPaletteData[i].s.green = pal[i].s.green;
- myPaletteData[i].s.blue = pal[i].s.blue;
- myPaletteData[i].s.alpha = pal[i].s.alpha;
+ memcpy(&myPaletteData, pal, palsize);
+ Flush();
}
-
- // on a palette change, you have to reload all of the textures
- Flush();
}
#endif
diff --git a/src/sdl/ogl_sdl.c b/src/sdl/ogl_sdl.c
index 66980f1adf..6c0dd35a59 100644
--- a/src/sdl/ogl_sdl.c
+++ b/src/sdl/ogl_sdl.c
@@ -224,16 +224,13 @@ void OglSdlFinishUpdate(boolean waitvbl)
EXPORT void HWRAPI( OglSdlSetPalette) (RGBA_t *palette)
{
- INT32 i;
-
- for (i = 0; i < 256; i++)
+ size_t palsize = (sizeof(RGBA_t) * 256);
+ // on a palette change, you have to reload all of the textures
+ if (memcmp(&myPaletteData, palette, palsize))
{
- myPaletteData[i].s.red = palette[i].s.red;
- myPaletteData[i].s.green = palette[i].s.green;
- myPaletteData[i].s.blue = palette[i].s.blue;
- myPaletteData[i].s.alpha = palette[i].s.alpha;
+ memcpy(&myPaletteData, palette, palsize);
+ Flush();
}
- Flush();
}
#endif //HWRENDER
--
GitLab