OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Trigger FBO validation on DrawBuffers change in non-ES2 mode.

Browse Source 
glDrawBuffers pointing at an unattached buffer is supposed to be
incomplete without ARB_ES2_compatibility.  The testcase to catch the
bug of not implementing that bit of the spec was tricked by this
missing piece of state update.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt
2011-05-25 13:43:02 -07:00
parent 179a88d52c
commit f73ff463a2
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/mesa/main/buffers.c
View File

@@ -340,6 +340,26 @@ _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE); ctx->Driver.DrawBuffer(ctx, n > 0 ? buffers[0] : GL_NONE);
} }
/**
* Performs necessary state updates when _mesa_drawbuffers makes an
* actual change.
*/
static void
updated_drawbuffers(struct gl_context *ctx)
{
FLUSH_VERTICES(ctx, _NEW_BUFFERS);
#if FEATURE_GL
if (ctx->API == API_OPENGL) {
struct gl_framebuffer *fb = ctx->DrawBuffer;
/* Flag the FBO as requiring validation. */
if (fb->Name != 0) {
fb->_Status = 0;
}
}
#endif
}
/** /**
* Helper function to set the GL_DRAW_BUFFER state in the context and * Helper function to set the GL_DRAW_BUFFER state in the context and
@@ -361,7 +381,6 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
{ {
struct gl_framebuffer *fb = ctx->DrawBuffer; struct gl_framebuffer *fb = ctx->DrawBuffer;
GLbitfield mask[MAX_DRAW_BUFFERS]; GLbitfield mask[MAX_DRAW_BUFFERS];
GLboolean newState = GL_FALSE;
if (!destMask) { if (!destMask) {
/* compute destMask values now */ /* compute destMask values now */
@@ -385,7 +404,7 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
GLint bufIndex = _mesa_ffs(destMask0) - 1; GLint bufIndex = _mesa_ffs(destMask0) - 1;
if (fb->_ColorDrawBufferIndexes[count] != bufIndex) { if (fb->_ColorDrawBufferIndexes[count] != bufIndex) {
fb->_ColorDrawBufferIndexes[count] = bufIndex; fb->_ColorDrawBufferIndexes[count] = bufIndex;
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
count++; count++;
destMask0 &= ~(1 << bufIndex); destMask0 &= ~(1 << bufIndex);
@@ -393,7 +412,7 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
fb->ColorDrawBuffer[0] = buffers[0]; fb->ColorDrawBuffer[0] = buffers[0];
if (fb->_NumColorDrawBuffers != count) { if (fb->_NumColorDrawBuffers != count) {
fb->_NumColorDrawBuffers = count; fb->_NumColorDrawBuffers = count;
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
} }
else { else {
@@ -405,14 +424,14 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
ASSERT(_mesa_bitcount(destMask[buf]) == 1); ASSERT(_mesa_bitcount(destMask[buf]) == 1);
if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) { if (fb->_ColorDrawBufferIndexes[buf] != bufIndex) {
fb->_ColorDrawBufferIndexes[buf] = bufIndex; fb->_ColorDrawBufferIndexes[buf] = bufIndex;
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
count = buf + 1; count = buf + 1;
} }
else { else {
if (fb->_ColorDrawBufferIndexes[buf] != -1) { if (fb->_ColorDrawBufferIndexes[buf] != -1) {
fb->_ColorDrawBufferIndexes[buf] = -1; fb->_ColorDrawBufferIndexes[buf] = -1;
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
} }
fb->ColorDrawBuffer[buf] = buffers[buf]; fb->ColorDrawBuffer[buf] = buffers[buf];
@@ -421,7 +440,7 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
while (buf < ctx->Const.MaxDrawBuffers) { while (buf < ctx->Const.MaxDrawBuffers) {
if (fb->_ColorDrawBufferIndexes[buf] != -1) { if (fb->_ColorDrawBufferIndexes[buf] != -1) {
fb->_ColorDrawBufferIndexes[buf] = -1; fb->_ColorDrawBufferIndexes[buf] = -1;
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
fb->ColorDrawBuffer[buf] = GL_NONE; fb->ColorDrawBuffer[buf] = GL_NONE;
buf++; buf++;
@@ -435,13 +454,10 @@ _mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,
for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) { for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
if (ctx->Color.DrawBuffer[buf] != fb->ColorDrawBuffer[buf]) { if (ctx->Color.DrawBuffer[buf] != fb->ColorDrawBuffer[buf]) {
ctx->Color.DrawBuffer[buf] = fb->ColorDrawBuffer[buf]; ctx->Color.DrawBuffer[buf] = fb->ColorDrawBuffer[buf];
newState = GL_TRUE; updated_drawbuffers(ctx);
} }
} }
} }
if (newState)
FLUSH_VERTICES(ctx, _NEW_BUFFERS);
} }