MoNTE48/irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fixed issue with BlendFactor in OpenGL ES1 and ES2 drivers.

Browse Source 
- Added missing from the last merge EVDF check.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4884 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
nadro 2014-05-26 16:40:42 +00:00
parent 02b07f10f2
commit 6c8e9ec729
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/Irrlicht/COGLES2Driver.cpp
View File

@ -1746,7 +1746,7 @@ bool COGLES2Driver::endScene()
} }
// Blend Factor // Blend Factor
if (material.BlendFactor != 0.f) if (IR(material.BlendFactor) & 0xFFFFFFFF)
{ {
E_BLEND_FACTOR srcRGBFact = EBF_ZERO; E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
E_BLEND_FACTOR dstRGBFact = EBF_ZERO; E_BLEND_FACTOR dstRGBFact = EBF_ZERO;

2
source/Irrlicht/COGLESDriver.cpp
View File

@ -2043,7 +2043,7 @@ void COGLES1Driver::setBasicRenderStates(const SMaterial& material, const SMater
} }
// Blend Factor // Blend Factor
if (material.BlendFactor != 0.f) if (IR(material.BlendFactor) & 0xFFFFFFFF)
{ {
E_BLEND_FACTOR srcRGBFact = EBF_ZERO; E_BLEND_FACTOR srcRGBFact = EBF_ZERO;
E_BLEND_FACTOR dstRGBFact = EBF_ZERO; E_BLEND_FACTOR dstRGBFact = EBF_ZERO;

2
source/Irrlicht/COpenGLExtensionHandler.cpp
View File

@ -801,6 +801,8 @@ bool COpenGLExtensionHandler::queryFeature(E_VIDEO_DRIVER_FEATURE feature) const
case EVDF_BLEND_OPERATIONS: case EVDF_BLEND_OPERATIONS:
return (Version>=140) || FeatureAvailable[IRR_EXT_blend_minmax] || return (Version>=140) || FeatureAvailable[IRR_EXT_blend_minmax] ||
FeatureAvailable[IRR_EXT_blend_subtract] || FeatureAvailable[IRR_EXT_blend_logic_op]; FeatureAvailable[IRR_EXT_blend_subtract] || FeatureAvailable[IRR_EXT_blend_logic_op];
case EVDF_BLEND_SEPARATE:
return (Version >= 140) || FeatureAvailable[IRR_EXT_blend_func_separate];
case EVDF_TEXTURE_MATRIX: case EVDF_TEXTURE_MATRIX:
return true; return true;
case EVDF_TEXTURE_COMPRESSED_DXT: case EVDF_TEXTURE_COMPRESSED_DXT: