diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-03-13 13:39:05 +1100 |
| commit | 03ec66375889f049b09f39ba98515aa35ac48164 (patch) | |
| tree | e149d8defb52b1252af982b459902ee0800b17cd /src/gallium/include/pipe/p_context.h | |
| parent | bd4fe0e87c1b979973d9a76aa48de5fbbb8d52b7 (diff) | |
| parent | 2366bb1baf2e9ae5b6ecf19f66ae9e0a4b0d2f36 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_context.h')
| -rw-r--r-- | src/gallium/include/pipe/p_context.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/include/pipe/p_context.h b/src/gallium/include/pipe/p_context.h index 1501b52f3e..b64948f0f3 100644 --- a/src/gallium/include/pipe/p_context.h +++ b/src/gallium/include/pipe/p_context.h @@ -100,7 +100,7 @@ struct pipe_context { void * (*create_sampler_state)(struct pipe_context *, const struct pipe_sampler_state *); - void (*bind_sampler_state)(struct pipe_context *, unsigned unit, void *); + void (*bind_sampler_states)(struct pipe_context *, unsigned num, void **); void (*delete_sampler_state)(struct pipe_context *, void *); void * (*create_rasterizer_state)(struct pipe_context *, @@ -148,9 +148,9 @@ struct pipe_context { /* Currently a sampler is constrained to sample from a single texture: */ - void (*set_sampler_texture)( struct pipe_context *, - unsigned sampler, - struct pipe_texture * ); + void (*set_sampler_textures)( struct pipe_context *, + unsigned num, + struct pipe_texture ** ); void (*set_viewport_state)( struct pipe_context *, const struct pipe_viewport_state * ); |