(D3D) Update

This commit is contained in:
twinaphex 2015-04-05 02:31:24 +02:00
parent 4e7f1f0dc8
commit 6e04afad4d
2 changed files with 23 additions and 20 deletions

View File

@ -214,15 +214,16 @@ bool renderchain_add_pass(void *data, const void *info_data)
return true; return true;
} }
bool renderchain_add_lut(void *data, const std::string &id, bool renderchain_add_lut(void *data, const char *id,
const std::string &path, const char *path,
bool smooth) bool smooth)
{ {
lut_info info;
renderchain_t *chain = (renderchain_t*)data; renderchain_t *chain = (renderchain_t*)data;
LPDIRECT3DDEVICE d3dr = chain->dev; LPDIRECT3DDEVICE d3dr = chain->dev;
LPDIRECT3DTEXTURE lut = (LPDIRECT3DTEXTURE) LPDIRECT3DTEXTURE lut = (LPDIRECT3DTEXTURE)
d3d_texture_new(d3dr, d3d_texture_new(d3dr,
path.c_str(), path,
D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2,
D3DX_DEFAULT_NONPOW2, D3DX_DEFAULT_NONPOW2,
0, 0,
@ -236,9 +237,11 @@ bool renderchain_add_lut(void *data, const std::string &id,
NULL NULL
); );
RARCH_LOG("[D3D]: LUT texture loaded: %s.\n", path.c_str()); RARCH_LOG("[D3D]: LUT texture loaded: %s.\n", path);
lut_info info = { lut, id, smooth }; info.tex = lut;
info.smooth = smooth;
strcpy(info.id, id);
if (!lut) if (!lut)
return false; return false;

View File

@ -121,8 +121,8 @@ bool renderchain_set_pass_size(void *data, unsigned pass_index,
bool renderchain_add_pass(void *data, const void *info_data); bool renderchain_add_pass(void *data, const void *info_data);
bool renderchain_add_lut(void *data, const std::string &id, bool renderchain_add_lut(void *data,
const std::string &path, const char *id, const char *path,
bool smooth); bool smooth);
void renderchain_add_state_tracker(void *data, void *tracker_data); void renderchain_add_state_tracker(void *data, void *tracker_data);