add IOS check

star-e · Sep 18, 2024 · fe7d55a · fe7d55a
1 parent 722540e
commit fe7d55a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cocos/gfx/webgl/webgl-commands.ts b/cocos/gfx/webgl/webgl-commands.ts
@@ -23,6 +23,7 @@
 */
 
 import { BYTEDANCE } from 'internal:constants';
+import { systemInfo } from 'pal/system-info';
 import { debugID, error, errorID, CachedArray, cclegacy, assertID } from '../../core';
 import { WebGLCommandAllocator } from './webgl-command-allocator';
 import { WebGLEXT } from './webgl-define';
@@ -39,6 +40,7 @@ import {
     TextureBlit, Filter,
 } from '../base/define';
 import { WebGLStateCache } from './webgl-state-cache';
+import { OS } from '../../../pal/system-info/enum-type';
 
 export function GFXFormatToWebGLType (format: Format, gl: WebGLRenderingContext): GLenum {
     switch (format) {
@@ -830,7 +832,7 @@ export function WebGLCmdFuncUpdateBuffer (
         }
         }
 
-        if ((gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
+        if (systemInfo.os === OS.IOS  && (gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
             // Fix performance issue on iOS.
             // TODO(zhouzhenglong): glBufferSubData is faster than glBufferData in most cases.
             // We should use multiple buffers to avoid stall (cpu write conflicts with gpu read).

diff --git a/cocos/gfx/webgl2/webgl2-commands.ts b/cocos/gfx/webgl2/webgl2-commands.ts
@@ -22,6 +22,7 @@
  THE SOFTWARE.
 */
 
+import { systemInfo } from 'pal/system-info';
 import {
     BufferUsageBit, ColorMask, CullMode, DynamicStateFlagBit, Filter, Format, TextureType, Type, FormatInfo,
     FormatInfos, FormatSize, LoadOp, MemoryUsageBit, SampleCount, ShaderStageFlagBit, TextureFlagBit,
@@ -47,6 +48,7 @@ import {
     IWebGL2GPURenderPass,
 } from './webgl2-gpu-objects';
 import { CachedArray, error, errorID, cclegacy, assertID, debugID } from '../../core';
+import { OS } from '../../../pal/system-info/enum-type';
 
 const WebGLWraps: GLenum[] = [
     0x2901, // WebGLRenderingContext.REPEAT
@@ -1001,7 +1003,7 @@ export function WebGL2CmdFuncUpdateBuffer (
                 cache.glArrayBuffer = gpuBuffer.glBuffer;
             }
 
-            if ((gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
+            if (systemInfo.os === OS.IOS && (gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
                 // Fix performance issue on iOS.
                 // TODO(zhouzhenglong): glBufferSubData is faster than glBufferData in most cases.
                 // We should use multiple buffers to avoid stall (cpu write conflicts with gpu read).
@@ -1028,7 +1030,7 @@ export function WebGL2CmdFuncUpdateBuffer (
                 cache.glElementArrayBuffer = gpuBuffer.glBuffer;
             }
 
-            if ((gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
+            if (systemInfo.os === OS.IOS && (gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
                 // Fix performance issue on iOS.
                 // TODO(zhouzhenglong): glBufferSubData is faster than glBufferData in most cases.
                 // We should use multiple buffers to avoid stall (cpu write conflicts with gpu read).
@@ -1047,7 +1049,7 @@ export function WebGL2CmdFuncUpdateBuffer (
                 cache.glUniformBuffer = gpuBuffer.glBuffer;
             }
 
-            if ((gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
+            if (systemInfo.os === OS.IOS && (gpuBuffer.memUsage & MemoryUsageBit.HOST) && offset === 0 && size === buff.byteLength) {
                 // Fix performance issue on iOS.
                 // TODO(zhouzhenglong): glBufferSubData is faster than glBufferData in most cases.
                 // We should use multiple buffers to avoid stall (cpu write conflicts with gpu read).