Merge branch 'vertex_array_bgra'

diff --cc src/mesa/drivers/dri/intel/intel_context.c
index e080594,a43e6be..a68e217
--- 1/src/mesa/drivers/dri/intel/intel_context.c
--- 2/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@@ -414,8 -413,8 +414,9 @@@ static const struct dri_extension brw_e
     { "GL_ARB_texture_non_power_of_two",   NULL },
     { "GL_ARB_vertex_shader",              GL_ARB_vertex_shader_functions },
     { "GL_EXT_shadow_funcs",               NULL },
 +   { "GL_EXT_stencil_two_side",           GL_EXT_stencil_two_side_functions },
     { "GL_EXT_texture_sRGB",             NULL },
+    { "GL_EXT_vertex_array_bgra",        NULL },
     { "GL_ATI_separate_stencil",           GL_ATI_separate_stencil_functions },
     { "GL_ATI_texture_env_combine3",       NULL },
     { NULL,                                NULL }

diff --cc src/mesa/main/extensions.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge