aco: fix rebase error from GS copy shader support
authorRhys Perry <pendingchaos02@gmail.com>
Tue, 28 Jan 2020 13:29:14 +0000 (13:29 +0000)
committerMarge Bot <eric+marge@anholt.net>
Tue, 28 Jan 2020 13:50:53 +0000 (13:50 +0000)
commit7edcf4a59d060efb5ee7c31f9b8346f7c43a138d
tree853bf244a5e796bd83a83953a3903d279a546414
parentdd9bf7d2911709fa5ae1c32f1fce725d4e65107e
aco: fix rebase error from GS copy shader support

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Fixes: f8f7712666b ('aco: implement GS copy shaders')
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3601>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3601>
src/amd/compiler/aco_instruction_selection_setup.cpp