r300: finish blit support for r300

[mesa.git] / src / mesa / drivers / dri / r300 / r300_emit.h

diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 94b0a7ebe80a30159678be23da0a4cc06a9794e5..a456d8867c4aaaa92d9b72dcb8a3708d49727b58 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -42,7 +42,6 @@
 #include "main/glheader.h"
 #include "r300_context.h"
 #include "r300_cmdbuf.h"
-#include "radeon_reg.h"
 
 static INLINE uint32_t cmdpacket0(struct radeon_screen *rscrn,
                                   int reg, int count)
@@ -50,6 +49,7 @@ static INLINE uint32_t cmdpacket0(struct radeon_screen *rscrn,
     if (!rscrn->kernel_mm) {
            drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.packet0.cmd_type = R300_CMD_PACKET0;
            cmd.packet0.count = count;
        cmd.packet0.reghi = ((unsigned int)reg & 0xFF00) >> 8;
@@ -67,6 +67,7 @@ static INLINE uint32_t cmdvpu(struct radeon_screen *rscrn, int addr, int count)
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.vpu.cmd_type = R300_CMD_VPU;
        cmd.vpu.count = count;
        cmd.vpu.adrhi = ((unsigned int)addr & 0xFF00) >> 8;
@@ -80,6 +81,7 @@ static INLINE uint32_t cmdr500fp(struct radeon_screen *rscrn,
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.r500fp.cmd_type = R300_CMD_R500FP;
        cmd.r500fp.count = count;
        cmd.r500fp.adrhi_flags = ((unsigned int)addr & 0x100) >> 8;
@@ -94,17 +96,20 @@ static INLINE uint32_t cmdpacket3(struct radeon_screen *rscrn, int packet)
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.packet3.cmd_type = R300_CMD_PACKET3;
        cmd.packet3.packet = packet;
 
        return cmd.u;
 }
 
-static INLINE uint32_t cmdcpdelay(struct radeon_screen *rscrn,  
+static INLINE uint32_t cmdcpdelay(struct radeon_screen *rscrn,
                                   unsigned short count)
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
+
        cmd.delay.cmd_type = R300_CMD_CP_DELAY;
        cmd.delay.count = count;
 
@@ -116,6 +121,7 @@ static INLINE uint32_t cmdwait(struct radeon_screen *rscrn,
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.wait.cmd_type = R300_CMD_WAIT;
        cmd.wait.flags = flags;
 
@@ -126,6 +132,7 @@ static INLINE uint32_t cmdpacify(struct radeon_screen *rscrn)
 {
        drm_r300_cmd_header_t cmd;
 
+       cmd.u = 0;
        cmd.header.cmd_type = R300_CMD_END3D;
 
        return cmd.u;
@@ -146,36 +153,36 @@ static INLINE uint32_t cmdpacify(struct radeon_screen *rscrn)
 /**
  * Must be sent to switch to 2d commands
  */
-void static INLINE end_3d(r300ContextPtr rmesa)
+void static INLINE end_3d(radeonContextPtr radeon)
 {
-       BATCH_LOCALS(&rmesa->radeon);
+       BATCH_LOCALS(radeon);
 
-    if (!rmesa->radeon.radeonScreen->kernel_mm) {
-       BEGIN_BATCH(1);
-           OUT_BATCH(cmdpacify(rmesa->radeon.radeonScreen));
-       END_BATCH();
-    }
+       if (!radeon->radeonScreen->kernel_mm) {
+               BEGIN_BATCH_NO_AUTOSTATE(1);
+               OUT_BATCH(cmdpacify(radeon->radeonScreen));
+               END_BATCH();
+       }
 }
 
 void static INLINE cp_delay(r300ContextPtr rmesa, unsigned short count)
 {
        BATCH_LOCALS(&rmesa->radeon);
 
-    if (!rmesa->radeon.radeonScreen->kernel_mm) {
-       BEGIN_BATCH(1);
-           OUT_BATCH(cmdcpdelay(rmesa->radeon.radeonScreen, count));
-       END_BATCH();
-    }
+       if (!rmesa->radeon.radeonScreen->kernel_mm) {
+               BEGIN_BATCH_NO_AUTOSTATE(1);
+               OUT_BATCH(cmdcpdelay(rmesa->radeon.radeonScreen, count));
+               END_BATCH();
+       }
 }
 
-void static INLINE cp_wait(r300ContextPtr rmesa, unsigned char flags)
+void static INLINE cp_wait(radeonContextPtr radeon, unsigned char flags)
 {
-       BATCH_LOCALS(&rmesa->radeon);
+       BATCH_LOCALS(radeon);
        uint32_t wait_until;
 
-       if (!rmesa->radeon.radeonScreen->kernel_mm) {
+       if (!radeon->radeonScreen->kernel_mm) {
                BEGIN_BATCH_NO_AUTOSTATE(1);
-               OUT_BATCH(cmdwait(rmesa->radeon.radeonScreen, flags));
+               OUT_BATCH(cmdwait(radeon->radeonScreen, flags));
                END_BATCH();
        } else {
                switch(flags) {
@@ -208,20 +215,14 @@ void static INLINE cp_wait(r300ContextPtr rmesa, unsigned char flags)
        }
 }
 
-extern int r300EmitArrays(GLcontext * ctx);
-
-extern void r300ReleaseArrays(GLcontext * ctx);
 extern int r300PrimitiveType(r300ContextPtr rmesa, int prim);
 extern int r300NumVerts(r300ContextPtr rmesa, int num_verts, int prim);
 
 extern void r300EmitCacheFlush(r300ContextPtr rmesa);
 
-extern GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
-                                int *inputs, GLint * tab, GLuint nr);
-extern GLuint r300VAPInputRoute1(uint32_t * dst, int swizzle[][4], GLuint nr);
 extern GLuint r300VAPInputCntl0(GLcontext * ctx, GLuint InputsRead);
 extern GLuint r300VAPInputCntl1(GLcontext * ctx, GLuint InputsRead);
-extern GLuint r300VAPOutputCntl0(GLcontext * ctx, GLuint OutputsWritten);
-extern GLuint r300VAPOutputCntl1(GLcontext * ctx, GLuint OutputsWritten);
+extern GLuint r300VAPOutputCntl0(GLcontext * ctx, GLuint vp_writes);
+extern GLuint r300VAPOutputCntl1(GLcontext * ctx, GLuint vp_writes);
 
 #endif