mesa: remove no longer needed _mesa_is_bufferobj function

[mesa.git] / src / mesa / drivers / dri / i965 / brw_draw_upload.c

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 221713ebd73a70a51983492a3c6dfd3c0ac92435..ca51f88da1510501733fa3b333b3bfc1bd0a7fc3 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -418,7 +418,7 @@ copy_array_to_vbo_array(struct brw_context *brw,
     *
     * In this case, let's the dst with undefined values
     */
-   if (src != NULL) {
+   if (ptr != NULL) {
       if (dst_stride == src_stride) {
          memcpy(dst, src, size);
       } else {
@@ -493,7 +493,7 @@ brw_prepare_vertices(struct brw_context *brw)
          _mesa_draw_buffer_binding(vao, ffs(vbomask) - 1);
       const GLsizei stride = glbinding->Stride;
 
-      assert(_mesa_is_bufferobj(glbinding->BufferObj));
+      assert(glbinding->BufferObj);
 
       /* Accumulate the range of a single vertex, start with inverted range */
       uint32_t vertex_range_start = ~(uint32_t)0;
@@ -518,7 +518,7 @@ brw_prepare_vertices(struct brw_context *brw)
          vertex_range_end = MAX2(vertex_range_end, rel_end);
 
          struct brw_vertex_element *input = &brw->vb.inputs[attr];
-         input->glattrib = glattrib;
+         input->glformat = &glattrib->Format;
          input->buffer = j;
          input->is_dual_slot = (vp->DualSlotInputs & BITFIELD64_BIT(attr)) != 0;
          input->offset = rel_offset;
@@ -581,7 +581,7 @@ brw_prepare_vertices(struct brw_context *brw)
          _mesa_draw_buffer_binding(vao, ffs(usermask) - 1);
       const GLsizei stride = glbinding->Stride;
 
-      assert(!_mesa_is_bufferobj(glbinding->BufferObj));
+      assert(!glbinding->BufferObj);
       assert(brw->vb.index_bounds_valid);
 
       /* Accumulate the range of a single vertex, start with inverted range */
@@ -607,7 +607,7 @@ brw_prepare_vertices(struct brw_context *brw)
          vertex_range_end = MAX2(vertex_range_end, rel_end);
 
          struct brw_vertex_element *input = &brw->vb.inputs[attr];
-         input->glattrib = glattrib;
+         input->glformat = &glattrib->Format;
          input->buffer = j;
          input->is_dual_slot = (vp->DualSlotInputs & BITFIELD64_BIT(attr)) != 0;
          input->offset = rel_offset;
@@ -663,7 +663,7 @@ brw_prepare_vertices(struct brw_context *brw)
             memset(cursor + size, 0, alignment - size);
 
          struct brw_vertex_element *input = &brw->vb.inputs[attr];
-         input->glattrib = glattrib;
+         input->glformat = &glattrib->Format;
          input->buffer = j;
          input->is_dual_slot = (vp->DualSlotInputs & BITFIELD64_BIT(attr)) != 0;
          input->offset = cursor - data;
@@ -727,7 +727,7 @@ brw_upload_indices(struct brw_context *brw)
 
    /* Turn into a proper VBO:
     */
-   if (!_mesa_is_bufferobj(bufferobj)) {
+   if (!bufferobj) {
       /* Get new bufferobj, offset:
        */
       brw_upload_data(&brw->upload, index_buffer->ptr, ib_size, ib_type_size,