panfrost: Drop point sprite from shader key

[mesa.git] / src / gallium / drivers / panfrost / pan_blit.c

diff --git a/src/gallium/drivers/panfrost/pan_blit.c b/src/gallium/drivers/panfrost/pan_blit.c
index e6ef70ea7b8f7d24d5945de0e543401698877eae..c9fc8c83918ba44d7f53bae709ad4f6aaaa00cd4 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_blit.c
+++ b/src/gallium/drivers/panfrost/pan_blit.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Broadcom
- * Copyright (C) 2019 Collabora
+ * Copyright (C) 2019 Collabora, Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,50 +28,47 @@
  */
 
 #include "pan_context.h"
-#include "util/u_format.h"
+#include "pan_util.h"
+#include "util/format/u_format.h"
 
 static void
 panfrost_blitter_save(
-                struct panfrost_context *ctx,
-                struct blitter_context *blitter)
+        struct panfrost_context *ctx,
+        struct blitter_context *blitter)
 {
 
         util_blitter_save_vertex_buffer_slot(blitter, ctx->vertex_buffers);
         util_blitter_save_vertex_elements(blitter, ctx->vertex);
-        util_blitter_save_vertex_shader(blitter, ctx->vs);
+        util_blitter_save_vertex_shader(blitter, ctx->shader[PIPE_SHADER_VERTEX]);
         util_blitter_save_rasterizer(blitter, ctx->rasterizer);
         util_blitter_save_viewport(blitter, &ctx->pipe_viewport);
         util_blitter_save_scissor(blitter, &ctx->scissor);
-        util_blitter_save_fragment_shader(blitter, ctx->fs);
+        util_blitter_save_fragment_shader(blitter, ctx->shader[PIPE_SHADER_FRAGMENT]);
         util_blitter_save_blend(blitter, ctx->blend);
         util_blitter_save_depth_stencil_alpha(blitter, ctx->depth_stencil);
         util_blitter_save_stencil_ref(blitter, &ctx->stencil_ref);
-       util_blitter_save_so_targets(blitter, 0, NULL);
-
-       /* For later */
-//        util_blitter_save_sample_mask(blitter, ctx->sample_mask);
+        util_blitter_save_so_targets(blitter, 0, NULL);
+        util_blitter_save_sample_mask(blitter, ctx->sample_mask);
 
         util_blitter_save_framebuffer(blitter, &ctx->pipe_framebuffer);
         util_blitter_save_fragment_sampler_states(blitter,
-                                                 ctx->sampler_count[PIPE_SHADER_FRAGMENT],
-                                                 (void **)(&ctx->samplers[PIPE_SHADER_FRAGMENT]));
+                        ctx->sampler_count[PIPE_SHADER_FRAGMENT],
+                        (void **)(&ctx->samplers[PIPE_SHADER_FRAGMENT]));
         util_blitter_save_fragment_sampler_views(blitter,
-                                                ctx->sampler_view_count[PIPE_SHADER_FRAGMENT],
-                                                (struct pipe_sampler_view **)&ctx->sampler_views[PIPE_SHADER_FRAGMENT]);
+                        ctx->sampler_view_count[PIPE_SHADER_FRAGMENT],
+                        (struct pipe_sampler_view **)&ctx->sampler_views[PIPE_SHADER_FRAGMENT]);
+        util_blitter_save_fragment_constant_buffer_slot(blitter,
+                        ctx->constant_buffer[PIPE_SHADER_FRAGMENT].cb);
 }
 
 static bool
 panfrost_u_blitter_blit(struct pipe_context *pipe,
-              const struct pipe_blit_info *info)
+                        const struct pipe_blit_info *info)
 {
         struct panfrost_context *ctx = pan_context(pipe);
 
-        if (!util_blitter_is_blit_supported(ctx->blitter, info)) {
-                fprintf(stderr, "blit unsupported %s -> %s\n",
-                util_format_short_name(info->src.resource->format),
-                util_format_short_name(info->dst.resource->format));
-                return false;
-        }
+        if (!util_blitter_is_blit_supported(ctx->blitter, info))
+                unreachable("Unsupported blit\n");
 
         /* TODO: Scissor */
 
@@ -92,8 +89,6 @@ panfrost_blit(struct pipe_context *pipe,
         if (panfrost_u_blitter_blit(pipe, info))
                 return;
 
-        fprintf(stderr, "Unhandled blit");
-
         return;
 }
 
@@ -103,33 +98,34 @@ panfrost_blit(struct pipe_context *pipe,
  */
 
 void
-panfrost_blit_wallpaper(struct panfrost_context *ctx)
+panfrost_blit_wallpaper(struct panfrost_context *ctx, struct pipe_box *box)
 {
-        struct pipe_blit_info binfo = { };
+        struct panfrost_batch *batch = ctx->wallpaper_batch;
+        struct pipe_blit_info binfo = {0};
 
         panfrost_blitter_save(ctx, ctx->blitter_wallpaper);
 
-        struct pipe_surface *surf = ctx->pipe_framebuffer.cbufs[0];
+        struct pipe_surface *surf = batch->key.cbufs[0];
         unsigned level = surf->u.tex.level;
         unsigned layer = surf->u.tex.first_layer;
         assert(surf->u.tex.last_layer == layer);
 
-       binfo.src.resource = binfo.dst.resource = ctx->pipe_framebuffer.cbufs[0]->texture;
-       binfo.src.level = binfo.dst.level = level;
-       binfo.src.box.x = binfo.dst.box.x = 0;
-       binfo.src.box.y = binfo.dst.box.y = 0;
-       binfo.src.box.z = binfo.dst.box.z = layer;
-       binfo.src.box.width = binfo.dst.box.width = ctx->pipe_framebuffer.width;
-       binfo.src.box.height = binfo.dst.box.height = ctx->pipe_framebuffer.height;
-       binfo.src.box.depth = binfo.dst.box.depth = 1;
+        binfo.src.resource = binfo.dst.resource = batch->key.cbufs[0]->texture;
+        binfo.src.level = binfo.dst.level = level;
+        binfo.src.box.x = binfo.dst.box.x = box->x;
+        binfo.src.box.y = binfo.dst.box.y = box->y;
+        binfo.src.box.z = binfo.dst.box.z = layer;
+        binfo.src.box.width = binfo.dst.box.width = box->width;
+        binfo.src.box.height = binfo.dst.box.height = box->height;
+        binfo.src.box.depth = binfo.dst.box.depth = 1;
 
-       binfo.src.format = binfo.dst.format = ctx->pipe_framebuffer.cbufs[0]->texture->format;
+        binfo.src.format = binfo.dst.format = batch->key.cbufs[0]->format;
 
-       assert(ctx->pipe_framebuffer.nr_cbufs == 1);
-       binfo.mask = PIPE_MASK_RGBA;
-       binfo.filter = PIPE_TEX_FILTER_LINEAR;
-       binfo.scissor_enable = FALSE;
+        assert(batch->key.nr_cbufs == 1);
+        binfo.mask = PIPE_MASK_RGBA;
+        binfo.filter = PIPE_TEX_FILTER_LINEAR;
+        binfo.scissor_enable = FALSE;
 
-       util_blitter_blit(ctx->blitter_wallpaper, &binfo);
+        util_blitter_blit(ctx->blitter_wallpaper, &binfo);
 }