Skip to content
This repository has been archived by the owner on Apr 7, 2021. It is now read-only.

Commit

Permalink
Shader data binding API update
Browse files Browse the repository at this point in the history
  • Loading branch information
jackoalan committed Apr 4, 2016
1 parent d49a33e commit a8ae371
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/TextView.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@ TextView::TextView(ViewResources& res,
m_shaderBinding = ctx.newShaderDataBinding(shader, m_vtxFmt,
nullptr, m_glyphBuf, nullptr, 1,
(boo::IGraphicsBuffer**)&m_viewVertBlockBuf,
1, texs);
nullptr, 1, texs);
}
else
{
boo::ITexture* texs[] = {m_fontAtlas.texture()};
m_shaderBinding = ctx.newShaderDataBinding(shader, res.m_textRes.m_vtxFmt,
nullptr, m_glyphBuf, nullptr, 1,
(boo::IGraphicsBuffer**)&m_viewVertBlockBuf,
1, texs);
nullptr, 1, texs);
}
return true;
});
Expand Down
8 changes: 4 additions & 4 deletions lib/View.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,15 @@ void View::VertexBufferBinding::initSolid(boo::IGraphicsDataFactory::Context& ct
boo::IGraphicsBuffer* bufs[] = {viewBlockBuf};
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader,
m_vtxFmt, m_vertsBuf, nullptr,
nullptr, 1, bufs, 0, nullptr);
nullptr, 1, bufs, nullptr, 0, nullptr);
}
else
{
boo::IGraphicsBuffer* bufs[] = {viewBlockBuf};
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_solidShader,
res.m_viewRes.m_solidVtxFmt,
m_vertsBuf, nullptr,
nullptr, 1, bufs, 0, nullptr);
nullptr, 1, bufs, nullptr, 0, nullptr);
}
}

Expand All @@ -425,7 +425,7 @@ void View::VertexBufferBinding::initTex(boo::IGraphicsDataFactory::Context& ctx,
boo::ITexture* tex[] = {texture};
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader,
m_vtxFmt, m_vertsBuf, nullptr,
nullptr, 1, bufs, 1, tex);
nullptr, 1, bufs, nullptr, 1, tex);
}
else
{
Expand All @@ -434,7 +434,7 @@ void View::VertexBufferBinding::initTex(boo::IGraphicsDataFactory::Context& ctx,
m_shaderBinding = ctx.newShaderDataBinding(res.m_viewRes.m_texShader,
res.m_viewRes.m_texVtxFmt,
m_vertsBuf, nullptr,
nullptr, 1, bufs, 1, tex);
nullptr, 1, bufs, nullptr, 1, tex);
}
}

Expand Down

0 comments on commit a8ae371

Please sign in to comment.