summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2013-09-27 15:32:20 -0700
committerKenneth Graunke <[email protected]>2013-10-13 00:10:44 -0700
commit3dda3ebec91ab9dfae8e9b9314d243cd86921ae0 (patch)
tree870a618ea694c180b86c8a2f58378119481b6357
parent67601da24c98a13a1a349b4e3df38ad10ff812bb (diff)
i965: Delete our copy of likely/unlikely macros.
brw_context.h includes imports.h which includes compiler.h which already defines these. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/intel_context.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 8b1aa3e5e0c..58a6e861aa1 100644
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -60,16 +60,6 @@ struct intel_region;
#define INTEL_WRITE_FULL 0x2
#define INTEL_READ 0x4
-#ifndef likely
-#ifdef __GNUC__
-#define likely(expr) (__builtin_expect(expr, 1))
-#define unlikely(expr) (__builtin_expect(expr, 0))
-#else
-#define likely(expr) (expr)
-#define unlikely(expr) (expr)
-#endif
-#endif
-
struct intel_sync_object {
struct gl_sync_object Base;