From d9567ff3f9df87038ea2fc4e86ed1487e45ed487 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Thu, 2 Oct 2025 18:07:39 +0500 Subject: [PATCH] engine: cleanup unused glw_state fields, as they only used in GL renderer --- engine/client/vid_common.h | 27 +++++++++++---------------- engine/platform/sdl2/vid_sdl2.c | 15 ++++++--------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/engine/client/vid_common.h b/engine/client/vid_common.h index 8b9d0d3f..a9e88203 100644 --- a/engine/client/vid_common.h +++ b/engine/client/vid_common.h @@ -4,9 +4,9 @@ typedef struct vidmode_s { - const char *desc; - int width; - int height; + const char *desc; + int width; + int height; } vidmode_t; typedef enum window_mode_e @@ -19,30 +19,25 @@ typedef enum window_mode_e typedef struct { - void* context; // handle to GL rendering context - int safe; - - int desktopBitsPixel; - int desktopHeight; - - qboolean initialized; // OpenGL subsystem started - qboolean extended; // extended context allows to GL_Debug - qboolean software; + void *context; // handle to GL rendering context + int safe; + int desktopBitsPixel; + qboolean software; } glwstate_t; extern glwstate_t glw_state; #define VID_MIN_HEIGHT 200 -#define VID_MIN_WIDTH 320 +#define VID_MIN_WIDTH 320 -extern convar_t vid_fullscreen; +extern convar_t vid_fullscreen; extern convar_t vid_maximized; -extern convar_t vid_highdpi; +extern convar_t vid_highdpi; extern convar_t window_width; extern convar_t window_height; extern convar_t window_xpos; extern convar_t window_ypos; -extern convar_t gl_msaa_samples; +extern convar_t gl_msaa_samples; void R_SaveVideoMode( int w, int h, int render_w, int render_h, qboolean maximized ); void VID_SetDisplayTransform( int *render_w, int *render_h ); diff --git a/engine/platform/sdl2/vid_sdl2.c b/engine/platform/sdl2/vid_sdl2.c index 4e33ec4a..fcebea5f 100644 --- a/engine/platform/sdl2/vid_sdl2.c +++ b/engine/platform/sdl2/vid_sdl2.c @@ -795,7 +795,7 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode ) int sdl_renderer = -2; char cmd[64]; - if( Sys_GetParmFromCmdLine("-sdl_renderer", cmd ) ) + if( Sys_GetParmFromCmdLine( "-sdl_renderer", cmd )) sdl_renderer = Q_atoi( cmd ); if( sdl_renderer >= -1 ) @@ -813,15 +813,12 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode ) } else { - if( !glw_state.initialized ) + while( !GL_CreateContext( )) { - while( !GL_CreateContext( )) - { - glw_state.safe++; - if(glw_state.safe > SAFE_DONTCARE) - return false; - GL_SetupAttributes(); // re-choose attributes - } + glw_state.safe++; + if( glw_state.safe > SAFE_DONTCARE ) + return false; + GL_SetupAttributes(); // re-choose attributes } if( !GL_UpdateContext( ))