FIXME: shader trailing '\n's.
Francois Gouget
fgouget at free.fr
Sat Mar 20 09:23:36 CDT 2010
---
dlls/wined3d/shader.c | 132 ++++++++++++++++++++++++------------------------
1 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 307cadf..0800d7d 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -244,12 +244,12 @@ int shader_vaddline(struct wined3d_shader_buffer *buffer, const char *format, va
if (buffer->newline)
{
- TRACE("GL HW (%u, %u) : %s", buffer->lineNo + 1, buffer->bsize, base);
+ TRACE("GL HW (%u, %u) : %s\n", buffer->lineNo + 1, buffer->bsize, base);
buffer->newline = FALSE;
}
else
{
- TRACE("%s", base);
+ TRACE("%s\n", base);
}
buffer->bsize += rc;
@@ -771,85 +771,85 @@ unsigned int shader_find_free_input_register(const struct shader_reg_maps *reg_m
static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semantic,
const struct wined3d_shader_version *shader_version)
{
- TRACE("dcl");
+ TRACE("dcl\n");
if (semantic->reg.reg.type == WINED3DSPR_SAMPLER)
{
switch (semantic->sampler_type)
{
- case WINED3DSTT_2D: TRACE("_2d"); break;
- case WINED3DSTT_CUBE: TRACE("_cube"); break;
- case WINED3DSTT_VOLUME: TRACE("_volume"); break;
- default: TRACE("_unknown_ttype(0x%08x)", semantic->sampler_type);
+ case WINED3DSTT_2D: TRACE("_2d\n"); break;
+ case WINED3DSTT_CUBE: TRACE("_cube\n"); break;
+ case WINED3DSTT_VOLUME: TRACE("_volume\n"); break;
+ default: TRACE("_unknown_ttype(0x%08x)\n", semantic->sampler_type);
}
}
else
{
/* Pixel shaders 3.0 don't have usage semantics. */
if (shader_version->major < 3 && shader_version->type == WINED3D_SHADER_TYPE_PIXEL) return;
- else TRACE("_");
+ else TRACE("_\n");
switch (semantic->usage)
{
case WINED3DDECLUSAGE_POSITION:
- TRACE("position%u", semantic->usage_idx);
+ TRACE("position%u\n", semantic->usage_idx);
break;
case WINED3DDECLUSAGE_BLENDINDICES:
- TRACE("blend");
+ TRACE("blend\n");
break;
case WINED3DDECLUSAGE_BLENDWEIGHT:
- TRACE("weight");
+ TRACE("weight\n");
break;
case WINED3DDECLUSAGE_NORMAL:
- TRACE("normal%u", semantic->usage_idx);
+ TRACE("normal%u\n", semantic->usage_idx);
break;
case WINED3DDECLUSAGE_PSIZE:
- TRACE("psize");
+ TRACE("psize\n");
break;
case WINED3DDECLUSAGE_COLOR:
- if (semantic->usage_idx == 0) TRACE("color");
- else TRACE("specular%u", (semantic->usage_idx - 1));
+ if (semantic->usage_idx == 0) TRACE("color\n");
+ else TRACE("specular%u\n", (semantic->usage_idx - 1));
break;
case WINED3DDECLUSAGE_TEXCOORD:
- TRACE("texture%u", semantic->usage_idx);
+ TRACE("texture%u\n", semantic->usage_idx);
break;
case WINED3DDECLUSAGE_TANGENT:
- TRACE("tangent");
+ TRACE("tangent\n");
break;
case WINED3DDECLUSAGE_BINORMAL:
- TRACE("binormal");
+ TRACE("binormal\n");
break;
case WINED3DDECLUSAGE_TESSFACTOR:
- TRACE("tessfactor");
+ TRACE("tessfactor\n");
break;
case WINED3DDECLUSAGE_POSITIONT:
- TRACE("positionT%u", semantic->usage_idx);
+ TRACE("positionT%u\n", semantic->usage_idx);
break;
case WINED3DDECLUSAGE_FOG:
- TRACE("fog");
+ TRACE("fog\n");
break;
case WINED3DDECLUSAGE_DEPTH:
- TRACE("depth");
+ TRACE("depth\n");
break;
case WINED3DDECLUSAGE_SAMPLE:
- TRACE("sample");
+ TRACE("sample\n");
break;
default:
- FIXME("unknown_semantics(0x%08x)", semantic->usage);
+ FIXME("unknown_semantics(0x%08x)\n", semantic->usage);
}
}
}
@@ -864,87 +864,87 @@ static void shader_dump_register(const struct wined3d_shader_register *reg,
switch (reg->type)
{
case WINED3DSPR_TEMP:
- TRACE("r");
+ TRACE("r\n");
break;
case WINED3DSPR_INPUT:
- TRACE("v");
+ TRACE("v\n");
break;
case WINED3DSPR_CONST:
case WINED3DSPR_CONST2:
case WINED3DSPR_CONST3:
case WINED3DSPR_CONST4:
- TRACE("c");
+ TRACE("c\n");
offset = shader_get_float_offset(reg->type, reg->idx);
break;
case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */
- TRACE("%c", shader_version->type == WINED3D_SHADER_TYPE_PIXEL ? 't' : 'a');
+ TRACE("%c\n", shader_version->type == WINED3D_SHADER_TYPE_PIXEL ? 't' : 'a');
break;
case WINED3DSPR_RASTOUT:
- TRACE("%s", rastout_reg_names[reg->idx]);
+ TRACE("%s\n", rastout_reg_names[reg->idx]);
break;
case WINED3DSPR_COLOROUT:
- TRACE("oC");
+ TRACE("oC\n");
break;
case WINED3DSPR_DEPTHOUT:
- TRACE("oDepth");
+ TRACE("oDepth\n");
break;
case WINED3DSPR_ATTROUT:
- TRACE("oD");
+ TRACE("oD\n");
break;
case WINED3DSPR_TEXCRDOUT:
/* Vertex shaders >= 3.0 use general purpose output registers
* (WINED3DSPR_OUTPUT), which can include an address token. */
- if (shader_version->major >= 3) TRACE("o");
- else TRACE("oT");
+ if (shader_version->major >= 3) TRACE("o\n");
+ else TRACE("oT\n");
break;
case WINED3DSPR_CONSTINT:
- TRACE("i");
+ TRACE("i\n");
break;
case WINED3DSPR_CONSTBOOL:
- TRACE("b");
+ TRACE("b\n");
break;
case WINED3DSPR_LABEL:
- TRACE("l");
+ TRACE("l\n");
break;
case WINED3DSPR_LOOP:
- TRACE("aL");
+ TRACE("aL\n");
break;
case WINED3DSPR_SAMPLER:
- TRACE("s");
+ TRACE("s\n");
break;
case WINED3DSPR_MISCTYPE:
if (reg->idx > 1) FIXME("Unhandled misctype register %u.\n", reg->idx);
- else TRACE("%s", misctype_reg_names[reg->idx]);
+ else TRACE("%s\n", misctype_reg_names[reg->idx]);
break;
case WINED3DSPR_PREDICATE:
- TRACE("p");
+ TRACE("p\n");
break;
case WINED3DSPR_IMMCONST:
- TRACE("l");
+ TRACE("l\n");
break;
case WINED3DSPR_CONSTBUFFER:
- TRACE("cb");
+ TRACE("cb\n");
break;
default:
- TRACE("unhandled_rtype(%#x)", reg->type);
+ TRACE("unhandled_rtype(%#x)\n", reg->type);
break;
}
@@ -1006,11 +1006,11 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param,
{
static const char *write_mask_chars = "xyzw";
- TRACE(".");
- if (write_mask & WINED3DSP_WRITEMASK_0) TRACE("%c", write_mask_chars[0]);
- if (write_mask & WINED3DSP_WRITEMASK_1) TRACE("%c", write_mask_chars[1]);
- if (write_mask & WINED3DSP_WRITEMASK_2) TRACE("%c", write_mask_chars[2]);
- if (write_mask & WINED3DSP_WRITEMASK_3) TRACE("%c", write_mask_chars[3]);
+ TRACE(".\n");
+ if (write_mask & WINED3DSP_WRITEMASK_0) TRACE("%c\n", write_mask_chars[0]);
+ if (write_mask & WINED3DSP_WRITEMASK_1) TRACE("%c\n", write_mask_chars[1]);
+ if (write_mask & WINED3DSP_WRITEMASK_2) TRACE("%c\n", write_mask_chars[2]);
+ if (write_mask & WINED3DSP_WRITEMASK_3) TRACE("%c\n", write_mask_chars[3]);
}
}
@@ -1025,11 +1025,11 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param,
|| src_modifier == WINED3DSPSM_SIGNNEG
|| src_modifier == WINED3DSPSM_X2NEG
|| src_modifier == WINED3DSPSM_ABSNEG)
- TRACE("-");
+ TRACE("-\n");
else if (src_modifier == WINED3DSPSM_COMP)
- TRACE("1-");
+ TRACE("1-\n");
else if (src_modifier == WINED3DSPSM_NOT)
- TRACE("!");
+ TRACE("!\n");
if (src_modifier == WINED3DSPSM_ABS || src_modifier == WINED3DSPSM_ABSNEG)
TRACE("abs(");
@@ -1170,21 +1170,21 @@ static void shader_dump_ins_modifiers(const struct wined3d_shader_dst_param *dst
switch (dst->shift)
{
case 0: break;
- case 13: TRACE("_d8"); break;
- case 14: TRACE("_d4"); break;
- case 15: TRACE("_d2"); break;
- case 1: TRACE("_x2"); break;
- case 2: TRACE("_x4"); break;
- case 3: TRACE("_x8"); break;
- default: TRACE("_unhandled_shift(%d)", dst->shift); break;
+ case 13: TRACE("_d8\n"); break;
+ case 14: TRACE("_d4\n"); break;
+ case 15: TRACE("_d2\n"); break;
+ case 1: TRACE("_x2\n"); break;
+ case 2: TRACE("_x4\n"); break;
+ case 3: TRACE("_x8\n"); break;
+ default: TRACE("_unhandled_shift(%d)\n", dst->shift); break;
}
- if (mmask & WINED3DSPDM_SATURATE) TRACE("_sat");
- if (mmask & WINED3DSPDM_PARTIALPRECISION) TRACE("_pp");
- if (mmask & WINED3DSPDM_MSAMPCENTROID) TRACE("_centroid");
+ if (mmask & WINED3DSPDM_SATURATE) TRACE("_sat\n");
+ if (mmask & WINED3DSPDM_PARTIALPRECISION) TRACE("_pp\n");
+ if (mmask & WINED3DSPDM_MSAMPCENTROID) TRACE("_centroid\n");
mmask &= ~(WINED3DSPDM_SATURATE | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_MSAMPCENTROID);
- if (mmask) FIXME("_unrecognized_modifier(%#x)", mmask);
+ if (mmask) FIXME("_unrecognized_modifier(%#x)\n", mmask);
}
static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *byte_code)
@@ -1281,7 +1281,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
fe->shader_read_dst_param(fe_data, &ptr, &dst, &rel_addr);
- TRACE("def c%u = %f, %f, %f, %f", shader_get_float_offset(dst.reg.type, dst.reg.idx),
+ TRACE("def c%u = %f, %f, %f, %f\n", shader_get_float_offset(dst.reg.type, dst.reg.idx),
*(const float *)(ptr),
*(const float *)(ptr + 1),
*(const float *)(ptr + 2),
@@ -1295,7 +1295,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
fe->shader_read_dst_param(fe_data, &ptr, &dst, &rel_addr);
- TRACE("defi i%u = %d, %d, %d, %d", dst.reg.idx,
+ TRACE("defi i%u = %d, %d, %d, %d\n", dst.reg.idx,
*(ptr),
*(ptr + 1),
*(ptr + 2),
@@ -1309,7 +1309,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
fe->shader_read_dst_param(fe_data, &ptr, &dst, &rel_addr);
- TRACE("defb b%u = %s", dst.reg.idx, *ptr ? "true" : "false");
+ TRACE("defb b%u = %s\n", dst.reg.idx, *ptr ? "true" : "false");
++ptr;
}
else
--
1.6.5
More information about the wine-patches
mailing list