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/drivers/i915simple/i915_state.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/drivers/i915simple/i915_state.c')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915simple/i915_state.c b/src/gallium/drivers/i915simple/i915_state.c index 19f194c027..273e74002a 100644 --- a/src/gallium/drivers/i915simple/i915_state.c +++ b/src/gallium/drivers/i915simple/i915_state.c @@ -30,7 +30,7 @@ #include "draw/draw_context.h" -#include "pipe/p_winsys.h" +#include "pipe/internal/p_winsys_screen.h" #include "pipe/p_inlines.h" #include "util/u_math.h" #include "util/u_memory.h" @@ -537,7 +537,7 @@ static void i915_set_constant_buffer(struct pipe_context *pipe, void *mapped; if (buf->buffer && buf->buffer->size && (mapped = ws->buffer_map(ws, buf->buffer, - PIPE_BUFFER_USAGE_CPU_READ))) { + PIPE_BUFFER_USAGE_CPU_READ))) { memcpy(i915->current.constants[shader], mapped, buf->buffer->size); ws->buffer_unmap(ws, buf->buffer); i915->current.num_user_constants[shader] |