Henri Verbeet : wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af6b98c44bec5e68552b71d31ffd8bf78785f466
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af6b98c44bec5e68552b71d31f...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Dec  8 21:04:05 2011 +0100

wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef.

---

 dlls/d3d9/d3d9_private.h |    9 ++++-----
 dlls/wined3d/directx.c   |   24 ++++++++++++------------
 include/wine/wined3d.h   |   14 +++++++-------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 76fef72..b16498e 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -111,11 +111,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H
     _pD3D9Caps->DeclTypes                         = _pWineCaps->DeclTypes; \
     _pD3D9Caps->NumSimultaneousRTs                = _pWineCaps->NumSimultaneousRTs; \
     _pD3D9Caps->StretchRectFilterCaps             = _pWineCaps->StretchRectFilterCaps; \
-    _pD3D9Caps->VS20Caps.Caps                     = _pWineCaps->VS20Caps.Caps; \
-    _pD3D9Caps->VS20Caps.DynamicFlowControlDepth  = _pWineCaps->VS20Caps.DynamicFlowControlDepth; \
-    _pD3D9Caps->VS20Caps.NumTemps                 = _pWineCaps->VS20Caps.NumTemps; \
-    _pD3D9Caps->VS20Caps.NumTemps                 = _pWineCaps->VS20Caps.NumTemps; \
-    _pD3D9Caps->VS20Caps.StaticFlowControlDepth   = _pWineCaps->VS20Caps.StaticFlowControlDepth; \
+    _pD3D9Caps->VS20Caps.Caps                     = _pWineCaps->VS20Caps.caps; \
+    _pD3D9Caps->VS20Caps.DynamicFlowControlDepth  = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \
+    _pD3D9Caps->VS20Caps.NumTemps                 = _pWineCaps->VS20Caps.temp_count; \
+    _pD3D9Caps->VS20Caps.StaticFlowControlDepth   = _pWineCaps->VS20Caps.static_flow_control_depth; \
     _pD3D9Caps->PS20Caps.Caps                     = _pWineCaps->PS20Caps.Caps; \
     _pD3D9Caps->PS20Caps.DynamicFlowControlDepth  = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \
     _pD3D9Caps->PS20Caps.NumTemps                 = _pWineCaps->PS20Caps.NumTemps; \
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index 57c3058..b73a82d 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -4763,32 +4763,32 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
          * aren't set (in case of software rendering) use the VS 3.0 from
          * MSDN or else if there's OpenGL spec use a hardcoded value minimum
          * VS3.0 value. */
-        caps->VS20Caps.Caps                     = WINED3DVS20CAPS_PREDICATION;
+        caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION;
         /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */
-        caps->VS20Caps.DynamicFlowControlDepth  = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH;
-        caps->VS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_vs_temps);
+        caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH;
+        caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps);
         /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */
-        caps->VS20Caps.StaticFlowControlDepth   = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH;
+        caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH;
 
         caps->MaxVShaderInstructionsExecuted    = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */
         caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions);
     }
     else if (caps->VertexShaderVersion == 2)
     {
-        caps->VS20Caps.Caps                     = 0;
-        caps->VS20Caps.DynamicFlowControlDepth  = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH;
-        caps->VS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_vs_temps);
-        caps->VS20Caps.StaticFlowControlDepth   = 1;
+        caps->VS20Caps.caps = 0;
+        caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH;
+        caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps);
+        caps->VS20Caps.static_flow_control_depth = 1;
 
         caps->MaxVShaderInstructionsExecuted    = 65535;
         caps->MaxVertexShader30InstructionSlots = 0;
     }
     else
     { /* VS 1.x */
-        caps->VS20Caps.Caps                     = 0;
-        caps->VS20Caps.DynamicFlowControlDepth  = 0;
-        caps->VS20Caps.NumTemps                 = 0;
-        caps->VS20Caps.StaticFlowControlDepth   = 0;
+        caps->VS20Caps.caps = 0;
+        caps->VS20Caps.dynamic_flow_control_depth = 0;
+        caps->VS20Caps.temp_count = 0;
+        caps->VS20Caps.static_flow_control_depth = 0;
 
         caps->MaxVShaderInstructionsExecuted    = 0;
         caps->MaxVertexShader30InstructionSlots = 0;
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index ea9f4fb..b8981d5 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -1742,13 +1742,13 @@ struct wined3d_strided_data
     BOOL position_transformed;
 };
 
-typedef struct _WINED3DVSHADERCAPS2_0
+struct wined3d_vertex_shader_caps
 {
-    DWORD Caps;
-    INT DynamicFlowControlDepth;
-    INT NumTemps;
-    INT StaticFlowControlDepth;
-} WINED3DVSHADERCAPS2_0;
+    DWORD caps;
+    INT dynamic_flow_control_depth;
+    INT temp_count;
+    INT static_flow_control_depth;
+};
 
 typedef struct _WINED3DPSHADERCAPS2_0
 {
@@ -1860,7 +1860,7 @@ typedef struct _WINED3DCAPS
     DWORD DeclTypes;
     DWORD NumSimultaneousRTs;
     DWORD StretchRectFilterCaps;
-    WINED3DVSHADERCAPS2_0 VS20Caps;
+    struct wined3d_vertex_shader_caps VS20Caps;
     WINED3DPSHADERCAPS2_0 PS20Caps;
     DWORD VertexTextureFilterCaps;
     DWORD MaxVShaderInstructionsExecuted;