Mesa (main): freedreno/a6xx: Handle non-UBWC surface views
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Jun 13 19:26:41 UTC 2021
Module: Mesa
Branch: main
Commit: 0c3079ce2d0421d800c83b138ab936f5521657c4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c3079ce2d0421d800c83b138ab936f5521657c4
Author: Rob Clark <robdclark at chromium.org>
Date: Sat Jun 12 11:41:47 2021 -0700
freedreno/a6xx: Handle non-UBWC surface views
Similar to sampler views and shader images, if we get a surface view
with a non-UBWC compatible format while the underlying resource is UBWC,
we need to demote to uncompressed.
Signed-off-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11343>
---
src/gallium/drivers/freedreno/a6xx/fd6_context.c | 30 +++++
.../freedreno/ci/piglit-freedreno-a630-fails.txt | 150 ---------------------
src/gallium/drivers/freedreno/freedreno_state.c | 4 +-
src/gallium/drivers/freedreno/freedreno_state.h | 3 +
4 files changed, 35 insertions(+), 152 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_context.c b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
index 24eb8e8befb..9b12c38bf9c 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_context.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_context.c
@@ -26,6 +26,7 @@
*/
#include "freedreno_query_acc.h"
+#include "freedreno_state.h"
#include "fd6_blend.h"
#include "fd6_blitter.h"
@@ -38,6 +39,7 @@
#include "fd6_program.h"
#include "fd6_query.h"
#include "fd6_rasterizer.h"
+#include "fd6_resource.h"
#include "fd6_texture.h"
#include "fd6_zsa.h"
@@ -127,6 +129,32 @@ fd6_vertex_state_delete(struct pipe_context *pctx, void *hwcso)
FREE(hwcso);
}
+static void
+validate_surface(struct pipe_context *pctx, struct pipe_surface *psurf)
+ assert_dt
+{
+ fd6_validate_format(fd_context(pctx), fd_resource(psurf->texture),
+ psurf->format);
+}
+
+static void
+fd6_set_framebuffer_state(struct pipe_context *pctx,
+ const struct pipe_framebuffer_state *pfb)
+ in_dt
+{
+ if (pfb->zsbuf)
+ validate_surface(pctx, pfb->zsbuf);
+
+ for (unsigned i = 0; i < pfb->nr_cbufs; i++) {
+ if (!pfb->cbufs[i])
+ continue;
+ validate_surface(pctx, pfb->cbufs[i]);
+ }
+
+ fd_set_framebuffer_state(pctx, pfb);
+}
+
+
static void
setup_state_map(struct fd_context *ctx)
{
@@ -221,6 +249,8 @@ fd6_context_create(struct pipe_screen *pscreen, void *priv,
if (!pctx)
return NULL;
+ pctx->set_framebuffer_state = fd6_set_framebuffer_state;
+
/* after fd_context_init() to override set_shader_images() */
fd6_image_init(pctx);
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
index 65a3feb9794..e82e295d62c 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
@@ -253,102 +253,63 @@ spec at arb_texture_rg@texwrap formats-int bordercolor-swizzled at GL_RG8UI- swizzled-
spec at arb_texture_view@bug-layers-image,Crash
spec at arb_texture_view@rendering-formats at clear GL_R16F as GL_RG8,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16F as GL_RG8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_R16F as GL_RG8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16F as GL_RG8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16I as GL_RG8,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16I as GL_RG8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_R16I as GL_RG8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16I as GL_RG8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16UI as GL_RG8,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16UI as GL_RG8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_R16UI as GL_RG8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_R16UI as GL_RG8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8 as GL_R16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8 as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8 as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8 as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8 as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8I as GL_R16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8I as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8I as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8I as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8I as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8UI as GL_R16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8UI as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8UI as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RG8UI as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RG8UI as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB8I as GL_RGB8,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGB8UI as GL_RGB8,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8 as GL_RGB10_A2UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGBA8,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RGB10_A2UI,Fail
@@ -358,86 +319,50 @@ spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGB10_A2UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8 as GL_R16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8 as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8 as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8 as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8 as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8I as GL_R16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8I as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8I as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8I as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8I as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8UI as GL_R16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8UI as GL_R16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8UI as GL_R16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RG8UI as GL_R16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RG8UI as GL_R16UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8 as GL_RGB10_A2UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8I as GL_RGB10_A2UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32F,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32UI,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16F,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16I,Fail
-spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16_SNORM,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16UI,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RGB10_A2,Fail
spec at arb_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RGB10_A2UI,Fail
@@ -901,102 +826,63 @@ spec at nv_primitive_restart@primitive-restart-draw-mode-quad_strip,Fail
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
spec at oes_texture_view@rendering-formats at clear GL_R16F as GL_RG8,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16F as GL_RG8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_R16F as GL_RG8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16F as GL_RG8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16I as GL_RG8,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16I as GL_RG8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_R16I as GL_RG8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16I as GL_RG8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16UI as GL_RG8,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16UI as GL_RG8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_R16UI as GL_RG8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_R16UI as GL_RG8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16F as GL_RGBA8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16I as GL_RGBA8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG16UI as GL_RGBA8UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8 as GL_R16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8 as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8 as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8 as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8 as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8I as GL_R16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8I as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8I as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8I as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8I as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8UI as GL_R16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8UI as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8UI as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RG8UI as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RG8UI as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2 as GL_RGBA8UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB10_A2UI as GL_RGBA8UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB8I as GL_RGB8,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGB8UI as GL_RGB8,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8 as GL_RGB10_A2UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8I as GL_RGBA8,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at clear GL_RGBA8UI as GL_RGB10_A2UI,Fail
@@ -1006,86 +892,50 @@ spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16F as GL_RGBA8UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16I as GL_RGBA8UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGB10_A2UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG16UI as GL_RGBA8UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8 as GL_R16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8 as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8 as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8 as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8 as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8I as GL_R16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8I as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8I as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8I as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8I as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8UI as GL_R16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8UI as GL_R16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8UI as GL_R16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RG8UI as GL_R16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RG8UI as GL_R16UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2 as GL_RGBA8UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGB10_A2UI as GL_RGBA8UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8 as GL_RGB10_A2UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8I as GL_RGB10_A2UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32F,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_R32UI,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16F,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16I,Fail
-spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16_SNORM,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RG16UI,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RGB10_A2,Fail
spec at oes_texture_view@rendering-formats at render to GL_RGBA8UI as GL_RGB10_A2UI,Fail
diff --git a/src/gallium/drivers/freedreno/freedreno_state.c b/src/gallium/drivers/freedreno/freedreno_state.c
index 6ff9c1e1e0f..92a4827149e 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.c
+++ b/src/gallium/drivers/freedreno/freedreno_state.c
@@ -247,9 +247,9 @@ fd_set_shader_images(struct pipe_context *pctx, enum pipe_shader_type shader,
fd_context_dirty_shader(ctx, shader, FD_DIRTY_SHADER_IMAGE);
}
-static void
+void
fd_set_framebuffer_state(struct pipe_context *pctx,
- const struct pipe_framebuffer_state *framebuffer) in_dt
+ const struct pipe_framebuffer_state *framebuffer)
{
struct fd_context *ctx = fd_context(pctx);
struct pipe_framebuffer_state *cso;
diff --git a/src/gallium/drivers/freedreno/freedreno_state.h b/src/gallium/drivers/freedreno/freedreno_state.h
index 255049bb1d9..1890583b5a2 100644
--- a/src/gallium/drivers/freedreno/freedreno_state.h
+++ b/src/gallium/drivers/freedreno/freedreno_state.h
@@ -66,6 +66,9 @@ void fd_set_shader_images(struct pipe_context *pctx,
unsigned count, unsigned unbind_num_trailing_slots,
const struct pipe_image_view *images);
+void fd_set_framebuffer_state(struct pipe_context *pctx,
+ const struct pipe_framebuffer_state *framebuffer) in_dt;
+
void fd_state_init(struct pipe_context *pctx);
#endif /* FREEDRENO_STATE_H_ */
More information about the mesa-commit
mailing list