From 63d305b3927a9e74f1fb1b993fe5f6e09038b8db Mon Sep 17 00:00:00 2001 From: amakaseev Date: Mon, 25 Dec 2017 11:39:46 +0200 Subject: [PATCH] fixed incorrect constants --- src/constants.js | 18 +++++++++--------- src/renderers/webgl/WebGLState.js | 3 ++- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/constants.js b/src/constants.js index b060ae6f6f..4909684bcf 100644 --- a/src/constants.js +++ b/src/constants.js @@ -92,15 +92,15 @@ export var LuminanceAlphaFormat = 1025; export var RGBEFormat = RGBAFormat; export var DepthFormat = 1026; export var DepthStencilFormat = 1027; -export var RGB_S3TC_DXT1_Format = 2001; -export var RGBA_S3TC_DXT1_Format = 2002; -export var RGBA_S3TC_DXT3_Format = 2003; -export var RGBA_S3TC_DXT5_Format = 2004; -export var RGB_PVRTC_4BPPV1_Format = 2100; -export var RGB_PVRTC_2BPPV1_Format = 2101; -export var RGBA_PVRTC_4BPPV1_Format = 2102; -export var RGBA_PVRTC_2BPPV1_Format = 2103; -export var RGB_ETC1_Format = 2151; +export var RGB_S3TC_DXT1_Format = 33776; +export var RGBA_S3TC_DXT1_Format = 33777; +export var RGBA_S3TC_DXT3_Format = 33778; +export var RGBA_S3TC_DXT5_Format = 33779; +export var RGB_PVRTC_4BPPV1_Format = 35840; +export var RGB_PVRTC_2BPPV1_Format = 35841; +export var RGBA_PVRTC_4BPPV1_Format = 35842; +export var RGBA_PVRTC_2BPPV1_Format = 35843; +export var RGB_ETC1_Format = 36196; export var RGBA_ASTC_4x4_Format = 37808; export var RGBA_ASTC_5x4_Format = 37809; export var RGBA_ASTC_5x5_Format = 37810; diff --git a/src/renderers/webgl/WebGLState.js b/src/renderers/webgl/WebGLState.js index a35895b026..6438f7da36 100644 --- a/src/renderers/webgl/WebGLState.js +++ b/src/renderers/webgl/WebGLState.js @@ -491,7 +491,8 @@ function WebGLState( gl, extensions, utils ) { if ( extensions.get( 'WEBGL_compressed_texture_pvrtc' ) || extensions.get( 'WEBGL_compressed_texture_s3tc' ) || - extensions.get( 'WEBGL_compressed_texture_etc1' ) ) { + extensions.get( 'WEBGL_compressed_texture_etc1' ) || + extensions.get( 'WEBGL_compressed_texture_astc' ) ) { var formats = gl.getParameter( gl.COMPRESSED_TEXTURE_FORMATS ); -- GitLab