From aa1302b699a53d8d435602d6651fda14bf9773d3 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 3 Nov 2016 21:26:15 +0530 Subject: [PATCH] Set texture interpolation to nearest to prevent fringing --- kitty/gl.h | 2 +- kitty/shaders.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/kitty/gl.h b/kitty/gl.h index ee39168c9..2f5559a33 100644 --- a/kitty/gl.h +++ b/kitty/gl.h @@ -538,7 +538,7 @@ int add_module_gl_constants(PyObject *module) { GLC(GL_MAX_ARRAY_TEXTURE_LAYERS); GLC(GL_MAX_TEXTURE_SIZE); GLC(GL_TEXTURE_2D_ARRAY); - GLC(GL_LINEAR); GLC(GL_CLAMP_TO_EDGE); + GLC(GL_LINEAR); GLC(GL_CLAMP_TO_EDGE); GLC(GL_NEAREST); GLC(GL_TEXTURE_MIN_FILTER); GLC(GL_TEXTURE_MAG_FILTER); GLC(GL_TEXTURE_WRAP_S); GLC(GL_TEXTURE_WRAP_T); GLC(GL_UNPACK_ALIGNMENT); diff --git a/kitty/shaders.py b/kitty/shaders.py index 10b1c11e5..51b42c200 100644 --- a/kitty/shaders.py +++ b/kitty/shaders.py @@ -16,11 +16,12 @@ from .fast_data_types import ( glGetAttribLocation, glUseProgram, glBindVertexArray, GL_TEXTURE0, GL_TEXTURE1, glGetIntegerv, GL_MAX_ARRAY_TEXTURE_LAYERS, glBufferData, GL_MAX_TEXTURE_SIZE, glDeleteTexture, GL_TEXTURE_2D_ARRAY, glGenTextures, - glBindTexture, glTexParameteri, GL_LINEAR, GL_CLAMP_TO_EDGE, glDeleteBuffer, + glBindTexture, glTexParameteri, GL_CLAMP_TO_EDGE, glDeleteBuffer, GL_TEXTURE_MAG_FILTER, GL_TEXTURE_MIN_FILTER, GL_TEXTURE_WRAP_S, - GL_TEXTURE_WRAP_T, glGenBuffers, GL_R8, GL_RED, GL_UNPACK_ALIGNMENT, GL_UNSIGNED_BYTE, - GL_STATIC_DRAW, GL_TEXTURE_BUFFER, GL_RGB32UI, glBindBuffer, glPixelStorei, - glTexBuffer, glActiveTexture, glTexStorage3D, glCopyImageSubData, glTexSubImage3D + GL_NEAREST, GL_TEXTURE_WRAP_T, glGenBuffers, GL_R8, GL_RED, + GL_UNPACK_ALIGNMENT, GL_UNSIGNED_BYTE, GL_STATIC_DRAW, GL_TEXTURE_BUFFER, + GL_RGB32UI, glBindBuffer, glPixelStorei, glTexBuffer, glActiveTexture, + glTexStorage3D, glCopyImageSubData, glTexSubImage3D ) GL_VERSION = (3, 3) @@ -71,8 +72,8 @@ class Sprites: tgt = GL_TEXTURE_2D_ARRAY tex = glGenTextures(1) glBindTexture(tgt, tex) - glTexParameteri(tgt, GL_TEXTURE_MIN_FILTER, GL_LINEAR) - glTexParameteri(tgt, GL_TEXTURE_MAG_FILTER, GL_LINEAR) + glTexParameteri(tgt, GL_TEXTURE_MIN_FILTER, GL_NEAREST) + glTexParameteri(tgt, GL_TEXTURE_MAG_FILTER, GL_NEAREST) glTexParameteri(tgt, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE) glTexParameteri(tgt, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE) znum = self.z + 1