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

Update boo

This commit is contained in:
Jack Andersen 2018-10-18 16:19:17 -10:00
parent 561bdac1c4
commit 808e46a4ef
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hecl/extern/boo vendored

@ -1 +1 @@
Subproject commit a8325044567a0e629fb4a04b8d23ff57225f84a9 Subproject commit 7bda89073daeec487f9c82f220f199a687a1826b

10
hecl/include/hecl/PipelineBase.hpp
View File

@ -183,10 +183,16 @@ public:
std::is_base_of<TessellationShader, I>, std::is_base_of<TessellationShader, I>,
std::is_same<P, PlatformType::Metal>>>* = 0) std::is_same<P, PlatformType::Metal>>>* = 0)
{ {
m_vertex = conv.getVertexConverter().convert(ctx, in);
m_fragment = conv.getFragmentConverter().convert(ctx, in);
if (in.HasTessellation) if (in.HasTessellation)
{
m_control = conv.getControlConverter().convert(ctx, in);
m_evaluation = conv.getEvaluationConverter().convert(ctx, in); m_evaluation = conv.getEvaluationConverter().convert(ctx, in);
}
else
{
m_vertex = conv.getVertexConverter().convert(ctx, in);
}
m_fragment = conv.getFragmentConverter().convert(ctx, in);
m_vtxFmt = in.VtxFmt; m_vtxFmt = in.VtxFmt;
m_additionalInfo = in.PipelineInfo; m_additionalInfo = in.PipelineInfo;
MakeHash(); MakeHash();