From ea5a7469f2111f2c059fe8ed70efb5f8026c7694 Mon Sep 17 00:00:00 2001 From: Marcel Schindler Date: Thu, 6 Sep 2018 21:12:00 +0200 Subject: [PATCH] !B (Renderer, Xbox) Fixes compilation error in RenderDisplayContext on Durango Copied from Perforce Change: 1847214 --- Code/CryEngine/RenderDll/Common/RenderDisplayContext.h | 1 + Code/CryEngine/RenderDll/Common/RendererResources.h | 5 +++++ Code/CryEngine/RenderDll/Common/Shaders/CShader.h | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Code/CryEngine/RenderDll/Common/RenderDisplayContext.h b/Code/CryEngine/RenderDll/Common/RenderDisplayContext.h index c9103a2e1..5098692b3 100644 --- a/Code/CryEngine/RenderDll/Common/RenderDisplayContext.h +++ b/Code/CryEngine/RenderDll/Common/RenderDisplayContext.h @@ -2,6 +2,7 @@ #pragma once +#include "RendererResources.h" #include "SwapChain.h" class CRenderOutput; diff --git a/Code/CryEngine/RenderDll/Common/RendererResources.h b/Code/CryEngine/RenderDll/Common/RendererResources.h index a8cb042cb..ea0d1b070 100644 --- a/Code/CryEngine/RenderDll/Common/RendererResources.h +++ b/Code/CryEngine/RenderDll/Common/RendererResources.h @@ -4,6 +4,11 @@ #include +//=================================================================== + +#define MAX_ENVTEXTURES 16 +#define MAX_ENVTEXSCANDIST 0.1f + class CTexture; struct SEnvTexture; diff --git a/Code/CryEngine/RenderDll/Common/Shaders/CShader.h b/Code/CryEngine/RenderDll/Common/Shaders/CShader.h index e18bfc58c..7b9a172ed 100644 --- a/Code/CryEngine/RenderDll/Common/Shaders/CShader.h +++ b/Code/CryEngine/RenderDll/Common/Shaders/CShader.h @@ -19,11 +19,6 @@ struct SSunFlare; //=================================================================== -#define MAX_ENVTEXTURES 16 -#define MAX_ENVTEXSCANDIST 0.1f - -//=============================================================================== - struct SMacroFX { string m_szMacro; -- 2.11.4.GIT