AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 05:50:11 +00:00
Code Issues Projects Releases Wiki Activity

glrenderer: Fix to prevent creation of GL_TEXTURE_MAG_FILTER filters with incorrect values

Browse Source
This commit is contained in:
sumibi-yakitori 2023-03-27 04:53:04 +09:00
parent 8cf3a95d8c
commit cf9c49dcb1
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gsk/gl/gskglcommandqueue.c
View File

@ -248,7 +248,7 @@ will_ignore_batch (GskGLCommandQueue *self)
} }
static inline GLint static inline GLint
filter_from_index (guint index) min_filter_from_index (guint index)
{ {
GLint filters[3] = { GL_LINEAR, GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR }; GLint filters[3] = { GL_LINEAR, GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR };
@ -257,6 +257,16 @@ filter_from_index (guint index)
return filters[index]; return filters[index];
} }
static inline GLint
mag_filter_from_index (guint index)
{
GLint filters[3] = { GL_LINEAR, GL_NEAREST, GL_LINEAR };
g_assert (index < GSK_GL_N_FILTERS);
return filters[index];
}
static inline guint static inline guint
snapshot_attachments (const GskGLAttachmentState *state, snapshot_attachments (const GskGLAttachmentState *state,
GskGLCommandBinds *array) GskGLCommandBinds *array)
@ -489,8 +499,8 @@ gsk_gl_command_queue_new (GdkGLContext *context,
glGenSamplers (G_N_ELEMENTS (self->samplers), self->samplers); glGenSamplers (G_N_ELEMENTS (self->samplers), self->samplers);
for (i = 0; i < G_N_ELEMENTS (self->samplers); i++) for (i = 0; i < G_N_ELEMENTS (self->samplers); i++)
{ {
glSamplerParameteri (self->samplers[i], GL_TEXTURE_MIN_FILTER, filter_from_index(i / GSK_GL_N_FILTERS)); glSamplerParameteri (self->samplers[i], GL_TEXTURE_MIN_FILTER, min_filter_from_index (i / GSK_GL_N_FILTERS));
glSamplerParameteri (self->samplers[i], GL_TEXTURE_MAG_FILTER, filter_from_index(i % GSK_GL_N_FILTERS)); glSamplerParameteri (self->samplers[i], GL_TEXTURE_MAG_FILTER, mag_filter_from_index (i % GSK_GL_N_FILTERS));
glSamplerParameteri (self->samplers[i], GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glSamplerParameteri (self->samplers[i], GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glSamplerParameteri (self->samplers[i], GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glSamplerParameteri (self->samplers[i], GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
} }
@ -1161,8 +1171,8 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self,
textures[bind->texture] = bind->id; textures[bind->texture] = bind->id;
if (!self->has_samplers) if (!self->has_samplers)
{ {
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter_from_index(bind->sampler / GSK_GL_N_FILTERS)); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_from_index (bind->sampler / GSK_GL_N_FILTERS));
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter_from_index(bind->sampler % GSK_GL_N_FILTERS)); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_from_index (bind->sampler % GSK_GL_N_FILTERS));
} }
} }
@ -1172,8 +1182,8 @@ gsk_gl_command_queue_execute (GskGLCommandQueue *self,
glBindSampler (bind->texture, self->samplers[bind->sampler]); glBindSampler (bind->texture, self->samplers[bind->sampler]);
else else
{ {
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, filter_from_index(bind->sampler / GSK_GL_N_FILTERS)); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_from_index (bind->sampler / GSK_GL_N_FILTERS));
glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, filter_from_index(bind->sampler % GSK_GL_N_FILTERS)); glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_from_index (bind->sampler % GSK_GL_N_FILTERS));
} }
samplers[bind->texture] = bind->sampler; samplers[bind->texture] = bind->sampler;
} }