Commit 220208c0 authored by hybrid's avatar hybrid

Merge the two legacy ps_1_x work-arounds into one if block in order to avoid...

Merge the two legacy ps_1_x work-arounds into one if block in order to avoid falling back to 1_x even if 2_x is supported. Thanks to DeM0nFiRe for help on this topic.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2495 dfc29bdd-3216-0410-991c-e03cc46cb475
parent b87a5a13
...@@ -182,7 +182,10 @@ bool CD3D9HLSLMaterialRenderer::createHLSLPixelShader(const char* pixelShaderPro ...@@ -182,7 +182,10 @@ bool CD3D9HLSLMaterialRenderer::createHLSLPixelShader(const char* pixelShaderPro
flags |= D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY; flags |= D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY;
#endif #endif
#if defined(_IRR_D3D_USE_LEGACY_HLSL_COMPILER) && defined(D3DXSHADER_USE_LEGACY_D3DX9_31_DLL) #if defined(_IRR_D3D_USE_LEGACY_HLSL_COMPILER) && defined(D3DXSHADER_USE_LEGACY_D3DX9_31_DLL)
flags |= D3DXSHADER_USE_LEGACY_D3DX9_31_DLL; #ifdef D3DXSHADER_ENABLE_BACKWARDS_COMPATIBILITY
else
#endif
flags |= D3DXSHADER_USE_LEGACY_D3DX9_31_DLL;
#endif #endif
#ifdef _IRR_D3D_NO_SHADER_DEBUGGING #ifdef _IRR_D3D_NO_SHADER_DEBUGGING
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment