Merge branch 'mesa_7_7_branch'

2009-12-02 14:56:56 +01:00
parent 7fc75ef7d4 0c75854cc1
commit cc8a537c57
33 changed files with 1834 additions and 103 deletions
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -124,7 +124,6 @@ static const struct dri_extension card_extensions[] = {
   { "GL_MESA_pack_invert",               NULL },
   { "GL_MESA_ycbcr_texture",             NULL },
   { "GL_NV_blend_square",                NULL },
-   { "GL_NV_point_sprite",                GL_NV_point_sprite_functions },
   { "GL_NV_vertex_program",              GL_NV_vertex_program_functions },
   { "GL_NV_vertex_program1_1",           NULL },
   { "GL_SGIS_generate_mipmap",           NULL },