diff options
| author | Eric Anholt <eric@anholt.net> | 2013-12-27 01:23:15 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-02-14 18:30:01 -0800 |
| commit | d63283860a7c04a12838dead0dfd6d04fb73a093 (patch) | |
| tree | 44197b26d405a8380ddd03d9539257b13ce89977 /glamor/glamor_pixmap.c | |
| parent | f3f4fc7a65589a200a086ea7b1527f91941bc19b (diff) | |
glamor: Pass pixmaps around to unifdef glamor_iformat_for_depth().
v2: Just pass in the PicturePtr to glamor_pict_format_is_compatible()
(suggestion by keithp)
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'glamor/glamor_pixmap.c')
| -rw-r--r-- | glamor/glamor_pixmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glamor/glamor_pixmap.c b/glamor/glamor_pixmap.c index 5442c90da..30aeebe51 100644 --- a/glamor/glamor_pixmap.c +++ b/glamor/glamor_pixmap.c @@ -403,7 +403,7 @@ __glamor_upload_pixmap_to_texture(PixmapPtr pixmap, unsigned int *tex, if (*tex == 0) { glGenTextures(1, tex); if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) - gl_iformat_for_depth(pixmap->drawable.depth, &iformat); + iformat = gl_iformat_for_pixmap(pixmap); else iformat = format; non_sub = 1; @@ -603,7 +603,7 @@ glamor_pixmap_upload_prepare(PixmapPtr pixmap, GLenum format, int no_alpha, return 0; if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP) - gl_iformat_for_depth(pixmap->drawable.depth, &iformat); + iformat = gl_iformat_for_pixmap(pixmap); else iformat = format; |