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_GetMatrixPointerArray() 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 e39845ac9a7f363ca824ff6354ade6b6425a35e9 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 644faeeb7e
commit 99c88ea215
2 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/directx/wine/d3dx9_36/effect.c
+31 -39
View File
@@ -1636,44 +1636,6 @@ static HRESULT d3dx9_base_effect_set_matrix_pointer_array(struct d3dx9_base_effe
return D3DERR_INVALIDCALL;
}
static HRESULT d3dx9_base_effect_get_matrix_pointer_array(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)
{
struct d3dx_parameter *param = get_valid_parameter(base, parameter);
if (!count) return D3D_OK;
if (param && matrix && count <= param->element_count)
{
UINT i;
TRACE("Class %s\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < count; ++i)
{
get_matrix(&param->members[i], matrix[i], FALSE);
}
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_OBJECT:
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_matrix_transpose(struct d3dx9_base_effect *base,
D3DXHANDLE parameter, const D3DXMATRIX *matrix)
{
@@ -3593,10 +3555,40 @@ static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DX
D3DXMATRIX **matrix, 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, matrix %p, count %u.\n", iface, parameter, matrix, count);
return d3dx9_base_effect_get_matrix_pointer_array(&effect->base_effect, parameter, matrix, count);
if (!count)
return D3D_OK;
if (param && matrix && count <= param->element_count)
{
unsigned int i;
TRACE("Class %s.\n", debug_d3dxparameter_class(param->class));
switch (param->class)
{
case D3DXPC_MATRIX_ROWS:
for (i = 0; i < count; ++i)
get_matrix(&param->members[i], matrix[i], FALSE);
return D3D_OK;
case D3DXPC_SCALAR:
case D3DXPC_VECTOR:
case D3DXPC_OBJECT:
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_SetMatrixTranspose(ID3DXEffect *iface, D3DXHANDLE parameter,
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: 2d7430f7143acc9e14cd58d3bc598ca79f7bff5e}
tags: {wine: e39845ac9a7f363ca824ff6354ade6b6425a35e9}