mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(slang) cleanups.

Browse Source
This commit is contained in:
aliaspider 2018-01-31 19:36:31 +01:00
parent 0ccfa3804b
commit f34dbdff8b
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gfx/drivers_shader/slang_process.cpp
View File

@ -329,11 +329,7 @@ bool slang_process(
ps->set_options(options);
std::vector<HLSLVertexAttributeRemap> vs_attrib_remap;
#if 0
/* remaps vertex shader output too so disable for now */
vs_attrib_remap.push_back({ 0, "POSITION" });
vs_attrib_remap.push_back({ 1, "TEXCOORD" });
#endif
/* not exactly a vertex attribute but this remaps
* float2 FragCoord :TEXCOORD# to float4 FragCoord : SV_POSITION */
std::vector<HLSLVertexAttributeRemap> ps_attrib_remap;
@ -370,11 +366,8 @@ bool slang_process(
else
goto error;
pass.source.string.vertex = (char*)malloc(vs_code.size() + 1);
memcpy(pass.source.string.vertex, vs_code.c_str(), vs_code.size() + 1);
pass.source.string.fragment = (char*)malloc(ps_code.size() + 1);
memcpy(pass.source.string.fragment, ps_code.c_str(), ps_code.size() + 1);
pass.source.string.vertex = strdup(vs_code.c_str());
pass.source.string.fragment = strdup(ps_code.c_str());
if (!slang_process_reflection(
vs_compiler, ps_compiler, vs_resources, ps_resources, shader_info, pass_number,
@ -383,7 +376,7 @@ bool slang_process(
} catch (const std::exception& e)
{
RARCH_ERR("[slang]: spir2cross threw exception: %s.\n", e.what());
RARCH_ERR("[slang]: SPIRV-Cross threw exception: %s.\n", e.what());
goto error;
}

2
gfx/drivers_shader/slang_reflection.cpp
View File

@ -673,7 +673,7 @@ bool slang_reflect_spirv(const std::vector<uint32_t> &vertex,
}
catch (const std::exception &e)
{
RARCH_ERR("[slang]: spir2cross threw exception: %s.\n", e.what());
RARCH_ERR("[slang]: SPIRV-Cross threw exception: %s.\n", e.what());
return false;
}
}