svga: Add GL4.1(compatibility profile) support in svga driver

[mesa.git] / src / gallium / drivers / svga / svga_pipe_vs.c

diff --git a/src/gallium/drivers/svga/svga_pipe_vs.c b/src/gallium/drivers/svga/svga_pipe_vs.c
index a475e000f2e01589d3a0fa2863262f54a31068d1..aa7396c2c6b00987f89f5c1880beebe2f0d85b69 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_vs.c
+++ b/src/gallium/drivers/svga/svga_pipe_vs.c
@@ -166,6 +166,7 @@ svga_delete_vs_state(struct pipe_context *pipe, void *shader)
 {
    struct svga_context *svga = svga_context(pipe);
    struct svga_vertex_shader *vs = (struct svga_vertex_shader *)shader;
+   struct svga_vertex_shader *next_vs;
    struct svga_shader_variant *variant, *tmp;
    enum pipe_error ret;
 
@@ -173,37 +174,42 @@ svga_delete_vs_state(struct pipe_context *pipe, void *shader)
 
    assert(vs->base.parent == NULL);
 
-   /* Check if there is a generated geometry shader to go with this
-    * vertex shader. If there is, then delete the geometry shader as well.
-    */
-   if (vs->gs != NULL) {
-      svga->pipe.delete_gs_state(&svga->pipe, vs->gs);
-   }
+   while (vs) {
+      next_vs = (struct svga_vertex_shader *)vs->base.next;
 
-   if (vs->base.stream_output != NULL)
-      svga_delete_stream_output(svga, vs->base.stream_output);
+      /* Check if there is a generated geometry shader to go with this
+       * vertex shader. If there is, then delete the geometry shader as well.
+       */
+      if (vs->gs != NULL) {
+         svga->pipe.delete_gs_state(&svga->pipe, vs->gs);
+      }
 
-   draw_delete_vertex_shader(svga->swtnl.draw, vs->draw_shader);
+      if (vs->base.stream_output != NULL)
+         svga_delete_stream_output(svga, vs->base.stream_output);
 
-   for (variant = vs->base.variants; variant; variant = tmp) {
-      tmp = variant->next;
+      draw_delete_vertex_shader(svga->swtnl.draw, vs->draw_shader);
 
-      /* Check if deleting currently bound shader */
-      if (variant == svga->state.hw_draw.vs) {
-         ret = svga_set_shader(svga, SVGA3D_SHADERTYPE_VS, NULL);
-         if (ret != PIPE_OK) {
-            svga_context_flush(svga, NULL);
+      for (variant = vs->base.variants; variant; variant = tmp) {
+         tmp = variant->next;
+
+         /* Check if deleting currently bound shader */
+         if (variant == svga->state.hw_draw.vs) {
             ret = svga_set_shader(svga, SVGA3D_SHADERTYPE_VS, NULL);
-            assert(ret == PIPE_OK);
+            if (ret != PIPE_OK) {
+               svga_context_flush(svga, NULL);
+               ret = svga_set_shader(svga, SVGA3D_SHADERTYPE_VS, NULL);
+               assert(ret == PIPE_OK);
+            }
+            svga->state.hw_draw.vs = NULL;
          }
-         svga->state.hw_draw.vs = NULL;
+
+         svga_destroy_shader_variant(svga, variant);
       }
 
-      svga_destroy_shader_variant(svga, variant);
+      FREE((void *)vs->base.tokens);
+      FREE(vs);
+      vs = next_vs;
    }
-
-   FREE((void *)vs->base.tokens);
-   FREE(vs);
 }