September 2013 - Wine-Commits

Vincent Povirk : gdiplus: Don' t expand the drawing area to include empty glyphs.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 85b989c1fa09793e41b81a798f10f4649f8d6b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b989c1fa09793e41b81a798… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:15:54 2013 -0500 gdiplus: Don't expand the drawing area to include empty glyphs. --- dlls/gdiplus/graphics.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3c4b479..bd9b70b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6208,15 +6208,18 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI if (glyphsize > max_glyphsize) max_glyphsize = glyphsize; - left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; - top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; - right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; - bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; - - if (left < min_x) min_x = left; - if (top < min_y) min_y = top; - if (right > max_x) max_x = right; - if (bottom > max_y) max_y = bottom; + if (glyphsize != 0) + { + left = pti[i].x + glyphmetrics.gmptGlyphOrigin.x; + top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; + right = pti[i].x + glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; + bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; + + if (left < min_x) min_x = left; + if (top < min_y) min_y = top; + if (right > max_x) max_x = right; + if (bottom > max_y) max_y = bottom; + } if (i+1 < length && (flags & DriverStringOptionsRealizedAdvance) == DriverStringOptionsRealizedAdvance) {

1 0

Henri Verbeet : wined3d: Introduce a separate function for updating the viewport and scissor rects.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 864b25e58297f79c3c7f8e4ca349499265fbd9e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=864b25e58297f79c3c7f8e4ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:44 2013 +0200 wined3d: Introduce a separate function for updating the viewport and scissor rects. --- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/stateblock.c | 17 ----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 58c3db1..158305b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -827,6 +827,23 @@ void CDECL wined3d_device_release_focus_window(struct wined3d_device *device) InterlockedExchangePointer((void **)&device->focus_window, NULL); } +static void device_reset_viewport_scissor(struct wined3d_device *device, UINT width, UINT height) +{ + struct wined3d_state *state = &device->state; + + state->viewport.x = 0; + state->viewport.y = 0; + state->viewport.width = width; + state->viewport.height = height; + state->viewport.min_z = 0.0f; + state->viewport.max_z = 1.0f; + + state->scissor_rect.left = 0; + state->scissor_rect.top = 0; + state->scissor_rect.right = width; + state->scissor_rect.bottom = height; +} + HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc) { @@ -895,6 +912,8 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, /* Setup all the devices defaults */ state_init_default(&device->state, device); + device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); context = context_acquire(device, swapchain->front_buffer); @@ -4704,6 +4723,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (FAILED(hr = state_init(&device->state, &device->adapter->d3d_info))) ERR("Failed to initialize device state, hr %#x.\n", hr); state_init_default(&device->state, device); + device_reset_viewport_scissor(device, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); device->update_state = &device->state; } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index c2a5208..c593a63 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1181,7 +1181,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi DWORD d; } tmpfloat; unsigned int i; - struct wined3d_swapchain_desc *swapchain_desc; static const struct wined3d_matrix identity = {{{ 1.0f, 0.0f, 0.0f, 0.0f, @@ -1384,22 +1383,6 @@ void state_init_default(struct wined3d_state *state, struct wined3d_device *devi { state->textures[i] = NULL; } - - swapchain_desc = &device->swapchains[0]->desc; - - /* Set the default scissor rect values */ - state->scissor_rect.left = 0; - state->scissor_rect.right = swapchain_desc->backbuffer_width; - state->scissor_rect.top = 0; - state->scissor_rect.bottom = swapchain_desc->backbuffer_height; - - /* Set the default viewport */ - state->viewport.x = 0; - state->viewport.y = 0; - state->viewport.width = swapchain_desc->backbuffer_width; - state->viewport.height = swapchain_desc->backbuffer_height; - state->viewport.min_z = 0.0f; - state->viewport.max_z = 1.0f; } static HRESULT stateblock_init(struct wined3d_stateblock *stateblock,

1 0

Henri Verbeet : ddraw: Avoid VOID.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: e02de5ff16fc554ab35f42bbce6bc835a6952001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02de5ff16fc554ab35f42bbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 23 10:26:48 2013 +0200 ddraw: Avoid VOID. --- dlls/ddraw/tests/d3d.c | 3 ++- include/ddrawgdi.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0ab3b06..042d2d8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -511,7 +511,8 @@ static void LimitTest(void) IDirectDrawSurface7_Release(pTexture); } -static HRESULT WINAPI enumDevicesCallback(GUID *Guid,LPSTR DeviceDescription,LPSTR DeviceName, D3DDEVICEDESC *hal, D3DDEVICEDESC *hel, VOID *ctx) +static HRESULT WINAPI enumDevicesCallback(GUID *Guid, char *DeviceDescription, + char *DeviceName, D3DDEVICEDESC *hal, D3DDEVICEDESC *hel, void *ctx) { UINT ver = *((UINT *) ctx); if(IsEqualGUID(&IID_IDirect3DRGBDevice, Guid)) diff --git a/include/ddrawgdi.h b/include/ddrawgdi.h index 9aea733..4b78702 100644 --- a/include/ddrawgdi.h +++ b/include/ddrawgdi.h @@ -27,7 +27,7 @@ extern "C" { #define DdQueryDisplaySettingsUniqueness GdiEntry13 -ULONG APIENTRY DdQueryDisplaySettingsUniqueness(VOID); +ULONG APIENTRY DdQueryDisplaySettingsUniqueness(void); #ifdef __cplusplus }

1 0

Stefan Dösinger : wined3d: Use GL_APPLE_client_storage for volumes if available.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 556e3e0c764ee5eff1eb02b97a01d4141d6ec58f URL: http://source.winehq.org/git/wine.git/?a=commit;h=556e3e0c764ee5eff1eb02b97… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:16 2013 +0200 wined3d: Use GL_APPLE_client_storage for volumes if available. --- dlls/wined3d/volume.c | 53 +++++++++++++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 7be0811..d61f32f 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -57,18 +57,48 @@ void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture volume->container = container; } +static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) +{ + if (volume->resource.heap_memory) + return TRUE; + + if (!wined3d_resource_allocate_sysmem(&volume->resource)) + { + ERR("Failed to allocate system memory.\n"); + return FALSE; + } + return TRUE; +} + /* Context activation is done by the caller. */ -static void wined3d_volume_allocate_texture(const struct wined3d_volume *volume, +static void wined3d_volume_allocate_texture(struct wined3d_volume *volume, const struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + void *mem = NULL; + + if (gl_info->supported[APPLE_CLIENT_STORAGE] && !format->convert + && volume_prepare_system_memory(volume)) + { + TRACE("Enabling GL_UNPACK_CLIENT_STORAGE_APPLE for volume %p\n", volume); + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE)"); + mem = volume->resource.heap_memory; + volume->flags |= WINED3D_VFLAG_CLIENT_STORAGE; + } GL_EXTCALL(glTexImage3DEXT(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal, volume->resource.width, volume->resource.height, volume->resource.depth, - 0, format->glFormat, format->glType, NULL)); + 0, format->glFormat, format->glType, mem)); checkGLcall("glTexImage3D"); + + if (mem) + { + gl_info->gl_ops.gl.p_glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE); + checkGLcall("glPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_FALSE)"); + } } static void wined3d_volume_get_pitch(const struct wined3d_volume *volume, UINT *row_pitch, @@ -261,6 +291,8 @@ static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) return FALSE; if (volume->resource.format->convert) return FALSE; + if (volume->flags & WINED3D_VFLAG_CLIENT_STORAGE) + return FALSE; return TRUE; } @@ -452,20 +484,6 @@ static void wined3d_volume_free_pbo(struct wined3d_volume *volume) context_release(context); } -static BOOL volume_prepare_system_memory(struct wined3d_volume *volume) -{ - if (volume->resource.heap_memory) - return TRUE; - - if (!wined3d_resource_allocate_sysmem(&volume->resource)) - { - ERR("Failed to allocate system memory.\n"); - return FALSE; - } - return TRUE; -} - - static void volume_unload(struct wined3d_resource *resource) { struct wined3d_volume *volume = volume_from_resource(resource); @@ -501,7 +519,8 @@ static void volume_unload(struct wined3d_resource *resource) } /* The texture name is managed by the container. */ - volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED); + volume->flags &= ~(WINED3D_VFLAG_ALLOCATED | WINED3D_VFLAG_SRGB_ALLOCATED + | WINED3D_VFLAG_CLIENT_STORAGE); resource_unload(resource); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 02c7aff..5525dd9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2114,6 +2114,7 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture) DECLSPEC_HIDDEN; #define WINED3D_VFLAG_ALLOCATED 0x00000001 #define WINED3D_VFLAG_SRGB_ALLOCATED 0x00000002 #define WINED3D_VFLAG_PBO 0x00000004 +#define WINED3D_VFLAG_CLIENT_STORAGE 0x00000008 #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002

1 0

Stefan Dösinger : d3d8/tests: Add a volume V16U16 test .
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 993c977890d92e39353114ab7cd5167d56efe8d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=993c977890d92e39353114ab7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:15 2013 +0200 d3d8/tests: Add a volume V16U16 test. --- dlls/d3d8/tests/visual.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 744d7e5..c013c1c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4007,6 +4007,160 @@ static void volume_dxt5_test(IDirect3DDevice8 *device) IDirect3DVolumeTexture8_Release(texture); } +static void volume_v16u16_test(IDirect3DDevice8 *device) +{ + HRESULT hr; + IDirect3D8 *d3d8; + IDirect3DVolumeTexture8 *texture; + DWORD shader; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + SHORT *texel; + D3DCAPS8 caps; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ + 0x0000ffff /* end */ + }; + + hr = IDirect3DDevice8_GetDirect3D(device, &d3d8); + ok(SUCCEEDED(hr), "Failed to get d3d8 interface, hr %#x.\n", hr); + hr = IDirect3D8_CheckDeviceFormat(d3d8, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); + IDirect3D8_Release(d3d8); + if (FAILED(hr)) + { + skip("Volume V16U16 textures are not supported, skipping test.\n"); + return; + } + hr = IDirect3DDevice8_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if (caps.PixelShaderVersion < D3DPS_VERSION(1, 1)) + { + skip("No pixel shader 1.1 support, skipping test.\n"); + return; + } + + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreatePixelShader(device, shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); + + for (i = 0; i < 2; i++) + { + D3DPOOL pool; + + if (i) + pool = D3DPOOL_SYSTEMMEM; + else + pool = D3DPOOL_MANAGED; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + pool, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = 32767; + texel[1] = 32767; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = -32768; + texel[1] = 0; + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = -16384; + texel[1] = 16384; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = 0; + texel[1] = 0; + + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + if (i) + { + IDirect3DVolumeTexture8 *texture2; + + hr = IDirect3DDevice8_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + D3DPOOL_DEFAULT, &texture2); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_UpdateTexture(device, (IDirect3DBaseTexture8 *)texture, + (IDirect3DBaseTexture8 *)texture2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture8_Release(texture); + texture = texture2; + } + + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *) texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColor(device, 120, 160); + ok (color_match(color, 0x000080ff, 2), + "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); + color = getPixelColor(device, 120, 400); + ok (color_match(color, 0x00ffffff, 2), + "Expected color 0x00ffffff, got 0x%08x, V16U16 input 32767, 32767.\n", color); + color = getPixelColor(device, 360, 160); + ok (color_match(color, 0x007f7fff, 2), + "Expected color 0x007f7fff, got 0x%08x, V16U16 input 0, 0.\n", color); + color = getPixelColor(device, 360, 400); + ok (color_match(color, 0x0040c0ff, 2), + "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + + IDirect3DVolumeTexture8_Release(texture); + } + + hr = IDirect3DDevice8_SetPixelShader(device, 0); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_DeletePixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed delete pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3DDevice8 *device_ptr; @@ -4096,6 +4250,7 @@ START_TEST(visual) resz_test(device_ptr); fog_special_test(device_ptr); volume_dxt5_test(device_ptr); + volume_v16u16_test(device_ptr); cleanup: if(device_ptr) {

1 0

Stefan Dösinger : d3d9/tests: Add a volume V16U16 test .
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: fe20ee1bc4afba87e4eb79237586730f3d40c80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe20ee1bc4afba87e4eb79237… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:14 2013 +0200 d3d9/tests: Add a volume V16U16 test. --- dlls/d3d9/tests/visual.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 471c0d6..d010043 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -14635,6 +14635,151 @@ static void volume_dxt5_test(IDirect3DDevice9 *device) IDirect3DVolumeTexture9_Release(texture); } +static void volume_v16u16_test(IDirect3DDevice9 *device) +{ + HRESULT hr; + IDirect3D9 *d3d9; + IDirect3DVolumeTexture9 *texture; + IDirect3DPixelShader9 *shader; + D3DLOCKED_BOX box; + unsigned int i; + DWORD color; + SHORT *texel; + static const struct + { + struct vec3 position; + struct vec3 texcrd; + } + quads[] = + { + {{ -1.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.25f}}, + {{ 0.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.25f}}, + {{ -1.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.25f}}, + {{ 0.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.25f}}, + + {{ 0.0f, -1.0f, 0.0f}, { 0.0f, 0.0f, 0.75f}}, + {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, + {{ 0.0f, 1.0f, 0.0f}, { 0.0f, 1.0f, 0.75f}}, + {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, + }; + static const DWORD shader_code[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000051, 0xa00f0000, 0x3f000000, 0x3f000000, /* def c0, 0.5, 0.5, */ + 0x3f000000, 0x3f000000, /* 0.5, 0.5 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000004, 0x800f0000, 0xb0e40000, 0xa0e40000, 0xa0e40000, /* mad r0, t0, c0, c0 */ + 0x0000ffff /* end */ + }; + + hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); + ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_V16U16); + IDirect3D9_Release(d3d9); + if (FAILED(hr)) + { + skip("Volume V16U16 textures are not supported, skipping test.\n"); + return; + } + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set filter, hr %#x.\n", hr); + + for (i = 0; i < 2; i++) + { + D3DPOOL pool; + + if (i) + pool = D3DPOOL_SYSTEMMEM; + else + pool = D3DPOOL_MANAGED; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + pool, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = 32767; + texel[1] = 32767; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 0 * box.SlicePitch); + texel[0] = -32768; + texel[1] = 0; + texel = (SHORT *)((BYTE *)box.pBits + 0 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = -16384; + texel[1] = 16384; + texel = (SHORT *)((BYTE *)box.pBits + 1 * box.RowPitch + 1 * box.SlicePitch); + texel[0] = 0; + texel[1] = 0; + + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + + if (i) + { + IDirect3DVolumeTexture9 *texture2; + + hr = IDirect3DDevice9_CreateVolumeTexture(device, 1, 2, 2, 1, 0, D3DFMT_V16U16, + D3DPOOL_DEFAULT, &texture2, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)texture, + (IDirect3DBaseTexture9 *)texture2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#x.\n", hr); + + IDirect3DVolumeTexture9_Release(texture); + texture = texture2; + } + + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *) texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff00ff, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + color = getPixelColor(device, 120, 160); + ok (color_match(color, 0x000080ff, 2), + "Expected color 0x000080ff, got 0x%08x, V16U16 input -32768, 0.\n", color); + color = getPixelColor(device, 120, 400); + ok (color_match(color, 0x00ffffff, 2), + "Expected color 0x00ffffff, got 0x%08x, V16U16 input 32767, 32767.\n", color); + color = getPixelColor(device, 360, 160); + ok (color_match(color, 0x007f7fff, 2), + "Expected color 0x007f7fff, got 0x%08x, V16U16 input 0, 0.\n", color); + color = getPixelColor(device, 360, 400); + ok (color_match(color, 0x0040c0ff, 2), + "Expected color 0x0040c0ff, got 0x%08x, V16U16 input -16384, 16384.\n", color); + + IDirect3DVolumeTexture9_Release(texture); + } + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "Failed to set pixel shader, hr %#x.\n", hr); + IDirect3DPixelShader9_Release(shader); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); +} + START_TEST(visual) { IDirect3D9 *d3d9; @@ -14712,6 +14857,7 @@ START_TEST(visual) { skip("No mipmap support\n"); } + offscreen_test(device_ptr); ds_size_test(device_ptr); alpha_test(device_ptr); @@ -14775,6 +14921,7 @@ START_TEST(visual) texdepth_test(device_ptr); texkill_test(device_ptr); x8l8v8u8_test(device_ptr); + volume_v16u16_test(device_ptr); if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr);

1 0

Stefan Dösinger : wined3d: Make format conversion functions work on volumes.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 5e89689bcd53871734736c905d537d49ba081860 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e89689bcd53871734736c905… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:13 2013 +0200 wined3d: Make format conversion functions work on volumes. --- dlls/wined3d/surface.c | 3 +- dlls/wined3d/utils.c | 399 ++++++++++++++++++++++------------------ dlls/wined3d/volume.c | 7 +- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 228 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e89689bcd53871734736…

1 0

Vincent Povirk : gdiplus: Skip drawing lines of text with only empty glyphs .
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: ce9de5c4bb1470e0545cbdb2000fff3f9d164687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9de5c4bb1470e0545cbdb20… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Sep 20 13:12:45 2013 -0500 gdiplus: Skip drawing lines of text with only empty glyphs. --- dlls/gdiplus/graphics.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a642bd8..3c4b479 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6225,6 +6225,10 @@ static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UI } } + if (max_glyphsize == 0) + /* Nothing to draw. */ + return Ok; + glyph_mask = GdipAlloc(max_glyphsize); text_mask = GdipAlloc((max_x - min_x) * (max_y - min_y)); text_mask_stride = max_x - min_x;

1 0

Stefan Dösinger : wined3d: Add support for converted volumes.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: bb172d2a38f560b2f551804c3e68d6e03728f1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb172d2a38f560b2f551804c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 23 13:29:12 2013 +0200 wined3d: Add support for converted volumes. --- dlls/wined3d/directx.c | 12 ---------- dlls/wined3d/volume.c | 56 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 653d123..4a65993 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3874,18 +3874,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - /* Filter formats that need conversion; For one part, this - * conversion is unimplemented, and volume textures are huge, so - * it would be a big performance hit. Unless we hit an application - * needing one of those formats, don't advertize them to avoid - * leading applications into temptation. The windows drivers don't - * support most of those formats on volumes anyway. */ - if (format->convert) - { - TRACE("[FAILED] - No converted formats on volumes.\n"); - return WINED3DERR_NOTAVAILABLE; - } - /* The GL_EXT_texture_compression_s3tc spec requires that loading * an s3tc compressed texture results in an error. While the D3D * refrast does support s3tc volumes, at least the nvidia Windows diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index ea481a1..b0dd756 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -102,11 +102,37 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + UINT width = volume->resource.width; + UINT height = volume->resource.height; + UINT depth = volume->resource.depth, z; + BYTE *mem = data->addr; TRACE("volume %p, context %p, level %u, format %s (%#x).\n", volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + if (format->convert) + { + UINT dst_row_pitch, dst_slice_pitch; + UINT src_row_pitch, src_slice_pitch; + UINT alignment = volume->resource.device->surface_alignment; + + if (data->buffer_object) + ERR("Loading a converted volume from a PBO.\n"); + if (format->flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); + + dst_row_pitch = width * format->conv_byte_count; + dst_row_pitch = (dst_row_pitch + alignment - 1) & ~(alignment - 1); + dst_slice_pitch = dst_row_pitch * height; + + wined3d_volume_get_pitch(volume, &src_row_pitch, &src_slice_pitch); + + mem = HeapAlloc(GetProcessHeap(), 0, dst_slice_pitch * depth); + for (z = 0; z < depth; z++) + format->convert(data->addr + z * src_slice_pitch, mem + z * dst_slice_pitch, + src_row_pitch, dst_row_pitch, width, height); + } if (data->buffer_object) { @@ -115,8 +141,8 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine } GL_EXTCALL(glTexSubImage3DEXT(GL_TEXTURE_3D, volume->texture_level, 0, 0, 0, - volume->resource.width, volume->resource.height, volume->resource.depth, - format->glFormat, format->glType, data->addr)); + width, height, depth, + format->glFormat, format->glType, mem)); checkGLcall("glTexSubImage3D"); if (data->buffer_object) @@ -124,6 +150,9 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); checkGLcall("glBindBufferARB"); } + + if (mem != data->addr) + HeapFree(GetProcessHeap(), 0, mem); } static void wined3d_volume_validate_location(struct wined3d_volume *volume, DWORD location) @@ -147,6 +176,13 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_format *format = volume->resource.format; + if (format->convert) + { + FIXME("Attempting to download a converted volume, format %s.\n", + debug_d3dformat(format->id)); + return; + } + if (data->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, data->buffer_object)); @@ -218,6 +254,17 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, HeapFree(GetProcessHeap(), 0, data.addr); } +static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) +{ + if (volume->resource.pool != WINED3D_POOL_MANAGED) + return FALSE; + if (volume->download_count >= 10) + return FALSE; + if (volume->resource.format->convert) + return FALSE; + + return TRUE; +} /* Context activation is done by the caller. */ static void wined3d_volume_load_location(struct wined3d_volume *volume, struct wined3d_context *context, DWORD location) @@ -280,7 +327,7 @@ static void wined3d_volume_load_location(struct wined3d_volume *volume, } wined3d_volume_validate_location(volume, location); - if (volume->resource.pool == WINED3D_POOL_MANAGED && volume->download_count < 10) + if (wined3d_volume_can_evict(volume)) wined3d_volume_evict_sysmem(volume); break; @@ -808,7 +855,8 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device volume->locations = WINED3D_LOCATION_DISCARDED; if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC - && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !format->convert) { wined3d_resource_free_sysmem(&volume->resource); volume->flags |= WINED3D_VFLAG_PBO;

1 0

Frédéric Delanoy : gphoto2.ds: Use BOOL type where appropriate.
by Alexandre Julliard Sept. 24, 2013

Sept. 24, 2013

Module: wine Branch: master Commit: 78fe60ac765ddb7d5bef8e2ce99e864136f48a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78fe60ac765ddb7d5bef8e2ce… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Sep 21 00:47:25 2013 +0200 gphoto2.ds: Use BOOL type where appropriate. --- dlls/gphoto2.ds/ui.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 0b21f2e..d663552 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -69,17 +69,17 @@ static void UI_EndDialog(HWND hwnd, INT_PTR rc) EndDialog(hwnd, rc); } -static int GetAllImages(void) +static BOOL GetAllImages(void) { struct gphoto2_file *file; - int has_images = 0; + BOOL has_images = FALSE; LIST_FOR_EACH_ENTRY( file, &activeDS.files, struct gphoto2_file, entry) { if (strstr(file->filename,".JPG") || strstr(file->filename,".jpg")) { file->download = TRUE; - has_images = 1; + has_images = TRUE; } } return has_images;

1 0