diff options
| author | Paul Berry <[email protected]> | 2012-09-24 14:38:19 -0700 |
|---|---|---|
| committer | Paul Berry <[email protected]> | 2012-09-25 15:01:13 -0700 |
| commit | 414f69aaad442abfce506323d0f0640139928898 (patch) | |
| tree | d26a1bfb926115a53545a2ce322b58a21b7e56ca /src/mesa/drivers/common/meta.h | |
| parent | 8faa79764c394ce5ec87c5376afb5643f99c53e7 (diff) | |
meta: Properly save/restore GL_FRAMEBUFFER_SRGB in Meta.
Previously, meta logic was saving and restoring the value of
GL_FRAMEBUFFER_SRGB in an ad-hoc fashion. As a result, it was not
properly disabled and/or restored for some meta operations.
This patch causes GL_FRAMEBUFFER_SRGB to be saved/restored in the
conventional way of meta-ops (using _mesa_meta_begin() and
_mesa_meta_end()). It is now reliably saved/restored for
_mesa_meta_BlitFramebuffer, _mesa_meta_GenerateMipmap, and
decompress_texture_image, and preserved for all other meta ops.
Fixes piglit tests "ARB_framebuffer_sRGB/blit renderbuffer
{linear_to_srgb,srgb} scaled {disabled,enabled}".
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common/meta.h')
| -rw-r--r-- | src/mesa/drivers/common/meta.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index d8dfb56f9b1..6ffc5b56a1f 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -56,6 +56,7 @@ #define MESA_META_CLIP 0x40000 #define MESA_META_SELECT_FEEDBACK 0x80000 #define MESA_META_MULTISAMPLE 0x100000 +#define MESA_META_FRAMEBUFFER_SRGB 0x200000 /**\}*/ extern void |