diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-03-09 15:59:40 +0100 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-09 15:59:40 +0100 |
| commit | 685340a53e1dcb2a888e634ee71ba24356befe69 (patch) | |
| tree | d6aa301eb5370eac6fcb3186d26a551c37b3c3a2 /src/gallium/drivers/i915/i915_context.h | |
| parent | e497a58fad878d913a1795b239ddd05870988c58 (diff) | |
| parent | ae7b7bf1edcf6c492b4dcc162bca28a0090f601e (diff) | |
Merge branch 'gallium-vertexelementcso'
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i965/brw_draw_upload.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_context.h
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state_derived.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_clear.c
Diffstat (limited to 'src/gallium/drivers/i915/i915_context.h')
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h index 499a727314..4994537683 100644 --- a/src/gallium/drivers/i915/i915_context.h +++ b/src/gallium/drivers/i915/i915_context.h @@ -148,7 +148,7 @@ struct i915_state /** Describes the current hardware vertex layout */ struct vertex_info vertex_info; - + unsigned id; /* track lost context events */ }; @@ -187,6 +187,11 @@ struct i915_sampler_state { unsigned maxlod; }; +struct i915_velems_state { + unsigned count; + struct pipe_vertex_element velem[PIPE_MAX_ATTRIBS]; +}; + #define I915_MAX_TEXTURE_2D_LEVELS 11 /* max 1024x1024 */ #define I915_MAX_TEXTURE_3D_LEVELS 8 /* max 128x128x128 */ @@ -250,7 +255,6 @@ struct i915_context unsigned num_samplers; unsigned num_textures; - unsigned num_vertex_elements; unsigned num_vertex_buffers; struct intel_batchbuffer *batch; |