Mesa (master): radeonsi: move r600_viewport.c to si_viewport.c

[Nicolai Hähnle]

Module: Mesa
Branch: master
Commit: c955f4594654eab28e342f72b42d8746c83843d5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c955f4594654eab28e342f72b42d8746c83843d5

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Tue Sep 26 17:17:55 2017 +0200

radeonsi: move r600_viewport.c to si_viewport.c

This is purely a file-move + #include fixup + build system changes.
Other cleanups will follow in subsequent commits.

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeon/Makefile.sources                             | 1 -
 src/gallium/drivers/radeonsi/Makefile.sources                           | 1 +
 .../drivers/{radeon/r600_viewport.c => radeonsi/si_state_viewport.c}    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
index f4e817e56e..5d38bb36b4 100644
--- a/src/gallium/drivers/radeon/Makefile.sources
+++ b/src/gallium/drivers/radeon/Makefile.sources
@@ -11,7 +11,6 @@ C_SOURCES := \
 	r600_streamout.c \
 	r600_test_dma.c \
 	r600_texture.c \
-	r600_viewport.c \
 	radeon_uvd.c \
 	radeon_uvd.h \
 	radeon_vcn_dec.c \
diff --git a/src/gallium/drivers/radeonsi/Makefile.sources b/src/gallium/drivers/radeonsi/Makefile.sources
index 3795bedb6b..ed3e52046c 100644
--- a/src/gallium/drivers/radeonsi/Makefile.sources
+++ b/src/gallium/drivers/radeonsi/Makefile.sources
@@ -30,5 +30,6 @@ C_SOURCES := \
 	si_state_binning.c \
 	si_state_draw.c \
 	si_state_shaders.c \
+	si_state_viewport.c \
 	si_state.h \
 	si_uvd.c
diff --git a/src/gallium/drivers/radeon/r600_viewport.c b/src/gallium/drivers/radeonsi/si_state_viewport.c
similarity index 99%
rename from src/gallium/drivers/radeon/r600_viewport.c
rename to src/gallium/drivers/radeonsi/si_state_viewport.c
index 6e4fc9d751..00fa4c0d02 100644
--- a/src/gallium/drivers/radeon/r600_viewport.c
+++ b/src/gallium/drivers/radeonsi/si_state_viewport.c
@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "r600_cs.h"
+#include "radeon/r600_cs.h"
 #include "util/u_viewport.h"
 #include "tgsi/tgsi_scan.h"