X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fi915%2Fi915_context.h;h=626a17f5606c78b89e3d1e8e5aebafd4b5d0d250;hb=c7c59f75e59510be890bc77a9257c14ffd5b7b59;hp=dacf50e870d64a4be1be2e1d9bebb132a458b4c0;hpb=288504fac7b659da6bd45f22ccfb39d130250f9c;p=mesa.git diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h index dacf50e870d..626a17f5606 100644 --- a/src/gallium/drivers/i915/i915_context.h +++ b/src/gallium/drivers/i915/i915_context.h @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2003 VMware, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -18,7 +18,7 @@ * 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. @@ -37,7 +37,7 @@ #include "tgsi/tgsi_scan.h" -#include "util/u_slab.h" +#include "util/slab.h" #include "util/u_blitter.h" @@ -50,18 +50,18 @@ struct i915_winsys_batchbuffer; #define I915_DYNAMIC_MODES4 0 #define I915_DYNAMIC_DEPTHSCALE_0 1 /* just the header */ -#define I915_DYNAMIC_DEPTHSCALE_1 2 +#define I915_DYNAMIC_DEPTHSCALE_1 2 #define I915_DYNAMIC_IAB 3 #define I915_DYNAMIC_BC_0 4 /* just the header */ #define I915_DYNAMIC_BC_1 5 -#define I915_DYNAMIC_BFO_0 6 +#define I915_DYNAMIC_BFO_0 6 #define I915_DYNAMIC_BFO_1 7 -#define I915_DYNAMIC_STP_0 8 -#define I915_DYNAMIC_STP_1 9 -#define I915_DYNAMIC_SC_ENA_0 10 -#define I915_DYNAMIC_SC_RECT_0 11 -#define I915_DYNAMIC_SC_RECT_1 12 -#define I915_DYNAMIC_SC_RECT_2 13 +#define I915_DYNAMIC_STP_0 8 +#define I915_DYNAMIC_STP_1 9 +#define I915_DYNAMIC_SC_ENA_0 10 +#define I915_DYNAMIC_SC_RECT_0 11 +#define I915_DYNAMIC_SC_RECT_1 12 +#define I915_DYNAMIC_SC_RECT_2 13 #define I915_MAX_DYNAMIC 14 @@ -78,7 +78,7 @@ struct i915_winsys_batchbuffer; /* These must mach the order of LI0_STATE_* bits, as they will be used * to generate hardware packets: */ -#define I915_CACHE_STATIC 0 +#define I915_CACHE_STATIC 0 #define I915_CACHE_DYNAMIC 1 /* handled specially */ #define I915_CACHE_SAMPLER 2 #define I915_CACHE_MAP 3 @@ -102,6 +102,11 @@ struct i915_fragment_shader struct tgsi_shader_info info; + struct draw_fragment_shader *draw_data; + + uint *decl; + uint decl_len; + uint *program; uint program_len; @@ -124,6 +129,12 @@ struct i915_fragment_shader * Else, the bitmask indicates which components are occupied by immediates. */ ubyte constant_flags[I915_MAX_CONSTANT]; + + /** + * The mapping between generics and hw texture coords. + * We need to share this between the vertex and fragment stages. + **/ + int generic_mapping[I915_TEX_UNITS]; }; @@ -132,7 +143,7 @@ struct i915_cache_context; /* Use to calculate differences between state emitted to hardware and * current driver-calculated state. */ -struct i915_state +struct i915_state { unsigned immediate[I915_MAX_IMMEDIATE]; unsigned dynamic[I915_MAX_DYNAMIC]; @@ -146,7 +157,7 @@ struct i915_state unsigned sampler_enable_nr; /* texture image buffers */ - unsigned texbuffer[I915_TEX_UNITS][2]; + unsigned texbuffer[I915_TEX_UNITS][3]; /** Describes the current hardware vertex layout */ struct vertex_info vertex_info; @@ -159,6 +170,8 @@ struct i915_state unsigned dst_buf_vars; uint32_t draw_offset; uint32_t draw_size; + uint32_t target_fixup_format; + uint32_t fixup_swizzle; unsigned id; /* track lost context events */ }; @@ -178,22 +191,21 @@ struct i915_depth_stencil_state { }; struct i915_rasterizer_state { + struct pipe_rasterizer_state templ; + unsigned light_twoside : 1; unsigned st; - enum interp_mode color_interp; unsigned LIS4; unsigned LIS7; unsigned sc[1]; - struct pipe_rasterizer_state templ; - union { float f; unsigned u; } ds[2]; }; struct i915_sampler_state { + struct pipe_sampler_state templ; unsigned state[3]; - const struct pipe_sampler_state *templ; unsigned minlod; unsigned maxlod; }; @@ -214,12 +226,19 @@ struct i915_context { /* The most recent drawing state as set by the driver: */ const struct i915_blend_state *blend; - const struct i915_sampler_state *sampler[PIPE_MAX_SAMPLERS]; + const struct i915_sampler_state *fragment_sampler[PIPE_MAX_SAMPLERS]; + struct pipe_sampler_state *vertex_samplers[PIPE_MAX_SAMPLERS]; const struct i915_depth_stencil_state *depth_stencil; const struct i915_rasterizer_state *rasterizer; struct i915_fragment_shader *fs; + void *vs; + + struct i915_velems_state *velems; + unsigned nr_vertex_buffers; + struct pipe_vertex_buffer vertex_buffers[PIPE_MAX_ATTRIBS]; + struct pipe_blend_color blend_color; struct pipe_stencil_ref stencil_ref; struct pipe_clip_state clip; @@ -228,13 +247,18 @@ struct i915_context { struct pipe_poly_stipple poly_stipple; struct pipe_scissor_state scissor; struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS]; + struct pipe_sampler_view *vertex_sampler_views[PIPE_MAX_SAMPLERS]; struct pipe_viewport_state viewport; - struct pipe_index_buffer index_buffer; unsigned dirty; + struct pipe_resource *mapped_vs_tex[PIPE_MAX_SAMPLERS]; + struct i915_winsys_buffer* mapped_vs_tex_buffer[PIPE_MAX_SAMPLERS]; + unsigned num_samplers; unsigned num_fragment_sampler_views; + unsigned num_vertex_samplers; + unsigned num_vertex_sampler_views; struct i915_winsys_batchbuffer *batch; @@ -253,27 +277,16 @@ struct i915_context { struct i915_winsys_buffer *validation_buffers[2 + 1 + I915_TEX_UNITS]; int num_validation_buffers; - struct util_slab_mempool transfer_pool; + struct slab_mempool transfer_pool; + struct slab_mempool texture_transfer_pool; + + /* state for tracking flushes */ + int last_fired_vertices; + int fired_vertices; + int queued_vertices; /** blitter/hw-clear */ struct blitter_context* blitter; - - /** State tracking needed by u_blitter for save/restore. */ - void *saved_fs; - void (*saved_bind_fs_state)(struct pipe_context *pipe, void *shader); - void *saved_vs; - struct pipe_clip_state saved_clip; - struct i915_velems_state *saved_velems; - unsigned saved_nr_vertex_buffers; - struct pipe_vertex_buffer saved_vertex_buffers[PIPE_MAX_ATTRIBS]; - unsigned saved_nr_samplers; - void *saved_samplers[PIPE_MAX_SAMPLERS]; - void (*saved_bind_sampler_states)(struct pipe_context *pipe, - unsigned num, void **sampler); - unsigned saved_nr_sampler_views; - struct pipe_sampler_view *saved_sampler_views[PIPE_MAX_SAMPLERS]; - void (*saved_set_sampler_views)(struct pipe_context *pipe, - unsigned num, struct pipe_sampler_view **views); }; /* A flag for each state_tracker state object: @@ -324,7 +337,7 @@ struct i915_context { #define I915_DST_VARS 4 #define I915_DST_RECT 8 -static INLINE +static inline void i915_set_flush_dirty(struct i915_context *i915, unsigned flush) { i915->hardware_dirty |= I915_HW_FLUSH; @@ -344,6 +357,14 @@ struct draw_stage *i915_draw_render_stage( struct i915_context *i915 ); struct draw_stage *i915_draw_vbuf_stage( struct i915_context *i915 ); +/*********************************************************************** + * i915_state.c: + */ +void i915_prepare_vertex_sampling(struct i915_context *i915); +void i915_cleanup_vertex_sampling(struct i915_context *i915); + + + /*********************************************************************** * i915_state_emit.c: */ @@ -354,11 +375,14 @@ void i915_emit_hardware_state(struct i915_context *i915 ); /*********************************************************************** * i915_clear.c: */ -void i915_clear_blitter(struct pipe_context *pipe, unsigned buffers, const float *rgba, +void i915_clear_blitter(struct pipe_context *pipe, unsigned buffers, + const union pipe_color_union *color, double depth, unsigned stencil); -void i915_clear_render(struct pipe_context *pipe, unsigned buffers, const float *rgba, +void i915_clear_render(struct pipe_context *pipe, unsigned buffers, + const union pipe_color_union *color, double depth, unsigned stencil); -void i915_clear_emit(struct pipe_context *pipe, unsigned buffers, const float *rgba, +void i915_clear_emit(struct pipe_context *pipe, unsigned buffers, + const union pipe_color_union *color, double depth, unsigned stencil, unsigned destx, unsigned desty, unsigned width, unsigned height); @@ -367,7 +391,6 @@ void i915_clear_emit(struct pipe_context *pipe, unsigned buffers, const float *r * */ void i915_init_state_functions( struct i915_context *i915 ); -void i915_init_fixup_state_functions( struct i915_context *i915 ); void i915_init_flush_functions( struct i915_context *i915 ); void i915_init_string_functions( struct i915_context *i915 ); @@ -376,14 +399,14 @@ void i915_init_string_functions( struct i915_context *i915 ); * i915_context.c */ struct pipe_context *i915_create_context(struct pipe_screen *screen, - void *priv); + void *priv, unsigned flags); /*********************************************************************** * Inline conversion functions. These are better-typed than the * macros used previously: */ -static INLINE struct i915_context * +static inline struct i915_context * i915_context( struct pipe_context *pipe ) { return (struct i915_context *)pipe;