Separate OpenGL code from Linux or Mac.

This commit is contained in:
LuisAntonRebollo 2014-11-08 01:32:11 +01:00
parent c354f59b72
commit 7f183ef9e5
2 changed files with 8 additions and 8 deletions

View file

@ -31,10 +31,11 @@
#include "gfx/gfxDevice.h"
#include "core/util/safeDelete.h"
#if !defined( TORQUE_OS_MAC ) && !defined( TORQUE_OS_LINUX )
#if defined( TORQUE_OS_WIN32 ) || defined( TORQUE_OS_XBOX )
# include "lighting/advanced/hlsl/gBufferConditionerHLSL.h"
# include "lighting/advanced/hlsl/advancedLightingFeaturesHLSL.h"
#else
#endif
#if defined( TORQUE_OPENGL )
# include "lighting/advanced/glsl/gBufferConditionerGLSL.h"
# include "lighting/advanced/glsl/advancedLightingFeaturesGLSL.h"
#endif
@ -54,7 +55,7 @@ void AdvancedLightingFeatures::registerFeatures( const GFXFormat &prepassTargetF
if(GFX->getAdapterType() == OpenGL)
{
#if defined( TORQUE_OS_MAC ) || defined( TORQUE_OS_LINUX )
#if defined( TORQUE_OPENGL )
cond = new GBufferConditionerGLSL( prepassTargetFormat, GBufferConditionerGLSL::ViewSpace );
FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond);
FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatGLSL());
@ -66,7 +67,7 @@ void AdvancedLightingFeatures::registerFeatures( const GFXFormat &prepassTargetF
}
else
{
#if !defined( TORQUE_OS_MAC ) && !defined( TORQUE_OS_LINUX )
#if defined( TORQUE_OS_WIN32 )
cond = new GBufferConditionerHLSL( prepassTargetFormat, GBufferConditionerHLSL::ViewSpace );
FEATUREMGR->registerFeature(MFT_PrePassConditioner, cond);
FEATUREMGR->registerFeature(MFT_RTLighting, new DeferredRTLightingFeatHLSL());