Mesa (master): r300-gallium: r500-fs: Combine function.
Corbin Simpson
csimpson at kemper.freedesktop.org
Thu May 21 06:22:51 UTC 2009
Module: Mesa
Branch: master
Commit: f1f0893eba6a3785d309f60ce4027980237fb8a6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1f0893eba6a3785d309f60ce4027980237fb8a6
Author: Corbin Simpson <MostAwesomeDude at gmail.com>
Date: Wed May 20 16:53:45 2009 -0700
r300-gallium: r500-fs: Combine function.
---
src/gallium/drivers/r300/r300_state_shader.c | 21 ++++++---------------
1 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_state_shader.c b/src/gallium/drivers/r300/r300_state_shader.c
index d087771..8a3e380 100644
--- a/src/gallium/drivers/r300/r300_state_shader.c
+++ b/src/gallium/drivers/r300/r300_state_shader.c
@@ -306,9 +306,12 @@ static INLINE void r300_emit_maths(struct r300_fragment_shader* fs,
}
/* Setup an ALU operation. */
-static INLINE void r500_emit_alu(struct r500_fragment_shader* fs,
- struct r300_fs_asm* assembler,
- struct tgsi_full_dst_register* dst)
+static INLINE void r500_emit_maths(struct r500_fragment_shader* fs,
+ struct r300_fs_asm* assembler,
+ struct tgsi_full_src_register* src,
+ struct tgsi_full_dst_register* dst,
+ unsigned op,
+ unsigned count)
{
int i = fs->instruction_count;
@@ -331,18 +334,6 @@ static INLINE void r500_emit_alu(struct r500_fragment_shader* fs,
R500_ALPHA_ADDRD(r300_fs_dst(assembler, &dst->DstRegister));
fs->instructions[i].inst5 =
R500_ALU_RGBA_ADDRD(r300_fs_dst(assembler, &dst->DstRegister));
-}
-
-static INLINE void r500_emit_maths(struct r500_fragment_shader* fs,
- struct r300_fs_asm* assembler,
- struct tgsi_full_src_register* src,
- struct tgsi_full_dst_register* dst,
- unsigned op,
- unsigned count)
-{
- int i = fs->instruction_count;
-
- r500_emit_alu(fs, assembler, dst);
switch (count) {
case 3:
More information about the mesa-commit
mailing list