KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: wire up InvalidateFramebuffer 

And before someone actually starts implementing DiscardFramebuffer()
lets rework the interface to something that is actually usable.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Rob Clark 2018-11-01 11:10:46 -04:00
parent e685566612
commit 0c42b5f3cb
2 changed files with 66 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/main/dd.h
View File

@ -784,9 +784,8 @@ struct dd_function_table {
GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);
void (*DiscardFramebuffer)(struct gl_context *ctx,
GLenum target, GLsizei numAttachments,
const GLenum *attachments);
void (*DiscardFramebuffer)(struct gl_context *ctx, struct gl_framebuffer *fb,
struct gl_renderbuffer_attachment *att);
/**
* \name Functions for GL_ARB_sample_locations

68
src/mesa/main/fbobject.c
View File

@ -4641,6 +4641,59 @@ invalid_enum:
return;
}
static struct gl_renderbuffer_attachment *
get_fb_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
const GLenum attachment)
{
switch (attachment) {
case GL_COLOR:
return &fb->Attachment[BUFFER_BACK_LEFT];
case GL_COLOR_ATTACHMENT0:
case GL_COLOR_ATTACHMENT1:
case GL_COLOR_ATTACHMENT2:
case GL_COLOR_ATTACHMENT3:
case GL_COLOR_ATTACHMENT4:
case GL_COLOR_ATTACHMENT5:
case GL_COLOR_ATTACHMENT6:
case GL_COLOR_ATTACHMENT7:
case GL_COLOR_ATTACHMENT8:
case GL_COLOR_ATTACHMENT9:
case GL_COLOR_ATTACHMENT10:
case GL_COLOR_ATTACHMENT11:
case GL_COLOR_ATTACHMENT12:
case GL_COLOR_ATTACHMENT13:
case GL_COLOR_ATTACHMENT14:
case GL_COLOR_ATTACHMENT15:
return &fb->Attachment[BUFFER_COLOR0 + attachment - GL_COLOR_ATTACHMENT0];
case GL_DEPTH:
case GL_DEPTH_ATTACHMENT:
case GL_DEPTH_STENCIL_ATTACHMENT:
return &fb->Attachment[BUFFER_DEPTH];
case GL_STENCIL:
case GL_STENCIL_ATTACHMENT:
return &fb->Attachment[BUFFER_STENCIL];
default:
return NULL;
}
}
static void
discard_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
GLsizei numAttachments, const GLenum *attachments)
{
if (!ctx->Driver.DiscardFramebuffer)
return;
for (int i = 0; i < numAttachments; i++) {
struct gl_renderbuffer_attachment *att =
get_fb_attachment(ctx, fb, attachments[i]);
if (!att)
continue;
ctx->Driver.DiscardFramebuffer(ctx, fb, att);
}
}
void GLAPIENTRY
_mesa_InvalidateSubFramebuffer_no_error(GLenum target, GLsizei numAttachments,
@ -4701,12 +4754,18 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint framebuffer,
"glInvalidateNamedFramebufferSubData");
}
void GLAPIENTRY
_mesa_InvalidateFramebuffer_no_error(GLenum target, GLsizei numAttachments,
const GLenum *attachments)
{
/* no-op */
struct gl_framebuffer *fb;
GET_CURRENT_CONTEXT(ctx);
fb = get_framebuffer_target(ctx, target);
if (!fb)
return;
discard_framebuffer(ctx, fb, numAttachments, attachments);
}
@ -4742,6 +4801,8 @@ _mesa_InvalidateFramebuffer(GLenum target, GLsizei numAttachments,
ctx->Const.MaxViewportWidth,
ctx->Const.MaxViewportHeight,
"glInvalidateFramebuffer");
discard_framebuffer(ctx, fb, numAttachments, attachments);
}
@ -4828,8 +4889,7 @@ _mesa_DiscardFramebufferEXT(GLenum target, GLsizei numAttachments,
}
}
if (ctx->Driver.DiscardFramebuffer)
ctx->Driver.DiscardFramebuffer(ctx, target, numAttachments, attachments);
discard_framebuffer(ctx, fb, numAttachments, attachments);
return;