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

D3D sync

This commit is contained in:
Jack Andersen 2016-03-23 22:35:38 -10:00
parent 737b688295
commit 83b89ceee6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
specter/lib/TextView.cpp
View File

@ -174,14 +174,14 @@ void TextView::Resources::init(boo::ID3DDataFactory* factory, FontCache* fcache)
m_regular = m_regular =
factory->newShaderPipeline(VS, FSReg, blobVert, blobFrag, blobPipe, m_vtxFmt, factory->newShaderPipeline(VS, FSReg, blobVert, blobFrag, blobPipe, m_vtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
blobFrag.Reset(); blobFrag.Reset();
blobPipe.Reset(); blobPipe.Reset();
m_subpixel = m_subpixel =
factory->newShaderPipeline(nullptr, FSSubpixel, blobVert, blobFrag, blobPipe, m_vtxFmt, factory->newShaderPipeline(nullptr, FSSubpixel, blobVert, blobFrag, blobPipe, m_vtxFmt,
boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1, boo::BlendFactor::SrcColor1, boo::BlendFactor::InvSrcColor1,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif

4
specter/lib/View.cpp
View File

@ -167,7 +167,7 @@ void View::Resources::init(boo::ID3DDataFactory* factory, const IThemeData& them
ComPtr<ID3DBlob> pipeBlob; ComPtr<ID3DBlob> pipeBlob;
m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, vertBlob, fragBlob, pipeBlob, m_solidVtxFmt, m_solidShader = factory->newShaderPipeline(SolidVS, SolidFS, vertBlob, fragBlob, pipeBlob, m_solidVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
boo::VertexElementDescriptor texvdescs[] = boo::VertexElementDescriptor texvdescs[] =
{ {
@ -181,7 +181,7 @@ void View::Resources::init(boo::ID3DDataFactory* factory, const IThemeData& them
pipeBlob.Reset(); pipeBlob.Reset();
m_texShader = factory->newShaderPipeline(TexVS, TexFS, vertBlob, fragBlob, pipeBlob, m_texVtxFmt, m_texShader = factory->newShaderPipeline(TexVS, TexFS, vertBlob, fragBlob, pipeBlob, m_texVtxFmt,
boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha, boo::BlendFactor::SrcAlpha, boo::BlendFactor::InvSrcAlpha,
false, false, false); boo::Primitive::TriStrips, false, false, false);
} }
#endif #endif