OSDN Git Service

Merge remote-tracking branch 'mesa/17.1' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 Oct 2017 03:13:12 +0000 (11:13 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 5 Oct 2017 03:13:12 +0000 (11:13 +0800)
1  2 
src/egl/drivers/dri2/egl_dri2.c
src/gallium/drivers/nouveau/nvc0/nvc0_query_hw.c
src/mesa/drivers/dri/i965/brw_performance_query.c

Simple merge