Initial pull of code from r6xx-r7xx-support branch

Not functional yet.

1 files changed, 70 insertions, 540 deletions

diff --git a/src/mesa/drivers/dri/r600/r600_context.h b/src/mesa/drivers/dri/r600/r600_context.h
index 0decf5d6a93..74e34e3684d 100644
--- a/src/mesa/drivers/dri/r600/r600_context.h
+++ b/src/mesa/drivers/dri/r600/r600_context.h
@@ -52,6 +52,7 @@ struct r600_context;
 typedef struct r600_context r600ContextRec;
 typedef struct r600_context *r600ContextPtr;
 
+typedef struct r600_context context_t;
 
 #include "main/mm.h"
 
@@ -71,11 +72,6 @@ typedef struct r600_context *r600ContextPtr;
 		} \
 	}
 
-#include "r600_vertprog.h"
-#include "r700_fragprog.h"
-
-
-
 /************ DMA BUFFERS **************/
 
 /* The blit width for texture uploads
@@ -87,316 +83,6 @@ struct r600_texture_state {
 	int tc_count;		/* number of incoming texture coordinates from VAP */
 };
 
-
-#define R600_VPT_CMD_0		0
-#define R600_VPT_XSCALE		1
-#define R600_VPT_XOFFSET	2
-#define R600_VPT_YSCALE		3
-#define R600_VPT_YOFFSET	4
-#define R600_VPT_ZSCALE		5
-#define R600_VPT_ZOFFSET	6
-#define R600_VPT_CMDSIZE	7
-
-#define R600_VIR_CMD_0		0	/* vir is variable size (at least 1) */
-#define R600_VIR_CNTL_0		1
-#define R600_VIR_CNTL_1		2
-#define R600_VIR_CNTL_2		3
-#define R600_VIR_CNTL_3		4
-#define R600_VIR_CNTL_4		5
-#define R600_VIR_CNTL_5		6
-#define R600_VIR_CNTL_6		7
-#define R600_VIR_CNTL_7		8
-#define R600_VIR_CMDSIZE	9
-
-#define R600_VIC_CMD_0		0
-#define R600_VIC_CNTL_0		1
-#define R600_VIC_CNTL_1		2
-#define R600_VIC_CMDSIZE	3
-
-#define R600_VOF_CMD_0		0
-#define R600_VOF_CNTL_0		1
-#define R600_VOF_CNTL_1		2
-#define R600_VOF_CMDSIZE	3
-
-#define R600_PVS_CMD_0		0
-#define R600_PVS_CNTL_1		1
-#define R600_PVS_CNTL_2		2
-#define R600_PVS_CNTL_3		3
-#define R600_PVS_CMDSIZE	4
-
-#define R600_GB_MISC_CMD_0		0
-#define R600_GB_MISC_MSPOS_0		1
-#define R600_GB_MISC_MSPOS_1		2
-#define R600_GB_MISC_TILE_CONFIG	3
-#define R600_GB_MISC_SELECT		4
-#define R600_GB_MISC_AA_CONFIG		5
-#define R600_GB_MISC_CMDSIZE		6
-
-#define R600_TXE_CMD_0		0
-#define R600_TXE_ENABLE		1
-#define R600_TXE_CMDSIZE	2
-
-#define R600_PS_CMD_0		0
-#define R600_PS_POINTSIZE	1
-#define R600_PS_CMDSIZE		2
-
-#define R600_ZBS_CMD_0		0
-#define R600_ZBS_T_FACTOR	1
-#define R600_ZBS_T_CONSTANT	2
-#define R600_ZBS_W_FACTOR	3
-#define R600_ZBS_W_CONSTANT	4
-#define R600_ZBS_CMDSIZE	5
-
-#define R600_CUL_CMD_0		0
-#define R600_CUL_CULL		1
-#define R600_CUL_CMDSIZE	2
-
-#define R600_RC_CMD_0		0
-#define R600_RC_CNTL_0		1
-#define R600_RC_CNTL_1		2
-#define R600_RC_CMDSIZE		3
-
-#define R600_RI_CMD_0		0
-#define R600_RI_INTERP_0	1
-#define R600_RI_INTERP_1	2
-#define R600_RI_INTERP_2	3
-#define R600_RI_INTERP_3	4
-#define R600_RI_INTERP_4	5
-#define R600_RI_INTERP_5	6
-#define R600_RI_INTERP_6	7
-#define R600_RI_INTERP_7	8
-#define R600_RI_CMDSIZE		9
-
-#define R500_RI_CMDSIZE	       17
-
-#define R600_RR_CMD_0		0	/* rr is variable size (at least 1) */
-#define R600_RR_INST_0		1
-#define R600_RR_INST_1		2
-#define R600_RR_INST_2		3
-#define R600_RR_INST_3		4
-#define R600_RR_INST_4		5
-#define R600_RR_INST_5		6
-#define R600_RR_INST_6		7
-#define R600_RR_INST_7		8
-#define R600_RR_CMDSIZE		9
-
-#define R600_FP_CMD_0		0
-#define R600_FP_CNTL0		1
-#define R600_FP_CNTL1		2
-#define R600_FP_CNTL2		3
-#define R600_FP_CMD_1		4
-#define R600_FP_NODE0		5
-#define R600_FP_NODE1		6
-#define R600_FP_NODE2		7
-#define R600_FP_NODE3		8
-#define R600_FP_CMDSIZE		9
-
-#define R500_FP_CMD_0           0
-#define R500_FP_CNTL            1
-#define R500_FP_PIXSIZE         2
-#define R500_FP_CMD_1           3
-#define R500_FP_CODE_ADDR       4
-#define R500_FP_CODE_RANGE      5
-#define R500_FP_CODE_OFFSET     6
-#define R500_FP_CMD_2           7
-#define R500_FP_FC_CNTL         8
-#define R500_FP_CMDSIZE         9
-
-#define R600_FPT_CMD_0		0
-#define R600_FPT_INSTR_0	1
-#define R600_FPT_CMDSIZE	65
-
-#define R600_FPI_CMD_0		0
-#define R600_FPI_INSTR_0	1
-#define R600_FPI_CMDSIZE	65
-/* R500 has space for 512 instructions - 6 dwords per instruction */
-#define R500_FPI_CMDSIZE	(512*6+1)
-
-#define R600_FPP_CMD_0		0
-#define R600_FPP_PARAM_0	1
-#define R600_FPP_CMDSIZE	(32*4+1)
-/* R500 has spcae for 256 constants - 4 dwords per constant */
-#define R500_FPP_CMDSIZE	(256*4+1)
-
-#define R600_FOGS_CMD_0		0
-#define R600_FOGS_STATE		1
-#define R600_FOGS_CMDSIZE	2
-
-#define R600_FOGC_CMD_0		0
-#define R600_FOGC_R		1
-#define R600_FOGC_G		2
-#define R600_FOGC_B		3
-#define R600_FOGC_CMDSIZE	4
-
-#define R600_FOGP_CMD_0		0
-#define R600_FOGP_SCALE		1
-#define R600_FOGP_START		2
-#define R600_FOGP_CMDSIZE	3
-
-#define R600_AT_CMD_0		0
-#define R600_AT_ALPHA_TEST	1
-#define R600_AT_UNKNOWN		2
-#define R600_AT_CMDSIZE		3
-
-#define R600_BLD_CMD_0		0
-#define R600_BLD_CBLEND		1
-#define R600_BLD_ABLEND		2
-#define R600_BLD_CMDSIZE	3
-
-#define R600_CMK_CMD_0		0
-#define R600_CMK_COLORMASK	1
-#define R600_CMK_CMDSIZE	2
-
-#define R600_CB_CMD_0		0
-#define R600_CB_OFFSET		1
-#define R600_CB_CMD_1		2
-#define R600_CB_PITCH		3
-#define R600_CB_CMDSIZE		4
-
-#define R600_ZS_CMD_0		0
-#define R600_ZS_CNTL_0		1
-#define R600_ZS_CNTL_1		2
-#define R600_ZS_CNTL_2		3
-#define R600_ZS_CMDSIZE		4
-
-#define R600_ZB_CMD_0		0
-#define R600_ZB_OFFSET		1
-#define R600_ZB_PITCH		2
-#define R600_ZB_CMDSIZE		3
-
-#define R600_VAP_CNTL_FLUSH     0
-#define R600_VAP_CNTL_FLUSH_1   1
-#define R600_VAP_CNTL_CMD       2
-#define R600_VAP_CNTL_INSTR     3
-#define R600_VAP_CNTL_SIZE      4
-
-#define R600_VPI_CMD_0		0
-#define R600_VPI_INSTR_0	1
-#define R600_VPI_CMDSIZE	1025	/* 256 16 byte instructions */
-
-#define R600_VPP_CMD_0		0
-#define R600_VPP_PARAM_0	1
-#define R600_VPP_CMDSIZE	1025	/* 256 4-component parameters */
-
-#define R600_VPUCP_CMD_0		0
-#define R600_VPUCP_X            1
-#define R600_VPUCP_Y            2
-#define R600_VPUCP_Z            3
-#define R600_VPUCP_W            4
-#define R600_VPUCP_CMDSIZE	5	/* 256 4-component parameters */
-
-#define R600_VPS_CMD_0		0
-#define R600_VPS_ZERO_0		1
-#define R600_VPS_ZERO_1		2
-#define R600_VPS_POINTSIZE	3
-#define R600_VPS_ZERO_3		4
-#define R600_VPS_CMDSIZE	5
-
-	/* the layout is common for all fields inside tex */
-#define R600_TEX_CMD_0		0
-#define R600_TEX_VALUE_0	1
-/* We don't really use this, instead specify mtu+1 dynamically
-#define R600_TEX_CMDSIZE	(MAX_TEXTURE_UNITS+1)
-*/
-
-/**
- * Cache for hardware register state.
- */
-struct r600_hw_state {
-	struct radeon_state_atom vpt;	/* viewport (1D98) */
-	struct radeon_state_atom vap_cntl;
-        struct radeon_state_atom vap_index_offset; /* 0x208c r5xx only */
-	struct radeon_state_atom vof;	/* VAP output format register 0x2090 */
-	struct radeon_state_atom vte;	/* (20B0) */
-	struct radeon_state_atom vap_vf_max_vtx_indx;	/* Maximum Vertex Indx Clamp (2134) */
-	struct radeon_state_atom vap_cntl_status;
-	struct radeon_state_atom vir[2];	/* vap input route (2150/21E0) */
-	struct radeon_state_atom vic;	/* vap input control (2180) */
-	struct radeon_state_atom vap_psc_sgn_norm_cntl; /* Programmable Stream Control Signed Normalize Control (21DC) */
-	struct radeon_state_atom vap_clip_cntl;
-	struct radeon_state_atom vap_clip;
-	struct radeon_state_atom vap_pvs_vtx_timeout_reg;	/* Vertex timeout register (2288) */
-	struct radeon_state_atom pvs;	/* pvs_cntl (22D0) */
-	struct radeon_state_atom gb_enable;	/* (4008) */
-	struct radeon_state_atom gb_misc;	/* Multisampling position shifts ? (4010) */
-	struct radeon_state_atom ga_point_s0;	/* S Texture Coordinate of Vertex 0 for Point texture stuffing (LLC) (4200) */
-	struct radeon_state_atom ga_triangle_stipple;	/* (4214) */
-	struct radeon_state_atom ps;	/* pointsize (421C) */
-	struct radeon_state_atom ga_point_minmax;	/* (4230) */
-	struct radeon_state_atom lcntl;	/* line control */
-	struct radeon_state_atom ga_line_stipple;	/* (4260) */
-	struct radeon_state_atom shade;
-	struct radeon_state_atom polygon_mode;
-	struct radeon_state_atom fogp;	/* fog parameters (4294) */
-	struct radeon_state_atom ga_soft_reset;	/* (429C) */
-	struct radeon_state_atom zbias_cntl;
-	struct radeon_state_atom zbs;	/* zbias (42A4) */
-	struct radeon_state_atom occlusion_cntl;
-	struct radeon_state_atom cul;	/* cull cntl (42B8) */
-	struct radeon_state_atom su_depth_scale;	/* (42C0) */
-	struct radeon_state_atom rc;	/* rs control (4300) */
-	struct radeon_state_atom ri;	/* rs interpolators (4310) */
-	struct radeon_state_atom rr;	/* rs route (4330) */
-	struct radeon_state_atom sc_hyperz;	/* (43A4) */
-	struct radeon_state_atom sc_screendoor;	/* (43E8) */
-	struct radeon_state_atom fp;	/* fragment program cntl + nodes (4600) */
-	struct radeon_state_atom fpt;	/* texi - (4620) */
-	struct radeon_state_atom us_out_fmt;	/* (46A4) */
-	struct radeon_state_atom r500fp;	/* r500 fp instructions */
-	struct radeon_state_atom r500fp_const;	/* r500 fp constants */
-	struct radeon_state_atom fpi[4];	/* fp instructions (46C0/47C0/48C0/49C0) */
-	struct radeon_state_atom fogs;	/* fog state (4BC0) */
-	struct radeon_state_atom fogc;	/* fog color (4BC8) */
-	struct radeon_state_atom at;	/* alpha test (4BD4) */
-	struct radeon_state_atom fg_depth_src;	/* (4BD8) */
-	struct radeon_state_atom fpp;	/* 0x4C00 and following */
-	struct radeon_state_atom rb3d_cctl;	/* (4E00) */
-	struct radeon_state_atom bld;	/* blending (4E04) */
-	struct radeon_state_atom cmk;	/* colormask (4E0C) */
-	struct radeon_state_atom blend_color;	/* constant blend color */
-	struct radeon_state_atom rop;	/* ropcntl */
-	struct radeon_state_atom cb;	/* colorbuffer (4E28) */
-	struct radeon_state_atom rb3d_dither_ctl;	/* (4E50) */
-	struct radeon_state_atom rb3d_aaresolve_ctl;	/* (4E88) */
-	struct radeon_state_atom rb3d_discard_src_pixel_lte_threshold;	/* (4E88) I saw it only written on RV350 hardware..  */
-	struct radeon_state_atom zs;	/* zstencil control (4F00) */
-	struct radeon_state_atom zstencil_format;
-	struct radeon_state_atom zb;	/* z buffer (4F20) */
-	struct radeon_state_atom zb_depthclearvalue;	/* (4F28) */
-	struct radeon_state_atom unk4F30;	/* (4F30) */
-	struct radeon_state_atom zb_hiz_offset;	/* (4F44) */
-	struct radeon_state_atom zb_hiz_pitch;	/* (4F54) */
-
-	struct radeon_state_atom vpi;	/* vp instructions */
-	struct radeon_state_atom vpp;	/* vp parameters */
-	struct radeon_state_atom vps;	/* vertex point size (?) */
-	struct radeon_state_atom vpucp[6];	/* vp user clip plane - 6 */
-	/* 8 texture units */
-	/* the state is grouped by function and not by
-	   texture unit. This makes single unit updates
-	   really awkward - we are much better off
-	   updating the whole thing at once */
-	struct {
-		struct radeon_state_atom filter;
-		struct radeon_state_atom filter_1;
-		struct radeon_state_atom size;
-		struct radeon_state_atom format;
-		struct radeon_state_atom pitch;
-		struct radeon_state_atom offset;
-		struct radeon_state_atom chroma_key;
-		struct radeon_state_atom border_color;
-	} tex;
-	struct radeon_state_atom txe;	/* tex enable (4104) */
-
-	radeonTexObj *textures[R600_MAX_TEXTURE_UNITS];
-};
-
-/**
- * State cache
- */
-
-/* Vertex shader state */
-
 /* Perhaps more if we store programs in vmem? */
 /* drm_r600_cmd_header_t->vpu->count is unsigned char */
 #define VSF_MAX_FRAGMENT_LENGTH (255*4)
@@ -407,19 +93,6 @@ struct r600_hw_state {
 #define STATE_R600_WINDOW_DIMENSION (STATE_INTERNAL_DRIVER+0)
 #define STATE_R600_TEXRECT_FACTOR (STATE_INTERNAL_DRIVER+1)
 
-struct r600_vertex_shader_fragment {
-	int length;
-	union {
-		GLuint d[VSF_MAX_FRAGMENT_LENGTH];
-		float f[VSF_MAX_FRAGMENT_LENGTH];
-		GLuint i[VSF_MAX_FRAGMENT_LENGTH];
-	} body;
-};
-
-struct r600_vertex_shader_state {
-	struct r600_vertex_shader_fragment program;
-};
-
 extern int hw_tcl_on;
 
 #define COLOR_IS_RGBA
@@ -427,219 +100,18 @@ extern int hw_tcl_on;
 #include "tnl_dd/t_dd_vertex.h"
 #undef TAG
 
-//#define CURRENT_VERTEX_SHADER(ctx) (ctx->VertexProgram._Current)
-#define CURRENT_VERTEX_SHADER(ctx) (R600_CONTEXT(ctx)->selected_vp)
-
-/* Should but doesnt work */
-//#define CURRENT_VERTEX_SHADER(ctx) (R600_CONTEXT(ctx)->curr_vp)
-
-/* r600_vertex_shader_state and r600_vertex_program should probably be merged together someday.
- * Keeping them them seperate for now should ensure fixed pipeline keeps functioning properly.
- */
-
-struct r600_vertex_program_key {
-	GLuint InputsRead;
-	GLuint OutputsWritten;
-	GLuint OutputsAdded;
-};
-
-struct r600_vertex_program {
-	struct r600_vertex_program *next;
-	struct r600_vertex_program_key key;
-	int translated;
-
-	struct r600_vertex_shader_fragment program;
-
-	int pos_end;
-	int num_temporaries;	/* Number of temp vars used by program */
-	int wpos_idx;
-	int inputs[VERT_ATTRIB_MAX];
-	int outputs[VERT_RESULT_MAX];
-	int native;
-	int ref_count;
-	int use_ref_count;
-};
-
-struct r600_vertex_program_cont {
-	struct gl_vertex_program mesa_program;	/* Must be first */
-	struct r600_vertex_shader_fragment params;
-	struct r600_vertex_program *progs;
-};
-
 #define PFS_MAX_ALU_INST	64
 #define PFS_MAX_TEX_INST	64
 #define PFS_MAX_TEX_INDIRECT 4
 #define PFS_NUM_TEMP_REGS	32
 #define PFS_NUM_CONST_REGS	16
 
-struct r600_pfs_compile_state;
-
-
-/**
- * Stores state that influences the compilation of a fragment program.
- */
-struct r600_fragment_program_external_state {
-	struct {
-		/**
-		 * If the sampler is used as a shadow sampler,
-		 * this field is:
-		 *  0 - GL_LUMINANCE
-		 *  1 - GL_INTENSITY
-		 *  2 - GL_ALPHA
-		 * depending on the depth texture mode.
-		 */
-		GLuint depth_texture_mode : 2;
-
-		/**
-		 * If the sampler is used as a shadow sampler,
-		 * this field is (texture_compare_func - GL_NEVER).
-		 * [e.g. if compare function is GL_LEQUAL, this field is 3]
-		 *
-		 * Otherwise, this field is 0.
-		 */
-		GLuint texture_compare_func : 3;
-	} unit[16];
-};
-
-
-struct r600_fragment_program_node {
-	int tex_offset; /**< first tex instruction */
-	int tex_end; /**< last tex instruction, relative to tex_offset */
-	int alu_offset; /**< first ALU instruction */
-	int alu_end; /**< last ALU instruction, relative to alu_offset */
-	int flags;
-};
-
-/**
- * Stores an R600 fragment program in its compiled-to-hardware form.
- */
-struct r600_fragment_program_code {
-	struct {
-		int length; /**< total # of texture instructions used */
-		GLuint inst[PFS_MAX_TEX_INST];
-	} tex;
-
-	struct {
-		int length; /**< total # of ALU instructions used */
-		struct {
-			GLuint inst0;
-			GLuint inst1;
-			GLuint inst2;
-			GLuint inst3;
-		} inst[PFS_MAX_ALU_INST];
-	} alu;
-
-	struct r600_fragment_program_node node[4];
-	int cur_node;
-	int first_node_has_tex;
-
-	/**
-	 * Remember which program register a given hardware constant
-	 * belongs to.
-	 */
-	struct prog_src_register constant[PFS_NUM_CONST_REGS];
-	int const_nr;
-
-	int max_temp_idx;
-};
-
-/**
- * Store everything about a fragment program that is needed
- * to render with that program.
- */
-struct r600_fragment_program {
-	struct gl_fragment_program mesa_program;
-
-	GLboolean translated;
-	GLboolean error;
-
-	struct r600_fragment_program_external_state state;
-	struct r600_fragment_program_code code;
-
-	GLboolean WritesDepth;
-	GLuint optimization;
-};
-
-struct r500_pfs_compile_state;
-
-struct r500_fragment_program_external_state {
-	struct {
-		/**
-		 * If the sampler is used as a shadow sampler,
-		 * this field is:
-		 *  0 - GL_LUMINANCE
-		 *  1 - GL_INTENSITY
-		 *  2 - GL_ALPHA
-		 * depending on the depth texture mode.
-		 */
-		GLuint depth_texture_mode : 2;
-
-		/**
-		 * If the sampler is used as a shadow sampler,
-		 * this field is (texture_compare_func - GL_NEVER).
-		 * [e.g. if compare function is GL_LEQUAL, this field is 3]
-		 *
-		 * Otherwise, this field is 0.
-		 */
-		GLuint texture_compare_func : 3;
-	} unit[16];
-};
-
-struct r500_fragment_program_code {
-	struct {
-		GLuint inst0;
-		GLuint inst1;
-		GLuint inst2;
-		GLuint inst3;
-		GLuint inst4;
-		GLuint inst5;
-	} inst[512];
-
-	int inst_offset;
-	int inst_end;
-
-	/**
-	 * Remember which program register a given hardware constant
-	 * belongs to.
-	 */
-	struct prog_src_register constant[PFS_NUM_CONST_REGS];
-	int const_nr;
-
-	int max_temp_idx;
-};
-
-struct r500_fragment_program {
-	struct gl_fragment_program mesa_program;
-
-	GLcontext *ctx;
-	GLboolean translated;
-	GLboolean error;
-
-	struct r500_fragment_program_external_state state;
-	struct r500_fragment_program_code code;
-
-	GLboolean writes_depth;
-
-	GLuint optimization;
-};
-
 #define R600_MAX_AOS_ARRAYS		16
 
 #define REG_COORDS	0
 #define REG_COLOR0	1
 #define REG_TEX0	2
 
-struct r600_state {
-	struct r600_texture_state texture;
-	int sw_tcl_inputs[VERT_ATTRIB_MAX];
-	struct r600_vertex_shader_state vertex_shader;
-
-
-	DECLARE_RENDERINPUTS(render_inputs_bitset);	/* actual render inputs that R600 was configured for.
-							   They are the same as tnl->render_inputs for fixed pipeline */
-
-};
-
 #define R600_FALLBACK_NONE 0
 #define R600_FALLBACK_TCL 1
 #define R600_FALLBACK_RAST 2
@@ -668,6 +140,71 @@ struct r600_swtcl_info {
    GLubyte vertex_attr_count;
 };
 
+/* to be enabled */ /* DELETE FOLLOWING 2 SRTUCTS */
+struct r600_dma_buffer 
+{
+    int         refcount;       /* the number of retained regions in buf */
+    drmBufPtr   buf;
+    int         id;
+};
+struct r600_dma_region 
+{
+    struct r600_dma_buffer  *buf;
+    char        *address;       /* == buf->address */
+    int         start;
+    int         end;
+    int         ptr;            /* offsets from start of buf */
+
+    int         aos_offset;     /* address in GART memory */
+    int         aos_stride;     /* distance between elements, in dwords */
+    int         aos_size;       /* number of components (1-4) */
+};
+/* ----------------------- */
+
+typedef struct chip_object
+{
+    void      *pvChipObj;
+
+    /* ------------  OUT ------------------- */
+    GLboolean (*DestroyChipObj)(void* pvChipObj);
+
+    void      (*InitFuncs)(struct dd_function_table *functions);
+
+    void      (*InitState)(GLcontext * ctx);
+
+    GLuint    (*GetTexObjSize)(void);
+
+    /* ------------  IN  ------------------- */
+    void      (*EmitShader)( GLcontext * ctx, 
+                             struct r600_dma_region *rvb,
+			                 GLvoid * data, 
+                             int sizeinDWORD);
+    void      (*FreeDmaRegion)( GLcontext * ctx, 
+                                struct r600_dma_region *region);
+    void      (*EmitVec)(GLcontext * ctx, 
+                         struct r600_dma_region *rvb,
+			             GLvoid * data, 
+                         int size, 
+                         int stride, 
+                         int count);
+    void      (*MemUse)(context_t *context, int id);
+    void      (*ReleaseArrays)(GLcontext * ctx);
+    int       (*FlushCmdBuffer)(GLcontext * ctx);
+    GLboolean (*LoadMemSurf)(context_t *context,
+                               GLuint     dst_offset, /* gpu addr */
+                               GLuint     dst_pitch_in_pixel,                               
+                               GLuint     src_width_in_pixel,
+                               GLuint     height,
+                               GLuint     byte_per_pixel,
+                               unsigned char* pSrc); /* source data */    
+    GLboolean (*AllocMemSurf)(context_t   *context,
+                           void  **ppmemBlock,
+                           void  **ppheap,
+                           GLuint      *prefered_heap, 
+                           GLuint       totalSize);
+    
+    struct tnl_pipeline_stage **stages;
+} chip_object;
 
 /**
  * \brief R600 context structure.
@@ -675,11 +212,8 @@ struct r600_swtcl_info {
 struct r600_context {
 	struct radeon_context radeon;	/* parent class, must be first */
 
-	struct r600_hw_state hw;
-
-	struct r600_state state;
-	struct gl_vertex_program *curr_vp;
-	struct r600_vertex_program *selected_vp;
+    /* ------ */
+    chip_object chipobj;
 
 	/* Vertex buffers
 	 */
@@ -693,18 +227,14 @@ struct r600_context {
 };
 
 #define R600_CONTEXT(ctx)		((r600ContextPtr)(ctx->DriverCtx))
+#define R700_CONTEXT(ctx)		((context_t *)(ctx->DriverCtx))
+#define GL_CONTEXT(context)     ((GLcontext *)(context->radeon.glCtx))
 
 extern void r600DestroyContext(__DRIcontextPrivate * driContextPriv);
 extern GLboolean r600CreateContext(const __GLcontextModes * glVisual,
 				   __DRIcontextPrivate * driContextPriv,
 				   void *sharedContextPrivate);
 
-extern void r600SelectVertexShader(r600ContextPtr r600);
-extern void r600InitShaderFuncs(struct dd_function_table *functions);
-extern int r600VertexProgUpdateParams(GLcontext * ctx,
-				      struct r600_vertex_program_cont *vp,
-				      float *dst);
-
 #define RADEON_D_CAPTURE 0
 #define RADEON_D_PLAYBACK 1
 #define RADEON_D_PLAYBACK_RAW 2