Emil Velikov cea0fa44ae 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 077078ce77) [Emil Velikov: resolve trivial conflicts] Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Conflicts: src/mesa/drivers/dri/i965/brw_defines.h		2017-03-15 18:02:31 +00:00
..
amd	radv: disable mip point pre clamping.	2017-03-15 18:02:30 +00:00
compiler	glsl: fix heap-use-after-free in ast_declarator_list::hir()	2017-03-15 14:39:56 +00:00
egl	egl: Ensure ResetNotificationStrategy matches for shared contexts.	2017-03-15 14:39:57 +00:00
gallium	nvc0: take extra pushbuf space into account for pushbuf_space calls	2017-03-15 18:02:30 +00:00
gbm	gbm: request correct version of the DRI2_FENCE extension	2016-11-24 16:34:42 +00:00
getopt	Introduce .editorconfig	2016-08-31 17:06:54 -07:00
glx	glx: guard swap-interval functions against destroyed drawables	2017-03-14 00:13:14 +00:00
gtest	Introduce .editorconfig	2016-08-31 17:06:54 -07:00
hgl	glapi/hgl: remove the final user of _glapi_check_table()	2016-10-06 15:03:46 +01:00
intel	intel/blorp: Explicitly flush all allocated state	2017-03-15 14:39:56 +00:00
loader	egl/dri3: implement query surface hook	2017-03-15 14:39:57 +00:00
mapi	mapi: automake: include builddir prior to srcdir	2017-02-09 23:46:22 +00:00
mesa	i965: move brw_define.h ifndef guard to the top	2017-03-15 18:02:31 +00:00
util	ralloc: Make sure ralloc() allocations match malloc()'s alignment.	2017-03-15 18:02:30 +00:00
vulkan/wsi	vulkan/wsi: Lower the maximum image sizes	2017-02-09 23:45:34 +00:00
Makefile.am	anv: move to using shared wsi code	2016-10-19 10:15:43 +10:00
SConscript	scons: put the generated git_sha1.h file in top-level src/ directory	2016-06-17 10:33:00 -06:00