From: Brian Paul <brianp@vmware.com>
Date: Fri, 23 Jan 2009 18:29:05 +0000 (-0700)
Subject: Merge branch 'vertex_array_bgra'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b8fc605cdb741bd409dbca44150a7ba262b6f157;p=mesa.git

Merge branch 'vertex_array_bgra'
---

b8fc605cdb741bd409dbca44150a7ba262b6f157
diff --cc src/mesa/drivers/dri/intel/intel_context.c
index e080594ee42,a43e6be0d9d..a68e2176471
--- a/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 }