isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/texture: Make is_get_data_supported() a bool on the texture

Browse Source 
Comparing the gl target is not enough. More on that later.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/687
This commit is contained in:
Jonas Ådahl 2019-07-16 18:27:38 +02:00 committed by Georges Basile Stavracas Neto
parent ac5d9ec558
commit e6c8939c30
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-texture-2d-private.h
View File

@ -47,6 +47,7 @@ struct _CoglTexture2D
gboolean auto_mipmap; gboolean auto_mipmap;
gboolean mipmaps_dirty; gboolean mipmaps_dirty;
gboolean is_foreign; gboolean is_foreign;
gboolean is_get_data_supported;
/* TODO: factor out these OpenGL specific members into some form /* TODO: factor out these OpenGL specific members into some form
* of driver private state. */ * of driver private state. */

1
cogl/cogl/cogl-texture-2d.c
View File

@ -106,6 +106,7 @@ _cogl_texture_2d_create_base (CoglContext *ctx,
tex_2d->mipmaps_dirty = TRUE; tex_2d->mipmaps_dirty = TRUE;
tex_2d->auto_mipmap = TRUE; tex_2d->auto_mipmap = TRUE;
tex_2d->is_get_data_supported = TRUE;
tex_2d->gl_target = GL_TEXTURE_2D; tex_2d->gl_target = GL_TEXTURE_2D;

6
cogl/cogl/driver/gl/cogl-texture-2d-gl.c
View File

@ -508,6 +508,7 @@ allocate_custom_egl_image_external (CoglTexture2D *tex_2d,
tex_2d->internal_format = internal_format; tex_2d->internal_format = internal_format;
tex_2d->gl_target = GL_TEXTURE_EXTERNAL_OES; tex_2d->gl_target = GL_TEXTURE_EXTERNAL_OES;
tex_2d->is_get_data_supported = FALSE;
return TRUE; return TRUE;
} }
@ -834,10 +835,7 @@ _cogl_texture_2d_gl_copy_from_bitmap (CoglTexture2D *tex_2d,
gboolean gboolean
_cogl_texture_2d_gl_is_get_data_supported (CoglTexture2D *tex_2d) _cogl_texture_2d_gl_is_get_data_supported (CoglTexture2D *tex_2d)
{ {
if (tex_2d->gl_target == GL_TEXTURE_EXTERNAL_OES) return tex_2d->is_get_data_supported;
return FALSE;
else
return TRUE;
} }
void void