wine-commits August 2013

wine-commits@winehq.org

2 participants
461 discussions

Nikolay Sivov : shell32: Remove unused parameters from conversion helper.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 15cd338d597cbf1323bf8754368e9a19bd2707f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15cd338d597cbf1323bf87543… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:33:38 2013 +0400 shell32: Remove unused parameters from conversion helper. --- dlls/shell32/shelllink.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 3e59aef..9664df9 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -208,10 +208,10 @@ static inline IShellLinkImpl *impl_from_IObjectWithSite(IObjectWithSite *iface) static HRESULT ShellLink_UpdatePath(LPCWSTR sPathRel, LPCWSTR path, LPCWSTR sWorkDir, LPWSTR* psPath); /* strdup on the process heap */ -static inline LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) +static inline LPWSTR heap_strdupAtoW( LPCSTR str) { INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + LPWSTR p = HeapAlloc( GetProcessHeap(), 0, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len ); @@ -1420,7 +1420,7 @@ static HRESULT WINAPI IShellLinkA_fnSetDescription(IShellLinkA *iface, LPCSTR ps if (pszName) { - descrW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszName); + descrW = heap_strdupAtoW(pszName); if (!descrW) return E_OUTOFMEMORY; } else @@ -1456,7 +1456,7 @@ static HRESULT WINAPI IShellLinkA_fnSetWorkingDirectory(IShellLinkA *iface, LPCS TRACE("(%p)->(dir=%s)\n",This, pszDir); - dirW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszDir); + dirW = heap_strdupAtoW(pszDir); if (!dirW) return E_OUTOFMEMORY; hr = IShellLinkW_SetWorkingDirectory(&This->IShellLinkW_iface, dirW); @@ -1490,7 +1490,7 @@ static HRESULT WINAPI IShellLinkA_fnSetArguments(IShellLinkA *iface, LPCSTR pszA if (pszArgs) { - argsW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszArgs); + argsW = heap_strdupAtoW(pszArgs); if (!argsW) return E_OUTOFMEMORY; } else @@ -1552,7 +1552,7 @@ static HRESULT WINAPI IShellLinkA_fnSetIconLocation(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s iicon=%u)\n",This, pszIconPath, iIcon); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszIconPath); + pathW = heap_strdupAtoW(pszIconPath); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetIconLocation(&This->IShellLinkW_iface, pathW, iIcon); @@ -1570,7 +1570,7 @@ static HRESULT WINAPI IShellLinkA_fnSetRelativePath(IShellLinkA *iface, LPCSTR p TRACE("(%p)->(path=%s %x)\n",This, pszPathRel, dwReserved); - pathW = HEAP_strdupAtoW(GetProcessHeap(), 0, pszPathRel); + pathW = heap_strdupAtoW(pszPathRel); if (!pathW) return E_OUTOFMEMORY; hr = IShellLinkW_SetRelativePath(&This->IShellLinkW_iface, pathW, dwReserved); @@ -1598,7 +1598,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA *iface, LPCSTR pszFile) if (!pszFile) return E_INVALIDARG; - str = HEAP_strdupAtoW(GetProcessHeap(), 0, pszFile); + str = heap_strdupAtoW(pszFile); if( !str ) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : shell32: Forward to IShellLinkW methods.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 5c4f23748627f6ddc0d421dadbe90b6dc17c3709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4f23748627f6ddc0d421dad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 16 11:32:41 2013 +0400 shell32: Forward to IShellLinkW methods. --- dlls/shell32/shelllink.c | 219 +++++++++++++++++++--------------------------- 1 files changed, 91 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4f23748627f6ddc0d42…

1 0

Henri Verbeet : d3drm/tests: Avoid LPDIRECT3DRMWINDEVICE.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: d7e052f8f13607fc6dbf40e346fe59044df3f87d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e052f8f13607fc6dbf40e34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:33 2013 +0200 d3drm/tests: Avoid LPDIRECT3DRMWINDEVICE. --- dlls/d3drm/tests/d3drm.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 7e59050..26b06f6 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1476,7 +1476,7 @@ static void test_Device(void) HRESULT hr; IDirect3DRM *d3drm; IDirect3DRMDevice *device; - LPDIRECT3DRMWINDEVICE pWinDevice; + IDirect3DRMWinDevice *win_device; GUID driver; HWND window; RECT rc; @@ -1513,27 +1513,26 @@ static void test_Device(void) ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); /* WinDevice */ - hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (LPVOID*)&pWinDevice); - if (FAILED(hr)) + if (FAILED(hr = IDirect3DRMDevice_QueryInterface(device, &IID_IDirect3DRMWinDevice, (void **)&win_device))) { win_skip("Cannot get IDirect3DRMWinDevice interface (hr = %x), skipping tests\n", hr); goto cleanup; } - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, NULL, NULL); + hr = IDirect3DRMWinDevice_GetClassName(win_device, NULL, NULL); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = 1; - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); ok(hr == E_INVALIDARG, "GetClassName failed with %x\n", hr); size = sizeof(cname); - hr = IDirect3DRMWinDevice_GetClassName(pWinDevice, &size, cname); + hr = IDirect3DRMWinDevice_GetClassName(win_device, &size, cname); ok(hr == D3DRM_OK, "Cannot get classname (hr = %x)\n", hr); ok(size == sizeof("Device"), "wrong size: %u\n", size); ok(!strcmp(cname, "Device"), "Expected cname to be \"Device\", but got \"%s\"\n", cname); - IDirect3DRMWinDevice_Release(pWinDevice); + IDirect3DRMWinDevice_Release(win_device); cleanup: IDirect3DRMDevice_Release(device);

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: c635b2fc7da3ffe98afe8654a33020d991db65ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c635b2fc7da3ffe98afe8654a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:32 2013 +0200 d3drm: Avoid LPDIRECT3DRMPROGRESSIVEMESH. --- dlls/d3drm/d3drm.c | 14 ++++---------- include/d3drm.h | 4 ++-- include/d3drmobj.h | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index bd7155d..3b653de 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -803,12 +803,9 @@ static HRESULT WINAPI IDirect3DRM2Impl_Tick(IDirect3DRM2* iface, D3DVALUE tick) return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2* iface, - LPDIRECT3DRMPROGRESSIVEMESH * ppMesh) +static HRESULT WINAPI IDirect3DRM2Impl_CreateProgressiveMesh(IDirect3DRM2 *iface, IDirect3DRMProgressiveMesh **mesh) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, ppMesh); + FIXME("iface %p, mesh %p stub!\n", iface, mesh); return E_NOTIMPL; } @@ -1478,12 +1475,9 @@ static HRESULT WINAPI IDirect3DRM3Impl_Tick(IDirect3DRM3* iface, D3DVALUE tick) return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3* iface, - LPDIRECT3DRMPROGRESSIVEMESH Mesh) +static HRESULT WINAPI IDirect3DRM3Impl_CreateProgressiveMesh(IDirect3DRM3 *iface, IDirect3DRMProgressiveMesh **mesh) { - IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); - - FIXME("(%p/%p)->(%p): stub\n", iface, This, Mesh); + FIXME("iface %p, mesh %p stub!\n", iface, mesh); return E_NOTIMPL; } diff --git a/include/d3drm.h b/include/d3drm.h index 7427d32..5633326 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -241,7 +241,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame *parent_frame) PURE; STDMETHOD(Tick)(THIS_ D3DVALUE) PURE; - STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH *) PURE; + STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; }; #undef INTERFACE @@ -384,7 +384,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) D3DRMLOADCALLBACK load_cb, void *load_ctx, D3DRMLOADTEXTURECALLBACK load_tex_cb, void *load_tex_ctx, IDirect3DRMFrame3 *parent_frame) PURE; STDMETHOD(Tick)(THIS_ D3DVALUE) PURE; - STDMETHOD(CreateProgressiveMesh)(THIS_ LPDIRECT3DRMPROGRESSIVEMESH) PURE; + STDMETHOD(CreateProgressiveMesh)(THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; STDMETHOD(RegisterClient)(THIS_ REFGUID rguid, LPDWORD lpdwID) PURE; STDMETHOD(UnregisterClient)(THIS_ REFGUID rguid) PURE; STDMETHOD(CreateClippedVisual)(THIS_ IDirect3DRMVisual *visual, IDirect3DRMClippedVisual **clipped_visual) PURE; diff --git a/include/d3drmobj.h b/include/d3drmobj.h index e1c2da9..dfce54a 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -2039,7 +2039,7 @@ DECLARE_INTERFACE_(IDirect3DRMProgressiveMesh,IDirect3DRMVisual) STDMETHOD(SetDetail) (THIS_ D3DVALUE d3dVal) PURE; STDMETHOD(RegisterEvents) (THIS_ HANDLE event, DWORD flags, DWORD reserved) PURE; STDMETHOD(CreateMesh) (THIS_ IDirect3DRMMesh **mesh) PURE; - STDMETHOD(Duplicate) (THIS_ LPDIRECT3DRMPROGRESSIVEMESH *ppD3DRMPMesh) PURE; + STDMETHOD(Duplicate) (THIS_ IDirect3DRMProgressiveMesh **mesh) PURE; STDMETHOD(GetBox) (THIS_ D3DRMBOX *box) PURE; STDMETHOD(SetQuality) (THIS_ D3DRMRENDERQUALITY quality) PURE; STDMETHOD(GetQuality) (THIS_ D3DRMRENDERQUALITY *quality) PURE;

1 0

Henri Verbeet : wined3d: Just update a range of constants in walk_constant_heap().
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: ad147d638cfd7ba518029bfef9f991842a644b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad147d638cfd7ba518029bfef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:31 2013 +0200 wined3d: Just update a range of constants in walk_constant_heap(). The call overhead from separate calls typically ends up being more expensive than just updating a few more constants. --- dlls/wined3d/glsl_shader.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d288ccc..a5b8c3b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -507,6 +507,7 @@ static void shader_glsl_load_vsamplers(const struct wined3d_gl_info *gl_info, static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, const float *constants, const GLint *constant_locations, const struct constant_heap *heap, unsigned char *stack, DWORD version) { + unsigned int start = ~0U, end = 0; int stack_idx = 0; unsigned int heap_idx = 1; unsigned int idx; @@ -514,7 +515,8 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con if (heap->entries[heap_idx].version <= version) return; idx = heap->entries[heap_idx].idx; - if (constant_locations[idx] != -1) GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + if (constant_locations[idx] != -1) + start = end = idx; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; while (stack_idx >= 0) @@ -530,7 +532,12 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con heap_idx = left_idx; idx = heap->entries[heap_idx].idx; if (constant_locations[idx] != -1) - GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + { + if (start > idx) + start = idx; + if (end < idx) + end = idx; + } stack[stack_idx++] = HEAP_NODE_TRAVERSE_RIGHT; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; @@ -546,7 +553,12 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con heap_idx = right_idx; idx = heap->entries[heap_idx].idx; if (constant_locations[idx] != -1) - GL_EXTCALL(glUniform4fvARB(constant_locations[idx], 1, &constants[idx * 4])); + { + if (start > idx) + start = idx; + if (end < idx) + end = idx; + } stack[stack_idx++] = HEAP_NODE_POP; stack[stack_idx] = HEAP_NODE_TRAVERSE_LEFT; @@ -560,6 +572,8 @@ static inline void walk_constant_heap(const struct wined3d_gl_info *gl_info, con break; } } + if (start <= end) + GL_EXTCALL(glUniform4fvARB(constant_locations[start], end - start + 1, &constants[start * 4])); checkGLcall("walk_constant_heap()"); }

1 0

Henri Verbeet : wined3d: Try to avoid redundant constant updates.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 37d1e8b79cfc2c4ca7b947589574179470a06c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d1e8b79cfc2c4ca7b947589… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:30 2013 +0200 wined3d: Try to avoid redundant constant updates. This gives a minor performance improvement. For example, in 3DMark03 Game Test 1 this gives about a 4% improvement, in the Counter Strike: Source stress test it's about 1%. (NVIDIA GF9600M, Intel T9550, 1024x768). --- dlls/wined3d/arb_program_shader.c | 65 +++++---- dlls/wined3d/ati_fragment_shader.c | 1 - dlls/wined3d/context.c | 8 +- dlls/wined3d/device.c | 24 ++-- dlls/wined3d/glsl_shader.c | 248 ++++++++++++++++++------------------ dlls/wined3d/shader.c | 4 +- dlls/wined3d/state.c | 65 +++------- dlls/wined3d/utils.c | 4 - dlls/wined3d/wined3d_private.h | 29 +++-- 9 files changed, 214 insertions(+), 234 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=37d1e8b79cfc2c4ca7b94…

1 0

Henri Verbeet : wined3d: Only set fragment pipe uniforms if they' re needed by the shader.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: c1af40505402ea4e5e4233a4ac739117a00429c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1af40505402ea4e5e4233a4a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 09:12:29 2013 +0200 wined3d: Only set fragment pipe uniforms if they're needed by the shader. In principle the GL driver also checks the location, but it turns out to be slightly faster to do it ourselves. --- dlls/wined3d/glsl_shader.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index cbf2c60..e61b479 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -908,16 +908,26 @@ static void shader_glsl_load_constants(void *shader_priv, const struct wined3d_c for (i = 0; i < MAX_TEXTURES; ++i) { + if (prog->ps.bumpenv_mat_location[i] == -1) + continue; + GL_EXTCALL(glUniformMatrix2fvARB(prog->ps.bumpenv_mat_location[i], 1, 0, - (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_scale_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); - GL_EXTCALL(glUniform1fARB(prog->ps.bumpenv_lum_offset_location[i], - *(const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_MAT00])); + + if (prog->ps.bumpenv_lum_scale_location[i] != -1) + { + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_scale_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LSCALE])); + GL_EXTCALL(glUniform1fvARB(prog->ps.bumpenv_lum_offset_location[i], 1, + (const float *)&state->texture_states[i][WINED3D_TSS_BUMPENV_LOFFSET])); + } } - D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_TEXTUREFACTOR], col); - GL_EXTCALL(glUniform4fARB(prog->ps.tex_factor_location, col[0], col[1], col[2], col[3])); + if (prog->ps.tex_factor_location != -1) + { + D3DCOLORTOGLFLOAT4(state->render_states[WINED3D_RS_TEXTUREFACTOR], col); + GL_EXTCALL(glUniform4fvARB(prog->ps.tex_factor_location, 1, col)); + } if (state->render_states[WINED3D_RS_SPECULARENABLE]) GL_EXTCALL(glUniform4fARB(prog->ps.specular_enable_location, 1.0f, 1.0f, 1.0f, 0.0f));

1 0

Rico Schüller : d3dx9: Introduce a helper function for the annotations.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: e5a9dcf945913215d1393fb8afdc9ca0672f2c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a9dcf945913215d1393fb8a… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Aug 13 21:39:40 2013 +0200 d3dx9: Introduce a helper function for the annotations. --- dlls/d3dx9_36/effect.c | 77 ++++++++++++++++++++---------------------------- 1 files changed, 32 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 7334718..1938b59 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1381,36 +1381,44 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetFunctionByName(ID3DXBaseEffect * return NULL; } -static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *iface, D3DXHANDLE object, UINT index) +static UINT get_annotation_from_object(struct ID3DXBaseEffectImpl *base, D3DXHANDLE object, + struct d3dx_parameter **annotations) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = get_valid_pass(This, object); - struct d3dx_technique *technique = get_valid_technique(This, object); - UINT annotation_count = 0; - struct d3dx_parameter *annotations = NULL; - - TRACE("iface %p, object %p, index %u\n", This, object, index); + struct d3dx_parameter *param = get_valid_parameter(base, object); + struct d3dx_pass *pass = get_valid_pass(base, object); + struct d3dx_technique *technique = get_valid_technique(base, object); if (pass) { - annotation_count = pass->annotation_count; - annotations = pass->annotations; + *annotations = pass->annotations; + return pass->annotation_count; } else if (technique) { - annotation_count = technique->annotation_count; - annotations = technique->annotations; + *annotations = technique->annotations; + return technique->annotation_count; } else if (param) { - annotation_count = param->annotation_count; - annotations = param->annotations; + *annotations = param->annotations; + return param->annotation_count; } else { FIXME("Functions are not handled, yet!\n"); + return 0; } +} + +static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *iface, D3DXHANDLE object, UINT index) +{ + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *annotations = NULL; + UINT annotation_count = 0; + + TRACE("iface %p, object %p, index %u\n", iface, object, index); + + annotation_count = get_annotation_from_object(base, object, &annotations); if (index < annotation_count) { @@ -1425,15 +1433,12 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotation(ID3DXBaseEffect *ifac static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect *iface, D3DXHANDLE object, LPCSTR name) { - struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(This, object); - struct d3dx_pass *pass = get_valid_pass(This, object); - struct d3dx_technique *technique = get_valid_technique(This, object); - struct d3dx_parameter *anno = NULL; - UINT annotation_count = 0; + struct ID3DXBaseEffectImpl *base = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *annotation = NULL; struct d3dx_parameter *annotations = NULL; + UINT annotation_count = 0; - TRACE("iface %p, object %p, name %s\n", This, object, debugstr_a(name)); + TRACE("iface %p, object %p, name %s\n", iface, object, debugstr_a(name)); if (!name) { @@ -1441,31 +1446,13 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect return NULL; } - if (pass) - { - annotation_count = pass->annotation_count; - annotations = pass->annotations; - } - else if (technique) - { - annotation_count = technique->annotation_count; - annotations = technique->annotations; - } - else if (param) - { - annotation_count = param->annotation_count; - annotations = param->annotations; - } - else - { - FIXME("Functions are not handled, yet!\n"); - } + annotation_count = get_annotation_from_object(base, object, &annotations); - anno = get_annotation_by_name(annotation_count, annotations, name); - if (anno) + annotation = get_annotation_by_name(annotation_count, annotations, name); + if (annotation) { - TRACE("Returning parameter %p\n", anno); - return get_parameter_handle(anno); + TRACE("Returning parameter %p\n", annotation); + return get_parameter_handle(annotation); } WARN("Invalid argument specified\n");

1 0

Charles Davis : winex11.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: d8cd28057906ccf45d278afce9dab3b0056eaa84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8cd28057906ccf45d278afce… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:05 2013 -0600 winex11.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string. --- dlls/winex11.drv/opengl.c | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 9d58861..6bed2c0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -396,9 +396,11 @@ static void (*pglXCopySubBufferMESA)(Display *dpy, GLXDrawable drawable, int x, /* Standard OpenGL */ static void (*pglFinish)(void); static void (*pglFlush)(void); +static const GLubyte *(*pglGetString)(GLenum name); static void wglFinish(void); static void wglFlush(void); +static const GLubyte *wglGetString(GLenum name); /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext ) @@ -422,6 +424,8 @@ static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg) static BOOL X11DRV_WineGL_InitOpenglInfo(void) { + static const char legacy_extensions[] = " WGL_EXT_extensions_string WGL_EXT_swap_control"; + int screen = DefaultScreen(gdi_display); Window win = 0, root = 0; const char *gl_renderer; @@ -473,8 +477,9 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void) gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER); WineGLInfo.glVersion = (const char *) opengl_funcs.gl.p_glGetString(GL_VERSION); str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); - WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+1); + WineGLInfo.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions)); strcpy(WineGLInfo.glExtensions, str); + strcat(WineGLInfo.glExtensions, legacy_extensions); /* Get the common GLX version supported by GLX client and server ( major/minor) */ pglXQueryVersion(gdi_display, &WineGLInfo.glxVersion[0], &WineGLInfo.glxVersion[1]); @@ -581,6 +586,7 @@ static BOOL has_opengl(void) do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = w##func; } while(0) REDIRECT( glFinish ); REDIRECT( glFlush ); + REDIRECT( glGetString ); #undef REDIRECT pglXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0); @@ -1927,6 +1933,13 @@ static void wglFlush(void) if (escape.gl_drawable) ExtEscape( ctx->hdc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } +static const GLubyte *wglGetString(GLenum name) +{ + if (name == GL_EXTENSIONS && WineGLInfo.glExtensions) + return (const GLubyte *)WineGLInfo.glExtensions; + return pglGetString(name); +} + /*********************************************************************** * X11DRV_wglCreateContextAttribsARB */

1 0

Charles Davis : winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string.
by Alexandre Julliard 16 Aug '13

16 Aug '13

Module: wine Branch: master Commit: 8a041504c8b1dbfdba5c32d889cfd59ffae23b87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a041504c8b1dbfdba5c32d88… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Mon Aug 12 15:07:04 2013 -0600 winemac.drv: Advertise some legacy WGL extensions in the GL_EXTENSIONS string. --- dlls/winemac.drv/opengl.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index fb294d1..7327e12 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -104,6 +104,7 @@ static void (*pglCopyColorTable)(GLenum target, GLenum internalformat, GLint x, static void (*pglCopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); static void (*pglFlush)(void); static void (*pglFlushRenderAPPLE)(void); +static const GLubyte *(*pglGetString)(GLenum name); static void (*pglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); static void (*pglViewport)(GLint x, GLint y, GLsizei width, GLsizei height); @@ -1186,6 +1187,9 @@ static const pixel_format *get_pixel_format(int format, BOOL allow_nondisplayabl static BOOL init_gl_info(void) { + static char legacy_extensions[] = " WGL_EXT_extensions_string"; + static const char legacy_ext_swap_control[] = " WGL_EXT_swap_control"; + CGDirectDisplayID display = CGMainDisplayID(); CGOpenGLDisplayMask displayMask = CGDisplayIDToOpenGLDisplayMask(display); CGLPixelFormatAttribute attribs[] = { @@ -1198,6 +1202,7 @@ static BOOL init_gl_info(void) CGLContextObj context; CGLContextObj old_context = CGLGetCurrentContext(); const char *str; + size_t length; err = CGLChoosePixelFormat(attribs, &pix, &virtualScreens); if (err != kCGLNoError || !pix) @@ -1226,8 +1231,14 @@ static BOOL init_gl_info(void) gl_info.glVersion = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); strcpy(gl_info.glVersion, str); str = (const char*)opengl_funcs.gl.p_glGetString(GL_EXTENSIONS); - gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str) + 1); + length = strlen(str) + sizeof(legacy_extensions); + if (allow_vsync) + length += strlen(legacy_ext_swap_control); + gl_info.glExtensions = HeapAlloc(GetProcessHeap(), 0, length); strcpy(gl_info.glExtensions, str); + strcat(gl_info.glExtensions, legacy_extensions); + if (allow_vsync) + strcat(gl_info.glExtensions, legacy_ext_swap_control); opengl_funcs.gl.p_glGetIntegerv(GL_MAX_VIEWPORT_DIMS, gl_info.max_viewport_dims); @@ -1516,6 +1527,26 @@ static void macdrv_glFlush(void) /********************************************************************** + * macdrv_glGetString + * + * Hook into glGetString in order to return some legacy WGL extensions + * that couldn't be advertised via the standard + * WGL_ARB_extensions_string mechanism. Some programs, especially + * older ones, expect to find certain older extensions, such as + * WGL_EXT_extensions_string itself, in the standard GL extensions + * string, and won't query any other WGL extensions unless they find + * that particular extension there. + */ +static const GLubyte *macdrv_glGetString(GLenum name) +{ + if (name == GL_EXTENSIONS && gl_info.glExtensions) + return (const GLubyte *)gl_info.glExtensions; + else + return pglGetString(name); +} + + +/********************************************************************** * macdrv_glReadPixels * * Hook into glReadPixels as part of the implementation of @@ -3054,6 +3085,7 @@ static BOOL init_opengl(void) #define REDIRECT(func) \ do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0) REDIRECT(glCopyPixels); + REDIRECT(glGetString); REDIRECT(glReadPixels); REDIRECT(glViewport); if (skip_single_buffer_flushes)

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
47
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 August 2013