X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_vb_vertex.c;h=30aa7c4086835b880466844b06e312e373b5aa4a;hb=87e44d9003d6fdd4b9be911ad1aa4de1f87068d9;hp=f0694f9a69f9913715227cd82e8ed5ce96a891ca;hpb=a2ea606377ed5679dc513eabcf2d398216b47d61;p=mesa.git

diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index f0694f9a69f..30aa7c40868 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
-#include "colormac.h"
-#include "context.h"
-#include "macros.h"
-#include "imports.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/colormac.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "main/imports.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 
@@ -126,10 +126,7 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
 
-   if (ctx->ShaderObjects.CurrentProgram != NULL)
-      return GL_TRUE;
-
-   if (ctx->VertexProgram._Enabled) 
+   if (ctx->VertexProgram._Current) 
       return GL_TRUE;
 
    if (ctx->_NeedEyeCoords) {
@@ -168,7 +165,7 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
     * the clipmask.
     */
    store->ormask = 0;
-   store->andmask = CLIP_ALL_BITS;
+   store->andmask = CLIP_FRUSTUM_BITS;
 
    if (tnl->NeedNdcCoords) {
       VB->NdcPtr =