freedreno: add resource seqno

[mesa.git] / src / gallium / drivers / freedreno / freedreno_resource.h

diff --git a/src/gallium/drivers/freedreno/freedreno_resource.h b/src/gallium/drivers/freedreno/freedreno_resource.h
index 9f6da5c21c11e9e6bf444556fe6bebb901bf4bd4..09abb512d7eeae93db0007225f51bd8142811bd5 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_resource.h
+++ b/src/gallium/drivers/freedreno/freedreno_resource.h
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2012 Rob Clark <robclark@freedesktop.org>
  *
@@ -31,7 +29,7 @@
 
 #include "util/list.h"
 #include "util/u_range.h"
-#include "util/u_transfer.h"
+#include "util/u_transfer_helper.h"
 
 #include "freedreno_batch.h"
 #include "freedreno_util.h"
@@ -64,7 +62,7 @@ struct fd_resource_slice {
 struct set;
 
 struct fd_resource {
-       struct u_resource base;
+       struct pipe_resource base;
        struct fd_bo *bo;
        uint32_t cpp;
        enum pipe_format internal_format;
@@ -73,6 +71,7 @@ struct fd_resource {
        struct fd_resource_slice slices[MAX_MIP_LEVELS];
        /* buffer range that has been initialized */
        struct util_range valid_buffer_range;
+       bool valid;
 
        /* reference to the resource holding stencil data for a z32_s8 texture */
        /* TODO rename to secondary or auxiliary? */
@@ -95,6 +94,21 @@ struct fd_resource {
         * shadowed.
         */
        uint32_t bc_batch_mask;
+
+       /* Sequence # incremented each time bo changes: */
+       uint16_t seqno;
+
+       unsigned tile_mode : 2;
+       unsigned preferred_tile_mode : 2;
+
+       /*
+        * LRZ
+        */
+       bool lrz_valid : 1;
+       uint16_t lrz_width;  // for lrz clear, does this differ from lrz_pitch?
+       uint16_t lrz_height;
+       uint16_t lrz_pitch;
+       struct fd_bo *lrz;
 };
 
 static inline struct fd_resource *
@@ -122,7 +136,8 @@ pending(struct fd_resource *rsc, bool write)
 
 struct fd_transfer {
        struct pipe_transfer base;
-       void *staging;
+       struct pipe_resource *staging_prsc;
+       struct pipe_box staging_box;
 };
 
 static inline struct fd_transfer *
@@ -134,7 +149,7 @@ fd_transfer(struct pipe_transfer *ptrans)
 static inline struct fd_resource_slice *
 fd_resource_slice(struct fd_resource *rsc, unsigned level)
 {
-       assert(level <= rsc->base.b.last_level);
+       assert(level <= rsc->base.last_level);
        return &rsc->slices[level];
 }
 
@@ -153,6 +168,16 @@ fd_resource_offset(struct fd_resource *rsc, unsigned level, unsigned layer)
        return offset;
 }
 
+/* This might be a5xx specific, but higher mipmap levels are always linear: */
+static inline bool
+fd_resource_level_linear(struct pipe_resource *prsc, int level)
+{
+       unsigned w = u_minify(prsc->width0, level);
+       if (w < 16)
+               return true;
+       return false;
+}
+
 void fd_blitter_pipe_begin(struct fd_context *ctx, bool render_cond, bool discard,
                enum fd_render_stage stage);
 void fd_blitter_pipe_end(struct fd_context *ctx);
@@ -160,6 +185,7 @@ void fd_blitter_pipe_end(struct fd_context *ctx);
 void fd_resource_screen_init(struct pipe_screen *pscreen);
 void fd_resource_context_init(struct pipe_context *pctx);
 
+uint32_t fd_setup_slices(struct fd_resource *rsc);
 void fd_resource_resize(struct pipe_resource *prsc, uint32_t sz);
 
 bool fd_render_condition_check(struct pipe_context *pctx);