projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeonsi: clean up passing the is_monolithic flag for compilation
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_context.h
diff --git
a/src/gallium/drivers/softpipe/sp_context.h
b/src/gallium/drivers/softpipe/sp_context.h
index 188cdeaf76f6e6bcf184137e7d07bf4f85b582e9..7c42403009ce550f82064204196edfdbf5f1a77d 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_context.h
+++ b/
src/gallium/drivers/softpipe/sp_context.h
@@
-71,6
+71,7
@@
struct softpipe_context {
struct sp_geometry_shader *gs;
struct sp_velems_state *velems;
struct sp_so_state *so;
struct sp_geometry_shader *gs;
struct sp_velems_state *velems;
struct sp_so_state *so;
+ struct sp_compute_shader *cs;
/** Other rendering state */
struct pipe_blend_color blend_color;
/** Other rendering state */
struct pipe_blend_color blend_color;
@@
-83,9
+84,10
@@
struct softpipe_context {
struct pipe_scissor_state scissors[PIPE_MAX_VIEWPORTS];
struct pipe_sampler_view *sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
struct pipe_scissor_state scissors[PIPE_MAX_VIEWPORTS];
struct pipe_sampler_view *sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
+ struct pipe_image_view images[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_IMAGES];
+ struct pipe_shader_buffer buffers[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_BUFFERS];
struct pipe_viewport_state viewports[PIPE_MAX_VIEWPORTS];
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
struct pipe_viewport_state viewports[PIPE_MAX_VIEWPORTS];
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
- struct pipe_index_buffer index_buffer;
struct pipe_resource *mapped_vs_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS];
struct pipe_resource *mapped_gs_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS];
struct pipe_resource *mapped_vs_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS];
struct pipe_resource *mapped_gs_tex[PIPE_MAX_SHADER_SAMPLER_VIEWS];
@@
-119,16
+121,16
@@
struct softpipe_context {
/** Vertex format */
struct sp_setup_info setup_info;
/** Vertex format */
struct sp_setup_info setup_info;
- struct vertex_info vertex_info
_vbuf
;
+ struct vertex_info vertex_info;
/** Which vertex shader output slot contains point size */
/** Which vertex shader output slot contains point size */
- int psize_slot;
+ int
8_t
psize_slot;
/** Which vertex shader output slot contains viewport index */
/** Which vertex shader output slot contains viewport index */
- int viewport_index_slot;
+ int
8_t
viewport_index_slot;
/** Which vertex shader output slot contains layer */
/** Which vertex shader output slot contains layer */
- int layer_slot;
+ int
8_t
layer_slot;
/** The reduced version of the primitive supplied by the state tracker */
unsigned reduced_api_prim;
/** The reduced version of the primitive supplied by the state tracker */
unsigned reduced_api_prim;
@@
-146,11
+148,9
@@
struct softpipe_context {
/** Derived from scissor and surface bounds: */
struct pipe_scissor_state cliprect[PIPE_MAX_VIEWPORTS];
/** Derived from scissor and surface bounds: */
struct pipe_scissor_state cliprect[PIPE_MAX_VIEWPORTS];
- unsigned line_stipple_counter;
-
/** Conditional query object and mode */
struct pipe_query *render_cond_query;
/** Conditional query object and mode */
struct pipe_query *render_cond_query;
-
uint
render_cond_mode;
+
enum pipe_render_cond_flag
render_cond_mode;
boolean render_cond_cond;
/** Polygon stipple items */
boolean render_cond_cond;
/** Polygon stipple items */
@@
-172,9
+172,13
@@
struct softpipe_context {
/** TGSI exec things */
struct {
struct sp_tgsi_sampler *sampler[PIPE_SHADER_TYPES];
/** TGSI exec things */
struct {
struct sp_tgsi_sampler *sampler[PIPE_SHADER_TYPES];
+ struct sp_tgsi_image *image[PIPE_SHADER_TYPES];
+ struct sp_tgsi_buffer *buffer[PIPE_SHADER_TYPES];
} tgsi;
struct tgsi_exec_machine *fs_machine;
} tgsi;
struct tgsi_exec_machine *fs_machine;
+ /** whether early depth testing is enabled */
+ bool early_depth;
/** The primitive drawing context */
struct draw_context *draw;
/** The primitive drawing context */
struct draw_context *draw;
@@
-199,10
+203,11
@@
struct softpipe_context {
* XXX wouldn't it make more sense for the tile cache to just be part
* of sp_sampler_view?
*/
* XXX wouldn't it make more sense for the tile cache to just be part
* of sp_sampler_view?
*/
- struct softpipe_tex_tile_cache *tex_cache[PIPE_SHADER_
GEOMETRY+1
][PIPE_MAX_SHADER_SAMPLER_VIEWS];
+ struct softpipe_tex_tile_cache *tex_cache[PIPE_SHADER_
TYPES
][PIPE_MAX_SHADER_SAMPLER_VIEWS];
unsigned dump_fs : 1;
unsigned dump_gs : 1;
unsigned dump_fs : 1;
unsigned dump_gs : 1;
+ unsigned dump_cs : 1;
unsigned no_rast : 1;
};
unsigned no_rast : 1;
};