[Mesa-dev] [PATCH v2 1/6] mesa: wire up InvalidateFramebuffer

2018-12-12 Thread Rob Clark 
And before someone actually starts implementing DiscardFramebuffer()
lets rework the interface to something that is actually usable.

Signed-off-by: Rob Clark 
Reviewed-by: Ian Romanick 
---
 src/mesa/main/dd.h   |  5 ++-
 src/mesa/main/fbobject.c | 77 +---
 2 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index f14c3e04e91..1214eeaa474 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -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
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 23e49396199..442435655fa 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -4637,6 +4637,65 @@ invalid_enum:
return;
 }
 
+static struct gl_renderbuffer_attachment *
+get_fb_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
+  const GLenum attachment)
+{
+   int idx;
+
+   switch (attachment) {
+   case GL_COLOR:
+   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:
+  if (attachment == GL_COLOR) {
+ idx = 0;
+  } else {
+ idx = attachment - GL_COLOR_ATTACHMENT0;
+  }
+  return &fb->Attachment[BUFFER_COLOR0 + idx];
+   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,
@@ -4695,14 +4754,23 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint 
framebuffer,
invalidate_framebuffer_storage(ctx, fb, numAttachments, attachments,
   x, y, width, height,
   "glInvalidateNamedFramebufferSubData");
-}
 
+   discard_sub_framebuffer(ctx, fb, numAttachments, attachments,
+   x, y, width, height);
+}
 
 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);
 }
 
 
@@ -4738,6 +4806,8 @@ _mesa_InvalidateFramebuffer(GLenum target, GLsizei 
numAttachments,
   ctx->Const.MaxViewportWidth,
   ctx->Const.MaxViewportHeight,
   "glInvalidateFramebuffer");
+
+   discard_framebuffer(ctx, fb, numAttachments, attachments);
 }
 
 
@@ -4824,8 +4894,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;
 
-- 
2.19.2

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH v2 1/6] mesa: wire up InvalidateFramebuffer

2018-12-13 Thread Brian Paul 
On 12/12/2018 08:48 AM, Rob Clark wrote:
> And before someone actually starts implementing DiscardFramebuffer()
> lets rework the interface to something that is actually usable.
> 
> Signed-off-by: Rob Clark 
> Reviewed-by: Ian Romanick 
> ---
>   src/mesa/main/dd.h   |  5 ++-
>   src/mesa/main/fbobject.c | 77 +---
>   2 files changed, 75 insertions(+), 7 deletions(-)
> 
> diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
> index f14c3e04e91..1214eeaa474 100644
> --- a/src/mesa/main/dd.h
> +++ b/src/mesa/main/dd.h
> @@ -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
> diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
> index 23e49396199..442435655fa 100644
> --- a/src/mesa/main/fbobject.c
> +++ b/src/mesa/main/fbobject.c
> @@ -4637,6 +4637,65 @@ invalid_enum:
>  return;
>   }
>   
> +static struct gl_renderbuffer_attachment *
> +get_fb_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
> +  const GLenum attachment)
> +{
> +   int idx;
> +
> +   switch (attachment) {
> +   case GL_COLOR:
> +   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:
> +  if (attachment == GL_COLOR) {
> + idx = 0;
> +  } else {
> + idx = attachment - GL_COLOR_ATTACHMENT0;
> +  }
> +  return &fb->Attachment[BUFFER_COLOR0 + idx];
> +   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;
> +   }
> +}

That function seems pretty similar to get_attachment().  Can you use (or 
modify) that one instead?


> +
> +static void
> +discard_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb,
> +GLsizei numAttachments, const GLenum *attachments)

Please put a comment on this new function.


> +{
> +   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);

Or,

if (att) {
ctx->Driver.DiscardFramebuffer(ctx, fb, att);
}


> +   }
> +}
>   
>   void GLAPIENTRY
>   _mesa_InvalidateSubFramebuffer_no_error(GLenum target, GLsizei 
> numAttachments,
> @@ -4695,14 +4754,23 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint 
> framebuffer,
>  invalidate_framebuffer_storage(ctx, fb, numAttachments, attachments,
> x, y, width, height,
> "glInvalidateNamedFramebufferSubData");
> -}
>   
> +   discard_sub_framebuffer(ctx, fb, numAttachments, attachments,
> +   x, y, width, height);
> +}
>   
>   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);
>   }
>   
>   
> @@ -4738,6 +4806,8 @@ _mesa_InvalidateFramebuffer(GLenum target, GLsizei 
> numAttachments,
> ctx->Const.MaxViewportWidth,
> ctx->Const.MaxViewportHeight,
> "glInvalidateFramebuffer");
> +
> +   discard_framebuffer(ctx, fb, numAttachments, attachments);
>   }
>   
>   
> @@ -4824,8 +4894,7 @@ _mesa_DiscardFramebufferEXT(GLenum target, GLsizei 
> numAttachments,
> }
>  }
>   
> -   if (ctx->Driv

Re: [Mesa-dev] [PATCH v2 1/6] mesa: wire up InvalidateFramebuffer

2018-12-12 Thread Frank Richter 

Hello,
On 12.12.18 16:48, Rob Clark wrote:

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 23e49396199..442435655fa 100644
@@ -4695,14 +4754,23 @@ _mesa_InvalidateNamedFramebufferSubData(GLuint 
framebuffer,
 invalidate_framebuffer_storage(ctx, fb, numAttachments, attachments,
x, y, width, height,
"glInvalidateNamedFramebufferSubData");
-}
  
+   discard_sub_framebuffer(ctx, fb, numAttachments, attachments,

+   x, y, width, height);
+}


From what I can see discard_sub_framebuffer() isn't defined yet. It is 
in patch 2/6.


-f.r.
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev