mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D8/D3D9) Cleanups

Browse Source
This commit is contained in:
twinaphex 2022-04-20 16:00:00 +02:00
parent 3cf86d3093
commit 8c27e58e20
3 changed files with 12 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/d3d8_common.h
View File

@ -353,14 +353,6 @@ static INLINE void d3d8_disable_blend_func(void *data)
d3d8_set_render_state(data, D3DRS_ALPHABLENDENABLE, false); d3d8_set_render_state(data, D3DRS_ALPHABLENDENABLE, false);
} }
static INLINE void d3d8_enable_alpha_blend_texture_func(void *data)
{
/* Also blend the texture with the set alpha value. */
d3d8_set_texture_stage_state(data, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
d3d8_set_texture_stage_state(data, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
d3d8_set_texture_stage_state(data, 0, D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
}
void d3d8_frame_postprocess(void *data); void d3d8_frame_postprocess(void *data);
static INLINE void d3d8_surface_free(LPDIRECT3DSURFACE8 surf) static INLINE void d3d8_surface_free(LPDIRECT3DSURFACE8 surf)

22
gfx/common/d3d9_common.c
View File

@ -1087,7 +1087,7 @@ void d3d9_overlay_render(d3d9_video_t *d3d,
vp_full.Height = height; vp_full.Height = height;
vp_full.MinZ = 0.0f; vp_full.MinZ = 0.0f;
vp_full.MaxZ = 1.0f; vp_full.MaxZ = 1.0f;
d3d9_set_viewports(dev, &vp_full); IDirect3DDevice9_SetViewport(dev, (D3DVIEWPORT9*)&vp_full);
} }
filter_type = D3DTEXF_LINEAR; filter_type = D3DTEXF_LINEAR;
@ -1101,16 +1101,18 @@ void d3d9_overlay_render(d3d9_video_t *d3d,
} }
/* Render overlay. */ /* Render overlay. */
d3d9_set_texture(dev, 0, (LPDIRECT3DTEXTURE9)overlay->tex); IDirect3DDevice9_SetTexture(dev, 0,(IDirect3DBaseTexture9*)overlay->tex);
d3d9_set_sampler_address_u(dev, 0, D3DTADDRESS_BORDER); IDirect3DDevice9_SetSamplerState(dev,0,D3DSAMP_ADDRESSU,
d3d9_set_sampler_address_v(dev, 0, D3DTADDRESS_BORDER); D3DTADDRESS_BORDER);
d3d9_set_sampler_minfilter(dev, 0, filter_type); IDirect3DDevice9_SetSamplerState(dev,0,D3DSAMP_ADDRESSV,
d3d9_set_sampler_magfilter(dev, 0, filter_type); D3DTADDRESS_BORDER);
IDirect3DDevice9_SetSamplerState(dev,0,D3DSAMP_MINFILTER, filter_type);
IDirect3DDevice9_SetSamplerState(dev,0,D3DSAMP_MAGFILTER, filter_type);
d3d9_draw_primitive(dev, D3DPT_TRIANGLESTRIP, 0, 2); d3d9_draw_primitive(dev, D3DPT_TRIANGLESTRIP, 0, 2);
/* Restore previous state. */ /* Restore previous state. */
d3d9_disable_blend_func(dev); IDirect3DDevice9_SetRenderState(dev, D3DRS_ALPHABLENDENABLE, false);
d3d9_set_viewports(dev, &d3d->final_viewport); IDirect3DDevice9_SetViewport(dev, (D3DVIEWPORT9*)&d3d->final_viewport);
} }
void d3d9_free_overlay(d3d9_video_t *d3d, overlay_t *overlay) void d3d9_free_overlay(d3d9_video_t *d3d, overlay_t *overlay)
@ -1157,10 +1159,10 @@ void d3d9_set_osd_msg(void *data,
struct font_params*)params; struct font_params*)params;
d3d9_set_font_rect(d3d, d3d_font_params); d3d9_set_font_rect(d3d, d3d_font_params);
d3d9_begin_scene(dev); IDirect3DDevice9_BeginScene(dev);
font_driver_render_msg(d3d, font_driver_render_msg(d3d,
msg, d3d_font_params, font); msg, d3d_font_params, font);
d3d9_end_scene(dev); IDirect3DDevice9_EndScene(dev);
} }
void d3d9_set_menu_texture_frame(void *data, void d3d9_set_menu_texture_frame(void *data,

14
gfx/common/d3d9_common.h
View File

@ -429,20 +429,6 @@ d3d9_set_vertex_declaration(LPDIRECT3DDEVICE9 dev,
IDirect3DDevice9_SetVertexDeclaration(dev, vertex_data); IDirect3DDevice9_SetVertexDeclaration(dev, vertex_data);
} }
static INLINE void d3d9_enable_alpha_blend_texture_func(LPDIRECT3DDEVICE9 dev)
{
if (!dev)
return;
/* Also blend the texture with the set alpha value. */
#ifndef _XBOX
/* XBox 360 has no fixed-function pipeline. */
IDirect3DDevice9_SetTextureStageState(dev, 0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
IDirect3DDevice9_SetTextureStageState(dev, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE);
IDirect3DDevice9_SetTextureStageState(dev, 0, D3DTSS_ALPHAARG2, D3DTA_TEXTURE);
#endif
}
void d3d9_frame_postprocess(void *data); void d3d9_frame_postprocess(void *data);
static INLINE void d3d9_surface_free(LPDIRECT3DSURFACE9 surf) static INLINE void d3d9_surface_free(LPDIRECT3DSURFACE9 surf)