diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
| commit | 7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796 (patch) | |
| tree | 0d078a56d8bcd7ffa319c9d6926aef3db5a7052b /mesalib/src/mesa/main/fbobject.c | |
| parent | 589f5feba1e7968b7318b02f4f2bdea81937f0e1 (diff) | |
| parent | 38eb7612c4b39dd69df4baf4450ba512e888effa (diff) | |
| download | vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.gz vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.bz2 vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Git update 21 nov 2012
Diffstat (limited to 'mesalib/src/mesa/main/fbobject.c')
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index ef739c162..223aef18d 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -31,6 +31,7 @@ * Brian Paul */ +#include <stdbool.h> #include "buffers.h" #include "context.h" @@ -162,13 +163,13 @@ invalidate_framebuffer(struct gl_framebuffer *fb) static struct gl_framebuffer * get_framebuffer_target(struct gl_context *ctx, GLenum target) { + bool have_fb_blit = _mesa_is_gles3(ctx) || + (ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx)); switch (target) { case GL_DRAW_FRAMEBUFFER: - return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx) - ? ctx->DrawBuffer : NULL; + return have_fb_blit ? ctx->DrawBuffer : NULL; case GL_READ_FRAMEBUFFER: - return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx) - ? ctx->ReadBuffer : NULL; + return have_fb_blit ? ctx->ReadBuffer : NULL; case GL_FRAMEBUFFER_EXT: return ctx->DrawBuffer; default: |