Commit c202bfe4 authored by Ivan Gyurdiev's avatar Ivan Gyurdiev Committed by Alexandre Julliard

wined3d: Simplify primitiveDeclartationConvertToStrided.

Assign fixed indices to declaration inputs. Then use a common path to load the strided data.
parent 85aa8ab8
...@@ -904,8 +904,10 @@ typedef struct WineDirect3DStridedData { ...@@ -904,8 +904,10 @@ typedef struct WineDirect3DStridedData {
typedef struct WineDirect3DVertexStridedData { typedef struct WineDirect3DVertexStridedData {
union { union {
struct { struct {
/* Do not add or reorder fields here,
* so this can be indexed as an array */
WineDirect3DStridedData position; WineDirect3DStridedData position;
BOOL position_transformed;
WineDirect3DStridedData blendWeights; WineDirect3DStridedData blendWeights;
WineDirect3DStridedData blendMatrixIndices; WineDirect3DStridedData blendMatrixIndices;
WineDirect3DStridedData normal; WineDirect3DStridedData normal;
...@@ -921,6 +923,10 @@ typedef struct WineDirect3DVertexStridedData { ...@@ -921,6 +923,10 @@ typedef struct WineDirect3DVertexStridedData {
WineDirect3DStridedData fog; WineDirect3DStridedData fog;
WineDirect3DStridedData depth; WineDirect3DStridedData depth;
WineDirect3DStridedData sample; WineDirect3DStridedData sample;
/* Add fields here */
BOOL position_transformed;
} s; } s;
WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */ WineDirect3DStridedData input[16]; /* Indexed by constants in D3DVSDE_REGISTER */
} u; } u;
......
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