freedreno: Make the slice pitch be bytes, not pixels.

[mesa.git] / src / gallium / drivers / freedreno / a4xx / fd4_context.h

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_context.h b/src/gallium/drivers/freedreno/a4xx/fd4_context.h
index 074c5a752bf646143505fd787fd585c994da2696..a84e3a90f8309f783b56f5f5d8eb2ce2bc0cf0ea 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_context.h
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_context.h
@@ -1,5 +1,3 @@
-/* -*- mode: C; c-file-style: "k&r"; tab-width 4; indent-tabs-mode: t; -*- */
-
 /*
  * Copyright (C) 2014 Rob Clark <robclark@freedesktop.org>
  *
@@ -31,47 +29,22 @@
 
 #include "util/u_upload_mgr.h"
 
-#include "freedreno_drmif.h"
-
 #include "freedreno_context.h"
 
-#include "ir3_shader.h"
+#include "ir3/ir3_shader.h"
 
 struct fd4_context {
        struct fd_context base;
 
-       /* Keep track of writes to RB_RENDER_CONTROL which need to be patched
-        * once we know whether or not to use GMEM, and GMEM tile pitch.
-        */
-       struct util_dynarray rbrc_patches;
-
        struct fd_bo *vs_pvt_mem, *fs_pvt_mem;
 
        /* This only needs to be 4 * num_of_pipes bytes (ie. 32 bytes).  We
         * could combine it with another allocation.
+        *
+        * (upper area used as scratch bo.. see fd4_query)
         */
        struct fd_bo *vsc_size_mem;
 
-       /* vertex buf used for clear/gmem->mem vertices, and mem->gmem
-        * vertices:
-        */
-       struct pipe_resource *solid_vbuf;
-
-       /* vertex buf used for mem->gmem tex coords:
-        */
-       struct pipe_resource *blit_texcoord_vbuf;
-
-       /* vertex state for solid_vbuf:
-        *    - solid_vbuf / 12 / R32G32B32_FLOAT
-        */
-       struct fd_vertex_state solid_vbuf_state;
-
-       /* vertex state for blit_prog:
-        *    - blit_texcoord_vbuf / 8 / R32G32_FLOAT
-        *    - solid_vbuf / 12 / R32G32B32_FLOAT
-        */
-       struct fd_vertex_state blit_vbuf_state;
-
        struct u_upload_mgr *border_color_uploader;
        struct pipe_resource *border_color_buf;
 
@@ -88,6 +61,9 @@ struct fd4_context {
         */
        uint16_t fsaturate_s, fsaturate_t, fsaturate_r;
 
+       /* bitmask of samplers which need astc srgb workaround: */
+       uint16_t vastc_srgb, fastc_srgb;
+
        /* some state changes require a different shader variant.  Keep
         * track of this so we know when we need to re-emit shader state
         * due to variant change.  See fixup_shader_state()