aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-10-31 09:21:05 +0100
committermarha <marha@users.sourceforge.net>2012-10-31 09:21:05 +0100
commit67c290de36ddc1caae94c0892157ac16b90e4f99 (patch)
tree2103f7ca65b9575500965cb2fc9e03c745e75879 /mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
parent7b3f315a5d8b90dcb0db5512ed91fa700027cb7a (diff)
downloadvcxsrv-67c290de36ddc1caae94c0892157ac16b90e4f99.tar.gz
vcxsrv-67c290de36ddc1caae94c0892157ac16b90e4f99.tar.bz2
vcxsrv-67c290de36ddc1caae94c0892157ac16b90e4f99.zip
mesa git update 31 oct 2012
mesa: 183e122bdfe27f875c3c121964484dae9587c051
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c')
-rw-r--r--mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
index 4d8adb9f3..48ebdb9fa 100644
--- a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1287,7 +1287,7 @@ util_create_gen_mipmap(struct pipe_context *pipe,
for (i = 0; i < 2; i++) {
ctx->velem[i].src_offset = i * 4 * sizeof(float);
ctx->velem[i].instance_divisor = 0;
- ctx->velem[i].vertex_buffer_index = 0;
+ ctx->velem[i].vertex_buffer_index = cso_get_aux_vertex_buffer_slot(cso);
ctx->velem[i].src_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
}
@@ -1565,7 +1565,7 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
cso_save_geometry_shader(ctx->cso);
cso_save_viewport(ctx->cso);
cso_save_vertex_elements(ctx->cso);
- cso_save_vertex_buffers(ctx->cso);
+ cso_save_aux_vertex_buffer_slot(ctx->cso);
/* bind our state */
cso_set_blend(ctx->cso, is_depth ? &ctx->blend_keep_color :
@@ -1673,6 +1673,7 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
util_draw_vertex_buffer(ctx->pipe,
ctx->cso,
ctx->vbuf,
+ cso_get_aux_vertex_buffer_slot(ctx->cso),
offset,
PIPE_PRIM_TRIANGLE_FAN,
4, /* verts */
@@ -1697,5 +1698,5 @@ util_gen_mipmap(struct gen_mipmap_state *ctx,
cso_restore_viewport(ctx->cso);
cso_restore_vertex_elements(ctx->cso);
cso_restore_stream_outputs(ctx->cso);
- cso_restore_vertex_buffers(ctx->cso);
+ cso_restore_aux_vertex_buffer_slot(ctx->cso);
}