Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gl renderer: Don't copy matrix/offset of color matrix nodes into ops

Browse Source
This commit is contained in:
Timm Bäder
2019-12-16 06:32:36 +01:00
parent 06f63764fb
commit 219493c818
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gsk/gl/gskglrenderer.c
View File

@@ -2492,10 +2492,10 @@ apply_color_matrix_op (const Program *program,
float mat[16];
float vec[4];
OP_PRINT (" -> Color Matrix");
graphene_matrix_to_float (&op->matrix, mat);
graphene_matrix_to_float (op->matrix, mat);
glUniformMatrix4fv (program->color_matrix.color_matrix_location, 1, GL_FALSE, mat);
graphene_vec4_to_float (&op->offset, vec);
graphene_vec4_to_float (op->offset, vec);
glUniform4fv (program->color_matrix.color_offset_location, 1, vec);
}

4
gsk/gl/gskglrenderops.c
View File

@@ -653,8 +653,8 @@ ops_set_color_matrix (RenderOpBuilder *builder,
current_program_state->color_matrix.offset = *offset;
op = ops_begin (builder, OP_CHANGE_COLOR_MATRIX);
op->matrix = *matrix;
op->offset = *offset;
op->matrix = matrix;
op->offset = offset;
}
void

4
gsk/gl/opbuffer.h
View File

@@ -118,8 +118,8 @@ typedef struct
typedef struct
{
graphene_matrix_t matrix;
graphene_vec4_t offset;
const graphene_matrix_t *matrix;
const graphene_vec4_t *offset;
} OpColorMatrix;
typedef struct