diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-13 22:07:24 +0000 |
| commit | dc54712d6b67dac7fc745cf3b9019b2c4c81f193 (patch) | |
| tree | 002b3fd0e0233fe3e6c57d603a8471794f5ba922 /mesalib/src/mesa/main/fbobject.c | |
| parent | ca14143b18b939ee4506936e77478f8c593802b5 (diff) | |
| parent | a0a46bd55d7cbbf70757a29c067e21b70ac4e2df (diff) | |
| download | vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.gz vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.tar.bz2 vcxsrv-dc54712d6b67dac7fc745cf3b9019b2c4c81f193.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 4f7a527c3..4ed2bb14e 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -999,6 +999,8 @@ _mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat) case GL_RGBA12:
case GL_RGBA16:
case GL_RGBA16_SNORM:
+ case GL_SRGB8_ALPHA8_EXT:
+ case GL_SRGB8_EXT:
return GL_RGBA;
case GL_STENCIL_INDEX:
case GL_STENCIL_INDEX1_EXT:
@@ -1924,6 +1926,13 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment, " renderbuffer %u)", renderbuffer);
return;
}
+ else if (rb == &DummyRenderbuffer) {
+ /* This is what NVIDIA does */
+ _mesa_error(ctx, GL_INVALID_VALUE,
+ "glFramebufferRenderbufferEXT(renderbuffer %u)",
+ renderbuffer);
+ return;
+ }
}
else {
/* remove renderbuffer attachment */
|