Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetVertexShader().
Alexandre Julliard
julliard at winehq.org
Wed May 4 13:47:42 CDT 2011
Module: wine
Branch: master
Commit: 35bff043f22a9bb740b086210a76def563a68bd0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bff043f22a9bb740b086210a76def563a68bd0
Author: Rico Schüller <kgbricola at web.de>
Date: Wed May 4 09:40:59 2011 +0200
d3dx9: Implement ID3DXBaseEffect::GetVertexShader().
---
dlls/d3dx9_36/effect.c | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 22f6993..5ad078e 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -326,6 +326,7 @@ static void free_parameter(D3DXHANDLE handle, BOOL element, BOOL child)
break;
case D3DXPT_PIXELSHADER:
+ case D3DXPT_VERTEXSHADER:
if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data);
break;
@@ -997,7 +998,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetValue(ID3DXBaseEffect *iface, D3DXH
if (data && param && param->data && param->bytes <= bytes)
{
- if (param->type == D3DXPT_PIXELSHADER)
+ if (param->type == D3DXPT_VERTEXSHADER || param->type == D3DXPT_PIXELSHADER)
{
UINT i;
@@ -1346,10 +1347,23 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPixelShader(ID3DXBaseEffect *iface,
static HRESULT WINAPI ID3DXBaseEffectImpl_GetVertexShader(ID3DXBaseEffect *iface, D3DXHANDLE parameter, LPDIRECT3DVERTEXSHADER9 *vshader)
{
struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface);
+ struct d3dx_parameter *param = is_valid_parameter(This, parameter);
- FIXME("iface %p, parameter %p, vshader %p stub\n", This, parameter, vshader);
+ TRACE("iface %p, parameter %p, vshader %p\n", This, parameter, vshader);
- return E_NOTIMPL;
+ if (!param) param = get_parameter_by_name(This, NULL, parameter);
+
+ if (vshader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER)
+ {
+ *vshader = *(LPDIRECT3DVERTEXSHADER9 *)param->data;
+ if (*vshader) IDirect3DVertexShader9_AddRef(*vshader);
+ TRACE("Returning %p\n", *vshader);
+ return D3D_OK;
+ }
+
+ WARN("Invalid argument specified\n");
+
+ return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI ID3DXBaseEffectImpl_SetArrayRange(ID3DXBaseEffect *iface, D3DXHANDLE parameter, UINT start, UINT end)
@@ -3086,6 +3100,7 @@ static HRESULT d3dx9_parse_value(struct d3dx_parameter *param, void *value, cons
{
case D3DXPT_STRING:
case D3DXPT_PIXELSHADER:
+ case D3DXPT_VERTEXSHADER:
read_dword(ptr, &id);
TRACE("Id: %u\n", id);
param->base->objects[id] = get_parameter_handle(param);
@@ -3191,6 +3206,15 @@ 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);
+ if (hr != D3D_OK)
+ {
+ WARN("Failed to create vertex shader\n");
+ return hr;
+ }
+ break;
+
case D3DXPT_PIXELSHADER:
hr = IDirect3DDevice9_CreatePixelShader(param->base->effect->device, (DWORD *)*ptr, (LPDIRECT3DPIXELSHADER9 *)param->data);
if (hr != D3D_OK)
@@ -3292,6 +3316,10 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx_parameter *param, const ch
param->bytes = sizeof(LPDIRECT3DPIXELSHADER9);
break;
+ case D3DXPT_VERTEXSHADER:
+ param->bytes = sizeof(LPDIRECT3DVERTEXSHADER9);
+ break;
+
default:
FIXME("Unhandled type %s\n", debug_d3dxparameter_type(param->type));
break;
More information about the wine-cvs
mailing list