diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
| commit | af3f3672e5f77a06a24b1e648ee118f1420b45ae (patch) | |
| tree | 2f08e1da8d47d44fcbf78f660ee8d99bf162b5f2 /mesalib/src/mesa/state_tracker/st_cb_clear.c | |
| parent | 60f8ca2d5842b40b8585c58095787c84edfa9803 (diff) | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.gz vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.bz2 vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_clear.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_clear.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_clear.c b/mesalib/src/mesa/state_tracker/st_cb_clear.c index 83802a5ea..19a87aae2 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_clear.c +++ b/mesalib/src/mesa/state_tracker/st_cb_clear.c @@ -246,6 +246,7 @@ clear_with_quad(struct gl_context *ctx, cso_save_clip(st->cso_context); cso_save_fragment_shader(st->cso_context); cso_save_vertex_shader(st->cso_context); + cso_save_geometry_shader(st->cso_context); cso_save_vertex_elements(st->cso_context); cso_save_vertex_buffers(st->cso_context); @@ -321,6 +322,7 @@ clear_with_quad(struct gl_context *ctx, cso_set_clip(st->cso_context, &st->clear.clip); set_fragment_shader(st); set_vertex_shader(st); + cso_set_geometry_shader_handle(st->cso_context, NULL); if (ctx->DrawBuffer->_ColorDrawBuffers[0]) { st_translate_color(ctx->Color.ClearColor.f, @@ -340,6 +342,7 @@ clear_with_quad(struct gl_context *ctx, cso_restore_clip(st->cso_context); cso_restore_fragment_shader(st->cso_context); cso_restore_vertex_shader(st->cso_context); + cso_restore_geometry_shader(st->cso_context); cso_restore_vertex_elements(st->cso_context); cso_restore_vertex_buffers(st->cso_context); } |