Revert "Linux/mac hlsl header refs removed"

This reverts commit 6f33e1404e.
This commit is contained in:
Aristo7
2021-04-20 12:52:40 -05:00
parent 6f33e1404e
commit 2a59b7e0e6
5 changed files with 22 additions and 0 deletions
@@ -14,6 +14,10 @@
#include <Implementation/GLBlitFramebufferHelper.hpp>
#include <Implementation/GLBlitShaders.hpp>
#include <Implementation/GLContext.hpp>
#if DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
#include <hlslcc.hpp>
#endif //DXGL_INPUT_GLSL && DXGL_GLSL_FROM_HLSLCROSSCOMPILER
#include <hlslcc_bin.hpp>
namespace NCryOpenGL
{
@@ -21,6 +21,11 @@
#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
@@ -19,6 +19,11 @@
#include "GLDevice.hpp"
#include <Common/RenderCapabilities.h>
#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)
@@ -18,6 +18,9 @@
#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
@@ -17,6 +17,11 @@
#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)