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

(D3D) Cleanups pt. 7

Browse Source
This commit is contained in:
twinaphex 2015-04-05 01:15:54 +02:00
parent cf4975b059
commit 583855a85c
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
gfx/d3d/render_chain.cpp
View File

@ -65,22 +65,23 @@ bool renderchain_init(void *data, const video_info_t *video_info,
const D3DVIEWPORT *final_viewport_, const D3DVIEWPORT *final_viewport_,
const void *info_data, PixelFormat fmt) const void *info_data, PixelFormat fmt)
{ {
const LinkInfo *info = (const LinkInfo*)info_data; const LinkInfo *info = (const LinkInfo*)info_data;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
CGcontext cgCtx_ = (CGcontext)shader_context; CGcontext cgCtx_ = (CGcontext)shader_context;
if (!chain) if (!chain)
return false; return false;
chain->dev = dev_; chain->dev = dev_;
#ifdef HAVE_CG #ifdef HAVE_CG
chain->cgCtx = cgCtx_; chain->cgCtx = cgCtx_;
#endif #endif
chain->video_info = video_info; chain->video_info = video_info;
chain->tracker = NULL; chain->tracker = NULL;
chain->final_viewport = (D3DVIEWPORT*)final_viewport_; chain->final_viewport = (D3DVIEWPORT*)final_viewport_;
chain->frame_count = 0; chain->frame_count = 0;
chain->pixel_size = fmt == RGB565 ? 2 : 4; chain->pixel_size = (fmt == RGB565) ? 2 : 4;
if (!renderchain_create_first_pass(chain, info, fmt)) if (!renderchain_create_first_pass(chain, info, fmt))
return false; return false;
renderchain_log_info(chain, info); renderchain_log_info(chain, info);
@ -149,8 +150,7 @@ bool renderchain_set_pass_size(void *data, unsigned pass_index,
pass->info.tex_w = width; pass->info.tex_w = width;
pass->info.tex_h = height; pass->info.tex_h = height;
pass->tex = (LPDIRECT3DTEXTURE)d3d_texture_new(
pass->tex = (LPDIRECT3DTEXTURE)d3d_texture_new(
d3dr, NULL, width, height, 1, d3dr, NULL, width, height, 1,
D3DUSAGE_RENDERTARGET, D3DUSAGE_RENDERTARGET,
chain->passes.back().info.pass->fbo.fp_fbo ? chain->passes.back().info.pass->fbo.fp_fbo ?
@ -218,13 +218,10 @@ bool renderchain_add_lut(void *data, const std::string &id,
const std::string &path, const std::string &path,
bool smooth) bool smooth)
{ {
LPDIRECT3DTEXTURE lut;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
LPDIRECT3DDEVICE d3dr = chain->dev; LPDIRECT3DDEVICE d3dr = chain->dev;
LPDIRECT3DTEXTURE lut = (LPDIRECT3DTEXTURE)
RARCH_LOG("[D3D]: Loading LUT texture: %s.\n", path.c_str()); d3d_texture_new(d3dr,
lut = (LPDIRECT3DTEXTURE)d3d_texture_new(d3dr,
path.c_str(), path.c_str(),
D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2,
D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2,
@ -239,6 +236,8 @@ bool renderchain_add_lut(void *data, const std::string &id,
NULL NULL
); );
RARCH_LOG("[D3D]: LUT texture loaded: %s.\n", path.c_str());
lut_info info = { lut, id, smooth }; lut_info info = { lut, id, smooth };
if (!lut) if (!lut)
return false; return false;
@ -263,7 +262,7 @@ void renderchain_add_state_tracker(void *data, void *tracker_data)
void renderchain_start_render(void *data) void renderchain_start_render(void *data)
{ {
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
if (!chain) if (!chain)
return; return;
@ -276,7 +275,7 @@ void renderchain_start_render(void *data)
void renderchain_end_render(void *data) void renderchain_end_render(void *data)
{ {
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
if (!chain) if (!chain)
return; return;
@ -297,8 +296,8 @@ bool renderchain_render(void *chain_data, const void *data,
renderchain_start_render(chain); renderchain_start_render(chain);
current_width = width; current_width = width;
current_height = height; current_height = height;
renderchain_convert_geometry(chain, &chain->passes[0].info, renderchain_convert_geometry(chain, &chain->passes[0].info,
&out_width, &out_height, &out_width, &out_height,
current_width, current_height, chain->final_viewport); current_width, current_height, chain->final_viewport);
@ -327,14 +326,14 @@ bool renderchain_render(void *chain_data, const void *data,
current_width, current_height, chain->final_viewport); current_width, current_height, chain->final_viewport);
/* Clear out whole FBO. */ /* Clear out whole FBO. */
viewport.Width = to_pass->info.tex_w; viewport.Width = to_pass->info.tex_w;
viewport.Height = to_pass->info.tex_h; viewport.Height = to_pass->info.tex_h;
viewport.MinZ = 0.0f; viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f; viewport.MaxZ = 1.0f;
d3d_set_viewport(d3dr, &viewport); d3d_set_viewport(d3dr, &viewport);
d3d_clear(d3dr, 0, 0, D3DCLEAR_TARGET, 0, 1, 0); d3d_clear(d3dr, 0, 0, D3DCLEAR_TARGET, 0, 1, 0);
viewport.Width = out_width; viewport.Width = out_width;
viewport.Height = out_height; viewport.Height = out_height;
renderchain_set_viewport(chain, &viewport); renderchain_set_viewport(chain, &viewport);
@ -397,18 +396,17 @@ bool renderchain_create_first_pass(void *data, const void *info_data,
d3d_set_transform(d3dr, D3DTS_WORLD, &ident); d3d_set_transform(d3dr, D3DTS_WORLD, &ident);
d3d_set_transform(d3dr, D3DTS_VIEW, &ident); d3d_set_transform(d3dr, D3DTS_VIEW, &ident);
pass.info = *info; pass.info = *info;
pass.last_width = 0; pass.last_width = 0;
pass.last_height = 0; pass.last_height = 0;
chain->prev.ptr = 0; chain->prev.ptr = 0;
for (i = 0; i < TEXTURES; i++) for (i = 0; i < TEXTURES; i++)
{ {
chain->prev.last_width[i] = 0; chain->prev.last_width[i] = 0;
chain->prev.last_height[i] = 0; chain->prev.last_height[i] = 0;
chain->prev.vertex_buf[i] = d3d_vertex_buffer_new(
chain->prev.vertex_buf[i] = d3d_vertex_buffer_new(
d3dr, 4 * sizeof(Vertex), d3dr, 4 * sizeof(Vertex),
d3dr->GetSoftwareVertexProcessing() d3dr->GetSoftwareVertexProcessing()
? D3DUSAGE_SOFTWAREPROCESSING : 0, ? D3DUSAGE_SOFTWAREPROCESSING : 0,
@ -668,6 +666,7 @@ void renderchain_log_info(void *data, const void *info_data)
RARCH_LOG("\tTexture height: %u\n", info->tex_h); RARCH_LOG("\tTexture height: %u\n", info->tex_h);
RARCH_LOG("\tScale type (X): "); RARCH_LOG("\tScale type (X): ");
switch (info->pass->fbo.type_x) switch (info->pass->fbo.type_x)
{ {
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT:
@ -684,6 +683,7 @@ void renderchain_log_info(void *data, const void *info_data)
} }
RARCH_LOG("\tScale type (Y): "); RARCH_LOG("\tScale type (Y): ");
switch (info->pass->fbo.type_y) switch (info->pass->fbo.type_y)
{ {
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT: