Age | Commit message (Collapse) | Author |
|
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
|
|
There were additional non-textual conflicts.
Conflicts:
src/gallium/drivers/r300/r300_tgsi_to_rc.c
src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
src/mesa/drivers/dri/r300/compiler/radeon_program.c
src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
|
|
In particular, this removes the dependency on prog_instruction, which
unfortunately creates some code duplication, but also opens a path towards
adding some hardware-specific things in there.
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
|
|
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>
|