summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/drivers/i965/brw_batchbuffer.c2
-rw-r--r--src/gallium/drivers/i965/brw_batchbuffer.h2
-rw-r--r--src/gallium/drivers/i965/brw_draw_upload.c1
-rw-r--r--src/gallium/drivers/i965/brw_pipe_clear.c1
-rw-r--r--src/gallium/drivers/i965/brw_winsys.h7
-rw-r--r--src/gallium/drivers/i965/brw_wm.c2
-rw-r--r--src/gallium/drivers/i965/brw_wm_fp.c1
-rw-r--r--src/gallium/winsys/drm/i965/xlib/xlib_i965.c5
8 files changed, 7 insertions, 14 deletions
diff --git a/src/gallium/drivers/i965/brw_batchbuffer.c b/src/gallium/drivers/i965/brw_batchbuffer.c
index 64d6754df55..673bd1ed44d 100644
--- a/src/gallium/drivers/i965/brw_batchbuffer.c
+++ b/src/gallium/drivers/i965/brw_batchbuffer.c
@@ -27,8 +27,6 @@
#include "util/u_memory.h"
-#include "pipe/p_error.h"
-
#include "brw_batchbuffer.h"
//#include "brw_decode.h"
#include "brw_reg.h"
diff --git a/src/gallium/drivers/i965/brw_batchbuffer.h b/src/gallium/drivers/i965/brw_batchbuffer.h
index b051638296c..781cd698e44 100644
--- a/src/gallium/drivers/i965/brw_batchbuffer.h
+++ b/src/gallium/drivers/i965/brw_batchbuffer.h
@@ -3,8 +3,6 @@
#include "util/u_debug.h"
-#include "pipe/p_error.h"
-
#include "brw_types.h"
#include "brw_winsys.h"
#include "brw_reg.h"
diff --git a/src/gallium/drivers/i965/brw_draw_upload.c b/src/gallium/drivers/i965/brw_draw_upload.c
index 6e12e8f4b3f..acebd440801 100644
--- a/src/gallium/drivers/i965/brw_draw_upload.c
+++ b/src/gallium/drivers/i965/brw_draw_upload.c
@@ -26,7 +26,6 @@
**************************************************************************/
#include "pipe/p_context.h"
-#include "pipe/p_error.h"
#include "util/u_upload_mgr.h"
#include "util/u_math.h"
diff --git a/src/gallium/drivers/i965/brw_pipe_clear.c b/src/gallium/drivers/i965/brw_pipe_clear.c
index 69bc95e51aa..34cad629770 100644
--- a/src/gallium/drivers/i965/brw_pipe_clear.c
+++ b/src/gallium/drivers/i965/brw_pipe_clear.c
@@ -27,7 +27,6 @@
#include "util/u_pack_color.h"
-#include "pipe/p_error.h"
#include "pipe/p_state.h"
#include "brw_batchbuffer.h"
diff --git a/src/gallium/drivers/i965/brw_winsys.h b/src/gallium/drivers/i965/brw_winsys.h
index b2ba3e86f97..f5ce9d13d73 100644
--- a/src/gallium/drivers/i965/brw_winsys.h
+++ b/src/gallium/drivers/i965/brw_winsys.h
@@ -27,6 +27,7 @@
#define BRW_WINSYS_H
#include "pipe/p_compiler.h"
+#include "pipe/p_error.h"
struct brw_winsys;
struct pipe_fence_handle;
@@ -123,9 +124,9 @@ struct brw_winsys_screen {
/* XXX: couldn't this be handled by returning true/false on
* bo_emit_reloc?
*/
- boolean (*check_aperture_space)( struct brw_winsys_screen *iws,
- struct brw_winsys_buffer **buffers,
- unsigned count );
+ enum pipe_error (*check_aperture_space)( struct brw_winsys_screen *iws,
+ struct brw_winsys_buffer **buffers,
+ unsigned count );
/**
* Map a buffer.
diff --git a/src/gallium/drivers/i965/brw_wm.c b/src/gallium/drivers/i965/brw_wm.c
index 90780272da5..815ae8c51aa 100644
--- a/src/gallium/drivers/i965/brw_wm.c
+++ b/src/gallium/drivers/i965/brw_wm.c
@@ -28,8 +28,6 @@
* Authors:
* Keith Whitwell <[email protected]>
*/
-#include "pipe/p_error.h"
-
#include "tgsi/tgsi_info.h"
#include "brw_context.h"
diff --git a/src/gallium/drivers/i965/brw_wm_fp.c b/src/gallium/drivers/i965/brw_wm_fp.c
index 58f1d35b7df..bba448815b6 100644
--- a/src/gallium/drivers/i965/brw_wm_fp.c
+++ b/src/gallium/drivers/i965/brw_wm_fp.c
@@ -31,7 +31,6 @@
#include "pipe/p_shader_tokens.h"
-#include "pipe/p_error.h"
#include "util/u_math.h"
#include "util/u_memory.h"
diff --git a/src/gallium/winsys/drm/i965/xlib/xlib_i965.c b/src/gallium/winsys/drm/i965/xlib/xlib_i965.c
index 08fce4b20b8..71d8f4bafc8 100644
--- a/src/gallium/winsys/drm/i965/xlib/xlib_i965.c
+++ b/src/gallium/winsys/drm/i965/xlib/xlib_i965.c
@@ -35,6 +35,7 @@
#include "util/u_memory.h"
#include "util/u_math.h"
+#include "pipe/p_error.h"
#include "pipe/p_context.h"
#include "xm_winsys.h"
@@ -226,7 +227,7 @@ xlib_brw_bo_references(struct brw_winsys_buffer *a,
return TRUE;
}
-static boolean
+static enum pipe_error
xlib_brw_check_aperture_space( struct brw_winsys_screen *iws,
struct brw_winsys_buffer **buffers,
unsigned count )
@@ -241,7 +242,7 @@ xlib_brw_check_aperture_space( struct brw_winsys_screen *iws,
__FUNCTION__, count,
(tot_size + 1023) / 1024);
- return TRUE;
+ return PIPE_OK;
}
static void *