ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Remove now redundant error handling from wined3d_device_set_stream_source_freq(). 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2020-03-04 22:46:48 -06:00 committed by Alexandre Julliard
parent 3b0f0b8aef
commit 0ada209125
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/wined3d/device.c
View File

@ -1314,30 +1314,13 @@ HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *devi
return WINED3D_OK; return WINED3D_OK;
} }
static HRESULT wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider) static void wined3d_device_set_stream_source_freq(struct wined3d_device *device, UINT stream_idx, UINT divider)
{ {
struct wined3d_stream_state *stream; struct wined3d_stream_state *stream;
UINT old_flags, old_freq; UINT old_flags, old_freq;
TRACE("device %p, stream_idx %u, divider %#x.\n", device, stream_idx, divider); TRACE("device %p, stream_idx %u, divider %#x.\n", device, stream_idx, divider);
/* Verify input. At least in d3d9 this is invalid. */
if ((divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && (divider & WINED3DSTREAMSOURCE_INDEXEDDATA))
{
WARN("INSTANCEDATA and INDEXEDDATA were set, returning D3DERR_INVALIDCALL.\n");
return WINED3DERR_INVALIDCALL;
}
if ((divider & WINED3DSTREAMSOURCE_INSTANCEDATA) && !stream_idx)
{
WARN("INSTANCEDATA used on stream 0, returning D3DERR_INVALIDCALL.\n");
return WINED3DERR_INVALIDCALL;
}
if (!divider)
{
WARN("Divider is 0, returning D3DERR_INVALIDCALL.\n");
return WINED3DERR_INVALIDCALL;
}
stream = &device->state.streams[stream_idx]; stream = &device->state.streams[stream_idx];
old_flags = stream->flags; old_flags = stream->flags;
old_freq = stream->frequency; old_freq = stream->frequency;
@ -1346,8 +1329,6 @@ static HRESULT wined3d_device_set_stream_source_freq(struct wined3d_device *devi
stream->frequency = divider & 0x7fffff; stream->frequency = divider & 0x7fffff;
if (stream->frequency != old_freq || stream->flags != old_flags) if (stream->frequency != old_freq || stream->flags != old_flags)
wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags); wined3d_cs_emit_set_stream_source_freq(device->cs, stream_idx, stream->frequency, stream->flags);
return WINED3D_OK;
} }
static void wined3d_device_set_transform(struct wined3d_device *device, static void wined3d_device_set_transform(struct wined3d_device *device,