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

wined3d: Make a copy of shader signature string data.

This commit is contained in:
Henri Verbeet 2014-11-04 08:47:42 +01:00 committed by Alexandre Julliard
parent a10a4538b7
commit 909c5cc6fa
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/wined3d/shader.c
View File

@ -1603,6 +1603,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe
static void shader_cleanup(struct wined3d_shader *shader) static void shader_cleanup(struct wined3d_shader *shader)
{ {
HeapFree(GetProcessHeap(), 0, shader->signature_strings);
shader->device->shader_backend->shader_destroy(shader); shader->device->shader_backend->shader_destroy(shader);
HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf);
HeapFree(GetProcessHeap(), 0, shader->function); HeapFree(GetProcessHeap(), 0, shader->function);
@ -2011,11 +2012,41 @@ static HRESULT vertexshader_init(struct wined3d_shader *shader, struct wined3d_d
if (output_signature) if (output_signature)
{ {
struct wined3d_shader_signature_element *e;
SIZE_T total, len;
char *ptr;
total = 0;
for (i = 0; i < output_signature->element_count; ++i) for (i = 0; i < output_signature->element_count; ++i)
{ {
struct wined3d_shader_signature_element *e = &output_signature->elements[i]; e = &output_signature->elements[i];
len = strlen(e->semantic_name);
if (len >= ~(SIZE_T)0 - total)
{
shader_cleanup(shader);
return E_OUTOFMEMORY;
}
total += len + 1;
}
if (!(shader->signature_strings = HeapAlloc(GetProcessHeap(), 0, total)))
{
shader_cleanup(shader);
return E_OUTOFMEMORY;
}
ptr = shader->signature_strings;
for (i = 0; i < output_signature->element_count; ++i)
{
e = &output_signature->elements[i];
reg_maps->output_registers |= 1 << e->register_idx; reg_maps->output_registers |= 1 << e->register_idx;
shader->output_signature[e->register_idx] = *e; shader->output_signature[e->register_idx] = *e;
len = strlen(e->semantic_name);
memcpy(ptr, e->semantic_name, len + 1);
shader->output_signature[e->register_idx].semantic_name = ptr;
ptr += len + 1;
} }
} }

1
dlls/wined3d/wined3d_private.h
View File

@ -2879,6 +2879,7 @@ struct wined3d_shader
struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)];
struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT];
char *signature_strings;
/* Pointer to the parent device */ /* Pointer to the parent device */
struct wined3d_device *device; struct wined3d_device *device;