X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fi965%2Fbrw_blorp.h;h=ff68000a2941aec96712dc1ebf34dba9d1f719b1;hb=8776b1b14b229d110f283f5da8c3c36261068ede;hp=08082060b7d41ab7b36e1658fd960f87aab2951e;hpb=5e5d4e021f7dde12fb0f4dfaf40fbbd4d119f4ab;p=mesa.git diff --git a/src/mesa/drivers/dri/i965/brw_blorp.h b/src/mesa/drivers/dri/i965/brw_blorp.h index 08082060b7d..ff68000a294 100644 --- a/src/mesa/drivers/dri/i965/brw_blorp.h +++ b/src/mesa/drivers/dri/i965/brw_blorp.h @@ -26,6 +26,7 @@ #include #include "brw_context.h" +#include "brw_reg.h" #include "intel_mipmap_tree.h" struct brw_context; @@ -35,20 +36,18 @@ extern "C" { #endif void -brw_blorp_blit_miptrees(struct intel_context *intel, +brw_blorp_blit_miptrees(struct brw_context *brw, struct intel_mipmap_tree *src_mt, unsigned src_level, unsigned src_layer, + mesa_format src_format, struct intel_mipmap_tree *dst_mt, unsigned dst_level, unsigned dst_layer, + mesa_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, - bool mirror_x, bool mirror_y); - -bool -brw_blorp_clear_color(struct intel_context *intel, struct gl_framebuffer *fb, - bool partial_clear); + GLenum filter, bool mirror_x, bool mirror_y); #ifdef __cplusplus } /* end extern "C" */ @@ -81,6 +80,11 @@ public: /** * The 2D layer within the miplevel. Combined, level and layer define the * 2D miptree slice to use. + * + * Note: if mt is a 2D multisample array texture on Gen7+ using + * INTEL_MSAA_LAYOUT_UMS or INTEL_MSAA_LAYOUT_CMS, layer is the physical + * layer holding sample 0. So, for example, if mt->num_samples == 4, then + * logical layer n corresponds to layer == 4*n. */ uint32_t layer; @@ -118,17 +122,18 @@ public: void set(struct brw_context *brw, struct intel_mipmap_tree *mt, - unsigned int level, unsigned int layer); + unsigned int level, unsigned int layer, + mesa_format format, bool is_render_target); uint32_t compute_tile_offsets(uint32_t *tile_x, uint32_t *tile_y) const; /* Setting this flag indicates that the buffer's contents are W-tiled * stencil data, but the surface state should be set up for Y tiled - * MESA_FORMAT_R8 data (this is necessary because surface states don't + * MESA_FORMAT_R_UNORM8 data (this is necessary because surface states don't * support W tiling). * * Since W tiles are 64 pixels wide by 64 pixels high, whereas Y tiles of - * MESA_FORMAT_R8 data are 128 pixels wide by 32 pixels high, the width and + * MESA_FORMAT_R_UNORM8 data are 128 pixels wide by 32 pixels high, the width and * pitch stored in the surface state will be multiplied by 2, and the * height will be halved. Also, since W and Y tiles store their data in a * different order, the width and height will be rounded up to a multiple @@ -139,10 +144,14 @@ public: unsigned num_samples; - /* Setting this flag indicates that the surface should be set up in - * ARYSPC_LOD0 mode. Ignored prior to Gen7. + /** + * Indicates if we use the standard miptree layout (ALL_LOD_IN_EACH_SLICE), + * or if we tightly pack array slices at each LOD (ALL_SLICES_AT_EACH_LOD). + * + * If ALL_SLICES_AT_EACH_LOD is set, then ARYSPC_LOD0 can be used. Ignored + * prior to Gen7. */ - bool array_spacing_lod0; + enum miptree_array_layout array_layout; /** * Format that should be used when setting up the surface state for this @@ -174,8 +183,13 @@ struct brw_blorp_wm_push_constants uint32_t dst_x1; uint32_t dst_y0; uint32_t dst_y1; + /* Top right coordinates of the rectangular grid used for scaled blitting */ + float rect_grid_x1; + float rect_grid_y1; brw_blorp_coord_transform_params x_transform; brw_blorp_coord_transform_params y_transform; + /* Pad out to an integral number of registers */ + uint32_t pad[6]; }; /* Every 32 bytes of push constant data constitutes one GEN register. */ @@ -197,6 +211,7 @@ struct brw_blorp_prog_data enum gen7_fast_clear_op { GEN7_FAST_CLEAR_OP_NONE, GEN7_FAST_CLEAR_OP_FAST_CLEAR, + GEN7_FAST_CLEAR_OP_RESOLVE, }; @@ -218,7 +233,6 @@ public: brw_blorp_surface_info dst; enum gen6_hiz_op hiz_op; enum gen7_fast_clear_op fast_clear_op; - unsigned num_samples; bool use_wm_prog; brw_blorp_wm_push_constants wm_push_consts; bool color_write_disable[4]; @@ -226,7 +240,7 @@ public: void -brw_blorp_exec(struct intel_context *intel, const brw_blorp_params *params); +brw_blorp_exec(struct brw_context *brw, const brw_blorp_params *params); /** @@ -284,7 +298,7 @@ struct brw_blorp_blit_prog_key /* Type of the data to be read from the texture (one of * BRW_REGISTER_TYPE_{UD,D,F}). */ - unsigned texture_data_type; + 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. @@ -314,6 +328,18 @@ struct brw_blorp_blit_prog_key * 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; }; class brw_blorp_blit_params : public brw_blorp_params @@ -322,13 +348,15 @@ public: brw_blorp_blit_params(struct brw_context *brw, struct intel_mipmap_tree *src_mt, unsigned src_level, unsigned src_layer, + mesa_format src_format, struct intel_mipmap_tree *dst_mt, unsigned dst_level, unsigned dst_layer, + mesa_format dst_format, GLfloat src_x0, GLfloat src_y0, GLfloat src_x1, GLfloat src_y1, GLfloat dst_x0, GLfloat dst_y0, GLfloat dst_x1, GLfloat dst_y1, - bool mirror_x, bool mirror_y); + GLenum filter, bool mirror_x, bool mirror_y); virtual uint32_t get_wm_prog(struct brw_context *brw, brw_blorp_prog_data **prog_data) const; @@ -347,10 +375,6 @@ private: void gen6_blorp_init(struct brw_context *brw); -void -gen6_blorp_emit_batch_head(struct brw_context *brw, - const brw_blorp_params *params); - void gen6_blorp_emit_state_base_address(struct brw_context *brw, const brw_blorp_params *params); @@ -396,6 +420,10 @@ gen6_blorp_emit_clip_disable(struct brw_context *brw, void gen6_blorp_emit_drawing_rectangle(struct brw_context *brw, const brw_blorp_params *params); + +uint32_t +gen6_blorp_emit_sampler_state(struct brw_context *brw, + const brw_blorp_params *params); /** \} */ #endif /* __cplusplus */