wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zebediah Figura : quartz/tests: Test receiving EC_COMPLETE when not connected.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 74b595162cb2c494a67a9bf2fcd3253183a58029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74b595162cb2c494a67a9bf2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:06 2021 -0500 quartz/tests: Test receiving EC_COMPLETE when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 76 +++++++++++++++++++++++++++++++ dlls/quartz/tests/videorenderer.c | 67 +++++++++++++++++++++++++++ dlls/quartz/tests/vmr7.c | 95 +++++++++++++++++++++++++++++++++++++++ dlls/quartz/tests/vmr9.c | 67 +++++++++++++++++++++++++++ 4 files changed, 305 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74b595162cb2c494a67a…

1 0

Zebediah Figura : evr/tests: Test receiving EC_COMPLETE when not connected.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 8ef3c68f5f7712005b0e2e292ba27dfb561ed33b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef3c68f5f7712005b0e2e29… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 31 19:04:05 2021 -0500 evr/tests: Test receiving EC_COMPLETE when not connected. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6a711e30581..8bfeb987352 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -84,6 +84,16 @@ static IBaseFilter *create_evr(void) return filter; } +static IFilterGraph2 *create_graph(void) +{ + IFilterGraph2 *ret; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&ret); + ok(hr == S_OK, "Failed to create FilterGraph: %#x\n", hr); + return ret; +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -438,6 +448,100 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static unsigned int check_event_code(IMediaEvent *eventsrc, DWORD timeout, LONG expected_code, LONG_PTR expected1, LONG_PTR expected2) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == expected_code) + { + ok(param1 == expected1, "Got param1 %#lx.\n", param1); + ok(param2 == expected2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + return check_event_code(eventsrc, timeout, EC_COMPLETE, S_OK, 0); +} + +static void test_unconnected_eos(void) +{ + IBaseFilter *filter = create_evr(); + IFilterGraph2 *graph = create_graph(); + IMediaControl *control; + IMediaEvent *eventsrc; + unsigned int ret; + HRESULT hr; + ULONG ref; + + hr = IFilterGraph2_AddFilter(graph, filter, L"renderer"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got %u EC_COMPLETE events.\n", ret); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Got %u EC_COMPLETE events.\n", ret); + + IMediaControl_Release(control); + IMediaEvent_Release(eventsrc); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static IMFMediaType * create_video_type(const GUID *subtype) { IMFMediaType *video_type; @@ -2952,6 +3056,8 @@ START_TEST(evr) test_enum_pins(); test_find_pin(); test_pin_info(); + test_unconnected_eos(); + test_default_mixer(); test_default_mixer_type_negotiation(); test_surface_sample();

1 0

Rémi Bernon : mshtml: Only treat resource://gre(-resources)/ as special.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 25184137e8fa892a7ee349f6880cf9ceb31cd648 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25184137e8fa892a7ee349f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 15:35:51 2021 +0200 mshtml: Only treat resource://gre(-resources)/ as special. Instead of everything starting with resource:, some application use the resource: prefix for their internal resources, and we fail to load them. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46213 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index abf05aaa41b..f921acf4dce 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3799,7 +3799,7 @@ static nsresult NSAPI nsIOServiceHook_GetProtocolHandler(nsIIOServiceHook *iface static BOOL is_gecko_special_uri(const char *spec) { - static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource:", "javascript:", "wyciwyg:"}; + static const char *special_schemes[] = {"chrome:", "data:", "jar:", "moz-safe-about", "resource://gre/", "resource://gre-resources/", "javascript:", "wyciwyg:"}; unsigned int i; for(i=0; i < ARRAY_SIZE(special_schemes); i++) {

1 0

Gabriel Ivăncescu : mshtml: Fix reference leak in HTMLStyleSheetRulesCollection_item.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 9ca56d3e97160fa428131258f87ff8df39116d5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ca56d3e97160fa428131258… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 25 16:30:29 2021 +0300 mshtml: Fix reference leak in HTMLStyleSheetRulesCollection_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 52eaa214508..c31c7809f63 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -348,6 +348,7 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol HTMLStyleSheetRulesCollection *This = impl_from_IHTMLStyleSheetRulesCollection(iface); nsIDOMCSSRule *nsstylesheetrule; nsresult nsres; + HRESULT hres; TRACE("(%p)->(%d %p)\n", This, index, p); @@ -357,7 +358,9 @@ static HRESULT WINAPI HTMLStyleSheetRulesCollection_item(IHTMLStyleSheetRulesCol if(!nsstylesheetrule) return E_INVALIDARG; - return create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); + hres = create_style_sheet_rule(nsstylesheetrule, dispex_compat_mode(&This->dispex), p); + nsIDOMCSSRule_Release(nsstylesheetrule); + return hres; } static const IHTMLStyleSheetRulesCollectionVtbl HTMLStyleSheetRulesCollectionVtbl = {

1 0

Gabriel Ivăncescu : mshtml: Fix reference leak in HTMLStyleSheetsCollection_item.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: c6b9cb7747130589bcfb47ecc840282f770b782d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6b9cb7747130589bcfb47ec… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 25 16:30:28 2021 +0300 mshtml: Fix reference leak in HTMLStyleSheetsCollection_item. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstylesheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index cbc2adf68b5..52eaa214508 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -540,6 +540,7 @@ static HRESULT WINAPI HTMLStyleSheetsCollection_item(IHTMLStyleSheetsCollection } hres = create_style_sheet(nsstylesheet, dispex_compat_mode(&This->dispex), &stylesheet); + nsIDOMStyleSheet_Release(nsstylesheet); if(FAILED(hres)) return hres;

1 0

Gabriel Ivăncescu : jscript: Fix some refcount leaks.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 4e5c4758ff7eb4b683b91709b1d9c950ae1902e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5c4758ff7eb4b683b91709… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 25 16:30:25 2021 +0300 jscript: Fix some refcount leaks. In particular, most leak when jsdisp->ctx is not the current ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index c7e4ba933b7..4c57a690f5f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2028,6 +2028,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns if(jsdisp && jsdisp->ctx == ctx) { if(flags & DISPATCH_PROPERTYPUT) { FIXME("disp_call(propput) on builtin object\n"); + jsdisp_release(jsdisp); return E_FAIL; } @@ -2037,6 +2038,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, uns jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(ret && argc) @@ -2106,6 +2109,8 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; if(r && argc && flags == DISPATCH_METHOD) @@ -2205,6 +2210,8 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val) VARIANT var; DISPPARAMS dp = {&var, &dispid, 1, 1}; + if(jsdisp) + jsdisp_release(jsdisp); hres = jsval_to_variant(val, &var); if(FAILED(hres)) return hres; @@ -2230,6 +2237,8 @@ HRESULT disp_propput_name(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR str; DISPID id; + if(jsdisp) + jsdisp_release(jsdisp); if(!(str = SysAllocString(name))) return E_OUTOFMEMORY; @@ -2248,7 +2257,9 @@ HRESULT disp_propput_name(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, return disp_propput(ctx, disp, id, val); } - return jsdisp_propput_name(jsdisp, name, val); + hres = jsdisp_propput_name(jsdisp, name, val); + jsdisp_release(jsdisp); + return hres; } HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) @@ -2312,6 +2323,8 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val jsdisp_release(jsdisp); return hres; } + if(jsdisp) + jsdisp_release(jsdisp); V_VT(&var) = VT_EMPTY; hres = disp_invoke(ctx, disp, id, INVOKE_PROPERTYGET, &dp, &var);

1 0

Paul Gofman : wined3d: Validate pitch against the new format in wined3d_texture_update_desc().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: 7ba8943e72a834e94be03b48ad4e6621e9e3a18d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ba8943e72a834e94be03b48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Oct 25 15:15:56 2021 +0300 wined3d: Validate pitch against the new format in wined3d_texture_update_desc(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51907 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f031daef373..df42f2d766b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1887,7 +1887,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, unsig * requires a 4-byte aligned pitch and doesn't support texture formats * larger than 4 bytes per pixel nor any format using 3 bytes per pixel. * This check is here to verify that the assumption holds. */ - if (pitch % texture->resource.format->byte_count) + if (pitch % format->byte_count) { WARN("Pitch unsupported, not a multiple of the texture format byte width.\n"); return WINED3DERR_INVALIDCALL;

1 0

Francois Gouget : wined3d: Add a trailing linefeed to an ERR().
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: facd463f0e6682750781c3be1babb126e61d31cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=facd463f0e6682750781c3be… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 20 16:39:44 2021 +0200 wined3d: Add a trailing linefeed to an ERR(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 94bbe27bd5c..374e693b17d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -2021,7 +2021,7 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view if (format_id == WINED3DFMT_UNKNOWN) { - ERR("Unsupported format %s.", debug_d3dformat(view_format->id)); + ERR("Unsupported format %s.\n", debug_d3dformat(view_format->id)); return; }

1 0

Zebediah Figura : wined3d: Move the bo_user field to struct wined3d_buffer.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: d4f8d13b099c87dd56c72c7e137e0a1dd2f20b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4f8d13b099c87dd56c72c7e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 00:12:00 2021 -0500 wined3d: Move the bo_user field to struct wined3d_buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 18 +++++++++--------- dlls/wined3d/context_gl.c | 20 ++++++++++---------- dlls/wined3d/context_vk.c | 8 ++++---- dlls/wined3d/state.c | 6 +++--- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 27 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d4f8d13b099c87dd56c7…

1 0

Zebediah Figura : wined3d: Make wined3d_buffer_gl_binding_from_bind_flags() static.
by Alexandre Julliard 01 Nov '21

01 Nov '21

Module: wine Branch: master Commit: cdf01b2f599d70e8a4d50c3b37df0ebd88bf72a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf01b2f599d70e8a4d50c3b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 20 00:11:59 2021 -0500 wined3d: Make wined3d_buffer_gl_binding_from_bind_flags() static. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 56 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 854fa71aefe..54291f1d9dd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -136,6 +136,34 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w wined3d_context_gl_bind_bo(context_gl, buffer_gl->bo.binding, buffer_gl->bo.id); } +static GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) +{ + if (!bind_flags) + return GL_PIXEL_UNPACK_BUFFER; + + if (bind_flags == WINED3D_BIND_INDEX_BUFFER) + return GL_ELEMENT_ARRAY_BUFFER; + + if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) + && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) + return GL_TEXTURE_BUFFER; + + if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) + return GL_UNIFORM_BUFFER; + + if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) + return GL_TRANSFORM_FEEDBACK_BUFFER; + + if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER + && gl_info->supported[ARB_DRAW_INDIRECT]) + return GL_DRAW_INDIRECT_BUFFER; + + if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) + FIXME("Unhandled bind flags %#x.\n", bind_flags); + + return GL_ARRAY_BUFFER; +} + /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) @@ -1116,34 +1144,6 @@ static const struct wined3d_resource_ops buffer_resource_ops = buffer_resource_sub_resource_unmap, }; -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, uint32_t bind_flags) -{ - if (!bind_flags) - return GL_PIXEL_UNPACK_BUFFER; - - if (bind_flags == WINED3D_BIND_INDEX_BUFFER) - return GL_ELEMENT_ARRAY_BUFFER; - - if (bind_flags & (WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_UNORDERED_ACCESS) - && gl_info->supported[ARB_TEXTURE_BUFFER_OBJECT]) - return GL_TEXTURE_BUFFER; - - if (bind_flags & WINED3D_BIND_CONSTANT_BUFFER) - return GL_UNIFORM_BUFFER; - - if (bind_flags & WINED3D_BIND_STREAM_OUTPUT) - return GL_TRANSFORM_FEEDBACK_BUFFER; - - if (bind_flags & WINED3D_BIND_INDIRECT_BUFFER - && gl_info->supported[ARB_DRAW_INDIRECT]) - return GL_DRAW_INDIRECT_BUFFER; - - if (bind_flags & ~(WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER)) - FIXME("Unhandled bind flags %#x.\n", bind_flags); - - return GL_ARRAY_BUFFER; -} - static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a6c84ee02f..63dc130d03d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5067,8 +5067,6 @@ static inline const struct wined3d_buffer_gl *wined3d_buffer_gl_const(const stru return CONTAINING_RECORD(buffer, struct wined3d_buffer_gl, b); } -GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *gl_info, - uint32_t bind_flags) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_gl_init(struct wined3d_buffer_gl *buffer_gl, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
88
89
90
91
92
93
94
95
96
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 November 2021