ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Create a d3d8 declaration as parent for FVF based declarations.

This commit is contained in:
Henri Verbeet 2008-12-15 12:10:15 +01:00 committed by Alexandre Julliard
parent 9011452243
commit b9468a89fc
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/d3d8/d3d8_private.h
View File

@ -170,7 +170,7 @@ typedef void * shader_handle;
struct FvfToDecl struct FvfToDecl
{ {
DWORD fvf; DWORD fvf;
IWineD3DVertexDeclaration *decl; struct IDirect3DVertexDeclaration8 *decl;
}; };
struct IDirect3DDevice8Impl struct IDirect3DDevice8Impl

42
dlls/d3d8/device.c
View File

@ -107,7 +107,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) {
This->inDestruction = TRUE; This->inDestruction = TRUE;
for(i = 0; i < This->numConvertedDecls; i++) { for(i = 0; i < This->numConvertedDecls; i++) {
IWineD3DVertexDeclaration_Release(This->decls[i].decl); IDirect3DVertexDeclaration8_Release(This->decls[i].decl);
} }
HeapFree(GetProcessHeap(), 0, This->decls); HeapFree(GetProcessHeap(), 0, This->decls);
@ -1609,10 +1609,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8
return hrc; return hrc;
} }
static IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8Impl *This, DWORD fvf) static IDirect3DVertexDeclaration8Impl *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8Impl *This, DWORD fvf)
{ {
IDirect3DVertexDeclaration8Impl *d3d8_declaration;
HRESULT hr; HRESULT hr;
IWineD3DVertexDeclaration* pDecl = NULL;
int p, low, high; /* deliberately signed */ int p, low, high; /* deliberately signed */
struct FvfToDecl *convertedDecls = This->decls; struct FvfToDecl *convertedDecls = This->decls;
@ -1625,7 +1625,7 @@ static IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8
TRACE("%d ", p); TRACE("%d ", p);
if(convertedDecls[p].fvf == fvf) { if(convertedDecls[p].fvf == fvf) {
TRACE("found %p\n", convertedDecls[p].decl); TRACE("found %p\n", convertedDecls[p].decl);
return convertedDecls[p].decl; return (IDirect3DVertexDeclaration8Impl *)convertedDecls[p].decl;
} else if(convertedDecls[p].fvf < fvf) { } else if(convertedDecls[p].fvf < fvf) {
low = p + 1; low = p + 1;
} else { } else {
@ -1634,11 +1634,26 @@ static IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8
} }
TRACE("not found. Creating and inserting at position %d.\n", low); TRACE("not found. Creating and inserting at position %d.\n", low);
d3d8_declaration = HeapAlloc(GetProcessHeap(), 0, sizeof(*d3d8_declaration));
if (!d3d8_declaration)
{
ERR("Memory allocation failed.\n");
return NULL;
}
d3d8_declaration->ref_count = 1;
d3d8_declaration->lpVtbl = &Direct3DVertexDeclaration8_Vtbl;
d3d8_declaration->elements = NULL;
d3d8_declaration->elements_size = 0;
hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(This->WineD3DDevice, hr = IWineD3DDevice_CreateVertexDeclarationFromFVF(This->WineD3DDevice,
&pDecl, &d3d8_declaration->wined3d_vertex_declaration, (IUnknown *)d3d8_declaration, fvf);
(IUnknown *) This, if (FAILED(hr))
fvf); {
if (FAILED(hr)) return NULL; ERR("Failed to create wined3d vertex declaration.\n");
HeapFree(GetProcessHeap(), 0, d3d8_declaration);
return NULL;
}
if(This->declArraySize == This->numConvertedDecls) { if(This->declArraySize == This->numConvertedDecls) {
int grow = This->declArraySize / 2; int grow = This->declArraySize / 2;
@ -1646,7 +1661,7 @@ static IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8
sizeof(convertedDecls[0]) * (This->numConvertedDecls + grow)); sizeof(convertedDecls[0]) * (This->numConvertedDecls + grow));
if(!convertedDecls) { if(!convertedDecls) {
/* This will destroy it */ /* This will destroy it */
IWineD3DVertexDeclaration_Release(pDecl); IDirect3DVertexDeclaration8_Release((IDirect3DVertexDeclaration8 *)d3d8_declaration);
return NULL; return NULL;
} }
This->decls = convertedDecls; This->decls = convertedDecls;
@ -1654,12 +1669,12 @@ static IWineD3DVertexDeclaration *IDirect3DDevice8Impl_FindDecl(IDirect3DDevice8
} }
memmove(convertedDecls + low + 1, convertedDecls + low, sizeof(convertedDecls[0]) * (This->numConvertedDecls - low)); memmove(convertedDecls + low + 1, convertedDecls + low, sizeof(convertedDecls[0]) * (This->numConvertedDecls - low));
convertedDecls[low].decl = pDecl; convertedDecls[low].decl = (IDirect3DVertexDeclaration8 *)d3d8_declaration;
convertedDecls[low].fvf = fvf; convertedDecls[low].fvf = fvf;
This->numConvertedDecls++; This->numConvertedDecls++;
TRACE("Returning %p. %d decls in array\n", pDecl, This->numConvertedDecls); TRACE("Returning %p. %u decls in array\n", d3d8_declaration, This->numConvertedDecls);
return pDecl; return d3d8_declaration;
} }
static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) { static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD pShader) {
@ -1671,7 +1686,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 ifa
if (VS_HIGHESTFIXEDFXF >= pShader) { if (VS_HIGHESTFIXEDFXF >= pShader) {
TRACE("Setting FVF, %d %d\n", VS_HIGHESTFIXEDFXF, pShader); TRACE("Setting FVF, %d %d\n", VS_HIGHESTFIXEDFXF, pShader);
IWineD3DDevice_SetFVF(This->WineD3DDevice, pShader); IWineD3DDevice_SetFVF(This->WineD3DDevice, pShader);
IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, IDirect3DDevice8Impl_FindDecl(This, pShader)); IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice,
IDirect3DDevice8Impl_FindDecl(This, pShader)->wined3d_vertex_declaration);
IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL); IWineD3DDevice_SetVertexShader(This->WineD3DDevice, NULL);
} else { } else {
TRACE("Setting shader\n"); TRACE("Setting shader\n");