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

Shader data binding API update

This commit is contained in:
Jack Andersen 2016-04-03 20:15:46 -10:00
parent 223b5c12c4
commit fa32f002b7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
specter/lib/TextView.cpp
View File

@ -339,7 +339,7 @@ TextView::TextView(ViewResources& res,
m_shaderBinding = ctx.newShaderDataBinding(shader, m_vtxFmt, m_shaderBinding = ctx.newShaderDataBinding(shader, m_vtxFmt,
nullptr, m_glyphBuf, nullptr, 1, nullptr, m_glyphBuf, nullptr, 1,
(boo::IGraphicsBuffer**)&m_viewVertBlockBuf, (boo::IGraphicsBuffer**)&m_viewVertBlockBuf,
1, texs); nullptr, 1, texs);
} }
else else
{ {
@ -347,7 +347,7 @@ TextView::TextView(ViewResources& res,
m_shaderBinding = ctx.newShaderDataBinding(shader, res.m_textRes.m_vtxFmt, m_shaderBinding = ctx.newShaderDataBinding(shader, res.m_textRes.m_vtxFmt,
nullptr, m_glyphBuf, nullptr, 1, nullptr, m_glyphBuf, nullptr, 1,
(boo::IGraphicsBuffer**)&m_viewVertBlockBuf, (boo::IGraphicsBuffer**)&m_viewVertBlockBuf,
1, texs); nullptr, 1, texs);
} }
return true; return true;
}); });

8
specter/lib/View.cpp
View File

@ -394,7 +394,7 @@ void View::VertexBufferBinding::initSolid(boo::IGraphicsDataFactory::Context& ct
boo::IGraphicsBuffer* bufs[] = {viewBlockBuf}; boo::IGraphicsBuffer* bufs[] = {viewBlockBuf};
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader, m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader,
m_vtxFmt, m_vertsBuf, nullptr, m_vtxFmt, m_vertsBuf, nullptr,
nullptr, 1, bufs, 0, nullptr); nullptr, 1, bufs, nullptr, 0, nullptr);
} }
else else
{ {
@ -402,7 +402,7 @@ void View::VertexBufferBinding::initSolid(boo::IGraphicsDataFactory::Context& ct
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader, m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader,
res.m_viewRes.m_solidVtxFmt, res.m_viewRes.m_solidVtxFmt,
m_vertsBuf, nullptr, m_vertsBuf, nullptr,
nullptr, 1, bufs, 0, nullptr); nullptr, 1, bufs, nullptr, 0, nullptr);
} }
} }
@ -425,7 +425,7 @@ void View::VertexBufferBinding::initTex(boo::IGraphicsDataFactory::Context& ctx,
boo::ITexture* tex[] = {texture}; boo::ITexture* tex[] = {texture};
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader, m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader,
m_vtxFmt, m_vertsBuf, nullptr, m_vtxFmt, m_vertsBuf, nullptr,
nullptr, 1, bufs, 1, tex); nullptr, 1, bufs, nullptr, 1, tex);
} }
else else
{ {
@ -434,7 +434,7 @@ void View::VertexBufferBinding::initTex(boo::IGraphicsDataFactory::Context& ctx,
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader, m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader,
res.m_viewRes.m_texVtxFmt, res.m_viewRes.m_texVtxFmt,
m_vertsBuf, nullptr, m_vertsBuf, nullptr,
nullptr, 1, bufs, 1, tex); nullptr, 1, bufs, nullptr, 1, tex);
} }
} }