diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2017-03-09 00:38:21 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2017-03-15 18:02:31 +0000 |
| commit | cea0fa44ae65ec6b8b724022008355afec2a2a4c (patch) | |
| tree | 98879a2dd4659735b417faf39cb787c070819a49 | |
| parent | 6f3579008d4f6a1a2b5b0b330fecbc105c5b6c2a (diff) | |
i965: move brw_define.h ifndef guard to the top
Cc: mesa-stable@lists.freedesktop.org
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
(cherry picked from commit 077078ce77e8653725def01ed291eb486989a9ad)
[Emil Velikov: resolve trivial conflicts]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Conflicts:
src/mesa/drivers/dri/i965/brw_defines.h
| -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 c4e0f27a393..34cef969cfa 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 <keithw@vmware.com> */ +#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 */ |