fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i915g: Cleanup the vertex sampler interface a bit.

Browse source
This commit is contained in:
Stéphane Marchesin 2011-10-18 10:26:04 -07:00
parent 2b4ab1435f
commit b1d93d2aa8
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/i915/i915_context.c
View file

@ -80,9 +80,7 @@ i915_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info)
draw_set_mapped_constant_buffer(draw, PIPE_SHADER_VERTEX, 0, NULL, 0);
if (i915->num_vertex_sampler_views > 0)
i915_prepare_vertex_sampling(i915,
i915->num_vertex_sampler_views,
i915->vertex_sampler_views);
i915_prepare_vertex_sampling(i915);
/*
* Do the drawing

4
src/gallium/drivers/i915/i915_context.h
View file

@ -370,9 +370,7 @@ struct draw_stage *i915_draw_vbuf_stage( struct i915_context *i915 );
/***********************************************************************
* i915_state.c:
*/
void i915_prepare_vertex_sampling(struct i915_context *i915,
unsigned num,
struct pipe_sampler_view **views);
void i915_prepare_vertex_sampling(struct i915_context *i915);
void i915_cleanup_vertex_sampling(struct i915_context *i915);

6
src/gallium/drivers/i915/i915_state.c
View file

@ -364,15 +364,15 @@ static void i915_delete_sampler_state(struct pipe_context *pipe,
* Called before drawing VBO to map vertex samplers and hand them to draw
*/
void
i915_prepare_vertex_sampling(struct i915_context *i915,
unsigned num,
struct pipe_sampler_view **views)
i915_prepare_vertex_sampling(struct i915_context *i915)
{
struct i915_winsys *iws = i915->iws;
unsigned i,j;
uint32_t row_stride[PIPE_MAX_TEXTURE_LEVELS];
uint32_t img_stride[PIPE_MAX_TEXTURE_LEVELS];
const void* data[PIPE_MAX_TEXTURE_LEVELS];
unsigned num = i915->num_vertex_sampler_views;
struct pipe_sampler_view **views = i915->vertex_sampler_views;
assert(num <= PIPE_MAX_VERTEX_SAMPLERS);
if (!num)