wine-commits July 2012

wine-commits@winehq.org

2 participants
712 discussions

Alexandre Julliard : winex11: Use the correct drawable with the X11DRV_GET_DRAWABLE escape.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 241ab9257cc54bbfdada56b036fe04c03779aec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=241ab9257cc54bbfdada56b03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 3 16:56:40 2012 +0200 winex11: Use the correct drawable with the X11DRV_GET_DRAWABLE escape. --- dlls/winex11.drv/opengl.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 81ec492..f43127c 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1610,7 +1610,7 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) } else { - if (escape.gl_type == DC_GL_BITMAP) escape.drawable = get_context_pixmap( hdc, ctx ); + if (escape.gl_type == DC_GL_BITMAP) escape.gl_drawable = get_context_pixmap( hdc, ctx ); wine_tsx11_lock(); @@ -1619,10 +1619,10 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) pglXGetFBConfigAttrib(gdi_display, ctx->fmt->fbconfig, GLX_VISUAL_ID, &vis_id); describeContext(ctx); TRACE("hdc %p drawable %lx fmt %u vis %x ctx %p\n", hdc, - escape.drawable, escape.pixel_format, vis_id, ctx->ctx); + escape.gl_drawable, escape.pixel_format, vis_id, ctx->ctx); } - ret = pglXMakeCurrent(gdi_display, escape.drawable, ctx->ctx); + ret = pglXMakeCurrent(gdi_display, escape.gl_drawable, ctx->ctx); if (ret) { @@ -1631,8 +1631,8 @@ static BOOL glxdrv_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) ctx->has_been_current = TRUE; ctx->hdc = hdc; ctx->read_hdc = hdc; - ctx->drawables[0] = escape.drawable; - ctx->drawables[1] = escape.drawable; + ctx->drawables[0] = escape.gl_drawable; + ctx->drawables[1] = escape.gl_drawable; ctx->refresh_drawables = FALSE; if (escape.gl_type == DC_GL_BITMAP) pglDrawBuffer(GL_FRONT_LEFT); @@ -1684,18 +1684,18 @@ static BOOL glxdrv_wglMakeContextCurrentARB( HDC draw_hdc, HDC read_hdc, struct { if (!pglXMakeContextCurrent) return FALSE; - if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.drawable = get_context_pixmap( draw_hdc, ctx ); - if (escape_read.gl_type == DC_GL_BITMAP) escape_read.drawable = get_context_pixmap( read_hdc, ctx ); + if (escape_draw.gl_type == DC_GL_BITMAP) escape_draw.gl_drawable = get_context_pixmap( draw_hdc, ctx ); + if (escape_read.gl_type == DC_GL_BITMAP) escape_read.gl_drawable = get_context_pixmap( read_hdc, ctx ); wine_tsx11_lock(); - ret = pglXMakeContextCurrent(gdi_display, escape_draw.drawable, escape_read.drawable, ctx->ctx); + ret = pglXMakeContextCurrent(gdi_display, escape_draw.gl_drawable, escape_read.gl_drawable, ctx->ctx); if (ret) { ctx->has_been_current = TRUE; ctx->hdc = draw_hdc; ctx->read_hdc = read_hdc; - ctx->drawables[0] = escape_draw.drawable; - ctx->drawables[1] = escape_read.drawable; + ctx->drawables[0] = escape_draw.gl_drawable; + ctx->drawables[1] = escape_read.gl_drawable; ctx->refresh_drawables = FALSE; NtCurrentTeb()->glContext = ctx; }

1 0

Henri Verbeet : winex11: Use our own structure for mode information.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3ea8de2637bd2d1bf08af74a180ef26b7e03ee0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea8de2637bd2d1bf08af74a1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:43 2012 +0200 winex11: Use our own structure for mode information. --- dlls/winex11.drv/desktop.c | 17 ++++++------- dlls/winex11.drv/settings.c | 52 +++++++++++++++++++------------------------ dlls/winex11.drv/x11drv.h | 19 ++++++++++----- dlls/winex11.drv/xrandr.c | 33 +++++++++++++-------------- dlls/winex11.drv/xvidmode.c | 31 ++++++++++--------------- dlls/winex11.drv/xvidmode.h | 1 - 6 files changed, 73 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ea8de2637bd2d1bf08af…

1 0

Henri Verbeet : d3d8: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 3509c89194b3d191b18a13c3f3bba9c8f34cc242 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3509c89194b3d191b18a13c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:42 2012 +0200 d3d8: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. --- dlls/d3d8/device.c | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index eea4a24..e3fee4a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -164,6 +164,25 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *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; + present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->hDeviceWindow = swapchain_desc->device_window; + present_parameters->Windowed = swapchain_desc->windowed; + 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->FullScreen_RefreshRateInHz = swapchain_desc->refresh_rate; + present_parameters->FullScreen_PresentationInterval = swapchain_desc->swap_interval; +} + static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -535,20 +554,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; - - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->FullScreen_PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return D3D_OK; } @@ -3080,19 +3086,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine goto err; } - parameters->BackBufferWidth = swapchain_desc.backbuffer_width; - parameters->BackBufferHeight = swapchain_desc.backbuffer_height; - parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); - parameters->BackBufferCount = swapchain_desc.backbuffer_count; - parameters->MultiSampleType = swapchain_desc.multisample_type; - parameters->SwapEffect = swapchain_desc.swap_effect; - parameters->hDeviceWindow = swapchain_desc.device_window; - parameters->Windowed = swapchain_desc.windowed; - parameters->EnableAutoDepthStencil = swapchain_desc.enable_auto_depth_stencil; - parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(swapchain_desc.auto_depth_stencil_format); - parameters->Flags = swapchain_desc.flags; - parameters->FullScreen_RefreshRateInHz = swapchain_desc.refresh_rate; - parameters->FullScreen_PresentationInterval = swapchain_desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(parameters, &swapchain_desc); device->declArraySize = 16; device->decls = HeapAlloc(GetProcessHeap(), 0, device->declArraySize * sizeof(*device->decls));

1 0

Henri Verbeet : d3d8: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: b4d0b4e452540f102fc718d2c08ca2ec4a8f0f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4d0b4e452540f102fc718d2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:41 2012 +0200 d3d8: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS. --- dlls/d3d8/device.c | 72 +++++++++++++++++---------------------------------- 1 files changed, 24 insertions(+), 48 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 2ec1369..eea4a24 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -164,6 +164,27 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, + const D3DPRESENT_PARAMETERS *present_parameters) +{ + 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->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->multisample_type = present_parameters->MultiSampleType; + swapchain_desc->multisample_quality = 0; /* d3d9 only */ + swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->device_window = present_parameters->hDeviceWindow; + swapchain_desc->windowed = present_parameters->Windowed; + 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->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; + swapchain_desc->swap_interval = present_parameters->FullScreen_PresentationInterval; + swapchain_desc->auto_restore_display_mode = TRUE; +} + /* Handle table functions */ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enum d3d8_handle_type type) { @@ -511,22 +532,7 @@ static HRESULT WINAPI d3d8_device_CreateAdditionalSwapChain(IDirect3DDevice8 *if TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - desc.backbuffer_width = present_parameters->BackBufferWidth; - desc.backbuffer_height = present_parameters->BackBufferHeight; - desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - desc.multisample_type = present_parameters->MultiSampleType; - desc.multisample_quality = 0; /* d3d9 only */ - desc.swap_effect = present_parameters->SwapEffect; - desc.device_window = present_parameters->hDeviceWindow; - desc.windowed = present_parameters->Windowed; - desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - desc.flags = present_parameters->Flags; - desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - desc.swap_interval = present_parameters->FullScreen_PresentationInterval; - desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d8_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain8_iface; @@ -585,23 +591,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); wined3d_mutex_lock(); - - 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.backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc.multisample_type = present_parameters->MultiSampleType; - swapchain_desc.multisample_quality = 0; /* d3d9 only */ - swapchain_desc.swap_effect = present_parameters->SwapEffect; - swapchain_desc.device_window = present_parameters->hDeviceWindow; - swapchain_desc.windowed = present_parameters->Windowed; - 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.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = present_parameters->FullScreen_PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback))) { hr = wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); @@ -3069,21 +3059,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine if (flags & D3DCREATE_MULTITHREADED) wined3d_device_set_multithreaded(device->wined3d_device); - swapchain_desc.backbuffer_width = parameters->BackBufferWidth; - swapchain_desc.backbuffer_height = parameters->BackBufferHeight; - swapchain_desc.backbuffer_format = wined3dformat_from_d3dformat(parameters->BackBufferFormat); - swapchain_desc.backbuffer_count = max(1, parameters->BackBufferCount); - swapchain_desc.multisample_type = parameters->MultiSampleType; - swapchain_desc.multisample_quality = 0; /* d3d9 only */ - swapchain_desc.swap_effect = parameters->SwapEffect; - swapchain_desc.device_window = parameters->hDeviceWindow; - swapchain_desc.windowed = parameters->Windowed; - swapchain_desc.enable_auto_depth_stencil = parameters->EnableAutoDepthStencil; - swapchain_desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(parameters->AutoDepthStencilFormat); - swapchain_desc.flags = parameters->Flags; - swapchain_desc.refresh_rate = parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = parameters->FullScreen_PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, parameters); hr = wined3d_device_init_3d(device->wined3d_device, &swapchain_desc); if (FAILED(hr))

1 0

Henri Verbeet : d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: c98725ccc30973eeb4089eea711879d54317b1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c98725ccc30973eeb4089eea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:40 2012 +0200 d3d9: Introduce a helper function to create D3DPRESENT_PARAMETERS from a wined3d_swapchain_desc. --- dlls/d3d9/d3d9_private.h | 9 +------ dlls/d3d9/device.c | 52 +++++++++++++++++++-------------------------- dlls/d3d9/swapchain.c | 16 +------------- 3 files changed, 25 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 6a080d1..bed2ed0 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -39,17 +39,12 @@ #include "d3d9.h" #include "wine/wined3d.h" -/* =========================================================================== - Internal use - =========================================================================== */ extern HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLSPEC_HIDDEN; D3DFORMAT d3dformat_from_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; -/* =========================================================================== - Macros - =========================================================================== */ -/* Not nice, but it lets wined3d support different versions of directx */ #define WINECAPSTOD3D9CAPS(_pD3D9Caps, _pWineCaps) \ _pD3D9Caps->DeviceType = (D3DDEVTYPE) _pWineCaps->DeviceType; \ _pD3D9Caps->AdapterOrdinal = _pWineCaps->AdapterOrdinal; \ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index df8deb2..67a2aad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,26 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, + const struct wined3d_swapchain_desc *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; + present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->MultiSampleQuality = swapchain_desc->multisample_quality; + present_parameters->SwapEffect = swapchain_desc->swap_effect; + present_parameters->hDeviceWindow = swapchain_desc->device_window; + present_parameters->Windowed = swapchain_desc->windowed; + 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->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) { @@ -477,21 +497,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain9_iface; - - present_parameters->BackBufferWidth = desc.backbuffer_width; - present_parameters->BackBufferHeight = desc.backbuffer_height; - present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - present_parameters->BackBufferCount = desc.backbuffer_count; - present_parameters->MultiSampleType = desc.multisample_type; - present_parameters->MultiSampleQuality = desc.multisample_quality; - present_parameters->SwapEffect = desc.swap_effect; - present_parameters->hDeviceWindow = desc.device_window; - present_parameters->Windowed = desc.windowed; - present_parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - present_parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - present_parameters->Flags = desc.flags; - present_parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - present_parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(present_parameters, &desc); return hr; } @@ -3425,21 +3431,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - parameters[i].BackBufferWidth = swapchain_desc[i].backbuffer_width; - parameters[i].BackBufferHeight = swapchain_desc[i].backbuffer_height; - parameters[i].BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc[i].backbuffer_format); - parameters[i].BackBufferCount = swapchain_desc[i].backbuffer_count; - parameters[i].MultiSampleType = swapchain_desc[i].multisample_type; - parameters[i].MultiSampleQuality = swapchain_desc[i].multisample_quality; - parameters[i].SwapEffect = swapchain_desc[i].swap_effect; - parameters[i].hDeviceWindow = swapchain_desc[i].device_window; - parameters[i].Windowed = swapchain_desc[i].windowed; - parameters[i].EnableAutoDepthStencil = swapchain_desc[i].enable_auto_depth_stencil; - parameters[i].AutoDepthStencilFormat = - d3dformat_from_wined3dformat(swapchain_desc[i].auto_depth_stencil_format); - parameters[i].Flags = swapchain_desc[i].flags; - parameters[i].FullScreen_RefreshRateInHz = swapchain_desc[i].refresh_rate; - parameters[i].PresentationInterval = swapchain_desc[i].swap_interval; + present_parameters_from_wined3d_swapchain_desc(&parameters[i], &swapchain_desc[i]); } HeapFree(GetProcessHeap(), 0, swapchain_desc); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index dace375..af56d73 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -215,21 +215,7 @@ static HRESULT WINAPI d3d9_swapchain_GetPresentParameters(IDirect3DSwapChain9 *i wined3d_mutex_lock(); hr = wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &desc); wined3d_mutex_unlock(); - - parameters->BackBufferWidth = desc.backbuffer_width; - parameters->BackBufferHeight = desc.backbuffer_height; - parameters->BackBufferFormat = d3dformat_from_wined3dformat(desc.backbuffer_format); - parameters->BackBufferCount = desc.backbuffer_count; - parameters->MultiSampleType = desc.multisample_type; - parameters->MultiSampleQuality = desc.multisample_quality; - parameters->SwapEffect = desc.swap_effect; - parameters->hDeviceWindow = desc.device_window; - parameters->Windowed = desc.windowed; - parameters->EnableAutoDepthStencil = desc.enable_auto_depth_stencil; - parameters->AutoDepthStencilFormat = d3dformat_from_wined3dformat(desc.auto_depth_stencil_format); - parameters->Flags = desc.flags; - parameters->FullScreen_RefreshRateInHz = desc.refresh_rate; - parameters->PresentationInterval = desc.swap_interval; + present_parameters_from_wined3d_swapchain_desc(parameters, &desc); return hr; }

1 0

Henri Verbeet : d3d9: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS .
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 003ab4d3e071b949ae2fec18c427c439751d8a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003ab4d3e071b949ae2fec18c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 3 12:59:39 2012 +0200 d3d9: Introduce a helper function to create a wined3d_swapchain_desc from D3DPRESENT_PARAMETERS. --- dlls/d3d9/device.c | 84 +++++++++++++++------------------------------------ 1 files changed, 25 insertions(+), 59 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 47a216c..df8deb2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -181,6 +181,27 @@ static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, U } } +static void wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, + const D3DPRESENT_PARAMETERS *present_parameters) +{ + 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->backbuffer_count = max(1, present_parameters->BackBufferCount); + swapchain_desc->multisample_type = present_parameters->MultiSampleType; + swapchain_desc->multisample_quality = present_parameters->MultiSampleQuality; + swapchain_desc->swap_effect = present_parameters->SwapEffect; + swapchain_desc->device_window = present_parameters->hDeviceWindow; + swapchain_desc->windowed = present_parameters->Windowed; + 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->refresh_rate = present_parameters->FullScreen_RefreshRateInHz; + swapchain_desc->swap_interval = present_parameters->PresentationInterval; + swapchain_desc->auto_restore_display_mode = TRUE; +} + static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9Ex *iface) { return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); @@ -453,22 +474,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_CreateAdditionalSwapChain(ID TRACE("iface %p, present_parameters %p, swapchain %p.\n", iface, present_parameters, swapchain); - desc.backbuffer_width = present_parameters->BackBufferWidth; - desc.backbuffer_height = present_parameters->BackBufferHeight; - desc.backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); - desc.backbuffer_count = max(1, present_parameters->BackBufferCount); - desc.multisample_type = present_parameters->MultiSampleType; - desc.multisample_quality = present_parameters->MultiSampleQuality; - desc.swap_effect = present_parameters->SwapEffect; - desc.device_window = present_parameters->hDeviceWindow; - desc.windowed = present_parameters->Windowed; - desc.enable_auto_depth_stencil = present_parameters->EnableAutoDepthStencil; - desc.auto_depth_stencil_format = wined3dformat_from_d3dformat(present_parameters->AutoDepthStencilFormat); - desc.flags = present_parameters->Flags; - desc.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - desc.swap_interval = present_parameters->PresentationInterval; - desc.auto_restore_display_mode = TRUE; - + wined3d_swapchain_desc_from_present_parameters(&desc, present_parameters); if (SUCCEEDED(hr = d3d9_swapchain_create(device, &desc, &object))) *swapchain = &object->IDirect3DSwapChain9_iface; @@ -569,38 +575,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH d3d9_device_Reset(IDirect3DDevice9Ex *if TRACE("iface %p, present_parameters %p.\n", iface, present_parameters); - /* Reset states that hold a COM object. WineD3D holds an internal reference to set objects, because - * such objects can still be used for rendering after their external d3d9 object has been destroyed. - * These objects must not be enumerated. Unsetting them tells WineD3D that the application will not - * make use of the hidden reference and destroys the objects. - * - * Unsetting them is no problem, because the states are supposed to be reset anyway. If the validation - * below fails, the device is considered "lost", and _Reset and _Release are the only allowed calls - */ - wined3d_mutex_lock(); - - 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.backbuffer_count = max(1, present_parameters->BackBufferCount); - swapchain_desc.multisample_type = present_parameters->MultiSampleType; - swapchain_desc.multisample_quality = present_parameters->MultiSampleQuality; - swapchain_desc.swap_effect = present_parameters->SwapEffect; - swapchain_desc.device_window = present_parameters->hDeviceWindow; - swapchain_desc.windowed = present_parameters->Windowed; - 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.refresh_rate = present_parameters->FullScreen_RefreshRateInHz; - swapchain_desc.swap_interval = present_parameters->PresentationInterval; - swapchain_desc.auto_restore_display_mode = TRUE; - + wined3d_mutex_lock(); + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, reset_enum_callback); if (FAILED(hr)) device->not_reset = TRUE; else device->not_reset = FALSE; - wined3d_mutex_unlock(); return hr; @@ -3426,22 +3407,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine for (i = 0; i < count; ++i) { - swapchain_desc[i].backbuffer_width = parameters[i].BackBufferWidth; - swapchain_desc[i].backbuffer_height = parameters[i].BackBufferHeight; - swapchain_desc[i].backbuffer_format = wined3dformat_from_d3dformat(parameters[i].BackBufferFormat); - swapchain_desc[i].backbuffer_count = max(1, parameters[i].BackBufferCount); - swapchain_desc[i].multisample_type = parameters[i].MultiSampleType; - swapchain_desc[i].multisample_quality = parameters[i].MultiSampleQuality; - swapchain_desc[i].swap_effect = parameters[i].SwapEffect; - swapchain_desc[i].device_window = parameters[i].hDeviceWindow; - swapchain_desc[i].windowed = parameters[i].Windowed; - swapchain_desc[i].enable_auto_depth_stencil = parameters[i].EnableAutoDepthStencil; - swapchain_desc[i].auto_depth_stencil_format = - wined3dformat_from_d3dformat(parameters[i].AutoDepthStencilFormat); - swapchain_desc[i].flags = parameters[i].Flags; - swapchain_desc[i].refresh_rate = parameters[i].FullScreen_RefreshRateInHz; - swapchain_desc[i].swap_interval = parameters[i].PresentationInterval; - swapchain_desc[i].auto_restore_display_mode = TRUE; + wined3d_swapchain_desc_from_present_parameters(&swapchain_desc[i], &parameters[i]); } hr = wined3d_device_init_3d(device->wined3d_device, swapchain_desc);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 18126eeb4f7c9233108ef0126bbebcb7f9fb36bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=18126eeb4f7c9233108ef0126… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:07 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixTransposePointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 46406a4..7627649 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1698,6 +1698,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); * effect->lpVtbl->SetValue(effect, parameter, NULL, res_desc->Bytes); */ @@ -1849,6 +1850,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixTransposeArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetValue(effect, NULL, input_value, res_desc->Bytes); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetValue failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2260,6 +2269,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + + /* SetMatrixTransposePointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixTransposePointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l * 4 + m + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTransposePointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } } count = effect->lpVtbl->Release(effect);

1 0

Rico Schüller : d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test.
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 1ae494a9bb52cae2bf67cb6d3bb3192b041aa7b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae494a9bb52cae2bf67cb6d3… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:28:01 2012 +0200 d3dx9/tests: Add effect parameter value SetMatrixPointerArray() test. --- dlls/d3dx9_36/tests/effect.c | 69 ++++++++++++++++++++++++++++++++--------- 1 files changed, 54 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c4046c7..46406a4 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -885,6 +885,7 @@ test_effect_parameter_value_data[] = #undef ADD_PARAMETER_VALUE +/* Multiple of 16 to cover complete matrices */ #define EFFECT_PARAMETER_VALUE_ARRAY_SIZE 48 /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -1640,7 +1641,8 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) FLOAT fvalue; DWORD input_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; DWORD expected_value[EFFECT_PARAMETER_VALUE_ARRAY_SIZE]; - UINT l, element; + UINT l, n, m, element; + const D3DXMATRIX *matrix_pointer_array[sizeof(input_value)/sizeof(D3DXMATRIX)]; parameter = effect->lpVtbl->GetParameterByName(effect, NULL, res_full_name); ok(parameter != NULL, "%u - %s: GetParameterByName failed\n", i, res_full_name); @@ -1693,6 +1695,7 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) * effect->lpVtbl->SetMatrix(effect, parameter, NULL); * effect->lpVtbl->GetMatrix(effect, parameter, NULL); * effect->lpVtbl->SetMatrixArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); + * effect->lpVtbl->SetMatrixPointerArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->SetMatrixTranspose(effect, parameter, NULL); * effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, NULL, res_desc->Elements ? res_desc->Elements : 1); * effect->lpVtbl->GetValue(effect, parameter, NULL, res_desc->Bytes); @@ -1814,6 +1817,14 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) ok(hr == D3DERR_INVALIDCALL, "%u - %s: GetMatrixArray failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, res_desc->Elements ? res_desc->Elements : 1); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + + hr = effect->lpVtbl->SetMatrixPointerArray(effect, NULL, matrix_pointer_array, 0); + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + hr = effect->lpVtbl->SetMatrixTranspose(effect, NULL, (D3DXMATRIX *)input_value); ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixTranspose failed, got %#x, expected %#x\n", i, res_full_name, hr, D3DERR_INVALIDCALL); @@ -2054,8 +2065,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetVectorArray(effect, parameter, (D3DXVECTOR4 *)input_value, element); if (res_desc->Elements && res_desc->Class == D3DXPC_VECTOR && element <= res_desc->Elements) { - UINT m; - for (m = 0; m < element; ++m) { for (l = 0; l < res_desc->Columns; ++l) @@ -2087,8 +2096,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2120,14 +2127,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2148,6 +2151,48 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); } + /* SetMatrixPointerArray */ + for (element = 0; element < res_desc->Elements + 1; ++element) + { + fvalue = 1.33; + for (l = 0; l < EFFECT_PARAMETER_VALUE_ARRAY_SIZE; ++l) + { + *(input_value + l) = *(DWORD *)&fvalue; + fvalue += 1.12; + } + memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); + for (l = 0; l < element; ++l) + { + matrix_pointer_array[l] = (D3DXMATRIX *)&input_value[l * sizeof(**matrix_pointer_array) / sizeof(*matrix_pointer_array)]; + } + hr = effect->lpVtbl->SetMatrixPointerArray(effect, parameter, matrix_pointer_array, element); + if (res_desc->Class == D3DXPC_MATRIX_ROWS && res_desc->Elements >= element) + { + for (n = 0; n < element; ++n) + { + for (l = 0; l < 4; ++l) + { + for (m = 0; m < 4; ++m) + { + if (m < res_desc->Rows && l < res_desc->Columns) + set_number(expected_value + l + m * res_desc->Columns + n * res_desc->Columns * res_desc->Rows, + res_desc->Type, input_value + l + m * 4 + n * 16, D3DXPT_FLOAT); + } + + } + } + ok(hr == D3D_OK, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3D_OK); + } + else + { + ok(hr == D3DERR_INVALIDCALL, "%u - %s: SetMatrixPointerArray failed, got %#x, expected %#x\n", + i, res_full_name, hr, D3DERR_INVALIDCALL); + } + test_effect_parameter_value_GetTestGroup(&res[k], effect, expected_value, parameter, i); + test_effect_parameter_value_ResetValue(&res[k], effect, &blob[res_value_offset], parameter, i); + } + /* SetMatrixTranspose */ fvalue = 1.33; for (l = 0; l < 16; ++l) @@ -2161,8 +2206,6 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns) @@ -2194,14 +2237,10 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) hr = effect->lpVtbl->SetMatrixTransposeArray(effect, parameter, (D3DXMATRIX *)input_value, element); if (res_desc->Class == D3DXPC_MATRIX_ROWS && element <= res_desc->Elements) { - UINT n; - for (n = 0; n < element; ++n) { for (l = 0; l < 4; ++l) { - UINT m; - for (m = 0; m < 4; ++m) { if (m < res_desc->Rows && l < res_desc->Columns)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTransposePointerArray().
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: 929c669b4ff61eb3fabd0941d0eb33ee881a0224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=929c669b4ff61eb3fabd0941d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:57 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixTransposePointerArray(). --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 08ae633..877df29 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2592,10 +2592,38 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposeArray(ID3DXBaseEffec static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); + D3DXMATRIX m; - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), D3DXMatrixTranspose(&m, matrix[i])); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTransposePointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixPointerArray().
by Alexandre Julliard 03 Jul '12

03 Jul '12

Module: wine Branch: master Commit: e5953b6b17b14b5e50b981acc209a2b385dc20aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5953b6b17b14b5e50b981acc… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Jul 3 12:27:46 2012 +0200 d3dx9: Implement ID3DXBaseEffect::SetMatrixPointerArray(). --- dlls/d3dx9_36/effect.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5ac79d1..08ae633 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2389,10 +2389,37 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX **matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && count <= param->element_count) + { + UINT i; + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX **matrix, UINT count)

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2012