Skip to content

W
wine-cw
Commit a2f259af authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

wined3d: Get rid of the "len" variable in shader_trace_init().

parent 63ae714f
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 13 deletions
dlls/wined3d/baseshader.c
View file @ a2f259af
...@@ -990,7 +990,6 @@ void shader_trace_init( ...@@ -990,7 +990,6 @@ void shader_trace_init(
const DWORD* pToken = pFunction; const DWORD* pToken = pFunction;
const SHADER_OPCODE* curOpcode = NULL; const SHADER_OPCODE* curOpcode = NULL;
DWORD opcode_token; DWORD opcode_token;
unsigned int len = 0;
DWORD i; DWORD i;
TRACE("(%p) : Parsing program\n", This); TRACE("(%p) : Parsing program\n", This);
...@@ -1011,7 +1010,6 @@ void shader_trace_init( ...@@ -1011,7 +1010,6 @@ void shader_trace_init(
WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version), WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version),
WINED3DSHADER_VERSION_MINOR(This->baseShader.hex_version)); WINED3DSHADER_VERSION_MINOR(This->baseShader.hex_version));
++pToken; ++pToken;
++len;
continue; continue;
} }
if (shader_is_comment(*pToken)) /* comment */ if (shader_is_comment(*pToken)) /* comment */
...@@ -1020,12 +1018,10 @@ void shader_trace_init( ...@@ -1020,12 +1018,10 @@ void shader_trace_init(
++pToken; ++pToken;
TRACE("//%s\n", (const char*)pToken); TRACE("//%s\n", (const char*)pToken);
pToken += comment_len; pToken += comment_len;
len += comment_len + 1;
continue; continue;
} }
opcode_token = *pToken++; opcode_token = *pToken++;
curOpcode = shader_get_opcode(This->baseShader.shader_ins, This->baseShader.hex_version, opcode_token); curOpcode = shader_get_opcode(This->baseShader.shader_ins, This->baseShader.hex_version, opcode_token);
len++;
if (!curOpcode) if (!curOpcode)
{ {
...@@ -1033,7 +1029,6 @@ void shader_trace_init( ...@@ -1033,7 +1029,6 @@ void shader_trace_init(
FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token); FIXME("Unrecognized opcode: token=0x%08x\n", opcode_token);
tokens_read = shader_skip_unrecognized(pToken, This->baseShader.hex_version); tokens_read = shader_skip_unrecognized(pToken, This->baseShader.hex_version);
pToken += tokens_read; pToken += tokens_read;
len += tokens_read;
} }
else else
{ {
...@@ -1047,7 +1042,6 @@ void shader_trace_init( ...@@ -1047,7 +1042,6 @@ void shader_trace_init(
TRACE(" "); TRACE(" ");
shader_dump_param(param, 0, 0, This->baseShader.hex_version); shader_dump_param(param, 0, 0, This->baseShader.hex_version);
pToken += 2; pToken += 2;
len += 2;
} }
else if (curOpcode->opcode == WINED3DSIO_DEF) else if (curOpcode->opcode == WINED3DSIO_DEF)
{ {
...@@ -1059,7 +1053,6 @@ void shader_trace_init( ...@@ -1059,7 +1053,6 @@ void shader_trace_init(
*(const float *)(pToken + 3), *(const float *)(pToken + 3),
*(const float *)(pToken + 4)); *(const float *)(pToken + 4));
pToken += 5; pToken += 5;
len += 5;
} }
else if (curOpcode->opcode == WINED3DSIO_DEFI) else if (curOpcode->opcode == WINED3DSIO_DEFI)
{ {
...@@ -1069,14 +1062,12 @@ void shader_trace_init( ...@@ -1069,14 +1062,12 @@ void shader_trace_init(
*(pToken + 3), *(pToken + 3),
*(pToken + 4)); *(pToken + 4));
pToken += 5; pToken += 5;
len += 5;
} }
else if (curOpcode->opcode == WINED3DSIO_DEFB) else if (curOpcode->opcode == WINED3DSIO_DEFB)
{ {
TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK, TRACE("defb b%u = %s", *pToken & WINED3DSP_REGNUM_MASK,
*(pToken + 1)? "true": "false"); *(pToken + 1)? "true": "false");
pToken += 2; pToken += 2;
len += 2;
} }
else else
{ {
...@@ -1127,7 +1118,6 @@ void shader_trace_init( ...@@ -1127,7 +1118,6 @@ void shader_trace_init(
{ {
tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token);
pToken += tokens_read; pToken += tokens_read;
len += tokens_read;
shader_dump_ins_modifiers(param); shader_dump_ins_modifiers(param);
TRACE(" "); TRACE(" ");
...@@ -1138,7 +1128,6 @@ void shader_trace_init( ...@@ -1138,7 +1128,6 @@ void shader_trace_init(
if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)
{ {
pToken++; pToken++;
len++;
} }
/* Other source tokens */ /* Other source tokens */
...@@ -1146,7 +1135,6 @@ void shader_trace_init( ...@@ -1146,7 +1135,6 @@ void shader_trace_init(
{ {
tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token); tokens_read = shader_get_param(pToken, This->baseShader.hex_version, &param, &addr_token);
pToken += tokens_read; pToken += tokens_read;
len += tokens_read;
TRACE((i == 0)? " " : ", "); TRACE((i == 0)? " " : ", ");
shader_dump_param(param, addr_token, 1, This->baseShader.hex_version); shader_dump_param(param, addr_token, 1, This->baseShader.hex_version);
...@@ -1155,7 +1143,9 @@ void shader_trace_init( ...@@ -1155,7 +1143,9 @@ void shader_trace_init(
TRACE("\n"); TRACE("\n");
} }
} }
This->baseShader.functionLength = (len + 1) * sizeof(DWORD); ++pToken;
This->baseShader.functionLength = ((char *)pToken - (char *)pFunction);
} }
void shader_cleanup(IWineD3DBaseShader *iface) void shader_cleanup(IWineD3DBaseShader *iface)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment