CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-17 15:59:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-10-02 00:30:14 +02:00
parent d254decf28
commit 95ca5a3876
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/common/d3d_common.cpp
View File

@ -271,6 +271,18 @@ void d3d_set_stream_source(LPDIRECT3DDEVICE dev, unsigned stream_no,
#endif #endif
} }
static void d3d_set_texture_stage_state(LPDIRECT3DDEVICE dev,
unsigned sampler, unsigned value, unsigned type)
{
#if defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetTextureStageState(dev, sampler, (D3DTEXTURESTAGESTATETYPE)type, value);
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
IDirect3DDevice8_SetTextureStageState(dev, sampler, (D3DTEXTURESTAGESTATETYPE)type, value);
#else
dev->SetTextureStageState(sampler, (D3DTEXTURESTAGESTATETYPE)type, value);
#endif
}
void d3d_set_sampler_address_u(LPDIRECT3DDEVICE dev, void d3d_set_sampler_address_u(LPDIRECT3DDEVICE dev,
unsigned sampler, unsigned value) unsigned sampler, unsigned value)
{ {
@ -281,10 +293,8 @@ void d3d_set_sampler_address_u(LPDIRECT3DDEVICE dev,
D3DDevice_SetSamplerState_AddressU_Inline(dev, sampler, value); D3DDevice_SetSamplerState_AddressU_Inline(dev, sampler, value);
#elif defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSU, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSU, value);
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
IDirect3DDevice8_SetTextureStageState(dev, sampler, D3DTSS_ADDRESSU, value);
#elif defined(HAVE_D3D8) #elif defined(HAVE_D3D8)
dev->SetTextureStageState(sampler, D3DTSS_ADDRESSU, value); d3d_set_texture_stage(dev, sampler, D3DTSS_ADDRESSU, value);
#else #else
dev->SetSamplerState(sampler, D3DSAMP_ADDRESSU, value); dev->SetSamplerState(sampler, D3DSAMP_ADDRESSU, value);
#endif #endif
@ -300,10 +310,8 @@ void d3d_set_sampler_address_v(LPDIRECT3DDEVICE dev,
D3DDevice_SetSamplerState_AddressV_Inline(dev, sampler, value); D3DDevice_SetSamplerState_AddressV_Inline(dev, sampler, value);
#elif defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSV, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_ADDRESSV, value);
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
IDirect3DDevice8_SetTextureStageState(dev, sampler, D3DTSS_ADDRESSV, value);
#elif defined(HAVE_D3D8) #elif defined(HAVE_D3D8)
dev->SetTextureStageState(sampler, D3DTSS_ADDRESSV, value); d3d_set_texture_stage(dev, sampler, D3DTSS_ADDRESSV, value);
#else #else
dev->SetSamplerState(sampler, D3DSAMP_ADDRESSV, value); dev->SetSamplerState(sampler, D3DSAMP_ADDRESSV, value);
#endif #endif
@ -319,10 +327,8 @@ void d3d_set_sampler_minfilter(LPDIRECT3DDEVICE dev,
D3DDevice_SetSamplerState_MinFilter(dev, sampler, value); D3DDevice_SetSamplerState_MinFilter(dev, sampler, value);
#elif defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MINFILTER, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MINFILTER, value);
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
IDirect3DDevice8_SetTextureStageState(dev, sampler, D3DTSS_MINFILTER, value);
#elif defined(HAVE_D3D8) #elif defined(HAVE_D3D8)
dev->SetTextureStageState(sampler, D3DTSS_MINFILTER, value); d3d_set_texture_stage(dev, sampler, D3DTSS_MINFILTER, value);
#else #else
dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, value); dev->SetSamplerState(sampler, D3DSAMP_MINFILTER, value);
#endif #endif
@ -338,10 +344,8 @@ void d3d_set_sampler_magfilter(LPDIRECT3DDEVICE dev,
D3DDevice_SetSamplerState_MagFilter(dev, sampler, value); D3DDevice_SetSamplerState_MagFilter(dev, sampler, value);
#elif defined(HAVE_D3D9) && !defined(__cplusplus) #elif defined(HAVE_D3D9) && !defined(__cplusplus)
IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MAGFILTER, value); IDirect3DDevice9_SetSamplerState(dev, sampler, D3DSAMP_MAGFILTER, value);
#elif defined(HAVE_D3D8) && !defined(__cplusplus)
IDirect3DDevice8_SetTextureStageState(dev, sampler, D3DTSS_MAGFILTER, value);
#elif defined(HAVE_D3D8) #elif defined(HAVE_D3D8)
dev->SetTextureStageState(sampler, D3DTSS_MAGFILTER, value); d3d_set_texture_stage(dev, sampler, D3DTSS_MAGFILTER, value);
#else #else
dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, value); dev->SetSamplerState(sampler, D3DSAMP_MAGFILTER, value);
#endif #endif
@ -600,9 +604,9 @@ void d3d_enable_alpha_blend_texture_func(void *data)
#ifndef _XBOX360 #ifndef _XBOX360
/* Also blend the texture with the set alpha value. */ /* Also blend the texture with the set alpha value. */
dev->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); d3d_set_texture_stage_state(dev, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
dev->SetTextureStageState(0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); d3d_set_texture_stage_state(dev, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
dev->SetTextureStageState(0, D3DTSS_ALPHAARG2, D3DTA_TEXTURE); d3d_set_texture_stage_state(dev, 0, D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
#endif #endif
} }