diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-07 07:15:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-07 07:15:44 +0100 |
| commit | 1ed503a856d9753a813951796bc6ba56c42ecd28 (patch) | |
| tree | 9bd4e360a04dcb4b17d5ed3ac7e11b7225e5c4c2 /mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | |
| parent | 02f377d5e2dd18537d0807ad63675a0970b5a37d (diff) | |
| download | vcxsrv-1ed503a856d9753a813951796bc6ba56c42ecd28.tar.gz vcxsrv-1ed503a856d9753a813951796bc6ba56c42ecd28.tar.bz2 vcxsrv-1ed503a856d9753a813951796bc6ba56c42ecd28.zip | |
xserver pixman mesa git update 7 nov 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_drawpixels.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c index 89e0a73f1..1c44d0d87 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c @@ -671,6 +671,7 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_save_fragment_sampler_views(cso); cso_save_fragment_shader(cso); cso_save_vertex_shader(cso); + cso_save_geometry_shader(cso); cso_save_vertex_elements(cso); cso_save_vertex_buffers(cso); if (write_stencil) { @@ -720,6 +721,8 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, /* vertex shader state: position + texcoord pass-through */ cso_set_vertex_shader_handle(cso, driver_vp); + /* geometry shader state: disabled */ + cso_set_geometry_shader_handle(cso, NULL); /* texture sampling state: */ { @@ -789,6 +792,7 @@ draw_textured_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_restore_fragment_sampler_views(cso); cso_restore_fragment_shader(cso); cso_restore_vertex_shader(cso); + cso_restore_geometry_shader(cso); cso_restore_vertex_elements(cso); cso_restore_vertex_buffers(cso); if (write_stencil) { |