diff --git a/config/ConfigFormUnit.cpp b/config/ConfigFormUnit.cpp index 3a1564a..547754a 100644 --- a/config/ConfigFormUnit.cpp +++ b/config/ConfigFormUnit.cpp @@ -787,7 +787,7 @@ void __fastcall TConfigForm::FormCreate(TObject *Sender) ShaderCbx->AddItem("Nearest neighbor", NULL); ShaderCbx->AddItem("Bilinear", NULL); ShaderCbx->AddItem("Bicubic", NULL); - ShaderCbx->AddItem("Lanczos", NULL); + ShaderCbx->AddItem("Lanczos", NULL); } auto shader = ini->ReadString("ddraw", "shader", "Bicubic"); diff --git a/src/opengl_utils.c b/src/opengl_utils.c index 94dda4e..f1bc32b 100644 --- a/src/opengl_utils.c +++ b/src/opengl_utils.c @@ -283,14 +283,14 @@ GLuint oglu_build_program(const GLchar* vert_source, const GLchar* frag_source) glGetShaderiv(frag_shader, GL_COMPILE_STATUS, &is_compiled); if (is_compiled == GL_FALSE) { - /**/ + /* GLint len = 0; glGetShaderiv(frag_shader, GL_INFO_LOG_LENGTH, &len); char* log = calloc(len + 50, 1); glGetShaderInfoLog(frag_shader, len, &len, &log[0]); TRACE("| GL_LOG: %s\n", log); free(log); - + */ if (glDeleteShader) { glDeleteShader(frag_shader); diff --git a/src/render_ogl.c b/src/render_ogl.c index 9a45936..74156a9 100644 --- a/src/render_ogl.c +++ b/src/render_ogl.c @@ -204,7 +204,7 @@ static void ogl_build_programs() CATMULL_ROM_FRAG_SHADER_CORE); } - bilinear = TRUE; + bilinear = _stricmp(g_ddraw->shader, "Nearest neighbor") != 0 && _stricmp(g_ddraw->shader, "Lanczos") != 0; }