X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_context.h;h=f32504c530adab3884e7015b567e95340a9b9c2b;hb=62f44f670bb0162e89fd4786af877f8da9ff607c;hp=76ea5ee2517ee1f788a9af2a50b53ad867fc297f;hpb=5650a719f0c69c00954e47bd7a7b3e9433cb551d;p=mesa.git diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 76ea5ee2517..f32504c530a 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -30,11 +30,11 @@ #include "pipe/p_context.h" #include "util/u_inlines.h" #include "util/u_transfer.h" -#include "util/u_vbuf_mgr.h" +#include "util/u_vbuf.h" #include "r300_defines.h" #include "r300_screen.h" -#include "r300_winsys.h" +#include "../../winsys/radeon/drm/radeon_winsys.h" struct u_upload_mgr; struct r300_context; @@ -65,7 +65,10 @@ struct r300_aa_state { }; struct r300_blend_state { - uint32_t cb[8]; + struct pipe_blend_state state; + + uint32_t cb_clamp[8]; + uint32_t cb_noclamp[8]; uint32_t cb_no_readwrite[8]; }; @@ -75,8 +78,6 @@ struct r300_blend_color_state { }; struct r300_clip_state { - struct pipe_clip_state clip; - uint32_t cb[29]; }; @@ -136,7 +137,7 @@ struct r300_gpu_flush { uint32_t cb_flush_clean[6]; }; -#define RS_STATE_MAIN_SIZE 25 +#define RS_STATE_MAIN_SIZE 27 struct r300_rs_state { /* Original rasterizer state. */ @@ -187,11 +188,16 @@ struct r300_texture_format_state { uint32_t format1; /* R300_TX_FORMAT1: 0x44c0 */ uint32_t format2; /* R300_TX_FORMAT2: 0x4500 */ uint32_t tile_config; /* R300_TX_OFFSET (subset thereof) */ + uint32_t us_format0; /* R500_US_FORMAT0_0: 0x4640 (through 15) */ }; struct r300_sampler_view { struct pipe_sampler_view base; + /* For resource_copy_region. */ + unsigned width0_override; + unsigned height0_override; + /* Swizzles in the UTIL_FORMAT_SWIZZLE_* representation, * derived from base. */ unsigned char swizzle[4]; @@ -208,7 +214,7 @@ struct r300_texture_sampler_state { struct r300_texture_format_state format; uint32_t filter0; /* R300_TX_FILTER0: 0x4400 */ uint32_t filter1; /* R300_TX_FILTER1: 0x4440 */ - uint32_t border_color; /* R300_TX_BORDER_COLOR: 0x45c0 */ + uint32_t border_color; /* R300_TX_BORDER_COLOR: 0x45c0 */ }; struct r300_textures_state { @@ -287,26 +293,18 @@ struct r300_query { boolean begin_emitted; /* The buffer where query results are stored. */ - struct r300_winsys_bo *buf; - struct r300_winsys_cs_handle *cs_buf; - /* The size of the buffer. */ - unsigned buffer_size; - /* The domain of the buffer. */ - enum r300_buffer_domain domain; - - /* Linked list members. */ - struct r300_query* prev; - struct r300_query* next; + struct pb_buffer *buf; + struct radeon_winsys_cs_handle *cs_buf; }; struct r300_surface { struct pipe_surface base; /* Winsys buffer backing the texture. */ - struct r300_winsys_bo *buf; - struct r300_winsys_cs_handle *cs_buf; + struct pb_buffer *buf; + struct radeon_winsys_cs_handle *cs_buf; - enum r300_buffer_domain domain; + enum radeon_bo_domain domain; uint32_t offset; /* COLOROFFSET or DEPTHOFFSET. */ uint32_t pitch; /* COLORPITCH or DEPTHPITCH. */ @@ -336,14 +334,13 @@ struct r300_texture_desc { /* Buffer tiling. * Macrotiling is specified per-level because small mipmaps cannot * be macrotiled. */ - enum r300_buffer_tiling microtile; - enum r300_buffer_tiling macrotile[R300_MAX_TEXTURE_LEVELS]; + enum radeon_bo_layout microtile; + enum radeon_bo_layout macrotile[R300_MAX_TEXTURE_LEVELS]; /* Offsets into the buffer. */ unsigned offset_in_bytes[R300_MAX_TEXTURE_LEVELS]; /* Strides for each mip-level. */ - unsigned stride_in_pixels[R300_MAX_TEXTURE_LEVELS]; unsigned stride_in_bytes[R300_MAX_TEXTURE_LEVELS]; /* Size of one zslice or face or 2D image based on the texture target. */ @@ -353,10 +350,6 @@ struct r300_texture_desc { * derived from the texture properties. */ unsigned size_in_bytes; - /* Total size of the buffer backing this texture, in bytes. - * It must be >= size. */ - unsigned buffer_size_in_bytes; - /** * If non-zero, override the natural texture layout with * a custom stride (in bytes). @@ -393,10 +386,9 @@ struct r300_resource struct u_vbuf_resource b; /* Winsys buffer backing this resource. */ - struct r300_winsys_bo *buf; - struct r300_winsys_cs_handle *cs_buf; - enum r300_buffer_domain domain; - unsigned buf_size; + struct pb_buffer *buf; + struct radeon_winsys_cs_handle *cs_buf; + enum radeon_bo_domain domain; /* Constant buffers are in user memory. */ uint8_t *constant_buffer; @@ -404,13 +396,6 @@ struct r300_resource /* Texture description (addressing, layout, special features). */ struct r300_texture_desc tex; - /* Registers carrying texture format data. */ - /* Only format-independent bits should be filled in. */ - struct r300_texture_format_state tx_format; - - /* Where the texture starts in the buffer. */ - unsigned tex_offset; - /* This is the level tiling flags were last time set for. * It's used to prevent redundant tiling-flags changes from happening.*/ unsigned surface_level; @@ -421,7 +406,7 @@ struct r300_vertex_element_state { struct pipe_vertex_element velem[PIPE_MAX_ATTRIBS]; unsigned format_size[PIPE_MAX_ATTRIBS]; - struct u_vbuf_mgr_elements *vmgr_elements; + struct u_vbuf_elements *vmgr_elements; /* The size of the vertex, in dwords. */ unsigned vertex_size_dwords; @@ -444,14 +429,21 @@ enum r300_hiz_func { HIZ_FUNC_MIN, }; +/* For deferred fragment shader state validation. */ +enum r300_fs_validity_status { + FRAGMENT_SHADER_VALID, /* No need to change/validate the FS. */ + FRAGMENT_SHADER_MAYBE_DIRTY,/* Validate the FS if external state was changed. */ + FRAGMENT_SHADER_DIRTY /* Always validate the FS (if the FS was changed) */ +}; + struct r300_context { /* Parent class */ struct pipe_context context; /* The interface to the windowing system, etc. */ - struct r300_winsys_screen *rws; + struct radeon_winsys *rws; /* The command stream. */ - struct r300_winsys_cs *cs; + struct radeon_winsys_cs *cs; /* Screen. */ struct r300_screen *screen; @@ -554,8 +546,6 @@ struct r300_context { /* Vertex elements for Gallium. */ struct r300_vertex_element_state *velems; - struct pipe_index_buffer index_buffer; - /* Vertex info for Draw. */ struct vertex_info vertex_info; @@ -573,30 +563,22 @@ struct r300_context { uint32_t zbuffer_bpp; /* Whether rendering is conditional and should be skipped. */ boolean skip_rendering; + /* The flag above saved by blitter. */ + unsigned char blitter_saved_skip_rendering; /* Point sprites texcoord index, 1 bit per texcoord */ int sprite_coord_enable; /* Whether two-sided color selection is enabled (AKA light_twoside). */ boolean two_sided_color; /* Whether fast color clear is enabled. */ boolean cbzb_clear; - /* Whether ZMASK is enabled. */ - boolean zmask_in_use; - /* Whether ZMASK is being decompressed. */ - boolean zmask_decompress; - /* Whether ZMASK/HIZ is locked, i.e. should be disabled and cannot be taken over. */ - boolean hyperz_locked; - /* The zbuffer the ZMASK of which is locked. */ - struct pipe_surface *locked_zbuffer; - /* Whether HIZ is enabled. */ - boolean hiz_in_use; - /* HiZ function. Can be either MIN or MAX. */ - enum r300_hiz_func hiz_func; - /* HiZ clear value. */ - uint32_t hiz_clear_value; + /* Whether fragment shader needs to be validated. */ + enum r300_fs_validity_status fs_status; + /* Framebuffer multi-write. */ + boolean fb_multiwrite; void *dsa_decompress_zmask; - struct u_vbuf_mgr *vbuf_mgr; + struct u_vbuf *vbuf_mgr; struct util_slab_mempool pool_transfers; @@ -612,6 +594,21 @@ struct r300_context { int vertex_arrays_offset; int vertex_arrays_instance_id; boolean instancing_enabled; + + /* Hyper-Z stats. */ + boolean hyperz_enabled; /* Whether it owns Hyper-Z access. */ + int64_t hyperz_time_of_last_flush; /* Time of the last flush with Z clear. */ + unsigned num_z_clears; /* Since the last flush. */ + + /* ZMask state. */ + boolean zmask_in_use; /* Whether ZMASK is enabled. */ + boolean zmask_decompress; /* Whether ZMASK is being decompressed. */ + struct pipe_surface *locked_zbuffer; /* Unbound zbuffer which still has data in ZMASK. */ + + /* HiZ state. */ + boolean hiz_in_use; /* Whether HIZ is enabled. */ + enum r300_hiz_func hiz_func; /* HiZ function. Can be either MIN or MAX. */ + uint32_t hiz_clear_value; /* HiZ clear value. */ }; #define foreach_atom(r300, atom) \ @@ -678,6 +675,7 @@ void r300_init_resource_functions(struct r300_context* r300); void r300_decompress_zmask(struct r300_context *r300); void r300_decompress_zmask_locked_unsafe(struct r300_context *r300); void r300_decompress_zmask_locked(struct r300_context *r300); +bool r300_is_blit_supported(enum pipe_format format); /* r300_flush.c */ void r300_flush(struct pipe_context *pipe, @@ -716,6 +714,13 @@ void r300_mark_fb_state_dirty(struct r300_context *r300, enum r300_fb_state_change change); void r300_mark_fs_code_dirty(struct r300_context *r300); +struct pipe_sampler_view * +r300_create_sampler_view_custom(struct pipe_context *pipe, + struct pipe_resource *texture, + const struct pipe_sampler_view *templ, + unsigned width0_override, + unsigned height0_override); + /* r300_state_derived.c */ void r300_update_derived_state(struct r300_context* r300);