From 8c347d4e5762b41320a80acf474284b5c096fd0d Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 2 May 2013 16:25:15 +0800 Subject: gallium: fix type of flags in pipe_context::flush() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be unsigned, not enum pipe_flush_flags. Fixed a build error: src/gallium/state_trackers/egl/android/native_android.cpp:426:29: error: invalid conversion from 'int' to 'pipe_flush_flags' [-fpermissive] v2: replace all occurrences of enum pipe_flush_flags by unsigned Signed-off-by: Chia-I Wu Reviewed-by: Marek Olšák [olv: document the parameter now that the type is unsigned] --- src/gallium/drivers/i915/i915_batch.h | 2 +- src/gallium/drivers/i915/i915_flush.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/i915') diff --git a/src/gallium/drivers/i915/i915_batch.h b/src/gallium/drivers/i915/i915_batch.h index 5f2b3242f53..ab0f8c8dd29 100644 --- a/src/gallium/drivers/i915/i915_batch.h +++ b/src/gallium/drivers/i915/i915_batch.h @@ -55,6 +55,6 @@ */ extern void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence, - enum pipe_flush_flags flags); + unsigned flags); #endif diff --git a/src/gallium/drivers/i915/i915_flush.c b/src/gallium/drivers/i915/i915_flush.c index 3db6ca136a8..0dca722d636 100644 --- a/src/gallium/drivers/i915/i915_flush.c +++ b/src/gallium/drivers/i915/i915_flush.c @@ -40,7 +40,7 @@ static void i915_flush_pipe( struct pipe_context *pipe, struct pipe_fence_handle **fence, - enum pipe_flush_flags flags ) + unsigned flags ) { struct i915_context *i915 = i915_context(pipe); enum i915_winsys_flush_flags winsys_flags = I915_FLUSH_ASYNC; @@ -71,7 +71,7 @@ void i915_init_flush_functions( struct i915_context *i915 ) */ void i915_flush(struct i915_context *i915, struct pipe_fence_handle **fence, - enum pipe_flush_flags flags) + unsigned flags) { struct i915_winsys_batchbuffer *batch = i915->batch; -- cgit v1.2.3