wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Mark Harmstone : winepulse: Add stub for GetPropValue.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 8c62cc5e66f3c648c42a5f794b4927c867877295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c62cc5e66f3c648c42a5f794… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:22:09 2015 -0600 winepulse: Add stub for GetPropValue. Edited by Maarten Lankhorst: No support for multiple devices in winepulse yet. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 7 +++++++ dlls/winepulse.drv/winepulse.drv.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index e5ba869..64e6c2a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -50,6 +50,7 @@ #include "initguid.h" #include "ks.h" #include "ksmedia.h" +#include "propkey.h" #include "mmdeviceapi.h" #include "audioclient.h" #include "endpointvolume.h" @@ -3198,3 +3199,9 @@ HRESULT WINAPI AUDDRV_GetAudioSessionManager(IMMDevice *device, *out = &This->IAudioSessionManager2_iface; return S_OK; } + +HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARIANT *out) +{ + TRACE("%s, (%s,%u), %p\n", wine_dbgstr_guid(guid), wine_dbgstr_guid(&prop->fmtid), prop->pid, out); + return E_NOTIMPL; +} diff --git a/dlls/winepulse.drv/winepulse.drv.spec b/dlls/winepulse.drv/winepulse.drv.spec index 288de87..7aeb175 100644 --- a/dlls/winepulse.drv/winepulse.drv.spec +++ b/dlls/winepulse.drv/winepulse.drv.spec @@ -3,6 +3,7 @@ @ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs @ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint @ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager +@ stdcall -private GetPropValue(ptr ptr ptr) AUDDRV_GetPropValue # WinMM driver functions @ stdcall -private DriverProc(long long long long long) winealsa.drv.DriverProc

1 0

Andrew Eikum : winepulse: In Shared mode, track device position in bytes.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 15323580f8e10d9883864ef7a87744f1ff8cccd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15323580f8e10d9883864ef7a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:21:53 2015 -0600 winepulse: In Shared mode, track device position in bytes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 0e2bc08..e5ba869 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -2207,8 +2207,12 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) pthread_mutex_lock(&pulse_lock); hr = pulse_stream_valid(This); - if (SUCCEEDED(hr)) - *freq = This->ss.rate * pa_frame_size(&This->ss); + if (SUCCEEDED(hr)) { + if (This->share == AUDCLNT_SHAREMODE_SHARED) + *freq = This->ss.rate * pa_frame_size(&This->ss); + else + *freq = This->ss.rate; + } pthread_mutex_unlock(&pulse_lock); return hr; } @@ -2233,6 +2237,9 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, *pos = This->clock_written; + if (This->share == AUDCLNT_SHAREMODE_EXCLUSIVE) + *pos /= pa_frame_size(&This->ss); + /* Make time never go backwards */ if (*pos < This->clock_lastpos) *pos = This->clock_lastpos; @@ -2301,7 +2308,7 @@ static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, { ACImpl *This = impl_from_IAudioClock2(iface); HRESULT hr = AudioClock_GetPosition(&This->IAudioClock_iface, pos, qpctime); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && This->share == AUDCLNT_SHAREMODE_SHARED) *pos /= pa_frame_size(&This->ss); return hr; }

1 0

Andrew Eikum : winepulse: Always mute buffer.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 8ed553c3c7f4ba860abaf9ff3f1749a06444bdc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed553c3c7f4ba860abaf9ff3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Nov 3 16:21:48 2015 -0600 winepulse: Always mute buffer. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 3895f4c..0e2bc08 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -572,6 +572,11 @@ static HRESULT pulse_stream_valid(ACImpl *This) { return S_OK; } +static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes) +{ + memset(buffer, format == PA_SAMPLE_U8 ? 0x80 : 0, bytes); +} + static void dump_attr(const pa_buffer_attr *attr) { TRACE("maxlength: %u\n", attr->maxlength); TRACE("minreq: %u\n", attr->minreq); @@ -1315,7 +1320,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, else { ACPacket *cur_packet = (ACPacket*)((char*)This->tmp_buffer + This->bufsize_bytes); BYTE *data = This->tmp_buffer; - memset(This->tmp_buffer, This->ss.format == PA_SAMPLE_U8 ? 0x80 : 0, This->bufsize_bytes); + silence_buffer(This->ss.format, This->tmp_buffer, This->bufsize_bytes); list_init(&This->packet_free_head); list_init(&This->packet_filled_head); for (i = 0; i < capture_packets; ++i, ++cur_packet) { @@ -1985,18 +1990,17 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( return AUDCLNT_E_INVALID_SIZE; } - if (flags & AUDCLNT_BUFFERFLAGS_SILENT) { - if (This->ss.format == PA_SAMPLE_U8) - memset(This->tmp_buffer, 128, written_bytes); - else - memset(This->tmp_buffer, 0, written_bytes); - } - This->locked = 0; - if (This->locked_ptr) + if (This->locked_ptr) { + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This->ss.format, This->locked_ptr, written_bytes); pa_stream_write(This->stream, This->locked_ptr, written_bytes, NULL, 0, PA_SEEK_RELATIVE); - else + } else { + if (flags & AUDCLNT_BUFFERFLAGS_SILENT) + silence_buffer(This->ss.format, This->tmp_buffer, written_bytes); pa_stream_write(This->stream, This->tmp_buffer, written_bytes, pulse_free_noop, 0, PA_SEEK_RELATIVE); + } + This->pad += written_bytes; This->locked_ptr = NULL; TRACE("Released %u, pad %zu\n", written_frames, This->pad / pa_frame_size(&This->ss));

1 0

Mark Harmstone : winepulse: Handle stream create failing correctly.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 0d7cee0dd6f1008baca9fe03f9959886a00ea7d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7cee0dd6f1008baca9fe03f… Author: Mark Harmstone <mark(a)harmstone.com> Date: Tue Nov 3 16:21:41 2015 -0600 winepulse: Handle stream create failing correctly. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 6b69488..3895f4c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -753,6 +753,12 @@ static HRESULT pulse_stream_connect(ACImpl *This, UINT32 period_bytes) { ret = InterlockedIncrement(&number); sprintf(buffer, "audio stream #%i", ret); This->stream = pa_stream_new(pulse_ctx, buffer, &This->ss, &This->map); + + if (!This->stream) { + WARN("pa_stream_new returned error %i\n", pa_context_errno(pulse_ctx)); + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } + pa_stream_set_state_callback(This->stream, pulse_stream_state, This); pa_stream_set_buffer_attr_callback(This->stream, pulse_attr_update, This); pa_stream_set_moved_callback(This->stream, pulse_attr_update, This);

1 0

Henri Verbeet : wined3d: Call wglGetPixelFormat() through the gl_ops table.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: b53256b8b752855576252cc2290dfbc9cb0f1280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53256b8b752855576252cc22… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:49 2015 +0100 wined3d: Call wglGetPixelFormat() through the gl_ops table. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 13b8471..1692d0d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -820,7 +820,7 @@ static BOOL context_set_pixel_format(struct wined3d_context *context, HDC dc, BO if (dc == context->hdc && context->hdc_is_private && context->hdc_has_format) return TRUE; - current = GetPixelFormat(dc); + current = gl_info->gl_ops.wgl.p_wglGetPixelFormat(dc); if (current == format) goto success; if (!current) @@ -1219,7 +1219,7 @@ static void context_enter(struct wined3d_context *context) context->needs_set = 1; } else if (!context->needs_set && !(context->hdc_is_private && context->hdc_has_format) - && context->pixel_format != GetPixelFormat(context->hdc)) + && context->pixel_format != context->gl_info->gl_ops.wgl.p_wglGetPixelFormat(context->hdc)) context->needs_set = 1; } } @@ -1588,10 +1588,10 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; } - context_enter(ret); - ret->gl_info = gl_info; + context_enter(ret); + if (!context_set_pixel_format(ret, hdc, hdc_is_private, pixel_format)) { ERR("Failed to set pixel format %d on device context %p.\n", pixel_format, hdc);

1 0

Henri Verbeet : wined3d: Always use the same formats in context_create() when "always_offscreen" is enabled.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: c92451f295242110bf016facf0e80564f3643d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c92451f295242110bf016facf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:48 2015 +0100 wined3d: Always use the same formats in context_create() when "always_offscreen" is enabled. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e97206e..13b8471 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1557,6 +1557,20 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, if (color_format->id == WINED3DFMT_P8_UINT) color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); + /* When "always_offscreen" is enabled, we only use the drawable for + * presentation blits, and don't do any rendering to it. That means we + * don't need depth or stencil buffers, and can mostly ignore the render + * target format. This wouldn't necessarily be quite correct for 10bpc + * display modes, but we don't currently support those. + * Using the same format regardless of the color/depth/stencil targets + * makes it much less likely that different wined3d instances will set + * conflicting pixel formats. */ + if (wined3d_settings.always_offscreen) + { + color_format = wined3d_get_format(gl_info, WINED3DFMT_B8G8R8A8_UNORM); + ds_format = wined3d_get_format(gl_info, WINED3DFMT_UNKNOWN); + } + /* Try to find a pixel format which matches our requirements. */ pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE);

1 0

Henri Verbeet : wined3d: Disallow stencil size mismatches in wined3d_check_pixel_format_depth() if the format has stencil bits.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 27e65fb963b177a1c1ca0a3cbb0de147f318969a URL: http://source.winehq.org/git/wine.git/?a=commit;h=27e65fb963b177a1c1ca0a3cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:47 2015 +0100 wined3d: Disallow stencil size mismatches in wined3d_check_pixel_format_depth() if the format has stencil bits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e2203ea..a7329e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4309,9 +4309,10 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in return FALSE; /* Some cards like Intel i915 ones only offer D24S8 but lots of games also - * need a format without stencil, so allow more stencil bits than - * requested. */ - if (cfg->stencilSize < format->stencil_size) + * need a format without stencil. We can allow a mismatch if the format + * doesn't have any stencil bits. If it does have stencil bits the size + * must match, or stencil wrapping would break. */ + if (format->stencil_size && cfg->stencilSize != format->stencil_size) return FALSE; return TRUE;

1 0

Henri Verbeet : wined3d: Get rid of getDepthStencilBits().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 99033b14534ffe8ff6c88c8d38a70d398c933b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=99033b14534ffe8ff6c88c8d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:46 2015 +0100 wined3d: Get rid of getDepthStencilBits(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 31 ++++++++++++------------------- dlls/wined3d/directx.c | 24 ++++++++++-------------- dlls/wined3d/utils.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 22 insertions(+), 66 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 543eaf3..e97206e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1244,7 +1244,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - BYTE depthBits=0, stencilBits=0; unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; unsigned int i; @@ -1253,8 +1252,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), auxBuffers, findCompatible); - getDepthStencilBits(ds_format, &depthBits, &stencilBits); - current_value = 0; for (i = 0; i < cfg_count; ++i) { @@ -1276,9 +1273,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC continue; if (cfg->alphaSize < color_format->alpha_size) continue; - if (cfg->depthSize < depthBits) + if (cfg->depthSize < ds_format->depth_size) continue; - if (stencilBits && cfg->stencilSize != stencilBits) + if (ds_format->stencil_size && cfg->stencilSize != ds_format->stencil_size) continue; /* Check multisampling support. */ if (cfg->numSamples) @@ -1287,9 +1284,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC value = 1; /* We try to locate a format which matches our requirements exactly. In case of * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */ - if (cfg->depthSize == depthBits) + if (cfg->depthSize == ds_format->depth_size) value += 1; - if (cfg->stencilSize == stencilBits) + if (cfg->stencilSize == ds_format->stencil_size) value += 2; if (cfg->alphaSize == color_format->alpha_size) value += 4; @@ -1325,8 +1322,8 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.cAlphaBits = color_format->alpha_size; pfd.cColorBits = color_format->red_size + color_format->green_size + color_format->blue_size + color_format->alpha_size; - pfd.cDepthBits = depthBits; - pfd.cStencilBits = stencilBits; + pfd.cDepthBits = ds_format->depth_size; + pfd.cStencilBits = ds_format->stencil_size; pfd.iLayerType = PFD_MAIN_PLANE; iPixelFormat = ChoosePixelFormat(hdc, &pfd); @@ -2245,21 +2242,17 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o static BOOL match_depth_stencil_format(const struct wined3d_format *existing, const struct wined3d_format *required) { - BYTE existing_depth, existing_stencil, required_depth, required_stencil; - if (existing == required) return TRUE; if ((existing->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) != (required->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT)) return FALSE; - - getDepthStencilBits(existing, &existing_depth, &existing_stencil); - getDepthStencilBits(required, &required_depth, &required_stencil); - - if(existing_depth < required_depth) return FALSE; - /* If stencil bits are used the exact amount is required - otherwise wrapping - * won't work correctly */ - if(required_stencil && required_stencil != existing_stencil) return FALSE; + if (existing->depth_size < required->depth_size) + return FALSE; + /* If stencil bits are used the exact amount is required - otherwise + * wrapping won't work correctly. */ + if (required->stencil_size && required->stencil_size != existing->stencil_size) + return FALSE; return TRUE; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e30e785..e2203ea 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4291,15 +4291,8 @@ static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_in static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - BYTE depthSize, stencilSize; BOOL lockable = FALSE; - if (!getDepthStencilBits(format, &depthSize, &stencilSize)) - { - ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) return FALSE; @@ -4307,15 +4300,18 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in if ((format->id == WINED3DFMT_D16_LOCKABLE) || (format->id == WINED3DFMT_D32_FLOAT)) lockable = TRUE; - /* On some modern cards like the Geforce8/9 GLX doesn't offer some dephthstencil formats which D3D9 reports. - * We can safely report 'compatible' formats (e.g. D24 can be used for D16) as long as we aren't dealing with - * a lockable format. This also helps D3D <= 7 as they expect D16 which isn't offered without this on Geforce8 cards. */ - if(!(cfg->depthSize == depthSize || (!lockable && cfg->depthSize > depthSize))) + /* On some modern cards like the Geforce8/9, GLX doesn't offer some + * dephth/stencil formats which D3D9 reports. We can safely report + * "compatible" formats (e.g. D24 can be used for D16) as long as we + * aren't dealing with a lockable format. This also helps D3D <= 7 as they + * expect D16 which isn't offered without this on Geforce8 cards. */ + if (!(cfg->depthSize == format->depth_size || (!lockable && cfg->depthSize > format->depth_size))) return FALSE; - /* Some cards like Intel i915 ones only offer D24S8 but lots of games also need a format without stencil, so - * allow more stencil bits than requested. */ - if(cfg->stencilSize < stencilSize) + /* Some cards like Intel i915 ones only offer D24S8 but lots of games also + * need a format without stencil, so allow more stencil bits than + * requested. */ + if (cfg->stencilSize < format->stencil_size) return FALSE; return TRUE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 40ba09c..4ddfead 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4016,37 +4016,6 @@ unsigned int count_bits(unsigned int mask) return count; } -/* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ -BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) -{ - TRACE("format %s.\n", debug_d3dformat(format->id)); - - switch (format->id) - { - case WINED3DFMT_D16_LOCKABLE: - case WINED3DFMT_D16_UNORM: - case WINED3DFMT_S1_UINT_D15_UNORM: - case WINED3DFMT_X8D24_UNORM: - case WINED3DFMT_S4X4_UINT_D24_UNORM: - case WINED3DFMT_D24_UNORM_S8_UINT: - case WINED3DFMT_S8_UINT_D24_FLOAT: - case WINED3DFMT_D32_UNORM: - case WINED3DFMT_D32_FLOAT: - case WINED3DFMT_INTZ: - break; - default: - FIXME("Unsupported depth/stencil format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - *depthSize = format->depth_size; - *stencilSize = format->stencil_size; - - TRACE("Returning depthSize: %d and stencilSize: %d for format %s.\n", - *depthSize, *stencilSize, debug_d3dformat(format->id)); - return TRUE; -} - /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fb261a..ac0b09a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,8 +2903,6 @@ void state_pointsprite_w(struct wined3d_context *context, void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -BOOL getDepthStencilBits(const struct wined3d_format *format, - BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; /* Math utils */

1 0

Henri Verbeet : wined3d: Get rid of getColorBits().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: e0ab314b62cfe4c06f21e7f468b0351604eb73df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ab314b62cfe4c06f21e7f46… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:45 2015 +0100 wined3d: Get rid of getColorBits(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 ++++++++++---------------- dlls/wined3d/directx.c | 47 ++++++++++++++---------------------------- dlls/wined3d/utils.c | 40 ----------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 26 insertions(+), 92 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 978f7d7..543eaf3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1244,7 +1244,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC BOOL auxBuffers, BOOL findCompatible) { int iPixelFormat=0; - BYTE redBits, greenBits, blueBits, alphaBits, colorBits; BYTE depthBits=0, stencilBits=0; unsigned int current_value; unsigned int cfg_count = device->adapter->cfg_count; @@ -1254,13 +1253,6 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id), auxBuffers, findCompatible); - if (!getColorBits(color_format, &redBits, &greenBits, &blueBits, &alphaBits, &colorBits)) - { - ERR("Unable to get color bits for format %s (%#x)!\n", - debug_d3dformat(color_format->id), color_format->id); - return 0; - } - getDepthStencilBits(ds_format, &depthBits, &stencilBits); current_value = 0; @@ -1276,13 +1268,13 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC /* In window mode we need a window drawable format and double buffering. */ if (!(cfg->windowDrawable && cfg->doubleBuffer)) continue; - if (cfg->redSize < redBits) + if (cfg->redSize < color_format->red_size) continue; - if (cfg->greenSize < greenBits) + if (cfg->greenSize < color_format->green_size) continue; - if (cfg->blueSize < blueBits) + if (cfg->blueSize < color_format->blue_size) continue; - if (cfg->alphaSize < alphaBits) + if (cfg->alphaSize < color_format->alpha_size) continue; if (cfg->depthSize < depthBits) continue; @@ -1299,14 +1291,14 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC value += 1; if (cfg->stencilSize == stencilBits) value += 2; - if (cfg->alphaSize == alphaBits) + if (cfg->alphaSize == color_format->alpha_size) value += 4; /* We like to have aux buffers in backbuffer mode */ if (auxBuffers && cfg->auxBuffers) value += 8; - if (cfg->redSize == redBits - && cfg->greenSize == greenBits - && cfg->blueSize == blueBits) + if (cfg->redSize == color_format->red_size + && cfg->greenSize == color_format->green_size + && cfg->blueSize == color_format->blue_size) value += 16; if (value > current_value) @@ -1330,8 +1322,9 @@ static int context_choose_pixel_format(const struct wined3d_device *device, HDC pfd.nVersion = 1; pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/ pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cAlphaBits = alphaBits; - pfd.cColorBits = colorBits; + pfd.cAlphaBits = color_format->alpha_size; + pfd.cColorBits = color_format->red_size + color_format->green_size + + color_format->blue_size + color_format->alpha_size; pfd.cDepthBits = depthBits; pfd.cStencilBits = stencilBits; pfd.iLayerType = PFD_MAIN_PLANE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a443636..e30e785 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4271,36 +4271,21 @@ HRESULT CDECL wined3d_get_adapter_raster_status(const struct wined3d *wined3d, U static BOOL wined3d_check_pixel_format_color(const struct wined3d_gl_info *gl_info, const struct wined3d_pixel_format *cfg, const struct wined3d_format *format) { - BYTE redSize, greenSize, blueSize, alphaSize, colorBits; - /* Float formats need FBOs. If FBOs are used this function isn't called */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FLOAT) return FALSE; - if(cfg->iPixelType == WGL_TYPE_RGBA_ARB) { /* Integer RGBA formats */ - if (!getColorBits(format, &redSize, &greenSize, &blueSize, &alphaSize, &colorBits)) - { - ERR("Unable to check compatibility for format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - if(cfg->redSize < redSize) - return FALSE; - - if(cfg->greenSize < greenSize) - return FALSE; - - if(cfg->blueSize < blueSize) - return FALSE; - - if(cfg->alphaSize < alphaSize) - return FALSE; + /* Probably a RGBA_float or color index mode. */ + if (cfg->iPixelType != WGL_TYPE_RGBA_ARB) + return FALSE; - return TRUE; - } + if (cfg->redSize < format->red_size + || cfg->greenSize < format->green_size + || cfg->blueSize < format->blue_size + || cfg->alphaSize < format->alpha_size) + return FALSE; - /* Probably a RGBA_float or color index mode */ - return FALSE; + return TRUE; } static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_info, @@ -4479,17 +4464,15 @@ static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter, return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) { - BYTE AdapterRed, AdapterGreen, AdapterBlue, AdapterAlpha, AdapterTotalSize; - BYTE CheckRed, CheckGreen, CheckBlue, CheckAlpha, CheckTotalSize; const struct wined3d_pixel_format *cfgs = adapter->cfgs; unsigned int i; - getColorBits(adapter_format, &AdapterRed, &AdapterGreen, &AdapterBlue, &AdapterAlpha, &AdapterTotalSize); - getColorBits(check_format, &CheckRed, &CheckGreen, &CheckBlue, &CheckAlpha, &CheckTotalSize); - - /* In backbuffer mode the front and backbuffer share the same WGL pixelformat. - * The format must match in RGB, alpha is allowed to be different. (Only the backbuffer can have alpha) */ - if (!((AdapterRed == CheckRed) && (AdapterGreen == CheckGreen) && (AdapterBlue == CheckBlue))) + /* In backbuffer mode the front and backbuffer share the same WGL + * pixelformat. The format must match in RGB, alpha is allowed to be + * different. (Only the backbuffer can have alpha.) */ + if (adapter_format->red_size != check_format->red_size + || adapter_format->green_size != check_format->green_size + || adapter_format->blue_size != check_format->blue_size) { TRACE("[FAILED]\n"); return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e7f9cbd..40ba09c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4016,46 +4016,6 @@ unsigned int count_bits(unsigned int mask) return count; } -/* Helper function for retrieving color info for ChoosePixelFormat and wglChoosePixelFormatARB. - * The later function requires individual color components. */ -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) -{ - TRACE("format %s.\n", debug_d3dformat(format->id)); - - switch (format->id) - { - case WINED3DFMT_B10G10R10A2_UNORM: - case WINED3DFMT_R10G10B10A2_UNORM: - case WINED3DFMT_B8G8R8X8_UNORM: - case WINED3DFMT_B8G8R8_UNORM: - case WINED3DFMT_B8G8R8A8_UNORM: - case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_B5G5R5X1_UNORM: - case WINED3DFMT_B5G5R5A1_UNORM: - case WINED3DFMT_B5G6R5_UNORM: - case WINED3DFMT_B4G4R4X4_UNORM: - case WINED3DFMT_B4G4R4A4_UNORM: - case WINED3DFMT_B2G3R3_UNORM: - case WINED3DFMT_P8_UINT_A8_UNORM: - case WINED3DFMT_P8_UINT: - break; - default: - FIXME("Unsupported format %s.\n", debug_d3dformat(format->id)); - return FALSE; - } - - *redSize = format->red_size; - *greenSize = format->green_size; - *blueSize = format->blue_size; - *alphaSize = format->alpha_size; - *totalSize = *redSize + *greenSize + *blueSize + *alphaSize; - - TRACE("Returning red: %d, green: %d, blue: %d, alpha: %d, total: %d for format %s.\n", - *redSize, *greenSize, *blueSize, *alphaSize, *totalSize, debug_d3dformat(format->id)); - return TRUE; -} - /* Helper function for retrieving depth/stencil info for ChoosePixelFormat and wglChoosePixelFormatARB */ BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99b025c..0fb261a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2903,8 +2903,6 @@ void state_pointsprite_w(struct wined3d_context *context, void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -BOOL getColorBits(const struct wined3d_format *format, - BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN; BOOL getDepthStencilBits(const struct wined3d_format *format, BYTE *depthSize, BYTE *stencilSize) DECLSPEC_HIDDEN; GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB().
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 4896fd6e28cd37b7e82e088b69328d03f6b56b64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896fd6e28cd37b7e82e088b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 4 00:02:44 2015 +0100 wined3d: Map glDrawArraysInstanced() to glDrawArraysInstancedARB(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 046c6eb..a443636 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3054,6 +3054,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); + MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB);

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
63
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 2015