Commit ff62cab5 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

wined3d: Introduce struct wined3d_shader_src_param.

parent 463de24e
......@@ -789,6 +789,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer,
const SHADER_OPCODE *opcode_table = This->baseShader.shader_ins;
const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table;
DWORD shader_version = reg_maps->shader_version;
struct wined3d_shader_src_param src_param[4];
struct wined3d_shader_dst_param dst_param;
struct wined3d_shader_instruction ins;
struct wined3d_shader_context ctx;
......@@ -804,6 +805,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer,
ins.ctx = &ctx;
ins.dst = &dst_param;
ins.src = src_param;
This->baseShader.parse_state.current_row = 0;
while (WINED3DPS_END() != *pToken)
......@@ -883,8 +885,8 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer,
{
DWORD param, addr_token = 0;
pToken += shader_get_param(pToken, shader_version, &param, &addr_token);
ins.src[i] = param;
ins.src_addr[i] = addr_token;
src_param[i].token = param;
src_param[i].addr_token = addr_token;
}
/* Call appropriate function for output target */
......
......@@ -462,6 +462,12 @@ struct wined3d_shader_dst_param
DWORD addr_token;
};
struct wined3d_shader_src_param
{
DWORD token;
DWORD addr_token;
};
struct wined3d_shader_instruction
{
const struct wined3d_shader_context *ctx;
......@@ -469,11 +475,10 @@ struct wined3d_shader_instruction
DWORD flags;
BOOL coissue;
DWORD predicate;
DWORD src[4];
DWORD src_addr[4];
UINT dst_count;
const struct wined3d_shader_dst_param *dst;
UINT src_count;
const struct wined3d_shader_src_param *src;
};
struct wined3d_shader_semantic
......
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