diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state_upload.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/bufferobj.c | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c index 9a858e64a2e..926597b6258 100644 --- a/src/mesa/drivers/dri/i965/brw_state_upload.c +++ b/src/mesa/drivers/dri/i965/brw_state_upload.c @@ -250,7 +250,6 @@ static struct dirty_bit_map mesa_bits[] = { DEFINE_BIT(_NEW_TRACK_MATRIX), DEFINE_BIT(_NEW_PROGRAM), DEFINE_BIT(_NEW_PROGRAM_CONSTANTS), - DEFINE_BIT(_NEW_BUFFER_OBJECT), DEFINE_BIT(_NEW_FRAG_CLAMP), /* Avoid sign extension problems. */ {(unsigned) _NEW_VARYING_VP_INPUTS, "_NEW_VARYING_VP_INPUTS", 0}, diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index bb2f0d9d9d4..6e2979f6db9 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -1579,7 +1579,7 @@ buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj, /* Unmap the existing buffer. We'll replace it now. Not an error. */ _mesa_buffer_unmap_all_mappings(ctx, bufObj); - FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT); + FLUSH_VERTICES(ctx, 0); bufObj->Written = GL_TRUE; bufObj->Immutable = GL_TRUE; @@ -1734,7 +1734,7 @@ _mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj, /* Unmap the existing buffer. We'll replace it now. Not an error. */ _mesa_buffer_unmap_all_mappings(ctx, bufObj); - FLUSH_VERTICES(ctx, _NEW_BUFFER_OBJECT); + FLUSH_VERTICES(ctx, 0); bufObj->Written = GL_TRUE; bufObj->MinMaxCacheDirty = true; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index edefd784a64..5fb4fc50441 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2665,8 +2665,7 @@ struct gl_uniform_block /** * Index (GL_UNIFORM_BLOCK_BINDING) into ctx->UniformBufferBindings[] to use - * with glBindBufferBase to bind a buffer object to this uniform block. When - * updated in the program, _NEW_BUFFER_OBJECT will be set. + * with glBindBufferBase to bind a buffer object to this uniform block. */ GLuint Binding; @@ -4279,7 +4278,7 @@ struct gl_matrix_stack #define _NEW_TRACK_MATRIX (1u << 25) /**< gl_context::VertexProgram */ #define _NEW_PROGRAM (1u << 26) /**< New program/shader state */ #define _NEW_PROGRAM_CONSTANTS (1u << 27) -#define _NEW_BUFFER_OBJECT (1u << 28) +/* gap */ #define _NEW_FRAG_CLAMP (1u << 29) /* gap, re-use for core Mesa state only; use ctx->DriverFlags otherwise */ #define _NEW_VARYING_VP_INPUTS (1u << 31) /**< gl_context::varying_vp_inputs */ |