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_bitmap.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_bitmap.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_bitmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c index beb5e7cab..1a8854b9b 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_bitmap.c +++ b/mesalib/src/mesa/state_tracker/st_cb_bitmap.c @@ -480,6 +480,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_save_viewport(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); @@ -493,6 +494,9 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, /* vertex shader state: position + texcoord pass-through */ cso_set_vertex_shader_handle(cso, st->bitmap.vs); + /* geometry shader state: disabled */ + cso_set_geometry_shader_handle(cso, NULL); + /* user samplers, plus our bitmap sampler */ { struct pipe_sampler_state *samplers[PIPE_MAX_SAMPLERS]; @@ -556,6 +560,7 @@ draw_bitmap_quad(struct gl_context *ctx, GLint x, GLint y, GLfloat z, cso_restore_viewport(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); } |