#include "r300_defines.h"
#include "r300_screen.h"
#include "compiler/radeon_regalloc.h"
-#include "../../winsys/radeon/drm/radeon_winsys.h"
struct u_upload_mgr;
struct r300_context;
COLORMASK_AAAA,
COLORMASK_GRRG,
COLORMASK_ARRA,
+ COLORMASK_BGRX,
+ COLORMASK_RGBX,
COLORMASK_NUM_SWIZZLES
};
/* Upper bound on number of dwords to emit. */
unsigned size;
/* Whether this atom should be emitted. */
- boolean dirty;
+ bool dirty;
/* Whether this atom may be emitted with state == NULL. */
- boolean allow_null_state;
+ bool allow_null_state;
};
struct r300_aa_state {
struct r300_surface *dest;
uint32_t aa_config;
- uint32_t aaresolve_ctl;
};
struct r300_blend_state {
uint32_t cb_clamp[COLORMASK_NUM_SWIZZLES][8];
uint32_t cb_noclamp[8];
+ uint32_t cb_noclamp_noalpha[8];
uint32_t cb_no_readwrite[8];
};
/* This is actually a command buffer with named dwords. */
uint32_t cb_begin;
- uint32_t alpha_function; /* R300_FG_ALPHA_FUNC: 0x4bd4 */
- uint32_t cb_reg_seq;
uint32_t z_buffer_control; /* R300_ZB_CNTL: 0x4f00 */
uint32_t z_stencil_control; /* R300_ZB_ZSTENCILCNTL: 0x4f04 */
uint32_t stencil_ref_mask; /* R300_ZB_STENCILREFMASK: 0x4f08 */
uint32_t cb_reg1;
uint32_t alpha_value; /* R500_FG_ALPHA_VALUE: 0x4be0 */
- /* The same, but for FP16 alpha test. */
- uint32_t cb_begin_fp16;
- uint32_t alpha_function_fp16; /* R300_FG_ALPHA_FUNC: 0x4bd4 */
- uint32_t cb_reg_seq_fp16;
- uint32_t z_buffer_control_fp16; /* R300_ZB_CNTL: 0x4f00 */
- uint32_t z_stencil_control_fp16; /* R300_ZB_ZSTENCILCNTL: 0x4f04 */
- uint32_t stencil_ref_mask_fp16; /* R300_ZB_STENCILREFMASK: 0x4f08 */
- uint32_t cb_reg_fp16;
- uint32_t stencil_ref_bf_fp16; /* R500_ZB_STENCILREFMASK_BF: 0x4fd4 */
- uint32_t cb_reg1_fp16;
- uint32_t alpha_value_fp16; /* R500_FG_ALPHA_VALUE: 0x4be0 */
-
- /* The second command buffer disables zbuffer reads and writes. */
- uint32_t cb_zb_no_readwrite[10];
- uint32_t cb_fp16_zb_no_readwrite[10];
+ /* Same, but without ZB reads and writes. */
+ uint32_t cb_zb_no_readwrite[8]; /* ZB not bound */
+
+ /* Emitted separately: */
+ uint32_t alpha_function;
/* Whether a two-sided stencil is enabled. */
- boolean two_sided;
+ bool two_sided;
/* Whether a fallback should be used for a two-sided stencil ref value. */
- boolean two_sided_stencil_ref;
+ bool two_sided_stencil_ref;
};
struct r300_hyperz_state {
unsigned cull_mode_index;
/* Whether polygon offset is enabled. */
- boolean polygon_offset_enable;
+ bool polygon_offset_enable;
/* This is emitted in the draw function. */
uint32_t color_control; /* R300_GA_COLOR_CONTROL: 0x4278 */
unsigned width0_override;
unsigned height0_override;
- /* Swizzles in the UTIL_FORMAT_SWIZZLE_* representation,
+ /* Swizzles in the PIPE_SWIZZLE_* representation,
* derived from base. */
unsigned char swizzle[4];
* This is not a subclass of pipe_query because pipe_query is never
* actually fully defined. So, rather than have it as a member, and do
* subclass-style casting, we treat pipe_query as an opaque, and just
- * trust that our state tracker does not ever mess up query objects.
+ * trust that our gallium frontend does not ever mess up query objects.
*/
struct r300_query {
/* The kind of query. Currently only OQ is supported. */
* after end_query and flush. */
unsigned num_results;
/* if begin has been emitted */
- boolean begin_emitted;
+ bool begin_emitted;
/* The buffer where query results are stored. */
struct pb_buffer *buf;
- struct radeon_winsys_cs_handle *cs_buf;
};
struct r300_surface {
/* Winsys buffer backing the texture. */
struct pb_buffer *buf;
- struct radeon_winsys_cs_handle *cs_buf;
enum radeon_bo_domain domain;
uint32_t pitch; /* COLORPITCH or DEPTHPITCH. */
uint32_t pitch_zmask; /* ZMASK_PITCH */
uint32_t pitch_hiz; /* HIZ_PITCH */
+ uint32_t pitch_cmask; /* CMASK_PITCH */
uint32_t format; /* US_OUT_FMT or ZB_FORMAT. */
/* Parameters dedicated to the CBZB clear. */
uint32_t cbzb_format; /* ZB_FORMAT. */
/* Whether the CBZB clear is allowed on the surface. */
- boolean cbzb_allowed;
+ bool cbzb_allowed;
unsigned colormask_swizzle;
};
/* Whether this texture has non-power-of-two dimensions.
* It can be either a regular texture or a rectangle one. */
- boolean is_npot;
+ bool is_npot;
/* This flag says that hardware must use the stride for addressing
* instead of the width. */
- boolean uses_stride_addressing;
+ bool uses_stride_addressing;
/* Whether CBZB fast color clear is allowed on the miplevel. */
- boolean cbzb_allowed[R300_MAX_TEXTURE_LEVELS];
+ bool cbzb_allowed[R300_MAX_TEXTURE_LEVELS];
/* Zbuffer compression info for each miplevel. */
- boolean zcomp8x8[R300_MAX_TEXTURE_LEVELS];
+ bool zcomp8x8[R300_MAX_TEXTURE_LEVELS];
/* If zero, then disable Z compression/HiZ. */
unsigned zmask_dwords[R300_MAX_TEXTURE_LEVELS];
unsigned hiz_dwords[R300_MAX_TEXTURE_LEVELS];
/* Zmask/HiZ strides for each miplevel. */
unsigned zmask_stride_in_pixels[R300_MAX_TEXTURE_LEVELS];
unsigned hiz_stride_in_pixels[R300_MAX_TEXTURE_LEVELS];
+
+ /* CMASK info for AA buffers (no mipmapping). */
+ unsigned cmask_dwords;
+ unsigned cmask_stride_in_pixels;
};
struct r300_resource
{
- struct u_resource b;
+ struct pipe_resource b;
/* Winsys buffer backing this resource. */
struct pb_buffer *buf;
- struct radeon_winsys_cs_handle *cs_buf;
enum radeon_bo_domain domain;
/* Constant buffers and SWTCL vertex and index buffers are in user
/* The interface to the windowing system, etc. */
struct radeon_winsys *rws;
+ /* The submission context. */
+ struct radeon_winsys_ctx *ctx;
/* The command stream. */
- struct radeon_winsys_cs *cs;
+ struct radeon_cmdbuf cs;
/* Screen. */
struct r300_screen *screen;
struct draw_context* draw;
/* Vertex buffer for SW TCL. */
struct pb_buffer *vbo;
- struct radeon_winsys_cs_handle *vbo_cs;
/* Offset and size into the SW TCL VBO. */
size_t draw_vbo_offset;
* performance and stability if not handled with care. */
/* GPU flush. */
struct r300_atom gpu_flush;
+ /* Clears must be emitted immediately after the flush. */
+ /* HiZ clear */
+ struct r300_atom hiz_clear;
+ /* zmask clear */
+ struct r300_atom zmask_clear;
+ /* cmask clear */
+ struct r300_atom cmask_clear;
/* Anti-aliasing (MSAA) state. */
struct r300_atom aa_state;
/* Framebuffer state. */
struct r300_atom blend_color_state;
/* Scissor state. */
struct r300_atom scissor_state;
+ /* Sample mask. */
+ struct r300_atom sample_mask;
/* Invariant state. This must be emitted to get the engine started. */
struct r300_atom invariant_state;
/* Viewport state. */
struct r300_atom texture_cache_inval;
/* Textures state. */
struct r300_atom textures_state;
- /* HiZ clear */
- struct r300_atom hiz_clear;
- /* zmask clear */
- struct r300_atom zmask_clear;
/* Occlusion query. */
struct r300_atom query_start;
/* Flag indicating whether or not the HW is dirty. */
uint32_t dirty_hw;
/* Whether polygon offset is enabled. */
- boolean polygon_offset_enabled;
+ bool polygon_offset_enabled;
/* Z buffer bit depth. */
uint32_t zbuffer_bpp;
/* Whether rendering is conditional and should be skipped. */
- boolean skip_rendering;
+ bool 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 we are drawing points, to disable sprite coord if not */
+ bool is_point;
/* Whether two-sided color selection is enabled (AKA light_twoside). */
- boolean two_sided_color;
+ bool two_sided_color;
+ bool flatshade;
+ bool clip_halfz;
/* Whether fast color clear is enabled. */
- boolean cbzb_clear;
+ bool cbzb_clear;
/* Whether fragment shader needs to be validated. */
enum r300_fs_validity_status fs_status;
/* Framebuffer multi-write. */
- boolean fb_multiwrite;
+ bool fb_multiwrite;
+ unsigned num_samples;
+ bool msaa_enable;
+ bool alpha_to_one;
+ bool alpha_to_coverage;
void *dsa_decompress_zmask;
- struct pipe_index_buffer index_buffer;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
unsigned nr_vertex_buffers;
struct u_upload_mgr *uploader;
- struct util_slab_mempool pool_transfers;
+ struct slab_child_pool pool_transfers;
/* Stat counter. */
uint64_t flush_counter;
int vs_const_base;
/* Vertex array state info */
- boolean vertex_arrays_dirty;
- boolean vertex_arrays_indexed;
+ bool vertex_arrays_dirty;
+ bool vertex_arrays_indexed;
int vertex_arrays_offset;
int vertex_arrays_instance_id;
- boolean instancing_enabled;
+ bool instancing_enabled;
/* Hyper-Z stats. */
- boolean hyperz_enabled; /* Whether it owns Hyper-Z access. */
+ bool 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. */
+ bool zmask_in_use; /* Whether ZMASK is enabled. */
+ bool 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. */
+ bool 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. */
+ /* CMASK state. */
+ bool cmask_access;
+ bool cmask_in_use;
+ uint32_t color_clear_value; /* RGBA8 or RGBA1010102 */
+ uint32_t color_clear_value_ar; /* RGBA16F */
+ uint32_t color_clear_value_gb; /* RGBA16F */
+
/* Compiler state. */
struct rc_regalloc_state fs_regalloc_state; /* Register allocator info for
* fragment shaders. */
+ struct rc_regalloc_state vs_regalloc_state; /* Register allocator info for
+ * vertex shaders. */
};
#define foreach_atom(r300, atom) \
for (atom = r300->first_dirty; atom != r300->last_dirty; atom++)
/* Convenience cast wrappers. */
-static INLINE struct r300_query* r300_query(struct pipe_query* q)
+static inline struct r300_query* r300_query(struct pipe_query* q)
{
return (struct r300_query*)q;
}
-static INLINE struct r300_surface* r300_surface(struct pipe_surface* surf)
+static inline struct r300_surface* r300_surface(struct pipe_surface* surf)
{
return (struct r300_surface*)surf;
}
-static INLINE struct r300_resource* r300_resource(struct pipe_resource* tex)
+static inline struct r300_resource* r300_resource(struct pipe_resource* tex)
{
return (struct r300_resource*)tex;
}
-static INLINE struct r300_context* r300_context(struct pipe_context* context)
+static inline struct r300_context* r300_context(struct pipe_context* context)
{
return (struct r300_context*)context;
}
-static INLINE struct r300_fragment_shader *r300_fs(struct r300_context *r300)
+static inline struct r300_fragment_shader *r300_fs(struct r300_context *r300)
{
return (struct r300_fragment_shader*)r300->fs.state;
}
-static INLINE void r300_mark_atom_dirty(struct r300_context *r300,
+static inline struct r300_vertex_shader *r300_vs(struct r300_context *r300)
+{
+ return (struct r300_vertex_shader*)r300->vs_state.state;
+}
+
+static inline void r300_mark_atom_dirty(struct r300_context *r300,
struct r300_atom *atom)
{
- atom->dirty = TRUE;
+ atom->dirty = true;
if (!r300->first_dirty) {
r300->first_dirty = atom;
}
}
+static inline struct pipe_surface *
+r300_get_nonnull_cb(struct pipe_framebuffer_state *fb, unsigned i)
+{
+ if (fb->cbufs[i])
+ return fb->cbufs[i];
+
+ /* The i-th framebuffer is NULL, return any non-NULL one. */
+ for (i = 0; i < fb->nr_cbufs; i++)
+ if (fb->cbufs[i])
+ return fb->cbufs[i];
+
+ return NULL;
+}
+
struct pipe_context* r300_create_context(struct pipe_screen* screen,
- void *priv);
+ void *priv, unsigned flags);
/* Context initialization. */
struct draw_stage* r300_draw_stage(struct r300_context* r300);
/* r300_render_translate.c */
void r300_translate_index_buffer(struct r300_context *r300,
- struct pipe_index_buffer *ib,
+ const struct pipe_draw_info *info,
struct pipe_resource **out_index_buffer,
unsigned *index_size, unsigned index_offset,
unsigned *start, unsigned count);
/* r300_render.c */
void r500_emit_index_bias(struct r300_context *r300, int index_bias);
void r300_blitter_draw_rectangle(struct blitter_context *blitter,
+ void *vertex_elements_cso,
+ blitter_get_vs_func get_vs,
int x1, int y1, int x2, int y2,
- float depth,
+ float depth, unsigned num_instances,
enum blitter_attrib_type type,
- const union pipe_color_union *attrib);
+ const union blitter_attrib *attrib);
/* r300_state.c */
enum r300_fb_state_change {
R300_CHANGED_FB_STATE = 0,
R300_CHANGED_HYPERZ_FLAG,
- R300_CHANGED_MULTIWRITE
+ R300_CHANGED_MULTIWRITE,
+ R300_CHANGED_CMASK_ENABLE,
};
void r300_mark_fb_state_dirty(struct r300_context *r300,
void r500_dump_rs_block(struct r300_rs_block *rs);
-static INLINE boolean CTX_DBG_ON(struct r300_context * ctx, unsigned flags)
+static inline bool CTX_DBG_ON(struct r300_context * ctx, unsigned flags)
{
return SCREEN_DBG_ON(ctx->screen, flags);
}
-static INLINE void CTX_DBG(struct r300_context * ctx, unsigned flags,
+static inline void CTX_DBG(struct r300_context * ctx, unsigned flags,
const char * fmt, ...)
{
if (CTX_DBG_ON(ctx, flags)) {
projects / platform / upstream / mesa.git / blobdiff