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

wined3d: Allow the existence of other shader types in get_loop_control_const().

This commit is contained in:
Henri Verbeet 2009-06-24 10:54:19 +02:00 committed by Alexandre Julliard
parent 943ed4e1e9
commit f98c6e3cff
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/wined3d/arb_program_shader.c
View File

@ -4362,7 +4362,6 @@ static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins,
static void get_loop_control_const(const struct wined3d_shader_instruction *ins, static void get_loop_control_const(const struct wined3d_shader_instruction *ins,
IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control) IWineD3DBaseShaderImpl *This, UINT idx, struct loop_control *loop_control)
{ {
BOOL vshader = shader_is_vshader_version(This->baseShader.reg_maps.shader_version.type);
struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data;
/* Integer constants can either be a local constant, or they can be stored in the shader /* Integer constants can either be a local constant, or they can be stored in the shader
@ -4389,23 +4388,26 @@ static void get_loop_control_const(const struct wined3d_shader_instruction *ins,
loop_control->step = 0; loop_control->step = 0;
return; return;
} }
else
switch (This->baseShader.reg_maps.shader_version.type)
{ {
if(vshader) case WINED3D_SHADER_TYPE_VERTEX:
{
/* Count and aL start value are unsigned */ /* Count and aL start value are unsigned */
loop_control->count = priv->cur_vs_args->loop_ctrl[idx][0]; loop_control->count = priv->cur_vs_args->loop_ctrl[idx][0];
loop_control->start = priv->cur_vs_args->loop_ctrl[idx][1]; loop_control->start = priv->cur_vs_args->loop_ctrl[idx][1];
/* Step is signed. */ /* Step is signed. */
loop_control->step = ((char)priv->cur_vs_args->loop_ctrl[idx][2]); loop_control->step = ((char)priv->cur_vs_args->loop_ctrl[idx][2]);
} break;
else
{ case WINED3D_SHADER_TYPE_PIXEL:
loop_control->count = priv->cur_ps_args->loop_ctrl[idx][0]; loop_control->count = priv->cur_ps_args->loop_ctrl[idx][0];
loop_control->start = priv->cur_ps_args->loop_ctrl[idx][1]; loop_control->start = priv->cur_ps_args->loop_ctrl[idx][1];
loop_control->step = ((char)priv->cur_ps_args->loop_ctrl[idx][2]); loop_control->step = ((char)priv->cur_ps_args->loop_ctrl[idx][2]);
} break;
return;
default:
FIXME("Unhandled shader type %#x.\n", This->baseShader.reg_maps.shader_version.type);
break;
} }
} }