ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINESYNC] d3dx9: Merge the d3dx_effect_SetIntArray() helper.

Browse Source 
Signed-off-by: Michael Stefaniuc <[email protected]>
Signed-off-by: Matteo Bruni <[email protected]>
Signed-off-by: Alexandre Julliard <[email protected]>

wine commit id 8ea0f9d4dd3e4d74af51df0a2dc2723f2be0da8c by Michael Stefaniuc <[email protected]>
This commit is contained in:
winesync
2021-02-04 16:37:02 +01:00
committed by Jérôme Gardou
parent 6c31253e62
commit 122fe3ff58
2 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/directx/wine/d3dx9_36/effect.c
+30 -39
View File
@@ -1349,44 +1349,6 @@ static HRESULT d3dx9_base_effect_get_value(struct d3dx9_base_effect *base,
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_int_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const INT *n, UINT count)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (param)
{
UINT i, size = min(count, param->bytes / sizeof(DWORD));
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < size; ++i)
{
set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
}
set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
case D3DXPC_STRUCT:
break;
default:
FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class));
break;
}
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_set_vector(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXVECTOR4 *vector)
{
@@ -3392,10 +3354,39 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete
static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count)
{
struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter);
TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count);
return d3dx9_base_effect_set_int_array(&effect->base_effect, parameter, n, count);
if (param)
{
unsigned int i, size = min(count, param->bytes / sizeof(DWORD));
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < size; ++i)
set_number((DWORD *)param->data + i, param->type, &n[i], D3DXPT_INT);
set_dirty(param);
return D3D_OK;
case D3DXPC_OBJECT:
case D3DXPC_STRUCT:
break;
default:
FIXME("Unhandled class %s.\n", debug_d3dxparameter_class(param->class));
break;
}
}
WARN("Parameter not found.\n");
return D3DERR_INVALIDCALL;
}
static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count)
sdk/tools/winesync/d3dx9.cfg
+1 -1
View File
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 2e771d77761a78b1b597144edfd69ae05b31561e}
tags: {wine: 8ea0f9d4dd3e4d74af51df0a2dc2723f2be0da8c}