diff --git a/game/graphics/gfx.h b/game/graphics/gfx.h index d9a9710b04..844987bbd4 100644 --- a/game/graphics/gfx.h +++ b/game/graphics/gfx.h @@ -73,8 +73,8 @@ static constexpr int PAT_MAT_COUNT = 23; struct GfxGlobalSettings { // note: this is actually the size of the display that ISN'T letterboxed // the excess space is what will be letterboxed away. - int lbox_w; - int lbox_h; + int lbox_w = 640; + int lbox_h = 480; // actual game resolution int game_res_w = 640; diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index a46f9064c7..390cecc64d 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -483,6 +483,7 @@ void OpenGLRenderer::setup_frame(const RenderOptions& settings) { } else { lg::error("bad framebuffer setup. fbo: {}, tex: {}, zbuf: {}, fbo2: {}, tex2: {}", fbo_state.fbo, fbo_state.tex, fbo_state.zbuf, fbo_state.fbo2, fbo_state.tex2); + lg::error("size was: {} x {}\n", fbo_state.width, fbo_state.height); fbo_state.delete_objects(); } } else { diff --git a/game/graphics/pipelines/opengl.cpp b/game/graphics/pipelines/opengl.cpp index 8cd0be658c..f31cb44321 100644 --- a/game/graphics/pipelines/opengl.cpp +++ b/game/graphics/pipelines/opengl.cpp @@ -140,7 +140,6 @@ static int gl_init(GfxSettings& settings) { glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_FALSE); } glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_TRUE); - glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE); return 0; } diff --git a/goal_src/jak1/pc/pckernel.gc b/goal_src/jak1/pc/pckernel.gc index c14ab0021a..1674db3f8f 100644 --- a/goal_src/jak1/pc/pckernel.gc +++ b/goal_src/jak1/pc/pckernel.gc @@ -64,6 +64,7 @@ ((= 'windowed (-> obj display-mode)) (set! (-> obj win-width) width) (set! (-> obj win-height) height) + (pc-set-window-size (max PC_MIN_WIDTH (-> obj win-width)) (max PC_MIN_HEIGHT (-> obj win-height))) ) (else (set! (-> obj width) width) @@ -197,15 +198,10 @@ (if (< (pc-get-screen-rate -1) (-> obj target-fps)) (pc-set-vsync #f)) (pc-set-frame-rate (-> obj target-fps))) - - (if (and (= 'windowed (-> obj display-mode)) - (or (!= (-> obj win-width) (-> obj real-width)) - (!= (-> obj win-height) (-> obj real-height)))) - (pc-set-window-size (max PC_MIN_WIDTH (-> obj win-width)) (max PC_MIN_HEIGHT (-> obj win-height)))) ) ;; do game resolution (if (= (-> obj display-mode) 'windowed) - (pc-set-game-resolution (-> obj win-width) (-> obj win-height)) + (pc-set-game-resolution (-> obj real-width) (-> obj real-height)) (pc-set-game-resolution (-> obj width) (-> obj height))) ;; set msaa sample rate. if invalid, just reset to 4. @@ -1018,7 +1014,6 @@ (define *pc-settings* (new 'global 'pc-settings)) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;; entity debugging ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;