Merged pull request "Remove rowbytes, pixels args from R_ModeChanged(…

…)": #357
NVIDIA · Nov 20, 2023 · ece5856 · ece5856
2 parents 743a509 + fa91b27
commit ece5856
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/inc/refresh/refresh.h b/inc/refresh/refresh.h
@@ -339,7 +339,7 @@ extern void    (*R_DiscardRawPic)(void);
 // video mode and refresh state management entry points
 extern void    (*R_BeginFrame)(void);
 extern void    (*R_EndFrame)(void);
-extern void    (*R_ModeChanged)(int width, int height, int flags, int rowbytes, void *pixels);
+extern void    (*R_ModeChanged)(int width, int height, int flags);
 
 // add decal to ring buffer
 extern void    (*R_AddDecal)(decal_t *d);

diff --git a/src/client/refresh.c b/src/client/refresh.c
@@ -481,7 +481,7 @@ void(*R_UpdateRawPic)(int pic_w, int pic_h, const uint32_t *pic) = NULL;
 void(*R_DiscardRawPic)(void) = NULL;
 void(*R_BeginFrame)(void) = NULL;
 void(*R_EndFrame)(void) = NULL;
-void(*R_ModeChanged)(int width, int height, int flags, int rowbytes, void *pixels) = NULL;
+void(*R_ModeChanged)(int width, int height, int flags) = NULL;
 void(*R_AddDecal)(decal_t *d) = NULL;
 bool(*R_InterceptKey)(unsigned key, bool down) = NULL;
 bool(*R_IsHDR)(void) = NULL;

diff --git a/src/refresh/gl/main.c b/src/refresh/gl/main.c
@@ -1013,7 +1013,7 @@ void R_EndRegistration_GL(void)
 R_ModeChanged
 ===============
 */
-void R_ModeChanged_GL(int width, int height, int flags, int rowbytes, void *pixels)
+void R_ModeChanged_GL(int width, int height, int flags)
 {
     r_config.width = width;
     r_config.height = height;

diff --git a/src/refresh/vkpt/main.c b/src/refresh/vkpt/main.c
@@ -3567,7 +3567,7 @@ R_EndFrame_RTX(void)
 }
 
 void
-R_ModeChanged_RTX(int width, int height, int flags, int rowbytes, void *pixels)
+R_ModeChanged_RTX(int width, int height, int flags)
 {
 	Com_DPrintf("mode changed %d %d\n", width, height);
 

diff --git a/src/unix/video/sdl.c b/src/unix/video/sdl.c
@@ -133,9 +133,6 @@ VIDEO
 
 static void mode_changed(void)
 {
-    void *pixels;
-    int rowbytes;
-
     SDL_GetWindowSize(sdl.window, &sdl.win_width, &sdl.win_height);
 
     SDL_GL_GetDrawableSize(sdl.window, &sdl.width, &sdl.height);
@@ -146,10 +143,7 @@ static void mode_changed(void)
     else
         sdl.flags &= ~QVF_FULLSCREEN;
 
-    pixels = NULL;
-    rowbytes = 0;
-
-    R_ModeChanged(sdl.width, sdl.height, sdl.flags, rowbytes, pixels);
+    R_ModeChanged(sdl.width, sdl.height, sdl.flags);
     SCR_ModeChanged();
 }