OSDN Git Service

Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86 android-x86-6.0-r1
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 6 Sep 2016 03:18:33 +0000 (11:18 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 6 Sep 2016 03:18:33 +0000 (11:18 +0800)
commit0e348766c7d819ec2bbd791797d4b0e0c3b8069e
tree5d4df7935919fc4cce410d970dfe108cdf79e320
parentc3bb2e308704073ef832c1d68846caab25ffc988
parent614fb93a6d0246d5592333a1b914ce71a409fcf7
Merge remote-tracking branch 'mesa/12.0' into marshmallow-x86

Conflicts:
src/egl/drivers/dri2/platform_android.c
src/mesa/drivers/dri/i965/intel_syncobj.c
configure.ac
src/egl/drivers/dri2/egl_dri2.c
src/egl/drivers/dri2/platform_android.c
src/gallium/auxiliary/util/u_math.h
src/gallium/drivers/nouveau/nvc0/nvc0_context.c
src/gallium/drivers/nouveau/nvc0/nvc0_context.h
src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c
src/gallium/drivers/nouveau/nvc0/nve4_compute.c