AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'glshader-track-uniform-state' into 'master'

Browse Source 
gl: Track the current uniform state for custom programs

See merge request GNOME/gtk!2638
This commit is contained in:
Matthias Clasen 2020-09-29 12:49:22 +00:00
commit 719c44a610
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gsk/gl/gskglrenderops.c
View File

@ -640,7 +640,28 @@ ops_set_gl_shader_args (RenderOpBuilder *builder,
float height,
const guchar *uniform_data)
{
ProgramState *current_program_state = get_current_program_state (builder);
OpGLShader *op;
gsize args_size = gsk_gl_shader_get_args_size (shader);
if (current_program_state)
{
if (current_program_state->gl_shader.width == width &&
current_program_state->gl_shader.height == height &&
current_program_state->gl_shader.uniform_data_len == args_size &&
memcmp (current_program_state->gl_shader.uniform_data, uniform_data, args_size) == 0)
return;
current_program_state->gl_shader.width = width;
current_program_state->gl_shader.height = height;
if (args_size > sizeof (current_program_state->gl_shader.uniform_data))
current_program_state->gl_shader.uniform_data_len = 0;
else
{
current_program_state->gl_shader.uniform_data_len = args_size;
memcpy (current_program_state->gl_shader.uniform_data, uniform_data, args_size);
}
}
op = ops_begin (builder, OP_CHANGE_GL_SHADER_ARGS);
op->shader = shader;

6
gsk/gl/gskglrenderopsprivate.h
View File

@ -79,6 +79,12 @@ typedef struct
float end;
float radius[2]; /* h/v */
} radial_gradient;
struct {
float width;
float height;
gint uniform_data_len;
guchar uniform_data[32];
} gl_shader;
};
} ProgramState;