mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-24 13:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanup SetTexture

Browse Source
This commit is contained in:
twinaphex 2014-06-08 04:35:58 +02:00
parent 4320efa9a1
commit 327b05d760
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/d3d9/render_chain.cpp
View File

@ -553,17 +553,7 @@ void renderchain_render_pass(void *data, Pass &pass, unsigned pass_index)
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)chain->dev;
renderchain_set_shaders(chain, pass.fPrg, pass.vPrg); renderchain_set_shaders(chain, pass.fPrg, pass.vPrg);
#ifdef _XBOX
if (g_extern.frame_count)
{
#if defined(_XBOX1)
d3dr->SwitchTexture(0, pass.tex);
#elif defined(_XBOX360)
d3dr->SetTextureFetchConstant(0, pass.tex);
#endif
}
else if(pass.tex)
#endif
d3dr->SetTexture(0, pass.tex); d3dr->SetTexture(0, pass.tex);
D3DDevice_SetSamplerState_MinFilter(d3dr, 0, translate_filter(pass.info.pass->filter)); D3DDevice_SetSamplerState_MinFilter(d3dr, 0, translate_filter(pass.info.pass->filter));
D3DDevice_SetSamplerState_MagFilter(d3dr, 0, translate_filter(pass.info.pass->filter)); D3DDevice_SetSamplerState_MagFilter(d3dr, 0, translate_filter(pass.info.pass->filter));

2
xdk/xdk_d3d.cpp
View File

@ -643,6 +643,7 @@ static void render_pass(void *data, const void *frame, unsigned width, unsigned
blit_to_texture(d3d, frame, width, height, pitch); blit_to_texture(d3d, frame, width, height, pitch);
set_vertices(d3d, 1, width, height); set_vertices(d3d, 1, width, height);
#if 0
#ifdef _XBOX #ifdef _XBOX
if (g_extern.frame_count) if (g_extern.frame_count)
{ {
@ -653,6 +654,7 @@ static void render_pass(void *data, const void *frame, unsigned width, unsigned
#endif #endif
} }
else if (d3d->tex) else if (d3d->tex)
#endif
#endif #endif
RD3DDevice_SetTexture(d3dr, 0, d3d->tex); RD3DDevice_SetTexture(d3dr, 0, d3d->tex);
RD3DDevice_SetViewport(d3d->dev, &d3d->final_viewport); RD3DDevice_SetViewport(d3d->dev, &d3d->final_viewport);