X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=dll%2Fdirectx%2Fwine%2Fd3d9%2Fd3d9_private.h;h=2649a5bc96500e35dea91bb9dc931609f3ce1d47;hp=fb8d1666c9b27041cf6cbeeb47dcd897556955d6;hb=e7054d7688e14c4a85f72cac70959a101d5f976c;hpb=e4155c95c72474bab3db9873fbb0f4548305026a diff --git a/dll/directx/wine/d3d9/d3d9_private.h b/dll/directx/wine/d3d9/d3d9_private.h index fb8d1666c9b..2649a5bc965 100644 --- a/dll/directx/wine/d3d9/d3d9_private.h +++ b/dll/directx/wine/d3d9/d3d9_private.h @@ -37,6 +37,7 @@ #define COBJMACROS #include #include +#include #include #include @@ -45,88 +46,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); #include #include -extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; +#define D3DPRESENTFLAGS_MASK 0x00000fffu + +extern const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops DECLSPEC_HIDDEN; + +HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; +BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN; enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN; - -#define WINECAPSTOD3D9CAPS(_pD3D9Caps, _pWineCaps) \ - _pD3D9Caps->DeviceType = (D3DDEVTYPE) _pWineCaps->DeviceType; \ - _pD3D9Caps->AdapterOrdinal = _pWineCaps->AdapterOrdinal; \ - _pD3D9Caps->Caps = _pWineCaps->Caps; \ - _pD3D9Caps->Caps2 = _pWineCaps->Caps2; \ - _pD3D9Caps->Caps3 = _pWineCaps->Caps3; \ - _pD3D9Caps->PresentationIntervals = _pWineCaps->PresentationIntervals; \ - _pD3D9Caps->CursorCaps = _pWineCaps->CursorCaps; \ - _pD3D9Caps->DevCaps = _pWineCaps->DevCaps; \ - _pD3D9Caps->PrimitiveMiscCaps = _pWineCaps->PrimitiveMiscCaps; \ - _pD3D9Caps->RasterCaps = _pWineCaps->RasterCaps; \ - _pD3D9Caps->ZCmpCaps = _pWineCaps->ZCmpCaps; \ - _pD3D9Caps->SrcBlendCaps = _pWineCaps->SrcBlendCaps; \ - _pD3D9Caps->DestBlendCaps = _pWineCaps->DestBlendCaps; \ - _pD3D9Caps->AlphaCmpCaps = _pWineCaps->AlphaCmpCaps; \ - _pD3D9Caps->ShadeCaps = _pWineCaps->ShadeCaps; \ - _pD3D9Caps->TextureCaps = _pWineCaps->TextureCaps; \ - _pD3D9Caps->TextureFilterCaps = _pWineCaps->TextureFilterCaps; \ - _pD3D9Caps->CubeTextureFilterCaps = _pWineCaps->CubeTextureFilterCaps; \ - _pD3D9Caps->VolumeTextureFilterCaps = _pWineCaps->VolumeTextureFilterCaps; \ - _pD3D9Caps->TextureAddressCaps = _pWineCaps->TextureAddressCaps; \ - _pD3D9Caps->VolumeTextureAddressCaps = _pWineCaps->VolumeTextureAddressCaps; \ - _pD3D9Caps->LineCaps = _pWineCaps->LineCaps; \ - _pD3D9Caps->MaxTextureWidth = _pWineCaps->MaxTextureWidth; \ - _pD3D9Caps->MaxTextureHeight = _pWineCaps->MaxTextureHeight; \ - _pD3D9Caps->MaxVolumeExtent = _pWineCaps->MaxVolumeExtent; \ - _pD3D9Caps->MaxTextureRepeat = _pWineCaps->MaxTextureRepeat; \ - _pD3D9Caps->MaxTextureAspectRatio = _pWineCaps->MaxTextureAspectRatio; \ - _pD3D9Caps->MaxAnisotropy = _pWineCaps->MaxAnisotropy; \ - _pD3D9Caps->MaxVertexW = _pWineCaps->MaxVertexW; \ - _pD3D9Caps->GuardBandLeft = _pWineCaps->GuardBandLeft; \ - _pD3D9Caps->GuardBandTop = _pWineCaps->GuardBandTop; \ - _pD3D9Caps->GuardBandRight = _pWineCaps->GuardBandRight; \ - _pD3D9Caps->GuardBandBottom = _pWineCaps->GuardBandBottom; \ - _pD3D9Caps->ExtentsAdjust = _pWineCaps->ExtentsAdjust; \ - _pD3D9Caps->StencilCaps = _pWineCaps->StencilCaps; \ - _pD3D9Caps->FVFCaps = _pWineCaps->FVFCaps; \ - _pD3D9Caps->TextureOpCaps = _pWineCaps->TextureOpCaps; \ - _pD3D9Caps->MaxTextureBlendStages = _pWineCaps->MaxTextureBlendStages; \ - _pD3D9Caps->MaxSimultaneousTextures = _pWineCaps->MaxSimultaneousTextures; \ - _pD3D9Caps->VertexProcessingCaps = _pWineCaps->VertexProcessingCaps; \ - _pD3D9Caps->MaxActiveLights = _pWineCaps->MaxActiveLights; \ - _pD3D9Caps->MaxUserClipPlanes = _pWineCaps->MaxUserClipPlanes; \ - _pD3D9Caps->MaxVertexBlendMatrices = _pWineCaps->MaxVertexBlendMatrices; \ - _pD3D9Caps->MaxVertexBlendMatrixIndex = _pWineCaps->MaxVertexBlendMatrixIndex; \ - _pD3D9Caps->MaxPointSize = _pWineCaps->MaxPointSize; \ - _pD3D9Caps->MaxPrimitiveCount = _pWineCaps->MaxPrimitiveCount; \ - _pD3D9Caps->MaxVertexIndex = _pWineCaps->MaxVertexIndex; \ - _pD3D9Caps->MaxStreams = _pWineCaps->MaxStreams; \ - _pD3D9Caps->MaxStreamStride = _pWineCaps->MaxStreamStride; \ - _pD3D9Caps->VertexShaderVersion = _pWineCaps->VertexShaderVersion; \ - _pD3D9Caps->MaxVertexShaderConst = _pWineCaps->MaxVertexShaderConst; \ - _pD3D9Caps->PixelShaderVersion = _pWineCaps->PixelShaderVersion; \ - _pD3D9Caps->PixelShader1xMaxValue = _pWineCaps->PixelShader1xMaxValue; \ - _pD3D9Caps->DevCaps2 = _pWineCaps->DevCaps2; \ - _pD3D9Caps->MaxNpatchTessellationLevel = _pWineCaps->MaxNpatchTessellationLevel; \ - _pD3D9Caps->MasterAdapterOrdinal = _pWineCaps->MasterAdapterOrdinal; \ - _pD3D9Caps->AdapterOrdinalInGroup = _pWineCaps->AdapterOrdinalInGroup; \ - _pD3D9Caps->NumberOfAdaptersInGroup = _pWineCaps->NumberOfAdaptersInGroup; \ - _pD3D9Caps->DeclTypes = _pWineCaps->DeclTypes; \ - _pD3D9Caps->NumSimultaneousRTs = _pWineCaps->NumSimultaneousRTs; \ - _pD3D9Caps->StretchRectFilterCaps = _pWineCaps->StretchRectFilterCaps; \ - _pD3D9Caps->VS20Caps.Caps = _pWineCaps->VS20Caps.caps; \ - _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ - _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ - _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ - _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.caps; \ - _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.dynamic_flow_control_depth; \ - _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.temp_count; \ - _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.static_flow_control_depth; \ - _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.instruction_slot_count; \ - _pD3D9Caps->VertexTextureFilterCaps = _pWineCaps->VertexTextureFilterCaps; \ - _pD3D9Caps->MaxVShaderInstructionsExecuted = _pWineCaps->MaxVShaderInstructionsExecuted; \ - _pD3D9Caps->MaxPShaderInstructionsExecuted = _pWineCaps->MaxPShaderInstructionsExecuted; \ - _pD3D9Caps->MaxVertexShader30InstructionSlots = _pWineCaps->MaxVertexShader30InstructionSlots; \ - _pD3D9Caps->MaxPixelShader30InstructionSlots = _pWineCaps->MaxPixelShader30InstructionSlots; +void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN; struct d3d9 { @@ -137,7 +67,6 @@ struct d3d9 }; BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; -void filter_caps(D3DCAPS9* pCaps) DECLSPEC_HIDDEN; struct fvf_declaration { @@ -145,6 +74,13 @@ struct fvf_declaration DWORD fvf; }; +enum d3d9_device_state +{ + D3D9_DEVICE_STATE_OK, + D3D9_DEVICE_STATE_LOST, + D3D9_DEVICE_STATE_NOT_RESET, +}; + struct d3d9_device { IDirect3DDevice9Ex IDirect3DDevice9Ex_iface; @@ -163,9 +99,13 @@ struct d3d9_device UINT index_buffer_size; UINT index_buffer_pos; + LONG device_state; BOOL in_destruction; - BOOL not_reset; BOOL in_scene; + BOOL has_vertex_declaration; + + UINT implicit_swapchain_count; + struct d3d9_swapchain **implicit_swapchains; }; HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wined3d *wined3d, @@ -190,13 +130,13 @@ struct d3d9_volume { IDirect3DVolume9 IDirect3DVolume9_iface; struct d3d9_resource resource; - struct wined3d_volume *wined3d_volume; - IUnknown *container; - IUnknown *forwardReference; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; + struct d3d9_texture *texture; }; -void volume_init(struct d3d9_volume *volume, struct wined3d_volume *wined3d_volume, - const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_swapchain { @@ -213,15 +153,21 @@ struct d3d9_surface { IDirect3DSurface9 IDirect3DSurface9_iface; struct d3d9_resource resource; - struct wined3d_surface *wined3d_surface; + struct wined3d_texture *wined3d_texture; + unsigned int sub_resource_idx; + struct list rtv_entry; + struct wined3d_rendertarget_view *wined3d_rtv; IDirect3DDevice9Ex *parent_device; IUnknown *container; - IUnknown *forwardReference; - BOOL getdc_supported; + struct d3d9_texture *texture; }; -void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface, - struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; +struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface) DECLSPEC_HIDDEN; +struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface) DECLSPEC_HIDDEN; +void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface, + struct wined3d_rendertarget_view *rtv) DECLSPEC_HIDDEN; +void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; struct d3d9_vertexbuffer @@ -256,6 +202,7 @@ struct d3d9_texture struct d3d9_resource resource; struct wined3d_texture *wined3d_texture; IDirect3DDevice9Ex *parent_device; + struct list rtv_list; }; HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *device, @@ -326,6 +273,7 @@ struct d3d9_query LONG refcount; struct wined3d_query *wined3d_query; IDirect3DDevice9Ex *parent_device; + DWORD data_size; }; HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUERYTYPE type) DECLSPEC_HIDDEN;