diff --git a/cocos/core/gfx/define.ts b/cocos/core/gfx/define.ts index 74e5106f27..73a7538aed 100644 --- a/cocos/core/gfx/define.ts +++ b/cocos/core/gfx/define.ts @@ -755,6 +755,7 @@ export function GFXFormatSize (format: GFXFormat, width: number, height: number, case GFXFormat.EAC_R11: case GFXFormat.EAC_R11SN: return Math.ceil(width / 4) * Math.ceil(height / 4) * 8 * depth; + case GFXFormat.ETC2_RGBA8: case GFXFormat.EAC_RG11: case GFXFormat.EAC_RG11SN: return Math.ceil(width / 4) * Math.ceil(height / 4) * 16 * depth; diff --git a/cocos/core/gfx/webgl/webgl-commands.ts b/cocos/core/gfx/webgl/webgl-commands.ts index 39f69576c7..53c6389382 100644 --- a/cocos/core/gfx/webgl/webgl-commands.ts +++ b/cocos/core/gfx/webgl/webgl-commands.ts @@ -179,6 +179,16 @@ export function GFXFormatToWebGLInternalFormat (format: GFXFormat, gl: WebGLRend case GFXFormat.BC3_SRGB: return WebGLEXT.COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT; case GFXFormat.ETC_RGB8: return WebGLEXT.COMPRESSED_RGB_ETC1_WEBGL; + case GFXFormat.ETC2_RGB8: return WebGLEXT.COMPRESSED_RGB8_ETC2; + case GFXFormat.ETC2_SRGB8: return WebGLEXT.COMPRESSED_SRGB8_ETC2; + case GFXFormat.ETC2_RGB8_A1: return WebGLEXT.COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2; + case GFXFormat.ETC2_SRGB8_A1: return WebGLEXT.COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2; + case GFXFormat.ETC2_RGBA8: return WebGLEXT.COMPRESSED_RGBA8_ETC2_EAC; + case GFXFormat.ETC2_SRGB8_A8: return WebGLEXT.COMPRESSED_SRGB8_ALPHA8_ETC2_EAC; + case GFXFormat.EAC_R11: return WebGLEXT.COMPRESSED_R11_EAC; + case GFXFormat.EAC_R11SN: return WebGLEXT.COMPRESSED_SIGNED_R11_EAC; + case GFXFormat.EAC_RG11: return WebGLEXT.COMPRESSED_RG11_EAC; + case GFXFormat.EAC_RG11SN: return WebGLEXT.COMPRESSED_SIGNED_RG11_EAC; case GFXFormat.PVRTC_RGB2: return WebGLEXT.COMPRESSED_RGB_PVRTC_2BPPV1_IMG; case GFXFormat.PVRTC_RGBA2: return WebGLEXT.COMPRESSED_RGBA_PVRTC_2BPPV1_IMG; diff --git a/cocos/core/gfx/webgl2/webgl2-commands.ts b/cocos/core/gfx/webgl2/webgl2-commands.ts index 497e84eb1b..9fa3410223 100644 --- a/cocos/core/gfx/webgl2/webgl2-commands.ts +++ b/cocos/core/gfx/webgl2/webgl2-commands.ts @@ -339,6 +339,16 @@ export function GFXFormatToWebGLFormat (format: GFXFormat, gl: WebGL2RenderingCo case GFXFormat.BC3_SRGB: return WebGLEXT.COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT; case GFXFormat.ETC_RGB8: return WebGLEXT.COMPRESSED_RGB_ETC1_WEBGL; + case GFXFormat.ETC2_RGB8: return WebGLEXT.COMPRESSED_RGB8_ETC2; + case GFXFormat.ETC2_SRGB8: return WebGLEXT.COMPRESSED_SRGB8_ETC2; + case GFXFormat.ETC2_RGB8_A1: return WebGLEXT.COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2; + case GFXFormat.ETC2_SRGB8_A1: return WebGLEXT.COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2; + case GFXFormat.ETC2_RGBA8: return WebGLEXT.COMPRESSED_RGBA8_ETC2_EAC; + case GFXFormat.ETC2_SRGB8_A8: return WebGLEXT.COMPRESSED_SRGB8_ALPHA8_ETC2_EAC; + case GFXFormat.EAC_R11: return WebGLEXT.COMPRESSED_R11_EAC; + case GFXFormat.EAC_R11SN: return WebGLEXT.COMPRESSED_SIGNED_R11_EAC; + case GFXFormat.EAC_RG11: return WebGLEXT.COMPRESSED_RG11_EAC; + case GFXFormat.EAC_RG11SN: return WebGLEXT.COMPRESSED_SIGNED_RG11_EAC; case GFXFormat.PVRTC_RGB2: return WebGLEXT.COMPRESSED_RGB_PVRTC_2BPPV1_IMG; case GFXFormat.PVRTC_RGBA2: return WebGLEXT.COMPRESSED_RGBA_PVRTC_2BPPV1_IMG; diff --git a/cocos/core/gfx/webgl2/webgl2-device.ts b/cocos/core/gfx/webgl2/webgl2-device.ts index 5a4aad76fd..5402ffd8c3 100644 --- a/cocos/core/gfx/webgl2/webgl2-device.ts +++ b/cocos/core/gfx/webgl2/webgl2-device.ts @@ -255,7 +255,6 @@ export class WebGL2GFXDevice extends GFXDevice { this._features[GFXFeature.TEXTURE_HALF_FLOAT] = true; this._features[GFXFeature.FORMAT_R11G11B10F] = true; this._features[GFXFeature.FORMAT_D24S8] = true; - this._features[GFXFeature.FORMAT_ETC2] = true; this._features[GFXFeature.MSAA] = true; this._features[GFXFeature.ELEMENT_INDEX_UINT] = true; this._features[GFXFeature.INSTANCED_ARRAYS] = true;