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

d3d10: Fix up D3D10_DST_* names. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2021-10-06 10:53:34 +03:00 committed by Alexandre Julliard
parent c85e46b102
commit 87fb9fe721
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/d3d10/stateblock.c
View File

@ -73,8 +73,8 @@ static const char *debug_d3d10_device_state_types(D3D10_DEVICE_STATE_TYPES t)
{ {
WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS); WINE_D3D10_TO_STR(D3D10_DST_SO_BUFFERS);
WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS); WINE_D3D10_TO_STR(D3D10_DST_OM_RENDER_TARGETS);
WINE_D3D10_TO_STR(D3D10_DST_DEPTH_STENCIL_STATE); WINE_D3D10_TO_STR(D3D10_DST_OM_DEPTH_STENCIL_STATE);
WINE_D3D10_TO_STR(D3D10_DST_BLEND_STATE); WINE_D3D10_TO_STR(D3D10_DST_OM_BLEND_STATE);
WINE_D3D10_TO_STR(D3D10_DST_VS); WINE_D3D10_TO_STR(D3D10_DST_VS);
WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS); WINE_D3D10_TO_STR(D3D10_DST_VS_SAMPLERS);
WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES); WINE_D3D10_TO_STR(D3D10_DST_VS_SHADER_RESOURCES);
@ -696,9 +696,9 @@ HRESULT WINAPI D3D10StateBlockMaskDisableCapture(D3D10_STATE_BLOCK_MASK *mask,
return stateblock_mask_clear_bits(&mask->SOBuffers, 1, start_idx, count); return stateblock_mask_clear_bits(&mask->SOBuffers, 1, start_idx, count);
case D3D10_DST_OM_RENDER_TARGETS: case D3D10_DST_OM_RENDER_TARGETS:
return stateblock_mask_clear_bits(&mask->OMRenderTargets, 1, start_idx, count); return stateblock_mask_clear_bits(&mask->OMRenderTargets, 1, start_idx, count);
case D3D10_DST_DEPTH_STENCIL_STATE: case D3D10_DST_OM_DEPTH_STENCIL_STATE:
return stateblock_mask_clear_bits(&mask->OMDepthStencilState, 1, start_idx, count); return stateblock_mask_clear_bits(&mask->OMDepthStencilState, 1, start_idx, count);
case D3D10_DST_BLEND_STATE: case D3D10_DST_OM_BLEND_STATE:
return stateblock_mask_clear_bits(&mask->OMBlendState, 1, start_idx, count); return stateblock_mask_clear_bits(&mask->OMBlendState, 1, start_idx, count);
case D3D10_DST_VS: case D3D10_DST_VS:
return stateblock_mask_clear_bits(&mask->VS, 1, start_idx, count); return stateblock_mask_clear_bits(&mask->VS, 1, start_idx, count);
@ -783,9 +783,9 @@ HRESULT WINAPI D3D10StateBlockMaskEnableCapture(D3D10_STATE_BLOCK_MASK *mask,
return stateblock_mask_set_bits(&mask->SOBuffers, 1, start_idx, count); return stateblock_mask_set_bits(&mask->SOBuffers, 1, start_idx, count);
case D3D10_DST_OM_RENDER_TARGETS: case D3D10_DST_OM_RENDER_TARGETS:
return stateblock_mask_set_bits(&mask->OMRenderTargets, 1, start_idx, count); return stateblock_mask_set_bits(&mask->OMRenderTargets, 1, start_idx, count);
case D3D10_DST_DEPTH_STENCIL_STATE: case D3D10_DST_OM_DEPTH_STENCIL_STATE:
return stateblock_mask_set_bits(&mask->OMDepthStencilState, 1, start_idx, count); return stateblock_mask_set_bits(&mask->OMDepthStencilState, 1, start_idx, count);
case D3D10_DST_BLEND_STATE: case D3D10_DST_OM_BLEND_STATE:
return stateblock_mask_set_bits(&mask->OMBlendState, 1, start_idx, count); return stateblock_mask_set_bits(&mask->OMBlendState, 1, start_idx, count);
case D3D10_DST_VS: case D3D10_DST_VS:
return stateblock_mask_set_bits(&mask->VS, 1, start_idx, count); return stateblock_mask_set_bits(&mask->VS, 1, start_idx, count);
@ -858,9 +858,9 @@ BOOL WINAPI D3D10StateBlockMaskGetSetting(D3D10_STATE_BLOCK_MASK *mask,
return stateblock_mask_get_bit(&mask->SOBuffers, 1, idx); return stateblock_mask_get_bit(&mask->SOBuffers, 1, idx);
case D3D10_DST_OM_RENDER_TARGETS: case D3D10_DST_OM_RENDER_TARGETS:
return stateblock_mask_get_bit(&mask->OMRenderTargets, 1, idx); return stateblock_mask_get_bit(&mask->OMRenderTargets, 1, idx);
case D3D10_DST_DEPTH_STENCIL_STATE: case D3D10_DST_OM_DEPTH_STENCIL_STATE:
return stateblock_mask_get_bit(&mask->OMDepthStencilState, 1, idx); return stateblock_mask_get_bit(&mask->OMDepthStencilState, 1, idx);
case D3D10_DST_BLEND_STATE: case D3D10_DST_OM_BLEND_STATE:
return stateblock_mask_get_bit(&mask->OMBlendState, 1, idx); return stateblock_mask_get_bit(&mask->OMBlendState, 1, idx);
case D3D10_DST_VS: case D3D10_DST_VS:
return stateblock_mask_get_bit(&mask->VS, 1, idx); return stateblock_mask_get_bit(&mask->VS, 1, idx);

4
include/d3d10effect.h
View File

@ -34,8 +34,8 @@ typedef enum _D3D10_DEVICE_STATE_TYPES
{ {
D3D10_DST_SO_BUFFERS = 1, D3D10_DST_SO_BUFFERS = 1,
D3D10_DST_OM_RENDER_TARGETS, D3D10_DST_OM_RENDER_TARGETS,
D3D10_DST_DEPTH_STENCIL_STATE, D3D10_DST_OM_DEPTH_STENCIL_STATE,
D3D10_DST_BLEND_STATE, D3D10_DST_OM_BLEND_STATE,
D3D10_DST_VS, D3D10_DST_VS,
D3D10_DST_VS_SAMPLERS, D3D10_DST_VS_SAMPLERS,
D3D10_DST_VS_SHADER_RESOURCES, D3D10_DST_VS_SHADER_RESOURCES,