Browse Source

Sync with spec

Popov72 4 years ago
parent
commit
d645df5874

+ 1 - 1
src/Engines/WebGPU/webgpuConstants.ts

@@ -171,7 +171,7 @@ export enum TextureFormat {
     BC5RGUnorm = "bc5-rg-unorm",
     BC5RGSnorm = "bc5-rg-snorm",
     BC6HRGBUFloat = "bc6h-rgb-ufloat",
-    BC6HRGBSFloat = "bc6h-rgb-sfloat",
+    BC6HRGBFloat = "bc6h-rgb-float",
     BC7RGBAUnorm = "bc7-rgba-unorm",
     BC7RGBAUnormSRGB = "bc7-rgba-unorm-srgb",
 

+ 3 - 3
src/Engines/WebGPU/webgpuTextureHelper.ts

@@ -116,7 +116,7 @@ export class WebGPUTextureHelper {
         switch (format) {
             case WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB:
             case WebGPUConstants.TextureFormat.BC7RGBAUnorm:
-            case WebGPUConstants.TextureFormat.BC6HRGBSFloat:
+            case WebGPUConstants.TextureFormat.BC6HRGBFloat:
             case WebGPUConstants.TextureFormat.BC6HRGBUFloat:
             case WebGPUConstants.TextureFormat.BC5RGSnorm:
             case WebGPUConstants.TextureFormat.BC5RGUnorm:
@@ -289,7 +289,7 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.BC7RGBAUnorm:
             case WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB:
             case WebGPUConstants.TextureFormat.BC6HRGBUFloat:
-            case WebGPUConstants.TextureFormat.BC6HRGBSFloat:
+            case WebGPUConstants.TextureFormat.BC6HRGBFloat:
             case WebGPUConstants.TextureFormat.BC5RGUnorm:
             case WebGPUConstants.TextureFormat.BC5RGSnorm:
             case WebGPUConstants.TextureFormat.BC3RGBAUnorm:
@@ -417,7 +417,7 @@ export class WebGPUTextureHelper {
             case WebGPUConstants.TextureFormat.BC7RGBAUnorm:
             case WebGPUConstants.TextureFormat.BC7RGBAUnormSRGB:
             case WebGPUConstants.TextureFormat.BC6HRGBUFloat:
-            case WebGPUConstants.TextureFormat.BC6HRGBSFloat:
+            case WebGPUConstants.TextureFormat.BC6HRGBFloat:
             case WebGPUConstants.TextureFormat.BC5RGUnorm:
             case WebGPUConstants.TextureFormat.BC5RGSnorm:
             case WebGPUConstants.TextureFormat.BC3RGBAUnorm:

+ 1 - 1
src/Engines/webgpuEngine.ts

@@ -1183,7 +1183,7 @@ export class WebGPUEngine extends Engine {
             case Constants.TEXTUREFORMAT_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT:
                 return WebGPUConstants.TextureFormat.BC6HRGBUFloat;
             case Constants.TEXTUREFORMAT_COMPRESSED_RGB_BPTC_SIGNED_FLOAT:
-                return WebGPUConstants.TextureFormat.BC6HRGBSFloat;
+                return WebGPUConstants.TextureFormat.BC6HRGBFloat;
             case Constants.TEXTUREFORMAT_COMPRESSED_RGBA_S3TC_DXT5:
                 return WebGPUConstants.TextureFormat.BC3RGBAUnorm;
             case Constants.TEXTUREFORMAT_COMPRESSED_RGBA_S3TC_DXT3:

+ 1 - 2
src/LibDeclarations/webgpu.d.ts

@@ -166,7 +166,7 @@ declare global {
     | "bc5-rg-unorm"
     | "bc5-rg-snorm"
     | "bc6h-rgb-ufloat"
-    | "bc6h-rgb-sfloat"
+    | "bc6h-rgb-float"
     | "bc7-rgba-unorm"
     | "bc7-rgba-unorm-srgb"
     | "depth24unorm-stencil8"
@@ -276,7 +276,6 @@ declare global {
     minBufferBindingSize?: number;
     viewDimension?: GPUTextureViewDimension;
     textureComponentType?: GPUTextureComponentType;
-    multisampled?: boolean;
     storageTextureFormat?: GPUTextureFormat;
   }