소스 검색

Remove ShaderC

Sebastien Vandenberghe 5 년 전
부모
커밋
889f4cf0b7
5개의 변경된 파일7개의 추가작업 그리고 8043개의 파일을 삭제
  1. 4 4
      Playground/indexWebGPU-local.html
  2. 1 1
      Playground/indexWebGPU.html
  3. 2 2
      Playground/js/mainWebGPU.js
  4. 0 8036
      dist/preview release/shaderc/shaderc.js
  5. BIN
      dist/preview release/shaderc/shaderc.wasm

+ 4 - 4
Playground/indexWebGPU-local.html

@@ -444,12 +444,12 @@
     <script src="js/actions.js"></script>
     <script src="js/actions.js"></script>
     <script src="js/pbt.js"></script>
     <script src="js/pbt.js"></script>
     
     
-    <script src="/dist/preview release/shaderc/shaderc.js"></script>
+    <script src="/dist/preview release/glslang/glslang.js"></script>
 
 
     <script>
     <script>
-        window.shadercOptions = { 
-            jsPath: "/dist/preview release/shaderc/shaderc.js",
-            wasmPath: "/dist/preview release/shaderc/shaderc.wasm"
+        window.glslangOptions = { 
+            jsPath: "/dist/preview release/glslang/glslang.js",
+            wasmPath: "/dist/preview release/glslang/glslang.wasm"
         };
         };
 
 
         BABYLONDEVTOOLS.Loader
         BABYLONDEVTOOLS.Loader

+ 1 - 1
Playground/indexWebGPU.html

@@ -30,7 +30,7 @@
     <script src="https://preview.babylonjs.com/gltf_validator.js"></script>
     <script src="https://preview.babylonjs.com/gltf_validator.js"></script>
     <script src="https://preview.babylonjs.com/earcut.min.js"></script>
     <script src="https://preview.babylonjs.com/earcut.min.js"></script>
     <!-- Babylon.js -->
     <!-- Babylon.js -->
-    <script src="https://preview.babylonjs.com/shaderc/shaderc.js"></script>
+    <script src="https://preview.babylonjs.com/glslang/glslang.js"></script>
     <script src="js/babylonWebGpu.max.js"></script>
     <script src="js/babylonWebGpu.max.js"></script>
     <!-- <script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script> -->
     <!-- <script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script> -->
     <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
     <script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

+ 2 - 2
Playground/js/mainWebGPU.js

@@ -73,7 +73,7 @@ compileAndRun = function(parent, fpsLabel) {
                 if (!createSceneFunction) {
                 if (!createSceneFunction) {
                     // Just pasted code.
                     // Just pasted code.
                     engine = createDefaultEngine();
                     engine = createDefaultEngine();
-                    await engine.initAsync(window.shadercOptions).catch((e) => {
+                    await engine.initAsync(window.glslangOptions).catch((e) => {
                         showparent.utils.showErrorError(e);
                         showparent.utils.showErrorError(e);
                 
                 
                         // Also log error in console to help debug playgrounds
                         // Also log error in console to help debug playgrounds
@@ -105,7 +105,7 @@ compileAndRun = function(parent, fpsLabel) {
                         parent.utils.showError("createEngine function must return an engine.", null);
                         parent.utils.showError("createEngine function must return an engine.", null);
                         return;
                         return;
                     }
                     }
-                    await engine.initAsync(window.shadercOptions).catch((e) => {
+                    await engine.initAsync(window.glslangOptions).catch((e) => {
                         parent.utils.showError(e);
                         parent.utils.showError(e);
                 
                 
                         // Also log error in console to help debug playgrounds
                         // Also log error in console to help debug playgrounds

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 8036
dist/preview release/shaderc/shaderc.js


BIN
dist/preview release/shaderc/shaderc.wasm