diff options
author | marha <marha@users.sourceforge.net> | 2011-04-10 18:53:44 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-04-10 18:53:44 +0000 |
commit | 57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05 (patch) | |
tree | 62c44b8772f885ab8252004587bcf01b1c2741ba /mesalib/src/mesa/state_tracker/st_context.h | |
parent | 5deaba2736a906e599eb03f2883fba036150c662 (diff) | |
parent | 2fb58f16eeec8ef3ec2a25e246477aab64e38a7d (diff) | |
download | vcxsrv-57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05.tar.gz vcxsrv-57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05.tar.bz2 vcxsrv-57fb3f76b66c5f7a9f7bed9c42fb9fec9d56ee05.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_context.h')
-rw-r--r-- | mesalib/src/mesa/state_tracker/st_context.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h index ef54fd7cd..a35439741 100644 --- a/mesalib/src/mesa/state_tracker/st_context.h +++ b/mesalib/src/mesa/state_tracker/st_context.h @@ -187,9 +187,16 @@ struct st_context void *winsys_drawable_handle;
/* User vertex buffers. */
- struct pipe_resource *user_vb[PIPE_MAX_ATTRIBS];
- unsigned user_vb_stride[PIPE_MAX_ATTRIBS];
- unsigned num_user_vbs;
+ struct {
+ struct pipe_resource *buffer;
+
+ /** Element size */
+ GLuint element_size;
+
+ /** Attribute stride */
+ GLsizei stride;
+ } user_attrib[PIPE_MAX_ATTRIBS];
+ unsigned num_user_attribs;
};
|