Attachment 142555 Details for Bug 108805 – FBO: revert most error values and only check directly for R_SRGB8

[patch] FBO: revert most error values and only check directly for R_SRGB8

0002-i965-directly-check-sRBB_R8.patch (text/plain), 2.18 KB, created by Gert Wollny on 2018-11-21 20:24:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gert Wollny

Created: 2018-11-21 20:24:49 UTC

Size: 2.18 KB

patch

obsolete

>From 264916935a2b59ac5c2e1fc73cad4efce12d6d0f Mon Sep 17 00:00:00 2001
>From: Gert Wollny <gert.wollny@collabora.com>
>Date: Tue, 20 Nov 2018 22:39:17 +0100
>Subject: [PATCH 2/2] i965: directly check  sRBB_R8
>
>---
> src/mesa/drivers/dri/i965/intel_fbo.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
>index 7e40d61a47..5bcd846a1b 100644
>--- a/src/mesa/drivers/dri/i965/intel_fbo.c
>+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
>@@ -719,7 +719,7 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
>                       "FBO incomplete: separate stencil unsupported\n");
> 	 }
> 	 if (stencil_mt->format != MESA_FORMAT_S_UINT8) {
>-	    fbo_incomplete(fb, GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>+	    fbo_incomplete(fb, GL_FRAMEBUFFER_UNSUPPORTED,
>                       "FBO incomplete: separate stencil is %s "
>                       "instead of S8\n",
>                       _mesa_get_format_name(stencil_mt->format));
>@@ -750,7 +750,7 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
>        */
>       rb = fb->Attachment[i].Renderbuffer;
>       if (rb == NULL) {
>-	 fbo_incomplete(fb, GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT,
>+	 fbo_incomplete(fb, GL_FRAMEBUFFER_UNSUPPORTED,
>                        "FBO incomplete: attachment without "
>                        "renderbuffer\n");
> 	 continue;
>@@ -771,8 +771,15 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
> 	 continue;
>       }
> 
>+     if (rb->Format == MESA_FORMAT_R_SRGB8) {
>+        fbo_incomplete(fb, GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>+                       "FBO incomplete: Format not color renderable: %s\n",
>+                       _mesa_get_format_name(rb->Format));
>+        continue;
>+     }
>+
>       if (!brw_render_target_supported(brw, rb)) {
>-	 fbo_incomplete(fb, GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT,
>+	 fbo_incomplete(fb, GL_FRAMEBUFFER_UNSUPPORTED,
>                    "FBO incomplete: Unsupported HW "
>                    "texture/renderbuffer format attached: %s\n",
>                    _mesa_get_format_name(intel_rb_format(irb)));
>-- 
>2.19.1
>

Actions: View | Splinter Review

Attachments on bug 108805: 142534 | 142551 | 142555

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.