summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Bornecrantz <wallbraker@gmail.com>2009-10-07 03:26:03 +0100
committerJakob Bornecrantz <wallbraker@gmail.com>2009-10-07 13:48:32 +0100
commitf8ba93aefdf23b88a945d6037cd2e672c99b314c (patch)
tree057470506bc0a06ad4c48fb9130d1d03fc374352
parent030723fc5d3faa919cac245fc7b13430ca201826 (diff)
downloadexternal_mesa3d-f8ba93aefdf23b88a945d6037cd2e672c99b314c.zip
external_mesa3d-f8ba93aefdf23b88a945d6037cd2e672c99b314c.tar.gz
external_mesa3d-f8ba93aefdf23b88a945d6037cd2e672c99b314c.tar.bz2
i915g: Change order of buffer_write arguments
They now follow the pipe_buffer_write style, its the gallium driver that sets the interface not the winsys.
-rw-r--r--src/gallium/drivers/i915/intel_winsys.h6
-rw-r--r--src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/i915/intel_winsys.h b/src/gallium/drivers/i915/intel_winsys.h
index 42c5e74..2c8dc63 100644
--- a/src/gallium/drivers/i915/intel_winsys.h
+++ b/src/gallium/drivers/i915/intel_winsys.h
@@ -153,13 +153,13 @@ struct intel_winsys {
/**
* Write to a buffer.
*
- * Arguments follows pwrite(2)
+ * Arguments follows pipe_buffer_write.
*/
int (*buffer_write)(struct intel_winsys *iws,
struct intel_buffer *dst,
- const void *src,
+ size_t offset,
size_t size,
- size_t offset);
+ const void *data);
void (*buffer_destroy)(struct intel_winsys *iws,
struct intel_buffer *buffer);
diff --git a/src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c b/src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c
index 327e19f..ac4dd6e 100644
--- a/src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c
+++ b/src/gallium/winsys/drm/intel/gem/intel_drm_buffer.c
@@ -119,9 +119,9 @@ intel_drm_buffer_unmap(struct intel_winsys *iws,
static int
intel_drm_buffer_write(struct intel_winsys *iws,
struct intel_buffer *buffer,
- const void *data,
+ size_t offset,
size_t size,
- size_t offset)
+ const void *data)
{
struct intel_drm_buffer *buf = intel_drm_buffer(buffer);