diff options
| author | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2009-12-06 16:44:11 -0500 |
| commit | 447dddb93d8dc2551ef7a9c43004237c7a8dd2dd (patch) | |
| tree | de18c6e4c2b071923345bcc1fa876459c4148a70 /src/gallium/drivers/nv20/nv20_state.c | |
| parent | 9e8ab2e7c1b8ff5279d4247b8690c9bfc57f7e02 (diff) | |
| parent | c574f515f0aa20ccc3841cf61a6124bc5996e7b2 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_shader_build.c
Diffstat (limited to 'src/gallium/drivers/nv20/nv20_state.c')
| -rw-r--r-- | src/gallium/drivers/nv20/nv20_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/nv20/nv20_state.c b/src/gallium/drivers/nv20/nv20_state.c index ed4084980f2..3a82e63423d 100644 --- a/src/gallium/drivers/nv20/nv20_state.c +++ b/src/gallium/drivers/nv20/nv20_state.c @@ -546,9 +546,9 @@ nv20_init_state_functions(struct nv20_context *nv20) nv20->pipe.delete_blend_state = nv20_blend_state_delete; nv20->pipe.create_sampler_state = nv20_sampler_state_create; - nv20->pipe.bind_sampler_states = nv20_sampler_state_bind; + nv20->pipe.bind_fragment_sampler_states = nv20_sampler_state_bind; nv20->pipe.delete_sampler_state = nv20_sampler_state_delete; - nv20->pipe.set_sampler_textures = nv20_set_sampler_texture; + nv20->pipe.set_fragment_sampler_textures = nv20_set_sampler_texture; nv20->pipe.create_rasterizer_state = nv20_rasterizer_state_create; nv20->pipe.bind_rasterizer_state = nv20_rasterizer_state_bind; |