AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-09-12 19:36:53 -10:00
parent 8580c5d972 1cd2e6eb5c
commit 8b23c0538e
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp
View File

@ -29,6 +29,7 @@ static const char* VS =
" VertToFrag vtf;\n" " VertToFrag vtf;\n"
" vtf.color = color;\n" " vtf.color = color;\n"
" vtf.uv = v.uvIn.xy;\n" " vtf.uv = v.uvIn.xy;\n"
" vtf.uv.y = -vtf.uv.y;\n"
" vtf.position = float4(v.posIn.xyz, 1.0);\n" " vtf.position = float4(v.posIn.xyz, 1.0);\n"
" return vtf;\n" " return vtf;\n"
"}\n"; "}\n";

1
Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp
View File

@ -31,6 +31,7 @@ static const char* VS =
" VertToFrag vtf;\n" " VertToFrag vtf;\n"
" vtf.color = tqu.color;\n" " vtf.color = tqu.color;\n"
" vtf.uv = v.uvIn.xy;\n" " vtf.uv = v.uvIn.xy;\n"
" vtf.uv.y = -vtf.uv.y;\n"
" vtf.position = float4(v.posIn.xyz, 1.0);\n" " vtf.position = float4(v.posIn.xyz, 1.0);\n"
" return vtf;\n" " return vtf;\n"
"}\n"; "}\n";

2
hecl

@ -1 +1 @@
Subproject commit 88fade1d0df7b34a38e9415adbb04a7eaf838f42 Subproject commit 83dee4423b5d4c5906357d63e90bb70c8230e8bd