projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARB prog lexer: Fix lexer to eat both DOS and Unix line endings
[mesa.git]
/
src
/
mesa
/
tnl
/
t_vb_cull.c
diff --git
a/src/mesa/tnl/t_vb_cull.c
b/src/mesa/tnl/t_vb_cull.c
index 8848dac10c1b3bf06f748e31e87b15abe3f8c3b9..712901acf3020a38c90d737fe43da0618fffcc8a 100644
(file)
--- a/
src/mesa/tnl/t_vb_cull.c
+++ b/
src/mesa/tnl/t_vb_cull.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 "ma
in/ma
cros.h"
+#include "
main/
imports.h"
+#include "m
ain/m
types.h"
#include "math/m_xform.h"
#include "math/m_xform.h"
@@
-57,10
+57,7
@@
static GLboolean run_cull_stage( GLcontext *ctx,
GLuint count = VB->Count;
GLuint i;
GLuint count = VB->Count;
GLuint i;
- if (ctx->ShaderObjects._VertexShaderPresent)
- return GL_TRUE;
-
- if (ctx->VertexProgram._Enabled ||
+ if (ctx->VertexProgram._Current ||
!ctx->Transform.CullVertexFlag)
return GL_TRUE;
!ctx->Transform.CullVertexFlag)
return GL_TRUE;