diff options
| author | Emil Velikov <[email protected]> | 2017-03-09 00:38:21 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-03-16 01:34:00 +0000 |
| commit | 7f7b1160d48d5215aaa8a3826f3c37aa8c3d5c2c (patch) | |
| tree | 6c63a2b27c242460b3d47c6dc712e007d7a8ee0d /src/mesa/drivers | |
| parent | b5ed3f87160911bc3cc7d81954ea10a24e24824b (diff) | |
i965: move brw_define.h ifndef guard to the top
Cc: [email protected]
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
(cherry picked from commit 077078ce77e8653725def01ed291eb486989a9ad)
[Emil Velikov: resolve trivial conflicts]
Signed-off-by: Emil Velikov <[email protected]>
Conflicts:
src/mesa/drivers/dri/i965/brw_defines.h
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_defines.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h index 3c5c6c484d7..76234e9505b 100644 --- a/src/mesa/drivers/dri/i965/brw_defines.h +++ b/src/mesa/drivers/dri/i965/brw_defines.h @@ -29,6 +29,9 @@ * Keith Whitwell <[email protected]> */ +#ifndef BRW_DEFINES_H +#define BRW_DEFINES_H + #define INTEL_MASK(high, low) (((1u<<((high)-(low)+1))-1)<<(low)) /* Using the GNU statement expression extension */ #define SET_FIELD(value, field) \ @@ -47,9 +50,6 @@ */ #define REG_MASK(value) ((value) << 16) -#ifndef BRW_DEFINES_H -#define BRW_DEFINES_H - /* 3D state: */ #define CMD_3D_PRIM 0x7b00 /* 3DPRIMITIVE */ |