Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/renderer/OpenGL/gl_ContextSDL3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@ static void SDL3_WindowParmsFromGlimpParms(const glimpParms_t &src, renderWindow
dst.multiSamples = src.multiSamples;
}

static void SDL3_SyncGLConfigWindowDimensions( const renderModuleWindowInfo_t &windowInfo ) {
if ( windowInfo.pixelWidth > 0 && windowInfo.pixelHeight > 0 ) {
glConfig.vidWidth = windowInfo.pixelWidth;
glConfig.vidHeight = windowInfo.pixelHeight;
}
glConfig.uiViewportX = windowInfo.uiViewportX;
glConfig.uiViewportY = windowInfo.uiViewportY;
glConfig.uiViewportWidth = windowInfo.uiViewportWidth;
glConfig.uiViewportHeight = windowInfo.uiViewportHeight;
}

static bool SDL3_EnsureGLContextCurrent(const char *operation) {
if (!s_glWindow || !s_glContext) {
return false;
Expand Down Expand Up @@ -489,6 +500,7 @@ bool GLimp_Init(glimpParms_t parms) {

s_glWindowServices->RefreshNativeWindowHandles(&windowInfo);
s_glHDC = windowInfo.nativeDisplayHandle;
SDL3_SyncGLConfigWindowDimensions(windowInfo);
SDL3_LoadWGLExtensions();
if (r_swapInterval.IsModified()) {
r_swapInterval.ClearModified();
Expand Down Expand Up @@ -525,6 +537,7 @@ bool GLimp_SetScreenParms(glimpParms_t parms) {
renderModuleWindowInfo_t windowInfo;
windowServices->RefreshNativeWindowHandles(&windowInfo);
s_glHDC = windowInfo.nativeDisplayHandle;
SDL3_SyncGLConfigWindowDimensions(windowInfo);
r_swapInterval.SetModified();
if (r_swapInterval.IsModified()) {
r_swapInterval.ClearModified();
Expand Down Expand Up @@ -575,14 +588,7 @@ void GLimp_SwapBuffers(void) {
if (s_glWindow && s_glWindowServices != NULL && s_glWindowServices->RefreshNativeWindowHandles != NULL) {
renderModuleWindowInfo_t windowInfo;
s_glWindowServices->RefreshNativeWindowHandles(&windowInfo);
if (windowInfo.pixelWidth > 0 && windowInfo.pixelHeight > 0) {
glConfig.vidWidth = windowInfo.pixelWidth;
glConfig.vidHeight = windowInfo.pixelHeight;
}
glConfig.uiViewportX = windowInfo.uiViewportX;
glConfig.uiViewportY = windowInfo.uiViewportY;
glConfig.uiViewportWidth = windowInfo.uiViewportWidth;
glConfig.uiViewportHeight = windowInfo.uiViewportHeight;
SDL3_SyncGLConfigWindowDimensions(windowInfo);
}

R_RendererMetrics_EndPresentPhase(RENDERER_PRESENT_WINDOW_STATE, windowBegin);
Expand Down