libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-31 22:14:06 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Fix function name clashes pt. 1

Browse Source
This commit is contained in:
twinaphex 2016-01-07 09:22:04 +01:00
parent 186a9fe61b
commit 281de92d79
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/common/d3d_common.cpp
View File

@ -304,7 +304,7 @@ void d3d_lock_rectangle_clear(LPDIRECT3DTEXTURE tex,
d3d_unlock_rectangle(tex);
}
void d3d_set_viewport(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp)
void d3d_set_viewports(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp)
{
#if defined(_XBOX360)
D3DDevice_SetViewport(dev, vp);

2
gfx/common/d3d_common.h
View File

@ -95,7 +95,7 @@ void d3d_texture_blit(unsigned pixel_size,
bool d3d_vertex_declaration_new(LPDIRECT3DDEVICE dev,
const void *vertex_data, void **decl_data);
void d3d_set_viewport(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp);
void d3d_set_viewports(LPDIRECT3DDEVICE dev, D3DVIEWPORT *vp);
void d3d_enable_blend_func(void *data);

4
gfx/d3d/d3d.cpp
View File

@ -1267,7 +1267,7 @@ static void d3d_overlay_render(d3d_video_t *d3d, overlay_t *overlay)
/* Restore previous state. */
d3d_disable_blend_func(d3d->dev);
d3d_set_viewport(d3d->dev, width, height, false, false);
d3d_set_viewport(d3d, width, height, false, false);
}
static void d3d_free_overlay(d3d_video_t *d3d, overlay_t *overlay)
@ -1485,7 +1485,7 @@ static bool d3d_frame(void *data, const void *frame,
screen_vp.MaxZ = 1;
screen_vp.Width = width;
screen_vp.Height = height;
d3d_set_viewport(d3d->dev, &screen_vp);
d3d_set_viewports(d3d->dev, &screen_vp);
d3d_clear(d3d->dev, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
/* Insert black frame first, so we

4
gfx/d3d/render_chain_cg.cpp
View File

@ -1305,7 +1305,7 @@ static void renderchain_set_viewport(void *data, void *viewport_data)
if (!chain)
return;
d3d_set_viewport(chain->dev, vp);
d3d_set_viewports(chain->dev, vp);
}
static void renderchain_blit_to_texture(
@ -1440,7 +1440,7 @@ static bool cg_d3d9_renderchain_render(
viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f;
d3d_set_viewport(d3dr, &viewport);
d3d_set_viewports(d3dr, &viewport);
d3d_clear(d3dr, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
viewport.Width = out_width;

2
gfx/d3d/render_chain_xdk.cpp
View File

@ -376,7 +376,7 @@ static bool xdk_renderchain_render(void *data, const void *frame,
renderchain_set_vertices(d3d, 1, frame_width, frame_height, *frame_count);
d3d_set_texture(d3dr, 0, chain->tex);
d3d_set_viewport(chain->dev, &d3d->final_viewport);
d3d_set_viewports(chain->dev, &d3d->final_viewport);
d3d_set_sampler_minfilter(d3dr, 0, settings->video.smooth ?
D3DTEXF_LINEAR : D3DTEXF_POINT);
d3d_set_sampler_magfilter(d3dr, 0, settings->video.smooth ?