projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
llvmpipe: Silence Coverity incorrect sizeof expression defect.
[mesa.git]
/
src
/
gallium
/
drivers
/
llvmpipe
/
lp_context.h
diff --git
a/src/gallium/drivers/llvmpipe/lp_context.h
b/src/gallium/drivers/llvmpipe/lp_context.h
index db09c95b272c9076675482775d839fefb696192c..f8610ae8f0c3774efb265c03a7ff247f59060c6a 100644
(file)
--- a/
src/gallium/drivers/llvmpipe/lp_context.h
+++ b/
src/gallium/drivers/llvmpipe/lp_context.h
@@
-57,8
+57,8
@@
struct llvmpipe_context {
/** Constant state objects */
const struct pipe_blend_state *blend;
/** Constant state objects */
const struct pipe_blend_state *blend;
-
const struct pipe_sampler_state *sampler
[PIPE_MAX_SAMPLERS];
- struct pipe_sampler_state *vertex_samplers[PIPE_MAX_VERTEX_SAMPLERS];
+
struct pipe_sampler_state *samplers[PIPE_SHADER_TYPES]
[PIPE_MAX_SAMPLERS];
+
const struct pipe_depth_stencil_alpha_state *depth_stencil;
const struct pipe_rasterizer_state *rasterizer;
struct lp_fragment_shader *fs;
const struct pipe_depth_stencil_alpha_state *depth_stencil;
const struct pipe_rasterizer_state *rasterizer;
struct lp_fragment_shader *fs;
@@
-75,8
+75,8
@@
struct llvmpipe_context {
struct pipe_framebuffer_state framebuffer;
struct pipe_poly_stipple poly_stipple;
struct pipe_scissor_state scissor;
struct pipe_framebuffer_state framebuffer;
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_VERTEX_SAMPLERS];
+ struct pipe_sampler_view *
sampler_views[PIPE_SHADER_TYPES]
[PIPE_MAX_SAMPLERS];
+
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
struct pipe_index_buffer index_buffer;
struct pipe_viewport_state viewport;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
struct pipe_index_buffer index_buffer;
@@
-88,10
+88,9
@@
struct llvmpipe_context {
} so_target;
struct pipe_resource *mapped_vs_tex[PIPE_MAX_VERTEX_SAMPLERS];
} so_target;
struct pipe_resource *mapped_vs_tex[PIPE_MAX_VERTEX_SAMPLERS];
- unsigned num_samplers;
- unsigned num_fragment_sampler_views;
- unsigned num_vertex_samplers;
- unsigned num_vertex_sampler_views;
+ unsigned num_samplers[PIPE_SHADER_TYPES];
+ unsigned num_sampler_views[PIPE_SHADER_TYPES];
+
unsigned num_vertex_buffers;
unsigned dirty; /**< Mask of LP_NEW_x flags */
unsigned num_vertex_buffers;
unsigned dirty; /**< Mask of LP_NEW_x flags */
@@
-104,9
+103,18
@@
struct llvmpipe_context {
/** Vertex format */
struct vertex_info vertex_info;
/** Vertex format */
struct vertex_info vertex_info;
+ /** Which vertex shader output slot contains color */
+ int color_slot[2];
+
+ /** Which vertex shader output slot contains bcolor */
+ int bcolor_slot[2];
+
/** Which vertex shader output slot contains point size */
int psize_slot;
/** Which vertex shader output slot contains point size */
int psize_slot;
+ /**< minimum resolvable depth value, for polygon offset */
+ double mrd;
+
/** The tiling engine */
struct lp_setup_context *setup;
struct lp_setup_variant setup_variant;
/** The tiling engine */
struct lp_setup_context *setup;
struct lp_setup_variant setup_variant;
@@
-117,17
+125,37
@@
struct llvmpipe_context {
unsigned tex_timestamp;
boolean no_rast;
unsigned tex_timestamp;
boolean no_rast;
+ /** List of all fragment shader variants */
struct lp_fs_variant_list_item fs_variants_list;
unsigned nr_fs_variants;
struct lp_fs_variant_list_item fs_variants_list;
unsigned nr_fs_variants;
+ unsigned nr_fs_instrs;
struct lp_setup_variant_list_item setup_variants_list;
unsigned nr_setup_variants;
struct lp_setup_variant_list_item setup_variants_list;
unsigned nr_setup_variants;
+
+ /** Conditional query object and mode */
+ struct pipe_query *render_cond_query;
+ uint render_cond_mode;
};
};
+/**
+ * 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;
+
+
struct pipe_context *
llvmpipe_create_context( struct pipe_screen *screen, void *priv );
struct pipe_context *
llvmpipe_create_context( struct pipe_screen *screen, void *priv );
+struct pipe_resource *
+llvmpipe_user_buffer_create(struct pipe_screen *screen,
+ void *ptr,
+ unsigned bytes,
+ unsigned bind_flags);
+
static INLINE struct llvmpipe_context *
llvmpipe_context( struct pipe_context *pipe )
static INLINE struct llvmpipe_context *
llvmpipe_context( struct pipe_context *pipe )