frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Unifdef the picture-format-to-format-and-type functions. 

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Eric Anholt 2013-12-27 02:10:53 -08:00
parent 3747c26081
commit 1adac62a7d
1 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
glamor/glamor_pixmap.c
View File

@ -194,14 +194,13 @@ glamor_set_alu(ScreenPtr screen, unsigned char alu)
* *
* Return 0 if find a matched texture type. Otherwise return -1. * Return 0 if find a matched texture type. Otherwise return -1.
**/ **/
#ifndef GLAMOR_GLES2
static int static int
glamor_get_tex_format_type_from_pictformat(PictFormatShort format, glamor_get_tex_format_type_from_pictformat_gl(PictFormatShort format,
GLenum *tex_format, GLenum *tex_format,
GLenum *tex_type, GLenum *tex_type,
int *no_alpha, int *no_alpha,
int *revert, int *revert,
int *swap_rb, int is_upload) int *swap_rb, int is_upload)
{ {
*no_alpha = 0; *no_alpha = 0;
*revert = REVERT_NONE; *revert = REVERT_NONE;
@ -291,16 +290,15 @@ glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
return 0; return 0;
} }
#else
#define IS_LITTLE_ENDIAN (IMAGE_BYTE_ORDER == LSBFirst) #define IS_LITTLE_ENDIAN (IMAGE_BYTE_ORDER == LSBFirst)
static int static int
glamor_get_tex_format_type_from_pictformat(PictFormatShort format, glamor_get_tex_format_type_from_pictformat_gles2(PictFormatShort format,
GLenum *tex_format, GLenum *tex_format,
GLenum *tex_type, GLenum *tex_type,
int *no_alpha, int *no_alpha,
int *revert, int *revert,
int *swap_rb, int is_upload) int *swap_rb, int is_upload)
{ {
int need_swap_rb = 0; int need_swap_rb = 0;
@ -463,8 +461,6 @@ glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
return 0; return 0;
} }
#endif
static int static int
glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap, glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
GLenum *format, GLenum *format,
@ -474,6 +470,8 @@ glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
{ {
glamor_pixmap_private *pixmap_priv; glamor_pixmap_private *pixmap_priv;
PictFormatShort pict_format; PictFormatShort pict_format;
glamor_screen_private *glamor_priv =
glamor_get_screen_private(pixmap->drawable.pScreen);
pixmap_priv = glamor_get_pixmap_private(pixmap); pixmap_priv = glamor_get_pixmap_private(pixmap);
if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv)) if (GLAMOR_PIXMAP_PRIV_IS_PICTURE(pixmap_priv))
@ -481,11 +479,21 @@ glamor_get_tex_format_type_from_pixmap(PixmapPtr pixmap,
else else
pict_format = format_for_depth(pixmap->drawable.depth); pict_format = format_for_depth(pixmap->drawable.depth);
return glamor_get_tex_format_type_from_pictformat(pict_format, if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) {
format, type, return glamor_get_tex_format_type_from_pictformat_gl(pict_format,
no_alpha, format, type,
revert, no_alpha,
swap_rb, is_upload); revert,
swap_rb,
is_upload);
} else {
return glamor_get_tex_format_type_from_pictformat_gles2(pict_format,
format, type,
no_alpha,
revert,
swap_rb,
is_upload);
}
} }
static void * static void *