Mesa (master): mesa/es: Allow other color attachments in OpenGL ES 2.0

Ian Romanick idr at kemper.freedesktop.org
Tue Oct 4 12:31:13 PDT 2011


Module: Mesa
Branch: master
Commit: 2e3a4ab818a798b592210f7ae7ec149b3b3c0a05
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e3a4ab818a798b592210f7ae7ec149b3b3c0a05

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sun Oct  2 15:03:07 2011 -0700

mesa/es: Allow other color attachments in OpenGL ES 2.0

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/main/fbobject.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 6e54c09..1d39806 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -240,9 +240,13 @@ _mesa_get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
    case GL_COLOR_ATTACHMENT13_EXT:
    case GL_COLOR_ATTACHMENT14_EXT:
    case GL_COLOR_ATTACHMENT15_EXT:
+      /* Only OpenGL ES 1.x forbids color attachments other than
+       * GL_COLOR_ATTACHMENT0.  For all other APIs the limit set by the
+       * hardware is used.
+       */
       i = attachment - GL_COLOR_ATTACHMENT0_EXT;
       if (i >= ctx->Const.MaxColorAttachments
-	  || (i > 0 && ctx->API != API_OPENGL)) {
+	  || (i > 0 && ctx->API == API_OPENGLES)) {
 	 return NULL;
       }
       return &fb->Attachment[BUFFER_COLOR0 + i];



More information about the mesa-commit mailing list