From bf4fce5553f6dff1da2fb244c28c55a81f31308b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 11 May 2017 09:14:38 -1000 Subject: [PATCH] CRadarPaintShader vertex format fix; update hecl --- Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp | 2 +- Runtime/Graphics/Shaders/CRadarPaintShaderHLSL.cpp | 2 +- Runtime/Graphics/Shaders/CRadarPaintShaderMetal.cpp | 2 +- hecl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp b/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp index cf796fe0a..33c6150be 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShaderGLSL.cpp @@ -126,7 +126,7 @@ CRadarPaintShader::Initialize(boo::VulkanDataFactory::Context& ctx) {nullptr, nullptr, boo::VertexSemantic::UV4, 3}, {nullptr, nullptr, boo::VertexSemantic::Color} }; - s_VtxFmt = ctx.newVertexFormat(2, VtxVmt); + s_VtxFmt = ctx.newVertexFormat(9, VtxVmt); s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, boo::ZTest::None, false, true, false, boo::CullMode::None); diff --git a/Runtime/Graphics/Shaders/CRadarPaintShaderHLSL.cpp b/Runtime/Graphics/Shaders/CRadarPaintShaderHLSL.cpp index a44dc6a5c..70ed24630 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShaderHLSL.cpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShaderHLSL.cpp @@ -84,7 +84,7 @@ CRadarPaintShader::Initialize(boo::ID3DDataFactory::Context& ctx) {nullptr, nullptr, boo::VertexSemantic::UV4, 3}, {nullptr, nullptr, boo::VertexSemantic::Color} }; - s_VtxFmt = ctx.newVertexFormat(2, VtxVmt); + s_VtxFmt = ctx.newVertexFormat(9, VtxVmt); s_Pipeline = ctx.newShaderPipeline(VS, FS, nullptr, nullptr, nullptr, s_VtxFmt, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, diff --git a/Runtime/Graphics/Shaders/CRadarPaintShaderMetal.cpp b/Runtime/Graphics/Shaders/CRadarPaintShaderMetal.cpp index f1f41b2fe..2619c0c78 100644 --- a/Runtime/Graphics/Shaders/CRadarPaintShaderMetal.cpp +++ b/Runtime/Graphics/Shaders/CRadarPaintShaderMetal.cpp @@ -91,7 +91,7 @@ CRadarPaintShader::Initialize(boo::MetalDataFactory::Context& ctx) {nullptr, nullptr, boo::VertexSemantic::UV4, 3}, {nullptr, nullptr, boo::VertexSemantic::Color} }; - s_VtxFmt = ctx.newVertexFormat(2, VtxVmt); + s_VtxFmt = ctx.newVertexFormat(9, VtxVmt); s_Pipeline = ctx.newShaderPipeline(VS, FS, s_VtxFmt, CGraphics::g_ViewportSamples, boo::BlendFactor::SrcAlpha, boo::BlendFactor::One, boo::Primitive::TriStrips, diff --git a/hecl b/hecl index 104d554f4..3878eaa8d 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 104d554f42102390ddcc52fe50832097b78c6c08 +Subproject commit 3878eaa8db88fe30520190fde23785f12b2fed14