summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/radeon/radeon_context.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-02-04 15:58:08 +1000
committerDave Airlie <airlied@redhat.com>2009-02-04 15:58:08 +1000
commitb584b0728d3a001a142f76dde22f9e8ed7d2dd16 (patch)
tree7551de813823d9f058e160a35439c96529c5cb8a /src/mesa/drivers/dri/radeon/radeon_context.h
parent88a409fa8e85a45eb71f99e5926340a5fe6a8071 (diff)
radeon: make compile again.
Not tested but ripped out lots of stuff unneeded anymore time to test later
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_context.h')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_context.h19
1 files changed, 7 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index ba5c57f121..6edbaf6910 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -340,7 +340,7 @@ struct r100_state {
#define RADEON_CMD_BUF_SZ (8*1024)
-
+#define R200_ELT_BUF_SZ (8*1024)
/* radeon_tcl.c
*/
struct radeon_tcl_info {
@@ -364,18 +364,17 @@ struct radeon_tcl_info {
struct radeon_dma_region fog;
struct radeon_dma_region tex[RADEON_MAX_TEXTURE_UNITS];
struct radeon_dma_region norm;
+
+ struct radeon_bo *elt_dma_bo;
+ int elt_dma_offset; /** Offset into this buffer object, in bytes */
+ int elt_used;
};
/* radeon_swtcl.c
*/
-struct radeon_swtcl_info {
- GLuint RenderIndex;
- GLuint vertex_size;
+struct r100_swtcl_info {
GLuint vertex_format;
- struct tnl_attr_map vertex_attrs[VERT_ATTRIB_MAX];
- GLuint vertex_attr_count;
-
GLubyte *verts;
/* Fallback rasterization functions
@@ -384,10 +383,6 @@ struct radeon_swtcl_info {
radeon_line_func draw_line;
radeon_tri_func draw_tri;
- GLuint hw_primitive;
- GLenum render_primitive;
- GLuint numverts;
-
/**
* Offset of the 4UB color data within a hardware (swtcl) vertex.
*/
@@ -448,7 +443,7 @@ struct r100_context {
/* radeon_swtcl.c
*/
- struct radeon_swtcl_info swtcl;
+ struct r100_swtcl_info swtcl;
GLboolean using_hyperz;
GLboolean texmicrotile;