November 2015 - Wine-commits

Józef Kucia : wined3d: Set slice pitch in wined3d_map_desc to surface size.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 3f2fa96b982a7c43127602cd5d398901ee4c0217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2fa96b982a7c43127602cd5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:27 2015 +0100 wined3d: Set slice pitch in wined3d_map_desc to surface size. This behavior mimics D3D11 runtime. 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/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c3ab307..c3ddc84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2597,7 +2597,7 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, map_desc->row_pitch = surface->resource.width * format->byte_count; else map_desc->row_pitch = wined3d_surface_get_pitch(surface); - map_desc->slice_pitch = 0; + map_desc->slice_pitch = surface->resource.height * map_desc->row_pitch; if (!box) {

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Map().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 75db69ad023d4221a991fb50f7e2915904ee3fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=75db69ad023d4221a991fb50f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:28 2015 +0100 d3d11: Implement d3d11_immediate_context_Map(). 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/d3d11/buffer.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 22 ++++++++++++++++++++-- dlls/d3d11/texture.c | 4 ++-- dlls/d3d11/utils.c | 10 +++++----- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 043e7da..5af121f 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -312,7 +312,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_buffer_Map(ID3D10Buffer *iface, D3D10_MAP wined3d_mutex_lock(); hr = wined3d_buffer_map(buffer->wined3d_buffer, 0, 0, (BYTE **)data, - wined3d_map_flags_from_d3d10_map_type(map_type)); + wined3d_map_flags_from_d3d11_map_type(map_type)); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index fcd4742..b6d84c0 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -65,7 +65,7 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) DECLSP DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; -DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) DECLSPEC_HIDDEN; +DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) DECLSPEC_HIDDEN; enum D3D11_USAGE d3d11_usage_from_d3d10_usage(enum D3D10_USAGE usage) DECLSPEC_HIDDEN; enum D3D10_USAGE d3d10_usage_from_d3d11_usage(enum D3D11_USAGE usage) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5f567ab..16aff79 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -202,10 +202,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_Draw(ID3D11DeviceContext * static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx, D3D11_MAP map_type, UINT map_flags, D3D11_MAPPED_SUBRESOURCE *mapped_subresource) { - FIXME("iface %p, resource %p, subresource_idx %u, map_type %u, map_flags %#x, mapped_subresource %p stub!\n", + struct wined3d_resource *wined3d_resource; + struct wined3d_map_desc map_desc; + HRESULT hr; + + TRACE("iface %p, resource %p, subresource_idx %u, map_type %u, map_flags %#x, mapped_subresource %p.\n", iface, resource, subresource_idx, map_type, map_flags, mapped_subresource); - return E_NOTIMPL; + if (map_flags) + FIXME("Ignoring map_flags %#x.\n", map_flags); + + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + + wined3d_mutex_lock(); + hr = wined3d_resource_map(wined3d_resource, subresource_idx, + &map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)); + wined3d_mutex_unlock(); + + mapped_subresource->pData = map_desc.data; + mapped_subresource->RowPitch = map_desc.row_pitch; + mapped_subresource->DepthPitch = map_desc.slice_pitch; + + return hr; } static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index cd6b2fd..ef4c3ac 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -367,7 +367,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture2d_Map(ID3D10Texture2D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; @@ -824,7 +824,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_texture3d_Map(ID3D10Texture3D *iface, UIN wined3d_mutex_lock(); if (SUCCEEDED(hr = wined3d_texture_map(texture->wined3d_texture, sub_resource_idx, - &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d10_map_type(map_type)))) + &wined3d_map_desc, NULL, wined3d_map_flags_from_d3d11_map_type(map_type)))) { mapped_texture->pData = wined3d_map_desc.data; mapped_texture->RowPitch = wined3d_map_desc.row_pitch; diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 9bf3ada..31dffa3 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -546,20 +546,20 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re } } -DWORD wined3d_map_flags_from_d3d10_map_type(D3D10_MAP map_type) +DWORD wined3d_map_flags_from_d3d11_map_type(D3D11_MAP map_type) { switch (map_type) { - case D3D10_MAP_READ_WRITE: + case D3D11_MAP_READ_WRITE: return 0; - case D3D10_MAP_READ: + case D3D11_MAP_READ: return WINED3D_MAP_READONLY; - case D3D10_MAP_WRITE_DISCARD: + case D3D11_MAP_WRITE_DISCARD: return WINED3D_MAP_DISCARD; - case D3D10_MAP_WRITE_NO_OVERWRITE: + case D3D11_MAP_WRITE_NO_OVERWRITE: return WINED3D_MAP_NOOVERWRITE; default:

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Unmap().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 825c675ebe58750753d2a2a20acb51d39e35823d URL: http://source.winehq.org/git/wine.git/?a=commit;h=825c675ebe58750753d2a2a20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 2 17:12:29 2015 +0100 d3d11: Implement d3d11_immediate_context_Unmap(). 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/d3d11/device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 16aff79..ca8b0ef 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -229,7 +229,15 @@ static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_Map(ID3D11DeviceContext static void STDMETHODCALLTYPE d3d11_immediate_context_Unmap(ID3D11DeviceContext *iface, ID3D11Resource *resource, UINT subresource_idx) { - FIXME("iface %p, resource %p, subresource_idx %u stub!\n", iface, resource, subresource_idx); + struct wined3d_resource *wined3d_resource; + + TRACE("iface %p, resource %p, subresource_idx %u.\n", iface, resource, subresource_idx); + + wined3d_resource = wined3d_resource_from_d3d11_resource(resource); + + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_resource, subresource_idx); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Riccardo Bortolato : ddraw: Remove unused mipmap_level from ddraw_surface.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: f7bf61ea4cb3ad693d587831770b75a4cb179957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7bf61ea4cb3ad693d5878317… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Nov 3 11:45:26 2015 +0100 ddraw: Remove unused mipmap_level from ddraw_surface. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/surface.c | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bb0a3f8..7c50031 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -185,9 +185,6 @@ struct ddraw_surface /* Surface description, for GetAttachedSurface */ DDSURFACEDESC2 surface_desc; - /* Misc things */ - UINT mipmap_level; - /* Clipper objects */ struct ddraw_clipper *clipper; struct ddraw_palette *palette; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 692f129..8a10eff 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -777,7 +777,6 @@ static HRESULT WINAPI ddraw_surface7_GetAttachedSurface(IDirectDrawSurface7 *ifa */ TRACE("(%p): Returning surface %p\n", This, surf); - TRACE("(%p): mipmapcount=%d\n", This, surf->mipmap_level); *Surface = &surf->IDirectDrawSurface7_iface; ddraw_surface7_AddRef(*Surface); wined3d_mutex_unlock(); @@ -5108,8 +5107,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu struct ddraw_palette *dst_pal, *src_pal; DDSURFACEDESC *src_desc, *dst_desc; - TRACE("Copying surface %p to surface %p (mipmap level %d).\n", - src_surface, dst_surface, src_surface->mipmap_level); + TRACE("Copying surface %p to surface %p.\n", src_surface, dst_surface); /* Suppress the ALLOCONLOAD flag */ dst_surface->surface_desc.ddsCaps.dwCaps &= ~DDSCAPS_ALLOCONLOAD;

1 0

Marcus Meissner : d3dx9_36: Remove unneeded vertex_remap variable ( Coverity).
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: d17341dbd0976363bad70c0d06202e8968606133 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17341dbd0976363bad70c0d0… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Oct 31 10:03:17 2015 +0100 d3dx9_36: Remove unneeded vertex_remap variable (Coverity). Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index c597e8e..606a088 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7016,7 +7016,6 @@ HRESULT WINAPI D3DXWeldVertices(ID3DXMesh *mesh, DWORD flags, const D3DXWELDEPSI DWORD *point_reps = NULL; struct d3dx9_mesh *This = impl_from_ID3DXMesh(mesh); DWORD *vertex_face_map = NULL; - ID3DXBuffer *vertex_remap = NULL; BYTE *vertices = NULL; TRACE("mesh %p, flags %#x, epsilons %p, adjacency %p, adjacency_out %p, face_remap_out %p, vertex_remap_out %p.\n", @@ -7183,7 +7182,6 @@ cleanup: HeapFree(GetProcessHeap(), 0, vertex_face_map); if (attributes) mesh->lpVtbl->UnlockAttributeBuffer(mesh); if (indices) mesh->lpVtbl->UnlockIndexBuffer(mesh); - if (vertex_remap) ID3DXBuffer_Release(vertex_remap); if (vertices) mesh->lpVtbl->UnlockVertexBuffer(mesh); return hr;

1 0

Piotr Caban : comctl32/tests: Flush events in listview tests after setting foreground window.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 7d6ca63154e2d36390f60949bb4a41ce23c53748 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d6ca63154e2d36390f60949b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 3 18:43:12 2015 +0100 comctl32/tests: Flush events in listview tests after setting foreground window. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 118b4a2..676dca1 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5776,6 +5776,7 @@ static void test_oneclickactivate(void) ok(r == 0, "should return zero\n"); SetForegroundWindow(hwndparent); + flush_events(); fg = GetForegroundWindow(); if (fg != hwndparent) {

1 0

Dmitry Timoshkov : ole32: Add more traces to the storage methods.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 2d08613e874d517e0b31b4972f2fd011e886f27a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08613e874d517e0b31b4972… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 3 11:45:25 2015 +0800 ole32: Add more traces to the storage methods. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 105 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 94 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d08613e874d517e0b31b…

1 0

Nikolay Sivov : oledb32: Allow case-insensitive match for Provider keyword.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: ae9281e27ffddb0b872652b42144852bd899070f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9281e27ffddb0b872652b42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 4 00:27:34 2015 +0300 oledb32: Allow case-insensitive match for Provider keyword. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 27 +++++++++++++++++++++++++-- dlls/oledb32/tests/database.c | 9 +++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 3a76e0b..1ba0cb1 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -413,7 +413,7 @@ static HRESULT parse_init_string(const WCHAR *initstring, struct dbprops *props) if (scol) scol++; start = scol; - if (!strcmpW(name, providerW)) + if (!strcmpiW(name, providerW)) { SysFreeString(name); SysFreeString(value); @@ -548,6 +548,29 @@ static void datasource_release(BOOL created, IUnknown **datasource) *datasource = NULL; } +static inline WCHAR *strdupW(const WCHAR *src) +{ + WCHAR *dest; + if (!src) return NULL; + dest = heap_alloc((strlenW(src)+1)*sizeof(WCHAR)); + if (dest) + strcpyW(dest, src); + return dest; +} + +static WCHAR *strstriW(const WCHAR *str, const WCHAR *sub) +{ + LPWSTR strlower, sublower, r; + strlower = CharLowerW(strdupW(str)); + sublower = CharLowerW(strdupW(sub)); + r = strstrW(strlower, sublower); + if (r) + r = (LPWSTR)str + (r - strlower); + heap_free(strlower); + heap_free(sublower); + return r; +} + static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID riid, IUnknown **datasource) { @@ -565,7 +588,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o /* first get provider name */ provclsid = IID_NULL; - if (initstring && (prov = strstrW(initstring, providerW))) + if (initstring && (prov = strstriW(initstring, providerW))) { WCHAR *start, *progid; int len; diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 5393a91..483454e 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -382,6 +382,8 @@ static void test_initializationstring(void) { static const WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static const WCHAR initstring_msdasql2[] = {'p','R','o','V','i','D','e','R','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; static const WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; IDataInitialize *datainit = NULL; @@ -414,6 +416,13 @@ static void test_initializationstring(void) } IDBInitialize_Release(dbinit); + + /* mixed casing string */ + dbinit = NULL; + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, (WCHAR*)initstring_msdasql2, + &IID_IDBInitialize, (IUnknown**)&dbinit); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDBInitialize_Release(dbinit); } else ok(dbinit == NULL, "got %p\n", dbinit);

1 0

Henri Verbeet : wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 4896fd6e28cd37b7e82e088b69328d03f6b56b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896fd6e28cd37b7e82e088b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:44 2015 +0100 wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 046c6eb..a443636 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3054,6 +3054,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); + MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB);

1 0

Henri Verbeet : wined3d: Get rid of getColorBits().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: e0ab314b62cfe4c06f21e7f468b0351604eb73df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ab314b62cfe4c06f21e7f46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:45 2015 +0100 wined3d: Get rid of getColorBits(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 ++++++++++---------------- dlls/wined3d/directx.c | 47 ++++++++++++++---------------------------- dlls/wined3d/utils.c | 40 ----------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 26 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 978f7d7..543eaf3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1244,7 +1244,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - BYTE redBits, greenBits, blueBits, alphaBits, colorBits; BYTE depthBits=0, stencilBits=0; unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; @@ -1254,13 +1253,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), auxBuffers, findCompatible); - if (!getColorBits(color_format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) - { - ERR("Unable to get color bits for format %s (%#x)!\n", - debug_d3dformat(color_format->id), color_format->id); - return 0; - } - getDepthStencilBits(ds_format, &depthBits, &stencilBits); current_value = 0; @@ -1276,13 +1268,13 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* In window mode we need a window drawable format and double buffering. */ if (!(cfg->windowDrawable && cfg->doubleBuffer)) continue; - if (cfg->redSize < redBits) + if (cfg->redSize < color_format->red_size) continue; - if (cfg->greenSize < greenBits) + if (cfg->greenSize < color_format->green_size) continue; - if (cfg->blueSize < blueBits) + if (cfg->blueSize < color_format->blue_size) continue; - if (cfg->alphaSize < alphaBits) + if (cfg->alphaSize < color_format->alpha_size) continue; if (cfg->depthSize < depthBits) continue; @@ -1299,14 +1291,14 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC value += 1; if (cfg->stencilSize == stencilBits) value += 2; - if (cfg->alphaSize == alphaBits) + if (cfg->alphaSize == color_format->alpha_size) value += 4; /* We like to have aux buffers in backbuffer mode */ if (auxBuffers && cfg->auxBuffers) value += 8; - if (cfg->redSize == redBits - && cfg->greenSize == greenBits - && cfg->blueSize == blueBits) + if (cfg->redSize == color_format->red_size + && cfg->greenSize == color_format->green_size + && cfg->blueSize == color_format->blue_size) value += 16; if (value > current_value) @@ -1330,8 +1322,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.nVersion = 1; pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cAlphaBits = alphaBits; - pfd.cColorBits = colorBits; + pfd.cAlphaBits = color_format->alpha_size; + pfd.cColorBits = color_format->red_size + color_format->green_size + + color_format->blue_size + color_format->alpha_size; pfd.cDepthBits = depthBits; pfd.cStencilBits = stencilBits; pfd.iLayerType = PFD_MAIN_PLANE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a443636..e30e785 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4271,36 +4271,21 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) return FALSE; - if(cfg->iPixelType == WGL_TYPE_RGBA_ARB) { /* Integer RGBA formats */ - if (!getColorBits(format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) - { - ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - if(cfg->redSize < redSize) - return FALSE; - - if(cfg->greenSize < greenSize) - return FALSE; - - if(cfg->blueSize < blueSize) - return FALSE; - - if(cfg->alphaSize < alphaSize) - return FALSE; + /* Probably a RGBA_float or color index mode. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + return FALSE; - return TRUE; - } + if (cfg->redSize < format->red_size + || cfg->greenSize < format->green_size + || cfg->blueSize < format->blue_size + || cfg->alphaSize < format->alpha_size) + return FALSE; - /* Probably a RGBA_float or color index mode */ - return FALSE; + return TRUE; } static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, @@ -4479,17 +4464,15 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; - BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; unsigned int i; - getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); - getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); - - /* In backbuffer mode the front and backbuffer share the same WGL pixelformat. - * The format must match in RGB, alpha is allowed to be different. (Only the backbuffer can have alpha) */ - if (!((AdapterRed == CheckRed) && (AdapterGreen == CheckGreen) && (AdapterBlue == CheckBlue))) + /* In backbuffer mode the front and backbuffer share the same WGL + * pixelformat. The format must match in RGB, alpha is allowed to be + * different. (Only the backbuffer can have alpha.) */ + if (adapter_format->red_size != check_format->red_size + || adapter_format->green_size != check_format->green_size + || adapter_format->blue_size != check_format->blue_size) { TRACE("[FAILED]\n"); return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7f9cbd..40ba09c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4016,46 +4016,6 @@ unsigned int count_bits(unsigned int mask) return count; } -/* Helper function for retrieving color info for ChoosePixelFormat and wglChoosePixelFormatARB. - * The later function requires individual color components. */ -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) -{ - TRACE("format %s.\n", debug_d3dformat(format->id)); - - switch (format->id) - { - case WINED3DFMT_B10G10R10A2_UNORM: - case WINED3DFMT_R10G10B10A2_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - case WINED3DFMT_B5G6R5_UNORM: - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_B2G3R3_UNORM: - case WINED3DFMT_P8_UINT_A8_UNORM: - case WINED3DFMT_P8_UINT: - break; - default: - FIXME("Unsupported format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - *redSize = format->red_size; - *greenSize = format->green_size; - *blueSize = format->blue_size; - *alphaSize = format->alpha_size; - *totalSize = *redSize + *greenSize + *blueSize + *alphaSize; - - TRACE("Returning red: %d, green: %d, blue: %d, alpha: %d, total: %d for format %s.\n", - *redSize, *greenSize, *blueSize, *alphaSize, *totalSize, debug_d3dformat(format->id)); - return TRUE; -} - /* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99b025c..0fb261a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,8 +2903,6 @@ void state_pointsprite_w(struct wined3d_context *context, void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN; BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN;

1 0