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_format.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_format.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_format.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c index 16d977fc9..64bfd1faa 100644 --- a/mesalib/src/mesa/state_tracker/st_format.c +++ b/mesalib/src/mesa/state_tracker/st_format.c @@ -1782,6 +1782,13 @@ st_QuerySamplesForFormat(struct gl_context *ctx, GLenum target, else bind = PIPE_BIND_RENDER_TARGET; + /* If an sRGB framebuffer is unsupported, sRGB formats behave like linear + * formats. + */ + if (!ctx->Extensions.EXT_framebuffer_sRGB) { + internalFormat = _mesa_get_linear_internalformat(internalFormat); + } + /* Set sample counts in descending order. */ for (i = 16; i > 1; i--) { format = st_choose_format(st, internalFormat, GL_NONE, GL_NONE, |