[Mesa-dev] [PATCH 8/8] state_tracker: remove sw_primitive_restart from st_context

Jordan Justen jordan.l.justen at intel.com
Fri May 11 08:15:58 PDT 2012


The VBO module now can handle primitive restart in software
if required.

Signed-off-by: Jordan Justen <jordan.l.justen at intel.com>
---
 src/mesa/state_tracker/st_context.h    |    1 -
 src/mesa/state_tracker/st_extensions.c |    4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 4786ed2..ffdefb7 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -81,7 +81,6 @@ struct st_context
    struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */
    struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */
    struct draw_stage *rastpos_stage;  /**< For glRasterPos */
-   GLboolean sw_primitive_restart;
    GLboolean clamp_frag_color_in_shader;
    GLboolean clamp_vert_color_in_shader;
 
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 559336e..2a4d8c0 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -599,9 +599,7 @@ void st_init_extensions(struct st_context *st)
 #endif
    }
 
-   if (!screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {
-      st->sw_primitive_restart = GL_TRUE;
-   } else {
+   if (screen->get_param(screen, PIPE_CAP_PRIMITIVE_RESTART)) {
       ctx->Const.PrimitiveRestartInSoftware = GL_FALSE;
    }
 
-- 
1.7.9.5



More information about the mesa-dev mailing list