OSDN Git Service

Merge freedesktop/master into otc-private/master
authorChad Versace <chad.versace@linux.intel.com>
Tue, 11 Jun 2013 23:54:51 +0000 (16:54 -0700)
committerChad Versace <chad.versace@linux.intel.com>
Tue, 11 Jun 2013 23:54:51 +0000 (16:54 -0700)
commite81df76f288943857cef865bb5d6434dc492cf92
treeca740624b325e83f2457c9ac9ea5e75ead28538d
parent83c1d4c96145d2b63ed3e0c021abf36100e772fd
parentb00d61151dba9904197ad3b5156b182dcca8a152
Merge freedesktop/master into otc-private/master
src/egl/drivers/dri2/platform_android.c
src/mesa/drivers/dri/i965/Makefile.sources
src/mesa/drivers/dri/i965/brw_context.h
src/mesa/drivers/dri/i965/brw_fs.h
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
src/mesa/drivers/dri/i965/brw_state.h
src/mesa/drivers/dri/i965/brw_vs.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
src/mesa/main/extensions.c