mirror of
https://github.com/brl/mutter.git
synced 2024-11-29 19:40:43 -05:00
cogl/driver: Remove pixel_format_from_gl_internal
It's unused. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3338>
This commit is contained in:
parent
26c3686162
commit
898044b9a5
@ -53,13 +53,6 @@ struct _CoglDriverVtable
|
|||||||
CoglGraphicsResetStatus
|
CoglGraphicsResetStatus
|
||||||
(* get_graphics_reset_status) (CoglContext *context);
|
(* get_graphics_reset_status) (CoglContext *context);
|
||||||
|
|
||||||
/* TODO: factor this out since this is OpenGL specific and
|
|
||||||
* so can be ignored by non-OpenGL drivers. */
|
|
||||||
gboolean
|
|
||||||
(* pixel_format_from_gl_internal) (CoglContext *context,
|
|
||||||
GLenum gl_int_format,
|
|
||||||
CoglPixelFormat *out_format);
|
|
||||||
|
|
||||||
/* TODO: factor this out since this is OpenGL specific and
|
/* TODO: factor this out since this is OpenGL specific and
|
||||||
* so can be ignored by non-OpenGL drivers. */
|
* so can be ignored by non-OpenGL drivers. */
|
||||||
CoglPixelFormat
|
CoglPixelFormat
|
||||||
|
@ -71,55 +71,6 @@ _cogl_driver_gl_real_context_init (CoglContext *context)
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
|
||||||
_cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
|
|
||||||
GLenum gl_int_format,
|
|
||||||
CoglPixelFormat *out_format)
|
|
||||||
{
|
|
||||||
/* It doesn't really matter we convert to exact same
|
|
||||||
format (some have no cogl match anyway) since format
|
|
||||||
is re-matched against cogl when getting or setting
|
|
||||||
texture image data.
|
|
||||||
*/
|
|
||||||
|
|
||||||
switch (gl_int_format)
|
|
||||||
{
|
|
||||||
case GL_ALPHA: case GL_ALPHA4: case GL_ALPHA8:
|
|
||||||
case GL_ALPHA12: case GL_ALPHA16:
|
|
||||||
/* Cogl only supports one single-component texture so if we have
|
|
||||||
* ended up with a red texture then it is probably being used as
|
|
||||||
* a component-alpha texture */
|
|
||||||
case GL_RED:
|
|
||||||
|
|
||||||
*out_format = COGL_PIXEL_FORMAT_A_8;
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
case GL_LUMINANCE: case GL_LUMINANCE4: case GL_LUMINANCE8:
|
|
||||||
case GL_LUMINANCE12: case GL_LUMINANCE16:
|
|
||||||
|
|
||||||
*out_format = COGL_PIXEL_FORMAT_G_8;
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
case GL_RG:
|
|
||||||
*out_format = COGL_PIXEL_FORMAT_RG_88;
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
case GL_RGB: case GL_RGB4: case GL_RGB5: case GL_RGB8:
|
|
||||||
case GL_RGB10: case GL_RGB12: case GL_RGB16: case GL_R3_G3_B2:
|
|
||||||
|
|
||||||
*out_format = COGL_PIXEL_FORMAT_RGB_888;
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
case GL_RGBA: case GL_RGBA2: case GL_RGBA4: case GL_RGB5_A1:
|
|
||||||
case GL_RGBA8: case GL_RGB10_A2: case GL_RGBA12: case GL_RGBA16:
|
|
||||||
|
|
||||||
*out_format = COGL_PIXEL_FORMAT_RGBA_8888;
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglPixelFormat
|
static CoglPixelFormat
|
||||||
_cogl_driver_pixel_format_to_gl (CoglContext *context,
|
_cogl_driver_pixel_format_to_gl (CoglContext *context,
|
||||||
CoglPixelFormat format,
|
CoglPixelFormat format,
|
||||||
@ -626,7 +577,6 @@ _cogl_driver_gl =
|
|||||||
_cogl_driver_gl_context_deinit,
|
_cogl_driver_gl_context_deinit,
|
||||||
_cogl_driver_gl_is_hardware_accelerated,
|
_cogl_driver_gl_is_hardware_accelerated,
|
||||||
_cogl_gl_get_graphics_reset_status,
|
_cogl_gl_get_graphics_reset_status,
|
||||||
_cogl_driver_pixel_format_from_gl_internal,
|
|
||||||
_cogl_driver_pixel_format_to_gl,
|
_cogl_driver_pixel_format_to_gl,
|
||||||
_cogl_driver_read_pixels_format_supported,
|
_cogl_driver_read_pixels_format_supported,
|
||||||
_cogl_driver_update_features,
|
_cogl_driver_update_features,
|
||||||
|
@ -63,14 +63,6 @@
|
|||||||
#define GL_HALF_FLOAT_OES 0x8D61
|
#define GL_HALF_FLOAT_OES 0x8D61
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static gboolean
|
|
||||||
_cogl_driver_pixel_format_from_gl_internal (CoglContext *context,
|
|
||||||
GLenum gl_int_format,
|
|
||||||
CoglPixelFormat *out_format)
|
|
||||||
{
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglPixelFormat
|
static CoglPixelFormat
|
||||||
_cogl_driver_pixel_format_to_gl (CoglContext *context,
|
_cogl_driver_pixel_format_to_gl (CoglContext *context,
|
||||||
CoglPixelFormat format,
|
CoglPixelFormat format,
|
||||||
@ -509,7 +501,6 @@ _cogl_driver_gles =
|
|||||||
_cogl_driver_gl_context_deinit,
|
_cogl_driver_gl_context_deinit,
|
||||||
_cogl_driver_gl_is_hardware_accelerated,
|
_cogl_driver_gl_is_hardware_accelerated,
|
||||||
_cogl_gl_get_graphics_reset_status,
|
_cogl_gl_get_graphics_reset_status,
|
||||||
_cogl_driver_pixel_format_from_gl_internal,
|
|
||||||
_cogl_driver_pixel_format_to_gl,
|
_cogl_driver_pixel_format_to_gl,
|
||||||
_cogl_driver_read_pixels_format_supported,
|
_cogl_driver_read_pixels_format_supported,
|
||||||
_cogl_driver_update_features,
|
_cogl_driver_update_features,
|
||||||
|
@ -93,7 +93,6 @@ _cogl_driver_nop =
|
|||||||
_cogl_driver_nop_context_deinit,
|
_cogl_driver_nop_context_deinit,
|
||||||
_cogl_driver_nop_is_hardware_accelerated,
|
_cogl_driver_nop_is_hardware_accelerated,
|
||||||
NULL, /* get_graphics_reset_status */
|
NULL, /* get_graphics_reset_status */
|
||||||
NULL, /* pixel_format_from_gl_internal */
|
|
||||||
NULL, /* pixel_format_to_gl */
|
NULL, /* pixel_format_to_gl */
|
||||||
NULL, /* read_pixels_format_supported */
|
NULL, /* read_pixels_format_supported */
|
||||||
_cogl_driver_update_features,
|
_cogl_driver_update_features,
|
||||||
|
Loading…
Reference in New Issue
Block a user