X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fbuffers.c;h=bb856882da2ff1031b11ee083e0366a146008627;hb=7ec308d978019dd9aa0e7a756b5919e34431196d;hp=0536266d7564ce9222a4dc5bef7e33a97b49dbcf;hpb=6ee082718fca884fbda73001e0ecb32095409549;p=mesa.git diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c index 0536266d756..bb856882da2 100644 --- a/src/mesa/main/buffers.c +++ b/src/mesa/main/buffers.c @@ -36,6 +36,7 @@ #include "enums.h" #include "fbobject.h" #include "mtypes.h" +#include "util/bitscan.h" #define BAD_MASK ~0u @@ -58,10 +59,7 @@ supported_buffer_bitmask(const struct gl_context *ctx, if (_mesa_is_user_fbo(fb)) { /* A user-created renderbuffer */ - GLuint i; - for (i = 0; i < ctx->Const.MaxColorAttachments; i++) { - mask |= (BUFFER_BIT_COLOR0 << i); - } + mask = ((1 << ctx->Const.MaxColorAttachments) - 1) << BUFFER_COLOR0; } else { /* A window system framebuffer */ @@ -159,6 +157,9 @@ draw_buffer_enum_to_bitmask(const struct gl_context *ctx, GLenum buffer) case GL_COLOR_ATTACHMENT7_EXT: return BUFFER_BIT_COLOR7; default: + /* not an error, but also not supported */ + if (buffer >= GL_COLOR_ATTACHMENT8 && buffer <= GL_COLOR_ATTACHMENT31) + return 1 << BUFFER_COUNT; /* error */ return BAD_MASK; } @@ -169,15 +170,25 @@ draw_buffer_enum_to_bitmask(const struct gl_context *ctx, GLenum buffer) * Helper routine used by glReadBuffer. * Given a GLenum naming a color buffer, return the index of the corresponding * renderbuffer (a BUFFER_* value). - * return -1 for an invalid buffer. + * return BUFFER_NONE for an invalid buffer. */ -static GLint -read_buffer_enum_to_index(GLenum buffer) +static gl_buffer_index +read_buffer_enum_to_index(const struct gl_context *ctx, GLenum buffer) { switch (buffer) { case GL_FRONT: return BUFFER_FRONT_LEFT; case GL_BACK: + if (_mesa_is_gles(ctx)) { + /* In draw_buffer_enum_to_bitmask, when GLES contexts draw to + * GL_BACK with a single-buffered configuration, we actually end + * up drawing to the sole front buffer in our internal + * representation. For consistency, we must read from that + * front left buffer too. + */ + if (!ctx->DrawBuffer->Visual.doubleBufferMode) + return BUFFER_FRONT_LEFT; + } return BUFFER_BACK_LEFT; case GL_RIGHT: return BUFFER_FRONT_RIGHT; @@ -193,6 +204,8 @@ read_buffer_enum_to_index(GLenum buffer) return BUFFER_FRONT_LEFT; case GL_AUX0: return BUFFER_AUX0; + case GL_FRONT_AND_BACK: + return BUFFER_FRONT_LEFT; case GL_AUX1: case GL_AUX2: case GL_AUX3: @@ -214,14 +227,23 @@ read_buffer_enum_to_index(GLenum buffer) case GL_COLOR_ATTACHMENT7_EXT: return BUFFER_COLOR7; default: + /* not an error, but also not supported */ + if (buffer >= GL_COLOR_ATTACHMENT8 && buffer <= GL_COLOR_ATTACHMENT31) + return BUFFER_COUNT; /* error */ - return -1; + return BUFFER_NONE; } } +static bool +is_legal_es3_readbuffer_enum(GLenum buf) +{ + return buf == GL_BACK || buf == GL_NONE || + (buf >= GL_COLOR_ATTACHMENT0 && buf <= GL_COLOR_ATTACHMENT31); +} /** - * Called by glDrawBuffer(). + * Called by glDrawBuffer() and glNamedFramebufferDrawBuffer(). * Specify which renderbuffer(s) to draw into for the first color output. * can name zero, one, two or four renderbuffers! * \sa _mesa_DrawBuffers @@ -242,16 +264,16 @@ read_buffer_enum_to_index(GLenum buffer) * * See the GL_EXT_framebuffer_object spec for more info. */ -void -_mesa_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, - GLenum buffer, const char *caller) +static ALWAYS_INLINE void +draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller, bool no_error) { GLbitfield destMask; FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) { - _mesa_debug(ctx, "%s %s\n", caller, _mesa_lookup_enum_by_nr(buffer)); + _mesa_debug(ctx, "%s %s\n", caller, _mesa_enum_to_string(buffer)); } if (buffer == GL_NONE) { @@ -261,39 +283,80 @@ _mesa_draw_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, const GLbitfield supportedMask = supported_buffer_bitmask(ctx, fb); destMask = draw_buffer_enum_to_bitmask(ctx, buffer); - if (destMask == BAD_MASK) { + if (!no_error && destMask == BAD_MASK) { /* totally bogus buffer */ _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid buffer %s)", caller, - _mesa_lookup_enum_by_nr(buffer)); + _mesa_enum_to_string(buffer)); return; } destMask &= supportedMask; - if (destMask == 0x0) { + if (!no_error && destMask == 0x0) { /* none of the named color buffers exist! */ _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffer)); + caller, _mesa_enum_to_string(buffer)); return; } } /* if we get here, there's no error so set new state */ - _mesa_drawbuffers(ctx, fb, 1, &buffer, &destMask); + const GLenum16 buffer16 = buffer; + _mesa_drawbuffers(ctx, fb, 1, &buffer16, &destMask); /* Call device driver function only if fb is the bound draw buffer */ if (fb == ctx->DrawBuffer) { - if (ctx->Driver.DrawBuffers) - ctx->Driver.DrawBuffers(ctx, 1, &buffer); - else if (ctx->Driver.DrawBuffer) - ctx->Driver.DrawBuffer(ctx, buffer); + if (ctx->Driver.DrawBuffer) + ctx->Driver.DrawBuffer(ctx); + if (ctx->Driver.DrawBufferAllocate) + ctx->Driver.DrawBufferAllocate(ctx); } } +static void +draw_buffer_error(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) +{ + draw_buffer(ctx, fb, buffer, caller, false); +} + + +static void +draw_buffer_no_error(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) +{ + draw_buffer(ctx, fb, buffer, caller, true); +} + + +void GLAPIENTRY +_mesa_DrawBuffer_no_error(GLenum buffer) +{ + GET_CURRENT_CONTEXT(ctx); + draw_buffer_no_error(ctx, ctx->DrawBuffer, buffer, "glDrawBuffer"); +} + + void GLAPIENTRY _mesa_DrawBuffer(GLenum buffer) { GET_CURRENT_CONTEXT(ctx); - _mesa_draw_buffer(ctx, ctx->DrawBuffer, buffer, "glDrawBuffer"); + draw_buffer_error(ctx, ctx->DrawBuffer, buffer, "glDrawBuffer"); +} + + +void GLAPIENTRY +_mesa_NamedFramebufferDrawBuffer_no_error(GLuint framebuffer, GLenum buf) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_framebuffer *fb; + + if (framebuffer) { + fb = _mesa_lookup_framebuffer(ctx, framebuffer); + } else { + fb = ctx->WinSysDrawBuffer; + } + + draw_buffer_no_error(ctx, fb, buf, "glNamedFramebufferDrawBuffer"); } @@ -312,22 +375,24 @@ _mesa_NamedFramebufferDrawBuffer(GLuint framebuffer, GLenum buf) else fb = ctx->WinSysDrawBuffer; - _mesa_draw_buffer(ctx, fb, buf, "glNamedFramebufferDrawBuffer"); + draw_buffer_error(ctx, fb, buf, "glNamedFramebufferDrawBuffer"); } /** - * Called by glDrawBuffersARB; specifies the destination color renderbuffers - * for N fragment program color outputs. + * Called by glDrawBuffersARB() and glNamedFramebufferDrawBuffers() to specify + * the destination color renderbuffers for N fragment program color outputs. * \sa _mesa_DrawBuffer * \param n number of outputs * \param buffers array [n] of renderbuffer names. Unlike glDrawBuffer, the * names cannot specify more than one buffer. For example, - * GL_FRONT_AND_BACK is illegal. + * GL_FRONT_AND_BACK is illegal. The only exception is GL_BACK + * that is considered special and allowed as far as n is one + * since 4.5. */ -void -_mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, - GLsizei n, const GLenum *buffers, const char *caller) +static ALWAYS_INLINE void +draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, GLsizei n, + const GLenum *buffers, const char *caller, bool no_error) { GLuint output; GLbitfield usedBufferMask, supportedMask; @@ -335,52 +400,105 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, FLUSH_VERTICES(ctx, 0); - /* Turns out n==0 is a valid input that should not produce an error. - * The remaining code below correctly handles the n==0 case. - * - * From the OpenGL 3.0 specification, page 258: - * "An INVALID_VALUE error is generated if n is greater than - * MAX_DRAW_BUFFERS." - */ - if (n < 0) { - _mesa_error(ctx, GL_INVALID_VALUE, "%s(n < 0)", caller); - return; - } + if (!no_error) { + /* Turns out n==0 is a valid input that should not produce an error. + * The remaining code below correctly handles the n==0 case. + * + * From the OpenGL 3.0 specification, page 258: + * "An INVALID_VALUE error is generated if n is greater than + * MAX_DRAW_BUFFERS." + */ + if (n < 0) { + _mesa_error(ctx, GL_INVALID_VALUE, "%s(n < 0)", caller); + return; + } - if (n > (GLsizei) ctx->Const.MaxDrawBuffers) { - _mesa_error(ctx, GL_INVALID_VALUE, - "%s(n > maximum number of draw buffers)", caller); - return; + if (n > (GLsizei) ctx->Const.MaxDrawBuffers) { + _mesa_error(ctx, GL_INVALID_VALUE, + "%s(n > maximum number of draw buffers)", caller); + return; + } + + /* From the ES 3.0 specification, page 180: + * "If the GL is bound to the default framebuffer, then n must be 1 + * and the constant must be BACK or NONE." + * (same restriction applies with GL_EXT_draw_buffers specification) + */ + if (ctx->API == API_OPENGLES2 && _mesa_is_winsys_fbo(fb) && + (n != 1 || (buffers[0] != GL_NONE && buffers[0] != GL_BACK))) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid buffers)", caller); + return; + } } supportedMask = supported_buffer_bitmask(ctx, fb); usedBufferMask = 0x0; - /* From the ES 3.0 specification, page 180: - * "If the GL is bound to the default framebuffer, then n must be 1 - * and the constant must be BACK or NONE." - * (same restriction applies with GL_EXT_draw_buffers specification) - */ - if (ctx->API == API_OPENGLES2 && _mesa_is_winsys_fbo(fb) && - (n != 1 || (buffers[0] != GL_NONE && buffers[0] != GL_BACK))) { - _mesa_error(ctx, GL_INVALID_OPERATION, "%s(invalid buffers)", caller); - return; - } - /* complicated error checking... */ for (output = 0; output < n; output++) { - /* Section 4.2 (Whole Framebuffer Operations) of the OpenGL 3.0 - * specification says: - * - * "Each buffer listed in bufs must be BACK, NONE, or one of the values - * from table 4.3 (NONE, COLOR_ATTACHMENTi)" - */ - if (_mesa_is_gles3(ctx) && buffers[output] != GL_NONE && - buffers[output] != GL_BACK && - (buffers[output] < GL_COLOR_ATTACHMENT0 || - buffers[output] >= GL_COLOR_ATTACHMENT0 + ctx->Const.MaxColorAttachments)) { - _mesa_error(ctx, GL_INVALID_ENUM, "glDrawBuffers(buffer)"); - return; + destMask[output] = draw_buffer_enum_to_bitmask(ctx, buffers[output]); + + if (!no_error) { + /* From the OpenGL 3.0 specification, page 258: + * "Each buffer listed in bufs must be one of the values from tables + * 4.5 or 4.6. Otherwise, an INVALID_ENUM error is generated. + */ + if (destMask[output] == BAD_MASK) { + _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid buffer %s)", + caller, _mesa_enum_to_string(buffers[output])); + return; + } + + /* From the OpenGL 4.5 specification, page 493 (page 515 of the PDF) + * "An INVALID_ENUM error is generated if any value in bufs is FRONT, + * LEFT, RIGHT, or FRONT_AND_BACK . This restriction applies to both + * the default framebuffer and framebuffer objects, and exists because + * these constants may themselves refer to multiple buffers, as shown + * in table 17.4." + * + * And on page 492 (page 514 of the PDF): + * "If the default framebuffer is affected, then each of the constants + * must be one of the values listed in table 17.6 or the special value + * BACK. When BACK is used, n must be 1 and color values are written + * into the left buffer for single-buffered contexts, or into the back + * left buffer for double-buffered contexts." + * + * Note "special value BACK". GL_BACK also refers to multiple buffers, + * but it is consider a special case here. This is a change on 4.5. + * For OpenGL 4.x we check that behaviour. For any previous version we + * keep considering it wrong (as INVALID_ENUM). + */ + if (_mesa_bitcount(destMask[output]) > 1) { + if (_mesa_is_winsys_fbo(fb) && ctx->Version >= 40 && + buffers[output] == GL_BACK) { + if (n != 1) { + _mesa_error(ctx, GL_INVALID_OPERATION, "%s(with GL_BACK n must be 1)", + caller); + return; + } + } else { + _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid buffer %s)", + caller, _mesa_enum_to_string(buffers[output])); + return; + } + } + + /* Section 4.2 (Whole Framebuffer Operations) of the OpenGL ES 3.0 + * specification says: + * + * "If the GL is bound to a draw framebuffer object, the ith + * buffer listed in bufs must be COLOR_ATTACHMENTi or NONE . + * Specifying a buffer out of order, BACK , or COLOR_ATTACHMENTm + * where m is greater than or equal to the value of MAX_- + * COLOR_ATTACHMENTS , will generate the error INVALID_OPERATION . + */ + if (_mesa_is_gles3(ctx) && _mesa_is_user_fbo(fb) && + buffers[output] != GL_NONE && + (buffers[output] < GL_COLOR_ATTACHMENT0 || + buffers[output] >= GL_COLOR_ATTACHMENT0 + ctx->Const.MaxColorAttachments)) { + _mesa_error(ctx, GL_INVALID_OPERATION, "glDrawBuffers(buffer)"); + return; + } } if (buffers[output] == GL_NONE) { @@ -395,7 +513,7 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, * or equal to the value of MAX_COLOR_ATTACHMENTS, then the error * INVALID_OPERATION results." */ - if (_mesa_is_user_fbo(fb) && buffers[output] >= + if (!no_error && _mesa_is_user_fbo(fb) && buffers[output] >= GL_COLOR_ATTACHMENT0 + ctx->Const.MaxDrawBuffers) { _mesa_error(ctx, GL_INVALID_OPERATION, "%s(buffers[%d] >= maximum number of draw buffers)", @@ -403,34 +521,6 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, return; } - destMask[output] = draw_buffer_enum_to_bitmask(ctx, buffers[output]); - - /* From the OpenGL 3.0 specification, page 258: - * "Each buffer listed in bufs must be one of the values from tables - * 4.5 or 4.6. Otherwise, an INVALID_ENUM error is generated. - */ - if (destMask[output] == BAD_MASK) { - _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffers[output])); - return; - } - - /* From the OpenGL 4.0 specification, page 256: - * "For both the default framebuffer and framebuffer objects, the - * constants FRONT, BACK, LEFT, RIGHT, and FRONT_AND_BACK are not - * valid in the bufs array passed to DrawBuffers, and will result in - * the error INVALID_ENUM. This restriction is because these - * constants may themselves refer to multiple buffers, as shown in - * table 4.4." - * Previous versions of the OpenGL specification say INVALID_OPERATION, - * but the Khronos conformance tests expect INVALID_ENUM. - */ - if (_mesa_bitcount(destMask[output]) > 1) { - _mesa_error(ctx, GL_INVALID_ENUM, "%s(invalid buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffers[output])); - return; - } - /* From the OpenGL 3.0 specification, page 259: * "If the GL is bound to the default framebuffer and DrawBuffers is * supplied with a constant (other than NONE) that does not indicate @@ -442,37 +532,40 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, * INVALID_OPERATION results." */ destMask[output] &= supportedMask; - if (destMask[output] == 0) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(unsupported buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffers[output])); - return; - } + if (!no_error) { + if (destMask[output] == 0) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(unsupported buffer %s)", + caller, _mesa_enum_to_string(buffers[output])); + return; + } - /* ES 3.0 is even more restrictive. From the ES 3.0 spec, page 180: - * "If the GL is bound to a framebuffer object, the ith buffer listed - * in bufs must be COLOR_ATTACHMENTi or NONE. [...] INVALID_OPERATION." - * (same restriction applies with GL_EXT_draw_buffers specification) - */ - if (ctx->API == API_OPENGLES2 && _mesa_is_user_fbo(fb) && - buffers[output] != GL_NONE && - buffers[output] != GL_COLOR_ATTACHMENT0 + output) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(unsupported buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffers[output])); - return; - } + /* ES 3.0 is even more restrictive. From the ES 3.0 spec, page 180: + * "If the GL is bound to a framebuffer object, the ith buffer + * listed in bufs must be COLOR_ATTACHMENTi or NONE. [...] + * INVALID_OPERATION." (same restriction applies with + * GL_EXT_draw_buffers specification) + */ + if (ctx->API == API_OPENGLES2 && _mesa_is_user_fbo(fb) && + buffers[output] != GL_NONE && + buffers[output] != GL_COLOR_ATTACHMENT0 + output) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(unsupported buffer %s)", + caller, _mesa_enum_to_string(buffers[output])); + return; + } - /* From the OpenGL 3.0 specification, page 258: - * "Except for NONE, a buffer may not appear more than once in the - * array pointed to by bufs. Specifying a buffer more then once will - * result in the error INVALID_OPERATION." - */ - if (destMask[output] & usedBufferMask) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(duplicated buffer %s)", - caller, _mesa_lookup_enum_by_nr(buffers[output])); - return; + /* From the OpenGL 3.0 specification, page 258: + * "Except for NONE, a buffer may not appear more than once in the + * array pointed to by bufs. Specifying a buffer more then once + * will result in the error INVALID_OPERATION." + */ + if (destMask[output] & usedBufferMask) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(duplicated buffer %s)", + caller, _mesa_enum_to_string(buffers[output])); + return; + } } /* update bitmask */ @@ -481,7 +574,11 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, } /* OK, if we get here, there were no errors so set the new state */ - _mesa_drawbuffers(ctx, fb, n, buffers, destMask); + GLenum16 buffers16[MAX_DRAW_BUFFERS]; + for (int i = 0; i < n; i++) + buffers16[i] = buffers[i]; + + _mesa_drawbuffers(ctx, fb, n, buffers16, destMask); /* * Call device driver function if fb is the bound draw buffer. @@ -490,19 +587,60 @@ _mesa_draw_buffers(struct gl_context *ctx, struct gl_framebuffer *fb, * may not be valid. */ if (fb == ctx->DrawBuffer) { - if (ctx->Driver.DrawBuffers) - ctx->Driver.DrawBuffers(ctx, n, buffers); - else if (ctx->Driver.DrawBuffer) - ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE); + if (ctx->Driver.DrawBuffer) + ctx->Driver.DrawBuffer(ctx); + if (ctx->Driver.DrawBufferAllocate) + ctx->Driver.DrawBufferAllocate(ctx); } } +static void +draw_buffers_error(struct gl_context *ctx, struct gl_framebuffer *fb, GLsizei n, + const GLenum *buffers, const char *caller) +{ + draw_buffers(ctx, fb, n, buffers, caller, false); +} + + +static void +draw_buffers_no_error(struct gl_context *ctx, struct gl_framebuffer *fb, + GLsizei n, const GLenum *buffers, const char *caller) +{ + draw_buffers(ctx, fb, n, buffers, caller, true); +} + + +void GLAPIENTRY +_mesa_DrawBuffers_no_error(GLsizei n, const GLenum *buffers) +{ + GET_CURRENT_CONTEXT(ctx); + draw_buffers_no_error(ctx, ctx->DrawBuffer, n, buffers, "glDrawBuffers"); +} + + void GLAPIENTRY _mesa_DrawBuffers(GLsizei n, const GLenum *buffers) { GET_CURRENT_CONTEXT(ctx); - _mesa_draw_buffers(ctx, ctx->DrawBuffer, n, buffers, "glDrawBuffers"); + draw_buffers_error(ctx, ctx->DrawBuffer, n, buffers, "glDrawBuffers"); +} + + +void GLAPIENTRY +_mesa_NamedFramebufferDrawBuffers_no_error(GLuint framebuffer, GLsizei n, + const GLenum *bufs) +{ + GET_CURRENT_CONTEXT(ctx); + struct gl_framebuffer *fb; + + if (framebuffer) { + fb = _mesa_lookup_framebuffer(ctx, framebuffer); + } else { + fb = ctx->WinSysDrawBuffer; + } + + draw_buffers_no_error(ctx, fb, n, bufs, "glNamedFramebufferDrawBuffers"); } @@ -522,7 +660,7 @@ _mesa_NamedFramebufferDrawBuffers(GLuint framebuffer, GLsizei n, else fb = ctx->WinSysDrawBuffer; - _mesa_draw_buffers(ctx, fb, n, bufs, "glNamedFramebufferDrawBuffers"); + draw_buffers_error(ctx, fb, n, bufs, "glNamedFramebufferDrawBuffers"); } @@ -545,8 +683,8 @@ updated_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb) /** - * Helper function to set the GL_DRAW_BUFFER state in the context and - * current FBO. Called via glDrawBuffer(), glDrawBuffersARB() + * Helper function to set the GL_DRAW_BUFFER state for the given context and + * FBO. Called via glDrawBuffer(), glDrawBuffersARB() * * All error checking will have been done prior to calling this function * so nothing should go wrong at this point. @@ -561,7 +699,8 @@ updated_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb) */ void _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, - GLuint n, const GLenum *buffers, const GLbitfield *destMask) + GLuint n, const GLenum16 *buffers, + const GLbitfield *destMask) { GLbitfield mask[MAX_DRAW_BUFFERS]; GLuint buf; @@ -586,13 +725,12 @@ _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, if (n > 0 && _mesa_bitcount(destMask[0]) > 1) { GLuint count = 0, destMask0 = destMask[0]; while (destMask0) { - GLint bufIndex = ffs(destMask0) - 1; + const gl_buffer_index bufIndex = u_bit_scan(&destMask0); if (fb->_ColorDrawBufferIndexes[count] != bufIndex) { updated_drawbuffers(ctx, fb); fb->_ColorDrawBufferIndexes[count] = bufIndex; } count++; - destMask0 &= ~(1 << bufIndex); } fb->ColorDrawBuffer[0] = buffers[0]; fb->_NumColorDrawBuffers = count; @@ -601,7 +739,7 @@ _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, GLuint count = 0; for (buf = 0; buf < n; buf++ ) { if (destMask[buf]) { - GLint bufIndex = ffs(destMask[buf]) - 1; + gl_buffer_index bufIndex = ffs(destMask[buf]) - 1; /* only one bit should be set in the destMask[buf] field */ assert(_mesa_bitcount(destMask[buf]) == 1); if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) { @@ -611,9 +749,9 @@ _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, count = buf + 1; } else { - if (fb->_ColorDrawBufferIndexes[buf] != -1) { + if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) { updated_drawbuffers(ctx, fb); - fb->_ColorDrawBufferIndexes[buf] = -1; + fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE; } } fb->ColorDrawBuffer[buf] = buffers[buf]; @@ -621,11 +759,11 @@ _mesa_drawbuffers(struct gl_context *ctx, struct gl_framebuffer *fb, fb->_NumColorDrawBuffers = count; } - /* set remaining outputs to -1 (GL_NONE) */ + /* set remaining outputs to BUFFER_NONE */ for (buf = fb->_NumColorDrawBuffers; buf < ctx->Const.MaxDrawBuffers; buf++) { - if (fb->_ColorDrawBufferIndexes[buf] != -1) { + if (fb->_ColorDrawBufferIndexes[buf] != BUFFER_NONE) { updated_drawbuffers(ctx, fb); - fb->_ColorDrawBufferIndexes[buf] = -1; + fb->_ColorDrawBufferIndexes[buf] = BUFFER_NONE; } } for (buf = n; buf < ctx->Const.MaxDrawBuffers; buf++) { @@ -662,14 +800,17 @@ _mesa_update_draw_buffers(struct gl_context *ctx) /** * Like \sa _mesa_drawbuffers(), this is a helper function for setting - * GL_READ_BUFFER state in the context and current FBO. + * GL_READ_BUFFER state for the given context and FBO. + * Note that all error checking should have been done before calling + * this function. * \param ctx the rendering context + * \param fb the framebuffer object to update * \param buffer GL_FRONT, GL_BACK, GL_COLOR_ATTACHMENT0, etc. * \param bufferIndex the numerical index corresponding to 'buffer' */ void _mesa_readbuffer(struct gl_context *ctx, struct gl_framebuffer *fb, - GLenum buffer, GLint bufferIndex) + GLenum buffer, gl_buffer_index bufferIndex) { if ((fb == ctx->ReadBuffer) && _mesa_is_winsys_fbo(fb)) { /* Only update the per-context READ_BUFFER state if we're bound to @@ -687,40 +828,50 @@ _mesa_readbuffer(struct gl_context *ctx, struct gl_framebuffer *fb, /** - * Called by glReadBuffer to set the source renderbuffer for reading pixels. + * Called by glReadBuffer and glNamedFramebufferReadBuffer to set the source + * renderbuffer for reading pixels. * \param mode color buffer such as GL_FRONT, GL_BACK, etc. */ -void -_mesa_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, - GLenum buffer, const char *caller) +static ALWAYS_INLINE void +read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller, bool no_error) { - GLbitfield supportedMask; - GLint srcBuffer; + gl_buffer_index srcBuffer; FLUSH_VERTICES(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) - _mesa_debug(ctx, "%s %s\n", caller, _mesa_lookup_enum_by_nr(buffer)); + _mesa_debug(ctx, "%s %s\n", caller, _mesa_enum_to_string(buffer)); if (buffer == GL_NONE) { /* This is legal--it means that no buffer should be bound for reading. */ - srcBuffer = -1; + srcBuffer = BUFFER_NONE; } else { /* general case / window-system framebuffer */ - srcBuffer = read_buffer_enum_to_index(buffer); - if (srcBuffer == -1) { - _mesa_error(ctx, GL_INVALID_ENUM, - "%s(invalid buffer %s)", caller, - _mesa_lookup_enum_by_nr(buffer)); - return; - } - supportedMask = supported_buffer_bitmask(ctx, fb); - if (((1 << srcBuffer) & supportedMask) == 0) { - _mesa_error(ctx, GL_INVALID_OPERATION, - "%s(invalid buffer %s)", caller, - _mesa_lookup_enum_by_nr(buffer)); - return; + if (!no_error &&_mesa_is_gles3(ctx) && + !is_legal_es3_readbuffer_enum(buffer)) + srcBuffer = BUFFER_NONE; + else + srcBuffer = read_buffer_enum_to_index(ctx, buffer); + + if (!no_error) { + GLbitfield supportedMask; + + if (srcBuffer == BUFFER_NONE) { + _mesa_error(ctx, GL_INVALID_ENUM, + "%s(invalid buffer %s)", caller, + _mesa_enum_to_string(buffer)); + return; + } + + supportedMask = supported_buffer_bitmask(ctx, fb); + if (((1 << srcBuffer) & supportedMask) == 0) { + _mesa_error(ctx, GL_INVALID_OPERATION, + "%s(invalid buffer %s)", caller, + _mesa_enum_to_string(buffer)); + return; + } } } @@ -731,16 +882,57 @@ _mesa_read_buffer(struct gl_context *ctx, struct gl_framebuffer *fb, /* Call the device driver function only if fb is the bound read buffer */ if (fb == ctx->ReadBuffer) { if (ctx->Driver.ReadBuffer) - (*ctx->Driver.ReadBuffer)(ctx, buffer); + ctx->Driver.ReadBuffer(ctx, buffer); } } +static void +read_buffer_err(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) +{ + read_buffer(ctx, fb, buffer, caller, false); +} + + +static void +read_buffer_no_error(struct gl_context *ctx, struct gl_framebuffer *fb, + GLenum buffer, const char *caller) +{ + read_buffer(ctx, fb, buffer, caller, true); +} + + +void GLAPIENTRY +_mesa_ReadBuffer_no_error(GLenum buffer) +{ + GET_CURRENT_CONTEXT(ctx); + read_buffer_no_error(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); +} + + void GLAPIENTRY _mesa_ReadBuffer(GLenum buffer) { GET_CURRENT_CONTEXT(ctx); - _mesa_read_buffer(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); + read_buffer_err(ctx, ctx->ReadBuffer, buffer, "glReadBuffer"); +} + + +void GLAPIENTRY +_mesa_NamedFramebufferReadBuffer_no_error(GLuint framebuffer, GLenum src) +{ + GET_CURRENT_CONTEXT(ctx); + + struct gl_framebuffer *fb; + + if (framebuffer) { + fb = _mesa_lookup_framebuffer(ctx, framebuffer); + } else { + fb = ctx->WinSysReadBuffer; + } + + read_buffer_no_error(ctx, fb, src, "glNamedFramebufferReadBuffer"); } @@ -759,5 +951,5 @@ _mesa_NamedFramebufferReadBuffer(GLuint framebuffer, GLenum src) else fb = ctx->WinSysReadBuffer; - _mesa_read_buffer(ctx, fb, src, "glNamedFramebufferReadBuffer"); + read_buffer_err(ctx, fb, src, "glNamedFramebufferReadBuffer"); }