wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Andrew Eikum : mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 89de040e4f2567df48af1cfcad33c34e2a54d9cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=89de040e4f2567df48af1cfca… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Mar 9 12:41:22 2016 -0600 mmdevapi: Implement IAudioEndpointVolume::GetVolumeRange. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/audiovolume.c | 15 ++++++++++----- dlls/mmdevapi/devenum.c | 5 +++-- dlls/mmdevapi/mmdevapi.h | 2 +- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 24 ++++++++++++++++++++++++ 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 7dddbdf..a49d2e9 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -233,10 +233,15 @@ static HRESULT WINAPI AEV_QueryHardwareSupport(IAudioEndpointVolumeEx *iface, DW static HRESULT WINAPI AEV_GetVolumeRange(IAudioEndpointVolumeEx *iface, float *mindb, float *maxdb, float *inc) { TRACE("(%p)->(%p,%p,%p)\n", iface, mindb, maxdb, inc); + if (!mindb || !maxdb || !inc) return E_POINTER; - FIXME("stub\n"); - return E_NOTIMPL; + + *mindb = -100.f; + *maxdb = 0.f; + *inc = 1.f; + + return S_OK; } static HRESULT WINAPI AEV_GetVolumeRangeChannel(IAudioEndpointVolumeEx *iface, UINT chan, float *mindb, float *maxdb, float *inc) @@ -273,17 +278,17 @@ static const IAudioEndpointVolumeExVtbl AEVImpl_Vtbl = { AEV_GetVolumeRangeChannel }; -HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) +HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) { AEVImpl *This; *ppv = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IAudioEndpointVolumeEx_iface.lpVtbl = &AEVImpl_Vtbl; This->ref = 1; - *ppv = (IAudioEndpointVolume*)&This->IAudioEndpointVolumeEx_iface; + *ppv = &This->IAudioEndpointVolumeEx_iface; return S_OK; } diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index e63a199..1694bee 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -595,8 +595,9 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (IsEqualIID(riid, &IID_IAudioClient)){ hr = drvs.pGetAudioEndpoint(&This->devguid, iface, (IAudioClient**)ppv); - }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume)) - hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolume**)ppv); + }else if (IsEqualIID(riid, &IID_IAudioEndpointVolume) || + IsEqualIID(riid, &IID_IAudioEndpointVolumeEx)) + hr = AudioEndpointVolume_Create(This, (IAudioEndpointVolumeEx**)ppv); else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 2b40a05..b85c757 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -74,6 +74,6 @@ typedef struct MMDevice { } MMDevice; extern HRESULT AudioClient_Create(MMDevice *parent, IAudioClient **ppv) DECLSPEC_HIDDEN; -extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolume **ppv) DECLSPEC_HIDDEN; +extern HRESULT AudioEndpointVolume_Create(MMDevice *parent, IAudioEndpointVolumeEx **ppv) DECLSPEC_HIDDEN; extern const WCHAR drv_keyW[] DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 12e2156..4f8c848 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -21,6 +21,7 @@ #define COBJMACROS #include "initguid.h" +#include "endpointvolume.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "audiopolicy.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 298c886..1476adc 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -39,6 +39,7 @@ #include "mmsystem.h" #include "audioclient.h" #include "audiopolicy.h" +#include "endpointvolume.h" static const unsigned int win_formats[][4] = { { 8000, 8, 1}, { 8000, 8, 2}, { 8000, 16, 1}, { 8000, 16, 2}, @@ -2242,6 +2243,28 @@ static void test_marshal(void) } +static void test_endpointvolume(void) +{ + HRESULT hr; + IAudioEndpointVolume *aev; + float mindb, maxdb, increment; + + hr = IMMDevice_Activate(dev, &IID_IAudioEndpointVolume, + CLSCTX_INPROC_SERVER, NULL, (void**)&aev); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, NULL, NULL); + ok(hr == E_POINTER, "GetVolumeRange should have failed with E_POINTER: 0x%08x\n", hr); + + hr = IAudioEndpointVolume_GetVolumeRange(aev, &mindb, &maxdb, &increment); + ok(hr == S_OK, "GetVolumeRange failed: 0x%08x\n", hr); + trace("got range: [%f,%f]/%f\n", mindb, maxdb, increment); + + IAudioEndpointVolume_Release(aev); +} + START_TEST(render) { HRESULT hr; @@ -2283,6 +2306,7 @@ START_TEST(render) test_volume_dependence(); test_session_creation(); test_worst_case(); + test_endpointvolume(); IMMDevice_Release(dev);

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: beb8986e48ad0cbdcea62c8b8c5d38ae63f683f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb8986e48ad0cbdcea62c8b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 9 16:21:58 2016 +0100 wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 2 ++ dlls/d3d9/volume.c | 2 ++ dlls/wined3d/surface.c | 51 ------------------------------ dlls/wined3d/texture.c | 70 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/volume.c | 30 ------------------ dlls/wined3d/wined3d_private.h | 2 -- 6 files changed, 59 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb8986e48ad0cbdcea62…

1 0

Henri Verbeet : wined3d: Use ARB_map_buffer_range in wined3d_surface_map() when available.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a59f70d29ceeb42139f1c93b54a2e59f56e928c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a59f70d29ceeb42139f1c93b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:57 2016 +0100 wined3d: Use ARB_map_buffer_range in wined3d_surface_map() when available. Like in wined3d_volume_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 13aae6d..f15d62a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2207,7 +2207,20 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ case WINED3D_LOCATION_BUFFER: GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, texture->sub_resources[surface_get_sub_resource_idx(surface)].buffer_object)); - base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_READ_WRITE)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield map_flags = wined3d_resource_gl_map_flags(flags); + map_flags &= ~GL_MAP_FLUSH_EXPLICIT_BIT; + base_memory = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, + 0, surface->resource.size, map_flags)); + } + else + { + GLenum access = wined3d_resource_gl_legacy_map_flags(flags); + base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, access)); + } + GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); checkGLcall("map PBO"); break;

1 0

Henri Verbeet : wined3d: Properly handle discarded surfaces in surface_load_location().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: a80a4c10d36008429fcf3a52deede91645a00a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80a4c10d36008429fcf3a52d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:56 2016 +0100 wined3d: Properly handle discarded surfaces in surface_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 90 ++++++++++++++++++++------------------------------ 1 file changed, 35 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e375618..13aae6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3237,13 +3237,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win h = surface->resource.height; } - if (surface->ds_current_size.cx == surface->resource.width - && surface->ds_current_size.cy == surface->resource.height) - { - TRACE("Location (%#x) is already up to date.\n", location); - return; - } - if (surface->current_renderbuffer) { FIXME("Not supported with fixed up depth stencil.\n"); @@ -3251,24 +3244,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win } wined3d_surface_prepare(surface, context, location); - if (surface->locations & WINED3D_LOCATION_DISCARDED) - { - TRACE("Surface was discarded, no need copy data.\n"); - surface->locations &= ~WINED3D_LOCATION_DISCARDED; - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; - return; - } - - if (!surface->locations) - { - FIXME("No up to date depth stencil location.\n"); - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; - return; - } if (location == WINED3D_LOCATION_TEXTURE_RGB) { @@ -3351,10 +3326,6 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win { ERR("Invalid location (%#x) specified.\n", location); } - - surface->locations |= location; - surface->ds_current_size.cx = surface->resource.width; - surface->ds_current_size.cy = surface->resource.height; } void surface_validate_location(struct wined3d_surface *surface, DWORD location) @@ -3687,33 +3658,11 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co TRACE("surface %p, location %s.\n", surface, wined3d_debug_location(location)); - if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (surface->locations & location && (!(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + || (surface->ds_current_size.cx == surface->resource.width + && surface->ds_current_size.cy == surface->resource.height))) { - if ((location == WINED3D_LOCATION_TEXTURE_RGB - && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) - || (location == WINED3D_LOCATION_DRAWABLE - && surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DISCARDED))) - { - surface_load_ds_location(surface, context, location); - return WINED3D_OK; - } - else if (location & surface->locations - && surface->container->resource.draw_binding != WINED3D_LOCATION_DRAWABLE) - { - /* Already up to date, nothing to do. */ - return WINED3D_OK; - } - else - { - FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", - wined3d_debug_location(surface->locations), wined3d_debug_location(location)); - return WINED3DERR_INVALIDCALL; - } - } - - if (surface->locations & location) - { - TRACE("Location already up to date.\n"); + TRACE("Location (%#x) is already up to date.\n", location); return WINED3D_OK; } @@ -3725,9 +3674,33 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co required_access, surface->resource.access_flags); } + if (surface->locations & WINED3D_LOCATION_DISCARDED) + { + TRACE("Surface previously discarded, nothing to do.\n"); + wined3d_surface_prepare(surface, context, location); + surface_validate_location(surface, location); + surface_invalidate_location(surface, WINED3D_LOCATION_DISCARDED); + goto done; + } + if (!surface->locations) { ERR("Surface %p does not have any up to date location.\n", surface); + surface_validate_location(surface, WINED3D_LOCATION_DISCARDED); + return surface_load_location(surface, context, location); + } + + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & WINED3D_LOCATION_DRAWABLE) + || (location == WINED3D_LOCATION_DRAWABLE && surface->locations & WINED3D_LOCATION_TEXTURE_RGB)) + { + surface_load_ds_location(surface, context, location); + goto done; + } + + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + wined3d_debug_location(surface->locations), wined3d_debug_location(location)); return WINED3DERR_INVALIDCALL; } @@ -3762,8 +3735,15 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co break; } +done: surface_validate_location(surface, location); + if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + { + surface->ds_current_size.cx = surface->resource.width; + surface->ds_current_size.cy = surface->resource.height; + } + if (location != WINED3D_LOCATION_SYSMEM && (surface->locations & WINED3D_LOCATION_SYSMEM)) surface_evict_sysmem(surface);

1 0

Henri Verbeet : wined3d: Don't call surface_load_ds_location() directly.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: de8e151f6d97211d09abf3676758dd6885bbc63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e151f6d97211d09abf3676… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:55 2016 +0100 wined3d: Don't call surface_load_ds_location() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff16c9d..d032184 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -203,7 +203,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, { if (device->onscreen_depth_stencil) { - surface_load_ds_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); + surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB, device->onscreen_depth_stencil->ds_current_size.cx, @@ -280,7 +280,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } /* Full load. */ - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8941761..4771898 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -661,7 +661,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); else wined3d_surface_prepare(ds, context, location); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 487fd3f..e375618 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3213,7 +3213,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) +static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = surface->resource.device; @@ -3689,8 +3689,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == WINED3D_LOCATION_TEXTURE_RGB + if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) + || (location == WINED3D_LOCATION_DRAWABLE + && surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DISCARDED))) { surface_load_ds_location(surface, context, location); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57e6e3f..ecd37a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2604,8 +2604,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void surface_load_ds_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Introduce helpers functions to calculate texture level dimensions.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 06b5114342deed6a28d8258e75ca102cd1f4ce1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b5114342deed6a28d8258e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:54 2016 +0100 wined3d: Introduce helpers functions to calculate texture level dimensions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3ac6f43..d0f1f91 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -532,8 +532,8 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) { const struct wined3d_resource *resource = &texture->resource; - unsigned int width = max(1, texture->resource.width >> level); - unsigned int height = max(1, texture->resource.height >> level); + unsigned int width = wined3d_texture_get_level_width(texture, level); + unsigned int height = wined3d_texture_get_level_height(texture, level); if (texture->row_pitch) { @@ -1322,8 +1322,8 @@ BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) { const struct wined3d_format *format = texture->resource.format; - unsigned int height = max(1, texture->resource.height >> level); - unsigned int width = max(1, texture->resource.width >> level); + unsigned int height = wined3d_texture_get_level_height(texture, level); + unsigned int width = wined3d_texture_get_level_width(texture, level); unsigned int width_mask, height_mask; if ((box->left >= box->right) @@ -1709,9 +1709,9 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture desc->pool = resource->pool; level_idx = sub_resource_idx % texture->level_count; - desc->width = max(1, resource->width >> level_idx); - desc->height = max(1, resource->height >> level_idx); - desc->depth = max(1, resource->depth >> level_idx); + desc->width = wined3d_texture_get_level_width(texture, level_idx); + desc->height = wined3d_texture_get_level_height(texture, level_idx); + desc->depth = wined3d_texture_get_level_depth(texture, level_idx); desc->size = texture->sub_resources[sub_resource_idx].resource->size; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64a4d88..57e6e3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2414,6 +2414,24 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t return srgb ? &texture->texture_srgb : &texture->texture_rgb; } +static inline unsigned int wined3d_texture_get_level_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.width >> level); +} + +static inline unsigned int wined3d_texture_get_level_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.height >> level); +} + +static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.depth >> level); +} + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Keep track of the download count in the texture.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: bc24fbf6d64d23b1ab0961de3d5bb86a53cb3d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc24fbf6d64d23b1ab0961de3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:53 2016 +0100 wined3d: Keep track of the download count in the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 35 +++++++++-------------------------- dlls/wined3d/volume.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 6 ++---- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1bdeecf..487fd3f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -507,11 +507,10 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - /* In some conditions the surface memory must not be freed: - * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance */ - if (surface->resource.map_count || surface->container->flags & (WINED3D_TEXTURE_CONVERTED - | WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_DYNAMIC_MAP)) + struct wined3d_texture *texture = surface->container; + + if (surface->resource.map_count || texture->download_count > MAXLOCKCOUNT + || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1259,11 +1258,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will - * get a boxed texture with width pow2width and not a texture of width resource.width. - * - * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy - * won't be released, and doesn't have to be re-read. */ + * get a boxed texture with width pow2width and not a texture of width resource.width. */ src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); @@ -2169,21 +2164,6 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); - /* Performance optimization: Count how often a surface is mapped, if it is - * mapped regularly do not throw away the system memory copy. This avoids - * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. Note that this - * only really makes sense for managed textures.*/ - if (!(texture->flags & WINED3D_TEXTURE_DYNAMIC_MAP) - && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) - { - if (++surface->lockCount > MAXLOCKCOUNT) - { - TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - texture->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; - } - } - flags = wined3d_resource_sanitize_map_flags(&texture->resource, flags); if (device->d3d_initialized) @@ -3475,9 +3455,12 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - wined3d_texture_bind_and_dirtify(surface->container, context, + struct wined3d_texture *texture = surface->container; + + wined3d_texture_bind_and_dirtify(texture, context, !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location); + ++texture->download_count; return; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f70b50b..6eb7622 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -234,11 +234,13 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) { - if (volume->resource.pool != WINED3D_POOL_MANAGED) + struct wined3d_texture *texture = volume->container; + + if (texture->resource.pool != WINED3D_POOL_MANAGED) return FALSE; - if (volume->download_count >= 10) + if (texture->download_count >= 10) return FALSE; - if (volume->resource.format->convert) + if (texture->resource.format->convert) return FALSE; return TRUE; @@ -324,8 +326,8 @@ static BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - volume->download_count++; wined3d_volume_download_data(volume, context, &data); + ++texture->download_count; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61cc3a3..64a4d88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2352,8 +2352,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 -#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000400 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000800 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2365,6 +2364,7 @@ struct wined3d_texture struct wined3d_swapchain *swapchain; UINT layer_count; UINT level_count; + unsigned int download_count; float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; @@ -2457,7 +2457,6 @@ struct wined3d_volume DWORD locations; GLint texture_level; - DWORD download_count; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) @@ -2537,7 +2536,6 @@ struct wined3d_surface GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; - int lockCount; /* For GetDC */ struct wined3d_surface_dib dib;

1 0

Matteo Bruni : d3d11/tests: Require feature level 11_0 or 10_0 by default.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 9da6dd2ac93c97bc6f8cd60f26f20f632b8d8ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da6dd2ac93c97bc6f8cd60f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 8 23:19:41 2016 +0100 d3d11/tests: Require feature level 11_0 or 10_0 by default. Otherwise D3D11CreateDevice() might fallback to feature level 9 and the current tests can't handle (nor are interested in) that. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9d9b2e4..9d6add5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -187,8 +187,23 @@ static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_0, + }; + unsigned int feature_level_count; ID3D11Device *device; - UINT feature_level_count = feature_level ? 1 : 0; + + if (feature_level) + { + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = sizeof(default_feature_level) / sizeof(default_feature_level[0]); + } if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, feature_level_count, D3D11_SDK_VERSION, &device, NULL, NULL)))

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: ab09deac3bb5e2ddaddba979d4945355ef360940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab09deac3bb5e2ddaddba979d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:53 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 732288a..85244c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4460,6 +4460,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) flags |= WINED3D_GLSL_SAMPLE_GRAD; if (ins->handler_idx == WINED3DSIH_SAMPLE_LOD) flags |= WINED3D_GLSL_SAMPLE_LOD; + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; @@ -4492,7 +4494,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - dx_param_str, dy_param_str, lod_param_str, NULL, "%s", coord_param.param_str); + dx_param_str, dy_param_str, lod_param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 36c67c8a44e6fe7c2f5088e08e94cfbafcf697d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c67c8a44e6fe7c2f5088e08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:52 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab4a511..732288a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4433,15 +4433,18 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; unsigned int sampler_bind_idx; + DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, WINED3D_GLSL_SAMPLE_LOAD, - &sample_function); + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; + + shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, NULL, "%s", coord_param.param_str); + NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
73
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 March 2016