May 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Add tests for sampling from 2d array textures.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: c0bedd0a257cace6ea6a40ca422b470d8a8b5bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0bedd0a257cace6ea6a40ca4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:38 2016 +0200 d3d11/tests: Add tests for sampling from 2d array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 261 +++++++++++++++++++++++++++++++---------------- 1 file changed, 173 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c0bedd0a257cace6ea6a4…

1 0

Ken Thomases : winemac: Adjust sizes of all descendant views when Retina mode changes.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 4a7628946489c6f575e4094c6273d656a7ad6c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a7628946489c6f575e4094c6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed May 18 18:38:25 2016 -0500 winemac: Adjust sizes of all descendant views when Retina mode changes. As opposed to just the immediate subviews of the window contentView. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index d97eb1d..1b0f9cc 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -553,6 +553,24 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi } } + - (void) setRetinaMode:(int)mode + { + double scale = mode ? 0.5 : 2.0; + NSRect frame = self.frame; + frame.origin.x *= scale; + frame.origin.y *= scale; + frame.size.width *= scale; + frame.size.height *= scale; + [self setFrame:frame]; + [self updateGLContexts]; + + for (WineContentView* subview in [self subviews]) + { + if ([subview isKindOfClass:[WineContentView class]]) + [subview setRetinaMode:mode]; + } + } + - (BOOL) acceptsFirstMouse:(NSEvent*)theEvent { return YES; @@ -2301,15 +2319,7 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi for (WineContentView* subview in [self.contentView subviews]) { if ([subview isKindOfClass:[WineContentView class]]) - { - frame = subview.frame; - frame.origin.x *= scale; - frame.origin.y *= scale; - frame.size.width *= scale; - frame.size.height *= scale; - [subview setFrame:frame]; - [subview updateGLContexts]; - } + [subview setRetinaMode:mode]; } frame = [self contentRectForFrameRect:self.wine_fractionalFrame];

1 0

Andrew Eikum : dsound: Support downmixing 5.1 to stereo.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 88dd3b4f6e4ed10413b8d93055801a6e60fbc5e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88dd3b4f6e4ed10413b8d9305… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:13 2016 -0500 dsound: Support downmixing 5.1 to stereo. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 2 ++ dlls/dsound/mixer.c | 8 ++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 4ae83ba..3b4d2e5 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -157,6 +157,13 @@ void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, floa *fbuf = value; } +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + BYTE *buf = (BYTE *)dsb->device->tmp_buffer; + float *fbuf = (float*)(buf + pos + sizeof(float) * channel); + *fbuf += value; +} + void put_mono2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { dsb->put_aux(dsb, pos, 0, value); @@ -206,6 +213,45 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on pulseaudio's downmix algorithm */ + switch(channel){ + + case 4: /* back left */ + value *= 0.056f; /* (1/9) / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 0.503; /* 1 / (sum of left volumes) */ + dsb->put_aux(dsb, pos, 0, value); + break; + + case 5: /* back right */ + value *= 0.056f; /* (1/9) / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 0.503f; /* 1 / (sum of right volumes) */ + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* front centre */ + value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: /* LFE */ + value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + } +} + void mixieee32(float *src, float *dst, unsigned samples) { TRACE("%p - %p %d\n", src, dst, samples); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index d063046..49e98ba 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -47,6 +47,7 @@ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); typedef void (*bitsputfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD, float); extern const bitsgetfunc getbpp[5] DECLSPEC_HIDDEN; void putieee32(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void putieee32_sum(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void mixieee32(float *src, float *dst, unsigned samples) DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; @@ -177,6 +178,7 @@ void put_mono2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, IDirectSoundBuffer **buffer) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 217d4ce..4f05ee2 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -173,6 +173,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->mix_channels = 2; dsb->put = put_stereo2surround51; } + else if (ichannels == 6 && ochannels == 2) + { + dsb->mix_channels = 6; + dsb->put = put_surround512stereo; + dsb->put_aux = putieee32_sum; + } else { if (ichannels > 2) @@ -495,6 +501,8 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; + if(dsb->put_aux == putieee32_sum) + memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer;

1 0

Andrew Eikum : dsound: Allow inactive devices to change the primary format.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 4fbe6f3e7601f7b39f7f672ffe43553eee92ab1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fbe6f3e7601f7b39f7f672ff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu May 19 09:11:08 2016 -0500 dsound: Allow inactive devices to change the primary format. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 0dc16f0..b14bff7 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -479,35 +479,30 @@ HRESULT primarybuffer_SetFormat(DirectSoundDevice *device, LPCWAVEFORMATEX passe RtlAcquireResourceExclusive(&(device->buffer_list_lock), TRUE); EnterCriticalSection(&(device->mixlock)); - if (device->priolevel == DSSCL_WRITEPRIMARY) { - old_fmt = device->primary_pwfx; - device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); - fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; - if (device->primary_pwfx == NULL) { - err = DSERR_OUTOFMEMORY; - goto out; - } + old_fmt = device->primary_pwfx; + device->primary_pwfx = DSOUND_CopyFormat(passed_fmt); + fmtex = (WAVEFORMATEXTENSIBLE *)device->primary_pwfx; + if (device->primary_pwfx == NULL) { + err = DSERR_OUTOFMEMORY; + goto out; + } - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->Samples.wValidBitsPerSample == 0) { - TRACE("Correcting 0 valid bits per sample\n"); - fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; - } + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->Samples.wValidBitsPerSample == 0) { + TRACE("Correcting 0 valid bits per sample\n"); + fmtex->Samples.wValidBitsPerSample = fmtex->Format.wBitsPerSample; + } + if(device->priolevel == DSSCL_WRITEPRIMARY || device->nrofbuffers == 0) err = DSOUND_ReopenDevice(device, TRUE); - if (FAILED(err)) { - ERR("No formats could be opened\n"); - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = old_fmt; - } else - HeapFree(GetProcessHeap(), 0, old_fmt); + if (FAILED(err) && device->priolevel == DSSCL_WRITEPRIMARY) { + ERR("No formats could be opened\n"); + HeapFree(GetProcessHeap(), 0, device->primary_pwfx); + device->primary_pwfx = old_fmt; } else { - WAVEFORMATEX *wfx = DSOUND_CopyFormat(passed_fmt); - if (wfx) { - HeapFree(GetProcessHeap(), 0, device->primary_pwfx); - device->primary_pwfx = wfx; - } else - err = DSERR_OUTOFMEMORY; + /* ignore failures */ + err = S_OK; + HeapFree(GetProcessHeap(), 0, old_fmt); } out:

1 0

Józef Kucia : d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData().
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: d283c5b68e078233cd1e69c1b16d3577af2cc448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d283c5b68e078233cd1e69c1b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:45 2016 +0200 d3d9: Allow to pass NULL pointers to IDirect3DDevice9_GetRenderTargetData(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 +++ dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dd7f46a..4bbdd42 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1279,6 +1279,9 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); + if (!render_target || !dst_surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &wined3d_desc); dst_rect.left = 0; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8860bce..4302f76 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -11122,6 +11122,55 @@ done: DestroyWindow(window); } +static void test_get_render_target_data(void) +{ + IDirect3DSurface9 *offscreen_surface, *render_target; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + UINT refcount; + HWND window; + HRESULT hr; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, NULL))) + { + skip("Failed to create a D3D device.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, + D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &offscreen_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create offscreen surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, + D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &render_target, NULL); + ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, NULL, offscreen_surface); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTargetData(device, render_target, offscreen_surface); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + + IDirect3DSurface9_Release(render_target); + IDirect3DSurface9_Release(offscreen_surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { WNDCLASSA wc = {0}; @@ -11237,6 +11286,7 @@ START_TEST(device) test_swapchain_parameters(); test_check_device_format(); test_miptree_layout(); + test_get_render_target_data(); UnregisterClassA("d3d9_test_wc", GetModuleHandleA(NULL)); }

1 0

Józef Kucia : wined3d: Use bit fields instead of BOOL arrays.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 57788849fdcee55db551c8134aaf0811c316d61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57788849fdcee55db551c8134… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:44 2016 +0200 wined3d: Use bit fields instead of BOOL arrays. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 96 +++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8d17788..0fb2f67 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6378,22 +6378,17 @@ static const char *arbfp_texture_target(enum wined3d_gl_resource_type type) static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, const struct wined3d_gl_info *gl_info) { - unsigned int stage; + BYTE tex_read = 0, bump_used = 0, luminance_used = 0, constant_used = 0; + BOOL tempreg_used = FALSE, tfactor_used = FALSE; + unsigned int stage, lowest_disabled_stage; struct wined3d_string_buffer buffer; - BOOL tex_read[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL bump_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - BOOL constant_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; - UINT lowest_disabled_stage; - const char *textype; - const char *instr; - char colorcor_dst[8]; - GLuint ret; + struct color_fixup_masks masks; + BOOL custom_linear_fog = FALSE; + const char *textype, *instr; DWORD arg0, arg1, arg2; - BOOL tempreg_used = FALSE, tfactor_used = FALSE; + char colorcor_dst[8]; BOOL op_equal; - BOOL custom_linear_fog = FALSE; - struct color_fixup_masks masks; + GLuint ret; if (!string_buffer_init(&buffer)) { @@ -6407,7 +6402,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con { shader_addline(&buffer, "PARAM color_key_low = program.env[%u];\n", ARB_FFP_CONST_COLOR_KEY_LOW); shader_addline(&buffer, "PARAM color_key_high = program.env[%u];\n", ARB_FFP_CONST_COLOR_KEY_HIGH); - tex_read[0] = TRUE; + tex_read |= 1; } /* Find out which textures are read */ @@ -6415,56 +6410,58 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con { if (settings->op[stage].cop == WINED3D_TOP_DISABLE) break; + arg0 = settings->op[stage].carg0 & WINED3DTA_SELECTMASK; arg1 = settings->op[stage].carg1 & WINED3DTA_SELECTMASK; arg2 = settings->op[stage].carg2 & WINED3DTA_SELECTMASK; - if (arg0 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg1 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg2 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - - if (settings->op[stage].cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA) - tex_read[stage] = TRUE; - if (settings->op[stage].cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM) - tex_read[stage] = TRUE; - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP) - { - bump_used[stage] = TRUE; - tex_read[stage] = TRUE; - } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - { - bump_used[stage] = TRUE; - tex_read[stage] = TRUE; - luminance_used[stage] = TRUE; - } - else if (settings->op[stage].cop == WINED3D_TOP_BLEND_FACTOR_ALPHA) - { - tfactor_used = TRUE; - } - if (settings->op[stage].dst == tempreg) tempreg_used = TRUE; + if (arg0 == WINED3DTA_TEXTURE || arg1 == WINED3DTA_TEXTURE || arg2 == WINED3DTA_TEXTURE) + tex_read |= 1u << stage; + if (settings->op[stage].dst == tempreg) + tempreg_used = TRUE; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; if (arg0 == WINED3DTA_TFACTOR || arg1 == WINED3DTA_TFACTOR || arg2 == WINED3DTA_TFACTOR) tfactor_used = TRUE; if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) - constant_used[stage] = TRUE; + constant_used |= 1u << stage; + + switch (settings->op[stage].cop) + { + case WINED3D_TOP_BUMPENVMAP_LUMINANCE: + luminance_used |= 1u << stage; + /* fall through */ + case WINED3D_TOP_BUMPENVMAP: + bump_used |= 1u << stage; + /* fall through */ + case WINED3D_TOP_BLEND_TEXTURE_ALPHA: + case WINED3D_TOP_BLEND_TEXTURE_ALPHA_PM: + tex_read |= 1u << stage; + break; + + case WINED3D_TOP_BLEND_FACTOR_ALPHA: + tfactor_used = TRUE; + break; + + default: + break; + } if (settings->op[stage].aop == WINED3D_TOP_DISABLE) continue; + arg0 = settings->op[stage].aarg0 & WINED3DTA_SELECTMASK; arg1 = settings->op[stage].aarg1 & WINED3DTA_SELECTMASK; arg2 = settings->op[stage].aarg2 & WINED3DTA_SELECTMASK; - if (arg0 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg1 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; - if (arg2 == WINED3DTA_TEXTURE) tex_read[stage] = TRUE; + if (arg0 == WINED3DTA_TEXTURE || arg1 == WINED3DTA_TEXTURE || arg2 == WINED3DTA_TEXTURE) + tex_read |= 1u << stage; if (arg0 == WINED3DTA_TEMP || arg1 == WINED3DTA_TEMP || arg2 == WINED3DTA_TEMP) tempreg_used = TRUE; if (arg0 == WINED3DTA_TFACTOR || arg1 == WINED3DTA_TFACTOR || arg2 == WINED3DTA_TFACTOR) tfactor_used = TRUE; if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) - constant_used[stage] = TRUE; + constant_used |= 1u << stage; } lowest_disabled_stage = stage; @@ -6494,25 +6491,24 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "TEMP arg2;\n"); for (stage = 0; stage < MAX_TEXTURES; ++stage) { - if (constant_used[stage]) + if (constant_used & (1u << stage)) shader_addline(&buffer, "PARAM const%u = program.env[%u];\n", stage, ARB_FFP_CONST_CONSTANT(stage)); - if (!tex_read[stage]) + if (!(tex_read & (1u << stage))) continue; shader_addline(&buffer, "TEMP tex%u;\n", stage); - if (!bump_used[stage]) + if (!(bump_used & (1u << stage))) continue; shader_addline(&buffer, "PARAM bumpmat%u = program.env[%u];\n", stage, ARB_FFP_CONST_BUMPMAT(stage)); - if (!luminance_used[stage]) + if (!(luminance_used & (1u << stage))) continue; shader_addline(&buffer, "PARAM luminance%u = program.env[%u];\n", stage, ARB_FFP_CONST_LUMINANCE(stage)); } - if(tfactor_used) { + if (tfactor_used) shader_addline(&buffer, "PARAM tfactor = program.env[%u];\n", ARB_FFP_CONST_TFACTOR); - } shader_addline(&buffer, "PARAM specular_enable = program.env[%u];\n", ARB_FFP_CONST_SPECULAR_ENABLE); if (settings->sRGB_write) @@ -6534,7 +6530,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con /* Generate texture sampling instructions */ for (stage = 0; stage < MAX_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { - if (!tex_read[stage]) + if (!(tex_read & (1u << stage))) continue; textype = arbfp_texture_target(settings->op[stage].tex_type);

1 0

Józef Kucia : wined3d: Implement texture stage constants in ARB program shader backend.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: e62763972eded04e60370e00ba61d00e14404db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62763972eded04e60370e00b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 11:11:43 2016 +0200 wined3d: Implement texture stage constants in ARB program shader backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 131 ++++++++++++++++++++++++++------------ 1 file changed, 90 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e62763972eded04e60370…

1 0

Józef Kucia : d3d10core/tests: Add tests for sampling from 2d array textures.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: 79aff3067ad3d800f2b4052fe00ba407ff07a27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=79aff3067ad3d800f2b4052fe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 19 10:49:39 2016 +0200 d3d10core/tests: Add tests for sampling from 2d array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 261 ++++++++++++++++++++++++++++-------------- 1 file changed, 173 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79aff3067ad3d800f2b40…

1 0

Alexandre Julliard : user32: Load the default app icon with LR_SHARED to avoid a leak.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: c007b3cd4612e9c1b9e2990819415486f59a6acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c007b3cd4612e9c1b9e299081… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 19 16:38:34 2016 +0900 user32: Load the default app icon with LR_SHARED to avoid a leak. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 68320af..d3598b1 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -173,7 +173,7 @@ static HICON NC_IconForWindow( HWND hwnd ) */ if (!hIcon && !(GetWindowLongW( hwnd, GWL_EXSTYLE ) & WS_EX_DLGMODALFRAME)) hIcon = LoadImageW(0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR | LR_SHARED); return hIcon; }

1 0

Henri Verbeet : kernel32/nls: Persian uses a right-to-left writing system.
by Alexandre Julliard May 19, 2016

May 19, 2016

Module: wine Branch: master Commit: f2af3b9b57e45ff121656a339759bdc1b4193b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2af3b9b57e45ff121656a339… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 18 18:43:19 2016 +0200 kernel32/nls: Persian uses a right-to-left writing system. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/far.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/far.nls b/dlls/kernel32/nls/far.nls index fa71dc0..859239b 100644 --- a/dlls/kernel32/nls/far.nls +++ b/dlls/kernel32/nls/far.nls @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_FARSI, SUBLANG_DEFAULT LOCALE_IPOSSEPBYSPACE "1" LOCALE_IPOSSIGNPOSN "2" LOCALE_IPOSSYMPRECEDES "1" - LOCALE_IREADINGLAYOUT "0" + LOCALE_IREADINGLAYOUT "1" LOCALE_ITIME "0" LOCALE_ITIMEMARKPOSN "0" LOCALE_ITLZERO "1"

1 0