|
@@ -684,7 +684,9 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
state.activeTexture( _gl.TEXTURE0 + slot );
|
|
|
state.bindTexture( textureType, textureProperties.__webglTexture );
|
|
|
|
|
|
- if ( source.version !== source.__currentVersion || forceUpload === true ) {
|
|
|
+ const sourceProperties = properties.get( source );
|
|
|
+
|
|
|
+ if ( source.version !== sourceProperties.__version || forceUpload === true ) {
|
|
|
|
|
|
_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, texture.flipY );
|
|
|
_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );
|
|
@@ -707,7 +709,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
const mipmaps = texture.mipmaps;
|
|
|
|
|
|
const useTexStorage = ( isWebGL2 && texture.isVideoTexture !== true );
|
|
|
- const allocateMemory = ( source.__currentVersion === undefined ) || ( forceUpload === true );
|
|
|
+ const allocateMemory = ( sourceProperties.__version === undefined ) || ( forceUpload === true );
|
|
|
const levels = getMipLevels( texture, image, supportsMips );
|
|
|
|
|
|
if ( texture.isDepthTexture ) {
|
|
@@ -1023,7 +1025,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
|
|
|
}
|
|
|
|
|
|
- source.__currentVersion = source.version;
|
|
|
+ sourceProperties.__version = source.version;
|
|
|
|
|
|
if ( texture.onUpdate ) texture.onUpdate( texture );
|
|
|
|
|
@@ -1043,7 +1045,9 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
state.activeTexture( _gl.TEXTURE0 + slot );
|
|
|
state.bindTexture( _gl.TEXTURE_CUBE_MAP, textureProperties.__webglTexture );
|
|
|
|
|
|
- if ( source.version !== source.__currentVersion || forceUpload === true ) {
|
|
|
+ const sourceProperties = properties.get( source );
|
|
|
+
|
|
|
+ if ( source.version !== sourceProperties.__version || forceUpload === true ) {
|
|
|
|
|
|
_gl.pixelStorei( _gl.UNPACK_FLIP_Y_WEBGL, texture.flipY );
|
|
|
_gl.pixelStorei( _gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, texture.premultiplyAlpha );
|
|
@@ -1078,7 +1082,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType, texture.encoding );
|
|
|
|
|
|
const useTexStorage = ( isWebGL2 && texture.isVideoTexture !== true );
|
|
|
- const allocateMemory = ( source.__currentVersion === undefined ) || ( forceUpload === true );
|
|
|
+ const allocateMemory = ( sourceProperties.__version === undefined ) || ( forceUpload === true );
|
|
|
let levels = getMipLevels( texture, image, supportsMips );
|
|
|
|
|
|
setTextureParameters( _gl.TEXTURE_CUBE_MAP, texture, supportsMips );
|
|
@@ -1227,7 +1231,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
|
|
|
|
|
|
}
|
|
|
|
|
|
- source.__currentVersion = source.version;
|
|
|
+ sourceProperties.__version = source.version;
|
|
|
|
|
|
if ( texture.onUpdate ) texture.onUpdate( texture );
|
|
|
|