Merge branch 'mesa_7_5_branch'

Conflicts: src/mesa/main/state.c
2009-08-05 14:13:48 -06:00
parent 3905119b47 5b3428d745
commit 1f71305993
11 changed files with 361 additions and 213 deletions
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -233,7 +233,9 @@ void st_init_extensions(struct st_context *st)

   if (screen->get_param(screen, PIPE_CAP_POINT_SPRITE)) {
      ctx->Extensions.ARB_point_sprite = GL_TRUE;
-      ctx->Extensions.NV_point_sprite = GL_TRUE;
+      /* GL_NV_point_sprite is not supported by gallium because we don't
+       * support the GL_POINT_SPRITE_R_MODE_NV option.
+       */
   }

   if (screen->get_param(screen, PIPE_CAP_OCCLUSION_QUERY)) {