diff options
| author | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-04-05 22:31:44 +0800 |
|---|---|---|
| committer | Zhigang Gong <zhigang.gong@linux.intel.com> | 2012-04-12 15:49:10 +0800 |
| commit | 09a0a936dbbd61c1baa6eb81ef81e4dbda7cc2f7 (patch) | |
| tree | 8bb44a5c22dce0f936cb366e9a4cd4328f643395 /src/glamor_priv.h | |
| parent | 6aea7e3586c29c5c0d3498177d03fff23d976eb3 (diff) | |
gles2: Added 1555/2101010 formats support.
Added color conversion code to support 1555/2101010
formats,now gles2 can pass the render check with all
formats.
We use 5551 to represent 1555, and do the revertion
if downloading/uploading is needed.
For 2101010, as gles2 doesn't support reading the
identical formats. We have to use 8888 to represent,
thus we may introduce some accurate problem. But anyway,
we can pass the error checking in render check, so that
may not be a big problem.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
Diffstat (limited to 'src/glamor_priv.h')
| -rw-r--r-- | src/glamor_priv.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/glamor_priv.h b/src/glamor_priv.h index 828b08e..71d5bf0 100644 --- a/src/glamor_priv.h +++ b/src/glamor_priv.h @@ -633,7 +633,7 @@ void glamor_pixmap_ensure_fb(glamor_pixmap_fbo *fbo); enum glamor_pixmap_status glamor_upload_pixmap_to_texture(PixmapPtr pixmap); -/** +/** * Upload a picture to gl texture. Similar to the * glamor_upload_pixmap_to_texture. Used in rendering. **/ @@ -641,6 +641,14 @@ enum glamor_pixmap_status glamor_upload_picture_to_texture(PicturePtr picture); /** + * Upload bits to a pixmap's texture. This function will + * convert the bits to the specified format/type format + * if the conversion is unavoidable. + **/ +Bool glamor_upload_bits_to_pixmap_texture(PixmapPtr pixmap, GLenum format, GLenum type, + int no_alpha, int revert, int swap_rb, void *bits); + +/** * Destroy all the resources allocated on the uploading * phase, includs the tex and fbo. **/ |