projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove hack for miniglx from dri/utils.c
[mesa.git]
/
src
/
mesa
/
vbo
/
vbo_context.h
diff --git
a/src/mesa/vbo/vbo_context.h
b/src/mesa/vbo/vbo_context.h
index 1d5e929e849585d2a7ba96a316818ae461305429..8b726dc8ac5bfd0e63669c3311d264b496cdd530 100644
(file)
--- a/
src/mesa/vbo/vbo_context.h
+++ b/
src/mesa/vbo/vbo_context.h
@@
-68,8
+68,8
@@
struct vbo_context {
struct gl_client_array *generic_currval;
struct gl_client_array *mat_currval;
struct gl_client_array *generic_currval;
struct gl_client_array *mat_currval;
- GLuint map_vp_none[
32
];
- GLuint map_vp_arb[
32
];
+ GLuint map_vp_none[
VERT_ATTRIB_MAX
];
+ GLuint map_vp_arb[
VERT_ATTRIB_MAX
];
GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->Current, ctx->Light.Material */
GLfloat CurrentFloatEdgeFlag;
GLfloat *current[VBO_ATTRIB_MAX]; /* points into ctx->Current, ctx->Light.Material */
GLfloat CurrentFloatEdgeFlag;
@@
-102,6
+102,8
@@
get_program_mode( GLcontext *ctx )
{
if (!ctx->VertexProgram._Current)
return VP_NONE;
{
if (!ctx->VertexProgram._Current)
return VP_NONE;
+ else if (ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram)
+ return VP_NONE;
else if (ctx->VertexProgram._Current->IsNVProgram)
return VP_NV;
else
else if (ctx->VertexProgram._Current->IsNVProgram)
return VP_NV;
else