svga: Use consistent names for public symbol names of shader dumping facilities.

5 files changed, 12 insertions, 12 deletions

diff --git a/src/gallium/drivers/svga/svgadump/svga_dump.c b/src/gallium/drivers/svga/svgadump/svga_dump.c
index c6c353f58e2..910afa25287 100644
--- a/src/gallium/drivers/svga/svgadump/svga_dump.c
+++ b/src/gallium/drivers/svga/svgadump/svga_dump.c
@@ -1627,7 +1627,7 @@ svga_dump_commands(const void *commands, uint32_t size)
                const SVGA3dCmdDefineShader *cmd = (const SVGA3dCmdDefineShader *)body;
                dump_SVGA3dCmdDefineShader(cmd);
                body = (const uint8_t *)&cmd[1];
-               sh_svga_dump((const uint32_t *)body, 
+               svga_shader_dump((const uint32_t *)body, 
                             (unsigned)(next - body)/sizeof(uint32_t),
                             FALSE );
                body = next;
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_dump.c b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
index c654126d3a8..7718bdf757b 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_dump.c
@@ -435,7 +435,7 @@ static void dump_srcreg( struct sh_srcreg srcreg, struct sh_srcreg *indreg, cons
 }
 
 void
-sh_svga_dump(
+svga_shader_dump(
    const unsigned *assem,
    unsigned dwords,
    unsigned do_binary )
@@ -602,7 +602,7 @@ sh_svga_dump(
 
       default:
          {
-            const struct sh_opcode_info *info = sh_svga_opcode_info( op.opcode );
+            const struct sh_opcode_info *info = svga_opcode_info( op.opcode );
             uint i;
             uint num_src = info->num_src + op.predicated;
             boolean not_first_arg = FALSE;
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_dump.h b/src/gallium/drivers/svga/svgadump/svga_shader_dump.h
index af5549cdba2..a2657acb2f1 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_dump.h
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_dump.h
@@ -30,13 +30,13 @@
  * @author Michal Krol <[email protected]>
  */
 
-#ifndef ST_SHADER_SVGA_DUMP_H
-#define ST_SHADER_SVGA_DUMP_H
+#ifndef SVGA_SHADER_DUMP_H
+#define SVGA_SHADER_DUMP_H
 
 void
-sh_svga_dump(
+svga_shader_dump(
    const unsigned *assem,
    unsigned dwords,
    unsigned do_binary );
 
-#endif /* ST_SHADER_SVGA_DUMP_H */
+#endif /* SVGA_SHADER_DUMP_H */
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_op.c b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
index cecc22106b2..8343bfdaab4 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_op.c
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_op.c
@@ -140,7 +140,7 @@ static struct sh_opcode_info opcode_info[] =
    { "breakp",       1, 1, SVGA3DOP_INVALID,     },
 };
 
-const struct sh_opcode_info *sh_svga_opcode_info( uint op )
+const struct sh_opcode_info *svga_opcode_info( uint op )
 {
    struct sh_opcode_info *info;
 
diff --git a/src/gallium/drivers/svga/svgadump/svga_shader_op.h b/src/gallium/drivers/svga/svgadump/svga_shader_op.h
index 01d39dca847..e558de02c53 100644
--- a/src/gallium/drivers/svga/svgadump/svga_shader_op.h
+++ b/src/gallium/drivers/svga/svgadump/svga_shader_op.h
@@ -30,8 +30,8 @@
  * @author Michal Krol <[email protected]>
  */
 
-#ifndef ST_SHADER_SVGA_OP_H
-#define ST_SHADER_SVGA_OP_H
+#ifndef SVGA_SHADER_OP_H
+#define SVGA_SHADER_OP_H
 
 struct sh_opcode_info
 {
@@ -41,6 +41,6 @@ struct sh_opcode_info
    unsigned svga_opcode:16;
 };
 
-const struct sh_opcode_info *sh_svga_opcode_info( unsigned op );
+const struct sh_opcode_info *svga_opcode_info( unsigned op );
 
-#endif /* ST_SHADER_SVGA_OP_H */
+#endif /* SVGA_SHADER_OP_H */