DataTexture: Set unpackAlignment to 1 by default. See mrdoob#9566.

mrdoob · mrdoob · commit eaaf205edd6b · 2016-09-26T11:29:11.000-07:00
diff --git a/src/renderers/webgl/WebGLTextures.js b/src/renderers/webgl/WebGLTextures.js
@@ -2,7 +2,7 @@
  * @author mrdoob / http://mrdoob.com/
  */
 
-import { LinearFilter, NearestFilter, RGBFormat, RGBAFormat, DepthFormat, DepthStencilFormat, FloatType, HalfFloatType, UnsignedByteType, ClampToEdgeWrapping, NearestMipMapLinearFilter, NearestMipMapNearestFilter } from '../../constants';
+import { LinearFilter, NearestFilter, RGBFormat, RGBAFormat, DepthFormat, DepthStencilFormat, FloatType, HalfFloatType, ClampToEdgeWrapping, NearestMipMapLinearFilter, NearestMipMapNearestFilter } from '../../constants';
 import { _Math } from '../../math/Math';
 
 function WebGLTextures( _gl, extensions, state, properties, capabilities, paramThreeToGL, info ) {
@@ -410,17 +410,6 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, paramT
 
 		_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, texture.flipY );
 		_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );
-
-		if ( texture.isDataTexture && texture.unpackAlignment !== 1 &&
-			_Math.isPowerOfTwo( texture.image.width ) === false &&
-			texture.format === RGBFormat &&
-			texture.type === UnsignedByteType ) {
-
-			console.warn( 'THREE.WebGLRenderer: Changed unpackAlignment to 1. See #9566.', texture );
-			texture.unpackAlignment = 1;
-
-		}
-
 		_gl.pixelStorei( _gl.UNPACK_ALIGNMENT, texture.unpackAlignment );
 
 		var image = clampToMaxSize( texture.image, capabilities.maxTextureSize );
diff --git a/src/textures/DataTexture.js b/src/textures/DataTexture.js
@@ -16,6 +16,7 @@ function DataTexture( data, width, height, format, type, mapping, wrapS, wrapT,
 
 	this.flipY = false;
 	this.generateMipmaps  = false;
+	this.unpackAlignment = 1;
 
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ function DataTexture( data, width, height, format, type, mapping, wrapS, wrapT,`
`16`	`16`
`17`	`17`	`this.flipY = false;`
`18`	`18`	`this.generateMipmaps = false;`
	`19`	`+ this.unpackAlignment = 1;`
`19`	`20`
`20`	`21`	`}`
`21`	`22`