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

Use d3dexecutebuffer_create only when compiling with MESA.

This commit is contained in:
Marcus Meissner 2000-04-10 13:45:17 +00:00 committed by Alexandre Julliard
parent a20b7921ad
commit 3873f44505
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/ddraw/d3ddevice/main.c
View File

@ -466,8 +466,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_CreateExecuteBuffer(
LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter
) { ) {
ICOM_THIS(IDirect3DDeviceImpl,iface); ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE("(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter); FIXME("(%p)->(%p,%p,%p): stub\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter);
*lplpDirect3DExecuteBuffer = d3dexecutebuffer_create(This, lpDesc);
return DD_OK; return DD_OK;
} }

13
dlls/ddraw/d3ddevice/mesa.c
View File

@ -749,6 +749,17 @@ static HRESULT WINAPI MESA_IDirect3DDevice2Impl_DrawIndexedPrimitive(
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI MESA_IDirect3DDeviceImpl_CreateExecuteBuffer(
LPDIRECT3DDEVICE iface, LPD3DEXECUTEBUFFERDESC lpDesc,
LPDIRECT3DEXECUTEBUFFER *lplpDirect3DExecuteBuffer, IUnknown *pUnkOuter
) {
ICOM_THIS(IDirect3DDeviceImpl,iface);
TRACE("(%p)->(%p,%p,%p)\n", This, lpDesc, lplpDirect3DExecuteBuffer, pUnkOuter);
*lplpDirect3DExecuteBuffer = d3dexecutebuffer_create(This, lpDesc);
return DD_OK;
}
/******************************************************************************* /*******************************************************************************
* OpenGL-specific IDirect3DDevice2 * OpenGL-specific IDirect3DDevice2
*/ */
@ -1017,7 +1028,7 @@ ICOM_VTABLE(IDirect3DDevice) OpenGL_vtable_dx3 =
IDirect3DDeviceImpl_Initialize, IDirect3DDeviceImpl_Initialize,
IDirect3DDeviceImpl_GetCaps, IDirect3DDeviceImpl_GetCaps,
IDirect3DDeviceImpl_SwapTextureHandles, IDirect3DDeviceImpl_SwapTextureHandles,
IDirect3DDeviceImpl_CreateExecuteBuffer, MESA_IDirect3DDeviceImpl_CreateExecuteBuffer,
IDirect3DDeviceImpl_GetStats, IDirect3DDeviceImpl_GetStats,
IDirect3DDeviceImpl_Execute, IDirect3DDeviceImpl_Execute,
IDirect3DDeviceImpl_AddViewport, IDirect3DDeviceImpl_AddViewport,