[Mesa-dev] [PATCH 05/17] mesa: remove unused gl_array_object::NewArray
Marek Olšák
maraeo at gmail.com
Wed May 1 20:42:56 PDT 2013
---
src/mesa/main/enable.c | 2 --
src/mesa/main/mtypes.h | 3 ---
src/mesa/main/state.c | 1 -
src/mesa/main/varray.c | 4 ----
4 files changed, 10 deletions(-)
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 33853e3..016e432 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -140,8 +140,6 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
else
arrayObj->_Enabled &= ~flag;
- arrayObj->NewArrays |= flag;
-
if (ctx->Driver.Enable) {
ctx->Driver.Enable( ctx, cap, state );
}
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 5ad4d3a..deecdf5 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1502,9 +1502,6 @@ struct gl_array_object
/** Mask of VERT_BIT_* values indicating which arrays are enabled */
GLbitfield64 _Enabled;
- /** Mask of VERT_BIT_* values indicating changed/dirty arrays */
- GLbitfield64 NewArrays;
-
/**
* Min of all enabled arrays' _MaxElement. When arrays reside inside VBOs
* we can determine the max legal (in bounds) glDrawElements array index.
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 8036d77..e7e23ca 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -429,7 +429,6 @@ _mesa_update_state_locked( struct gl_context *ctx )
new_state = ctx->NewState | new_prog_state;
ctx->NewState = 0;
ctx->Driver.UpdateState(ctx, new_state);
- ctx->Array.ArrayObj->NewArrays = 0x0;
}
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 4f6d96c..abdaf96 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -269,7 +269,6 @@ update_array(struct gl_context *ctx,
ctx->Array.ArrayBufferObj);
ctx->NewState |= _NEW_ARRAY;
- ctx->Array.ArrayObj->NewArrays |= VERT_BIT(attrib);
}
@@ -521,7 +520,6 @@ _mesa_EnableVertexAttribArray(GLuint index)
FLUSH_VERTICES(ctx, _NEW_ARRAY);
arrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled = GL_TRUE;
arrayObj->_Enabled |= VERT_BIT_GENERIC(index);
- arrayObj->NewArrays |= VERT_BIT_GENERIC(index);
}
}
@@ -547,7 +545,6 @@ _mesa_DisableVertexAttribArray(GLuint index)
FLUSH_VERTICES(ctx, _NEW_ARRAY);
arrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)].Enabled = GL_FALSE;
arrayObj->_Enabled &= ~VERT_BIT_GENERIC(index);
- arrayObj->NewArrays |= VERT_BIT_GENERIC(index);
}
}
@@ -1148,7 +1145,6 @@ _mesa_VertexAttribDivisor(GLuint index, GLuint divisor)
if (array->InstanceDivisor != divisor) {
FLUSH_VERTICES(ctx, _NEW_ARRAY);
array->InstanceDivisor = divisor;
- ctx->Array.ArrayObj->NewArrays |= VERT_BIT(VERT_ATTRIB_GENERIC(index));
}
}
--
1.7.10.4
More information about the mesa-dev
mailing list