Rico Schüller : d3dx9: Pass the device directly to d3dx9_parse_data().

[Alexandre Julliard]

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

Author: Rico Schüller <kgbricola(a)web.de>
Date:   Wed May 25 10:54:51 2011 +0200

d3dx9: Pass the device directly to d3dx9_parse_data().

---

 dlls/d3dx9_36/effect.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 7608717..712839b 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3519,7 +3519,7 @@ static HRESULT d3dx9_parse_name(char **name, const char *ptr)
     return D3D_OK;
 }
 
-static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr)
+static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr, LPDIRECT3DDEVICE9 device)
 {
     DWORD size;
     HRESULT hr;
@@ -3549,7 +3549,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr)
             break;
 
         case D3DXPT_VERTEXSHADER:
-            hr = IDirect3DDevice9_CreateVertexShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data);
+            hr = IDirect3DDevice9_CreateVertexShader(device, (DWORD *)*ptr, (LPDIRECT3DVERTEXSHADER9 *)param->data);
             if (hr != D3D_OK)
             {
                 WARN("Failed to create vertex shader\n");
@@ -3558,7 +3558,7 @@ static HRESULT d3dx9_parse_data(struct d3dx_parameter *param, const char **ptr)
             break;
 
         case D3DXPT_PIXELSHADER:
-            hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data);
+            hr = IDirect3DDevice9_CreatePixelShader(device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data);
             if (hr != D3D_OK)
             {
                 WARN("Failed to create pixel shader\n");
@@ -4252,7 +4252,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char *
 
         param = get_parameter_struct(base->objects[id]);
 
-        hr = d3dx9_parse_data(param, &ptr);
+        hr = d3dx9_parse_data(param, &ptr, base->effect->device);
         if (hr != D3D_OK)
         {
             WARN("Failed to parse data\n");