@babylonjs/core 6.0.0 → 6.1.0

package/Engines/engine.d.ts

@@ -1065,9 +1065,9 @@ const PressureObserver: {
 
 interface WebGL2RenderingContext extends WebGL2RenderingContextBase {
     HALF_FLOAT_OES: number;
-    RGBA16F: number;
-    RGBA32F: number;
-    DEPTH24_STENCIL8: number;
+    RGBA16F: typeof WebGL2RenderingContext.RGBA16F;
+    RGBA32F: typeof WebGL2RenderingContext.RGBA32F;
+    DEPTH24_STENCIL8: typeof WebGL2RenderingContext.DEPTH24_STENCIL8;
     COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR: number;
     COMPRESSED_SRGB_S3TC_DXT1_EXT: number;
     COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: number;
@@ -1075,13 +1075,10 @@ interface WebGL2RenderingContext extends WebGL2RenderingContextBase {
     COMPRESSED_SRGB_ALPHA_BPTC_UNORM_EXT: number;
     COMPRESSED_SRGB8_ETC2: number;
     COMPRESSED_SRGB8_ALPHA8_ETC2_EAC: number;
-    DRAW_FRAMEBUFFER: number;
-    UNSIGNED_INT_24_8: number;
-    MAX: number;
-    MIN: number;
-    SRGB: number;
-    SRGB8: number;
-    SRGB8_ALPHA8: number;
+    DRAW_FRAMEBUFFER: typeof WebGL2RenderingContext.DRAW_FRAMEBUFFER;
+    UNSIGNED_INT_24_8: typeof WebGL2RenderingContext.UNSIGNED_INT_24_8;
+    MIN: typeof WebGL2RenderingContext.MIN;
+    MAX: typeof WebGL2RenderingContext.MAX;
 }
 
 interface EXT_disjoint_timer_query {
@@ -3366,16 +3363,6 @@ enum XOVR_multiview2 {
     FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR = 0x9633,
 }
 
-interface OVR_multiview2 {
-    framebufferTextureMultiviewOVR(target: GLenum, attachment: GLenum, texture: WebGLTexture | null, level: GLint, baseViewIndex: GLint, numViews: GLsizei): void;
-    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR: 0x9630;
-    readonly FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR: 0x9632;
-    readonly MAX_VIEWS_OVR: 0x9631;
-    readonly FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR: 0x9633;
-}
-
-abstract class OVR_multiview2 implements OVR_multiview2 {}
-
 // Oculus extensions
 interface XRSessionGrant {
     mode: XRSessionMode;

package/Engines/thinEngine.d.ts

@@ -278,6 +278,12 @@ export declare class ThinEngine {
     protected _creationOptions: EngineOptions;
     protected _audioContext: Nullable<AudioContext>;
     protected _audioDestination: Nullable<AudioDestinationNode | MediaStreamAudioDestinationNode>;
+    /** @internal */
+    _glSRGBExtensionValues: {
+        SRGB: typeof WebGL2RenderingContext.SRGB;
+        SRGB8: typeof WebGL2RenderingContext.SRGB8 | EXT_sRGB["SRGB_ALPHA_EXT"];
+        SRGB8_ALPHA8: typeof WebGL2RenderingContext.SRGB8_ALPHA8 | EXT_sRGB["SRGB_ALPHA_EXT"];
+    };
     /**
      * Gets the options used for engine creation
      * @returns EngineOptions object
@@ -1562,7 +1568,7 @@ export declare class ThinEngine {
     /**
      * @internal
      */
-    _getRGBAMultiSampleBufferFormat(type: number): number;
+    _getRGBAMultiSampleBufferFormat(type: number, format?: number): number;
     /**
      * @internal
      */

package/Engines/thinEngine.js

@@ -34,13 +34,13 @@ export class ThinEngine {
      */
     // Not mixed with Version for tooling purpose.
     static get NpmPackage() {
-        return "babylonjs@6.0.0";
+        return "babylonjs@6.1.0";
     }
     /**
      * Returns the current version of the framework
      */
     static get Version() {
-        return "6.0.0";
+        return "6.1.0";
     }
     /**
      * Returns a string describing the current engine
@@ -926,14 +926,21 @@ export class ThinEngine {
         if (!this._caps.supportSRGBBuffers) {
             if (this._webGLVersion > 1) {
                 this._caps.supportSRGBBuffers = true;
+                this._glSRGBExtensionValues = {
+                    SRGB: WebGL2RenderingContext.SRGB,
+                    SRGB8: WebGL2RenderingContext.SRGB8,
+                    SRGB8_ALPHA8: WebGL2RenderingContext.SRGB8_ALPHA8,
+                };
             }
             else {
                 const sRGBExtension = this._gl.getExtension("EXT_sRGB");
                 if (sRGBExtension != null) {
                     this._caps.supportSRGBBuffers = true;
-                    this._gl.SRGB = sRGBExtension.SRGB_EXT;
-                    this._gl.SRGB8 = sRGBExtension.SRGB_ALPHA_EXT;
-                    this._gl.SRGB8_ALPHA8 = sRGBExtension.SRGB_ALPHA_EXT;
+                    this._glSRGBExtensionValues = {
+                        SRGB: sRGBExtension.SRGB_EXT,
+                        SRGB8: sRGBExtension.SRGB_ALPHA_EXT,
+                        SRGB8_ALPHA8: sRGBExtension.SRGB_ALPHA_EXT,
+                    };
                 }
             }
             // take into account the forced state that was provided in options
@@ -3291,7 +3298,7 @@ export class ThinEngine {
                 : extension === ".jpg" && !texture._useSRGBBuffer
                     ? gl.RGB
                     : texture._useSRGBBuffer
-                        ? gl.SRGB8_ALPHA8
+                        ? this._glSRGBExtensionValues.SRGB8_ALPHA8
                         : gl.RGBA;
             let texelFormat = format ? this._getInternalFormat(format) : extension === ".jpg" && !texture._useSRGBBuffer ? gl.RGB : gl.RGBA;
             if (texture._useSRGBBuffer && this.webGLVersion === 1) {
@@ -4279,7 +4286,7 @@ export class ThinEngine {
      * @internal
      */
     _getInternalFormat(format, useSRGBBuffer = false) {
-        let internalFormat = useSRGBBuffer ? this._gl.SRGB8_ALPHA8 : this._gl.RGBA;
+        let internalFormat = useSRGBBuffer ? this._glSRGBExtensionValues.SRGB8_ALPHA8 : this._gl.RGBA;
         switch (format) {
             case 0:
                 internalFormat = this._gl.ALPHA;
@@ -4297,10 +4304,10 @@ export class ThinEngine {
                 internalFormat = this._gl.RG;
                 break;
             case 4:
-                internalFormat = useSRGBBuffer ? this._gl.SRGB : this._gl.RGB;
+                internalFormat = useSRGBBuffer ? this._glSRGBExtensionValues.SRGB : this._gl.RGB;
                 break;
             case 5:
-                internalFormat = useSRGBBuffer ? this._gl.SRGB8_ALPHA8 : this._gl.RGBA;
+                internalFormat = useSRGBBuffer ? this._glSRGBExtensionValues.SRGB8_ALPHA8 : this._gl.RGBA;
                 break;
         }
         if (this._webGLVersion > 1) {
@@ -4335,7 +4342,7 @@ export class ThinEngine {
                     case 2:
                         return this._gl.LUMINANCE_ALPHA;
                     case 4:
-                        return useSRGBBuffer ? this._gl.SRGB : this._gl.RGB;
+                        return useSRGBBuffer ? this._glSRGBExtensionValues.SRGB : this._gl.RGB;
                 }
             }
             return this._gl.RGBA;
@@ -4367,9 +4374,9 @@ export class ThinEngine {
                     case 7:
                         return this._gl.RG8;
                     case 4:
-                        return useSRGBBuffer ? this._gl.SRGB8 : this._gl.RGB8; // By default. Other possibilities are RGB565, SRGB8.
+                        return useSRGBBuffer ? this._glSRGBExtensionValues.SRGB8 : this._gl.RGB8; // By default. Other possibilities are RGB565, SRGB8.
                     case 5:
-                        return useSRGBBuffer ? this._gl.SRGB8_ALPHA8 : this._gl.RGBA8; // By default. Other possibilities are RGB5_A1, RGBA4, SRGB8_ALPHA8.
+                        return useSRGBBuffer ? this._glSRGBExtensionValues.SRGB8_ALPHA8 : this._gl.RGBA8; // By default. Other possibilities are RGB5_A1, RGBA4, SRGB8_ALPHA8.
                     case 8:
                         return this._gl.R8UI;
                     case 9:
@@ -4485,17 +4492,27 @@ export class ThinEngine {
                         return this._gl.RGB10_A2;
                 }
         }
-        return useSRGBBuffer ? this._gl.SRGB8_ALPHA8 : this._gl.RGBA8;
+        return useSRGBBuffer ? this._glSRGBExtensionValues.SRGB8_ALPHA8 : this._gl.RGBA8;
     }
     /**
      * @internal
      */
-    _getRGBAMultiSampleBufferFormat(type) {
-        if (type === 1) {
-            return this._gl.RGBA32F;
-        }
-        else if (type === 2) {
-            return this._gl.RGBA16F;
+    _getRGBAMultiSampleBufferFormat(type, format = 5) {
+        switch (type) {
+            case 1:
+                switch (format) {
+                    case 6:
+                        return this._gl.R32F;
+                    default:
+                        return this._gl.RGBA32F;
+                }
+            case 2:
+                switch (format) {
+                    case 6:
+                        return this._gl.R16F;
+                    default:
+                        return this._gl.RGBA16F;
+                }
         }
         return this._gl.RGBA8;
     }