Merge branch 'pr-42'

This commit is contained in:
Luke Street 2020-02-21 13:49:29 -05:00
commit 0c83839680
1 changed files with 1 additions and 1 deletions

View File

@ -1306,7 +1306,7 @@ class D3D11DataFactoryImpl : public D3D11DataFactory, public GraphicsDataFactory
const std::array<VertexElementDescriptor, 2> vfmt{{{VertexSemantic::Position4}, {VertexSemantic::UV4}}}; const std::array<VertexElementDescriptor, 2> vfmt{{{VertexSemantic::Position4}, {VertexSemantic::UV4}}};
AdditionalPipelineInfo info = { AdditionalPipelineInfo info = {
BlendFactor::One, BlendFactor::Zero, Primitive::TriStrips, ZTest::None, false, true, false, CullMode::None}; BlendFactor::One, BlendFactor::Zero, Primitive::TriStrips, ZTest::None, false, true, false, CullMode::None};
m_gammaShader = ctx.newShaderPipeline(vertexShader, fragmentShader, vfmt.data(), info); m_gammaShader = ctx.newShaderPipeline(vertexShader, fragmentShader, VertexFormatInfo(vfmt.size(), vfmt.data()), info);
m_gammaLUT = ctx.newDynamicTexture(256, 256, TextureFormat::I16, TextureClampMode::ClampToEdge); m_gammaLUT = ctx.newDynamicTexture(256, 256, TextureFormat::I16, TextureClampMode::ClampToEdge);
setDisplayGamma(1.f); setDisplayGamma(1.f);