Merge pull request #21149 from Mugen87/dev51

WebGPURenderer: Refactor glslang import.
mrdoob · Jan 26, 2021 · 3d153ab · 3d153ab
2 parents b15bd85 + ca306c0
commit 3d153ab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/examples/jsm/libs/glslang.js b/examples/jsm/libs/glslang.js
diff --git a/examples/jsm/renderers/webgpu/WebGPURenderer.js b/examples/jsm/renderers/webgpu/WebGPURenderer.js
@@ -10,9 +10,10 @@ import WebGPUBindings from './WebGPUBindings.js';
 import WebGPURenderLists from './WebGPURenderLists.js';
 import WebGPUTextures from './WebGPUTextures.js';
 import WebGPUBackground from './WebGPUBackground.js';
-
 import WebGPUNodes from './nodes/WebGPUNodes.js';
 
+import glslang from '../../libs/glslang.js';
+
 import { Frustum, Matrix4, Vector3, Color } from '../../../../build/three.module.js';
 
 console.info( 'THREE.WebGPURenderer: Modified Matrix4.makePerspective() and Matrix4.makeOrtographic() to work with WebGPU, see https://github.com/mrdoob/three.js/issues/20276.' );
@@ -157,9 +158,7 @@ class WebGPURenderer {
 
 		const device = await adapter.requestDevice( deviceDescriptor );
 
-		// https://cdn.jsdelivr.net/npm/@webgpu/glslang@0.0.15/dist/web-devel/glslang.js
-		const glslang = await import( '../../libs/glslang.js' );
-		const compiler = await glslang.default();
+		const compiler = await glslang();
 
 		const context = ( parameters.context !== undefined ) ? parameters.context : this.domElement.getContext( 'gpupresent' );