diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-08-15 00:52:44 +0200 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-08-15 00:52:44 +0200 |
| commit | a89963cec1b5872d620c73ed8a5e54b10e3bf28b (patch) | |
| tree | e2fa5270cb5b7e7c4f5f5a85bdfcaead5d5b49e0 /src/mesa/drivers/dri/r300/r300_context.h | |
| parent | 71b1610941f9bfefa01d827fd19cc2368e6cdae3 (diff) | |
| parent | 7fe0dd2e6e927e4ec3e532e08aa0551ebaec4cc1 (diff) | |
Merge branch 'vbo_clean'
Conflicts:
src/mesa/drivers/dri/r300/r300_draw.c
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_context.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_context.h b/src/mesa/drivers/dri/r300/r300_context.h index 24dc6bc6a3..d620417422 100644 --- a/src/mesa/drivers/dri/r300/r300_context.h +++ b/src/mesa/drivers/dri/r300/r300_context.h @@ -478,11 +478,12 @@ struct r300_vertex_buffer { struct vertex_attribute { /* generic */ GLubyte element; - GLvoid *data; - GLboolean free_needed; GLuint stride; GLuint dwords; GLubyte size; /* number of components */ + GLboolean is_named_bo; + struct radeon_bo *bo; + GLint bo_offset; /* hw specific */ uint32_t data_type:4; @@ -497,9 +498,10 @@ struct r300_vertex_buffer { }; struct r300_index_buffer { - GLvoid *ptr; + struct radeon_bo *bo; + int bo_offset; + GLboolean is_32bit; - GLboolean free_needed; GLuint count; }; |