add HTML5 check

cocos · Jan 16, 2025 · e533f46 · e533f46
1 parent a7b7730
commit e533f46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/cocos/rendering/custom/layout-graph-utils.ts b/cocos/rendering/custom/layout-graph-utils.ts
@@ -23,6 +23,7 @@
 ****************************************************************************/
 
 /* eslint-disable max-len */
+import { HTML5 } from 'internal:constants';
 import { EffectAsset } from '../../asset/assets';
 import { assert, error, warn } from '../../core';
 import { API, DescriptorSetInfo, DescriptorSetLayout, DescriptorSetLayoutBinding, DescriptorSetLayoutInfo, DescriptorType, Device, Feature, Format, FormatFeatureBit, GetTypeSize, MemoryAccessBit, PipelineLayout, PipelineLayoutInfo, SampleType, ShaderStageFlagBit, Type, Uniform, UniformBlock, ViewDimension } from '../../gfx';
@@ -338,7 +339,7 @@ export function makeDescriptorSetLayoutData (
 
     for (let i = 0; i < descriptors.blocks.length; i++) {
         const cb = descriptors.blocks[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -362,7 +363,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.samplerTextures.length; i++) {
         const samplerTexture = descriptors.samplerTextures[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -384,7 +385,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.samplers.length; i++) {
         const sampler = descriptors.samplers[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -406,7 +407,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.textures.length; i++) {
         const texture = descriptors.textures[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -428,7 +429,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.buffers.length; i++) {
         const buffer = descriptors.buffers[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -450,7 +451,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.images.length; i++) {
         const image = descriptors.images[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -472,7 +473,7 @@ export function makeDescriptorSetLayoutData (
     }
     for (let i = 0; i < descriptors.subpassInputs.length; i++) {
         const subpassInput = descriptors.subpassInputs[i];
-        const block = isWebGPU
+        const block = HTML5 && isWebGPU
             ? getDescriptorGroupBlockData(map, {
                 updateFrequency: rate,
                 parameterType: ParameterType.TABLE,
@@ -494,7 +495,7 @@ export function makeDescriptorSetLayoutData (
     }
 
     // sort blocks
-    const flattenedBlocks = isWebGPU
+    const flattenedBlocks = HTML5 && isWebGPU
         ? Array.from(map).sort(sortDescriptorGroupBlocks)
         : Array.from(map).sort(sortDescriptorBlocks);
 

diff --git a/cocos/rendering/custom/layout-graph.ts b/cocos/rendering/custom/layout-graph.ts
@@ -28,6 +28,7 @@
  * ========================= !DO NOT CHANGE THE FOLLOWING SECTION MANUALLY! =========================
  */
 /* eslint-disable max-len */
+import { HTML5 } from 'internal:constants';
 import { AddressableGraph, AdjI, AdjacencyGraph, BidirectionalGraph, ComponentGraph, ED, InEI, MutableGraph, MutableReferenceGraph, NamedGraph, OutE, OutEI, PolymorphicGraph, PropertyGraph, ReferenceGraph, VertexListGraph, findRelative, getPath } from './graph';
 import type { DescriptorSet, DescriptorSetLayout, PipelineLayout } from '../../gfx';
 import { DescriptorSetLayoutInfo, Format, MemoryAccessBit, SampleType, ShaderStageFlagBit, Type, UniformBlock, ViewDimension } from '../../gfx';
@@ -604,10 +605,10 @@ export class PipelineLayoutData {
         this.descriptorGroups.clear();
     }
     getSets (isWebGPU: boolean): Map<UpdateFrequency, DescriptorSetData> {
-        return isWebGPU ? this.descriptorGroups : this.descriptorSets;
+        return HTML5 && isWebGPU ? this.descriptorGroups : this.descriptorSets;
     }
     getSet (frequency: UpdateFrequency, isWebGPU: boolean): DescriptorSetData | undefined {
-        return isWebGPU ? this.descriptorGroups.get(frequency) : this.descriptorSets.get(frequency);
+        return HTML5 && isWebGPU ? this.descriptorGroups.get(frequency) : this.descriptorSets.get(frequency);
     }
     readonly descriptorSets: Map<UpdateFrequency, DescriptorSetData> = new Map<UpdateFrequency, DescriptorSetData>();
     readonly descriptorGroups: Map<UpdateFrequency, DescriptorSetData> = new Map<UpdateFrequency, DescriptorSetData>();