#include <inttypes.h> /* for PRId64 macro */
#include "glheader.h"
-#include "util/imports.h"
+
#include "bufferobj.h"
#include "context.h"
#include "enable.h"
if (array->BufferBindingIndex != bindingIndex) {
const GLbitfield array_bit = VERT_BIT(attribIndex);
- if (_mesa_is_bufferobj(vao->BufferBinding[bindingIndex].BufferObj))
+ if (vao->BufferBinding[bindingIndex].BufferObj)
vao->VertexAttribBufferMask |= array_bit;
else
vao->VertexAttribBufferMask &= ~array_bit;
struct gl_vertex_buffer_binding *binding = &vao->BufferBinding[index];
if (ctx->Const.VertexBufferOffsetIsInt32 && (int)offset < 0 &&
- _mesa_is_bufferobj(vbo)) {
+ vbo) {
/* The offset will be interpreted as a signed int, so make sure
* the user supplied offset is not negative (driver limitation).
*/
binding->Offset = offset;
binding->Stride = stride;
- if (!_mesa_is_bufferobj(vbo)) {
+ if (!vbo) {
vao->VertexAttribBufferMask &= ~binding->_BoundArrays;
} else {
vao->VertexAttribBufferMask |= binding->_BoundArrays;
GLuint relativeOffset)
{
struct gl_array_attributes *const array = &vao->VertexAttrib[attrib];
+ struct gl_vertex_format new_format;
assert(!vao->SharedAndImmutable);
assert(size <= 4);
- array->RelativeOffset = relativeOffset;
- _mesa_set_vertex_format(&array->Format, size, type, format,
+ _mesa_set_vertex_format(&new_format, size, type, format,
normalized, integer, doubles);
+ if ((array->RelativeOffset == relativeOffset) &&
+ !memcmp(&new_format, &array->Format, sizeof(new_format)))
+ return;
+
+ array->RelativeOffset = relativeOffset;
+ array->Format = new_format;
+
vao->NewArrays |= vao->Enabled & VERT_BIT(attrib);
}
* 2.9.6), and the pointer argument is not NULL."
*/
if (ptr != NULL && vao != ctx->Array.DefaultVAO &&
- !_mesa_is_bufferobj(obj)) {
+ !obj) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(non-VBO array)", func);
return;
}
/* The Stride and Ptr fields are not set by update_array_format() */
struct gl_array_attributes *array = &vao->VertexAttrib[attrib];
- array->Stride = stride;
- /* For updating the pointer we would need to add the vao->NewArrays flag
- * to the VAO. But but that is done already unconditionally in
- * _mesa_update_array_format called above.
- */
- assert((vao->NewArrays | ~vao->Enabled) & VERT_BIT(attrib));
- array->Ptr = ptr;
+ if ((array->Stride != stride) || (array->Ptr != ptr)) {
+ array->Stride = stride;
+ array->Ptr = ptr;
+ vao->NewArrays |= vao->Enabled & VERT_BIT(attrib);
+ }
/* Update the vertex buffer binding */
GLsizei effectiveStride = stride != 0 ?
return false;
}
} else {
- *vbo = ctx->Shared->NullBufferObj;
+ *vbo = NULL;
}
return true;
const char *caller)
{
const struct gl_array_attributes *array;
+ struct gl_buffer_object *buf;
if (index >= ctx->Const.Program[MESA_SHADER_VERTEX].MaxAttribs) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(index=%u)", caller, index);
case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
return array->Format.Normalized;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
- return vao->BufferBinding[array->BufferBindingIndex].BufferObj->Name;
+ buf = vao->BufferBinding[array->BufferBindingIndex].BufferObj;
+ return buf ? buf->Name : 0;
case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
if ((_mesa_is_desktop_gl(ctx)
&& (ctx->Version >= 30 || ctx->Extensions.EXT_gpu_shader4))
{
GET_CURRENT_CONTEXT(ctx);
struct gl_vertex_array_object *vao;
+ struct gl_buffer_object *buf;
/* The ARB_direct_state_access specification says:
*
params[0] = vao->BufferBinding[VERT_ATTRIB_GENERIC(index)].InstanceDivisor;
break;
case GL_VERTEX_BINDING_BUFFER:
- params[0] = vao->BufferBinding[VERT_ATTRIB_GENERIC(index)].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_GENERIC(index)].BufferObj;
+ params[0] = buf ? buf->Name : 0;
break;
default:
params[0] = get_vertex_array_attrib(ctx, vao, index, pname,
primitive_restart_index(struct gl_context *ctx, GLuint index)
{
ctx->Array.RestartIndex = index;
+ _mesa_update_derived_primitive_restart_state(ctx);
}
GLsizei stride, bool no_error, const char *func)
{
struct gl_buffer_object *vbo;
- if (buffer ==
- vao->BufferBinding[VERT_ATTRIB_GENERIC(bindingIndex)].BufferObj->Name) {
- vbo = vao->BufferBinding[VERT_ATTRIB_GENERIC(bindingIndex)].BufferObj;
+ struct gl_buffer_object *current_buf =
+ vao->BufferBinding[VERT_ATTRIB_GENERIC(bindingIndex)].BufferObj;
+
+ if (current_buf && buffer == current_buf->Name) {
+ vbo = current_buf;
} else if (buffer != 0) {
vbo = _mesa_lookup_bufferobj(ctx, buffer);
* "If <buffer> is zero, any buffer object attached to this
* bindpoint is detached."
*/
- vbo = ctx->Shared->NullBufferObj;
+ vbo = NULL;
}
_mesa_bind_vertex_buffer(ctx, vao, VERT_ATTRIB_GENERIC(bindingIndex),
* associated with the binding points are set to default values,
* ignoring <offsets> and <strides>."
*/
- struct gl_buffer_object *vbo = ctx->Shared->NullBufferObj;
-
for (i = 0; i < count; i++)
_mesa_bind_vertex_buffer(ctx, vao, VERT_ATTRIB_GENERIC(first + i),
- vbo, 0, 16);
+ NULL, 0, 16);
return;
}
struct gl_vertex_buffer_binding *binding =
&vao->BufferBinding[VERT_ATTRIB_GENERIC(first + i)];
- if (buffers[i] == binding->BufferObj->Name)
+ if (buffers[i] == 0)
+ vbo = NULL;
+ else if (binding->BufferObj && binding->BufferObj->Name == buffers[i])
vbo = binding->BufferObj;
- else
- vbo = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i, func);
-
- if (!vbo)
- continue;
+ else {
+ bool error;
+ vbo = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i, func,
+ &error);
+ if (error)
+ continue;
+ }
} else {
- vbo = ctx->Shared->NullBufferObj;
+ vbo = NULL;
}
_mesa_bind_vertex_buffer(ctx, vao, VERT_ATTRIB_GENERIC(first + i),
gl_vert_attrib_name((gl_vert_attrib)i),
array->Ptr, _mesa_enum_to_string(array->Format.Type),
array->Format.Size,
- array->Format._ElementSize, binding->Stride, bo->Name,
- (unsigned long) bo->Size);
+ array->Format._ElementSize, binding->Stride, bo ? bo->Name : 0,
+ (unsigned long)(bo ? bo->Size : 0));
}
}
{
GET_CURRENT_CONTEXT(ctx);
struct gl_vertex_array_object* vao;
+ struct gl_buffer_object *buf;
void* ptr;
vao = _mesa_lookup_vao_err(ctx, vaobj, true,
*param = vao->VertexAttrib[VERT_ATTRIB_POS].Stride;
break;
case GL_VERTEX_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_POS].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_POS].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_COLOR_ARRAY_SIZE:
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR0].Format.Size;
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR0].Stride;
break;
case GL_COLOR_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_COLOR0].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_COLOR0].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_EDGE_FLAG_ARRAY_STRIDE:
*param = vao->VertexAttrib[VERT_ATTRIB_EDGEFLAG].Stride;
break;
case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_EDGEFLAG].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_EDGEFLAG].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_INDEX_ARRAY_TYPE:
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Format.Type;
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR_INDEX].Stride;
break;
case GL_INDEX_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_COLOR_INDEX].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_COLOR_INDEX].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_NORMAL_ARRAY_TYPE:
*param = vao->VertexAttrib[VERT_ATTRIB_NORMAL].Format.Type;
*param = vao->VertexAttrib[VERT_ATTRIB_NORMAL].Stride;
break;
case GL_NORMAL_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_NORMAL].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_NORMAL].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_TEXTURE_COORD_ARRAY_SIZE:
*param = vao->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].Format.Size;
*param = vao->VertexAttrib[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].Stride;
break;
case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_TEX(ctx->Array.ActiveTexture)].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_FOG_COORD_ARRAY_TYPE:
*param = vao->VertexAttrib[VERT_ATTRIB_FOG].Format.Type;
*param = vao->VertexAttrib[VERT_ATTRIB_FOG].Stride;
break;
case GL_FOG_COORD_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_FOG].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_FOG].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
case GL_SECONDARY_COLOR_ARRAY_SIZE:
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR1].Format.Size;
*param = vao->VertexAttrib[VERT_ATTRIB_COLOR1].Stride;
break;
case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_COLOR1].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_COLOR1].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
/* Tokens using IsEnabled */
{
GET_CURRENT_CONTEXT(ctx);
struct gl_vertex_array_object* vao;
+ struct gl_buffer_object *buf;
vao = _mesa_lookup_vao_err(ctx, vaobj, true,
"glGetVertexArrayIntegeri_vEXT");
*param = vao->VertexAttrib[VERT_ATTRIB_TEX(index)].Stride;
break;
case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING:
- *param = vao->BufferBinding[VERT_ATTRIB_TEX(index)].BufferObj->Name;
+ buf = vao->BufferBinding[VERT_ATTRIB_TEX(index)].BufferObj;
+ *param = buf ? buf->Name : 0;
break;
default:
*param = get_vertex_array_attrib(ctx, vao, index, pname, "glGetVertexArrayIntegeri_vEXT");
projects / mesa.git / blobdiff