Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Safari 15.4 to Exception list #12534

Merged
merged 2 commits into from
May 16, 2022
Merged

Add Safari 15.4 to Exception list #12534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f79a3
add to Exception list
RaananW May 16, 2022
92d6bdd
remove the unneeded changes to playground and sandbox
RaananW May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions packages/dev/core/src/Engines/thinEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ export interface EngineOptions extends WebGLContextAttributes {
* Defines that engine should ignore context lost events
* If this event happens when this parameter is true, you will have to reload the page to restore rendering
*/

doNotHandleContextLost?: boolean;
/**
* Defines that engine should ignore modifying touch action attribute and style
Expand Down Expand Up @@ -183,6 +182,10 @@ export class ThinEngine {
{ key: "Mac OS.+Chrome/71", capture: null, captureConstraint: null, targets: ["vao"] },
{ key: "Mac OS.+Chrome/72", capture: null, captureConstraint: null, targets: ["vao"] },
{ key: "Mac OS.+Chrome", capture: null, captureConstraint: null, targets: ["uniformBuffer"] },
// desktop osx safari 15.4
{ key: ".*AppleWebKit.*(15.4).*Safari", capture: null, captureConstraint: null, targets: ["antialias", "maxMSAASamples"] },
// mobile browsers using safari 15.4 on ios
{ key: ".*(15.4).*AppleWebKit.*Safari", capture: null, captureConstraint: null, targets: ["antialias", "maxMSAASamples"] },
];

/** @hidden */
Expand Down Expand Up @@ -537,6 +540,7 @@ export class ThinEngine {

private _nextFreeTextureSlots = new Array<number>();
private _maxSimultaneousTextures = 0;
private _maxMSAASamplesOverride: Nullable<number> = null;

private _activeRequests = new Array<IFileRequest>();

Expand Down Expand Up @@ -858,6 +862,12 @@ export class ThinEngine {
case "vao":
this.disableVertexArrayObjects = true;
break;
case "antialias":
options.antialias = false;
break;
case "maxMSAASamples":
this._maxMSAASamplesOverride = 1;
break;
}
}
}
Expand Down Expand Up @@ -1227,7 +1237,7 @@ export class ThinEngine {
// Draw buffers
if (this._webGLVersion > 1) {
this._caps.drawBuffersExtension = true;
this._caps.maxMSAASamples = this._gl.getParameter(this._gl.MAX_SAMPLES);
this._caps.maxMSAASamples = this._maxMSAASamplesOverride !== null ? this._maxMSAASamplesOverride : this._gl.getParameter(this._gl.MAX_SAMPLES);
sebavan marked this conversation as resolved.
Show resolved Hide resolved
} else {
const drawBuffersExtension = this._gl.getExtension("WEBGL_draw_buffers");

Expand Down
8 changes: 1 addition & 7 deletions packages/tools/playground/src/components/rendererComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,6 @@ export class RenderingComponent extends React.Component<IRenderingComponentProps
}

try {
// TODO - remove this once not needed anymore. Spoofing Safari 15.4.X
const fixYourBugsAlreadyRegexp = /.*AppleWebKit.*(15.4).*Safari/g;
const allowOtherBrowsersAlready = /.*(15.4).*AppleWebKit.*Safari/g;
const fixYourBugsAlreadyMatch = navigator.userAgent.match(fixYourBugsAlreadyRegexp) || navigator.userAgent.match(allowOtherBrowsersAlready);
const antialias = fixYourBugsAlreadyMatch ? false : undefined;
// Set up the global object ("window" and "this" for user code).
// Delete (or rewrite) previous-run globals to avoid confusion.
const globalObject = window as any;
Expand Down Expand Up @@ -173,11 +168,10 @@ export class RenderingComponent extends React.Component<IRenderingComponentProps
};
} else {
globalObject.createDefaultEngine = function () {
return new Engine(canvas, antialias, {
return new Engine(canvas, true, {
disableWebGL2Support: forceWebGL1,
preserveDrawingBuffer: true,
stencil: true,
antialias,
});
};
}
Expand Down
6 changes: 1 addition & 5 deletions packages/tools/sandbox/src/components/renderingZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,7 @@ export class RenderingZone extends React.Component<IRenderingZoneProps> {
async initEngine() {
const useWebGPU = location.href.indexOf("webgpu") !== -1 && !!(navigator as any).gpu;
// TODO - remove this once not needed anymore. Spoofing Safari 15.4.X
const fixYourBugsAlreadyRegexp = /.*AppleWebKit.*(15.4).*Safari/g;
const allowOtherBrowsersAlready = /.*(15.4).*AppleWebKit.*Safari/g;
const fixYourBugsAlreadyMatch = navigator.userAgent.match(fixYourBugsAlreadyRegexp) || navigator.userAgent.match(allowOtherBrowsersAlready);
const disableAntialiasOnThisVersion = fixYourBugsAlreadyMatch ? false : undefined;
const antialias = this.props.globalState.commerceMode ? false : disableAntialiasOnThisVersion;
const antialias = this.props.globalState.commerceMode ? false : undefined;

this._canvas = document.getElementById("renderCanvas") as HTMLCanvasElement;
if (useWebGPU) {
Expand Down