projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: prefix #includes with main/
[mesa.git]
/
src
/
mesa
/
tnl
/
t_vb_vertex.c
diff --git
a/src/mesa/tnl/t_vb_vertex.c
b/src/mesa/tnl/t_vb_vertex.c
index f0694f9a69f9913715227cd82e8ed5ce96a891ca..30aa7c4086835b880466844b06e312e373b5aa4a 100644
(file)
--- 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 "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"
@@
-126,10
+126,7
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
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) {
return GL_TRUE;
if (ctx->_NeedEyeCoords) {
@@
-168,7
+165,7
@@
static GLboolean run_vertex_stage( GLcontext *ctx,
* the clipmask.
*/
store->ormask = 0;
* the clipmask.
*/
store->ormask = 0;
- store->andmask = CLIP_
ALL
_BITS;
+ store->andmask = CLIP_
FRUSTUM
_BITS;
if (tnl->NeedNdcCoords) {
VB->NdcPtr =
if (tnl->NeedNdcCoords) {
VB->NdcPtr =