diff options
| author | Corbin Simpson <[email protected]> | 2009-05-20 16:53:45 -0700 |
|---|---|---|
| committer | Corbin Simpson <[email protected]> | 2009-05-20 16:53:45 -0700 |
| commit | f1f0893eba6a3785d309f60ce4027980237fb8a6 (patch) | |
| tree | 95b7e4131ec302fa81786c1a9fa20290b4d8bacf /src | |
| parent | d67fb5ea1d93db3f64720994017c312a04867eea (diff) | |
r300-gallium: r500-fs: Combine function.
Diffstat (limited to 'src')
| -rw-r--r-- | 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 d087771c3e7..8a3e380eec4 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: |