projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'gallium-userbuf'
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_context.h
diff --git
a/src/mesa/state_tracker/st_context.h
b/src/mesa/state_tracker/st_context.h
index 4786ed22fe9696c33df4a7f853b2fd4e74bcac73..00a405b69f9828dda9c2e368e54d90a05e5ef7cf 100644
(file)
--- a/
src/mesa/state_tracker/st_context.h
+++ b/
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 st_context;
struct st_fragment_program;
struct u_upload_mgr;
-struct u_vbuf;
#define ST_NEW_MESA (1 << 0) /* Mesa state has changed */
#define ST_NEW_MESA (1 << 0) /* Mesa state has changed */
@@
-74,8
+73,7
@@
struct st_context
struct pipe_context *pipe;
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 */
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;
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;
/* Active render condition. */
struct pipe_query *render_condition;
unsigned condition_mode;