diff options
| author | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
|---|---|---|
| committer | Stephane Marchesin <marchesin@icps.u-strasbg.fr> | 2009-02-02 02:13:07 +0100 |
| commit | 59edbc70cd1042a884e7d153ba547c2f7f87318d (patch) | |
| tree | c5764fc515f31ab8017d63b476c8ec1178d41d96 /src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c | |
| parent | 4035e0f8989754ee7d31212e69d6461f1bbff008 (diff) | |
| parent | 1c90cdd878e9d10e1f6ac619d5d0c3f5151fcb2b (diff) | |
Merge branch 'gallium-0.2' of git+ssh://marcheu@git.freedesktop.org/git/mesa/mesa into gallium-0.2
Diffstat (limited to 'src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c')
| -rw-r--r-- | src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c index 789042f6f2..d53482f579 100644 --- a/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c +++ b/src/gallium/state_trackers/g3dvl/vl_r16snorm_mc_buf.c @@ -2,7 +2,6 @@ #include "vl_r16snorm_mc_buf.h" #include <assert.h> #include <pipe/p_context.h> -#include <pipe/p_winsys.h> #include <pipe/p_screen.h> #include <pipe/p_state.h> #include <pipe/p_inlines.h> @@ -649,9 +648,9 @@ static int vlFlush pipe->set_framebuffer_state(pipe, &mc->render_target); pipe->set_viewport_state(pipe, &mc->viewport); - vs_consts = pipe->winsys->buffer_map + vs_consts = pipe_buffer_map ( - pipe->winsys, + pipe->screen, mc->vs_const_buf.buffer, PIPE_BUFFER_USAGE_CPU_WRITE | PIPE_BUFFER_USAGE_DISCARD ); |