From 417506572cce70328a48764332b21d615e1b74d7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 28 Sep 2019 22:07:03 -0400 Subject: [PATCH] Graphics/Shaders/CCameraBlurFilter: Move Vert definition into cpp file This is private and not used anywhere in the exposed interface, so this can be moved into the cpp file to make it an implementation detail and allow moving a zeus header into the cpp file. --- Runtime/Graphics/Shaders/CCameraBlurFilter.cpp | 9 ++++++++- Runtime/Graphics/Shaders/CCameraBlurFilter.hpp | 8 +------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp index 6829ff821..491a62a6f 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.cpp @@ -6,10 +6,17 @@ #include "Runtime/Graphics/CGraphics.hpp" #include +#include namespace urde { +namespace { +struct Vert { + zeus::CVector2f m_pos; + zeus::CVector2f m_uv; +}; -static boo::ObjToken s_Pipeline; +boo::ObjToken s_Pipeline; +} // Anonymous namespace void CCameraBlurFilter::Initialize() { s_Pipeline = hecl::conv->convert(Shader_CCameraBlurFilter{}); } diff --git a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp index f7869ff8e..19922a58f 100644 --- a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp +++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp @@ -1,22 +1,16 @@ #pragma once #include - -#include #include namespace urde { class CCameraBlurFilter { - struct Vert { - zeus::CVector2f m_pos; - zeus::CVector2f m_uv; - }; - struct Uniform { zeus::CVector4f m_uv[6]; float m_opacity = 1.f; }; + boo::ObjToken m_vbo; boo::ObjToken m_uniBuf; boo::ObjToken m_dataBind;