KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better conversion of logo width/height to gl values

Browse Source 
Map the naive value back to an integer using the same algorithm as for
the scissor test and adjust the value if they dont match
This commit is contained in:
Kovid Goyal 2021-12-05 13:18:16 +05:30
parent 73386bd67f
commit 525a32be51
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kitty/shaders.c
View File

@ -588,12 +588,22 @@ render_window_title(OSWindow *os_window, Screen *screen UNUSED, GLfloat xstart,
return 2.f * (GLfloat)bar_height / (GLfloat)os_window->viewport_height; return 2.f * (GLfloat)bar_height / (GLfloat)os_window->viewport_height;
} }
static GLfloat
gl_size(const unsigned int sz, const unsigned int viewport_size) {
// convert sz to OpenGL co-oridinate system. Checks that mapping back via roundf()
// yields the same value.
const GLfloat px = 2.f / viewport_size;
GLfloat ans = px * sz;
const unsigned int mapped_val = (unsigned int)roundf((ans * viewport_size) / 2.f);
return ans + px * (sz - mapped_val);
}
static void static void
draw_window_logo(ssize_t vao_idx, OSWindow *os_window, const WindowLogoRenderData *wl, const CellRenderData *crd) { draw_window_logo(ssize_t vao_idx, OSWindow *os_window, const WindowLogoRenderData *wl, const CellRenderData *crd) {
if (os_window->live_resize.in_progress) return; if (os_window->live_resize.in_progress) return;
BLEND_PREMULT; BLEND_PREMULT;
GLfloat logo_width_gl = 2.f * ((float)wl->instance->width) / os_window->viewport_width; GLfloat logo_width_gl = gl_size(wl->instance->width, os_window->viewport_width);
GLfloat logo_height_gl = 2.f * ((float)wl->instance->height) / os_window->viewport_height; GLfloat logo_height_gl = gl_size(wl->instance->height, os_window->viewport_height);
GLfloat logo_left_gl = crd->gl.xstart + crd->gl.width * wl->position.canvas_x - logo_width_gl * wl->position.image_x; GLfloat logo_left_gl = crd->gl.xstart + crd->gl.width * wl->position.canvas_x - logo_width_gl * wl->position.image_x;
GLfloat logo_top_gl = crd->gl.ystart - crd->gl.height * wl->position.canvas_y + logo_height_gl * wl->position.image_y; GLfloat logo_top_gl = crd->gl.ystart - crd->gl.height * wl->position.canvas_y + logo_height_gl * wl->position.image_y;
static ImageRenderData ird = {.group_count=1}; static ImageRenderData ird = {.group_count=1};