r300: Move Mesa -> RC program conversion to classic Mesa driver

This really doesn't belong into the compiler itself, since the compiler
should eventually be independent of Mesa's program representation.

Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>

diff --git a/src/mesa/drivers/dri/r300/Makefile b/src/mesa/drivers/dri/r300/Makefile
index 188efcb7a0754a99e8af70af2d04a709a61d5c25..5d1e2c0adc72d1e274db0cb1b950fd8c23fc5238 100644 (file)
--- a/src/mesa/drivers/dri/r300/Makefile
+++ b/src/mesa/drivers/dri/r300/Makefile
@@ -53,6 +53,7 @@ DRIVER_SOURCES = \
                 r300_vertprog.c \
                 r300_fragprog_common.c \
                 r300_shader.c \
+                radeon_mesa_to_rc.c \
                 r300_emit.c \
                 r300_swtcl.c \
                 $(RADEON_COMMON_SOURCES) \

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_compiler.h b/src/mesa/drivers/dri/r300/compiler/radeon_compiler.h
index e63ab8840abbfc104cdbc39f08d2280b8aa088fe..fbe7c37dd18abddfa82696dda7145bfd4ed398dc 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_compiler.h
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_compiler.h
@@ -67,8 +67,6 @@ void rc_destroy(struct radeon_compiler * c);
 void rc_debug(struct radeon_compiler * c, const char * fmt, ...);
 void rc_error(struct radeon_compiler * c, const char * fmt, ...);
 
-void rc_mesa_to_rc_program(struct radeon_compiler * c, struct gl_program * program);
-
 void rc_calculate_inputs_outputs(struct radeon_compiler * c);
 
 void rc_move_input(struct radeon_compiler * c, unsigned input, struct prog_src_register new_input);

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program.c b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
index bbbf0dd776832b2212849a630974c9664377b3a5..bf7f9ac92c7a39e549561465a0157fb08a395582 100644 (file)
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program.c
@@ -136,32 +136,6 @@ void rc_remove_instruction(struct rc_instruction * inst)
 }
 
 
-void rc_mesa_to_rc_program(struct radeon_compiler * c, struct gl_program * program)
-{
-       struct prog_instruction *source;
-       unsigned int i;
-
-       for(source = program->Instructions; source->Opcode != OPCODE_END; ++source) {
-               struct rc_instruction * dest = rc_insert_new_instruction(c, c->Program.Instructions.Prev);
-               dest->I = *source;
-       }
-
-       c->Program.ShadowSamplers = program->ShadowSamplers;
-       c->Program.InputsRead = program->InputsRead;
-       c->Program.OutputsWritten = program->OutputsWritten;
-
-       for(i = 0; i < program->Parameters->NumParameters; ++i) {
-               struct rc_constant constant;
-
-               constant.Type = RC_CONSTANT_EXTERNAL;
-               constant.Size = 4;
-               constant.u.External = i;
-
-               rc_constants_add(&c->Program.Constants, &constant);
-       }
-}
-
-
 /**
  * Print program to stderr, default options.
  */

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index e1dc23102704a5acf4a3530579ecf8a5a66f5051..ea6ff03e613098076285b9cb1467495ed8336e2a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -44,6 +44,7 @@
 
 #include "compiler/radeon_compiler.h"
 
+#include "radeon_mesa_to_rc.h"
 #include "r300_state.h"
 
 
@@ -218,7 +219,7 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog
                fflush(stderr);
        }
 
-       rc_mesa_to_rc_program(&compiler.Base, &cont->Base.Base);
+       radeon_mesa_to_rc_program(&compiler.Base, &cont->Base.Base);
 
        insert_WPOS_trailer(&compiler, fp);
 

diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 9fe6c18f564ca06f4cf5c80d8f0bf925b9b0b0df..be21268ba5e8f5551ee1198fc9934371cada55d3 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -42,6 +42,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "compiler/radeon_compiler.h"
 #include "compiler/radeon_nqssadce.h"
+#include "radeon_mesa_to_rc.h"
 #include "r300_context.h"
 #include "r300_state.h"
 
@@ -232,7 +233,7 @@ static struct r300_vertex_program *build_program(GLcontext *ctx,
                _mesa_insert_mvp_code(ctx, vp->Base);
        }
 
-       rc_mesa_to_rc_program(&compiler.Base, &vp->Base->Base);
+       radeon_mesa_to_rc_program(&compiler.Base, &vp->Base->Base);
 
        rc_move_output(&compiler.Base, VERT_RESULT_PSIZ, VERT_RESULT_PSIZ, WRITEMASK_X);
 

diff --git a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
new file mode 100644 (file)
index 0000000..13b9d35
--- /dev/null
+++ b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2009 Nicolai Haehnle.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#include "radeon_mesa_to_rc.h"
+
+#include "main/mtypes.h"
+#include "shader/prog_parameter.h"
+
+#include "compiler/radeon_compiler.h"
+#include "compiler/radeon_program.h"
+
+
+void radeon_mesa_to_rc_program(struct radeon_compiler * c, struct gl_program * program)
+{
+       struct prog_instruction *source;
+       unsigned int i;
+
+       for(source = program->Instructions; source->Opcode != OPCODE_END; ++source) {
+               struct rc_instruction * dest = rc_insert_new_instruction(c, c->Program.Instructions.Prev);
+               dest->I = *source;
+       }
+
+       c->Program.ShadowSamplers = program->ShadowSamplers;
+       c->Program.InputsRead = program->InputsRead;
+       c->Program.OutputsWritten = program->OutputsWritten;
+
+       for(i = 0; i < program->Parameters->NumParameters; ++i) {
+               struct rc_constant constant;
+
+               constant.Type = RC_CONSTANT_EXTERNAL;
+               constant.Size = 4;
+               constant.u.External = i;
+
+               rc_constants_add(&c->Program.Constants, &constant);
+       }
+}

diff --git a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.h b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.h
new file mode 100644 (file)
index 0000000..9511a04
--- /dev/null
+++ b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2009 Nicolai Haehnle.
+ *
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT OWNER(S) AND/OR ITS SUPPLIERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ */
+
+#ifndef RADEON_MESA_TO_RC_H
+#define RADEON_MESA_TO_RC_H
+
+struct gl_program;
+struct radeon_compiler;
+
+void radeon_mesa_to_rc_program(struct radeon_compiler * c, struct gl_program * program);
+
+#endif /* RADEON_MESA_TO_RC_H */