diff options
author | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-07-04 10:41:31 +0200 |
commit | b3daaeb1467f3d3d52bef2f76413f3a063fc4f33 (patch) | |
tree | 4415e903a15dff8b36bba9fcce197d26a7790186 /mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c | |
parent | e44d0067ca65d58f258e7f2ae1a240c9bfce5766 (diff) | |
parent | fc8f37239f3af088819c18f5632b2608954af73a (diff) | |
download | vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.gz vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.tar.bz2 vcxsrv-b3daaeb1467f3d3d52bef2f76413f3a063fc4f33.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/include/misc.h
xorg-server/os/utils.c
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c index 82474cd7b..2ff1af70a 100644 --- a/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c +++ b/mesalib/src/gallium/auxiliary/util/u_gen_mipmap.c @@ -1556,6 +1556,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); /* bind our state */ cso_set_blend(ctx->cso, &ctx->blend); @@ -1679,4 +1680,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); } |