mirrors
/
weston
mirror of https://gitlab.freedesktop.org/wayland/weston.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gl-renderer: Use fixed tex units 

Provide a fixed allocation to each texture unit in order to prevent
conflicts. This fixes a conflict between colour transforms and the
wireframe debug mode.

Signed-off-by: Loïc Molinari <loic.molinari@collabora.com>
This commit is contained in:
Loïc Molinari 2024-07-23 13:13:49 +02:00 committed by Daniel Stone
parent 16390dbae1
commit 69d4f66fab
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libweston/renderer-gl/gl-renderer-internal.h
View File

@ -38,6 +38,9 @@
#include "shared/weston-egl-ext.h" /* for PFN* stuff */
#include "shared/helpers.h"
/* Max number of images per buffer. */
#define SHADER_INPUT_TEX_MAX 3
/* Keep the following in sync with vertex.glsl. */
enum gl_shader_texcoord_input {
SHADER_TEXCOORD_INPUT_ATTRIB = 0,
@ -78,6 +81,19 @@ enum gl_shader_attrib_loc {
SHADER_ATTRIB_LOC_BARYCENTRIC,
};
enum gl_tex_unit {
TEX_UNIT_IMAGES = 0,
TEX_UNIT_COLOR_PRE_CURVE = SHADER_INPUT_TEX_MAX,
TEX_UNIT_COLOR_MAPPING,
TEX_UNIT_COLOR_POST_CURVE,
TEX_UNIT_WIREFRAME,
TEX_UNIT_LAST,
};
static_assert(TEX_UNIT_LAST < 8, "OpenGL ES 2.0 requires at least 8 texture "
"units. Consider replacing this assert with a "
"GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS check at display creation "
"to require more.");
/** GL shader requirements key
*
* This structure is used as a binary blob key for building and searching
@ -115,9 +131,6 @@ struct gl_shader;
struct weston_color_transform;
struct dmabuf_allocator;
#define SHADER_INPUT_TEX_MAX 3
#define SHADER_WIREFRAME_TEX_UNIT SHADER_INPUT_TEX_MAX
struct gl_shader_config {
struct gl_shader_requirements req;

27
libweston/renderer-gl/gl-shaders.c
View File

@ -686,8 +686,8 @@ gl_shader_load_config(struct gl_shader *shader,
continue;
assert(shader->tex_uniforms[i] != -1);
glUniform1i(shader->tex_uniforms[i], i);
glActiveTexture(GL_TEXTURE0 + i);
glUniform1i(shader->tex_uniforms[i], TEX_UNIT_IMAGES + i);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_IMAGES + i);
glBindTexture(in_tgt, sconf->input_tex[i]);
glTexParameteri(in_tgt, GL_TEXTURE_MIN_FILTER, in_filter);
@ -695,7 +695,6 @@ gl_shader_load_config(struct gl_shader *shader,
}
/* Fixed texture unit for color_pre_curve LUT if it is available */
i = SHADER_INPUT_TEX_MAX;
switch (sconf->req.color_pre_curve) {
case SHADER_COLOR_CURVE_IDENTITY:
break;
@ -703,10 +702,10 @@ gl_shader_load_config(struct gl_shader *shader,
assert(sconf->color_pre_curve.lut_3x1d.tex != 0);
assert(shader->color_pre_curve.lut_3x1d.tex_2d_uniform != -1);
assert(shader->color_pre_curve.lut_3x1d.scale_offset_uniform != -1);
glActiveTexture(GL_TEXTURE0 + i);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_COLOR_PRE_CURVE);
glBindTexture(GL_TEXTURE_2D, sconf->color_pre_curve.lut_3x1d.tex);
glUniform1i(shader->color_pre_curve.lut_3x1d.tex_2d_uniform, i);
i++;
glUniform1i(shader->color_pre_curve.lut_3x1d.tex_2d_uniform,
TEX_UNIT_COLOR_PRE_CURVE);
glUniform2fv(shader->color_pre_curve.lut_3x1d.scale_offset_uniform,
1, sconf->color_pre_curve.lut_3x1d.scale_offset);
break;
@ -727,10 +726,10 @@ gl_shader_load_config(struct gl_shader *shader,
assert(shader->color_mapping.lut3d.tex_uniform != -1);
assert(sconf->color_mapping.lut3d.tex != 0);
assert(shader->color_mapping.lut3d.scale_offset_uniform != -1);
glActiveTexture(GL_TEXTURE0 + i);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_COLOR_MAPPING);
glBindTexture(GL_TEXTURE_3D, sconf->color_mapping.lut3d.tex);
glUniform1i(shader->color_mapping.lut3d.tex_uniform, i);
i++;
glUniform1i(shader->color_mapping.lut3d.tex_uniform,
TEX_UNIT_COLOR_MAPPING);
glUniform2fv(shader->color_mapping.lut3d.scale_offset_uniform,
1, sconf->color_mapping.lut3d.scale_offset);
break;
@ -749,10 +748,10 @@ gl_shader_load_config(struct gl_shader *shader,
assert(sconf->color_post_curve.lut_3x1d.tex != 0);
assert(shader->color_post_curve.lut_3x1d.tex_2d_uniform != -1);
assert(shader->color_post_curve.lut_3x1d.scale_offset_uniform != -1);
glActiveTexture(GL_TEXTURE0 + i);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_COLOR_POST_CURVE);
glBindTexture(GL_TEXTURE_2D, sconf->color_post_curve.lut_3x1d.tex);
glUniform1i(shader->color_post_curve.lut_3x1d.tex_2d_uniform, i);
i++;
glUniform1i(shader->color_post_curve.lut_3x1d.tex_2d_uniform,
TEX_UNIT_COLOR_POST_CURVE);
glUniform2fv(shader->color_post_curve.lut_3x1d.scale_offset_uniform,
1, sconf->color_post_curve.lut_3x1d.scale_offset);
break;
@ -768,8 +767,8 @@ gl_shader_load_config(struct gl_shader *shader,
if (sconf->req.wireframe) {
assert(sconf->wireframe_tex != 0);
glUniform1i(shader->tex_uniform_wireframe, SHADER_WIREFRAME_TEX_UNIT);
glActiveTexture(GL_TEXTURE0 + SHADER_WIREFRAME_TEX_UNIT);
glUniform1i(shader->tex_uniform_wireframe, TEX_UNIT_WIREFRAME);
glActiveTexture(GL_TEXTURE0 + TEX_UNIT_WIREFRAME);
glBindTexture(GL_TEXTURE_2D, sconf->wireframe_tex);
}
}