Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / r300 / compiler / radeon_program_pair.h

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
index da2bcc5d8999ce723c45e3c67119e3612072a866..6685ade3ea844eea7224264083395530f908f6cf 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_pair.h
@@ -28,24 +28,37 @@
 #ifndef __RADEON_PROGRAM_PAIR_H_
 #define __RADEON_PROGRAM_PAIR_H_
 
-#include "radeon_program.h"
+#include "radeon_code.h"
+#include "radeon_opcodes.h"
+#include "radeon_program_constants.h"
 
 struct r300_fragment_program_compiler;
 
 
 /**
- * Represents a paired instruction, as found in R300 and R500
+ * \file
+ * Represents a paired ALU instruction, as found in R300 and R500
  * fragment programs.
+ *
+ * Note that this representation is taking some liberties as far
+ * as register files are concerned, to allow separate register
+ * allocation.
+ *
+ * Also note that there are some subtleties in that the semantics
+ * of certain opcodes are implicitly changed in this representation;
+ * see \ref rc_pair_translate
  */
+
+
 struct radeon_pair_instruction_source {
-       unsigned int Index:8;
-       unsigned int Constant:1;
        unsigned int Used:1;
+       unsigned int File:3;
+       unsigned int Index:RC_REGISTER_INDEX_BITS;
 };
 
 struct radeon_pair_instruction_rgb {
        unsigned int Opcode:8;
-       unsigned int DestIndex:8;
+       unsigned int DestIndex:RC_REGISTER_INDEX_BITS;
        unsigned int WriteMask:3;
        unsigned int OutputWriteMask:3;
        unsigned int Saturate:1;
@@ -62,7 +75,7 @@ struct radeon_pair_instruction_rgb {
 
 struct radeon_pair_instruction_alpha {
        unsigned int Opcode:8;
-       unsigned int DestIndex:8;
+       unsigned int DestIndex:RC_REGISTER_INDEX_BITS;
        unsigned int WriteMask:1;
        unsigned int OutputWriteMask:1;
        unsigned int DepthWriteMask:1;
@@ -78,66 +91,34 @@ struct radeon_pair_instruction_alpha {
        } Arg[3];
 };
 
-struct radeon_pair_instruction {
+struct rc_pair_instruction {
        struct radeon_pair_instruction_rgb RGB;
        struct radeon_pair_instruction_alpha Alpha;
-};
-
 
-enum {
-       RADEON_OPCODE_TEX = 0,
-       RADEON_OPCODE_TXB,
-       RADEON_OPCODE_TXP,
-       RADEON_OPCODE_KIL
+       unsigned int WriteALUResult:2;
+       unsigned int ALUResultCompare:3;
 };
 
-struct radeon_pair_texture_instruction {
-       unsigned int Opcode:2; /**< one of RADEON_OPCODE_xxx */
-
-       unsigned int DestIndex:8;
-       unsigned int WriteMask:4;
 
-       unsigned int TexSrcUnit:5;
-       unsigned int TexSrcTarget:3;
-
-       unsigned int SrcIndex:8;
-       unsigned int SrcSwizzle:12;
-};
+/**
+ * General helper functions for dealing with the paired instruction format.
+ */
+/*@{*/
+int rc_pair_alloc_source(struct rc_pair_instruction *pair,
+       unsigned int rgb, unsigned int alpha,
+       rc_register_file file, unsigned int index);
+/*@}*/
 
 
 /**
- *
+ * Compiler passes that operate with the paired format.
  */
-struct radeon_pair_handler {
-       /**
-        * Write a paired instruction to the hardware.
-        *
-        * @return 0 on error.
-        */
-       int (*EmitPaired)(void*, struct radeon_pair_instruction*);
-
-       /**
-        * Write a texture instruction to the hardware.
-        * Register indices have already been rewritten to the allocated
-        * hardware register numbers.
-        *
-        * @return 0 on error.
-        */
-       int (*EmitTex)(void*, struct radeon_pair_texture_instruction*);
-
-       /**
-        * Called before a block of contiguous, independent texture
-        * instructions is emitted.
-        */
-       int (*BeginTexBlock)(void*);
-
-       unsigned MaxHwTemps;
-};
-
-void radeonPairProgram(
-       struct r300_fragment_program_compiler * compiler,
-       const struct radeon_pair_handler*, void *userdata);
+/*@{*/
+struct radeon_pair_handler;
 
-void radeonPrintPairInstruction(struct radeon_pair_instruction *inst);
+void rc_pair_translate(struct r300_fragment_program_compiler *c);
+void rc_pair_schedule(struct r300_fragment_program_compiler *c);
+void rc_pair_regalloc(struct r300_fragment_program_compiler *c, unsigned maxtemps);
+/*@}*/
 
 #endif /* __RADEON_PROGRAM_PAIR_H_ */