wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Michael Stefaniuc : dmcompos: Use a better error for an unimplemented COM class.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 4f3931eb1537f315112386732ce42e61ac11a688 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f3931eb1537f315112386732… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 16 00:42:52 2014 +0100 dmcompos: Use a better error for an unimplemented COM class. --- dlls/dmcompos/dmcompos_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index b9f1444..e40c6ea 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_direct_music_template(REFIID riid, void **ppv, IUnk { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Frédéric Delanoy : comctl32: Avoid TRUE: FALSE conditional expressions.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 3684578a9f64b497b49d8b44151e8a3bf5b1278c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3684578a9f64b497b49d8b441… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 15 23:58:17 2014 +0100 comctl32: Avoid TRUE:FALSE conditional expressions. --- dlls/comctl32/comboex.c | 2 +- dlls/comctl32/rebar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index f1acc7d..31762b1 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1590,7 +1590,7 @@ static LRESULT COMBOEX_NotifyFormat (COMBOEX_INFO *infoPtr, LPARAM lParam) if (lParam == NF_REQUERY) { INT i = SendMessageW(infoPtr->hwndNotify, WM_NOTIFYFORMAT, (WPARAM)infoPtr->hwndSelf, NF_QUERY); - infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->NtfUnicode = (i == NFR_UNICODE); } return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI; } diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 4a3b7d4..becfe20 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3385,7 +3385,7 @@ REBAR_NotifyFormat (REBAR_INFO *infoPtr, LPARAM cmd) ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n", i); i = NFR_ANSI; } - infoPtr->bUnicode = (i == NFR_UNICODE) ? 1 : 0; + infoPtr->bUnicode = (i == NFR_UNICODE); return (LRESULT)i; } return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);

1 0

Ken Thomases : winecoreaudio: Remove some no-longer-used code.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: d3488325aec9ca6b2ef0a7212a194711cf4c96f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3488325aec9ca6b2ef0a7212… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:25 2014 -0600 winecoreaudio: Remove some no-longer-used code. --- dlls/winecoreaudio.drv/audiounit.c | 95 +----------------------------------- 1 file changed, 1 insertion(+), 94 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 6968719..b49d214 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -36,25 +36,8 @@ #include "wine/debug.h" #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for compatibility's sake */ -typedef Component AudioComponent; +/* Define new AudioComponent Manager types for compatibility's sake */ typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} #endif #ifndef HAVE_AUGRAPHADDNODE @@ -72,49 +55,6 @@ static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponen WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); -static const char *streamDescription(const AudioStreamBasicDescription* stream) -{ - return wine_dbg_sprintf("\n mSampleRate : %f\n mFormatID : %s\n mFormatFlags : %lX\n mBytesPerPacket : %lu\n mFramesPerPacket : %lu\n mBytesPerFrame : %lu\n mChannelsPerFrame : %lu\n mBitsPerChannel : %lu\n", - stream->mSampleRate, - wine_dbgstr_fourcc(stream->mFormatID), - stream->mFormatFlags, - stream->mBytesPerPacket, - stream->mFramesPerPacket, - stream->mBytesPerFrame, - stream->mChannelsPerFrame, - stream->mBitsPerChannel); -} - -int AudioUnit_CloseAudioUnit(AudioUnit au) -{ - OSStatus err = AudioComponentInstanceDispose(au); - return (err == noErr); -} - -int AudioUnit_InitializeWithStreamDescription(AudioUnit au, AudioStreamBasicDescription *stream) -{ - OSStatus err = noErr; - - TRACE("input format: %s\n", streamDescription(stream)); - - err = AudioUnitSetProperty(au, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, - 0, stream, sizeof(*stream)); - - if (err != noErr) - { - ERR("AudioUnitSetProperty return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - err = AudioUnitInitialize(au); - if (err != noErr) - { - ERR("AudioUnitInitialize return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - return 1; -} - int AudioUnit_SetVolume(AudioUnit au, float left, float right) { OSStatus err = noErr; @@ -150,39 +90,6 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) } -/* FIXME: implement sample rate conversion on input */ -int AudioUnit_GetInputDeviceSampleRate(void) -{ - AudioDeviceID defaultInputDevice; - UInt32 param; - AudioObjectPropertyAddress propertyAddress; - Float64 sampleRate; - OSStatus err; - - param = sizeof(defaultInputDevice); - propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice; - propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; - propertyAddress.mElement = kAudioObjectPropertyElementMaster; - err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &param, &defaultInputDevice); - if (err != noErr || defaultInputDevice == kAudioDeviceUnknown) - { - ERR("Couldn't get the default audio input device ID: %08lx\n", err); - return 0; - } - - param = sizeof(sampleRate); - propertyAddress.mSelector = kAudioDevicePropertyNominalSampleRate; - propertyAddress.mScope = kAudioDevicePropertyScopeInput; - err = AudioObjectGetPropertyData(defaultInputDevice, &propertyAddress, 0, NULL, &param, &sampleRate); - if (err != noErr) - { - ERR("Couldn't get the device sample rate: %08lx\n", err); - return 0; - } - - return sampleRate; -} - /* * MIDI Synth Unit */

1 0

Ken Thomases : winemac: Eliminate unused "hdc" field of OpenGL context structure.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: f4b41eeb17e99d52d7dacca468c915069983c8b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4b41eeb17e99d52d7dacca46… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:16 2014 -0600 winemac: Eliminate unused "hdc" field of OpenGL context structure. --- dlls/winemac.drv/opengl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index ad520fa..48fe4b7 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -56,7 +56,6 @@ static struct gl_info gl_info; struct wgl_context { - HDC hdc; int format; macdrv_opengl_context context; CGLContextObj cglcontext;

1 0

Ken Thomases : opengl32: Download OpenGL registry files even if server certificate can' t be verified.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: fbf2e243fe62fa1fb483b85f53a0789071fade37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf2e243fe62fa1fb483b85f5… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:46:52 2014 -0600 opengl32: Download OpenGL registry files even if server certificate can't be verified. --- dlls/opengl32/make_opengl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index fa6d514..b0b9c00 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -389,8 +389,8 @@ if ($version eq "1.0") { # # Fetch the registry files # --f "gl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; --f "wgl.xml" || system "wget https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; +-f "gl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml" || die "cannot download gl.xml"; +-f "wgl.xml" || system "wget --no-check-certificate https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml" || die "cannot download wgl.xml"; #

1 0

Ken Thomases : opengl32: Fix Perl compilation errors in make_opengl script.
by Alexandre Julliard 16 Jan '14

16 Jan '14

Module: wine Branch: master Commit: 46c7acadd76053ab886924a6603c05d68829439b URL: http://source.winehq.org/git/wine.git/?a=commit;h=46c7acadd76053ab886924a66… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Jan 15 13:47:04 2014 -0600 opengl32: Fix Perl compilation errors in make_opengl script. --- dlls/opengl32/make_opengl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index 569c294..fa6d514 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -609,7 +609,7 @@ sub parse_variable($) my $pnamebefore = ''; my $pnameafter = ''; - while (my ($k, $v) = each($p)){ + while (my ($k, $v) = each(%$p)){ if ($k eq 'ptype') { $ptype = ${$v}[0]; } elsif ($k eq 'name') { @@ -643,7 +643,7 @@ sub parse_file($$) my $ret = ''; my $params = []; my @alias = ''; - while (my ($k, $v) = each($command)){ + while (my ($k, $v) = each(%$command)){ if ($k eq 'param') { push(@$params, parse_variable($_)) for (@{$v}); } elsif ($k eq 'proto') { @@ -657,7 +657,7 @@ sub parse_file($$) if ($generate_enums) { for my $enum ( @{$data->{'enums'}} ) { if (ref($enum->{'enum'}) eq "HASH") { - while (my ($k, $v) = each($enum->{'enum'})){ + while (my ($k, $v) = each(%{$enum->{'enum'}})){ $enums{$k} = $v->{'value'}; } } @@ -665,7 +665,7 @@ sub parse_file($$) } # generate norm functions - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if ($norm_categories{$k}) { for my $req (@{$v->{require}}) { for(keys %{$req->{command}}) { @@ -676,7 +676,7 @@ sub parse_file($$) } # generate extension functions from norm functions, if they are newer than the category - while (my ($k, $v) = each($data->{feature})) { + while (my ($k, $v) = each(%{$data->{feature}})) { if (!$norm_categories{$k} && $v->{api} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { @@ -690,7 +690,7 @@ sub parse_file($$) } # generate extension functions - while (my ($k, $v) = each(${$data->{extensions}}[0]->{extension})) { + while (my ($k, $v) = each(%{${$data->{extensions}}[0]->{extension}})) { if ($v->{supported} =~ /^gl(\||$)/) { for my $req (@{$v->{require}}) { if (!defined $req->{api} || $req->{api} =~ /^gl(\||$)/) {

1 0

Stefan Dösinger : wined3d: Give buffers their own location.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 2b8e900ac4f1cfce6b3234967b4931a524114ddf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8e900ac4f1cfce6b3234967… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:12 2014 +0100 wined3d: Give buffers their own location. --- dlls/wined3d/surface.c | 192 ++++++++++++++++------------------------ dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 15 ++-- 3 files changed, 87 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b8e900ac4f1cfce6b323…

1 0

Stefan Dösinger : wined3d: Decide about PBO use at surface creation time.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 321cd8e825c4382cdb4b0c4b4371c7362b237eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=321cd8e825c4382cdb4b0c4b4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:11 2014 +0100 wined3d: Decide about PBO use at surface creation time. --- dlls/wined3d/surface.c | 41 +++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 0d8de0f..ab7bbd6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -538,20 +538,6 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win data->buffer_object = 0; } -static BOOL surface_need_pbo(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) -{ - if (surface->resource.pool == WINED3D_POOL_SYSTEM_MEM) - return FALSE; - if (!(surface->flags & SFLAG_DYNLOCK)) - return FALSE; - if (surface->flags & (SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) - return FALSE; - if (!gl_info->supported[ARB_PIXEL_BUFFER_OBJECT]) - return FALSE; - - return TRUE; -} - static void surface_create_pbo(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info) { struct wined3d_context *context; @@ -591,7 +577,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!surface->pbo && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); else if (!(surface->resource.heap_memory || surface->pbo)) { @@ -666,6 +652,17 @@ static void surface_release_client_storage(struct wined3d_surface *surface) surface_force_reload(surface); } +static BOOL surface_use_pbo(const struct wined3d_surface *surface) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + + return surface->resource.pool == WINED3D_POOL_DEFAULT + && surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] + && !surface->resource.format->convert + && !(surface->flags & (SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)); +} + static HRESULT surface_private_setup(struct wined3d_surface *surface) { /* TODO: Check against the maximum texture sizes supported by the video card. */ @@ -753,6 +750,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) surface->flags |= SFLAG_DISCARDED; + if (surface_use_pbo(surface)) + surface->flags |= SFLAG_PBO; + return WINED3D_OK; } @@ -2791,6 +2791,13 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, else surface->resource.size = resource_size; + /* The format might be changed to a format that needs conversion. + * If the surface didn't use PBOs previously but could now, don't + * change it - whatever made us not use PBOs might come back, e.g. + * color keys. */ + if (!surface_use_pbo(surface)) + surface->flags &= ~SFLAG_PBO; + if (create_dib) { if (FAILED(hr = surface_create_dib_section(surface))) @@ -5109,6 +5116,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); + surface->flags &= ~SFLAG_PBO; } surface_get_memory(surface, &data, surface->flags); @@ -5209,8 +5217,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !surface->pbo - && surface_need_pbo(surface, gl_info)) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface->flags & SFLAG_PBO) surface_create_pbo(surface, gl_info); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d8bdc9c..9d4c39c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2305,6 +2305,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ #define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_PBO 0x00400000 /* Use a PBO for mapping. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Stefan Dösinger : wined3d: Remove SFLAG_PBO.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 7c052171d638f9d43911981e75da367350831b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c052171d638f9d43911981e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:10 2014 +0100 wined3d: Remove SFLAG_PBO. --- dlls/wined3d/surface.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 21 +++++++++------------ 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 74cab37..0d8de0f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -45,7 +45,7 @@ static void surface_cleanup(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if ((surface->flags & SFLAG_PBO) || surface->rb_multisample + if (surface->pbo || surface->rb_multisample || surface->rb_resolved || !list_empty(&surface->renderbuffers)) { struct wined3d_renderbuffer_entry *entry, *entry2; @@ -55,7 +55,7 @@ static void surface_cleanup(struct wined3d_surface *surface) context = context_acquire(surface->resource.device, NULL); gl_info = context->gl_info; - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { TRACE("Deleting PBO %u.\n", surface->pbo); GL_EXTCALL(glDeleteBuffersARB(1, &surface->pbo)); @@ -522,7 +522,7 @@ static void surface_get_memory(const struct wined3d_surface *surface, struct win } if (location & SFLAG_INSYSMEM) { - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { data->addr = NULL; data->buffer_object = surface->pbo; @@ -581,7 +581,6 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win /* We don't need the system memory anymore and we can't even use it for PBOs. */ if (!(surface->flags & SFLAG_CLIENT)) wined3d_resource_free_sysmem(&surface->resource); - surface->flags |= SFLAG_PBO; surface->map_binding = SFLAG_INSYSMEM; context_release(context); } @@ -592,9 +591,9 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) TRACE("surface %p.\n", surface); - if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) + if (!surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.heap_memory || surface->flags & SFLAG_PBO)) + else if (!(surface->resource.heap_memory || surface->pbo)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -631,7 +630,7 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) - || surface->user_memory) + || surface->user_memory || surface->pbo) return; wined3d_resource_free_sysmem(&surface->resource); @@ -828,7 +827,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR return surface->dib.bitmap_data; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { BYTE *ret; const struct wined3d_gl_info *gl_info; @@ -877,7 +876,7 @@ static void surface_unmap(struct wined3d_surface *surface) break; case SFLAG_INSYSMEM: - if (surface->flags & SFLAG_PBO) + if (surface->pbo) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; @@ -1339,7 +1338,6 @@ static void surface_remove_pbo(struct wined3d_surface *surface, const struct win checkGLcall("glDeleteBuffersARB"); surface->pbo = 0; - surface->flags &= ~SFLAG_PBO; } static BOOL surface_init_sysmem(struct wined3d_surface *surface) @@ -1382,7 +1380,7 @@ static void surface_unload(struct wined3d_resource *resource) * or the depth stencil into an FBO the texture or render buffer will be removed * and all flags get lost */ - if (!(surface->flags & SFLAG_PBO)) + if (!surface->pbo) { surface_init_sysmem(surface); surface_validate_location(surface, surface->map_binding); @@ -1405,7 +1403,7 @@ static void surface_unload(struct wined3d_resource *resource) gl_info = context->gl_info; /* Destroy PBOs, but load them into real sysmem before */ - if (surface->flags & SFLAG_PBO) + if (surface->pbo) surface_remove_pbo(surface, gl_info); /* Destroy fbo render buffers. This is needed for implicit render targets, for @@ -3274,7 +3272,8 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) if (FAILED(hr)) return WINED3DERR_INVALIDCALL; if (!(surface->map_binding == SFLAG_INUSERMEM - || surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM))) + || surface->flags & SFLAG_PIN_SYSMEM + || surface->pbo)) surface->map_binding = SFLAG_INDIB; } @@ -5106,7 +5105,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * SFLAG_CONVERTED but it isn't set (yet) in all cases it is getting * called. */ - if ((convert != WINED3D_CT_NONE || format.convert) && (surface->flags & SFLAG_PBO)) + if ((convert != WINED3D_CT_NONE || format.convert) && surface->pbo) { TRACE("Removing the pbo attached to surface %p.\n", surface); surface_remove_pbo(surface, gl_info); @@ -5210,7 +5209,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location) { TRACE("Location already up to date.\n"); - if (location == SFLAG_INSYSMEM && !(surface->flags & SFLAG_PBO) + if (location == SFLAG_INSYSMEM && !surface->pbo && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e795623..d8bdc9c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2296,27 +2296,24 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_DIBSECTION 0x00000400 /* Has a DIB section attached for GetDC. */ #define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ #define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ -#define SFLAG_PBO 0x00002000 /* The surface has a PBO. */ -#define SFLAG_INSYSMEM 0x00004000 /* The system memory copy is current. */ -#define SFLAG_INUSERMEM 0x00008000 /* The user memory copy is current. */ -#define SFLAG_INDIB 0x00010000 /* The DIB copy is current. */ -#define SFLAG_INTEXTURE 0x00020000 /* The GL texture is current. */ -#define SFLAG_INSRGBTEX 0x00040000 /* The GL sRGB texture is current. */ -#define SFLAG_INDRAWABLE 0x00080000 /* The GL drawable is current. */ -#define SFLAG_INRB_MULTISAMPLE 0x00100000 /* The multisample renderbuffer is current. */ -#define SFLAG_INRB_RESOLVED 0x00200000 /* The resolved renderbuffer is current. */ -#define SFLAG_DISCARDED 0x00400000 /* Surface was discarded, allocating new location is enough. */ +#define SFLAG_INSYSMEM 0x00002000 /* The system memory copy is current. */ +#define SFLAG_INUSERMEM 0x00004000 /* The user memory copy is current. */ +#define SFLAG_INDIB 0x00008000 /* The DIB copy is current. */ +#define SFLAG_INTEXTURE 0x00010000 /* The GL texture is current. */ +#define SFLAG_INSRGBTEX 0x00020000 /* The GL sRGB texture is current. */ +#define SFLAG_INDRAWABLE 0x00040000 /* The GL drawable is current. */ +#define SFLAG_INRB_MULTISAMPLE 0x00080000 /* The multisample renderbuffer is current. */ +#define SFLAG_INRB_RESOLVED 0x00100000 /* The resolved renderbuffer is current. */ +#define SFLAG_DISCARDED 0x00200000 /* Surface was discarded, allocating new location is enough. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_PBO: PBOs don't use 'normal' memory. It is either allocated by the driver or must be NULL. * SFLAG_CLIENT: OpenGL uses our memory as backup */ #define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ SFLAG_DYNLOCK | \ SFLAG_CLIENT | \ - SFLAG_PBO | \ SFLAG_PIN_SYSMEM) #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \

1 0

Stefan Dösinger : wined3d: Load textures from dib without copying to sysmem first.
by Alexandre Julliard 15 Jan '14

15 Jan '14

Module: wine Branch: master Commit: 035012d5aac797077edd62b1a87ce903aa6bbc36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035012d5aac797077edd62b1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 15 14:54:09 2014 +0100 wined3d: Load textures from dib without copying to sysmem first. --- dlls/wined3d/surface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 92750cb..74cab37 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define MAXLOCKCOUNT 50 /* After this amount of locks do not free the sysmem copy. */ +static const DWORD surface_simple_locations = + SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; + static void surface_cleanup(struct wined3d_surface *surface) { struct wined3d_surface *overlay, *cur; @@ -4941,10 +4944,7 @@ static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - static const DWORD simple_locations = - SFLAG_INDIB | SFLAG_INUSERMEM | SFLAG_INSYSMEM; - - if (surface->flags & simple_locations) + if (surface->flags & surface_simple_locations) { surface_copy_simple_location(surface, dst_location); return; @@ -5079,9 +5079,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } } - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface_simple_locations)) { - WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); + WARN("Trying to load a texture from sysmem, but no simple location is valid.\n"); /* Lets hope we get it from somewhere... */ surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM);

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
82
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 January 2014