X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fllvmpipe%2Flp_context.h;h=1fd0d0a2dea2331f63e84e88bf3e885ea0497c52;hb=fca2d3ce3fd87e2b5744e1f1d7c0c95814ed86b3;hp=b11a3d838e317003a102c752a363525196a7f70c;hpb=3427466e6dbbb8db7c1ecda6b3859ca1cc5827a3;p=mesa.git diff --git a/src/gallium/drivers/llvmpipe/lp_context.h b/src/gallium/drivers/llvmpipe/lp_context.h index b11a3d838e3..1fd0d0a2dea 100644 --- a/src/gallium/drivers/llvmpipe/lp_context.h +++ b/src/gallium/drivers/llvmpipe/lp_context.h @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,14 +18,14 @@ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR + * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS BE LIABLE FOR * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * **************************************************************************/ -/* Authors: Keith Whitwell +/* Authors: Keith Whitwell */ #ifndef LP_CONTEXT_H @@ -40,14 +40,16 @@ #include "lp_jit.h" #include "lp_setup.h" #include "lp_state_fs.h" +#include "lp_state_cs.h" #include "lp_state_setup.h" struct llvmpipe_vbuf_render; struct draw_context; struct draw_stage; +struct draw_vertex_shader; struct lp_fragment_shader; -struct lp_vertex_shader; +struct lp_compute_shader; struct lp_blend_state; struct lp_setup_context; struct lp_setup_variant; @@ -63,40 +65,46 @@ struct llvmpipe_context { const struct pipe_depth_stencil_alpha_state *depth_stencil; const struct pipe_rasterizer_state *rasterizer; struct lp_fragment_shader *fs; - const struct lp_vertex_shader *vs; + struct draw_vertex_shader *vs; const struct lp_geometry_shader *gs; + struct lp_compute_shader *cs; const struct lp_velems_state *velems; const struct lp_so_state *so; /** Other rendering state */ + unsigned sample_mask; struct pipe_blend_color blend_color; struct pipe_stencil_ref stencil_ref; struct pipe_clip_state clip; struct pipe_constant_buffer constants[PIPE_SHADER_TYPES][LP_MAX_TGSI_CONST_BUFFERS]; struct pipe_framebuffer_state framebuffer; struct pipe_poly_stipple poly_stipple; - struct pipe_scissor_state scissor; - struct pipe_sampler_view *sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS]; + struct pipe_scissor_state scissors[PIPE_MAX_VIEWPORTS]; + struct pipe_sampler_view *sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS]; - struct pipe_viewport_state viewport; + 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_SAMPLERS]; + + struct pipe_shader_buffer ssbos[PIPE_SHADER_TYPES][LP_MAX_TGSI_SHADER_BUFFERS]; + struct pipe_image_view images[PIPE_SHADER_TYPES][LP_MAX_TGSI_SHADER_IMAGES]; unsigned num_samplers[PIPE_SHADER_TYPES]; unsigned num_sampler_views[PIPE_SHADER_TYPES]; + unsigned num_images[PIPE_SHADER_TYPES]; unsigned num_vertex_buffers; struct draw_so_target *so_targets[PIPE_MAX_SO_BUFFERS]; int num_so_targets; struct pipe_query_data_so_statistics so_stats; - unsigned num_primitives_generated; - unsigned dirty; /**< Mask of LP_NEW_x flags */ + struct pipe_query_data_pipeline_statistics pipeline_statistics; + unsigned active_statistics_queries; - unsigned active_occlusion_query; + unsigned active_occlusion_queries; + unsigned dirty; /**< Mask of LP_NEW_x flags */ + unsigned cs_dirty; /**< Mask of LP_CSNEW_x flags */ /** Mapped vertex buffers */ ubyte *mapped_vbuffer[PIPE_MAX_ATTRIBS]; @@ -104,17 +112,27 @@ struct llvmpipe_context { struct vertex_info vertex_info; /** Which vertex shader output slot contains color */ - int color_slot[2]; + int8_t color_slot[2]; /** Which vertex shader output slot contains bcolor */ - int bcolor_slot[2]; + int8_t bcolor_slot[2]; /** Which vertex shader output slot contains point size */ - int psize_slot; + int8_t psize_slot; + + /** Which vertex shader output slot contains viewport index */ + int8_t viewport_index_slot; + + /** Which geometry shader output slot contains layer */ + int8_t layer_slot; + + /** A fake frontface output for unfilled primitives */ + int8_t face_slot; + + /** Depth format and bias settings. */ + boolean floating_point_depth; + double mrd; /**< minimum resolvable depth value, for polygon offset */ - /**< minimum resolvable depth value, for polygon offset */ - double mrd; - /** The tiling engine */ struct lp_setup_context *setup; struct lp_setup_variant setup_variant; @@ -125,7 +143,6 @@ struct llvmpipe_context { struct blitter_context *blitter; unsigned tex_timestamp; - boolean no_rast; /** List of all fragment shader variants */ struct lp_fs_variant_list_item fs_variants_list; @@ -135,31 +152,34 @@ struct llvmpipe_context { struct lp_setup_variant_list_item setup_variants_list; unsigned nr_setup_variants; + /** List of all compute shader variants */ + struct lp_cs_variant_list_item cs_variants_list; + unsigned nr_cs_variants; + unsigned nr_cs_instrs; + struct lp_cs_context *csctx; + /** 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; - -/** - * Fragment and setup variant count, used to trigger garbage collection. - * This is global since all variants in all contexts will be free when - * we do garbage collection. - */ -extern unsigned llvmpipe_variant_count; + /** The LLVMContext to use for LLVM related work */ + LLVMContextRef context; +}; struct pipe_context * -llvmpipe_create_context( struct pipe_screen *screen, void *priv ); +llvmpipe_create_context(struct pipe_screen *screen, void *priv, + unsigned flags); struct pipe_resource * llvmpipe_user_buffer_create(struct pipe_screen *screen, void *ptr, unsigned bytes, - unsigned bind_flags); + unsigned bind_flags); -static INLINE struct llvmpipe_context * +static inline struct llvmpipe_context * llvmpipe_context( struct pipe_context *pipe ) { return (struct llvmpipe_context *)pipe;