freedreno: fix scissor state emit

[mesa.git] / src / gallium / drivers / freedreno / a4xx / fd4_screen.c

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_screen.c b/src/gallium/drivers/freedreno/a4xx/fd4_screen.c
index cf697d4b741b1fc2e1084476760fb82e88faa807..bfec76cab62b6cfc1abc237075bf374a0874a261 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_screen.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_screen.c
@@ -32,31 +32,37 @@
 #include "fd4_screen.h"
 #include "fd4_context.h"
 #include "fd4_format.h"
+#include "ir3_compiler.h"
 
 static boolean
 fd4_screen_is_format_supported(struct pipe_screen *pscreen,
                enum pipe_format format,
                enum pipe_texture_target target,
                unsigned sample_count,
+               unsigned storage_sample_count,
                unsigned usage)
 {
        unsigned retval = 0;
 
        if ((target >= PIPE_MAX_TEXTURE_TYPES) ||
-                       (sample_count > 1) || /* TODO add MSAA */
-                       !util_format_is_supported(format, usage)) {
+                       (sample_count > 1)) { /* TODO add MSAA */
                DBG("not supported: format=%s, target=%d, sample_count=%d, usage=%x",
                                util_format_name(format), target, sample_count, usage);
                return FALSE;
        }
 
+       if (MAX2(1, sample_count) != MAX2(1, storage_sample_count))
+               return false;
+
        if ((usage & PIPE_BIND_VERTEX_BUFFER) &&
-                       (fd4_pipe2vtx(format) != ~0)) {
+                       (fd4_pipe2vtx(format) != (enum a4xx_vtx_fmt)~0)) {
                retval |= PIPE_BIND_VERTEX_BUFFER;
        }
 
        if ((usage & PIPE_BIND_SAMPLER_VIEW) &&
-                       (fd4_pipe2tex(format) != ~0)) {
+                       (target == PIPE_BUFFER ||
+                        util_format_get_blocksize(format) != 12) &&
+                       (fd4_pipe2tex(format) != (enum a4xx_tex_fmt)~0)) {
                retval |= PIPE_BIND_SAMPLER_VIEW;
        }
 
@@ -64,30 +70,30 @@ fd4_screen_is_format_supported(struct pipe_screen *pscreen,
                                PIPE_BIND_DISPLAY_TARGET |
                                PIPE_BIND_SCANOUT |
                                PIPE_BIND_SHARED)) &&
-                       (fd4_pipe2color(format) != ~0) &&
-                       (fd4_pipe2tex(format) != ~0)) {
+                       (fd4_pipe2color(format) != (enum a4xx_color_fmt)~0) &&
+                       (fd4_pipe2tex(format) != (enum a4xx_tex_fmt)~0)) {
                retval |= usage & (PIPE_BIND_RENDER_TARGET |
                                PIPE_BIND_DISPLAY_TARGET |
                                PIPE_BIND_SCANOUT |
                                PIPE_BIND_SHARED);
        }
 
+       /* For ARB_framebuffer_no_attachments: */
+       if ((usage & PIPE_BIND_RENDER_TARGET) && (format == PIPE_FORMAT_NONE)) {
+               retval |= usage & PIPE_BIND_RENDER_TARGET;
+       }
+
        if ((usage & PIPE_BIND_DEPTH_STENCIL) &&
-                       (fd4_pipe2depth(format) != ~0) &&
-                       (fd4_pipe2tex(format) != ~0)) {
+                       (fd4_pipe2depth(format) != (enum a4xx_depth_format)~0) &&
+                       (fd4_pipe2tex(format) != (enum a4xx_tex_fmt)~0)) {
                retval |= PIPE_BIND_DEPTH_STENCIL;
        }
 
        if ((usage & PIPE_BIND_INDEX_BUFFER) &&
-                       (fd_pipe2index(format) != ~0)) {
+                       (fd_pipe2index(format) != (enum pc_di_index_size)~0)) {
                retval |= PIPE_BIND_INDEX_BUFFER;
        }
 
-       if (usage & PIPE_BIND_TRANSFER_READ)
-               retval |= PIPE_BIND_TRANSFER_READ;
-       if (usage & PIPE_BIND_TRANSFER_WRITE)
-               retval |= PIPE_BIND_TRANSFER_WRITE;
-
        if (retval != usage) {
                DBG("not supported: format=%s, target=%d, sample_count=%d, "
                                "usage=%x, retval=%x", util_format_name(format),
@@ -100,6 +106,9 @@ fd4_screen_is_format_supported(struct pipe_screen *pscreen,
 void
 fd4_screen_init(struct pipe_screen *pscreen)
 {
+       struct fd_screen *screen = fd_screen(pscreen);
+       screen->max_rts = A4XX_MAX_RENDER_TARGETS;
+       screen->compiler = ir3_compiler_create(screen->dev, screen->gpu_id);
        pscreen->context_create = fd4_context_create;
        pscreen->is_format_supported = fd4_screen_is_format_supported;
 }