From c88535c7ab5a9ad6fb8c18d4b2786e92741a4b90 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Wed, 7 Aug 2019 18:11:46 +0200 Subject: [PATCH] gfx-effect-source: Remove/replace old defines --- source/gfx/gfx-effect-source.cpp | 5 ++--- source/gfx/gfx-effect-source.hpp | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source/gfx/gfx-effect-source.cpp b/source/gfx/gfx-effect-source.cpp index 8622d4e7..4f4d49a9 100644 --- a/source/gfx/gfx-effect-source.cpp +++ b/source/gfx/gfx-effect-source.cpp @@ -25,9 +25,8 @@ #include "obs/gs/gs-helper.hpp" #include "strings.hpp" -#define ST "Shader" -#define ST_FILE ST ".File" -#define ST_TECHNIQUE ST ".Technique" +#define ST_FILE S_SHADER_FILE +#define ST_TECHNIQUE S_SHADER_TECHNIQUE static std::vector static_parameters{ "ViewProj", diff --git a/source/gfx/gfx-effect-source.hpp b/source/gfx/gfx-effect-source.hpp index 0face178..1554861e 100644 --- a/source/gfx/gfx-effect-source.hpp +++ b/source/gfx/gfx-effect-source.hpp @@ -44,7 +44,7 @@ extern "C" { } #define S_SHADER_FILE "Shader.File" -#define S_SHADER_TECHNIQUE ST "Shader.Technique" +#define S_SHADER_TECHNIQUE "Shader.Technique" namespace gfx { namespace effect_source {