mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly replace template.

Browse Source 
Avoid having to assume a magic variable is present in scope.
This commit is contained in:
Themaister 2014-01-15 17:24:24 +01:00
parent 73b23f7002
commit c4978651fa
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gfx/d3d9/render_chain.cpp
View File

@ -14,6 +14,7 @@
*/ */
#include "render_chain.hpp" #include "render_chain.hpp"
#include <string.h>
namespace Global namespace Global
{ {
@ -498,7 +499,7 @@ void RenderChain::set_vertices(Pass &pass,
void *verts; void *verts;
pass.vertex_buf->Lock(0, sizeof(vert), &verts, 0); pass.vertex_buf->Lock(0, sizeof(vert), &verts, 0);
std::memcpy(verts, vert, sizeof(vert)); memcpy(verts, vert, sizeof(vert));
pass.vertex_buf->Unlock(); pass.vertex_buf->Unlock();
} }
@ -536,17 +537,17 @@ void RenderChain::set_cg_mvp(CGprogram &vPrg,
cgD3D9SetUniformMatrix(cgpModelViewProj, &tmp); cgD3D9SetUniformMatrix(cgpModelViewProj, &tmp);
} }
#define set_cg_param(prog, param, val) \ #define set_cg_param(prog, param, val) do { \
cgp = cgGetNamedParameter(prog, param); \ CGparameter cgp = cgGetNamedParameter(prog, param); \
if (cgp) \ if (cgp) \
cgD3D9SetUniform(cgp, &val); cgD3D9SetUniform(cgp, &val); \
} while(0)
void RenderChain::set_cg_params(Pass &pass, void RenderChain::set_cg_params(Pass &pass,
unsigned video_w, unsigned video_h, unsigned video_w, unsigned video_h,
unsigned tex_w, unsigned tex_h, unsigned tex_w, unsigned tex_h,
unsigned viewport_w, unsigned viewport_h) unsigned viewport_w, unsigned viewport_h)
{ {
CGparameter cgp;
D3DXVECTOR2 video_size; D3DXVECTOR2 video_size;
video_size.x = video_w; video_size.x = video_w;
video_size.y = video_h; video_size.y = video_h;
@ -717,7 +718,6 @@ void RenderChain::log_info(const LinkInfo &info)
void RenderChain::bind_orig(Pass &pass) void RenderChain::bind_orig(Pass &pass)
{ {
CGparameter cgp;
D3DXVECTOR2 video_size; D3DXVECTOR2 video_size;
video_size.x = passes[0].last_width; video_size.x = passes[0].last_width;
video_size.y = passes[0].last_height; video_size.y = passes[0].last_height;
@ -782,7 +782,6 @@ void RenderChain::bind_prev(Pass &pass)
snprintf(attr_tex_size, sizeof(attr_tex_size), "%s.texture_size", prev_names[i]); snprintf(attr_tex_size, sizeof(attr_tex_size), "%s.texture_size", prev_names[i]);
snprintf(attr_coord, sizeof(attr_coord), "%s.tex_coord", prev_names[i]); snprintf(attr_coord, sizeof(attr_coord), "%s.tex_coord", prev_names[i]);
CGparameter cgp;
D3DXVECTOR2 video_size; D3DXVECTOR2 video_size;
video_size.x = prev.last_width[(prev.ptr - (i + 1)) & TexturesMask]; video_size.x = prev.last_width[(prev.ptr - (i + 1)) & TexturesMask];
video_size.y = prev.last_height[(prev.ptr - (i + 1)) & TexturesMask]; video_size.y = prev.last_height[(prev.ptr - (i + 1)) & TexturesMask];
@ -829,7 +828,6 @@ void RenderChain::bind_pass(Pass &pass, unsigned pass_index)
for (unsigned i = 1; i < pass_index - 1; i++) for (unsigned i = 1; i < pass_index - 1; i++)
{ {
CGparameter cgp;
char pass_base[64]; char pass_base[64];
snprintf(pass_base, sizeof(pass_base), "PASS%u.", i); snprintf(pass_base, sizeof(pass_base), "PASS%u.", i);
@ -955,7 +953,7 @@ static inline bool validate_param_name(const char *name)
}; };
for (unsigned i = 0; i < sizeof(illegal) / sizeof(illegal[0]); i++) for (unsigned i = 0; i < sizeof(illegal) / sizeof(illegal[0]); i++)
if (std::strstr(name, illegal[i]) == name) if (strstr(name, illegal[i]) == name)
return false; return false;
return true; return true;
@ -1134,7 +1132,6 @@ void RenderChain::bind_tracker(Pass &pass, unsigned pass_index)
for (unsigned i = 0; i < uniform_cnt; i++) for (unsigned i = 0; i < uniform_cnt; i++)
{ {
CGparameter cgp;
set_cg_param(pass.fPrg, uniform_info[i].id, uniform_info[i].value); set_cg_param(pass.fPrg, uniform_info[i].id, uniform_info[i].value);
set_cg_param(pass.vPrg, uniform_info[i].id, uniform_info[i].value); set_cg_param(pass.vPrg, uniform_info[i].id, uniform_info[i].value);
} }