static void STDMETHODCALLTYPE d3d9_null_wined3d_object_destroyed(void *parent) {}
-static const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops =
+const struct wined3d_parent_ops d3d9_null_wined3d_parent_ops =
{
d3d9_null_wined3d_object_destroyed,
};
case WINED3DFMT_L16_UNORM: return D3DFMT_L16;
case WINED3DFMT_D32_FLOAT: return D3DFMT_D32F_LOCKABLE;
case WINED3DFMT_S8_UINT_D24_FLOAT: return D3DFMT_D24FS8;
- case WINED3DFMT_VERTEXDATA: return D3DFMT_VERTEXDATA;
case WINED3DFMT_R16_UINT: return D3DFMT_INDEX16;
case WINED3DFMT_R32_UINT: return D3DFMT_INDEX32;
case WINED3DFMT_R16G16B16A16_SNORM: return D3DFMT_Q16W16V16U16;
case D3DFMT_L16: return WINED3DFMT_L16_UNORM;
case D3DFMT_D32F_LOCKABLE: return WINED3DFMT_D32_FLOAT;
case D3DFMT_D24FS8: return WINED3DFMT_S8_UINT_D24_FLOAT;
- case D3DFMT_VERTEXDATA: return WINED3DFMT_VERTEXDATA;
case D3DFMT_INDEX16: return WINED3DFMT_R16_UINT;
case D3DFMT_INDEX32: return WINED3DFMT_R32_UINT;
case D3DFMT_Q16W16V16U16: return WINED3DFMT_R16G16B16A16_SNORM;
case D3DFMT_A32B32G32R32F: return WINED3DFMT_R32G32B32A32_FLOAT;
case D3DFMT_CxV8U8: return WINED3DFMT_R8G8_SNORM_Cx;
default:
- FIXME("Unhandled D3DFORMAT %#x\n", format);
+ FIXME("Unhandled D3DFORMAT %#x.\n", format);
return WINED3DFMT_UNKNOWN;
}
}
static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count)
{
- switch(primitive_type)
+ switch (primitive_type)
{
case D3DPT_POINTLIST:
return primitive_count;
return primitive_count + 2;
default:
- FIXME("Unhandled primitive type %#x\n", primitive_type);
+ FIXME("Unhandled primitive type %#x.\n", primitive_type);
return 0;
}
}
present_parameters->EnableAutoDepthStencil = swapchain_desc->enable_auto_depth_stencil;
present_parameters->AutoDepthStencilFormat
= d3dformat_from_wined3dformat(swapchain_desc->auto_depth_stencil_format);
- present_parameters->Flags = swapchain_desc->flags;
+ present_parameters->Flags = swapchain_desc->flags & D3DPRESENTFLAGS_MASK;
present_parameters->FullScreen_RefreshRateInHz = swapchain_desc->refresh_rate;
present_parameters->PresentationInterval = swapchain_desc->swap_interval;
}
-static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc,
- const D3DPRESENT_PARAMETERS *present_parameters)
+static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc,
+ const D3DPRESENT_PARAMETERS *present_parameters, BOOL extended)
{
+ D3DSWAPEFFECT highest_swapeffect = extended ? D3DSWAPEFFECT_FLIPEX : D3DSWAPEFFECT_COPY;
+ UINT highest_bb_count = extended ? 30 : 3;
+
+ if (!present_parameters->SwapEffect || present_parameters->SwapEffect > highest_swapeffect)
+ {
+ WARN("Invalid swap effect %u passed.\n", present_parameters->SwapEffect);
+ return FALSE;
+ }
+ if (present_parameters->BackBufferCount > highest_bb_count
+ || (present_parameters->SwapEffect == D3DSWAPEFFECT_COPY
+ && present_parameters->BackBufferCount > 1))
+ {
+ WARN("Invalid backbuffer count %u.\n", present_parameters->BackBufferCount);
+ return FALSE;
+ }
+
swapchain_desc->backbuffer_width = present_parameters->BackBufferWidth;
swapchain_desc->backbuffer_height = present_parameters->BackBufferHeight;
swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat);
swapchain_desc->enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil;
swapchain_desc->auto_depth_stencil_format
= wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat);
- swapchain_desc->flags = present_parameters->Flags;
+ swapchain_desc->flags
+ = (present_parameters->Flags & D3DPRESENTFLAGS_MASK) | WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH;
+ if (is_gdi_compat_wined3dformat(swapchain_desc->backbuffer_format))
+ swapchain_desc->flags |= WINED3D_SWAPCHAIN_GDI_COMPATIBLE;
swapchain_desc->refresh_rate = present_parameters->FullScreen_RefreshRateInHz;
swapchain_desc->swap_interval = present_parameters->PresentationInterval;
swapchain_desc->auto_restore_display_mode = TRUE;
+
+ if (present_parameters->Flags & ~D3DPRESENTFLAGS_MASK)
+ FIXME("Unhandled flags %#x.\n", present_parameters->Flags & ~D3DPRESENTFLAGS_MASK);
+
+ return TRUE;
+}
+
+void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps)
+{
+ static const DWORD ps_minor_version[] = {0, 4, 0, 0};
+ static const DWORD vs_minor_version[] = {0, 1, 0, 0};
+ static const DWORD texture_filter_caps =
+ D3DPTFILTERCAPS_MINFPOINT | D3DPTFILTERCAPS_MINFLINEAR | D3DPTFILTERCAPS_MINFANISOTROPIC |
+ D3DPTFILTERCAPS_MINFPYRAMIDALQUAD | D3DPTFILTERCAPS_MINFGAUSSIANQUAD|
+ D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT |
+ D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD|
+ D3DPTFILTERCAPS_MAGFGAUSSIANQUAD;
+
+ caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType;
+ caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal;
+ caps->Caps = wined3d_caps->Caps;
+ caps->Caps2 = wined3d_caps->Caps2;
+ caps->Caps3 = wined3d_caps->Caps3;
+ caps->PresentationIntervals = wined3d_caps->PresentationIntervals;
+ caps->CursorCaps = wined3d_caps->CursorCaps;
+ caps->DevCaps = wined3d_caps->DevCaps;
+ caps->PrimitiveMiscCaps = wined3d_caps->PrimitiveMiscCaps;
+ caps->RasterCaps = wined3d_caps->RasterCaps;
+ caps->ZCmpCaps = wined3d_caps->ZCmpCaps;
+ caps->SrcBlendCaps = wined3d_caps->SrcBlendCaps;
+ caps->DestBlendCaps = wined3d_caps->DestBlendCaps;
+ caps->AlphaCmpCaps = wined3d_caps->AlphaCmpCaps;
+ caps->ShadeCaps = wined3d_caps->ShadeCaps;
+ caps->TextureCaps = wined3d_caps->TextureCaps;
+ caps->TextureFilterCaps = wined3d_caps->TextureFilterCaps;
+ caps->CubeTextureFilterCaps = wined3d_caps->CubeTextureFilterCaps;
+ caps->VolumeTextureFilterCaps = wined3d_caps->VolumeTextureFilterCaps;
+ caps->TextureAddressCaps = wined3d_caps->TextureAddressCaps;
+ caps->VolumeTextureAddressCaps = wined3d_caps->VolumeTextureAddressCaps;
+ caps->LineCaps = wined3d_caps->LineCaps;
+ caps->MaxTextureWidth = wined3d_caps->MaxTextureWidth;
+ caps->MaxTextureHeight = wined3d_caps->MaxTextureHeight;
+ caps->MaxVolumeExtent = wined3d_caps->MaxVolumeExtent;
+ caps->MaxTextureRepeat = wined3d_caps->MaxTextureRepeat;
+ caps->MaxTextureAspectRatio = wined3d_caps->MaxTextureAspectRatio;
+ caps->MaxAnisotropy = wined3d_caps->MaxAnisotropy;
+ caps->MaxVertexW = wined3d_caps->MaxVertexW;
+ caps->GuardBandLeft = wined3d_caps->GuardBandLeft;
+ caps->GuardBandTop = wined3d_caps->GuardBandTop;
+ caps->GuardBandRight = wined3d_caps->GuardBandRight;
+ caps->GuardBandBottom = wined3d_caps->GuardBandBottom;
+ caps->ExtentsAdjust = wined3d_caps->ExtentsAdjust;
+ caps->StencilCaps = wined3d_caps->StencilCaps;
+ caps->FVFCaps = wined3d_caps->FVFCaps;
+ caps->TextureOpCaps = wined3d_caps->TextureOpCaps;
+ caps->MaxTextureBlendStages = wined3d_caps->MaxTextureBlendStages;
+ caps->MaxSimultaneousTextures = wined3d_caps->MaxSimultaneousTextures;
+ caps->VertexProcessingCaps = wined3d_caps->VertexProcessingCaps;
+ caps->MaxActiveLights = wined3d_caps->MaxActiveLights;
+ caps->MaxUserClipPlanes = wined3d_caps->MaxUserClipPlanes;
+ caps->MaxVertexBlendMatrices = wined3d_caps->MaxVertexBlendMatrices;
+ caps->MaxVertexBlendMatrixIndex = wined3d_caps->MaxVertexBlendMatrixIndex;
+ caps->MaxPointSize = wined3d_caps->MaxPointSize;
+ caps->MaxPrimitiveCount = wined3d_caps->MaxPrimitiveCount;
+ caps->MaxVertexIndex = wined3d_caps->MaxVertexIndex;
+ caps->MaxStreams = wined3d_caps->MaxStreams;
+ caps->MaxStreamStride = wined3d_caps->MaxStreamStride;
+ caps->VertexShaderVersion = wined3d_caps->VertexShaderVersion;
+ caps->MaxVertexShaderConst = wined3d_caps->MaxVertexShaderConst;
+ caps->PixelShaderVersion = wined3d_caps->PixelShaderVersion;
+ caps->PixelShader1xMaxValue = wined3d_caps->PixelShader1xMaxValue;
+ caps->DevCaps2 = wined3d_caps->DevCaps2;
+ caps->MaxNpatchTessellationLevel = wined3d_caps->MaxNpatchTessellationLevel;
+ caps->MasterAdapterOrdinal = wined3d_caps->MasterAdapterOrdinal;
+ caps->AdapterOrdinalInGroup = wined3d_caps->AdapterOrdinalInGroup;
+ caps->NumberOfAdaptersInGroup = wined3d_caps->NumberOfAdaptersInGroup;
+ caps->DeclTypes = wined3d_caps->DeclTypes;
+ caps->NumSimultaneousRTs = wined3d_caps->NumSimultaneousRTs;
+ caps->StretchRectFilterCaps = wined3d_caps->StretchRectFilterCaps;
+ caps->VS20Caps.Caps = wined3d_caps->VS20Caps.caps;
+ caps->VS20Caps.DynamicFlowControlDepth = wined3d_caps->VS20Caps.dynamic_flow_control_depth;
+ caps->VS20Caps.NumTemps = wined3d_caps->VS20Caps.temp_count;
+ caps->VS20Caps.StaticFlowControlDepth = wined3d_caps->VS20Caps.static_flow_control_depth;
+ caps->PS20Caps.Caps = wined3d_caps->PS20Caps.caps;
+ caps->PS20Caps.DynamicFlowControlDepth = wined3d_caps->PS20Caps.dynamic_flow_control_depth;
+ caps->PS20Caps.NumTemps = wined3d_caps->PS20Caps.temp_count;
+ caps->PS20Caps.StaticFlowControlDepth = wined3d_caps->PS20Caps.static_flow_control_depth;
+ caps->PS20Caps.NumInstructionSlots = wined3d_caps->PS20Caps.instruction_slot_count;
+ caps->VertexTextureFilterCaps = wined3d_caps->VertexTextureFilterCaps;
+ caps->MaxVShaderInstructionsExecuted = wined3d_caps->MaxVShaderInstructionsExecuted;
+ caps->MaxPShaderInstructionsExecuted = wined3d_caps->MaxPShaderInstructionsExecuted;
+ caps->MaxVertexShader30InstructionSlots = wined3d_caps->MaxVertexShader30InstructionSlots;
+ caps->MaxPixelShader30InstructionSlots = wined3d_caps->MaxPixelShader30InstructionSlots;
+
+ /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps. */
+ caps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES;
+
+ /* Filter wined3d caps. */
+ caps->TextureFilterCaps &= texture_filter_caps;
+ caps->CubeTextureFilterCaps &= texture_filter_caps;
+ caps->VolumeTextureFilterCaps &= texture_filter_caps;
+
+ caps->DevCaps &=
+ D3DDEVCAPS_EXECUTESYSTEMMEMORY | D3DDEVCAPS_EXECUTEVIDEOMEMORY | D3DDEVCAPS_TLVERTEXSYSTEMMEMORY |
+ D3DDEVCAPS_TLVERTEXVIDEOMEMORY | D3DDEVCAPS_TEXTURESYSTEMMEMORY| D3DDEVCAPS_TEXTUREVIDEOMEMORY |
+ D3DDEVCAPS_DRAWPRIMTLVERTEX | D3DDEVCAPS_CANRENDERAFTERFLIP | D3DDEVCAPS_TEXTURENONLOCALVIDMEM|
+ D3DDEVCAPS_DRAWPRIMITIVES2 | D3DDEVCAPS_SEPARATETEXTUREMEMORIES |
+ D3DDEVCAPS_DRAWPRIMITIVES2EX | D3DDEVCAPS_HWTRANSFORMANDLIGHT| D3DDEVCAPS_CANBLTSYSTONONLOCAL |
+ D3DDEVCAPS_HWRASTERIZATION | D3DDEVCAPS_PUREDEVICE | D3DDEVCAPS_QUINTICRTPATCHES |
+ D3DDEVCAPS_RTPATCHES | D3DDEVCAPS_RTPATCHHANDLEZERO | D3DDEVCAPS_NPATCHES;
+
+ caps->ShadeCaps &=
+ D3DPSHADECAPS_COLORGOURAUDRGB | D3DPSHADECAPS_SPECULARGOURAUDRGB |
+ D3DPSHADECAPS_ALPHAGOURAUDBLEND | D3DPSHADECAPS_FOGGOURAUD;
+
+ caps->RasterCaps &=
+ D3DPRASTERCAPS_DITHER | D3DPRASTERCAPS_ZTEST | D3DPRASTERCAPS_FOGVERTEX |
+ D3DPRASTERCAPS_FOGTABLE | D3DPRASTERCAPS_MIPMAPLODBIAS | D3DPRASTERCAPS_ZBUFFERLESSHSR |
+ D3DPRASTERCAPS_FOGRANGE | D3DPRASTERCAPS_ANISOTROPY | D3DPRASTERCAPS_WBUFFER |
+ D3DPRASTERCAPS_WFOG | D3DPRASTERCAPS_ZFOG | D3DPRASTERCAPS_COLORPERSPECTIVE |
+ D3DPRASTERCAPS_SCISSORTEST | D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS |
+ D3DPRASTERCAPS_DEPTHBIAS | D3DPRASTERCAPS_MULTISAMPLE_TOGGLE;
+
+ caps->DevCaps2 &=
+ D3DDEVCAPS2_STREAMOFFSET | D3DDEVCAPS2_DMAPNPATCH | D3DDEVCAPS2_ADAPTIVETESSRTPATCH |
+ D3DDEVCAPS2_ADAPTIVETESSNPATCH | D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES |
+ D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH| D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET;
+
+ caps->Caps2 &=
+ D3DCAPS2_FULLSCREENGAMMA | D3DCAPS2_CANCALIBRATEGAMMA | D3DCAPS2_RESERVED |
+ D3DCAPS2_CANMANAGERESOURCE | D3DCAPS2_DYNAMICTEXTURES | D3DCAPS2_CANAUTOGENMIPMAP;
+
+ caps->VertexProcessingCaps &=
+ D3DVTXPCAPS_TEXGEN | D3DVTXPCAPS_MATERIALSOURCE7 | D3DVTXPCAPS_DIRECTIONALLIGHTS |
+ D3DVTXPCAPS_POSITIONALLIGHTS | D3DVTXPCAPS_LOCALVIEWER | D3DVTXPCAPS_TWEENING |
+ D3DVTXPCAPS_TEXGEN_SPHEREMAP | D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER;
+
+ caps->TextureCaps &=
+ D3DPTEXTURECAPS_PERSPECTIVE | D3DPTEXTURECAPS_POW2 | D3DPTEXTURECAPS_ALPHA |
+ D3DPTEXTURECAPS_SQUAREONLY | D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE |
+ D3DPTEXTURECAPS_ALPHAPALETTE | D3DPTEXTURECAPS_NONPOW2CONDITIONAL |
+ D3DPTEXTURECAPS_PROJECTED | D3DPTEXTURECAPS_CUBEMAP | D3DPTEXTURECAPS_VOLUMEMAP |
+ D3DPTEXTURECAPS_MIPMAP | D3DPTEXTURECAPS_MIPVOLUMEMAP | D3DPTEXTURECAPS_MIPCUBEMAP |
+ D3DPTEXTURECAPS_CUBEMAP_POW2 | D3DPTEXTURECAPS_VOLUMEMAP_POW2| D3DPTEXTURECAPS_NOPROJECTEDBUMPENV;
+
+ caps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst);
+ caps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, caps->NumSimultaneousRTs);
+
+ if (caps->PixelShaderVersion > 3)
+ {
+ caps->PixelShaderVersion = D3DPS_VERSION(3, 0);
+ }
+ else
+ {
+ DWORD major = caps->PixelShaderVersion;
+ caps->PixelShaderVersion = D3DPS_VERSION(major, ps_minor_version[major]);
+ }
+
+ if (caps->VertexShaderVersion > 3)
+ {
+ caps->VertexShaderVersion = D3DVS_VERSION(3, 0);
+ }
+ else
+ {
+ DWORD major = caps->VertexShaderVersion;
+ caps->VertexShaderVersion = D3DVS_VERSION(major, vs_minor_version[major]);
+ }
}
static HRESULT WINAPI d3d9_device_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out)
if (device->index_buffer)
wined3d_buffer_decref(device->index_buffer);
+ HeapFree(GetProcessHeap(), 0, device->implicit_swapchains);
+
wined3d_device_uninit_3d(device->wined3d_device);
wined3d_device_release_focus_window(device->wined3d_device);
wined3d_device_decref(device->wined3d_device);
TRACE("iface %p.\n", iface);
- if (device->not_reset)
+ TRACE("device state: %#x.\n", device->device_state);
+
+ if (device->d3d_parent->extended)
+ return D3D_OK;
+
+ switch (device->device_state)
{
- TRACE("D3D9 device is marked not reset.\n");
- return D3DERR_DEVICENOTRESET;
+ default:
+ case D3D9_DEVICE_STATE_OK:
+ return D3D_OK;
+ case D3D9_DEVICE_STATE_LOST:
+ return D3DERR_DEVICELOST;
+ case D3D9_DEVICE_STATE_NOT_RESET:
+ return D3DERR_DEVICENOTRESET;
}
-
- return D3D_OK;
}
static UINT WINAPI d3d9_device_GetAvailableTextureMem(IDirect3DDevice9Ex *iface)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- HRESULT hr;
+ UINT ret;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_device_get_available_texture_mem(device->wined3d_device);
+ ret = wined3d_device_get_available_texture_mem(device->wined3d_device);
wined3d_mutex_unlock();
- return hr;
+ return ret;
}
static HRESULT WINAPI d3d9_device_EvictManagedResources(IDirect3DDevice9Ex *iface)
static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCAPS9 *caps)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- WINED3DCAPS *wined3d_caps;
+ WINED3DCAPS wined3d_caps;
HRESULT hr;
TRACE("iface %p, caps %p.\n", iface, caps);
if (!caps)
return D3DERR_INVALIDCALL;
- if (!(wined3d_caps = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wined3d_caps))))
- return D3DERR_INVALIDCALL; /* well this is what MSDN says to return */
-
memset(caps, 0, sizeof(*caps));
wined3d_mutex_lock();
- hr = wined3d_device_get_device_caps(device->wined3d_device, wined3d_caps);
+ hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps);
wined3d_mutex_unlock();
- WINECAPSTOD3D9CAPS(caps, wined3d_caps)
- HeapFree(GetProcessHeap(), 0, wined3d_caps);
-
- /* Some functionality is implemented in d3d9.dll, not wined3d.dll. Add the needed caps */
- caps->DevCaps2 |= D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES;
-
- filter_caps(caps);
+ d3dcaps_from_wined3dcaps(caps, &wined3d_caps);
return hr;
}
wined3d_mutex_lock();
hr = wined3d_device_set_cursor_properties(device->wined3d_device,
- hotspot_x, hotspot_y, bitmap_impl->wined3d_surface);
+ hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx);
wined3d_mutex_unlock();
return hr;
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct wined3d_swapchain_desc desc;
struct d3d9_swapchain *object;
+ UINT i, count;
HRESULT hr;
TRACE("iface %p, present_parameters %p, swapchain %p.\n",
iface, present_parameters, swapchain);
- wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters);
+ if (!present_parameters->Windowed)
+ {
+ WARN("Trying to create an additional fullscreen swapchain, returning D3DERR_INVALIDCALL.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
+ wined3d_mutex_lock();
+ count = wined3d_device_get_swapchain_count(device->wined3d_device);
+ for (i = 0; i < count; ++i)
+ {
+ struct wined3d_swapchain *wined3d_swapchain;
+
+ wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i);
+ wined3d_swapchain_get_desc(wined3d_swapchain, &desc);
+
+ if (!desc.windowed)
+ {
+ wined3d_mutex_unlock();
+ WARN("Trying to create an additional swapchain in fullscreen mode, returning D3DERR_INVALIDCALL.\n");
+ return D3DERR_INVALIDCALL;
+ }
+ }
+ wined3d_mutex_unlock();
+
+ if (!wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters,
+ device->d3d_parent->extended))
+ return D3DERR_INVALIDCALL;
if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object)))
*swapchain = (IDirect3DSwapChain9 *)&object->IDirect3DSwapChain9Ex_iface;
present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc);
UINT swapchain_idx, IDirect3DSwapChain9 **swapchain)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- struct wined3d_swapchain *wined3d_swapchain;
- struct d3d9_swapchain *swapchain_impl;
HRESULT hr;
TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", iface, swapchain_idx, swapchain);
wined3d_mutex_lock();
- if ((wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, swapchain_idx)))
+ if (swapchain_idx < device->implicit_swapchain_count)
{
- swapchain_impl = wined3d_swapchain_get_parent(wined3d_swapchain);
- *swapchain = (IDirect3DSwapChain9 *)&swapchain_impl->IDirect3DSwapChain9Ex_iface;
- IDirect3DSwapChain9Ex_AddRef(*swapchain);
- hr = D3D_OK;
+ *swapchain = (IDirect3DSwapChain9 *)&device->implicit_swapchains[swapchain_idx]->IDirect3DSwapChain9Ex_iface;
+ IDirect3DSwapChain9Ex_AddRef(*swapchain);
+ hr = D3D_OK;
}
else
{
static HRESULT CDECL reset_enum_callback(struct wined3d_resource *resource)
{
struct wined3d_resource_desc desc;
+ IDirect3DBaseTexture9 *texture;
+ struct d3d9_surface *surface;
+ IUnknown *parent;
wined3d_resource_get_desc(resource, &desc);
- if (desc.pool == WINED3D_POOL_DEFAULT)
+ if (desc.pool != WINED3D_POOL_DEFAULT)
+ return D3D_OK;
+
+ if (desc.resource_type != WINED3D_RTYPE_TEXTURE_2D)
{
- struct d3d9_surface *surface;
+ WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource);
+ return D3DERR_INVALIDCALL;
+ }
- if (desc.resource_type == WINED3D_RTYPE_TEXTURE)
- {
- IUnknown *parent = wined3d_resource_get_parent(resource);
- IDirect3DBaseTexture9 *texture;
+ parent = wined3d_resource_get_parent(resource);
+ if (parent && SUCCEEDED(IUnknown_QueryInterface(parent, &IID_IDirect3DBaseTexture9, (void **)&texture)))
+ {
+ IDirect3DBaseTexture9_Release(texture);
+ WARN("Texture %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", texture, resource);
+ return D3DERR_INVALIDCALL;
+ }
- if (SUCCEEDED(IUnknown_QueryInterface(parent, &IID_IDirect3DBaseTexture9, (void **)&texture)))
- {
- IDirect3DBaseTexture9_Release(texture);
- WARN("Texture %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", texture, resource);
- return D3DERR_INVALIDCALL;
- }
+ surface = wined3d_texture_get_sub_resource_parent(wined3d_texture_from_resource(resource), 0);
+ if (!surface->resource.refcount)
+ return D3D_OK;
- return D3D_OK;
- }
+ WARN("Surface %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface);
+ return D3DERR_INVALIDCALL;
+}
- if (desc.resource_type != WINED3D_RTYPE_SURFACE)
- {
- WARN("Resource %p in pool D3DPOOL_DEFAULT blocks the Reset call.\n", resource);
- return D3DERR_INVALIDCALL;
- }
+static HRESULT d3d9_device_get_swapchains(struct d3d9_device *device)
+{
+ UINT i, new_swapchain_count = wined3d_device_get_swapchain_count(device->wined3d_device);
+ struct wined3d_swapchain *wined3d_swapchain;
- surface = wined3d_resource_get_parent(resource);
- if (surface->resource.refcount)
- {
- WARN("Surface %p (resource %p) in pool D3DPOOL_DEFAULT blocks the Reset call.\n", surface, resource);
- return D3DERR_INVALIDCALL;
- }
+ if (!(device->implicit_swapchains = HeapAlloc(GetProcessHeap(), 0,
+ new_swapchain_count * sizeof(*device->implicit_swapchains))))
+ return E_OUTOFMEMORY;
- WARN("Surface %p (resource %p) is an implicit resource with ref 0.\n", surface, resource);
+ for (i = 0; i < new_swapchain_count; ++i)
+ {
+ wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, i);
+ device->implicit_swapchains[i] = wined3d_swapchain_get_parent(wined3d_swapchain);
}
+ device->implicit_swapchain_count = new_swapchain_count;
return D3D_OK;
}
-static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface,
- D3DPRESENT_PARAMETERS *present_parameters)
+static HRESULT d3d9_device_reset(struct d3d9_device *device,
+ D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode)
{
- struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct wined3d_swapchain_desc swapchain_desc;
+ struct wined3d_display_mode wined3d_mode;
HRESULT hr;
- TRACE("iface %p, present_parameters %p.\n", iface, present_parameters);
+ if (!device->d3d_parent->extended && device->device_state == D3D9_DEVICE_STATE_LOST)
+ {
+ WARN("App not active, returning D3DERR_DEVICELOST.\n");
+ return D3DERR_DEVICELOST;
+ }
+
+ if (mode)
+ {
+ wined3d_mode.width = mode->Width;
+ wined3d_mode.height = mode->Height;
+ wined3d_mode.refresh_rate = mode->RefreshRate;
+ wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format);
+ wined3d_mode.scanline_ordering = mode->ScanLineOrdering;
+ }
+
+ if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters,
+ device->d3d_parent->extended))
+ return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
device->vertex_buffer = NULL;
device->vertex_buffer_size = 0;
}
+
if (device->index_buffer)
{
wined3d_buffer_decref(device->index_buffer);
device->index_buffer_size = 0;
}
- wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters);
- hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc,
- NULL, reset_enum_callback, !device->d3d_parent->extended);
- if (FAILED(hr) && !device->d3d_parent->extended)
- device->not_reset = TRUE;
- else
- device->not_reset = FALSE;
+ if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc,
+ mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended)))
+ {
+ HeapFree(GetProcessHeap(), 0, device->implicit_swapchains);
+
+ if (FAILED(hr = d3d9_device_get_swapchains(device)))
+ {
+ device->device_state = D3D9_DEVICE_STATE_NOT_RESET;
+ }
+ else
+ {
+ wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc);
+ present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width;
+ present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height;
+ present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format);
+ present_parameters->BackBufferCount = swapchain_desc.backbuffer_count;
+
+ device->device_state = D3D9_DEVICE_STATE_OK;
+ }
+ }
+ else if (!device->d3d_parent->extended)
+ {
+ device->device_state = D3D9_DEVICE_STATE_NOT_RESET;
+ }
+
wined3d_mutex_unlock();
return hr;
}
+static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *iface,
+ D3DPRESENT_PARAMETERS *present_parameters)
+{
+ struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+
+ TRACE("iface %p, present_parameters %p.\n", iface, present_parameters);
+
+ return d3d9_device_reset(device, present_parameters, NULL);
+}
+
static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Present(IDirect3DDevice9Ex *iface,
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ UINT i;
HRESULT hr;
TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n",
iface, src_rect, dst_rect, dst_window_override, dirty_region);
+ if (device->device_state != D3D9_DEVICE_STATE_OK)
+ return device->d3d_parent->extended ? S_PRESENT_OCCLUDED : D3DERR_DEVICELOST;
+
+ if (dirty_region)
+ FIXME("Ignoring dirty_region %p.\n", dirty_region);
+
wined3d_mutex_lock();
- hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect,
- dst_window_override, dirty_region, 0);
+ for (i = 0; i < device->implicit_swapchain_count; ++i)
+ {
+ if (FAILED(hr = wined3d_swapchain_present(device->implicit_swapchains[i]->wined3d_swapchain,
+ src_rect, dst_rect, dst_window_override, 0)))
+ {
+ wined3d_mutex_unlock();
+ return hr;
+ }
+ }
wined3d_mutex_unlock();
- return hr;
+ return D3D_OK;
}
static HRESULT WINAPI d3d9_device_GetBackBuffer(IDirect3DDevice9Ex *iface, UINT swapchain,
UINT backbuffer_idx, D3DBACKBUFFER_TYPE backbuffer_type, IDirect3DSurface9 **backbuffer)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- struct wined3d_surface *wined3d_surface = NULL;
- struct d3d9_surface *surface_impl;
HRESULT hr;
TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n",
iface, swapchain, backbuffer_idx, backbuffer_type, backbuffer);
+ /* backbuffer_type is ignored by native. */
+
+ /* No need to check for backbuffer == NULL, Windows crashes in that case. */
+ *backbuffer = NULL;
+
wined3d_mutex_lock();
- hr = wined3d_device_get_back_buffer(device->wined3d_device, swapchain,
- backbuffer_idx, (enum wined3d_backbuffer_type)backbuffer_type, &wined3d_surface);
- if (SUCCEEDED(hr) && wined3d_surface && backbuffer)
+ if (swapchain >= device->implicit_swapchain_count)
{
- surface_impl = wined3d_surface_get_parent(wined3d_surface);
- *backbuffer = &surface_impl->IDirect3DSurface9_iface;
- IDirect3DSurface9_AddRef(*backbuffer);
+ wined3d_mutex_unlock();
+ WARN("Swapchain index %u is out of range, returning D3DERR_INVALIDCALL.\n", swapchain);
+ return D3DERR_INVALIDCALL;
}
+
+ hr = IDirect3DSwapChain9Ex_GetBackBuffer(&device->implicit_swapchains[swapchain]->IDirect3DSwapChain9Ex_iface,
+ backbuffer_idx, backbuffer_type, backbuffer);
wined3d_mutex_unlock();
return hr;
}
+
static HRESULT WINAPI d3d9_device_GetRasterStatus(IDirect3DDevice9Ex *iface,
UINT swapchain, D3DRASTER_STATUS *raster_status)
{
}
if (set_mem)
- {
- struct wined3d_resource *resource;
- struct d3d9_surface *surface;
-
- resource = wined3d_texture_get_sub_resource(object->wined3d_texture, 0);
- surface = wined3d_resource_get_parent(resource);
- wined3d_surface_update_desc(surface->wined3d_surface, width, height,
+ wined3d_texture_update_desc(object->wined3d_texture, width, height,
wined3dformat_from_d3dformat(format), WINED3D_MULTISAMPLE_NONE, 0,
*shared_handle, 0);
- }
TRACE("Created texture %p.\n", object);
*texture = (IDirect3DTexture9 *)&object->IDirect3DBaseTexture9_iface;
struct d3d9_texture *object;
HRESULT hr;
- TRACE("iface %p, width %u, height %u, depth %u, levels %u\n",
- iface, width, height, depth, levels);
- TRACE("usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n",
+ TRACE("iface %p, width %u, height %u, depth %u, levels %u, "
+ "usage %#x, format %#x, pool %#x, texture %p, shared_handle %p.\n",
+ iface, width, height, depth, levels,
usage, format, pool, texture, shared_handle);
*texture = NULL;
D3DFORMAT format, DWORD flags, IDirect3DSurface9 **surface, UINT usage, D3DPOOL pool,
D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, void *user_mem)
{
- struct wined3d_resource *sub_resource;
struct wined3d_resource_desc desc;
struct d3d9_surface *surface_impl;
struct wined3d_texture *texture;
device, width, height, format, flags, surface, usage, pool,
multisample_type, multisample_quality);
- desc.resource_type = WINED3D_RTYPE_TEXTURE;
+ desc.resource_type = WINED3D_RTYPE_TEXTURE_2D;
desc.format = wined3dformat_from_d3dformat(format);
desc.multisample_type = multisample_type;
desc.multisample_quality = multisample_quality;
desc.depth = 1;
desc.size = 0;
+ if (is_gdi_compat_wined3dformat(desc.format))
+ flags |= WINED3D_TEXTURE_CREATE_GET_DC;
+
wined3d_mutex_lock();
if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc,
- 1, flags, NULL, &d3d9_null_wined3d_parent_ops, &texture)))
+ 1, 1, flags, NULL, NULL, &d3d9_null_wined3d_parent_ops, &texture)))
{
wined3d_mutex_unlock();
WARN("Failed to create texture, hr %#x.\n", hr);
+ if (hr == WINED3DERR_NOTAVAILABLE)
+ hr = D3DERR_INVALIDCALL;
return hr;
}
- sub_resource = wined3d_texture_get_sub_resource(texture, 0);
- surface_impl = wined3d_resource_get_parent(sub_resource);
- surface_impl->forwardReference = NULL;
+ surface_impl = wined3d_texture_get_sub_resource_parent(texture, 0);
surface_impl->parent_device = &device->IDirect3DDevice9Ex_iface;
*surface = &surface_impl->IDirect3DSurface9_iface;
IDirect3DSurface9_AddRef(*surface);
- wined3d_texture_decref(texture);
if (user_mem)
- wined3d_surface_update_desc(surface_impl->wined3d_surface, width, height,
+ wined3d_texture_update_desc(texture, width, height,
desc.format, multisample_type, multisample_quality, user_mem, 0);
+ wined3d_texture_decref(texture);
+
wined3d_mutex_unlock();
return D3D_OK;
}
+BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format)
+{
+ switch (format)
+ {
+ case WINED3DFMT_B8G8R8A8_UNORM:
+ case WINED3DFMT_B8G8R8X8_UNORM:
+ case WINED3DFMT_B5G6R5_UNORM:
+ case WINED3DFMT_B5G5R5X1_UNORM:
+ case WINED3DFMT_B5G5R5A1_UNORM:
+ case WINED3DFMT_B8G8R8_UNORM:
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
+
static HRESULT WINAPI d3d9_device_CreateRenderTarget(IDirect3DDevice9Ex *iface, UINT width, UINT height,
D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality,
BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle)
}
if (lockable)
- flags |= WINED3D_SURFACE_MAPPABLE;
+ flags |= WINED3D_TEXTURE_CREATE_MAPPABLE;
return d3d9_device_create_surface(device, width, height, format, flags, surface,
D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL);
BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- DWORD flags = WINED3D_SURFACE_MAPPABLE;
+ DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE;
TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n"
"discard %#x, surface %p, shared_handle %p.\n",
}
if (discard)
- flags |= WINED3D_SURFACE_DISCARD;
+ flags |= WINED3D_TEXTURE_CREATE_DISCARD;
return d3d9_device_create_surface(device, width, height, format, flags, surface,
D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL);
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface);
struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface);
+ struct wined3d_box src_box;
HRESULT hr;
TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n",
iface, src_surface, src_rect, dst_surface, dst_point);
+ if (src_rect)
+ wined3d_box_set(&src_box, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1);
+
wined3d_mutex_lock();
- hr = wined3d_device_update_surface(device->wined3d_device, src->wined3d_surface, src_rect,
- dst->wined3d_surface, dst_point);
+ hr = wined3d_device_copy_sub_resource_region(device->wined3d_device,
+ wined3d_texture_get_resource(dst->wined3d_texture), dst->sub_resource_idx, dst_point ? dst_point->x : 0,
+ dst_point ? dst_point->y : 0, 0, wined3d_texture_get_resource(src->wined3d_texture),
+ src->sub_resource_idx, src_rect ? &src_box : NULL);
wined3d_mutex_unlock();
+ if (FAILED(hr))
+ return D3DERR_INVALIDCALL;
+
return hr;
}
{
struct d3d9_surface *rt_impl = unsafe_impl_from_IDirect3DSurface9(render_target);
struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface);
+ struct wined3d_sub_resource_desc wined3d_desc;
+ RECT dst_rect, src_rect;
HRESULT hr;
TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface);
+ if (!render_target || !dst_surface)
+ return D3DERR_INVALIDCALL;
+
wined3d_mutex_lock();
- hr = wined3d_surface_get_render_target_data(dst_impl->wined3d_surface, rt_impl->wined3d_surface);
+ wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc);
+ SetRect(&dst_rect, 0, 0, wined3d_desc.width, wined3d_desc.height);
+
+ wined3d_texture_get_sub_resource_desc(rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &wined3d_desc);
+ SetRect(&src_rect, 0, 0, wined3d_desc.width, wined3d_desc.height);
+
+ /* TODO: Check surface sizes, pools, etc. */
+ if (wined3d_desc.multisample_type)
+ hr = D3DERR_INVALIDCALL;
+ else
+ hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect,
+ rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT);
wined3d_mutex_unlock();
return hr;
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface);
- HRESULT hr;
+ HRESULT hr = D3DERR_INVALIDCALL;
TRACE("iface %p, swapchain %u, dst_surface %p.\n", iface, swapchain, dst_surface);
wined3d_mutex_lock();
- hr = wined3d_device_get_front_buffer_data(device->wined3d_device, swapchain, dst_impl->wined3d_surface);
+ if (swapchain < device->implicit_swapchain_count)
+ hr = wined3d_swapchain_get_front_buffer_data(device->implicit_swapchains[swapchain]->wined3d_swapchain,
+ dst_impl->wined3d_texture, dst_impl->sub_resource_idx);
wined3d_mutex_unlock();
return hr;
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *src = unsafe_impl_from_IDirect3DSurface9(src_surface);
struct d3d9_surface *dst = unsafe_impl_from_IDirect3DSurface9(dst_surface);
+ struct wined3d_sub_resource_desc src_desc, dst_desc;
HRESULT hr = D3DERR_INVALIDCALL;
- struct wined3d_resource_desc src_desc, dst_desc;
- struct wined3d_resource *wined3d_resource;
+ RECT d, s;
TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n",
iface, src_surface, src_rect, dst_surface, dst_rect, filter);
wined3d_mutex_lock();
- wined3d_resource = wined3d_surface_get_resource(dst->wined3d_surface);
- wined3d_resource_get_desc(wined3d_resource, &dst_desc);
+ wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &dst_desc);
+ if (!dst_rect)
+ {
+ SetRect(&d, 0, 0, dst_desc.width, dst_desc.height);
+ dst_rect = &d;
+ }
- wined3d_resource = wined3d_surface_get_resource(src->wined3d_surface);
- wined3d_resource_get_desc(wined3d_resource, &src_desc);
+ wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &src_desc);
+ if (!src_rect)
+ {
+ SetRect(&s, 0, 0, src_desc.width, src_desc.height);
+ src_rect = &s;
+ }
if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
{
goto done;
}
- if (src_rect)
+ if (src_rect->left || src_rect->top || src_rect->right != src_desc.width
+ || src_rect->bottom != src_desc.height)
{
- if (src_rect->left || src_rect->top || src_rect->right != src_desc.width
- || src_rect->bottom != src_desc.height)
- {
- WARN("Rejecting depth / stencil blit with invalid source rect %s.\n",
- wine_dbgstr_rect(src_rect));
- goto done;
- }
+ WARN("Rejecting depth / stencil blit with invalid source rect %s.\n",
+ wine_dbgstr_rect(src_rect));
+ goto done;
}
- if (dst_rect)
+
+ if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width
+ || dst_rect->bottom != dst_desc.height)
{
- if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width
- || dst_rect->bottom != dst_desc.height)
- {
- WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n",
- wine_dbgstr_rect(dst_rect));
- goto done;
- }
+ WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n",
+ wine_dbgstr_rect(dst_rect));
+ goto done;
}
+
if (src_desc.width != dst_desc.width || src_desc.height != dst_desc.height)
{
WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n");
}
}
- hr = wined3d_surface_blt(dst->wined3d_surface, dst_rect, src->wined3d_surface, src_rect, 0, NULL, filter);
+ hr = wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, dst_rect,
+ src->wined3d_texture, src->sub_resource_idx, src_rect, 0, NULL, filter);
if (hr == WINEDDERR_INVALIDRECT)
hr = D3DERR_INVALIDCALL;
};
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface);
- struct wined3d_resource *wined3d_resource;
- struct wined3d_resource_desc desc;
+ struct wined3d_sub_resource_desc desc;
+ struct wined3d_rendertarget_view *rtv;
HRESULT hr;
TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color);
wined3d_mutex_lock();
- wined3d_resource = wined3d_surface_get_resource(surface_impl->wined3d_surface);
- wined3d_resource_get_desc(wined3d_resource, &desc);
+ if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture,
+ surface_impl->sub_resource_idx, &desc)))
+ {
+ wined3d_mutex_unlock();
+ return D3DERR_INVALIDCALL;
+ }
- /* This method is only allowed with surfaces that are render targets, or
- * offscreen plain surfaces in D3DPOOL_DEFAULT. */
- if (!(desc.usage & WINED3DUSAGE_RENDERTARGET) && desc.pool != WINED3D_POOL_DEFAULT)
+ if (desc.pool != WINED3D_POOL_DEFAULT)
{
wined3d_mutex_unlock();
- WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n");
+ WARN("Colorfill is not allowed on surfaces in pool %#x, returning D3DERR_INVALIDCALL.\n", desc.pool);
+ return D3DERR_INVALIDCALL;
+ }
+ if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE)
+ {
+ wined3d_mutex_unlock();
+ WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n");
+ return D3DERR_INVALIDCALL;
+ }
+ if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL)
+ {
+ wined3d_mutex_unlock();
+ WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n");
return D3DERR_INVALIDCALL;
}
- /* Colorfill can only be used on rendertarget surfaces, or offscreen plain surfaces in D3DPOOL_DEFAULT */
- hr = wined3d_device_color_fill(device->wined3d_device, surface_impl->wined3d_surface, rect, &c);
+ rtv = d3d9_surface_acquire_rendertarget_view(surface_impl);
+ hr = wined3d_device_clear_rendertarget_view(device->wined3d_device,
+ rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0);
+ d3d9_surface_release_rendertarget_view(surface_impl, rtv);
wined3d_mutex_unlock();
* regardless of the pool they're created in. Should we set dynamic usage
* here? */
return d3d9_device_create_surface(device, width, height, format,
- WINED3D_SURFACE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem);
+ WINED3D_TEXTURE_CREATE_MAPPABLE, surface, 0, pool, D3DMULTISAMPLE_NONE, 0, user_mem);
}
static HRESULT WINAPI d3d9_device_SetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 *surface)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *surface_impl = unsafe_impl_from_IDirect3DSurface9(surface);
+ struct wined3d_rendertarget_view *rtv;
HRESULT hr;
TRACE("iface %p, idx %u, surface %p.\n", iface, idx, surface);
if (!idx && !surface_impl)
{
- WARN("Trying to set render target 0 to NULL.\n");
- return D3DERR_INVALIDCALL;
+ WARN("Trying to set render target 0 to NULL.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
+ if (surface_impl && d3d9_surface_get_device(surface_impl) != device)
+ {
+ WARN("Render target surface does not match device.\n");
+ return D3DERR_INVALIDCALL;
}
wined3d_mutex_lock();
- hr = wined3d_device_set_render_target(device->wined3d_device, idx,
- surface_impl ? surface_impl->wined3d_surface : NULL, TRUE);
+ rtv = surface_impl ? d3d9_surface_acquire_rendertarget_view(surface_impl) : NULL;
+ hr = wined3d_device_set_rendertarget_view(device->wined3d_device, idx, rtv, TRUE);
+ d3d9_surface_release_rendertarget_view(surface_impl, rtv);
wined3d_mutex_unlock();
return hr;
static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWORD idx, IDirect3DSurface9 **surface)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- struct wined3d_surface *wined3d_surface;
+ struct wined3d_rendertarget_view *wined3d_rtv;
struct d3d9_surface *surface_impl;
HRESULT hr = D3D_OK;
}
wined3d_mutex_lock();
- if ((wined3d_surface = wined3d_device_get_render_target(device->wined3d_device, idx)))
+ if ((wined3d_rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, idx)))
{
- surface_impl = wined3d_surface_get_parent(wined3d_surface);
+ /* We want the sub resource parent here, since the view itself may be
+ * internal to wined3d and may not have a parent. */
+ surface_impl = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_rtv);
*surface = &surface_impl->IDirect3DSurface9_iface;
IDirect3DSurface9_AddRef(*surface);
}
else
{
- hr = WINED3DERR_NOTFOUND;
+ hr = D3DERR_NOTFOUND;
*surface = NULL;
}
wined3d_mutex_unlock();
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil);
+ struct wined3d_rendertarget_view *rtv;
TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil);
wined3d_mutex_lock();
- wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL);
+ rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL;
+ wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv);
+ d3d9_surface_release_rendertarget_view(ds_impl, rtv);
wined3d_mutex_unlock();
return D3D_OK;
static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- struct wined3d_surface *wined3d_surface;
+ struct wined3d_rendertarget_view *wined3d_dsv;
struct d3d9_surface *surface_impl;
HRESULT hr = D3D_OK;
return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
- if ((wined3d_surface = wined3d_device_get_depth_stencil(device->wined3d_device)))
+ if ((wined3d_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device)))
{
- surface_impl = wined3d_surface_get_parent(wined3d_surface);
+ /* We want the sub resource parent here, since the view itself may be
+ * internal to wined3d and may not have a parent. */
+ surface_impl = wined3d_rendertarget_view_get_sub_resource_parent(wined3d_dsv);
*depth_stencil = &surface_impl->IDirect3DSurface9_iface;
IDirect3DSurface9_AddRef(*depth_stencil);
}
else
{
- hr = WINED3DERR_NOTFOUND;
+ hr = D3DERR_NOTFOUND;
*depth_stencil = NULL;
}
wined3d_mutex_unlock();
TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n",
iface, rect_count, rects, flags, color, z, stencil);
+ if (rect_count && !rects)
+ {
+ WARN("count %u with NULL rects.\n", rect_count);
+ rect_count = 0;
+ }
+
wined3d_mutex_lock();
hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil);
wined3d_mutex_unlock();
static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D3DVIEWPORT9 *viewport)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ struct wined3d_viewport vp;
TRACE("iface %p, viewport %p.\n", iface, viewport);
- /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */
+ vp.x = viewport->X;
+ vp.y = viewport->Y;
+ vp.width = viewport->Width;
+ vp.height = viewport->Height;
+ vp.min_z = viewport->MinZ;
+ vp.max_z = viewport->MaxZ;
+
wined3d_mutex_lock();
- wined3d_device_set_viewport(device->wined3d_device, (const struct wined3d_viewport *)viewport);
+ wined3d_device_set_viewport(device->wined3d_device, &vp);
wined3d_mutex_unlock();
return D3D_OK;
static HRESULT WINAPI d3d9_device_GetViewport(IDirect3DDevice9Ex *iface, D3DVIEWPORT9 *viewport)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ struct wined3d_viewport wined3d_viewport;
TRACE("iface %p, viewport %p.\n", iface, viewport);
- /* Note: D3DVIEWPORT9 is compatible with struct wined3d_viewport. */
wined3d_mutex_lock();
- wined3d_device_get_viewport(device->wined3d_device, (struct wined3d_viewport *)viewport);
+ wined3d_device_get_viewport(device->wined3d_device, &wined3d_viewport);
wined3d_mutex_unlock();
+ viewport->X = wined3d_viewport.x;
+ viewport->Y = wined3d_viewport.y;
+ viewport->Width = wined3d_viewport.width;
+ viewport->Height = wined3d_viewport.height;
+ viewport->MinZ = wined3d_viewport.min_z;
+ viewport->MaxZ = wined3d_viewport.max_z;
+
return D3D_OK;
}
wined3d_mutex_unlock();
if (FAILED(hr))
{
- WARN("IWineD3DDevice_EndStateBlock() failed, hr %#x.\n", hr);
+ WARN("Failed to end the state block, hr %#x.\n", hr);
return hr;
}
iface, primitive_type, start_vertex, primitive_count);
wined3d_mutex_lock();
- wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ if (!device->has_vertex_declaration)
+ {
+ wined3d_mutex_unlock();
+ WARN("Called without a valid vertex declaration set.\n");
+ return D3DERR_INVALIDCALL;
+ }
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0);
hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex,
vertex_count_from_primitive_count(primitive_type, primitive_count));
wined3d_mutex_unlock();
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
- TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u,\n"
+ TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u, "
"vertex_count %u, start_idx %u, primitive_count %u.\n",
iface, primitive_type, base_vertex_idx, min_vertex_idx,
vertex_count, start_idx, primitive_count);
wined3d_mutex_lock();
+ if (!device->has_vertex_declaration)
+ {
+ wined3d_mutex_unlock();
+ WARN("Called without a valid vertex declaration set.\n");
+ return D3DERR_INVALIDCALL;
+ }
wined3d_device_set_base_vertex_index(device->wined3d_device, base_vertex_idx);
- wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0);
hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx,
vertex_count_from_primitive_count(primitive_type, primitive_count));
wined3d_mutex_unlock();
UINT size = max(device->vertex_buffer_size * 2, min_size);
struct wined3d_buffer *buffer;
- TRACE("Growing vertex buffer to %u bytes\n", size);
+ TRACE("Growing vertex buffer to %u bytes.\n", size);
hr = wined3d_buffer_create_vb(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY,
WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer);
if (FAILED(hr))
{
- ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x\n", device, hr);
+ ERR("(%p) wined3d_buffer_create_vb failed with hr = %08x.\n", device, hr);
return hr;
}
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count);
+ struct wined3d_map_desc wined3d_map_desc;
+ struct wined3d_box wined3d_box = {0};
UINT size = vtx_count * stride;
+ struct wined3d_resource *vb;
UINT vb_pos, align;
- BYTE *buffer_data;
TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n",
iface, primitive_type, primitive_count, data, stride);
wined3d_mutex_lock();
+ if (!device->has_vertex_declaration)
+ {
+ wined3d_mutex_unlock();
+ WARN("Called without a valid vertex declaration set.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
hr = d3d9_device_prepare_vertex_buffer(device, size);
if (FAILED(hr))
goto done;
else
vb_pos += align;
- hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data,
- vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD);
- if (FAILED(hr))
+ wined3d_box.left = vb_pos;
+ wined3d_box.right = vb_pos + size;
+ vb = wined3d_buffer_get_resource(device->vertex_buffer);
+ if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box,
+ vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
goto done;
- memcpy(buffer_data, data, size);
- wined3d_buffer_unmap(device->vertex_buffer);
+ memcpy(wined3d_map_desc.data, data, size);
+ wined3d_resource_unmap(vb, 0);
device->vertex_buffer_pos = vb_pos + size;
hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);
if (FAILED(hr))
goto done;
- wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0);
hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count);
wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0);
UINT size = max(device->index_buffer_size * 2, min_size);
struct wined3d_buffer *buffer;
- TRACE("Growing index buffer to %u bytes\n", size);
+ TRACE("Growing index buffer to %u bytes.\n", size);
hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY,
WINED3D_POOL_DEFAULT, NULL, &d3d9_null_wined3d_parent_ops, &buffer);
if (FAILED(hr))
{
- ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr);
+ ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x.\n", device, hr);
return hr;
}
UINT primitive_count, const void *index_data, D3DFORMAT index_format,
const void *vertex_data, UINT vertex_stride)
{
- struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- HRESULT hr;
- BYTE *buffer_data;
-
UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count);
+ struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4;
- UINT idx_size = idx_count * idx_fmt_size;
- UINT ib_pos;
-
UINT vtx_size = vertex_count * vertex_stride;
- UINT vb_pos, align;
+ UINT idx_size = idx_count * idx_fmt_size;
+ struct wined3d_map_desc wined3d_map_desc;
+ struct wined3d_box wined3d_box = {0};
+ struct wined3d_resource *ib, *vb;
+ UINT vb_pos, ib_pos, align;
+ HRESULT hr;
- TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u,\n"
+ TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, primitive_count %u, "
"index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n",
iface, primitive_type, min_vertex_idx, vertex_count, primitive_count,
index_data, index_format, vertex_data, vertex_stride);
if (!primitive_count)
{
- WARN("primitive_count is 0, returning D3D_OK\n");
+ WARN("primitive_count is 0, returning D3D_OK.\n");
return D3D_OK;
}
wined3d_mutex_lock();
+ if (!device->has_vertex_declaration)
+ {
+ wined3d_mutex_unlock();
+ WARN("Called without a valid vertex declaration set.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
hr = d3d9_device_prepare_vertex_buffer(device, vtx_size);
if (FAILED(hr))
goto done;
else
vb_pos += align;
- hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &buffer_data,
- vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD);
- if (FAILED(hr))
+ wined3d_box.left = vb_pos;
+ wined3d_box.right = vb_pos + vtx_size;
+ vb = wined3d_buffer_get_resource(device->vertex_buffer);
+ if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box,
+ vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
goto done;
- memcpy(buffer_data, vertex_data, vtx_size);
- wined3d_buffer_unmap(device->vertex_buffer);
+ memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size);
+ wined3d_resource_unmap(vb, 0);
device->vertex_buffer_pos = vb_pos + vtx_size;
hr = d3d9_device_prepare_index_buffer(device, idx_size);
else
ib_pos += align;
- hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &buffer_data,
- ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD);
- if (FAILED(hr))
+ wined3d_box.left = ib_pos;
+ wined3d_box.right = ib_pos + idx_size;
+ ib = wined3d_buffer_get_resource(device->index_buffer);
+ if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box,
+ ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))
goto done;
- memcpy(buffer_data, index_data, idx_size);
- wined3d_buffer_unmap(device->index_buffer);
+ memcpy(wined3d_map_desc.data, index_data, idx_size);
+ wined3d_resource_unmap(ib, 0);
device->index_buffer_pos = ib_pos + idx_size;
hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride);
goto done;
wined3d_device_set_index_buffer(device->wined3d_device, device->index_buffer,
- wined3dformat_from_d3dformat(index_format));
- wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride);
+ wined3dformat_from_d3dformat(index_format), 0);
+ wined3d_device_set_base_vertex_index(device->wined3d_device, vb_pos / vertex_stride - min_vertex_idx);
- wined3d_device_set_primitive_type(device->wined3d_device, primitive_type);
+ wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0);
hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count);
wined3d_device_set_stream_source(device->wined3d_device, 0, NULL, 0, 0);
- wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN);
+ wined3d_device_set_index_buffer(device->wined3d_device, NULL, WINED3DFMT_UNKNOWN, 0);
wined3d_device_set_base_vertex_index(device->wined3d_device, 0);
done:
wined3d_mutex_lock();
wined3d_device_set_vertex_declaration(device->wined3d_device,
decl_impl ? decl_impl->wined3d_declaration : NULL);
+ device->has_vertex_declaration = !!decl_impl;
wined3d_mutex_unlock();
return D3D_OK;
}
wined3d_device_set_vertex_declaration(device->wined3d_device, decl);
+ device->has_vertex_declaration = TRUE;
wined3d_mutex_unlock();
return D3D_OK;
}
wined3d_mutex_lock();
- hr = wined3d_device_set_vs_consts_f(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_vs_consts_f(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_vec4 *)data);
wined3d_mutex_unlock();
return hr;
}
wined3d_mutex_lock();
- hr = wined3d_device_get_vs_consts_f(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_vs_consts_f(device->wined3d_device,
+ reg_idx, count, (struct wined3d_vec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_vs_consts_i(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_vs_consts_i(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_get_vs_consts_i(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_vs_consts_i(device->wined3d_device,
+ reg_idx, count, (struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_vs_consts_b(device->wined3d_device, reg_idx, count, data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_vs_consts_b(device->wined3d_device, reg_idx, count, data);
wined3d_mutex_unlock();
return hr;
buffer_impl = wined3d_buffer_get_parent(wined3d_buffer);
*buffer = &buffer_impl->IDirect3DVertexBuffer9_iface;
IDirect3DVertexBuffer9_AddRef(*buffer);
- wined3d_buffer_decref(wined3d_buffer);
}
else
{
wined3d_mutex_lock();
wined3d_device_set_index_buffer(device->wined3d_device,
- ib ? ib->wined3d_buffer : NULL,
- ib ? ib->format : WINED3DFMT_UNKNOWN);
+ ib ? ib->wined3d_buffer : NULL, ib ? ib->format : WINED3DFMT_UNKNOWN, 0);
wined3d_mutex_unlock();
return D3D_OK;
return D3DERR_INVALIDCALL;
wined3d_mutex_lock();
- if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format)))
+ if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format, NULL)))
{
buffer_impl = wined3d_buffer_get_parent(wined3d_buffer);
*buffer = &buffer_impl->IDirect3DIndexBuffer9_iface;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_ps_consts_f(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_ps_consts_f(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_vec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_get_ps_consts_f(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_ps_consts_f(device->wined3d_device,
+ reg_idx, count, (struct wined3d_vec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_ps_consts_i(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_ps_consts_i(device->wined3d_device,
+ reg_idx, count, (const struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_get_ps_consts_i(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_ps_consts_i(device->wined3d_device,
+ reg_idx, count, (struct wined3d_ivec4 *)data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_set_ps_consts_b(device->wined3d_device, reg_idx, count, data);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count);
wined3d_mutex_lock();
- hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, data, count);
+ hr = wined3d_device_get_ps_consts_b(device->wined3d_device, reg_idx, count, data);
wined3d_mutex_unlock();
return hr;
IDirect3DSurface9 *src_surface, IDirect3DSurface9 *dst_surface, IDirect3DVertexBuffer9 *src_descs,
UINT rect_count, IDirect3DVertexBuffer9 *dst_descs, D3DCOMPOSERECTSOP operation, INT offset_x, INT offset_y)
{
- FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u,\n"
+ FIXME("iface %p, src_surface %p, dst_surface %p, src_descs %p, rect_count %u, "
"dst_descs %p, operation %#x, offset_x %u, offset_y %u stub!\n",
iface, src_surface, dst_surface, src_descs, rect_count,
dst_descs, operation, offset_x, offset_y);
const RGNDATA *dirty_region, DWORD flags)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ UINT i;
HRESULT hr;
TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n",
iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect),
dst_window_override, dirty_region, flags);
+ if (device->device_state != D3D9_DEVICE_STATE_OK)
+ return S_PRESENT_OCCLUDED;
+
+ if (dirty_region)
+ FIXME("Ignoring dirty_region %p.\n", dirty_region);
+
wined3d_mutex_lock();
- hr = wined3d_device_present(device->wined3d_device, src_rect, dst_rect,
- dst_window_override, dirty_region, flags);
+ for (i = 0; i < device->implicit_swapchain_count; ++i)
+ {
+ if (FAILED(hr = wined3d_swapchain_present(device->implicit_swapchains[i]->wined3d_swapchain,
+ src_rect, dst_rect, dst_window_override, flags)))
+ {
+ wined3d_mutex_unlock();
+ return hr;
+ }
+ }
wined3d_mutex_unlock();
- return hr;
+ return D3D_OK;
}
static HRESULT WINAPI d3d9_device_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority)
static HRESULT WINAPI d3d9_device_CheckDeviceState(IDirect3DDevice9Ex *iface, HWND dst_window)
{
- static int i;
+ struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ struct wined3d_swapchain_desc swapchain_desc;
- TRACE("iface %p, dst_window %p stub!\n", iface, dst_window);
+ TRACE("iface %p, dst_window %p.\n", iface, dst_window);
- if (!i++)
- FIXME("iface %p, dst_window %p stub!\n", iface, dst_window);
+ wined3d_mutex_lock();
+ wined3d_swapchain_get_desc(device->implicit_swapchains[0]->wined3d_swapchain, &swapchain_desc);
+ wined3d_mutex_unlock();
- return D3D_OK;
+ if (swapchain_desc.windowed)
+ return D3D_OK;
+
+ /* FIXME: This is actually supposed to check if any other device is in
+ * fullscreen mode. */
+ if (dst_window != swapchain_desc.device_window)
+ return device->device_state == D3D9_DEVICE_STATE_OK ? S_PRESENT_OCCLUDED : D3D_OK;
+
+ return device->device_state == D3D9_DEVICE_STATE_OK ? D3D_OK : S_PRESENT_OCCLUDED;
}
static HRESULT WINAPI d3d9_device_CreateRenderTargetEx(IDirect3DDevice9Ex *iface,
UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality,
BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage)
{
- FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n"
+ FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, "
"lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n",
iface, width, height, format, multisample_type, multisample_quality,
lockable, surface, shared_handle, usage);
UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality,
BOOL discard, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage)
{
- FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n"
- "discard %#x, surface %p, shared_handle %p, usage %#x stub!\n",
+ struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
+ DWORD flags = WINED3D_TEXTURE_CREATE_MAPPABLE;
+
+ TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u, "
+ "discard %#x, surface %p, shared_handle %p, usage %#x.\n",
iface, width, height, format, multisample_type, multisample_quality,
discard, surface, shared_handle, usage);
- *surface = NULL;
+ if (usage & D3DUSAGE_DEPTHSTENCIL)
+ {
+ WARN("Invalid usage %#x.\n", usage);
+ return D3DERR_INVALIDCALL;
+ }
+
if (shared_handle)
FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle);
- return E_NOTIMPL;
+ if (discard)
+ flags |= WINED3D_TEXTURE_CREATE_DISCARD;
+
+ *surface = NULL;
+ return d3d9_device_create_surface(device, width, height, format, flags, surface,
+ D3DUSAGE_DEPTHSTENCIL | usage, D3DPOOL_DEFAULT, multisample_type, multisample_quality, NULL);
}
static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_ResetEx(IDirect3DDevice9Ex *iface,
D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode)
{
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
- struct wined3d_swapchain_desc swapchain_desc;
- struct wined3d_display_mode wined3d_mode;
- HRESULT hr;
TRACE("iface %p, present_parameters %p, mode %p.\n", iface, present_parameters, mode);
- if (mode)
+ if (!present_parameters->Windowed == !mode)
{
- wined3d_mode.width = mode->Width;
- wined3d_mode.height = mode->Height;
- wined3d_mode.refresh_rate = mode->RefreshRate;
- wined3d_mode.format_id = wined3dformat_from_d3dformat(mode->Format);
- wined3d_mode.scanline_ordering = mode->ScanLineOrdering;
+ WARN("Mode can be passed if and only if Windowed is FALSE.\n");
+ return D3DERR_INVALIDCALL;
}
- wined3d_mutex_lock();
-
- if (device->vertex_buffer)
+ if (mode && (mode->Width != present_parameters->BackBufferWidth
+ || mode->Height != present_parameters->BackBufferHeight))
{
- wined3d_buffer_decref(device->vertex_buffer);
- device->vertex_buffer = NULL;
- device->vertex_buffer_size = 0;
- }
- if (device->index_buffer)
- {
- wined3d_buffer_decref(device->index_buffer);
- device->index_buffer = NULL;
- device->index_buffer_size = 0;
+ WARN("Mode and back buffer mismatch (mode %ux%u, backbuffer %ux%u).\n",
+ mode->Width, mode->Height,
+ present_parameters->BackBufferWidth, present_parameters->BackBufferHeight);
+ return D3DERR_INVALIDCALL;
}
- wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters);
- hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc,
- mode ? &wined3d_mode : NULL, reset_enum_callback, FALSE);
- wined3d_mutex_unlock();
-
- return hr;
+ return d3d9_device_reset(device, present_parameters, mode);
}
static HRESULT WINAPI d3d9_device_GetDisplayModeEx(IDirect3DDevice9Ex *iface,
TRACE("device_parent %p.\n", device_parent);
}
-static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
- void *container_parent, struct wined3d_surface *surface, void **parent,
- const struct wined3d_parent_ops **parent_ops)
+static void CDECL device_parent_activate(struct wined3d_device_parent *device_parent, BOOL activate)
{
struct d3d9_device *device = device_from_device_parent(device_parent);
+
+ TRACE("device_parent %p, activate %#x.\n", device_parent, activate);
+
+ if (!device->d3d_parent)
+ return;
+
+ if (!activate)
+ InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_LOST, D3D9_DEVICE_STATE_OK);
+ else if (device->d3d_parent->extended)
+ InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_OK, D3D9_DEVICE_STATE_LOST);
+ else
+ InterlockedCompareExchange(&device->device_state, D3D9_DEVICE_STATE_NOT_RESET, D3D9_DEVICE_STATE_LOST);
+}
+
+static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent *device_parent,
+ struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
+ void **parent, const struct wined3d_parent_ops **parent_ops)
+{
struct d3d9_surface *d3d_surface;
- TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",
- device_parent, container_parent, surface, parent, parent_ops);
+ TRACE("device_parent %p, wined3d_texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
if (!(d3d_surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_surface))))
- {
- FIXME("Failed to allocate surface memory.\n");
- return D3DERR_OUTOFVIDEOMEMORY;
- }
+ return E_OUTOFMEMORY;
- surface_init(d3d_surface, surface, device, parent_ops);
+ surface_init(d3d_surface, wined3d_texture, sub_resource_idx, parent_ops);
*parent = d3d_surface;
TRACE("Created surface %p.\n", d3d_surface);
- d3d_surface->container = container_parent;
- IDirect3DDevice9Ex_Release(d3d_surface->parent_device);
- d3d_surface->parent_device = NULL;
-
- IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface);
- d3d_surface->forwardReference = container_parent;
-
return D3D_OK;
}
static HRESULT CDECL device_parent_volume_created(struct wined3d_device_parent *device_parent,
- void *container_parent, struct wined3d_volume *volume, void **parent,
- const struct wined3d_parent_ops **parent_ops)
+ struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx,
+ void **parent, const struct wined3d_parent_ops **parent_ops)
{
struct d3d9_volume *d3d_volume;
- TRACE("device_parent %p, container_parent %p, volume %p, parent %p, parent_ops %p.\n",
- device_parent, container_parent, volume, parent, parent_ops);
+ TRACE("device_parent %p, texture %p, sub_resource_idx %u, parent %p, parent_ops %p.\n",
+ device_parent, wined3d_texture, sub_resource_idx, parent, parent_ops);
if (!(d3d_volume = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d3d_volume))))
return E_OUTOFMEMORY;
- volume_init(d3d_volume, volume, parent_ops);
+ volume_init(d3d_volume, wined3d_texture, sub_resource_idx, parent_ops);
*parent = d3d_volume;
TRACE("Created volume %p.\n", d3d_volume);
- d3d_volume->container = container_parent;
-
- IDirect3DVolume9_Release(&d3d_volume->IDirect3DVolume9_iface);
- d3d_volume->forwardReference = container_parent;
-
return D3D_OK;
}
-static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_device_parent *device_parent,
- void *container_parent, const struct wined3d_resource_desc *desc, struct wined3d_surface **surface)
+static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_device_parent *device_parent,
+ void *container_parent, const struct wined3d_resource_desc *desc, DWORD texture_flags,
+ struct wined3d_texture **texture)
{
struct d3d9_device *device = device_from_device_parent(device_parent);
- struct wined3d_resource_desc texture_desc;
struct d3d9_surface *d3d_surface;
- struct wined3d_texture *texture;
HRESULT hr;
- TRACE("device_parent %p, container_parent %p, desc %p, surface %p.\n",
- device_parent, container_parent, desc, surface);
+ TRACE("device_parent %p, container_parent %p, desc %p, texture flags %#x, texture %p.\n",
+ device_parent, container_parent, desc, texture_flags, texture);
if (container_parent == device_parent)
container_parent = &device->IDirect3DDevice9Ex_iface;
- texture_desc = *desc;
- texture_desc.resource_type = WINED3D_RTYPE_TEXTURE;
- if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &texture_desc, 1,
- WINED3D_SURFACE_MAPPABLE, container_parent, &d3d9_null_wined3d_parent_ops, &texture)))
+ if (FAILED(hr = wined3d_texture_create(device->wined3d_device, desc, 1, 1,
+ texture_flags | WINED3D_TEXTURE_CREATE_MAPPABLE, NULL, container_parent,
+ &d3d9_null_wined3d_parent_ops, texture)))
{
WARN("Failed to create texture, hr %#x.\n", hr);
return hr;
}
- *surface = wined3d_surface_from_resource(wined3d_texture_get_sub_resource(texture, 0));
- wined3d_surface_incref(*surface);
- wined3d_texture_decref(texture);
-
- d3d_surface = wined3d_surface_get_parent(*surface);
- d3d_surface->forwardReference = NULL;
+ d3d_surface = wined3d_texture_get_sub_resource_parent(*texture, 0);
d3d_surface->parent_device = &device->IDirect3DDevice9Ex_iface;
return hr;
{
device_parent_wined3d_device_created,
device_parent_mode_changed,
+ device_parent_activate,
device_parent_surface_created,
device_parent_volume_created,
- device_parent_create_swapchain_surface,
+ device_parent_create_swapchain_texture,
device_parent_create_swapchain,
};
if (!swapchain_desc)
{
ERR("Failed to allocate wined3d parameters.\n");
+ wined3d_device_release_focus_window(device->wined3d_device);
wined3d_device_decref(device->wined3d_device);
wined3d_mutex_unlock();
return E_OUTOFMEMORY;
for (i = 0; i < count; ++i)
{
- wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], ¶meters[i]);
+ if (!wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], ¶meters[i],
+ parent->extended))
+ {
+ wined3d_device_release_focus_window(device->wined3d_device);
+ wined3d_device_decref(device->wined3d_device);
+ HeapFree(GetProcessHeap(), 0, swapchain_desc);
+ wined3d_mutex_unlock();
+ return D3DERR_INVALIDCALL;
+ }
}
hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc);
return hr;
}
- wined3d_mutex_unlock();
+ if (FAILED(hr = d3d9_device_get_swapchains(device)))
+ {
+ wined3d_device_uninit_3d(device->wined3d_device);
+ wined3d_device_release_focus_window(device->wined3d_device);
+ wined3d_device_decref(device->wined3d_device);
+ wined3d_mutex_unlock();
+ return E_OUTOFMEMORY;
+ }
for (i = 0; i < count; ++i)
{
present_parameters_from_wined3d_swapchain_desc(¶meters[i], &swapchain_desc[i]);
}
+
+ wined3d_mutex_unlock();
+
HeapFree(GetProcessHeap(), 0, swapchain_desc);
/* Initialize the converted declaration array. This creates a valid pointer
{
ERR("Failed to allocate FVF vertex declaration map memory.\n");
wined3d_mutex_lock();
+ HeapFree(GetProcessHeap(), 0, device->implicit_swapchains);
wined3d_device_uninit_3d(device->wined3d_device);
wined3d_device_release_focus_window(device->wined3d_device);
wined3d_device_decref(device->wined3d_device);
projects / reactos.git / blobdiff