system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

d3d8: Retrieve vertex shader constants from the primary stateblock.

Browse source 
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-02-20 20:21:30 -06:00 committed by Alexandre Julliard
parent 07a96c46e3
commit ffb8cc3623
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/d3d8/d3d8_private.h
View file

@ -131,6 +131,8 @@ struct d3d8_device
DWORD in_destruction : 1;
DWORD padding : 14;
unsigned int vs_uniform_count;
/* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE,
* no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */
struct wined3d_swapchain *implicit_swapchain;

25
dlls/d3d8/device.c
View file

@ -2991,26 +2991,29 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac
}
static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *iface,
DWORD start_register, void *data, DWORD count)
DWORD start_idx, void *constants, DWORD count)
{
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
HRESULT hr;
const struct wined3d_vec4 *src;
TRACE("iface %p, start_register %u, data %p, count %u.\n",
iface, start_register, data, count);
TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count);
if (start_register + count > D3D8_MAX_VERTEX_SHADER_CONSTANTF)
if (!constants)
return D3DERR_INVALIDCALL;
if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx)
{
WARN("Trying to access %u constants, but d3d8 only supports %u\n",
start_register + count, D3D8_MAX_VERTEX_SHADER_CONSTANTF);
WARN("Trying to access %u constants, but d3d8 only supports %u.\n",
start_idx + count, device->vs_uniform_count);
return D3DERR_INVALIDCALL;
}
wined3d_mutex_lock();
hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, count, data);
src = wined3d_stateblock_get_state(device->state)->vs_consts_f;
memcpy(constants, &src[start_idx], count * sizeof(*src));
wined3d_mutex_unlock();
return hr;
return D3D_OK;
}
static HRESULT WINAPI d3d8_device_GetVertexShaderDeclaration(IDirect3DDevice8 *iface,
@ -3668,6 +3671,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine
struct wined3d_swapchain_desc swapchain_desc;
struct wined3d_swapchain *wined3d_swapchain;
struct d3d8_swapchain *d3d_swapchain;
struct wined3d_caps caps;
HRESULT hr;
static const enum wined3d_feature_level feature_levels[] =
@ -3702,6 +3706,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine
return hr;
}
wined3d_get_device_caps(wined3d, adapter, device_type, &caps);
device->vs_uniform_count = caps.MaxVertexShaderConst;
if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &device->state)))
{
ERR("Failed to create primary stateblock, hr %#x.\n", hr);