From ee6639b4f769caad2be085e496db6e40499e248e Mon Sep 17 00:00:00 2001 From: water Date: Mon, 9 Aug 2021 18:59:47 -0400 Subject: [PATCH] fix texture filter --- game/graphics/opengl_renderer/DirectRenderer.cpp | 5 +++-- game/kernel/kmachine.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/game/graphics/opengl_renderer/DirectRenderer.cpp b/game/graphics/opengl_renderer/DirectRenderer.cpp index f7b11a8e9f..2443a27555 100644 --- a/game/graphics/opengl_renderer/DirectRenderer.cpp +++ b/game/graphics/opengl_renderer/DirectRenderer.cpp @@ -180,10 +180,11 @@ void DirectRenderer::update_gl_texture(SharedRenderState* render_state) { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, tex->gpu_texture); + // TODO these wrappings are probably wrong. glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glUniform1i( glGetUniformLocation(render_state->shaders[ShaderId::DIRECT_BASIC_TEXTURED].id(), "T0"), 0); } diff --git a/game/kernel/kmachine.cpp b/game/kernel/kmachine.cpp index 55ac8b48bb..63072850ba 100644 --- a/game/kernel/kmachine.cpp +++ b/game/kernel/kmachine.cpp @@ -618,7 +618,7 @@ void InitMachine_PCPort() { void vif_interrupt_callback() { // added for the PC port for faking VIF interrupts from the graphics system. - if (machine_booted) { + if (machine_booted && MasterExit == 0) { auto sym = intern_from_c("vif1-handler-debug"); if (sym->value) { call_goal(Ptr(sym->value), 0, 0, 0, s7.offset, g_ee_main_mem);