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

cogl: Use pixel_format_to_gl_with_target in find_best_gl_get_data_format

Browse Source 
Fixes cogl_texture_get_data() resorting to the wrong conversions when
extracting the texture data. This notably resulted in RGB/RGBA buffers
copied as-is into BGRA buffers, for instance for the fullscreen animation,
or single-window screenshots of such buffers.

https://bugzilla.gnome.org/show_bug.cgi?id=779234
This commit is contained in:
Carlos Garnacho 2017-05-18 14:57:43 +02:00
parent 7f0f880fba
commit 1b4cd1b47d
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-texture-driver.h
View File

@ -198,6 +198,7 @@ struct _CoglTextureDriver
CoglPixelFormat CoglPixelFormat
(* find_best_gl_get_data_format) (CoglContext *context, (* find_best_gl_get_data_format) (CoglContext *context,
CoglPixelFormat format, CoglPixelFormat format,
CoglPixelFormat target_format,
GLenum *closest_gl_format, GLenum *closest_gl_format,
GLenum *closest_gl_type); GLenum *closest_gl_type);
}; };

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

@ -1059,6 +1059,7 @@ cogl_texture_get_data (CoglTexture *texture,
closest_format = closest_format =
ctx->texture_driver->find_best_gl_get_data_format (ctx, ctx->texture_driver->find_best_gl_get_data_format (ctx,
texture_format,
format, format,
&closest_gl_format, &closest_gl_format,
&closest_gl_type); &closest_gl_type);

4
cogl/cogl/driver/gl/gl/cogl-texture-driver-gl.c
View File

@ -533,11 +533,13 @@ static CoglPixelFormat
_cogl_texture_driver_find_best_gl_get_data_format _cogl_texture_driver_find_best_gl_get_data_format
(CoglContext *context, (CoglContext *context,
CoglPixelFormat format, CoglPixelFormat format,
CoglPixelFormat target_format,
GLenum *closest_gl_format, GLenum *closest_gl_format,
GLenum *closest_gl_type) GLenum *closest_gl_type)
{ {
return context->driver_vtable->pixel_format_to_gl (context, return context->driver_vtable->pixel_format_to_gl_with_target (context,
format, format,
target_format,
NULL, /* don't need */ NULL, /* don't need */
closest_gl_format, closest_gl_format,
closest_gl_type); closest_gl_type);

1
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
View File

@ -615,6 +615,7 @@ static CoglPixelFormat
_cogl_texture_driver_find_best_gl_get_data_format _cogl_texture_driver_find_best_gl_get_data_format
(CoglContext *context, (CoglContext *context,
CoglPixelFormat format, CoglPixelFormat format,
CoglPixelFormat target_format,
GLenum *closest_gl_format, GLenum *closest_gl_format,
GLenum *closest_gl_type) GLenum *closest_gl_type)
{ {