diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp index cb26d81c89..c0bc403b25 100644 --- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp +++ b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLBlitFramebufferHelper.cpp @@ -14,10 +14,6 @@ #include #include #include -#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include -#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include namespace NCryOpenGL { diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp index 6983bd4fdf..d83ba2c95f 100644 --- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp +++ b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLExtensions.hpp @@ -21,11 +21,6 @@ #define CryEngine_GLExtensions_hpp #pragma once -#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include "hlslcc.hpp" -#include "hlslcc_bin.hpp" -#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER - #if DXGLES && DXGLES_VERSION == DXGLES_VERSION_30 && defined(GL_EXT_separate_shader_objects) && defined(IOS) // On OpenGL ES separate shader programs are available as an extesion, so we // just define the normal api here to avoid ifdefing the entire code diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp index 7974411481..13f5cb2d15 100644 --- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp +++ b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.cpp @@ -19,11 +19,6 @@ #include "GLDevice.hpp" #include -#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include "hlslcc.hpp" -#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include "hlslcc_bin.hpp" - struct SAutoBindProgram { SAutoBindProgram(const GLuint uProgram) diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp index 430a5bf1c8..195b29fff0 100644 --- a/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp +++ b/Code/CryEngine/RenderDll/XRenderD3D9/DXGL/Implementation/GLShader.hpp @@ -18,9 +18,6 @@ #define __GLSHADER__ #include "GLCommon.hpp" -#if !DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER -#include "hlslcc.hpp" -#endif //!DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER #if DXGL_GLSL_FROM_HLSLCROSSCOMPILER && !DXGL_INPUT_GLSL && DXGL_SUPPORT_SHADER_STORAGE_BLOCKS #define DXGL_ENABLE_SHADER_TRACING 1 diff --git a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp index 2834559226..f105fda2cf 100644 --- a/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp +++ b/Code/CryEngine/RenderDll/XRenderD3D9/DXMETAL/Implementation/GLShader.cpp @@ -17,11 +17,6 @@ #include "MetalDevice.hpp" #include "GLExtensions.hpp" -// Confetti BEGIN: Igor Lobanchikov -#include "hlslcc.hpp" -#include "hlslcc_bin.hpp" -// Confetti End: Igor Lobanchikov - namespace NCryMetal { SSource::SSource(const char* pData, uint32 uDataSize)