radeonsi: Apply si_* file naming scheme.

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

src/gallium/drivers/radeonsi/Makefile.sources

@@ -1,16 +1,16 @@
 C_SOURCES := \
-	r600_blit.c \
-	r600_buffer.c \
-	r600_hw_context.c \
-	radeonsi_pipe.c \
-	r600_query.c \
-	r600_resource.c \
-	radeonsi_shader.c \
-	r600_translate.c \
-	radeonsi_pm4.c \
-	radeonsi_compute.c \
+	si_blit.c \
+	si_buffer.c \
+	si_commands.c \
+	si_compute.c \
 	si_descriptors.c \
+	si_hw_context.c \
+	si_pipe.c \
+	si_pm4.c \
+	si_query.c \
+	si_resource.c \
+	si_shader.c \
 	si_state.c \
 	si_state_draw.c \
-	si_commands.c \
-	radeonsi_uvd.c
+	si_translate.c \
+	si_uvd.c

src/gallium/drivers/radeonsi/r600_resource.h

@@ -1,40 +0,0 @@
-/*
- * Copyright 2010 Marek Olšák <maraeo@gmail.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * on the rights to use, copy, modify, merge, publish, distribute, sub
- * license, and/or sell copies of the Software, and to permit persons to whom
- * the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#ifndef R600_RESOURCE_H
-#define R600_RESOURCE_H
-
-#include "../radeon/r600_pipe_common.h"
-
-struct r600_surface {
-	struct pipe_surface		base;
-};
-
-void r600_init_screen_resource_functions(struct pipe_screen *screen);
-
-struct r600_context;
-
-void r600_upload_const_buffer(struct r600_context *rctx, struct r600_resource **rbuffer,
-			      const uint8_t *ptr, unsigned size,
-			      uint32_t *const_offset);
-
-#endif

src/gallium/drivers/radeonsi/si.h

@@ -23,14 +23,14 @@
  * Authors:
  *      Jerome Glisse
  */
-#ifndef R600_H
-#define R600_H
+#ifndef SI_H
+#define SI_H
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 #include "util/u_double_list.h"
 #include "util/u_transfer.h"
 
-#include "radeonsi_resource.h"
+#include "si_resource.h"
 
 struct winsys_handle;
 

src/gallium/drivers/radeonsi/si_blit.c

@@ -23,7 +23,7 @@
 #include "util/u_surface.h"
 #include "util/u_blitter.h"
 #include "util/u_format.h"
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 #include "si_state.h"
 
 enum r600_blitter_op /* bitmask */

src/gallium/drivers/radeonsi/si_buffer.c

@@ -32,8 +32,8 @@
 #include "util/u_memory.h"
 #include "util/u_upload_mgr.h"
 
-#include "r600.h"
-#include "radeonsi_pipe.h"
+#include "si.h"
+#include "si_pipe.h"
 
 void r600_upload_index_buffer(struct r600_context *rctx,
 			      struct pipe_index_buffer *ib, unsigned count)

src/gallium/drivers/radeonsi/si_commands.c

@@ -24,9 +24,9 @@
  *      Christian König <christian.koenig@amd.com>
  */
 
-#include "radeonsi_pipe.h"
-#include "radeonsi_pm4.h"
 #include "sid.h"
+#include "si_pipe.h"
+#include "si_pm4.h"
 
 void si_cmd_context_control(struct si_pm4_state *pm4)
 {

src/gallium/drivers/radeonsi/si_compute.c

@@ -1,8 +1,8 @@
 #include "util/u_memory.h"
 
 #include "../radeon/r600_cs.h"
-#include "radeonsi_pipe.h"
-#include "radeonsi_shader.h"
+#include "si_pipe.h"
+#include "si_shader.h"
 
 #include "radeon_llvm_util.h"
 

src/gallium/drivers/radeonsi/si_descriptors.c

@@ -24,9 +24,9 @@
  *      Marek Olšák <marek.olsak@amd.com>
  */
 #include "../radeon/r600_cs.h"
-#include "radeonsi_pipe.h"
-#include "radeonsi_resource.h"
-#include "radeonsi_shader.h"
+#include "si_pipe.h"
+#include "si_resource.h"
+#include "si_shader.h"
 
 #include "util/u_memory.h"
 

src/gallium/drivers/radeonsi/si_hw_context.c

@@ -24,9 +24,9 @@
  *      Jerome Glisse
  */
 #include "../radeon/r600_cs.h"
-#include "radeonsi_pm4.h"
-#include "radeonsi_pipe.h"
 #include "sid.h"
+#include "si_pm4.h"
+#include "si_pipe.h"
 #include "util/u_memory.h"
 #include <errno.h>
 

src/gallium/drivers/radeonsi/si_pipe.c

@@ -42,12 +42,12 @@
 #include "vl/vl_video_buffer.h"
 #include "os/os_time.h"
 #include "pipebuffer/pb_buffer.h"
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 #include "radeon/radeon_uvd.h"
-#include "r600.h"
+#include "si.h"
 #include "sid.h"
-#include "r600_resource.h"
-#include "radeonsi_pipe.h"
+#include "si_resource.h"
+#include "si_pipe.h"
 #include "si_state.h"
 #include "../radeon/r600_cs.h"
 

src/gallium/drivers/radeonsi/si_pipe.h

@@ -23,8 +23,8 @@
  * Authors:
  *      Jerome Glisse
  */
-#ifndef RADEONSI_PIPE_H
-#define RADEONSI_PIPE_H
+#ifndef SI_PIPE_H
+#define SI_PIPE_H
 
 #include "../radeon/r600_pipe_common.h"
 
@@ -33,12 +33,12 @@
 #include "util/u_format.h"
 #include "util/u_math.h"
 #include "util/u_slab.h"
-#include "r600.h"
-#include "radeonsi_public.h"
-#include "radeonsi_pm4.h"
-#include "si_state.h"
-#include "r600_resource.h"
+#include "si.h"
 #include "sid.h"
+#include "si_public.h"
+#include "si_pm4.h"
+#include "si_resource.h"
+#include "si_state.h"
 
 #ifdef PIPE_ARCH_BIG_ENDIAN
 #define R600_BIG_ENDIAN 1
@@ -175,30 +175,30 @@ struct r600_context {
 	union si_state	emitted;
 };
 
-/* r600_blit.c */
+/* si_blit.c */
 void si_init_blit_functions(struct r600_context *rctx);
 void si_flush_depth_textures(struct r600_context *rctx,
 			     struct r600_textures_info *textures);
 void r600_decompress_color_textures(struct r600_context *rctx,
 				    struct r600_textures_info *textures);
 
-/* r600_buffer.c */
+/* si_buffer.c */
 void r600_upload_index_buffer(struct r600_context *rctx,
 			      struct pipe_index_buffer *ib, unsigned count);
 
 
-/* r600_pipe.c */
+/* si_pipe.c */
 void radeonsi_flush(struct pipe_context *ctx, struct pipe_fence_handle **fence,
 		    unsigned flags);
 const char *r600_get_llvm_processor_name(enum radeon_family family);
 
-/* r600_query.c */
+/* si_query.c */
 void r600_init_query_functions(struct r600_context *rctx);
 
-/* r600_resource.c */
+/* si_resource.c */
 void r600_init_context_resource_functions(struct r600_context *r600);
 
-/* r600_translate.c */
+/* si_translate.c */
 void r600_translate_index_buffer(struct r600_context *r600,
 				 struct pipe_index_buffer *ib,
 				 unsigned count);
@@ -207,10 +207,10 @@ void r600_translate_index_buffer(struct r600_context *r600,
 void r600_trace_emit(struct r600_context *rctx);
 #endif
 
-/* radeonsi_compute.c */
+/* si_compute.c */
 void si_init_compute_functions(struct r600_context *rctx);
 
-/* radeonsi_uvd.c */
+/* si_uvd.c */
 struct pipe_video_codec *radeonsi_uvd_create_decoder(struct pipe_context *context,
                                                      const struct pipe_video_codec *templ);
 

src/gallium/drivers/radeonsi/si_pm4.c

@@ -26,8 +26,8 @@
 
 #include "../radeon/r600_cs.h"
 #include "util/u_memory.h"
-#include "radeonsi_pipe.h"
-#include "radeonsi_pm4.h"
+#include "si_pipe.h"
+#include "si_pm4.h"
 #include "sid.h"
 
 #define NUMBER_OF_STATES (sizeof(union si_state) / sizeof(struct si_pm4_state *))

src/gallium/drivers/radeonsi/si_pm4.h

@@ -24,8 +24,8 @@
  *      Christian König <christian.koenig@amd.com>
  */
 
-#ifndef RADEONSI_PM4_H
-#define RADEONSI_PM4_H
+#ifndef SI_PM4_H
+#define SI_PM4_H
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 

src/gallium/drivers/radeonsi/si_public.h

@@ -20,8 +20,8 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#ifndef RADEONSI_PUBLIC_H
-#define RADEONSI_PUBLIC_H
+#ifndef SI_PUBLIC_H
+#define SI_PUBLIC_H
 
 struct radeon_winsys;
 

src/gallium/drivers/radeonsi/si_query.c

@@ -20,7 +20,7 @@
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 #include "sid.h"
 
 static struct pipe_query *r600_create_query(struct pipe_context *ctx, unsigned query_type)

src/gallium/drivers/radeonsi/si_resource.c

@@ -21,7 +21,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 
 static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
 						const struct pipe_resource *templ)

src/gallium/drivers/radeonsi/si_resource.h

@@ -24,8 +24,8 @@
  *      Christian König <christian.koenig@amd.com>
  */
 
-#ifndef RADEONSI_RESOURCE_H
-#define RADEONSI_RESOURCE_H
+#ifndef SI_RESOURCE_H
+#define SI_RESOURCE_H
 
 #include "../radeon/r600_pipe_common.h"
 #include "util/u_transfer.h"
@@ -40,4 +40,16 @@ r600_resource_create_custom(struct pipe_screen *screen,
 		PIPE_BIND_CUSTOM, usage, size));
 }
 
+struct r600_surface {
+	struct pipe_surface		base;
+};
+
+void r600_init_screen_resource_functions(struct pipe_screen *screen);
+
+struct r600_context;
+
+void r600_upload_const_buffer(struct r600_context *rctx, struct r600_resource **rbuffer,
+			      const uint8_t *ptr, unsigned size,
+			      uint32_t *const_offset);
+
 #endif

src/gallium/drivers/radeonsi/si_shader.c

@@ -44,8 +44,8 @@
 #include "tgsi/tgsi_util.h"
 #include "tgsi/tgsi_dump.h"
 
-#include "radeonsi_pipe.h"
-#include "radeonsi_shader.h"
+#include "si_pipe.h"
+#include "si_shader.h"
 #include "si_state.h"
 #include "sid.h"
 

src/gallium/drivers/radeonsi/si_shader.h

@@ -26,8 +26,8 @@
  *      Christian König <christian.koenig@amd.com>
  */
 
-#ifndef RADEONSI_SHADER_H
-#define RADEONSI_SHADER_H
+#ifndef SI_SHADER_H
+#define SI_SHADER_H
 
 #include <llvm-c/Core.h> /* LLVMModuleRef */
 

src/gallium/drivers/radeonsi/si_state.c

@@ -34,8 +34,8 @@
 #include "util/u_format_s3tc.h"
 #include "tgsi/tgsi_parse.h"
 #include "tgsi/tgsi_scan.h"
-#include "radeonsi_pipe.h"
-#include "radeonsi_shader.h"
+#include "si_pipe.h"
+#include "si_shader.h"
 #include "si_state.h"
 #include "../radeon/r600_cs.h"
 #include "sid.h"

src/gallium/drivers/radeonsi/si_state.h

@@ -27,7 +27,7 @@
 #ifndef SI_STATE_H
 #define SI_STATE_H
 
-#include "radeonsi_pm4.h"
+#include "si_pm4.h"
 #include "../radeon/r600_pipe_common.h"
 
 struct si_state_blend {

src/gallium/drivers/radeonsi/si_state_draw.c

@@ -28,8 +28,8 @@
 #include "util/u_framebuffer.h"
 #include "util/u_blitter.h"
 #include "tgsi/tgsi_parse.h"
-#include "radeonsi_pipe.h"
-#include "radeonsi_shader.h"
+#include "si_pipe.h"
+#include "si_shader.h"
 #include "si_state.h"
 #include "../radeon/r600_cs.h"
 #include "sid.h"

src/gallium/drivers/radeonsi/si_translate.c

@@ -25,7 +25,7 @@
 
 #include "util/u_index_modify.h"
 #include "util/u_upload_mgr.h"
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 
 
 void r600_translate_index_buffer(struct r600_context *r600,

src/gallium/drivers/radeonsi/si_uvd.c

@@ -44,7 +44,7 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_mpeg12_decoder.h"
 
-#include "radeonsi_pipe.h"
+#include "si_pipe.h"
 #include "radeon/radeon_uvd.h"
 #include "sid.h"
 

src/gallium/targets/pipe-loader/pipe_radeonsi.c

@@ -1,7 +1,7 @@
 #include "state_tracker/drm_driver.h"
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
-#include "radeonsi/radeonsi_public.h"
+#include "radeonsi/si_public.h"
 
 static struct pipe_screen *
 create_screen(int fd)

src/gallium/targets/radeonsi/common/drm_target.c

@@ -29,7 +29,7 @@
 #include "target-helpers/inline_debug_helper.h"
 #include "radeon/drm/radeon_drm_public.h"
 #include "radeon/drm/radeon_winsys.h"
-#include "radeonsi/radeonsi_public.h"
+#include "radeonsi/si_public.h"
 
 static struct pipe_screen *create_screen(int fd)
 {