diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
| commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
| tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /mesalib/src/mesa/state_tracker/st_context.h | |
| parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
| parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
| download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_context.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_context.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h index 4786ed22f..00a405b69 100644 --- a/mesalib/src/mesa/state_tracker/st_context.h +++ b/mesalib/src/mesa/state_tracker/st_context.h @@ -41,7 +41,6 @@ struct gen_mipmap_state; struct st_context; struct st_fragment_program; struct u_upload_mgr; -struct u_vbuf; #define ST_NEW_MESA (1 << 0) /* Mesa state has changed */ @@ -74,8 +73,7 @@ struct st_context struct pipe_context *pipe; - struct u_upload_mgr *uploader; - struct u_vbuf *vbuf; + struct u_upload_mgr *uploader, *indexbuf_uploader, *constbuf_uploader; struct draw_context *draw; /**< For selection/feedback/rastpos only */ struct draw_stage *feedback_stage; /**< For GL_FEEDBACK rendermode */ @@ -191,18 +189,6 @@ struct st_context int force_msaa; void *winsys_drawable_handle; - /* User vertex buffers. */ - struct { - struct pipe_resource *buffer; - - /** Element size */ - GLuint element_size; - - /** Attribute stride */ - GLsizei stride; - } user_attrib[PIPE_MAX_ATTRIBS]; - unsigned num_user_attribs; - /* Active render condition. */ struct pipe_query *render_condition; unsigned condition_mode; |