May 2019 - Wine-devel - list.winehq.org

[PATCH] user32: Make WIN_SetOwner() static.
by Francois Gouget 09 May '19

09 May '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/user32/win.c | 2 +- dlls/user32/win.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 0bb9fd9cba7..a29e3a1d9bb 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -742,7 +742,7 @@ HWND WIN_GetFullHandle( HWND hwnd ) * * Change the owner of a window. */ -HWND WIN_SetOwner( HWND hwnd, HWND owner ) +static HWND WIN_SetOwner( HWND hwnd, HWND owner ) { WND *win = WIN_GetPtr( hwnd ); HWND ret = 0; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc95ea..1f51fd63314 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -91,7 +91,6 @@ extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentThread( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT win_set_flags( HWND hwnd, UINT set_mask, UINT clear_mask ) DECLSPEC_HIDDEN; -extern HWND WIN_SetOwner( HWND hwnd, HWND owner ) DECLSPEC_HIDDEN; extern ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits ) DECLSPEC_HIDDEN; extern BOOL WIN_GetRectangles( HWND hwnd, enum coords_relative relative, RECT *rectWindow, RECT *rectClient ) DECLSPEC_HIDDEN; extern void map_window_region( HWND from, HWND to, HRGN hrgn ) DECLSPEC_HIDDEN; -- 2.20.1

2 1

[PATCH] winealsa.drv: Adjust the buffer volume before sending it to ALSA
by Gabriel Ivăncescu 09 May '19

09 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38182 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- It's a bit uglier than Pulse's code. First, the session channels allocation can actually fail without any error in the rest of the code, so the session->channel_count can be <= the fmt->nChannels, and thus we have to handle this case. Also, we have to keep track of the amount of samples we adjusted since ALSA can return -EAGAIN. I've artifically tested this by simulating every 10th buffer write call as if it was full (returning 0), and it worked fine. (it had some random rare glitches, but those were present even without this patch but with this simulation) dlls/winealsa.drv/mmdevdrv.c | 136 +++++++++++++++++++++++++++++++++-- 1 file changed, 129 insertions(+), 7 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2bf4d73..8b96acd 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -126,6 +126,7 @@ struct ACImpl { UINT32 lcl_offs_frames; /* offs into local_buffer where valid data starts */ UINT32 wri_offs_frames; /* where to write fresh data in local_buffer */ UINT32 hidden_frames; /* ALSA reserve to ensure continuous rendering */ + UINT32 vol_adjusted_frames; /* Frames we've already adjusted the volume of but didn't write yet */ UINT32 data_in_alsa_frames; HANDLE timer; @@ -1970,18 +1971,134 @@ static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) return This->remapping_buf; } +static void adjust_buffer_volume(const ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) +{ + float vol[ARRAY_SIZE(This->alsa_channel_map)]; + BOOL adjust = FALSE; + UINT32 i, channels; + BYTE *end; + + if (This->vol_adjusted_frames >= frames) + return; + channels = This->fmt->nChannels; + + if (mute) + { + int err = snd_pcm_format_set_silence(This->alsa_format, buf, frames * channels); + if (err < 0) + WARN("Setting buffer to silence failed: %d (%s)\n", err, snd_strerror(err)); + return; + } + + /* Adjust the buffer based on the volume for each channel */ + for (i = 0; i < channels; i++) + vol[i] = This->vols[i] * This->session->master_vol; + for (i = 0; i < This->session->channel_count; i++) + { + vol[i] *= This->session->channel_vols[i]; + adjust |= vol[i] != 1.0f; + } + while (i < channels) adjust |= vol[i++] != 1.0f; + if (!adjust) return; + + end = buf + frames * This->fmt->nBlockAlign; + buf += This->vol_adjusted_frames * This->fmt->nBlockAlign; + + switch (This->alsa_format) + { +#ifndef WORDS_BIGENDIAN +#define PROCESS_BUFFER(type) do \ +{ \ + type *p = (type*)buf; \ + do \ + { \ + for (i = 0; i < channels; i++) \ + p[i] = p[i] * vol[i]; \ + p += i; \ + } while ((BYTE*)p != end); \ +} while (0); + case SND_PCM_FORMAT_S16_LE: + PROCESS_BUFFER(INT16); + break; + case SND_PCM_FORMAT_S32_LE: + PROCESS_BUFFER(INT32); + break; + case SND_PCM_FORMAT_FLOAT_LE: + PROCESS_BUFFER(float); + break; + case SND_PCM_FORMAT_FLOAT64_LE: + PROCESS_BUFFER(double); + break; +#undef PROCESS_BUFFER + case SND_PCM_FORMAT_S20_3LE: + case SND_PCM_FORMAT_S24_3LE: + { + /* Do it 12 bytes at a time until it is no longer possible */ + UINT32 *q = (UINT32*)buf, mask = ~0xff; + BYTE *p; + + /* After we adjust the volume, we need to mask out low bits */ + if (This->alsa_format == SND_PCM_FORMAT_S20_3LE) + mask = ~0x0fff; + + i = 0; + while (end - (BYTE*)q >= 12) + { + UINT32 v[4], k; + v[0] = q[0] << 8; + v[1] = q[1] << 16 | (q[0] >> 16 & ~0xff); + v[2] = q[2] << 24 | (q[1] >> 8 & ~0xff); + v[3] = q[2] & ~0xff; + for (k = 0; k < 4; k++) + { + v[k] = (INT32)((INT32)v[k] * vol[i]); + v[k] &= mask; + if (++i == channels) i = 0; + } + *q++ = v[0] >> 8 | v[1] << 16; + *q++ = v[1] >> 16 | v[2] << 8; + *q++ = v[2] >> 24 | v[3]; + } + p = (BYTE*)q; + while (p != end) + { + UINT32 v = (INT32)((INT32)(p[0] << 8 | p[1] << 16 | p[2] << 24) * vol[i]); + v &= mask; + *p++ = v >> 8 & 0xff; + *p++ = v >> 16 & 0xff; + *p++ = v >> 24; + if (++i == channels) i = 0; + } + break; + } +#endif + case SND_PCM_FORMAT_U8: + { + UINT8 *p = (UINT8*)buf; + do + { + for (i = 0; i < channels; i++) + p[i] = (int)((p[i] - 128) * vol[i]) + 128; + p += i; + } while ((BYTE*)p != end); + break; + } + default: + TRACE("Unhandled format %i, not adjusting volume.\n", This->alsa_format); + break; + } +} + static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames, BOOL mute) { snd_pcm_sframes_t written; - if(mute){ - int err; - if((err = snd_pcm_format_set_silence(This->alsa_format, buf, - frames * This->fmt->nChannels)) < 0) - WARN("Setting buffer to silence failed: %d (%s)\n", err, - snd_strerror(err)); - } + adjust_buffer_volume(This, buf, frames, mute); + + /* Mark the frames we've already adjusted */ + if (This->vol_adjusted_frames < frames) + This->vol_adjusted_frames = frames; buf = remap_channels(This, buf, frames); @@ -2005,6 +2122,8 @@ static snd_pcm_sframes_t alsa_write_best_effort(ACImpl *This, BYTE *buf, written = snd_pcm_writei(This->pcm_handle, buf, frames); } + if (written > 0) + This->vol_adjusted_frames -= written; return written; } @@ -2102,7 +2221,10 @@ static void alsa_write_data(ACImpl *This) /* Add a lead-in when starting with too few frames to ensure * continuous rendering. Additional benefit: Force ALSA to start. */ if(This->data_in_alsa_frames == 0 && This->held_frames < This->alsa_period_frames) + { alsa_write_best_effort(This, This->silence_buf, This->alsa_period_frames - This->held_frames, FALSE); + This->vol_adjusted_frames = 0; + } if(This->started) max_copy_frames = data_not_in_alsa(This); -- 2.21.0

1 0

[PATCH] winnt: added enums
by Roman Stingler 09 May '19

09 May '19

From: romanstingler <roman.stingler(a)gmail.com> Signed-off-by: Roman Stingler <roman.stingler(a)gmail.com> --- include/processthreadapi.h | 12 ++++++++++++ include/winnt.h | 7 +++++++ 2 files changed, 19 insertions(+) diff --git a/include/processthreadapi.h b/include/processthreadapi.h index 7788b3be20..effbca4377 100644 --- a/include/processthreadapi.h +++ b/include/processthreadapi.h @@ -30,6 +30,18 @@ typedef enum _CPU_SET_INFORMATION_TYPE { WINAPI BOOL WINAPI SetThreadSelectedCpuSets(HANDLE,const ULONG *,ULONG); +typedef enum _PROCESS_MEMORY_EXHAUSTION_TYPE { + PMETypeFailFastOnCommitFailure, + PMETypeMax +} PROCESS_MEMORY_EXHAUSTION_TYPE, *PPROCESS_MEMORY_EXHAUSTION_TYPE; + +typedef struct _PROCESS_MEMORY_EXHAUSTION_INFO { + USHORT Version; + USHORT Reserved; + PROCESS_MEMORY_EXHAUSTION_TYPE Type; + ULONG_PTR Value; +} PROCESS_MEMORY_EXHAUSTION_INFO, *PPROCESS_MEMORY_EXHAUSTION_INFO; + #ifdef __cplusplus } #endif diff --git a/include/winnt.h b/include/winnt.h index 8c9c844662..ef05b40777 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6580,6 +6580,13 @@ typedef enum _PROCESS_MITIGATION_POLICY MaxProcessMitigationPolicy } PROCESS_MITIGATION_POLICY, *PPROCESS_MITIGATION_POLICY; +typedef enum JOB_OBJECT_NET_RATE_CONTROL_FLAGS { + JOB_OBJECT_NET_RATE_CONTROL_ENABLE, + JOB_OBJECT_NET_RATE_CONTROL_MAX_BANDWIDTH, + JOB_OBJECT_NET_RATE_CONTROL_DSCP_TAG, + JOB_OBJECT_NET_RATE_CONTROL_VALID_FLAGS +} ; + #ifdef __cplusplus } #endif -- 2.21.0

2 1

mferror: Clarification of some terms for translators
by Julian Rüger 09 May '19

09 May '19

Hi Nikolay, in order to translate some of the (more or less ;) recently added mferror strings, I'd like to ask you for a bit of context. #: mferror.mc:193 msgid "Unsupported rate.\n" Is this framerate, bitrate or rate of playback, i.e. 1.5x normal speed? #: mferror.mc:207 msgid "Reversing is not supported.\n" Going back to a previous point in the video/stream to resume normal playback from there, playing back in reverse or maybe even manipulating/editing the data, so the last frame will be the first and vice-versa? #: mferror.mc:221 msgid "Rate change was preempted.\n" Rate change was disabled? Rate was already changed by some other process/thread before (the change requested by user?) could be processed? #: mferror.mc:242 msgid "Clock is not available.\n" ? Time (speed/tick rate) provider? Like a metronome? #: mferror.mc:284 msgid "Unsupported state transition.\n" Playback state as in "paused", "playing", etc.? #: mferror.mc:319 msgid "Bad startup version.\n" I could just translate this literally, but that feels like saying nothing really. #: mferror.mc:326 msgid "Unsupported caption.\n" Caption as in subtitle? #: mferror.mc:347 msgid "Property type is not allowed.\n" I guess this is not a property as in a setting the user can change? More like an attribute? There may be more later, but that's all for now. Sorry for bothering you ;) Best, Julian

2 2

[PATCH 1/3] strmbase: Move some internal definitions to strmbase_private.h.
by Zebediah Figura 09 May '19

09 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/audio.c | 9 +-------- dlls/strmbase/dispatch.c | 8 +------- dlls/strmbase/dllfunc.c | 19 +------------------ dlls/strmbase/enumpins.c | 6 +----- dlls/strmbase/filter.c | 8 +------- dlls/strmbase/outputqueue.c | 10 +--------- dlls/strmbase/pin.c | 9 +-------- dlls/strmbase/pospass.c | 10 +--------- dlls/strmbase/qualitycontrol.c | 9 --------- dlls/strmbase/renderer.c | 7 ------- dlls/strmbase/seeking.c | 10 +--------- dlls/strmbase/strmbase_private.h | 32 ++++++++++++++++++++++++++++++++ dlls/strmbase/transform.c | 15 --------------- dlls/strmbase/video.c | 9 +-------- dlls/strmbase/window.c | 9 +-------- include/wine/strmbase.h | 13 ------------- 16 files changed, 43 insertions(+), 140 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index 260e5edffc..6ad64610f0 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <assert.h> -#include "dshow.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "wine/strmbase.h" - +#include "strmbase_private.h" static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) { diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 697618527a..e91b65a94a 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h" HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index da4f450412..842bee6121 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -19,24 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> -#include <assert.h> - -#define COBJMACROS -#define NONAMELESSSTRUCT -#define NONAMELESSUNION - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winerror.h" -#include "winreg.h" -#include "objbase.h" -#include "uuids.h" -#include "strmif.h" - -#include "wine/debug.h" -#include "wine/strmbase.h" +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index abfaf6917d..65a11bd34e 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -19,11 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" -#include "wine/debug.h" +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index f133f1ca78..50340cd9b5 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -18,13 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index ba61c1f7b5..e3515c0e31 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -18,15 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/list.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 3075207614..8ae909850a 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -19,14 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 45eb23482d..f8321324a8 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -20,15 +20,7 @@ */ /* FIXME: critical sections */ -#define COBJMACROS - -#include "dshow.h" -#include "uuids.h" - -#include "wine/debug.h" -#include "wine/strmbase.h" - -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index 456ef83c5e..d6a91a7133 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -23,17 +23,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" #include "strmbase_private.h" -#include "uuids.h" -#include "wine/debug.h" - -#include <assert.h> - WINE_DEFAULT_DEBUG_CHANNEL(strmbase_qc); #define XTIME_FMT "%u.%03u" diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 0649d34464..43d7c70d45 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -18,13 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" #include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index c31699c209..8a773b51d5 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -20,15 +20,7 @@ */ /* FIXME: critical sections */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/strmbase.h" - -#include "uuids.h" -#include "wine/debug.h" - -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 4e5a25a937..f3367f88c5 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_STRMBASE_PRIVATE_H +#define __WINE_STRMBASE_PRIVATE_H + +#include <assert.h> +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#define COBJMACROS +#include "dshow.h" +#include "uuids.h" +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/strmbase.h" +#include "wine/unicode.h" + /* Quality Control */ typedef struct QualityControlImpl { IQualityControl IQualityControl_iface; @@ -48,3 +62,21 @@ HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sam void QualityControlRender_DoQOS(QualityControlImpl *priv); void QualityControlRender_BeginRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This); + +HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin pfn_get_pin, + BaseFilter_GetPinCount pfn_get_pin_count, BaseFilter_GetPinVersion pfn_get_pin_version, + IEnumPins **enum_pins); + +HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); +HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); +HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); + +HRESULT WINAPI BaseDispatch_Init(BaseDispatch *disp, REFIID iid); +HRESULT WINAPI BaseDispatch_Destroy(BaseDispatch *disp); +HRESULT WINAPI BaseDispatchImpl_GetIDsOfNames(BaseDispatch *disp, REFIID iid, + WCHAR **names, UINT count, LCID lcid, DISPID *ids); +HRESULT WINAPI BaseDispatchImpl_GetTypeInfo(BaseDispatch *disp, REFIID iid, + UINT index, LCID lcid, ITypeInfo **typeinfo); +HRESULT WINAPI BaseDispatchImpl_GetTypeInfoCount(BaseDispatch *disp, UINT *count); + +#endif /* __WINE_STRMBASE_PRIVATE_H */ diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index d741e928d0..c942e92c5c 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -19,21 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "dshow.h" -#include "amvideo.h" -#include "strmif.h" -#include "vfw.h" - -#include <assert.h> - -#include "wine/debug.h" -#include "wine/strmbase.h" #include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/video.c b/dlls/strmbase/video.c index f5366418a0..2857932a05 100644 --- a/dlls/strmbase/video.c +++ b/dlls/strmbase/video.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include <assert.h> -#include "dshow.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include "wine/debug.h" -#include "wine/strmbase.h" +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index 64e9bc1d02..d0105bdfbd 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -18,14 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - -#include "dshow.h" -#include "wine/debug.h" -#include "wine/strmbase.h" -#include "uuids.h" -#include "vfwmsgs.h" -#include <assert.h> +#include "strmbase_private.h" WINE_DEFAULT_DEBUG_CHANNEL(strmbase); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cfd8027559..6429d864fd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -204,8 +204,6 @@ HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); /* Enums */ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); -HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum); - /* Transform Filter */ typedef struct TransformFilter { @@ -303,11 +301,6 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate); HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate); HRESULT WINAPI SourceSeekingImpl_GetPreroll(IMediaSeeking * iface, LONGLONG * pPreroll); -/* PosPassThru */ -HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); -HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); -HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface); - HRESULT WINAPI CreatePosPassThru(IUnknown* pUnkOuter, BOOL bRenderer, IPin *pPin, IUnknown **ppPassThru); HRESULT WINAPI PosPassThru_Construct(IUnknown* pUnkOuter, LPVOID *ppPassThru); @@ -419,12 +412,6 @@ typedef struct{ ITypeInfo *pTypeInfo; } BaseDispatch; -HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid); -HRESULT WINAPI BaseDispatch_Destroy(BaseDispatch *This); -HRESULT WINAPI BaseDispatchImpl_GetIDsOfNames(BaseDispatch *This, REFIID riid, OLECHAR **rgszNames, UINT cNames, LCID lcid, DISPID *rgdispid); -HRESULT WINAPI BaseDispatchImpl_GetTypeInfo(BaseDispatch *This, REFIID riid, UINT itinfo, LCID lcid, ITypeInfo **pptinfo); -HRESULT WINAPI BaseDispatchImpl_GetTypeInfoCount(BaseDispatch *This, UINT *pctinfo); - #ifdef __IVideoWindow_FWD_DEFINED__ typedef struct tagBaseControlWindow { -- 2.21.0

1 2

[PATCH 5/5] wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_bind_and_dirtify().
by Henri Verbeet 09 May '19

09 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/surface.c | 8 +++---- dlls/wined3d/texture.c | 51 ++++++++++++++++++++++-------------------- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b2a2b1ad4ff..2fb361fb677 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2242,7 +2242,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); wined3d_texture_upload_data(dst_texture, op->dst_sub_resource_idx, context, dst_texture->resource.format, &op->src_box, wined3d_const_bo_address(&addr), row_pitch, slice_pitch, op->dst_box.left, op->dst_box.top, op->dst_box.front, FALSE); @@ -2340,7 +2340,7 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_prepare_texture(texture, context, FALSE); else wined3d_texture_load_location(texture, op->sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), FALSE); wined3d_box_set(&src_box, 0, 0, box->right - box->left, box->bottom - box->top, 0, box->back - box->front); wined3d_texture_upload_data(texture, op->sub_resource_idx, context, texture->resource.format, &src_box, diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7a20e2c6007..15d8078fa06 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -687,7 +687,7 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr TRACE("Using upload conversion.\n"); wined3d_texture_prepare_texture(dst_texture, context, FALSE); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); wined3d_texture_upload_data(dst_texture, 0, context, src_format, &src_box, wined3d_const_bo_address(&src_data), src_row_pitch, src_slice_pitch, 0, 0, 0, FALSE); @@ -858,7 +858,7 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, device_invalidate_state(device, STATE_FRAMEBUFFER); wined3d_texture_prepare_texture(&texture_gl->t, context, srgb); - wined3d_texture_gl_bind_and_dirtify(texture_gl, context, srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); TRACE("Reading back offscreen render target %p, %u.\n", texture_gl, sub_resource_idx); @@ -1445,7 +1445,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { struct wined3d_bo_address data; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); @@ -1612,7 +1612,7 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re } wined3d_texture_prepare_texture(texture, context, srgb); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), srgb); wined3d_texture_get_pitch(texture, level, &src_row_pitch, &src_slice_pitch); format = texture->resource.format; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 80f72f5cfd8..8097bb23f74 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1050,7 +1050,7 @@ void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, /* Context activation is done by the caller. */ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) + struct wined3d_context_gl *context_gl, BOOL srgb) { /* We don't need a specific texture unit, but after binding the texture * the current unit is dirty. Read the unit back instead of switching to @@ -1061,18 +1061,18 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, * called from sampler() in state.c. This means we can't touch anything * other than whatever happens to be the currently active texture, or we * would risk marking already applied sampler states dirty again. */ - if (context->active_texture < ARRAY_SIZE(context->rev_tex_unit_map)) + if (context_gl->c.active_texture < ARRAY_SIZE(context_gl->c.rev_tex_unit_map)) { - DWORD active_sampler = context->rev_tex_unit_map[context->active_texture]; + DWORD active_sampler = context_gl->c.rev_tex_unit_map[context_gl->c.active_texture]; if (active_sampler != WINED3D_UNMAPPED_STAGE) - context_invalidate_state(context, STATE_SAMPLER(active_sampler)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(active_sampler)); } /* FIXME: Ideally we'd only do this when touching a binding that's used by * a shader. */ - context_invalidate_compute_state(context, STATE_COMPUTE_SHADER_RESOURCE_BINDING); - context_invalidate_state(context, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); + context_invalidate_compute_state(&context_gl->c, STATE_COMPUTE_SHADER_RESOURCE_BINDING); + context_invalidate_state(&context_gl->c, STATE_GRAPHICS_SHADER_RESOURCE_BINDING); - wined3d_texture_gl_bind(texture_gl, context, srgb); + wined3d_texture_gl_bind(texture_gl, &context_gl->c, srgb); } /* Context activation is done by the caller (state handler). */ @@ -1752,7 +1752,7 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win } format_gl = wined3d_format_gl(format); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), wined3d_context_gl(context), srgb); if (srgb) internal = format_gl->srgb_internal; @@ -2730,6 +2730,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", @@ -2749,7 +2750,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context, location == WINED3D_LOCATION_TEXTURE_SRGB); + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -2760,7 +2761,7 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); @@ -2781,9 +2782,9 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; @@ -2802,9 +2803,9 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } @@ -3107,6 +3108,7 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, BOOL dest_is_srgb) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; struct wined3d_bo_address data; struct wined3d_box src_box; @@ -3124,9 +3126,9 @@ static void texture3d_srgb_transfer(struct wined3d_texture *texture, unsigned in wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, !dest_is_srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, !dest_is_srgb); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, dest_is_srgb); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, dest_is_srgb); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, &src_box, wined3d_const_bo_address(&data), row_pitch, slice_pitch, 0, 0, 0, FALSE); @@ -3138,6 +3140,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) @@ -3154,7 +3157,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context, location == WINED3D_LOCATION_TEXTURE_SRGB); + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3166,7 +3169,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context, location == WINED3D_LOCATION_TEXTURE_SRGB); + context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3194,9 +3197,9 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in data.addr += sub_resource->offset; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; @@ -3215,9 +3218,9 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context, TRUE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); wined3d_texture_download_data(texture, sub_resource_idx, context, &data); } @@ -3800,7 +3803,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_prepare_texture(dst_texture, context, FALSE); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), context, FALSE); + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, @@ -3828,7 +3831,7 @@ void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &data, dst_location); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), context, + wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), !(src_texture->sub_resources[src_sub_resource_idx].locations & WINED3D_LOCATION_TEXTURE_RGB)); wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, &data); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index d04f861f0c4..3b004a8882b 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -906,7 +906,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } else { - wined3d_texture_gl_bind_and_dirtify(texture_gl, context, srgb); + wined3d_texture_gl_bind_and_dirtify(texture_gl, wined3d_context_gl(context), srgb); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_BASE_LEVEL, base_level); gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_MAX_LEVEL, max_level); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 333178a80d0..26b0894b2e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3602,7 +3602,7 @@ void wined3d_texture_gl_apply_sampler_desc(struct wined3d_texture_gl *texture_gl void wined3d_texture_gl_bind(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; + struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_apply_ffp_blit_state().
by Henri Verbeet 09 May '19

09 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 8 +++++--- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a05bb2f38c9..8409a5438dd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7872,7 +7872,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl wined3d_texture_load(src_texture, context, FALSE); } - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 506bb720831..cf164d5e35e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2908,12 +2908,14 @@ static void context_apply_blit_projection(const struct wined3d_context *context, /* Setup OpenGL states for fixed-function blitting. */ /* Context activation is done by the caller. */ -void context_apply_ffp_blit_state(struct wined3d_context *context, const struct wined3d_device *device) +void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context *context = &context_gl->c; + const struct wined3d_gl_info *gl_info; unsigned int i, sampler; + gl_info = context->gl_info; if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) ERR("Applying fixed-function state without legacy context support.\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 06c0a23b992..7a20e2c6007 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1028,7 +1028,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture_gl *dst_texture, context = context_acquire(device, &src_texture->t, src_sub_resource_idx); context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); wined3d_texture_load(&dst_texture->t, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); @@ -2228,7 +2228,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit wined3d_texture_load(src_texture, context, FALSE); } - context_apply_ffp_blit_state(context, device); + wined3d_context_gl_apply_ffp_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb57f62ead1..333178a80d0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2056,6 +2056,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) DECLSPEC_HIDDEN; +void wined3d_context_gl_apply_ffp_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; @@ -2214,8 +2216,6 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, struct wined3d_resource *rt, unsigned int rt_sub_resource_idx, struct wined3d_resource *ds, unsigned int ds_sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; -void context_apply_ffp_blit_state(struct wined3d_context *context, - const struct wined3d_device *device) DECLSPEC_HIDDEN; void context_active_texture(struct wined3d_context *context, const struct wined3d_gl_info *gl_info, unsigned int unit) DECLSPEC_HIDDEN; void context_bind_bo(struct wined3d_context *context, GLenum binding, GLuint name) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_apply_blit_state().
by Henri Verbeet 09 May '19

09 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 15 ++++++++++----- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index b72f61bb02b..506bb720831 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2749,16 +2749,20 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_context *conte } /* Context activation is done by the caller. */ -void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) +void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct wined3d_texture *rt = context->current_rt.texture; + struct wined3d_context *context = &context_gl->c; + const struct wined3d_gl_info *gl_info; + struct wined3d_texture *rt; DWORD rt_mask, *cur_mask; unsigned int sampler; SIZE rt_size; TRACE("Setting up context %p for blitting.\n", context); + gl_info = context->gl_info; + rt = context->current_rt.texture; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (context->render_offscreen) @@ -2906,6 +2910,7 @@ static void context_apply_blit_projection(const struct wined3d_context *context, /* Context activation is done by the caller. */ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct wined3d_device *device) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int i, sampler; @@ -2919,14 +2924,14 @@ void context_apply_ffp_blit_state(struct wined3d_context *context, const struct context_get_rt_size(context, &rt_size); if (context->blit_w != rt_size.cx || context->blit_h != rt_size.cy) context_apply_blit_projection(context, rt_size.cx, rt_size.cy); - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); checkGLcall("ffp blit state application"); return; } context->last_was_ffp_blit = TRUE; - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); /* Disable all textures. The caller can then bind a texture it wants to blit * from. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5ee40b00358..386ce78f419 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13307,7 +13307,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli wined3d_texture_load(src_texture, context, FALSE); } - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); if (dst_location == WINED3D_LOCATION_DRAWABLE) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2c5ea75ebbb..06c0a23b992 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -737,7 +737,7 @@ static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, uns } else { - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(wined3d_context_gl(context), device); } /* Select the correct read buffer, and give some debug output. @@ -908,7 +908,7 @@ static void fb_copy_to_texture_direct(struct wined3d_texture_gl *dst_texture, un context = context_acquire(device, &src_texture->t, src_sub_resource_idx); context_gl = wined3d_context_gl(context); gl_info = context->gl_info; - context_apply_blit_state(context, device); + wined3d_context_gl_apply_blit_state(context_gl, device); wined3d_texture_load(&dst_texture->t, context, FALSE); /* Bind the target texture */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc75ddd0fd7..bb57f62ead1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2054,6 +2054,8 @@ static inline const struct wined3d_context_gl *wined3d_context_gl_const(const st return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, + const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; @@ -2207,7 +2209,6 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, void context_alloc_fence(struct wined3d_context *context, struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_alloc_occlusion_query(struct wined3d_context *context, struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; -void context_apply_blit_state(struct wined3d_context *context, const struct wined3d_device *device) DECLSPEC_HIDDEN; BOOL context_apply_clear_state(struct wined3d_context *context, const struct wined3d_state *state, UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN; void context_apply_fbo_state_blit(struct wined3d_context *context, GLenum target, -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_bind_shader_resources().
by Henri Verbeet 09 May '19

09 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62792688258..b72f61bb02b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3774,12 +3774,11 @@ static void context_load_shader_resources(struct wined3d_context *context, const } } -static void context_bind_shader_resources(struct wined3d_context *context, +static void wined3d_context_gl_bind_shader_resources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; - const struct wined3d_device *device = context->device; + const struct wined3d_device *device = context_gl->c.device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; @@ -3815,7 +3814,7 @@ static void context_bind_shader_resources(struct wined3d_context *context, sampler = device->default_sampler; else if (!(sampler = state->sampler[shader_type][entry->sampler_idx])) sampler = device->null_sampler; - wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, context); + wined3d_shader_resource_view_gl_bind(wined3d_shader_resource_view_gl(view), bind_idx, sampler, &context_gl->c); } } @@ -3927,6 +3926,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct wined3d_state_entry *state_table = context->state_table; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; @@ -4005,7 +4005,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { for (i = 0; i < WINED3D_SHADER_TYPE_GRAPHICS_COUNT; ++i) - context_bind_shader_resources(context, state, i); + wined3d_context_gl_bind_shader_resources(context_gl, state, i); context->update_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_compute_shader_resource_bindings = 1; @@ -4063,7 +4063,7 @@ static void context_apply_compute_state(struct wined3d_context *context, if (context->update_compute_shader_resource_bindings) { - context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE); + wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); context->update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) context->update_shader_resource_bindings = 1; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_get_tex_unit_mapping().
by Henri Verbeet 09 May '19

09 May '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 13 +++++++------ dlls/wined3d/glsl_shader.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 9 +++++++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 97d765658b0..62792688258 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2369,16 +2369,16 @@ void wined3d_context_destroy(struct wined3d_context *context) device->adapter->adapter_ops->adapter_destroy_context(context); } -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!shader_version) { *base = 0; *count = WINED3D_MAX_TEXTURES; - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } if (shader_version->major >= 4) @@ -2403,7 +2403,7 @@ const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, *count = 0; } - return context->tex_unit_map; + return context_gl->c.tex_unit_map; } static void context_get_rt_size(const struct wined3d_context *context, SIZE *size) @@ -3777,18 +3777,19 @@ static void context_load_shader_resources(struct wined3d_context *context, const static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, enum wined3d_shader_type shader_type) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int bind_idx, shader_sampler_count, base, count, i; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; const struct wined3d_shader *shader; + const unsigned int *tex_unit_map; struct wined3d_sampler *sampler; - const DWORD *tex_unit_map; if (!(shader = state->shader[shader_type])) return; - tex_unit_map = context_get_tex_unit_mapping(context, + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, &shader->reg_maps.shader_version, &base, &count); shader_sampler_count = shader->reg_maps.sampler_map.count; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6493e7f16c7..5ee40b00358 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -705,10 +705,11 @@ static void shader_glsl_load_samplers_range(const struct wined3d_gl_info *gl_inf static unsigned int shader_glsl_map_tex_unit(const struct wined3d_context *context, const struct wined3d_shader_version *shader_version, unsigned int sampler_idx) { - const DWORD *tex_unit_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); + const unsigned int *tex_unit_map; unsigned int base, count; - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); if (sampler_idx >= count) return WINED3D_UNMAPPED_STAGE; if (!tex_unit_map) @@ -731,9 +732,10 @@ static void shader_glsl_append_sampler_binding_qualifier(struct wined3d_string_b static void shader_glsl_load_samplers(const struct wined3d_context *context, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader_reg_maps *reg_maps) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader_version *shader_version; - const DWORD *tex_unit_map; + const unsigned int *tex_unit_map; unsigned int base, count; const char *prefix; @@ -742,7 +744,7 @@ static void shader_glsl_load_samplers(const struct wined3d_context *context, shader_version = reg_maps ? &reg_maps->shader_version : NULL; prefix = shader_glsl_get_prefix(shader_version ? shader_version->type : WINED3D_SHADER_TYPE_PIXEL); - tex_unit_map = context_get_tex_unit_mapping(context, shader_version, &base, &count); + tex_unit_map = wined3d_context_gl_get_tex_unit_mapping(context_gl, shader_version, &base, &count); shader_glsl_load_samplers_range(gl_info, priv, program_id, prefix, base, count, tex_unit_map); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a226cd4796a..fc75ddd0fd7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2049,9 +2049,16 @@ static inline struct wined3d_context_gl *wined3d_context_gl(struct wined3d_conte return CONTAINING_RECORD(context, struct wined3d_context_gl, c); } +static inline const struct wined3d_context_gl *wined3d_context_gl_const(const struct wined3d_context *context) +{ + return CONTAINING_RECORD(context, struct wined3d_context_gl, c); +} + void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, GLenum target, GLuint name) DECLSPEC_HIDDEN; void wined3d_context_gl_cleanup(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +const unsigned int *wined3d_context_gl_get_tex_unit_mapping(const struct wined3d_context_gl *context_gl, + const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, @@ -2231,8 +2238,6 @@ void context_free_fence(struct wined3d_fence *fence) DECLSPEC_HIDDEN; void context_free_occlusion_query(struct wined3d_occlusion_query *query) DECLSPEC_HIDDEN; struct wined3d_context *context_get_current(void) DECLSPEC_HIDDEN; GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DECLSPEC_HIDDEN; -const DWORD *context_get_tex_unit_mapping(const struct wined3d_context *context, - const struct wined3d_shader_version *shader_version, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; -- 2.11.0

1 0