reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 22:20:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

d3d8: Save the d3d8 vertex declaration.

Browse Source
This commit is contained in:
H. Verbeet 2007-03-08 01:15:46 +01:00 committed by Alexandre Julliard
parent e879efcc74
commit 138826b8cc
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d8/d3d8_private.h
View File

@ -515,6 +515,9 @@ typedef struct {
const IDirect3DVertexDeclaration8Vtbl *lpVtbl; const IDirect3DVertexDeclaration8Vtbl *lpVtbl;
LONG ref_count; LONG ref_count;
DWORD *elements;
DWORD elements_size; /* Size of elements, in bytes */
IWineD3DVertexDeclaration *wined3d_vertex_declaration; IWineD3DVertexDeclaration *wined3d_vertex_declaration;
} IDirect3DVertexDeclaration8Impl; } IDirect3DVertexDeclaration8Impl;
@ -619,7 +622,7 @@ typedef struct IDirect3DPixelShader8Impl {
* to see how not defined it here * to see how not defined it here
*/ */
void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader); void load_local_constants(const DWORD *d3d8_elements, IWineD3DVertexShader *wined3d_vertex_shader);
size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXELEMENT **wined3d_elements); size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements);
/* Callbacks */ /* Callbacks */
extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height, extern HRESULT WINAPI D3D8CB_CreateSurface(IUnknown *device, IUnknown *pSuperior, UINT Width, UINT Height,

14
dlls/d3d8/device.c
View File

@ -1214,13 +1214,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexDeclaration(IDirect3DDevi
object->ref_count = 1; object->ref_count = 1;
object->lpVtbl = &Direct3DVertexDeclaration8_Vtbl; object->lpVtbl = &Direct3DVertexDeclaration8_Vtbl;
wined3d_element_count = convert_to_wined3d_declaration(declaration, &wined3d_elements); wined3d_element_count = convert_to_wined3d_declaration(declaration, &object->elements_size, &wined3d_elements);
object->elements = HeapAlloc(GetProcessHeap(), 0, object->elements_size);
if (!object->elements) {
ERR("Memory allocation failed\n");
HeapFree(GetProcessHeap(), 0, wined3d_elements);
HeapFree(GetProcessHeap(), 0, object);
*decl_ptr = NULL;
return D3DERR_OUTOFVIDEOMEMORY;
}
CopyMemory(object->elements, declaration, object->elements_size);
hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wined3d_vertex_declaration, hr = IWineD3DDevice_CreateVertexDeclaration(This->WineD3DDevice, &object->wined3d_vertex_declaration,
(IUnknown *)object, wined3d_elements, wined3d_element_count); (IUnknown *)object, wined3d_elements, wined3d_element_count);
HeapFree(GetProcessHeap(), 0, wined3d_elements); HeapFree(GetProcessHeap(), 0, wined3d_elements);
if (FAILED(hr)) { if (FAILED(hr)) {
ERR("(%p) : IWineD3DDevice_CreateVertexDeclaration call failed\n", This); ERR("(%p) : IWineD3DDevice_CreateVertexDeclaration call failed\n", This);
HeapFree(GetProcessHeap(), 0, object->elements);
HeapFree(GetProcessHeap(), 0, object); HeapFree(GetProcessHeap(), 0, object);
} else { } else {
*decl_ptr = (IDirect3DVertexDeclaration8 *)object; *decl_ptr = (IDirect3DVertexDeclaration8 *)object;

5
dlls/d3d8/vertexdeclaration.c
View File

@ -62,6 +62,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDecla
if (!ref_count) { if (!ref_count) {
IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration); IWineD3DVertexDeclaration_Release(This->wined3d_vertex_declaration);
HeapFree(GetProcessHeap(), 0, This->elements);
HeapFree(GetProcessHeap(), 0, This); HeapFree(GetProcessHeap(), 0, This);
} }
@ -271,7 +272,7 @@ static const wined3d_usage_t wined3d_usage_lookup[] = {
}; };
/* TODO: find out where rhw (or positionT) is for declaration8 */ /* TODO: find out where rhw (or positionT) is for declaration8 */
size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXELEMENT **wined3d_elements) size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3d8_elements_size, WINED3DVERTEXELEMENT **wined3d_elements)
{ {
const DWORD *token = d3d8_elements; const DWORD *token = d3d8_elements;
WINED3DVERTEXELEMENT *element; WINED3DVERTEXELEMENT *element;
@ -326,6 +327,8 @@ size_t convert_to_wined3d_declaration(const DWORD *d3d8_elements, WINED3DVERTEXE
element->Stream = 0xFF; element->Stream = 0xFF;
element->Type = WINED3DDECLTYPE_UNUSED; element->Type = WINED3DDECLTYPE_UNUSED;
*d3d8_elements_size = (++token - d3d8_elements) * sizeof(DWORD);
return element_count; return element_count;
} }