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/state_trackers/python | |
| 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/state_trackers/python')
| -rw-r--r-- | src/gallium/state_trackers/python/p_context.i | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/python/p_context.i b/src/gallium/state_trackers/python/p_context.i index 3f36ccb621..5c44462e80 100644 --- a/src/gallium/state_trackers/python/p_context.i +++ b/src/gallium/state_trackers/python/p_context.i @@ -51,7 +51,7 @@ struct st_context { void set_blend( const struct pipe_blend_state *state ) { cso_set_blend($self->cso, state); } - + void set_fragment_sampler( unsigned index, const struct pipe_sampler_state *state ) { cso_single_sampler($self->cso, index, state); cso_single_sampler_done($self->cso); @@ -222,9 +222,9 @@ struct st_context { void set_vertex_elements(unsigned num) { $self->num_vertex_elements = num; - $self->pipe->set_vertex_elements($self->pipe, - $self->num_vertex_elements, - $self->vertex_elements); + cso_set_vertex_elements($self->cso, + $self->num_vertex_elements, + $self->vertex_elements); } /* |