diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
commit | fe9f4f49ef1c86938f75ab598d63d9ddce850f32 (patch) | |
tree | 530c340a5ac1aa43aacdfea49f4bb1b3ffe1bce9 /src/mesa/pipe/i915simple/i915_texture.c | |
parent | 18fe9776b4977af092582630b181893b2bc6de40 (diff) | |
parent | 0a79c65073db7dbeb9a83e40a4516edcb4f25ee5 (diff) |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/drivers/dri/Makefile.template
Diffstat (limited to 'src/mesa/pipe/i915simple/i915_texture.c')
-rw-r--r-- | src/mesa/pipe/i915simple/i915_texture.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/pipe/i915simple/i915_texture.c b/src/mesa/pipe/i915simple/i915_texture.c index 59e8db8a95..fefd105adf 100644 --- a/src/mesa/pipe/i915simple/i915_texture.c +++ b/src/mesa/pipe/i915simple/i915_texture.c @@ -495,9 +495,7 @@ i915_texture_create(struct pipe_context *pipe, struct pipe_texture **pt) if (i915->flags.is_i945 ? i945_miptree_layout(pipe, tex) : i915_miptree_layout(pipe, tex)) { - tex->buffer = pipe->winsys->buffer_create(pipe->winsys, - PIPE_SURFACE_FLAG_TEXTURE, - 0, 0); + tex->buffer = pipe->winsys->buffer_create(pipe->winsys, 64, 0, 0); if (tex->buffer) pipe->winsys->buffer_data(pipe->winsys, tex->buffer, |