Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14778 from VisualSJ/v3_12_11 

Close webgl dedicated test in canvas mode
This commit is contained in:
pandamicro 2015-12-22 18:59:53 +08:00
parent e8d3e3f136 843694cea5
commit e311655fbe
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/js-tests/src/ParticleTest/ParticleTest.js
View File

@ -138,7 +138,7 @@ var particleSceneArr = [
} }
]; ];
if( 'opengl' in cc.sys.capabilities ){ if( 'opengl' in cc.sys.capabilities && cc._renderType === cc.game.RENDER_TYPE_WEBGL){
particleSceneArr.push( function () { particleSceneArr.push( function () {
return new ParallaxParticle(); return new ParallaxParticle();
}); });

2
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
View File

@ -673,7 +673,7 @@ var arrayOfRenderTextureTest = [
Issue1464 Issue1464
]; ];
if(('opengl' in cc.sys.capabilities) && (!cc.sys.isNative) ){ if(('opengl' in cc.sys.capabilities) && cc._renderType === cc.game.RENDER_TYPE_WEBGL && (!cc.sys.isNative) ){
arrayOfRenderTextureTest.push(RenderTextureIssue937); arrayOfRenderTextureTest.push(RenderTextureIssue937);
arrayOfRenderTextureTest.push(RenderTextureZbuffer); arrayOfRenderTextureTest.push(RenderTextureZbuffer);
arrayOfRenderTextureTest.push(RenderTextureTestDepthStencil); arrayOfRenderTextureTest.push(RenderTextureTestDepthStencil);

2
tests/js-tests/src/SpriteTest/SpriteTest.js
View File

@ -977,7 +977,7 @@ var SpriteZVertex = SpriteTestDemo.extend({
this._super(cc.color(255, 0, 0, 80), cc.color(255, 98, 117, 20)); this._super(cc.color(255, 0, 0, 80), cc.color(255, 98, 117, 20));
if ("opengl" in cc.sys.capabilities) { if ("opengl" in cc.sys.capabilities && cc._renderType === cc.game.RENDER_TYPE_WEBGL) {
gl.enable(gl.DEPTH_TEST); gl.enable(gl.DEPTH_TEST);
// //