Skip to content

W
wine-winehq
Commit 13c00a9d authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d10: Use a union to store effect variable data instead of a void pointer.

parent 16360a4f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 62 deletions
dlls/d3d10/d3d10_private.h
View file @ 13c00a9d
...@@ -151,7 +151,6 @@ struct d3d10_effect_variable ...@@ -151,7 +151,6 @@ struct d3d10_effect_variable
struct d3d10_effect_variable *buffer; struct d3d10_effect_variable *buffer;
struct d3d10_effect_type *type; struct d3d10_effect_type *type;
void *data;
char *name; char *name;
char *semantic; char *semantic;
DWORD buffer_offset; DWORD buffer_offset;
...@@ -162,6 +161,12 @@ struct d3d10_effect_variable ...@@ -162,6 +161,12 @@ struct d3d10_effect_variable
struct d3d10_effect_variable *elements; struct d3d10_effect_variable *elements;
struct d3d10_effect_variable *members; struct d3d10_effect_variable *members;
struct d3d10_effect_variable *annotations; struct d3d10_effect_variable *annotations;
union
{
struct d3d10_effect_state_object_variable state;
struct d3d10_effect_shader_variable shader;
} u;
}; };
/* ID3D10EffectPass */ /* ID3D10EffectPass */
......
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