November 2013 - Wine-commits

Piotr Caban : qcap: Support compression filter in ICaptureGraphBuilder2:: RenderStream.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: badc77d522f64112f7e7bc6f7d5d07da058d553c URL: http://source.winehq.org/git/wine.git/?a=commit;h=badc77d522f64112f7e7bc6f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:00:07 2013 +0100 qcap: Support compression filter in ICaptureGraphBuilder2::RenderStream. --- dlls/qcap/capturegraph.c | 59 +++++++++++++++++++++++++++++++++------------ 1 files changed, 43 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 7cec77e..a852b61 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -259,37 +259,64 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, IBaseFilter *pfRenderer) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); - IPin *pin_in = NULL; - IPin *pin_out = NULL; + IPin *source_out; + IPin *renderer_in; HRESULT hr; - FIXME("(%p/%p)->(%s, %s, %p, %p, %p) Stub!\n", This, iface, + FIXME("(%p/%p)->(%s, %s, %p, %p, %p) semi-stub!\n", This, iface, debugstr_guid(pCategory), debugstr_guid(pType), pSource, pfCompressor, pfRenderer); - if (pfCompressor) - FIXME("Intermediate streams not supported yet\n"); - if (!This->mygraph) { FIXME("Need a capture graph\n"); return E_UNEXPECTED; } + if (!pfRenderer) + { + FIXME("pfRenderer == NULL not yet supported\n"); + return E_NOTIMPL; + } - ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &pin_in); - if (!pin_in) - return E_FAIL; - ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfRenderer, PINDIR_INPUT, pCategory, pType, TRUE, 0, &pin_out); - if (!pin_out) + hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); + if (FAILED(hr)) + return E_INVALIDARG; + hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfRenderer, PINDIR_INPUT, pCategory, pType, TRUE, 0, &renderer_in); + if (FAILED(hr)) { - IPin_Release(pin_in); - return E_FAIL; + IPin_Release(source_out); + return hr; } /* Uses 'Intelligent Connect', so Connect, not ConnectDirect here */ - hr = IGraphBuilder_Connect(This->mygraph, pin_in, pin_out); - IPin_Release(pin_in); - IPin_Release(pin_out); + if (!pfCompressor) + hr = IGraphBuilder_Connect(This->mygraph, source_out, renderer_in); + else + { + IPin *compressor_in, *compressor_out; + + hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfCompressor, + PINDIR_INPUT, NULL, NULL, TRUE, 0, &compressor_in); + if (SUCCEEDED(hr)) + { + hr = IGraphBuilder_Connect(This->mygraph, source_out, compressor_in); + IPin_Release(compressor_in); + } + + if (SUCCEEDED(hr)) + { + hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfCompressor, + PINDIR_OUTPUT, NULL, NULL, TRUE, 0, &compressor_out); + if (SUCCEEDED(hr)) + { + hr = IGraphBuilder_Connect(This->mygraph, compressor_out, renderer_in); + IPin_Release(compressor_out); + } + } + } + + IPin_Release(source_out); + IPin_Release(renderer_in); return hr; }

1 0

Piotr Caban : qcap: Don' t ignore type and category parameters in ICaptureGraphBuilder2::FindPin.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 4adcca84f059ecb4a42c84b578560f11fe6f63c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4adcca84f059ecb4a42c84b57… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:01:27 2013 +0100 qcap: Don't ignore type and category parameters in ICaptureGraphBuilder2::FindPin. --- dlls/qcap/capturegraph.c | 90 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index a852b61..5af4f3b 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -368,31 +368,73 @@ fnCaptureGraphBuilder2_CopyCaptureFile(ICaptureGraphBuilder2 * iface, return E_NOTIMPL; } -static BOOL pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) +static HRESULT pin_matches(IPin *pin, PIN_DIRECTION direction, const GUID *cat, const GUID *type, BOOL unconnected) { IPin *partner; PIN_DIRECTION pindir; + HRESULT hr; - IPin_QueryDirection(pin, &pindir); - if (pindir != direction) - { - TRACE("No match, wrong direction\n"); - return FALSE; - } + hr = IPin_QueryDirection(pin, &pindir); - if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK) + if (unconnected && IPin_ConnectedTo(pin, &partner) == S_OK && partner!=NULL) { IPin_Release(partner); TRACE("No match, %p already connected to %p\n", pin, partner); - return FALSE; + return FAILED(hr) ? hr : S_FALSE; } - if (cat || type) - FIXME("Ignoring category/type\n"); + if (FAILED(hr)) + return hr; + if (SUCCEEDED(hr) && pindir != direction) + return S_FALSE; + + if (cat) + { + IKsPropertySet *props; + GUID category; + DWORD fetched; + + hr = IPin_QueryInterface(pin, &IID_IKsPropertySet, (void**)&props); + if (FAILED(hr)) + return S_FALSE; - TRACE("Match made in heaven\n"); + hr = IKsPropertySet_Get(props, &AMPROPSETID_Pin, 0, NULL, + 0, &category, sizeof(category), &fetched); + IKsPropertySet_Release(props); + if (FAILED(hr) || !IsEqualIID(&category, cat)) + return S_FALSE; + } + + if (type) + { + IEnumMediaTypes *types; + AM_MEDIA_TYPE *media_type; + ULONG fetched; + + hr = IPin_EnumMediaTypes(pin, &types); + if (FAILED(hr)) + return S_FALSE; + + IEnumMediaTypes_Reset(types); + while (1) { + if (IEnumMediaTypes_Next(types, 1, &media_type, &fetched) != S_OK || fetched != 1) + { + IEnumMediaTypes_Release(types); + return S_FALSE; + } - return TRUE; + if (IsEqualIID(&media_type->majortype, type)) + { + DeleteMediaType(media_type); + break; + } + DeleteMediaType(media_type); + } + IEnumMediaTypes_Release(types); + } + + TRACE("Pin matched\n"); + return S_OK; } static HRESULT WINAPI @@ -426,7 +468,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, if (hr == E_NOINTERFACE) { WARN("Input not filter or pin?!\n"); - return E_FAIL; + return E_NOINTERFACE; } hr = IBaseFilter_EnumPins(filter, &enumpins); @@ -436,11 +478,11 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, return hr; } - IEnumPins_Reset(enumpins); - while (1) { - hr = IEnumPins_Next(enumpins, 1, &pin, NULL); + ULONG fetched; + + hr = IEnumPins_Next(enumpins, 1, &pin, &fetched); if (hr == VFW_E_ENUM_OUT_OF_SYNC) { numcurrent = 0; @@ -448,14 +490,22 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, pin = NULL; continue; } - if (hr != S_OK) break; + if (fetched != 1) + { + hr = E_FAIL; + break; + } + TRACE("Testing match\n"); - if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) && numcurrent++ == num) + hr = pin_matches(pin, pindir, pCategory, pType, fUnconnected); + if (hr == S_OK && numcurrent++ == num) break; IPin_Release(pin); pin = NULL; + if (FAILED(hr)) + break; } IEnumPins_Release(enumpins); @@ -465,7 +515,7 @@ fnCaptureGraphBuilder2_FindPin(ICaptureGraphBuilder2 * iface, return E_FAIL; } } - else if (!pin_matches(pin, pindir, pCategory, pType, fUnconnected)) + else if (pin_matches(pin, pindir, pCategory, pType, fUnconnected) != S_OK) { IPin_Release(pin); return E_FAIL;

1 0

Piotr Caban : qcap: Warn if additional filters should be used in ICaptureGraphBuilder2:: RenderStream.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: f810d14149c7ca83fecb587e405e4ca5fd8defe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f810d14149c7ca83fecb587e4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:01:59 2013 +0100 qcap: Warn if additional filters should be used in ICaptureGraphBuilder2::RenderStream. --- dlls/qcap/capturegraph.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 5af4f3b..f5973c8 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -42,6 +42,7 @@ *#include "dshow.h" *#include "ddraw.h" */ +#include "uuids.h" #include "qcap_main.h" #include "wine/unicode.h" @@ -259,8 +260,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, IBaseFilter *pfRenderer) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder2(iface); - IPin *source_out; - IPin *renderer_in; + IPin *source_out, *renderer_in, *capture, *preview; HRESULT hr; FIXME("(%p/%p)->(%s, %s, %p, %p, %p) semi-stub!\n", This, iface, @@ -281,14 +281,30 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, pCategory, pType, TRUE, 0, &source_out); if (FAILED(hr)) return E_INVALIDARG; - hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfRenderer, PINDIR_INPUT, pCategory, pType, TRUE, 0, &renderer_in); + + if (pCategory && IsEqualIID(pCategory, &PIN_CATEGORY_VBI)) { + FIXME("Tee/Sink-to-Sink filter not supported\n"); + IPin_Release(source_out); + return E_NOTIMPL; + } + + hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, &PIN_CATEGORY_CAPTURE, NULL, TRUE, 0, &capture); + if (SUCCEEDED(hr)) { + hr = ICaptureGraphBuilder2_FindPin(iface, pSource, PINDIR_OUTPUT, &PIN_CATEGORY_PREVIEW, NULL, TRUE, 0, &preview); + if (FAILED(hr)) + FIXME("Smart Tee filter not supported - not creating preview pin\n"); + else + IPin_Release(preview); + IPin_Release(capture); + } + + hr = ICaptureGraphBuilder2_FindPin(iface, (IUnknown*)pfRenderer, PINDIR_INPUT, NULL, NULL, TRUE, 0, &renderer_in); if (FAILED(hr)) { IPin_Release(source_out); return hr; } - /* Uses 'Intelligent Connect', so Connect, not ConnectDirect here */ if (!pfCompressor) hr = IGraphBuilder_Connect(This->mygraph, source_out, renderer_in); else

1 0

Piotr Caban : qcap: Add initial ICaptureGraphBuilder2::RenderStream tests.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 2b1befb9a047d4795cb1ef4986805be650e1dea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1befb9a047d4795cb1ef498… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:02:29 2013 +0100 qcap: Add initial ICaptureGraphBuilder2::RenderStream tests. --- dlls/qcap/tests/qcap.c | 822 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 822 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1befb9a047d4795cb1e…

1 0

Piotr Caban : qcap: Add ICaptureGraphBuilder2:: RenderStream test with intermediate filter.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: cdbf03df83939bac664cb9103eddf5e51d3825e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbf03df83939bac664cb9103… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 20 12:02:42 2013 +0100 qcap: Add ICaptureGraphBuilder2::RenderStream test with intermediate filter. --- dlls/qcap/tests/qcap.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 73 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index d8788de..a710c03 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -199,6 +199,65 @@ static const struct { {GRAPHBUILDER_CONNECT, NOT_FILTER}, {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, {END, NOT_FILTER} +}, renderstream_intermediate[] = { + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {PIN_QUERYDIRECTION, SOURCE_FILTER}, + {PIN_CONNECTEDTO, SOURCE_FILTER}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER}, + {ENUMMEDIATYPES_RESET, SOURCE_FILTER}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {PIN_QUERYDIRECTION, SOURCE_FILTER}, + {PIN_CONNECTEDTO, SOURCE_FILTER}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER}, + {ENUMPINS_NEXT, SOURCE_FILTER}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, TRUE}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {BASEFILTER_QUERYINTERFACE, SOURCE_FILTER, TRUE}, + {BASEFILTER_ENUMPINS, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_QUERYDIRECTION, SOURCE_FILTER, TRUE}, + {PIN_CONNECTEDTO, SOURCE_FILTER, TRUE}, + {PIN_QUERYPININFO, SOURCE_FILTER, TRUE}, + {KSPROPERTYSET_GET, SOURCE_FILTER, TRUE}, + {ENUMPINS_NEXT, SOURCE_FILTER, TRUE}, + {PIN_ENUMMEDIATYPES, SOURCE_FILTER, TRUE}, + {ENUMMEDIATYPES_NEXT, SOURCE_FILTER, TRUE}, + {BASEFILTER_QUERYINTERFACE, SINK_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, SINK_FILTER}, + {ENUMPINS_NEXT, SINK_FILTER}, + {PIN_QUERYDIRECTION, SINK_FILTER}, + {PIN_CONNECTEDTO, SINK_FILTER}, + {BASEFILTER_QUERYINTERFACE, INTERMEDIATE_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {GRAPHBUILDER_CONNECT, NOT_FILTER}, + {BASEFILTER_QUERYINTERFACE, INTERMEDIATE_FILTER, FALSE, TRUE}, + {BASEFILTER_ENUMPINS, INTERMEDIATE_FILTER}, + {ENUMPINS_NEXT, INTERMEDIATE_FILTER}, + {PIN_QUERYDIRECTION, INTERMEDIATE_FILTER}, + {PIN_CONNECTEDTO, INTERMEDIATE_FILTER}, + {GRAPHBUILDER_CONNECT, NOT_FILTER}, + {BASEFILTER_GETSTATE, SOURCE_FILTER, TRUE}, + {END, NOT_FILTER} }, *current_calls_list; int call_no; @@ -559,7 +618,7 @@ static HRESULT WINAPI EnumPins_Next(IEnumPins *iface, ok(ppPins != NULL, "ppPins == NULL\n"); ok(pcFetched != NULL, "pcFetched == NULL\n"); - if(!This->enum_pins_pos++) { + if(This->enum_pins_pos++ < (This->filter_type == INTERMEDIATE_FILTER ? 2 : 1)) { *ppPins = &This->IPin_iface; *pcFetched = 1; return S_OK; @@ -677,6 +736,8 @@ static HRESULT WINAPI Pin_QueryDirection(IPin *iface, PIN_DIRECTION *pPinDir) check_calls_list("Pin_QueryDirection", PIN_QUERYDIRECTION, This->filter_type); *pPinDir = This->dir; + if(This->filter_type==INTERMEDIATE_FILTER && This->enum_pins_pos==2) + *pPinDir = PINDIR_INPUT; return S_OK; } @@ -894,6 +955,8 @@ static void test_CaptureGraphBuilder_RenderStream(void) {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; test_filter sink_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_INPUT, SINK_FILTER}; + test_filter intermediate_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, + {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, INTERMEDIATE_FILTER}; ICaptureGraphBuilder2 *cgb; HRESULT hr; @@ -918,6 +981,15 @@ static void test_CaptureGraphBuilder_RenderStream(void) ok(hr == S_OK, "RenderStream failed: %08x\n", hr); check_calls_list("test_CaptureGraphBuilder_RenderStream", END, NOT_FILTER); + trace("RenderStream with intermediate filter\n"); + current_calls_list = renderstream_intermediate; + call_no = 0; + hr = ICaptureGraphBuilder2_RenderStream(cgb, &PIN_CATEGORY_EDS, + &MEDIATYPE_Video, (IUnknown*)&source_filter.IBaseFilter_iface, + &intermediate_filter.IBaseFilter_iface, &sink_filter.IBaseFilter_iface); + ok(hr == S_OK, "RenderStream failed: %08x\n", hr); + check_calls_list("test_CaptureGraphBuilder_RenderStream", END, NOT_FILTER); + ICaptureGraphBuilder2_Release(cgb); }

1 0

Henri Verbeet : wined3d: Surfaces always have a container in surface_invalidate_location().
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 51f05a1f141a524dd66d4c1126fc203f828c68f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51f05a1f141a524dd66d4c112… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:29 2013 +0100 wined3d: Surfaces always have a container in surface_invalidate_location(). --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 60348ab..320a79b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5215,7 +5215,7 @@ void surface_invalidate_location(struct wined3d_surface *surface, DWORD location { TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); - if ((location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && surface->container) + if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) wined3d_texture_set_dirty(surface->container); surface->flags &= ~(location & SFLAG_LOCATIONS);

1 0

Henri Verbeet : wined3d: Surfaces always have a container in ffp_blit_set() .
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: ad6a194aa00bcdf1518b1c31748c4229b2b7adb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6a194aa00bcdf1518b1c317… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:30 2013 +0100 wined3d: Surfaces always have a container in ffp_blit_set(). --- dlls/wined3d/surface.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 320a79b..c1714c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5594,14 +5594,8 @@ static void ffp_blit_free(struct wined3d_device *device) { } static HRESULT ffp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum target; - if (surface->container) - target = surface->container->target; - else - target = surface->texture_target; - - gl_info->gl_ops.gl.p_glEnable(target); + gl_info->gl_ops.gl.p_glEnable(surface->container->target); checkGLcall("glEnable(target)"); return WINED3D_OK;

1 0

Henri Verbeet : wined3d: Surfaces always have a container in arbfp_blit_set ().
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: e64b19387b2fa37fe2eeabbd76eeaf34af78d7cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64b19387b2fa37fe2eeabbd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:31 2013 +0100 wined3d: Surfaces always have a container in arbfp_blit_set(). --- dlls/wined3d/arb_program_shader.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5efb562..aa62bfe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7302,12 +7302,7 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_priv *priv = blit_priv; enum complex_fixup fixup; const struct wined3d_gl_info *gl_info = context->gl_info; - GLenum textype; - - if (surface->container) - textype = surface->container->target; - else - textype = surface->texture_target; + GLenum textype = surface->container->target; if (surface->flags & SFLAG_CONVERTED) {

1 0

Henri Verbeet : wined3d: Get rid of the redundant texture_name and texture_name_srgb fields in struct wined3d_surface .
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 7e8897b7b84af07b7722911d2269daca79e3dd49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e8897b7b84af07b7722911d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:32 2013 +0100 wined3d: Get rid of the redundant texture_name and texture_name_srgb fields in struct wined3d_surface. --- dlls/wined3d/context.c | 6 ++-- dlls/wined3d/surface.c | 54 +++++++++---------------------------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 57 ++++++++++++--------------------------- dlls/wined3d/wined3d_private.h | 5 +--- 5 files changed, 36 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e8897b7b84af07b77229…

1 0

Henri Verbeet : wined3d: wined3d_texture_bind() should never fail.
by Alexandre Julliard 20 Nov '13

20 Nov '13

Module: wine Branch: master Commit: 7e72985358d892a430aa75ec06d6f2f9ebf8bfd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e72985358d892a430aa75ec0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 20 10:04:33 2013 +0100 wined3d: wined3d_texture_bind() should never fail. --- dlls/wined3d/texture.c | 71 ++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 33 insertions(+), 40 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b7c2451..8bae223 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -143,13 +143,12 @@ void wined3d_texture_set_dirty(struct wined3d_texture *texture) } /* Context activation is done by the caller. */ -static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, +static void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb, BOOL *set_surface_desc) { const struct wined3d_gl_info *gl_info = context->gl_info; struct gl_texture *gl_tex; BOOL new_texture = FALSE; - HRESULT hr = WINED3D_OK; GLenum target; TRACE("texture %p, context %p, srgb %#x, set_surface_desc %p.\n", texture, context, srgb, set_surface_desc); @@ -173,6 +172,13 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, gl_info->gl_ops.gl.p_glGenTextures(1, &gl_tex->name); checkGLcall("glGenTextures"); TRACE("Generated texture %d.\n", gl_tex->name); + + if (!gl_tex->name) + { + ERR("Failed to generate a texture name.\n"); + return; + } + if (texture->resource.pool == WINED3D_POOL_DEFAULT) { /* Tell OpenGL to try and keep this texture in video ram (well mostly). */ @@ -213,39 +219,29 @@ static HRESULT wined3d_texture_bind(struct wined3d_texture *texture, *set_surface_desc = FALSE; } - if (gl_tex->name) + context_bind_texture(context, target, gl_tex->name); + if (new_texture) { - context_bind_texture(context, target, gl_tex->name); - if (new_texture) + /* For a new texture we have to set the texture levels after + * binding the texture. Beware that texture rectangles do not + * support mipmapping, but set the maxmiplevel if we're relying + * on the partial GL_ARB_texture_non_power_of_two emulation with + * texture rectangles. (I.e., do not care about cond_np2 here, + * just look for GL_TEXTURE_RECTANGLE_ARB.) */ + if (target != GL_TEXTURE_RECTANGLE_ARB) { - /* For a new texture we have to set the texture levels after - * binding the texture. Beware that texture rectangles do not - * support mipmapping, but set the maxmiplevel if we're relying - * on the partial GL_ARB_texture_non_power_of_two emulation with - * texture rectangles. (I.e., do not care about cond_np2 here, - * just look for GL_TEXTURE_RECTANGLE_ARB.) */ - if (target != GL_TEXTURE_RECTANGLE_ARB) - { - TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); - checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); - } - if (target == GL_TEXTURE_CUBE_MAP_ARB) - { - /* Cubemaps are always set to clamp, regardless of the sampler state. */ - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); - } + TRACE("Setting GL_TEXTURE_MAX_LEVEL to %u.\n", texture->level_count - 1); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + checkGLcall("glTexParameteri(target, GL_TEXTURE_MAX_LEVEL, texture->level_count)"); + } + if (target == GL_TEXTURE_CUBE_MAP_ARB) + { + /* Cubemaps are always set to clamp, regardless of the sampler state. */ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); } } - else - { - ERR("This texture doesn't have an OpenGL texture assigned to it.\n"); - hr = WINED3DERR_INVALIDCALL; - } - - return hr; } /* Context activation is done by the caller. */ @@ -601,17 +597,16 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, } /* Context activation is done by the caller. */ -static HRESULT texture2d_bind(struct wined3d_texture *texture, +static void texture2d_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; BOOL set_gl_texture_desc; - HRESULT hr; TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (SUCCEEDED(hr = wined3d_texture_bind(texture, context, srgb, &set_gl_texture_desc)) - && set_gl_texture_desc && (texture->flags & WINED3D_TEXTURE_COND_NP2)) + wined3d_texture_bind(texture, context, srgb, &set_gl_texture_desc); + if (set_gl_texture_desc && (texture->flags & WINED3D_TEXTURE_COND_NP2)) { struct gl_texture *gl_tex = wined3d_texture_get_gl_texture(texture, texture->flags & WINED3D_TEXTURE_IS_SRGB); @@ -639,8 +634,6 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, gl_tex->states[WINED3DTEXSTA_MINFILTER] = WINED3D_TEXF_POINT; gl_tex->states[WINED3DTEXSTA_MIPFILTER] = WINED3D_TEXF_NONE; } - - return hr; } static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) @@ -1012,14 +1005,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 } /* Context activation is done by the caller. */ -static HRESULT texture3d_bind(struct wined3d_texture *texture, +static void texture3d_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { BOOL dummy; TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - return wined3d_texture_bind(texture, context, srgb, &dummy); + wined3d_texture_bind(texture, context, srgb, &dummy); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a220de9..16fae5a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,7 +2058,7 @@ struct gl_texture struct wined3d_texture_ops { - HRESULT (*texture_bind)(struct wined3d_texture *texture, + void (*texture_bind)(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb); void (*texture_preload)(struct wined3d_texture *texture, struct wined3d_context *context, enum WINED3DSRGB srgb);

1 0