/**************************************************************************
- *
+ *
* Copyright 2007 VMware, Inc.
* All Rights Reserved.
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
**************************************************************************/
-#include "main/imports.h"
+
#include "main/arrayobj.h"
#include "main/image.h"
#include "main/macros.h"
GLboolean index_bounds_valid,
GLuint min_index,
GLuint max_index,
+ GLuint num_instances,
+ GLuint base_instance,
struct gl_transform_feedback_object *tfb_vertcount,
unsigned stream)
{
struct st_common_variant *vp_variant;
struct pipe_vertex_buffer vbuffers[PIPE_MAX_SHADER_INPUTS];
unsigned num_vbuffers = 0;
- struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
+ struct cso_velems_state velements;
struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {NULL};
struct pipe_transfer *ib_transfer = NULL;
GLuint i;
st_validate_state(st, ST_PIPELINE_RENDER);
- if (!index_bounds_valid)
+ if (ib && !index_bounds_valid)
vbo_get_minmax_indices(ctx, prims, ib, &min_index, &max_index, nr_prims);
/* must get these after state validation! */
/* Must setup these after state validation! */
/* Setup arrays */
bool uses_user_vertex_buffers;
- st_setup_arrays(st, vp, vp_variant, velements, vbuffers, &num_vbuffers,
+ st_setup_arrays(st, vp, vp_variant, &velements, vbuffers, &num_vbuffers,
&uses_user_vertex_buffers);
/* Setup current values as userspace arrays */
- st_setup_current_user(st, vp, vp_variant, velements, vbuffers, &num_vbuffers);
+ st_setup_current_user(st, vp, vp_variant, &velements, vbuffers, &num_vbuffers);
/* Map all buffers and tell draw about their mapping */
for (unsigned buf = 0; buf < num_vbuffers; ++buf) {
}
draw_set_vertex_buffers(draw, 0, num_vbuffers, vbuffers);
- draw_set_vertex_elements(draw, vp->num_inputs, velements);
+ draw_set_vertex_elements(draw, vp->num_inputs, velements.velems);
unsigned start = 0;
if (ib) {
struct gl_buffer_object *bufobj = ib->obj;
- unsigned index_size = ib->index_size;
+ unsigned index_size = 1 << ib->index_size_shift;
if (index_size == 0)
goto out_unref_vertex;
if (bufobj && bufobj->Name) {
struct st_buffer_object *stobj = st_buffer_object(bufobj);
- start = pointer_to_offset(ib->ptr) / index_size;
+ start = pointer_to_offset(ib->ptr) >> ib->index_size_shift;
mapped_indices = pipe_buffer_map(pipe, stobj->buffer,
PIPE_TRANSFER_READ, &ib_transfer);
}
mapped_indices = ib->ptr;
}
- info.index_size = ib->index_size;
+ info.index_size = index_size;
info.min_index = min_index;
info.max_index = max_index;
info.has_user_indices = true;
if (ctx->Array._PrimitiveRestart) {
info.primitive_restart = true;
- info.restart_index = _mesa_primitive_restart_index(ctx, info.index_size);
+ info.restart_index = ctx->Array._RestartIndex[index_size - 1];
}
} else {
info.index_size = 0;
struct pipe_transfer *ubo_transfer[PIPE_MAX_CONSTANT_BUFFERS] = {0};
assert(prog->info.num_ubos <= ARRAY_SIZE(ubo_transfer));
- for (unsigned i = 0; i < prog->info.num_ubos; i++) {
+ for (unsigned i = 0; i < prog->sh.NumUniformBlocks; i++) {
struct gl_buffer_binding *binding =
&st->ctx->UniformBufferBindings[prog->sh.UniformBlocks[i]->Binding];
struct st_buffer_object *st_obj = st_buffer_object(binding->BufferObject);
draw_set_mapped_texture(draw, PIPE_SHADER_VERTEX, i, width0,
res->height0, num_layers, first_level,
- last_level, (void*)base_addr, row_stride,
+ last_level, 0, 0, (void*)base_addr, row_stride,
img_stride, mip_offset);
}
}
draw_set_mapped_image(draw, PIPE_SHADER_VERTEX, i, width, height,
- num_layers, addr, row_stride, img_stride);
+ num_layers, addr, row_stride, img_stride, 0, 0);
}
draw_set_images(draw, PIPE_SHADER_VERTEX, images, prog->info.num_images);
+ info.start_instance = base_instance;
+ info.instance_count = num_instances;
+
/* draw here */
for (i = 0; i < nr_prims; i++) {
info.count = prims[i].count;
info.mode = prims[i].mode;
info.start = start + prims[i].start;
- info.start_instance = prims[i].base_instance;
- info.instance_count = prims[i].num_instances;
info.index_bias = prims[i].basevertex;
info.drawid = prims[i].draw_id;
if (!ib) {
/* unmap images */
for (unsigned i = 0; i < prog->info.num_images; i++) {
if (img_transfer[i]) {
- draw_set_mapped_image(draw, PIPE_SHADER_VERTEX, i, 0, 0, 0, NULL, 0, 0);
+ draw_set_mapped_image(draw, PIPE_SHADER_VERTEX, i, 0, 0, 0, NULL, 0, 0, 0, 0);
pipe_transfer_unmap(pipe, img_transfer[i]);
}
}
projects / mesa.git / blobdiff