diff options
| author | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-08-01 13:25:23 +0200 |
| commit | c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d (patch) | |
| tree | f86937d9126b2d543ffd13f861a1271f48bd69e6 /mesalib/src/mesa/state_tracker/st_cb_fbo.c | |
| parent | acad661e29a4f09d06f829fdfea949814da57da6 (diff) | |
| parent | 0659c77949b38440a2a9ba67e1ee9cacef1f3a7f (diff) | |
| download | vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.gz vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.tar.bz2 vcxsrv-c3d3ea464f7f4e53e8fe3e11ecada36cb209ba4d.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa xserver xkeyboard-config git update 1 aug 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_fbo.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_fbo.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c index 826722be8..77aaccd04 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c @@ -37,6 +37,7 @@ #include "main/context.h" #include "main/fbobject.h" #include "main/framebuffer.h" +#include "main/glformats.h" #include "main/macros.h" #include "main/renderbuffer.h" @@ -132,6 +133,13 @@ st_renderbuffer_alloc_storage(struct gl_context * ctx, pipe_surface_reference( &strb->surface, NULL ); pipe_resource_reference( &strb->texture, NULL ); + /* If an sRGB framebuffer is unsupported, sRGB formats behave like linear + * formats. + */ + if (!ctx->Extensions.EXT_framebuffer_sRGB) { + internalFormat = _mesa_get_linear_internalformat(internalFormat); + } + /* Handle multisample renderbuffers first. * * From ARB_framebuffer_object: |