wine-commits June 2011

wine-commits@winehq.org

2 participants
809 discussions

Dylan Smith : d3dx9: Add support for loading texture coords from X files.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 05f09c0bf443ac0709425de6040a8ef1f85ea6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=05f09c0bf443ac0709425de60… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:27 2011 -0400 d3dx9: Add support for loading texture coords from X files. --- dlls/d3dx9_36/mesh.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 1a4964e..d0ee9b7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1831,6 +1831,8 @@ struct mesh_data { D3DXVECTOR3 *normals; DWORD *normal_indices; + D3DXVECTOR2 *tex_coords; + DWORD num_materials; D3DXMATERIAL *materials; DWORD *material_indices; @@ -2053,6 +2055,51 @@ truncated_data_error: return E_FAIL; } +static HRESULT parse_texture_coords(IDirectXFileData *filedata, struct mesh_data *mesh) +{ + HRESULT hr; + DWORD data_size; + BYTE *data; + + HeapFree(GetProcessHeap(), 0, mesh->tex_coords); + mesh->tex_coords = NULL; + + hr = IDirectXFileData_GetData(filedata, NULL, &data_size, (void**)&data); + if (FAILED(hr)) return hr; + + /* template Coords2d { + * FLOAT u; + * FLOAT v; + * } + * template MeshTextureCoords { + * DWORD nTextureCoords; + * array Coords2d textureCoords[nTextureCoords]; + * } + */ + + if (data_size < sizeof(DWORD)) + goto truncated_data_error; + if (*(DWORD*)data != mesh->num_vertices) { + WARN("number of texture coordinates (%u) doesn't match number of vertices (%u)\n", + *(DWORD*)data, mesh->num_vertices); + return E_FAIL; + } + data += sizeof(DWORD); + if (data_size < sizeof(DWORD) + mesh->num_vertices * sizeof(*mesh->tex_coords)) + goto truncated_data_error; + + mesh->tex_coords = HeapAlloc(GetProcessHeap(), 0, mesh->num_vertices * sizeof(*mesh->tex_coords)); + if (!mesh->tex_coords) return E_OUTOFMEMORY; + memcpy(mesh->tex_coords, data, mesh->num_vertices * sizeof(*mesh->tex_coords)); + + mesh->fvf |= D3DFVF_TEX1; + + return D3D_OK; +truncated_data_error: + WARN("truncated data (%u bytes)\n", data_size); + return E_FAIL; +} + static HRESULT parse_normals(IDirectXFileData *filedata, struct mesh_data *mesh) { HRESULT hr; @@ -2245,8 +2292,7 @@ static HRESULT parse_mesh(IDirectXFileData *filedata, struct mesh_data *mesh_dat FIXME("Mesh vertex color loading not implemented.\n"); hr = E_NOTIMPL; } else if (IsEqualGUID(type, &TID_D3DRMMeshTextureCoords)) { - FIXME("Mesh texture coordinate loading not implemented.\n"); - hr = E_NOTIMPL; + hr = parse_texture_coords(child, mesh_data); } else if (IsEqualGUID(type, &TID_D3DRMMeshMaterialList) && (provide_flags & PROVIDE_MATERIALS)) { @@ -2468,6 +2514,10 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, *(D3DXVECTOR3*)out_ptr = mesh_data.normals[duplications[i].normal_index]; out_ptr += sizeof(D3DXVECTOR3); } + if (mesh_data.fvf & D3DFVF_TEX1) { + *(D3DXVECTOR2*)out_ptr = mesh_data.tex_coords[i]; + out_ptr += sizeof(D3DXVECTOR2); + } } if (mesh_data.fvf & D3DFVF_NORMAL) { DWORD vertex_size = D3DXGetFVFVertexSize(mesh_data.fvf); @@ -2596,6 +2646,7 @@ cleanup: HeapFree(GetProcessHeap(), 0, mesh_data.normals); HeapFree(GetProcessHeap(), 0, mesh_data.normal_indices); destroy_materials(&mesh_data); + HeapFree(GetProcessHeap(), 0, mesh_data.tex_coords); HeapFree(GetProcessHeap(), 0, duplications); return hr; }

1 0

Dylan Smith : d3dx9/tests: Test effect generation and material loading for X files.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 42f9f15cd2a6dde247ec6f4b2e9bab350397424b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f9f15cd2a6dde247ec6f4b2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:13 2011 -0400 d3dx9/tests: Test effect generation and material loading for X files. --- dlls/d3dx9_36/tests/mesh.c | 272 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 272 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42f9f15cd2a6dde247ec6…

1 0

Dylan Smith : d3dx9: Generate effect instances from materials for mesh loading.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: f5da523aef0f9fbb60c54856ab5b98173d70e874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5da523aef0f9fbb60c54856a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:54:01 2011 -0400 d3dx9: Generate effect instances from materials for mesh loading. --- dlls/d3dx9_36/d3dx9_36_private.h | 2 + dlls/d3dx9_36/mesh.c | 114 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 111 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index f770c62..ed46402 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -30,6 +30,8 @@ #include "winuser.h" #include "d3dx9.h" +#define ARRAY_SIZE(array) (sizeof(array)/sizeof(*array)) + /* for internal use */ typedef enum _FormatType { FORMAT_ARGB, /* unsigned */ diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 148fbf8..1a4964e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -27,6 +27,7 @@ #define COBJMACROS #define NONAMELESSUNION +#include <assert.h> #include "windef.h" #include "wingdi.h" #include "d3dx9.h" @@ -2267,6 +2268,103 @@ truncated_data_error: return E_FAIL; } +static HRESULT generate_effects(ID3DXBuffer *materials, DWORD num_materials, + ID3DXBuffer **effects) +{ + HRESULT hr; + D3DXEFFECTINSTANCE *effect_ptr; + BYTE *out_ptr; + const D3DXMATERIAL *material_ptr = ID3DXBuffer_GetBufferPointer(materials); + static const struct { + const char *param_name; + DWORD name_size; + DWORD num_bytes; + DWORD value_offset; + } material_effects[] = { +#define EFFECT_TABLE_ENTRY(str, field) \ + {str, sizeof(str), sizeof(material_ptr->MatD3D.field), offsetof(D3DXMATERIAL, MatD3D.field)} + EFFECT_TABLE_ENTRY("Diffuse", Diffuse), + EFFECT_TABLE_ENTRY("Power", Power), + EFFECT_TABLE_ENTRY("Specular", Specular), + EFFECT_TABLE_ENTRY("Emissive", Emissive), + EFFECT_TABLE_ENTRY("Ambient", Ambient), +#undef EFFECT_TABLE_ENTRY + }; + static const char texture_paramname[] = "Texture0@Name"; + DWORD buffer_size; + int i; + + /* effects buffer layout: + * + * D3DXEFFECTINSTANCE effects[num_materials]; + * for (effect in effects) + * { + * D3DXEFFECTDEFAULT defaults[effect.NumDefaults]; + * for (default in defaults) + * { + * *default.pParamName; + * *default.pValue; + * } + * } + */ + buffer_size = sizeof(D3DXEFFECTINSTANCE); + buffer_size += sizeof(D3DXEFFECTDEFAULT) * ARRAY_SIZE(material_effects); + for (i = 0; i < ARRAY_SIZE(material_effects); i++) { + buffer_size += material_effects[i].name_size; + buffer_size += material_effects[i].num_bytes; + } + buffer_size *= num_materials; + for (i = 0; i < num_materials; i++) { + if (material_ptr[i].pTextureFilename) { + buffer_size += sizeof(D3DXEFFECTDEFAULT); + buffer_size += sizeof(texture_paramname); + buffer_size += strlen(material_ptr[i].pTextureFilename) + 1; + } + } + + hr = D3DXCreateBuffer(buffer_size, effects); + if (FAILED(hr)) return hr; + effect_ptr = ID3DXBuffer_GetBufferPointer(*effects); + out_ptr = (BYTE*)(effect_ptr + num_materials); + + for (i = 0; i < num_materials; i++) + { + int j; + D3DXEFFECTDEFAULT *defaults = (D3DXEFFECTDEFAULT*)out_ptr; + + effect_ptr->pDefaults = defaults; + effect_ptr->NumDefaults = material_ptr->pTextureFilename ? 6 : 5; + out_ptr = (BYTE*)(effect_ptr->pDefaults + effect_ptr->NumDefaults); + + for (j = 0; j < ARRAY_SIZE(material_effects); j++) + { + defaults->pParamName = (LPSTR)out_ptr; + strcpy(defaults->pParamName, material_effects[j].param_name); + defaults->pValue = defaults->pParamName + material_effects[j].name_size; + defaults->Type = D3DXEDT_FLOATS; + defaults->NumBytes = material_effects[j].num_bytes; + memcpy(defaults->pValue, (BYTE*)material_ptr + material_effects[j].value_offset, defaults->NumBytes); + out_ptr = (BYTE*)defaults->pValue + defaults->NumBytes; + defaults++; + } + + if (material_ptr->pTextureFilename) { + defaults->pParamName = (LPSTR)out_ptr; + strcpy(defaults->pParamName, texture_paramname); + defaults->pValue = defaults->pParamName + sizeof(texture_paramname); + defaults->Type = D3DXEDT_STRING; + defaults->NumBytes = strlen(material_ptr->pTextureFilename) + 1; + strcpy(defaults->pValue, material_ptr->pTextureFilename); + out_ptr = (BYTE*)defaults->pValue + defaults->NumBytes; + } + material_ptr++; + effect_ptr++; + } + assert(out_ptr - (BYTE*)ID3DXBuffer_GetBufferPointer(*effects) == buffer_size); + + return D3D_OK; +} + /* change to D3DXLoadSkinMeshFromXof when ID3DXFileData is implemented */ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, DWORD options, @@ -2285,6 +2383,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, ID3DXMesh *d3dxmesh = NULL; ID3DXBuffer *adjacency = NULL; ID3DXBuffer *materials = NULL; + ID3DXBuffer *effects = NULL; struct vertex_duplication { DWORD normal_index; struct list entry; @@ -2434,7 +2533,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, if (FAILED(hr)) goto cleanup; } - if (mesh_data.num_materials && materials_out) { + if (mesh_data.num_materials && (materials_out || effects_out)) { DWORD buffer_size = mesh_data.num_materials * sizeof(D3DXMATERIAL); char *strings_out_ptr; D3DXMATERIAL *materials_ptr; @@ -2460,9 +2559,13 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } if (mesh_data.num_materials && effects_out) { - FIXME("Effect instance generation not supported.\n"); - hr = E_NOTIMPL; - goto cleanup; + hr = generate_effects(materials, mesh_data.num_materials, &effects); + if (FAILED(hr)) goto cleanup; + + if (!materials_out) { + ID3DXBuffer_Release(materials); + materials = NULL; + } } if (adjacency_out) { @@ -2476,7 +2579,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, if (adjacency_out) *adjacency_out = adjacency; if (num_materials_out) *num_materials_out = mesh_data.num_materials; if (materials_out) *materials_out = materials; - if (effects_out) *effects_out = NULL; + if (effects_out) *effects_out = effects; if (skin_info_out) *skin_info_out = NULL; hr = D3D_OK; @@ -2485,6 +2588,7 @@ cleanup: if (d3dxmesh) IUnknown_Release(d3dxmesh); if (adjacency) ID3DXBuffer_Release(adjacency); if (materials) ID3DXBuffer_Release(materials); + if (effects) ID3DXBuffer_Release(effects); } HeapFree(GetProcessHeap(), 0, mesh_data.vertices); HeapFree(GetProcessHeap(), 0, mesh_data.num_tri_per_face);

1 0

Dylan Smith : d3dx9: Add support for loading materials from X files.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 0e0581834c87a0abc574990fee56fb27534fe272 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e0581834c87a0abc574990fe… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:53:52 2011 -0400 d3dx9: Add support for loading materials from X files. --- dlls/d3dx9_36/mesh.c | 249 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 245 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0e0581834c87a0abc5749…

1 0

Dylan Smith : d3dx9/tests: Add tests for D3DXLoadMeshHierarchyFromXInMemory .
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 420947c53117dd9b682d6d11a2db096b9cd5c531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=420947c53117dd9b682d6d11a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:53:35 2011 -0400 d3dx9/tests: Add tests for D3DXLoadMeshHierarchyFromXInMemory. --- dlls/d3dx9_36/tests/mesh.c | 562 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 562 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=420947c53117dd9b682d6…

1 0

Dylan Smith : d3dx9: Respect the options parameter for mesh loading.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 39f94f351671067c30b786a86972b0fa58d89a05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f94f351671067c30b786a86… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jun 6 12:53:16 2011 -0400 d3dx9: Respect the options parameter for mesh loading. --- dlls/d3dx9_36/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 48ae20e..5bd2cb6 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -2162,7 +2162,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata, } } - hr = D3DXCreateMeshFVF(mesh_data.num_tri_faces, total_vertices, D3DXMESH_MANAGED, mesh_data.fvf, device, &d3dxmesh); + hr = D3DXCreateMeshFVF(mesh_data.num_tri_faces, total_vertices, options, mesh_data.fvf, device, &d3dxmesh); if (FAILED(hr)) goto cleanup; hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, D3DLOCK_DISCARD, &vertices);

1 0

Jacek Caban : mshtml: Added VT_ERROR printing to debugstr_variant.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 0360aebc19a0fb37c39c7ef036f15a5858b25659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0360aebc19a0fb37c39c7ef03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 11:30:07 2011 +0200 mshtml: Added VT_ERROR printing to debugstr_variant. --- dlls/mshtml/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 18cdaec..1661c26 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -521,6 +521,8 @@ const char *debugstr_variant(const VARIANT *v) return wine_dbg_sprintf("{VT_BSTR: %s}", debugstr_w(V_BSTR(v))); case VT_DISPATCH: return wine_dbg_sprintf("{VT_DISPATCH: %p}", V_DISPATCH(v)); + case VT_ERROR: + return wine_dbg_sprintf("{VT_ERROR: %08x}", V_ERROR(v)); case VT_BOOL: return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); case VT_UINT:

1 0

Jacek Caban : widl: Don' t duplicate optarg and optind declarations in sources.
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: 674ab49fa2427455cf68e9a349833c42c3ee25c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=674ab49fa2427455cf68e9a34… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 11:06:13 2011 +0200 widl: Don't duplicate optarg and optind declarations in sources. --- tools/widl/widl.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 62c1008..29547e7 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -483,8 +483,6 @@ void write_id_data(const statement_list_t *stmts) int main(int argc,char *argv[]) { - extern char* optarg; - extern int optind; int optc; int ret = 0; int opti = 0;

1 0

Henri Verbeet : wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth().
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: be180bed7cdde56cb8d4d7517f9e699546b6af55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be180bed7cdde56cb8d4d7517… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:28 2011 +0200 wined3d: cfg can never be NULL in wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4b77d5e..02cb33c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2974,9 +2974,6 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in BYTE depthSize, stencilSize; BOOL lockable = FALSE; - if(!cfg) - return FALSE; - if (!getDepthStencilBits(format, &depthSize, &stencilSize)) { ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id));

1 0

Henri Verbeet : wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth ().
by Alexandre Julliard 07 Jun '11

07 Jun '11

Module: wine Branch: master Commit: fec6137de27e2c90eb9b6f808ba0458e36e81913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec6137de27e2c90eb9b6f808… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 11:06:27 2011 +0200 wined3d: Rename IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt to wined3d_check_pixel_format_depth(). --- dlls/wined3d/directx.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a29533e..4b77d5e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2968,7 +2968,7 @@ static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(const struct wined return FALSE; } -static BOOL IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(const struct wined3d_gl_info *gl_info, +static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { BYTE depthSize, stencilSize; @@ -3043,7 +3043,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, { if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, &cfgs[i], rt_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], ds_format)) + if (wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], ds_format)) { TRACE_(d3d_caps)("Formats match.\n"); return WINED3D_OK; @@ -3104,7 +3104,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if(cfgs[i].numSamples != multisample_type) continue; - if (!IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, &cfgs[i], format)) + if (!wined3d_check_pixel_format_depth(&adapter->gl_info, &cfgs[i], format)) continue; TRACE("Found pixel format %u to support multisample_type %#x for format %s.\n", @@ -3190,10 +3190,8 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_pixel_format *cfg = &adapter->cfgs[it]; if (IWineD3DImpl_IsPixelFormatCompatibleWithRenderFmt(&adapter->gl_info, cfg, display_format)) { - if (IWineD3DImpl_IsPixelFormatCompatibleWithDepthFmt(&adapter->gl_info, cfg, ds_format)) - { + if (wined3d_check_pixel_format_depth(&adapter->gl_info, cfg, ds_format)) return TRUE; - } } } }

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2011