Fix up some confusion wrt winsys->buffer_create alignment / flags parameters.

intel_winsys works again.

diff --git a/src/mesa/pipe/i915simple/i915_texture.c b/src/mesa/pipe/i915simple/i915_texture.c
index 59e8db8..fefd105 100644 (file)
--- 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,

diff --git a/src/mesa/pipe/softpipe/sp_texture.c b/src/mesa/pipe/softpipe/sp_texture.c
index cfe9628..2dd1add 100644 (file)
--- a/src/mesa/pipe/softpipe/sp_texture.c
+++ b/src/mesa/pipe/softpipe/sp_texture.c
@@ -381,10 +381,7 @@ softpipe_texture_create(struct pipe_context *pipe, struct pipe_texture **pt)
             sizeof(struct softpipe_texture) - sizeof(struct pipe_texture));
 
       if (softpipe_mipmap_tree_layout(pipe, spt)) {
-        spt->buffer = pipe->winsys->buffer_create(pipe->winsys,
-                                                  32,
-                                                  PIPE_SURFACE_FLAG_TEXTURE,
-                                                  0);
+        spt->buffer = pipe->winsys->buffer_create(pipe->winsys, 32, 0, 0);
 
         if (spt->buffer) {
            pipe->winsys->buffer_data(pipe->winsys, spt->buffer,

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 10396c3..36d25a5 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -118,7 +118,7 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
       pipe->winsys->buffer_reference(pipe->winsys, &strb->surface->buffer,
                                     NULL);
 
-   strb->surface->buffer = pipe->winsys->buffer_create(pipe->winsys, 32, flags, 0);
+   strb->surface->buffer = pipe->winsys->buffer_create(pipe->winsys, 32, 0, 0);
    if (!strb->surface->buffer)
       return GL_FALSE; /* out of memory, try s/w buffer? */