Browse Source

Revert "Remove webglVersion option from WebGLRenderer constructor"

This reverts commit acee27d76e436c4eab65b1c1ab350c7d851923bc.
Takahiro 7 years ago
parent
commit
f696296a47
1 changed files with 10 additions and 3 deletions
  1. 10 3
      src/renderers/WebGLRenderer.js

+ 10 - 3
src/renderers/WebGLRenderer.js

@@ -66,7 +66,8 @@ function WebGLRenderer( parameters ) {
 		_antialias = parameters.antialias !== undefined ? parameters.antialias : false,
 		_premultipliedAlpha = parameters.premultipliedAlpha !== undefined ? parameters.premultipliedAlpha : true,
 		_preserveDrawingBuffer = parameters.preserveDrawingBuffer !== undefined ? parameters.preserveDrawingBuffer : false,
-		_powerPreference = parameters.powerPreference !== undefined ? parameters.powerPreference : 'default';
+		_powerPreference = parameters.powerPreference !== undefined ? parameters.powerPreference : 'default',
+		_webglVersion = parameters.webglVersion !== undefined ? parameters.webglVersion : 'webgl';
 
 	var currentRenderList = null;
 	var currentRenderState = null;
@@ -191,11 +192,17 @@ function WebGLRenderer( parameters ) {
 		_canvas.addEventListener( 'webglcontextlost', onContextLost, false );
 		_canvas.addEventListener( 'webglcontextrestored', onContextRestore, false );
 
-		_gl = _context || _canvas.getContext( 'webgl', contextAttributes ) || _canvas.getContext( 'experimental-webgl', contextAttributes );
+		var webglVersion = ( _webglVersion === 'webgl2' || _webglVersion === 'auto' ) ? 'webgl2' : 'webgl';
+
+		_gl = _context || _canvas.getContext( webglVersion, contextAttributes );
+
+		if ( _gl === null && _webglVersion === 'auto' ) _gl = _canvas.getContext( 'webgl', contextAttributes );
+
+		if ( _gl === null && ( webglVersion === 'webgl' || _webglVersion === 'auto' ) ) _gl = _canvas.getContext( 'experimental-webgl', contextAttributes );
 
 		if ( _gl === null ) {
 
-			if ( _canvas.getContext( 'webgl' ) !== null ) {
+			if ( _canvas.getContext( webglVersion ) !== null ) {
 
 				throw new Error( 'Error creating WebGL context with your selected attributes.' );