diff --git a/game/graphics/opengl_renderer/OpenGLRenderer.cpp b/game/graphics/opengl_renderer/OpenGLRenderer.cpp index 8192dac259..b53ef1b078 100644 --- a/game/graphics/opengl_renderer/OpenGLRenderer.cpp +++ b/game/graphics/opengl_renderer/OpenGLRenderer.cpp @@ -462,7 +462,6 @@ void OpenGLRenderer::setup_frame(const RenderOptions& settings) { if (fbo_state.tex2 == -1) { glGenTextures(1, &fbo_state.tex2); } - glActiveTexture(GL_TEXTURE30); glBindTexture(GL_TEXTURE_2D, fbo_state.tex2); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, fbo_state.width, fbo_state.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, nullptr); diff --git a/game/graphics/opengl_renderer/opengl_utils.cpp b/game/graphics/opengl_renderer/opengl_utils.cpp index 041365bcbb..0d181f8244 100644 --- a/game/graphics/opengl_renderer/opengl_utils.cpp +++ b/game/graphics/opengl_renderer/opengl_utils.cpp @@ -142,7 +142,6 @@ void FullScreenDraw::draw(const math::Vector4f& color, glBindBuffer(GL_ARRAY_BUFFER, m_vertex_buffer); auto& shader = render_state->shaders[ShaderId::POST_PROCESSING]; shader.activate(); - glUniform1i(glGetUniformLocation(shader.id(), "screen_tex"), 0); glUniform4f(glGetUniformLocation(shader.id(), "fragment_color"), color[0], color[1], color[2], color[3]); diff --git a/game/graphics/opengl_renderer/shaders/post_processing.frag b/game/graphics/opengl_renderer/shaders/post_processing.frag index 244753aa00..47d103e1f1 100644 --- a/game/graphics/opengl_renderer/shaders/post_processing.frag +++ b/game/graphics/opengl_renderer/shaders/post_processing.frag @@ -6,7 +6,7 @@ out vec4 color; uniform vec4 fragment_color; -layout (binding = 30) uniform sampler2D screen_tex; +layout (binding = 0) uniform sampler2D screen_tex; void main() { color = vec4(texture(screen_tex, screen_pos).rgb * fragment_color.a, 1.0); diff --git a/goal_src/jak1/pc/pckernel-h.gc b/goal_src/jak1/pc/pckernel-h.gc index b8e9ff546a..fa1d970416 100644 --- a/goal_src/jak1/pc/pckernel-h.gc +++ b/goal_src/jak1/pc/pckernel-h.gc @@ -418,14 +418,14 @@ (set! (-> obj target-fps) 60) (pc-get-screen-size -1 (&-> obj width) (&-> obj height)) + (set-aspect! obj 4 3) (set! (-> obj use-vis?) #f) - (set! (-> obj aspect-ratio-auto?) #f) + (set! (-> obj aspect-ratio-auto?) #t) (set! (-> obj vsync?) #t) (set! (-> obj letterbox?) #t) - (set-display-mode! obj 'windowed) + (set-display-mode! obj 'fullscreen) (set-size! obj PC_BASE_WIDTH PC_BASE_HEIGHT) - (set-aspect! obj 4 3) (set! (-> obj gfx-msaa) 4) ;; 4x msaa