mesa: move vbo_count_tessellated_primitives() to api_validate.c

[mesa.git] / src / mesa / vbo / vbo_exec.c

diff --git a/src/mesa/vbo/vbo_exec.c b/src/mesa/vbo/vbo_exec.c
index a301c6c9a227b136c9648c4bfc98c0a82da282ef..4320738bd6d3769bdaa95a22395712f7274a6158 100644 (file)
--- a/src/mesa/vbo/vbo_exec.c
+++ b/src/mesa/vbo/vbo_exec.c
@@ -26,7 +26,6 @@
  */
 
 
-#include "main/api_arrayelt.h"
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/vtxfmt.h"
@@ -34,24 +33,26 @@
 
 
 
-void vbo_exec_init( struct gl_context *ctx )
+void
+vbo_exec_init(struct gl_context *ctx)
 {
    struct vbo_exec_context *exec = &vbo_context(ctx)->exec;
 
    exec->ctx = ctx;
 
-   /* Initialize the arrayelt helper
-    */
-   if (!ctx->aelt_context &&
-       !_ae_create_context( ctx )) 
-      return;
+   /* aelt_context should have been created by the caller */
+   assert(ctx->aelt_context);
 
-   vbo_exec_vtx_init( exec );
+   vbo_exec_vtx_init(exec);
 
    ctx->Driver.NeedFlush = 0;
    ctx->Driver.CurrentExecPrimitive = PRIM_OUTSIDE_BEGIN_END;
 
-   vbo_exec_invalidate_state( ctx, ~0 );
+   /* The aelt_context state should still be dirty from its creation */
+   assert(_ae_is_state_dirty(ctx));
+
+   exec->array.recalculate_inputs = GL_TRUE;
+   exec->eval.recalculate_maps = GL_TRUE;
 }
 
 
@@ -68,92 +69,6 @@ void vbo_exec_destroy( struct gl_context *ctx )
 }
 
 
-/**
- * Really want to install these callbacks to a central facility to be
- * invoked according to the state flags.  That will have to wait for a
- * mesa rework:
- */ 
-void vbo_exec_invalidate_state( struct gl_context *ctx, GLuint new_state )
-{
-   struct vbo_context *vbo = vbo_context(ctx);
-   struct vbo_exec_context *exec = &vbo->exec;
-
-   if (!exec->validating && new_state & (_NEW_PROGRAM|_NEW_ARRAY)) {
-      exec->array.recalculate_inputs = GL_TRUE;
-   }
-
-   if (new_state & _NEW_EVAL)
-      exec->eval.recalculate_maps = GL_TRUE;
-
-   _ae_invalidate_state(ctx, new_state);
-}
-
-
-/**
- * Figure out the number of transform feedback primitives that will be output
- * considering the drawing mode, number of vertices, and instance count,
- * assuming that no geometry shading is done and primitive restart is not
- * used.
- *
- * This is used by driver back-ends in implementing the PRIMITIVES_GENERATED
- * and TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN queries.  It is also used to
- * pre-validate draw calls in GLES3 (where draw calls only succeed if there is
- * enough room in the transform feedback buffer for the result).
- */
-size_t
-vbo_count_tessellated_primitives(GLenum mode, GLuint count,
-                                 GLuint num_instances)
-{
-   size_t num_primitives;
-   switch (mode) {
-   case GL_POINTS:
-      num_primitives = count;
-      break;
-   case GL_LINE_STRIP:
-      num_primitives = count >= 2 ? count - 1 : 0;
-      break;
-   case GL_LINE_LOOP:
-      num_primitives = count >= 2 ? count : 0;
-      break;
-   case GL_LINES:
-      num_primitives = count / 2;
-      break;
-   case GL_TRIANGLE_STRIP:
-   case GL_TRIANGLE_FAN:
-   case GL_POLYGON:
-      num_primitives = count >= 3 ? count - 2 : 0;
-      break;
-   case GL_TRIANGLES:
-      num_primitives = count / 3;
-      break;
-   case GL_QUAD_STRIP:
-      num_primitives = count >= 4 ? ((count / 2) - 1) * 2 : 0;
-      break;
-   case GL_QUADS:
-      num_primitives = (count / 4) * 2;
-      break;
-   case GL_LINES_ADJACENCY:
-      num_primitives = count / 4;
-      break;
-   case GL_LINE_STRIP_ADJACENCY:
-      num_primitives = count >= 4 ? count - 3 : 0;
-      break;
-   case GL_TRIANGLES_ADJACENCY:
-      num_primitives = count / 6;
-      break;
-   case GL_TRIANGLE_STRIP_ADJACENCY:
-      num_primitives = count >= 6 ? (count - 4) / 2 : 0;
-      break;
-   default:
-      assert(!"Unexpected primitive type in count_tessellated_primitives");
-      num_primitives = 0;
-      break;
-   }
-   return num_primitives * num_instances;
-}
-
-
-
 /**
  * In some degenarate cases we can improve our ability to merge
  * consecutive primitives.  For example: