Alan Coopersmith wrote:
> Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
> ---
> src/gallium/drivers/i965/brw_batchbuffer.c | 2 +-
> src/gallium/drivers/i965/brw_batchbuffer.h | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/drivers/i965/brw_batchbuffer.c
> b/src/gallium/drivers/i965/brw_batchbuffer.c
> index 22607dc..003b1fd 100644
> --- a/src/gallium/drivers/i965/brw_batchbuffer.c
> +++ b/src/gallium/drivers/i965/brw_batchbuffer.c
> @@ -155,7 +155,7 @@ _brw_batchbuffer_flush(struct brw_batchbuffer *batch,
> enum pipe_error
> brw_batchbuffer_emit_reloc(struct brw_batchbuffer *batch,
> struct brw_winsys_buffer *buffer,
> - uint32_t usage,
> + enum brw_buffer_usage usage,
> uint32_t delta)
> {
> int ret;
> diff --git a/src/gallium/drivers/i965/brw_batchbuffer.h
> b/src/gallium/drivers/i965/brw_batchbuffer.h
> index 7473f5b..6ca9f61 100644
> --- a/src/gallium/drivers/i965/brw_batchbuffer.h
> +++ b/src/gallium/drivers/i965/brw_batchbuffer.h
> @@ -64,12 +64,12 @@ brw_batchbuffer_reset(struct brw_batchbuffer *batch);
> * Consider it a convenience function wrapping multple
> * intel_buffer_dword() calls.
> */
> -int brw_batchbuffer_data(struct brw_batchbuffer *batch,
> +enum pipe_error brw_batchbuffer_data(struct brw_batchbuffer *batch,
> const void *data, GLuint bytes,
> enum cliprect_mode cliprect_mode);
>
>
> -int brw_batchbuffer_emit_reloc(struct brw_batchbuffer *batch,
> +enum pipe_error brw_batchbuffer_emit_reloc(struct brw_batchbuffer *batch,
> struct brw_winsys_buffer *buffer,
> enum brw_buffer_usage usage,
> uint32_t offset);
Signed-off-by: Brian Paul <bri...@vmware.com>
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
