fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-05-07 20:08:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: move color mapping asserts to load config

Browse source 
The frequency of checking remaing the same, but we can use an already
needed switch statement and do not need one just for the asserts. This
makes gl_shader_config_set_color_transform() nice and short.

The MAPPING_MATRIX assert was useless, the variable is set right above.

Asserting the mapping type is valid happens already in
gl_shader_load_config_mapping().

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2025-04-15 12:07:45 +03:00
parent cf6735a761
commit 95cb915d32
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libweston/renderer-gl/gl-shader-config-color-transformation.c
View file

@ -375,7 +375,6 @@ gl_shader_config_set_color_transform(struct gl_renderer *gr,
struct weston_color_transform *xform)
{
const struct gl_renderer_color_transform *gl_xform;
bool ret = false;
gl_xform = gl_renderer_color_transform_from(gr, xform);
if (!gl_xform)
@ -389,20 +388,6 @@ gl_shader_config_set_color_transform(struct gl_renderer *gr,
sconf->req.color_mapping = gl_xform->mapping.type;
sconf->color_mapping = gl_xform->mapping.u;
switch (gl_xform->mapping.type) {
case SHADER_COLOR_MAPPING_3DLUT:
assert(sconf->color_mapping.lut3d.scale > 0.0);
assert(sconf->color_mapping.lut3d.offset > 0.0);
ret = true;
break;
case SHADER_COLOR_MAPPING_MATRIX:
assert(sconf->req.color_mapping == SHADER_COLOR_MAPPING_MATRIX);
ret = true;
break;
case SHADER_COLOR_MAPPING_IDENTITY:
ret = true;
break;
}
return ret;
return true;
}

5
libweston/renderer-gl/gl-shaders.c
View file

@ -672,8 +672,11 @@ gl_shader_load_config_mapping(struct weston_compositor *compositor,
return;
case SHADER_COLOR_MAPPING_3DLUT:
assert(unif->lut3d.tex_uniform != -1);
assert(sconf->lut3d.tex3d != 0);
assert(unif->lut3d.scale_offset_uniform != -1);
assert(sconf->lut3d.tex3d != 0);
assert(sconf->lut3d.scale > 0.0);
assert(sconf->lut3d.offset > 0.0);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_COLOR_MAPPING);
glBindTexture(GL_TEXTURE_3D, sconf->lut3d.tex3d);
glUniform1i(unif->lut3d.tex_uniform, TEX_UNIT_COLOR_MAPPING);