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

wined3d: Get rid of the redundant "output_signature" parameter to shader_set_function(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-05-23 18:06:28 +02:00 committed by Alexandre Julliard
parent 8ae3a9b624
commit 597c4d52cc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/wined3d/shader.c
View File

@ -2488,8 +2488,7 @@ const struct wined3d_shader_backend_ops none_shader_backend =
};
static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *byte_code,
const struct wined3d_shader_signature *output_signature, DWORD float_const_count,
enum wined3d_shader_type type, unsigned int max_version)
DWORD float_const_count, enum wined3d_shader_type type, unsigned int max_version)
{
struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
const struct wined3d_shader_frontend *fe;
@ -2497,8 +2496,8 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b
unsigned int backend_version;
const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info;
TRACE("shader %p, byte_code %p, output_signature %p, float_const_count %u, type %#x, max_version %u.\n",
shader, byte_code, output_signature, float_const_count, type, max_version);
TRACE("shader %p, byte_code %p, float_const_count %u, type %#x, max_version %u.\n",
shader, byte_code, float_const_count, type, max_version);
list_init(&shader->constantsF);
list_init(&shader->constantsB);
@ -2512,7 +2511,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b
return WINED3DERR_INVALIDCALL;
}
shader->frontend = fe;
shader->frontend_data = fe->shader_init(byte_code, output_signature);
shader->frontend_data = fe->shader_init(byte_code, &shader->output_signature);
if (!shader->frontend_data)
{
FIXME("Failed to initialize frontend.\n");
@ -2824,7 +2823,7 @@ static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device
list_init(&shader->linked_programs);
list_add_head(&device->shaders, &shader->shader_list_entry);
if (FAILED(hr = shader_set_function(shader, desc->byte_code, desc->output_signature,
if (FAILED(hr = shader_set_function(shader, desc->byte_code,
float_const_count, type, desc->max_version)))
{
WARN("Failed to set function, hr %#x.\n", hr);

2
dlls/wined3d/shader_sm1.c
View File

@ -548,7 +548,7 @@ static void *shader_sm1_init(const DWORD *byte_code, const struct wined3d_shader
if (!priv)
return NULL;
if (output_signature)
if (output_signature->element_count)
{
FIXME("SM 1-3 shader shouldn't have output signatures.\n");
}