i965: Split brw_blorp.c/h into multiple files

This mega-commit pulls most of the i965-specific bits of blorp into the
brw_blorp.c/h files which now contain nothing but i965 wrappers around
"core blorp" calls.  The "core blorp" api is moved into blorp.h and the
internal blorp data structures are moved into blorp_priv.h.  The new file
blorp.c is created to house "core blorp" internals which are pulled from
the old brw_blorp.c

Reviewed-by: Topi Pohjolainen <[email protected]>

1 files changed, 6 insertions, 408 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h
index 72174a05156..1291916e9f0 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.h
+++ b/src/mesa/drivers/dri/i965/brw_blorp.h
@@ -23,58 +23,14 @@
 
 #pragma once
 
-#include <stdint.h>
-
-#include "brw_reg.h"
+#include "blorp.h"
 #include "intel_mipmap_tree.h"
-
-struct brw_context;
-struct brw_wm_prog_key;
+#include "program/prog_instruction.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct brw_blorp_surf
-{
-   const struct isl_surf *surf;
-   drm_intel_bo *bo;
-   uint32_t offset;
-
-   const struct isl_surf *aux_surf;
-   drm_intel_bo *aux_bo;
-   uint32_t aux_offset;
-   enum isl_aux_usage aux_usage;
-
-   union isl_color_value clear_color;
-};
-
-void
-brw_blorp_surf_for_miptree(struct brw_context *brw,
-                           struct brw_blorp_surf *surf,
-                           struct intel_mipmap_tree *mt,
-                           bool is_render_target,
-                           unsigned *level,
-                           struct isl_surf tmp_surfs[2]);
-
-enum isl_format
-brw_blorp_to_isl_format(struct brw_context *brw, mesa_format format,
-                        bool is_render_target);
-
-void
-brw_blorp_blit(struct brw_context *brw,
-               const struct brw_blorp_surf *src_surf,
-               unsigned src_level, unsigned src_layer,
-               enum isl_format src_format, int src_swizzle,
-               const struct brw_blorp_surf *dst_surf,
-               unsigned dst_level, unsigned dst_layer,
-               enum isl_format dst_format,
-               float src_x0, float src_y0,
-               float src_x1, float src_y1,
-               float dst_x0, float dst_y0,
-               float dst_x1, float dst_y1,
-               GLenum filter, bool mirror_x, bool mirror_y);
-
 void
 brw_blorp_blit_miptrees(struct brw_context *brw,
                         struct intel_mipmap_tree *src_mt,
@@ -98,368 +54,10 @@ void
 brw_blorp_resolve_color(struct brw_context *brw,
                         struct intel_mipmap_tree *mt);
 
-/**
- * Binding table indices used by BLORP.
- */
-enum {
-   BRW_BLORP_RENDERBUFFER_BINDING_TABLE_INDEX,
-   BRW_BLORP_TEXTURE_BINDING_TABLE_INDEX,
-   BRW_BLORP_NUM_BINDING_TABLE_ENTRIES
-};
-
-struct brw_blorp_surface_info
-{
-   struct isl_surf surf;
-   drm_intel_bo *bo;
-   uint32_t offset;
-
-   struct isl_surf aux_surf;
-   drm_intel_bo *aux_bo;
-   uint32_t aux_offset;
-   enum isl_aux_usage aux_usage;
-
-   union isl_color_value clear_color;
-
-   struct isl_view view;
-
-   /* Z offset into a 3-D texture or slice of a 2-D array texture. */
-   uint32_t z_offset;
-
-   uint32_t tile_x_sa, tile_y_sa;
-};
-
-void
-brw_blorp_surface_info_init(struct brw_context *brw,
-                            struct brw_blorp_surface_info *info,
-                            const struct brw_blorp_surf *surf,
-                            unsigned int level, unsigned int layer,
-                            enum isl_format format, bool is_render_target);
-
-
-struct brw_blorp_coord_transform
-{
-   float multiplier;
-   float offset;
-};
-
-/**
- * Bounding rectangle telling pixel discard which pixels are not to be
- * touched. This is needed in when surfaces are configured as something else
- * what they really are:
- *
- *    - writing W-tiled stencil as Y-tiled
- *    - writing interleaved multisampled as single sampled.
- *
- * See blorp_nir_discard_if_outside_rect().
- */
-struct brw_blorp_discard_rect
-{
-   uint32_t x0;
-   uint32_t x1;
-   uint32_t y0;
-   uint32_t y1;
-};
-
-/**
- * Grid needed for blended and scaled blits of integer formats, see
- * blorp_nir_manual_blend_bilinear().
- */
-struct brw_blorp_rect_grid
-{
-   float x1;
-   float y1;
-   float pad[2];
-};
-
-struct brw_blorp_wm_inputs
-{
-   struct brw_blorp_discard_rect discard_rect;
-   struct brw_blorp_rect_grid rect_grid;
-   struct brw_blorp_coord_transform coord_transform[2];
-
-   /* Minimum layer setting works for all the textures types but texture_3d
-    * for which the setting has no effect. Use the z-coordinate instead.
-    */
-   uint32_t src_z;
-
-   /* Pad out to an integral number of registers */
-   uint32_t pad[3];
-};
-
-struct brw_blorp_prog_data
-{
-   bool dispatch_8;
-   bool dispatch_16;
-
-   uint8_t first_curbe_grf_0;
-   uint8_t first_curbe_grf_2;
-
-   uint32_t ksp_offset_2;
-
-   /**
-    * True if the WM program should be run in MSDISPMODE_PERSAMPLE with more
-    * than one sample per pixel.
-    */
-   bool persample_msaa_dispatch;
-
-   /**
-    * Mask of which FS inputs are marked flat by the shader source.  This is
-    * needed for setting up 3DSTATE_SF/SBE.
-    */
-   uint32_t flat_inputs;
-   unsigned num_varying_inputs;
-   GLbitfield64 inputs_read;
-};
-
-static inline unsigned
-brw_blorp_get_urb_length(const struct brw_blorp_prog_data *prog_data)
-{
-   if (prog_data == NULL)
-      return 1;
-
-   /* From the BSpec: 3D Pipeline - Strips and Fans - 3DSTATE_SBE
-    *
-    * read_length = ceiling((max_source_attr+1)/2)
-    */
-   return MAX2((prog_data->num_varying_inputs + 1) / 2, 1);
-}
-
-struct brw_blorp_params
-{
-   uint32_t x0;
-   uint32_t y0;
-   uint32_t x1;
-   uint32_t y1;
-   struct brw_blorp_surface_info depth;
-   uint32_t depth_format;
-   struct brw_blorp_surface_info src;
-   struct brw_blorp_surface_info dst;
-   enum gen6_hiz_op hiz_op;
-   union {
-      unsigned fast_clear_op;
-      unsigned resolve_type;
-   };
-   bool color_write_disable[4];
-   struct brw_blorp_wm_inputs wm_inputs;
-   unsigned num_draw_buffers;
-   unsigned num_layers;
-   uint32_t wm_prog_kernel;
-   struct brw_blorp_prog_data *wm_prog_data;
-};
-
-void
-brw_blorp_params_init(struct brw_blorp_params *params);
-
-void
-brw_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params);
-
-void
-gen6_blorp_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt,
-                    unsigned level, unsigned layer, enum gen6_hiz_op op);
-
-void
-gen6_blorp_exec(struct brw_context *brw,
-                const struct brw_blorp_params *params);
-
-void
-gen7_blorp_exec(struct brw_context *brw,
-                const struct brw_blorp_params *params);
-
-void
-gen8_blorp_exec(struct brw_context *brw, const struct brw_blorp_params *params);
-
-struct brw_blorp_blit_prog_key
-{
-   /* Number of samples per pixel that have been configured in the surface
-    * state for texturing from.
-    */
-   unsigned tex_samples;
-
-   /* MSAA layout that has been configured in the surface state for texturing
-    * from.
-    */
-   enum isl_msaa_layout tex_layout;
-
-   enum isl_aux_usage tex_aux_usage;
-
-   /* Actual number of samples per pixel in the source image. */
-   unsigned src_samples;
-
-   /* Actual MSAA layout used by the source image. */
-   enum isl_msaa_layout src_layout;
-
-   /* Number of samples per pixel that have been configured in the render
-    * target.
-    */
-   unsigned rt_samples;
-
-   /* MSAA layout that has been configured in the render target. */
-   enum isl_msaa_layout rt_layout;
-
-   /* Actual number of samples per pixel in the destination image. */
-   unsigned dst_samples;
-
-   /* Actual MSAA layout used by the destination image. */
-   enum isl_msaa_layout dst_layout;
-
-   /* Type of the data to be read from the texture (one of
-    * BRW_REGISTER_TYPE_{UD,D,F}).
-    */
-   enum brw_reg_type texture_data_type;
-
-   /* True if the source image is W tiled.  If true, the surface state for the
-    * source image must be configured as Y tiled, and tex_samples must be 0.
-    */
-   bool src_tiled_w;
-
-   /* True if the destination image is W tiled.  If true, the surface state
-    * for the render target must be configured as Y tiled, and rt_samples must
-    * be 0.
-    */
-   bool dst_tiled_w;
-
-   /* True if all source samples should be blended together to produce each
-    * destination pixel.  If true, src_tiled_w must be false, tex_samples must
-    * equal src_samples, and tex_samples must be nonzero.
-    */
-   bool blend;
-
-   /* True if the rectangle being sent through the rendering pipeline might be
-    * larger than the destination rectangle, so the WM program should kill any
-    * pixels that are outside the destination rectangle.
-    */
-   bool use_kill;
-
-   /**
-    * True if the WM program should be run in MSDISPMODE_PERSAMPLE with more
-    * than one sample per pixel.
-    */
-   bool persample_msaa_dispatch;
-
-   /* True for scaled blitting. */
-   bool blit_scaled;
-
-   /* Scale factors between the pixel grid and the grid of samples. We're
-    * using grid of samples for bilinear filetring in multisample scaled blits.
-    */
-   float x_scale;
-   float y_scale;
-
-   /* True for blits with filter = GL_LINEAR. */
-   bool bilinear_filter;
-};
-
-/**
- * \name BLORP internals
- * \{
- *
- * Used internally by gen6_blorp_exec() and gen7_blorp_exec().
- */
-
-void brw_blorp_init_wm_prog_key(struct brw_wm_prog_key *wm_key);
-
-const unsigned *
-brw_blorp_compile_nir_shader(struct brw_context *brw, struct nir_shader *nir,
-                             const struct brw_wm_prog_key *wm_key,
-                             bool use_repclear,
-                             struct brw_blorp_prog_data *prog_data,
-                             unsigned *program_size);
-
-uint32_t
-brw_blorp_emit_surface_state(struct brw_context *brw,
-                             const struct brw_blorp_surface_info *surface,
-                             uint32_t read_domains, uint32_t write_domain,
-                             bool is_render_target);
-
-void
-gen6_blorp_init(struct brw_context *brw);
-
-void
-gen6_blorp_emit_vertices(struct brw_context *brw,
-                         const struct brw_blorp_params *params);
-
-uint32_t
-gen6_blorp_emit_blend_state(struct brw_context *brw,
-                            const struct brw_blorp_params *params);
-
-uint32_t
-gen6_blorp_emit_cc_state(struct brw_context *brw);
-
-uint32_t
-gen6_blorp_emit_wm_constants(struct brw_context *brw,
-                             const struct brw_blorp_params *params);
-
-void
-gen6_blorp_emit_vs_disable(struct brw_context *brw,
-                           const struct brw_blorp_params *params);
-
-uint32_t
-gen6_blorp_emit_binding_table(struct brw_context *brw,
-                              uint32_t wm_surf_offset_renderbuffer,
-                              uint32_t wm_surf_offset_texture);
-
-uint32_t
-gen6_blorp_emit_depth_stencil_state(struct brw_context *brw,
-                                    const struct brw_blorp_params *params);
-
 void
-gen6_blorp_emit_gs_disable(struct brw_context *brw,
-                           const struct brw_blorp_params *params);
-
-void
-gen6_blorp_emit_clip_disable(struct brw_context *brw);
-
-void
-gen6_blorp_emit_drawing_rectangle(struct brw_context *brw,
-                                  const struct brw_blorp_params *params);
-
-uint32_t
-gen6_blorp_emit_sampler_state(struct brw_context *brw,
-                              unsigned tex_filter, unsigned max_lod,
-                              bool non_normalized_coords);
-void
-gen7_blorp_emit_urb_config(struct brw_context *brw,
-                           const struct brw_blorp_params *params);
-
-void
-gen7_blorp_emit_blend_state_pointer(struct brw_context *brw,
-                                    uint32_t cc_blend_state_offset);
-
-void
-gen7_blorp_emit_cc_state_pointer(struct brw_context *brw,
-                                 uint32_t cc_state_offset);
-
-void
-gen7_blorp_emit_cc_viewport(struct brw_context *brw);
-
-void
-gen7_blorp_emit_te_disable(struct brw_context *brw);
-
-void
-gen7_blorp_emit_binding_table_pointers_ps(struct brw_context *brw,
-                                          uint32_t wm_bind_bo_offset);
-
-void
-gen7_blorp_emit_sampler_state_pointers_ps(struct brw_context *brw,
-                                          uint32_t sampler_offset);
-
-void
-gen7_blorp_emit_clear_params(struct brw_context *brw,
-                             const struct brw_blorp_params *params);
-
-void
-gen7_blorp_emit_constant_ps(struct brw_context *brw,
-                            uint32_t wm_push_const_offset);
-
-void
-gen7_blorp_emit_constant_ps_disable(struct brw_context *brw);
-
-void
-gen7_blorp_emit_primitive(struct brw_context *brw,
-                          const struct brw_blorp_params *params);
-
-/** \} */
+intel_hiz_exec(struct brw_context *brw, struct intel_mipmap_tree *mt,
+	       unsigned int level, unsigned int layer, enum gen6_hiz_op op);
 
 #ifdef __cplusplus
-} /* end extern "C" */
-#endif /* __cplusplus */
+} /* extern "C" */
+#endif