d3dcompiler_43: Make debug_print_{relarg,swizzle,writemask}() static.
Francois Gouget
fgouget at free.fr
Thu Aug 26 06:00:59 CDT 2010
---
dlls/d3dcompiler_43/asmutils.c | 46 ++++++++++++++--------------
dlls/d3dcompiler_43/d3dcompiler_private.h | 2 -
2 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/dlls/d3dcompiler_43/asmutils.c b/dlls/d3dcompiler_43/asmutils.c
index 68b25cf..e6f0d74 100644
--- a/dlls/d3dcompiler_43/asmutils.c
+++ b/dlls/d3dcompiler_43/asmutils.c
@@ -369,7 +369,7 @@ static const char *get_regname(const struct shader_reg *reg) {
}
}
-const char *debug_print_writemask(DWORD mask) {
+static const char *debug_print_writemask(DWORD mask) {
char ret[6];
unsigned char pos = 1;
@@ -383,28 +383,7 @@ const char *debug_print_writemask(DWORD mask) {
return wine_dbg_sprintf("%s", ret);
}
-const char *debug_print_relarg(const struct shader_reg *reg) {
- const char *short_swizzle;
- if(!reg->rel_reg) return "";
-
- short_swizzle = debug_print_swizzle(reg->rel_reg->swizzle);
-
- if(reg->rel_reg->type == BWRITERSPR_ADDR) {
- return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle);
- } else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) {
- return wine_dbg_sprintf("[aL%s]", short_swizzle);
- } else {
- return "Unexpected relative addressing argument";
- }
-}
-
-const char *debug_print_dstreg(const struct shader_reg *reg) {
- return wine_dbg_sprintf("%s%s%s", get_regname(reg),
- debug_print_relarg(reg),
- debug_print_writemask(reg->writemask));
-}
-
-const char *debug_print_swizzle(DWORD arg) {
+static const char *debug_print_swizzle(DWORD arg) {
char ret[6];
unsigned int i;
DWORD swizzle[4];
@@ -440,6 +419,27 @@ const char *debug_print_swizzle(DWORD arg) {
return wine_dbg_sprintf("%s", ret);
}
+static const char *debug_print_relarg(const struct shader_reg *reg) {
+ const char *short_swizzle;
+ if(!reg->rel_reg) return "";
+
+ short_swizzle = debug_print_swizzle(reg->rel_reg->swizzle);
+
+ if(reg->rel_reg->type == BWRITERSPR_ADDR) {
+ return wine_dbg_sprintf("[a%u%s]", reg->rel_reg->regnum, short_swizzle);
+ } else if(reg->rel_reg->type == BWRITERSPR_LOOP && reg->rel_reg->regnum == 0) {
+ return wine_dbg_sprintf("[aL%s]", short_swizzle);
+ } else {
+ return "Unexpected relative addressing argument";
+ }
+}
+
+const char *debug_print_dstreg(const struct shader_reg *reg) {
+ return wine_dbg_sprintf("%s%s%s", get_regname(reg),
+ debug_print_relarg(reg),
+ debug_print_writemask(reg->writemask));
+}
+
const char *debug_print_srcreg(const struct shader_reg *reg) {
switch(reg->srcmod) {
case BWRITERSPSM_NONE:
diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h
index c085c90..929e635 100644
--- a/dlls/d3dcompiler_43/d3dcompiler_private.h
+++ b/dlls/d3dcompiler_43/d3dcompiler_private.h
@@ -327,8 +327,6 @@ const char *debug_print_dstmod(DWORD mod);
const char *debug_print_shift(DWORD shift);
const char *debug_print_dstreg(const struct shader_reg *reg);
const char *debug_print_srcreg(const struct shader_reg *reg);
-const char *debug_print_swizzle(DWORD swizzle);
-const char *debug_print_writemask(DWORD mask);
const char *debug_print_comp(DWORD comp);
const char *debug_print_opcode(DWORD opcode);
--
1.7.1
More information about the wine-patches
mailing list