#ifndef SI_PIPE_H
#define SI_PIPE_H
-#include "../radeon/r600_pipe_common.h"
-
-#include "pipe/p_screen.h"
-#include "pipe/p_context.h"
-#include "util/u_format.h"
-#include "util/u_math.h"
-#include "util/u_slab.h"
-#include "si.h"
-#include "sid.h"
-#include "si_public.h"
-#include "si_pm4.h"
-#include "si_resource.h"
#include "si_state.h"
#ifdef PIPE_ARCH_BIG_ENDIAN
-#define R600_BIG_ENDIAN 1
+#define SI_BIG_ENDIAN 1
#else
-#define R600_BIG_ENDIAN 0
+#define SI_BIG_ENDIAN 0
#endif
-#define R600_TRACE_CS 0
-#define R600_TRACE_CS_DWORDS 6
+#define SI_TRACE_CS 0
+#define SI_TRACE_CS_DWORDS 6
#define SI_MAX_DRAW_CS_DWORDS 18
struct si_pipe_compute;
-struct r600_screen {
+struct si_screen {
struct r600_common_screen b;
-#if R600_TRACE_CS
- struct r600_resource *trace_bo;
- uint32_t *trace_ptr;
- unsigned cs_count;
-#endif
};
struct si_pipe_sampler_view {
struct si_pipe_compute *program;
};
-struct r600_textures_info {
+struct si_textures_info {
struct si_sampler_views views;
struct si_pipe_sampler_state *samplers[NUM_TEX_UNITS];
unsigned n_views;
unsigned n_samplers;
};
-#define SI_NUM_ATOMS(rctx) (sizeof((rctx)->atoms)/sizeof((rctx)->atoms.array[0]))
-#define SI_NUM_SHADERS (PIPE_SHADER_FRAGMENT+1)
+struct si_surface {
+ struct pipe_surface base;
+};
+
+#define SI_NUM_ATOMS(sctx) (sizeof((sctx)->atoms)/sizeof((sctx)->atoms.array[0]))
+
+#define SI_SHADER_EXPORT (PIPE_SHADER_GEOMETRY+1)
+#define SI_NUM_SHADERS (SI_SHADER_EXPORT+1)
-struct r600_context {
+struct si_context {
struct r600_common_context b;
struct blitter_context *blitter;
void *custom_dsa_flush_depth_stencil[8];
void *custom_dsa_flush_inplace;
void *custom_blend_resolve;
void *custom_blend_decompress;
- struct r600_screen *screen;
+ struct si_screen *screen;
union {
struct {
/* for saving when using blitter */
struct pipe_stencil_ref stencil_ref;
struct si_pipe_shader_selector *ps_shader;
+ struct si_pipe_shader_selector *gs_shader;
struct si_pipe_shader_selector *vs_shader;
struct si_cs_shader_state cs_shader_state;
- struct pipe_query *current_render_cond;
- unsigned current_render_cond_mode;
- boolean current_render_cond_cond;
- struct pipe_query *saved_render_cond;
- unsigned saved_render_cond_mode;
- boolean saved_render_cond_cond;
/* shader information */
unsigned sprite_coord_enable;
unsigned export_16bpc;
struct si_buffer_resources const_buffers[SI_NUM_SHADERS];
struct si_buffer_resources streamout_buffers;
- struct r600_textures_info samplers[SI_NUM_SHADERS];
+ struct si_textures_info samplers[SI_NUM_SHADERS];
struct r600_resource *border_color_table;
unsigned border_color_offset;
*/
unsigned pm4_dirty_cdwords;
- /* The list of active queries. Only one query of each type can be active. */
- struct list_head active_nontimer_query_list;
- unsigned num_cs_dw_nontimer_queries_suspend;
- /* If queries have been suspended. */
- bool nontimer_queries_suspended;
-
- unsigned backend_mask;
- unsigned max_db; /* for OQ */
- boolean predicate_drawing;
-
/* Vertex and index buffers. */
bool vertex_buffers_dirty;
struct pipe_index_buffer index_buffer;
/* With rasterizer discard, there doesn't have to be a pixel shader.
* In that case, we bind this one: */
void *dummy_pixel_shader;
+ struct si_pm4_state *gs_on;
+ struct si_pm4_state *gs_off;
+ struct si_pm4_state *gs_rings;
struct r600_atom cache_flush;
struct pipe_constant_buffer null_const_buf; /* used for set_constant_buffer(NULL) on CIK */
+ struct pipe_constant_buffer esgs_ring;
+ struct pipe_constant_buffer gsvs_ring;
/* SI state handling */
union si_state queued;
};
/* si_blit.c */
-void si_init_blit_functions(struct r600_context *rctx);
-void si_flush_depth_textures(struct r600_context *rctx,
- struct r600_textures_info *textures);
-void r600_decompress_color_textures(struct r600_context *rctx,
- struct r600_textures_info *textures);
-
-/* si_buffer.c */
-void r600_upload_index_buffer(struct r600_context *rctx,
- struct pipe_index_buffer *ib, unsigned count);
+void si_init_blit_functions(struct si_context *sctx);
+void si_flush_depth_textures(struct si_context *sctx,
+ struct si_textures_info *textures);
+void si_decompress_color_textures(struct si_context *sctx,
+ struct si_textures_info *textures);
+/* si_hw_context.c */
+void si_context_flush(struct si_context *ctx, unsigned flags);
+void si_begin_new_cs(struct si_context *ctx);
+void si_need_cs_space(struct si_context *ctx, unsigned num_dw, boolean count_draw_in);
/* si_pipe.c */
-void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
- unsigned flags);
-const char *r600_get_llvm_processor_name(enum radeon_family family);
-
-/* si_query.c */
-void r600_init_query_functions(struct r600_context *rctx);
-
-/* si_resource.c */
-void r600_init_context_resource_functions(struct r600_context *r600);
+void si_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
+ unsigned flags);
-/* si_translate.c */
-void r600_translate_index_buffer(struct r600_context *r600,
- struct pipe_index_buffer *ib,
- unsigned count);
-
-#if R600_TRACE_CS
-void r600_trace_emit(struct r600_context *rctx);
+#if SI_TRACE_CS
+void si_trace_emit(struct si_context *sctx);
#endif
/* si_compute.c */
-void si_init_compute_functions(struct r600_context *rctx);
+void si_init_compute_functions(struct si_context *sctx);
/* si_uvd.c */
-struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context,
- const struct pipe_video_codec *templ);
+struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context,
+ const struct pipe_video_codec *templ);
-struct pipe_video_buffer *radeonsi_video_buffer_create(struct pipe_context *pipe,
- const struct pipe_video_buffer *tmpl);
+struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
+ const struct pipe_video_buffer *tmpl);
/*
* common helpers
*/
-static INLINE uint32_t S_FIXED(float value, uint32_t frac_bits)
-{
- return value * (1 << frac_bits);
-}
-#define ALIGN_DIVUP(x, y) (((x) + (y) - 1) / (y))
-
-static INLINE unsigned si_map_swizzle(unsigned swizzle)
-{
- switch (swizzle) {
- case UTIL_FORMAT_SWIZZLE_Y:
- return V_008F0C_SQ_SEL_Y;
- case UTIL_FORMAT_SWIZZLE_Z:
- return V_008F0C_SQ_SEL_Z;
- case UTIL_FORMAT_SWIZZLE_W:
- return V_008F0C_SQ_SEL_W;
- case UTIL_FORMAT_SWIZZLE_0:
- return V_008F0C_SQ_SEL_0;
- case UTIL_FORMAT_SWIZZLE_1:
- return V_008F0C_SQ_SEL_1;
- default: /* UTIL_FORMAT_SWIZZLE_X */
- return V_008F0C_SQ_SEL_X;
- }
-}
-
-static inline unsigned r600_tex_aniso_filter(unsigned filter)
-{
- if (filter <= 1) return 0;
- if (filter <= 2) return 1;
- if (filter <= 4) return 2;
- if (filter <= 8) return 3;
- /* else */ return 4;
-}
-/* 12.4 fixed-point */
-static INLINE unsigned r600_pack_float_12p4(float x)
+static INLINE struct r600_resource *
+si_resource_create_custom(struct pipe_screen *screen,
+ unsigned usage, unsigned size)
{
- return x <= 0 ? 0 :
- x >= 4096 ? 0xffff : x * 16;
+ assert(size);
+ return r600_resource(pipe_buffer_create(screen,
+ PIPE_BIND_CUSTOM, usage, size));
}
#endif
projects / mesa.git / blobdiff