radeon: Add r6xx/r7xx chip family to get_chip_family_name

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

diff --git a/src/mesa/drivers/dri/r300/r500_fragprog.h b/src/mesa/drivers/dri/r300/r500_fragprog.h
index ff6a9002c14e9395ce5a95d57361b27558c8d88d..1179bf660738443f2e8f076eda9cba6acc6009e2 100644 (file)
--- a/src/mesa/drivers/dri/r300/r500_fragprog.h
+++ b/src/mesa/drivers/dri/r300/r500_fragprog.h
@@ -33,60 +33,20 @@
 #ifndef __R500_FRAGPROG_H_
 #define __R500_FRAGPROG_H_
 
-#include "glheader.h"
-#include "macros.h"
-#include "enums.h"
 #include "shader/prog_parameter.h"
-#include "shader/prog_print.h"
-#include "shader/program.h"
 #include "shader/prog_instruction.h"
 
 #include "r300_context.h"
-#include "r300_state.h"
-#include "radeon_program.h"
+#include "radeon_nqssadce.h"
 
-/* supported hw opcodes */
-#define PFS_OP_MAD 0
-#define PFS_OP_DP3 1
-#define PFS_OP_DP4 2
-#define PFS_OP_MIN 3
-#define PFS_OP_MAX 4
-#define PFS_OP_CMP 5
-#define PFS_OP_FRC 6
-#define PFS_OP_EX2 7
-#define PFS_OP_LG2 8
-#define PFS_OP_RCP 9
-#define PFS_OP_RSQ 10
-#define PFS_OP_REPL_ALPHA 11
-#define PFS_OP_CMPH 12
-#define MAX_PFS_OP 12
+extern GLboolean r500BuildFragmentProgramHwCode(struct r300_fragment_program_compiler *compiler);
 
-#define PFS_FLAG_SAT   (1 << 0)
-#define PFS_FLAG_ABS   (1 << 1)
+extern void r500FragmentProgramDump(union rX00_fragment_program_code *c);
 
-#define ARG_NEG                        (1 << 5)
-#define ARG_ABS                        (1 << 6)
-#define ARG_MASK               (127 << 0)
-#define ARG_STRIDE             7
-#define SRC_CONST              (1 << 5)
-#define SRC_MASK               (63 << 0)
-#define SRC_STRIDE             6
+extern GLboolean r500FPIsNativeSwizzle(GLuint opcode, struct prog_src_register reg);
 
-#define DRI_CONF_FP_OPTIMIZATION_SPEED   0
-#define DRI_CONF_FP_OPTIMIZATION_QUALITY 1
+extern void r500FPBuildSwizzle(struct nqssadce_state *s, struct prog_dst_register dst, struct prog_src_register src);
 
-struct r500_fragment_program;
-
-extern void r500TranslateFragmentShader(r300ContextPtr r300,
-                                       struct r500_fragment_program *fp);
-
-struct r500_fragment_program_compiler {
-       r300ContextPtr r300;
-       struct r500_fragment_program *fp;
-       struct r500_fragment_program_code *code;
-       struct radeon_compiler compiler;
-};
-
-extern GLboolean r500FragmentProgramEmit(struct r500_fragment_program_compiler *compiler);
+extern GLboolean r500_transform_TEX(struct radeon_transform_context *t, struct prog_instruction* orig_inst, void* data);
 
 #endif