mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-21 06:46:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'float-conv' into 'master'

Browse source 
[RFC] meson: add -Wfloat-conversion

See merge request wlroots/wlroots!3731
This commit is contained in:
Kirill Primak 2022-09-21 02:36:08 +00:00
commit 43b9e98050
31 changed files with 220 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

14
render/vulkan/renderer.c
View file

@ -59,9 +59,9 @@ struct vert_pcr_data {
// https://www.w3.org/Graphics/Color/srgb
static float color_to_linear(float non_linear) {
return (non_linear > 0.04045) ?
pow((non_linear + 0.055) / 1.055, 2.4) :
non_linear / 12.92;
return (non_linear > 0.04045f) ?
powf((non_linear + 0.055f) / 1.055f, 2.4f) :
non_linear / 12.92f;
}
// renderer
@ -782,10 +782,10 @@ static bool vulkan_render_subtexture_with_matrix(struct wlr_renderer *wlr_render
struct vert_pcr_data vert_pcr_data;
mat3_to_mat4(final_matrix, vert_pcr_data.mat4);
vert_pcr_data.uv_off[0] = box->x / wlr_texture->width;
vert_pcr_data.uv_off[1] = box->y / wlr_texture->height;
vert_pcr_data.uv_size[0] = box->width / wlr_texture->width;
vert_pcr_data.uv_size[1] = box->height / wlr_texture->height;
vert_pcr_data.uv_off[0] = (float)(box->x / wlr_texture->width);
vert_pcr_data.uv_off[1] = (float)(box->y / wlr_texture->height);
vert_pcr_data.uv_size[0] = (float)(box->width / wlr_texture->width);
vert_pcr_data.uv_size[1] = (float)(box->height / wlr_texture->height);
vkCmdPushConstants(cb, renderer->pipe_layout,
VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(vert_pcr_data), &vert_pcr_data);