ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Return early from shader_trace_init() when a NULL pFunction is passed. 

This is mainly to reduce the size and indentation level of the if-block.
This commit is contained in:
Henri Verbeet 2008-12-08 10:30:02 +01:00 committed by Alexandre Julliard
parent e18629bedd
commit 9887d66dad
1 changed files with 150 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
dlls/wined3d/baseshader.c
View File

@ -981,9 +981,17 @@ void shader_trace_init(
TRACE("(%p) : Parsing program\n", This); TRACE("(%p) : Parsing program\n", This);
if (NULL != pToken) { if (!pFunction)
while (WINED3DVS_END() != *pToken) { {
if (shader_is_version_token(*pToken)) { /** version */ WARN("Got a NULL pFunction, returning.\n");
This->baseShader.functionLength = 1; /* no Function defined use fixed function vertex processing */
return;
}
while (WINED3DVS_END() != *pToken)
{
if (shader_is_version_token(*pToken)) /* version */
{
This->baseShader.hex_version = *pToken; This->baseShader.hex_version = *pToken;
TRACE("%s_%u_%u\n", shader_is_pshader_version(This->baseShader.hex_version)? "ps": "vs", TRACE("%s_%u_%u\n", shader_is_pshader_version(This->baseShader.hex_version)? "ps": "vs",
WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version), WINED3DSHADER_VERSION_MAJOR(This->baseShader.hex_version),
@ -992,7 +1000,8 @@ void shader_trace_init(
++len; ++len;
continue; continue;
} }
if (shader_is_comment(*pToken)) { /** comment */ if (shader_is_comment(*pToken)) /* comment */
{
DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT; DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT;
++pToken; ++pToken;
TRACE("//%s\n", (const char*)pToken); TRACE("//%s\n", (const char*)pToken);
@ -1004,16 +1013,18 @@ void shader_trace_init(
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++; len++;
if (NULL == curOpcode) { if (!curOpcode)
{
int tokens_read; int tokens_read;
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; len += tokens_read;
}
} else { else
if (curOpcode->opcode == WINED3DSIO_DCL) { {
if (curOpcode->opcode == WINED3DSIO_DCL)
{
DWORD usage = *pToken; DWORD usage = *pToken;
DWORD param = *(pToken + 1); DWORD param = *(pToken + 1);
@ -1023,9 +1034,9 @@ void shader_trace_init(
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; len += 2;
}
} else if (curOpcode->opcode == WINED3DSIO_DEF) { else if (curOpcode->opcode == WINED3DSIO_DEF)
{
unsigned int offset = shader_get_float_offset(*pToken); unsigned int offset = shader_get_float_offset(*pToken);
TRACE("def c%u = %f, %f, %f, %f", offset, TRACE("def c%u = %f, %f, %f, %f", offset,
@ -1033,70 +1044,73 @@ void shader_trace_init(
*(const float *)(pToken + 2), *(const float *)(pToken + 2),
*(const float *)(pToken + 3), *(const float *)(pToken + 3),
*(const float *)(pToken + 4)); *(const float *)(pToken + 4));
pToken += 5; pToken += 5;
len += 5; len += 5;
} else if (curOpcode->opcode == WINED3DSIO_DEFI) { }
else if (curOpcode->opcode == WINED3DSIO_DEFI)
{
TRACE("defi i%u = %d, %d, %d, %d", *pToken & WINED3DSP_REGNUM_MASK, TRACE("defi i%u = %d, %d, %d, %d", *pToken & WINED3DSP_REGNUM_MASK,
*(pToken + 1), *(pToken + 1),
*(pToken + 2), *(pToken + 2),
*(pToken + 3), *(pToken + 3),
*(pToken + 4)); *(pToken + 4));
pToken += 5; pToken += 5;
len += 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; len += 2;
}
} else { else
{
DWORD param, addr_token; DWORD param, addr_token;
int tokens_read; int tokens_read;
/* Print out predication source token first - it follows /* Print out predication source token first - it follows
* the destination token. */ * the destination token. */
if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)
{
TRACE("("); TRACE("(");
shader_dump_param(*(pToken + 2), 0, 1, This->baseShader.hex_version); shader_dump_param(*(pToken + 2), 0, 1, This->baseShader.hex_version);
TRACE(") "); TRACE(") ");
} }
if (opcode_token & WINED3DSI_COISSUE) { if (opcode_token & WINED3DSI_COISSUE)
{
/* PixWin marks instructions with the coissue flag with a '+' */ /* PixWin marks instructions with the coissue flag with a '+' */
TRACE("+"); TRACE("+");
} }
TRACE("%s", curOpcode->name); TRACE("%s", curOpcode->name);
if (curOpcode->opcode == WINED3DSIO_IFC || if (curOpcode->opcode == WINED3DSIO_IFC
curOpcode->opcode == WINED3DSIO_BREAKC) { || curOpcode->opcode == WINED3DSIO_BREAKC)
{
DWORD op = (opcode_token & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT; DWORD op = (opcode_token & INST_CONTROLS_MASK) >> INST_CONTROLS_SHIFT;
switch (op) {
switch (op)
{
case COMPARISON_GT: TRACE("_gt"); break; case COMPARISON_GT: TRACE("_gt"); break;
case COMPARISON_EQ: TRACE("_eq"); break; case COMPARISON_EQ: TRACE("_eq"); break;
case COMPARISON_GE: TRACE("_ge"); break; case COMPARISON_GE: TRACE("_ge"); break;
case COMPARISON_LT: TRACE("_lt"); break; case COMPARISON_LT: TRACE("_lt"); break;
case COMPARISON_NE: TRACE("_ne"); break; case COMPARISON_NE: TRACE("_ne"); break;
case COMPARISON_LE: TRACE("_le"); break; case COMPARISON_LE: TRACE("_le"); break;
default: default: TRACE("_(%u)", op);
TRACE("_(%u)", op);
} }
} else if (curOpcode->opcode == WINED3DSIO_TEX && }
This->baseShader.hex_version >= WINED3DPS_VERSION(2,0)) { else if (curOpcode->opcode == WINED3DSIO_TEX
if(opcode_token & WINED3DSI_TEXLD_PROJECT) TRACE("p"); && This->baseShader.hex_version >= WINED3DPS_VERSION(2,0)
&& (opcode_token & WINED3DSI_TEXLD_PROJECT))
{
TRACE("p");
} }
/* Destination token */ /* Destination token */
if (curOpcode->dst_token) { if (curOpcode->dst_token)
{
/* Destination token */
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; len += tokens_read;
@ -1107,14 +1121,15 @@ void shader_trace_init(
} }
/* Predication token - already printed out, just skip it */ /* Predication token - already printed out, just skip it */
if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) { if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)
{
pToken++; pToken++;
len++; len++;
} }
/* Other source tokens */ /* Other source tokens */
for (i = curOpcode->dst_token; i < curOpcode->num_params; ++i) { for (i = curOpcode->dst_token; i < curOpcode->num_params; ++i)
{
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; len += tokens_read;
@ -1127,9 +1142,6 @@ void shader_trace_init(
} }
} }
This->baseShader.functionLength = (len + 1) * sizeof(DWORD); This->baseShader.functionLength = (len + 1) * sizeof(DWORD);
} else {
This->baseShader.functionLength = 1; /* no Function defined use fixed function vertex processing */
}
} }
static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0}; static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0};