ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(D3D) Create d3d_enable_blend_func/d3d_disable_blend_func

This commit is contained in:
twinaphex 2015-04-06 00:55:25 +02:00
parent df164dd328
commit 44894e608b
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/d3d/d3d.cpp
View File

@ -1027,9 +1027,7 @@ static bool texture_image_render(d3d_video_t *d3d,
memcpy(verts, newVerts, sizeof(newVerts)); memcpy(verts, newVerts, sizeof(newVerts));
d3d_vertex_buffer_unlock(out_img->vertex_buf); d3d_vertex_buffer_unlock(out_img->vertex_buf);
d3d->dev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); d3d_enable_blend_func(d3d->dev);
d3d->dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
d3d->dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
/* Also blend the texture with the set alpha value. */ /* Also blend the texture with the set alpha value. */
d3d->dev->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); d3d->dev->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
@ -1071,13 +1069,11 @@ static void d3d_draw_texture(d3d_video_t *d3d)
if (d3d->menu_texture_enable) if (d3d->menu_texture_enable)
{ {
d3d->dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_ONE); d3d_enable_blend_func(d3d->dev);
d3d->dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
d3d->dev->SetRenderState(D3DRS_ALPHABLENDENABLE, true);
texture_image_render(d3d, menu_texture, texture_image_render(d3d, menu_texture,
menu_texture->x, menu_texture->y, menu_texture->x, menu_texture->y,
d3d->screen_width, d3d->screen_height, true); d3d->screen_width, d3d->screen_height, true);
d3d->dev->SetRenderState(D3DRS_ALPHABLENDENABLE, false); d3d_disable_blend_func(d3d->dev);
} }
#endif #endif
} }
@ -1327,10 +1323,7 @@ static void d3d_overlay_render(d3d_video_t *d3d, overlay_t *overlay)
memcpy(verts, vert, sizeof(vert)); memcpy(verts, vert, sizeof(vert));
d3d_vertex_buffer_unlock(overlay->vert_buf); d3d_vertex_buffer_unlock(overlay->vert_buf);
// enable alpha d3d_enable_blend_func(d3d->dev);
d3d->dev->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE);
d3d->dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
d3d->dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
#ifndef _XBOX1 #ifndef _XBOX1
d3d->dev->CreateVertexDeclaration(vElems, &vertex_decl); d3d->dev->CreateVertexDeclaration(vElems, &vertex_decl);
@ -1364,7 +1357,7 @@ static void d3d_overlay_render(d3d_video_t *d3d, overlay_t *overlay)
d3d_draw_primitive(d3d->dev, D3DPT_TRIANGLESTRIP, 0, 2); d3d_draw_primitive(d3d->dev, D3DPT_TRIANGLESTRIP, 0, 2);
/* Restore previous state. */ /* Restore previous state. */
d3d->dev->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE); d3d_disable_blend_func(d3d->dev);
d3d_set_viewport(d3d->dev, &d3d->final_viewport); d3d_set_viewport(d3d->dev, &d3d->final_viewport);
} }

22
gfx/d3d/d3d_wrapper.cpp
View File

@ -369,3 +369,25 @@ void d3d_texture_blit(void *data, unsigned pixel_size,
} }
#endif #endif
} }
void d3d_enable_blend_func(void *data)
{
LPDIRECT3DDEVICE dev = (LPDIRECT3DDEVICE)data;
if (!dev)
return;
dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
dev->SetRenderState(D3DRS_ALPHABLENDENABLE, true);
}
void d3d_disable_blend_func(void *data)
{
LPDIRECT3DDEVICE dev = (LPDIRECT3DDEVICE)data;
if (!dev)
return;
dev->SetRenderState(D3DRS_ALPHABLENDENABLE, false);
}

4
gfx/d3d/d3d_wrapper.h
View File

@ -84,4 +84,8 @@ void d3d_texture_blit(void *data, unsigned pixel_size,
void d3d_set_viewport(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp); void d3d_set_viewport(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp);
void d3d_enable_blend_func(void *data);
void d3d_disable_blend_func(void *data);
#endif #endif