From 5fc2c72ea55353bd9f5cb2f171ec76d5a2ec2a35 Mon Sep 17 00:00:00 2001 From: minggo Date: Fri, 13 Nov 2020 16:25:16 +0800 Subject: [PATCH] Reduce jsb (#7784) * cache device.uboOffsetAlignment * use JS BindingMappingInfo * use JS BindingMappingInfo * use JS ShaderStage/Uniform/UniformBlock/UniformSampler/ShaderInfo * use JS DrawInfo/IndirectBuffer * use JS SamplerInfo * use JS SubPassInfo/ColorAttachment/DepthStencilAttachment/RenderPassInfo * use more JS classes --- cocos/core/gfx/index.jsb.ts | 57 +++++++++++------------------------ port/native/engine/jsb-gfx.js | 9 ++++++ 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/cocos/core/gfx/index.jsb.ts b/cocos/core/gfx/index.jsb.ts index c47e45ad5b..012226c44f 100644 --- a/cocos/core/gfx/index.jsb.ts +++ b/cocos/core/gfx/index.jsb.ts @@ -32,61 +32,38 @@ import { PipelineState } from './pipeline-state.jsb'; export * from './define'; export * from './define-class'; export * from './pipeline-state.jsb'; - +export { DeviceInfo, BindingMappingInfo } from './device'; export {TextureInfo } from './texture'; +export { ShaderStage, UniformSampler, UniformBlock, Uniform, ShaderInfo } from './shader'; +export { DRAW_INFO_SIZE, BufferInfo, BufferViewInfo, DrawInfo, IndirectBuffer } from './buffer'; +export { ColorAttachment, DepthStencilAttachment, SubPassInfo, RenderPassInfo } from './render-pass'; +export { SamplerInfo } from './sampler'; +export { DESCRIPTOR_BUFFER_TYPE, DESCRIPTOR_SAMPLER_TYPE, DescriptorSetInfo } from './descriptor-set'; +export { DescriptorSetLayoutInfo, DescriptorSetLayoutBinding } from './descriptor-set-layout'; +export { CommandBufferInfo } from './command-buffer'; +export { FramebufferInfo } from './framebuffer'; +export { PipelineLayoutInfo } from './pipeline-layout'; +export { FenceInfo } from './fence'; +export { QueueInfo } from './queue'; +export { InputAssemblerInfo } from './input-assembler'; + export const TextureViewInfo = gfx.TextureViewInfo; export const Texture = gfx.Texture; - export const Device = gfx.Device; -export const BindingMappingInfo = gfx.BindingMappingInfo; -// DeviceInfo is different from native defination, so use JS defination instead. -export { DeviceInfo } from './device'; - export const Shader = gfx.Shader; -export const ShaderStage = gfx.ShaderStage; -export const Uniform = gfx.Uniform; -export const UniformBlock = gfx.UniformBlock; -export const UniformSampler = gfx.UniformSampler; -export const ShaderInfo = gfx.ShaderInfo; - export const Attribute = gfx.Attribute; -export const InputAssemblerInfo = gfx.InputAssemblerInfo; export const InputAssembler = gfx.InputAssembler; - -export const DrawInfo = gfx.DrawInfo; -export const IndirectBuffer = gfx.IndirectBuffer; export const Buffer = gfx.Buffer; -export { DRAW_INFO_SIZE, BufferInfo, BufferViewInfo } from './buffer'; - -export const SamplerInfo = gfx.SamplerInfo; export const Sampler = gfx.Sampler; - -export const FenceInfo = gfx.FenceInfo; -export const Fence = gfx.Fence; - -export const ColorAttachment = gfx.ColorAttachment; -export const DepthStencilAttachment = gfx.DepthStencilAttachment; -export const SubPassInfo = gfx.SubPassInfo; -export const RenderPassInfo = gfx.RenderPassInfo; -export const RenderPass = gfx.RenderPass; - -export const QueueInfo = gfx.QueueInfo; +export const Fence = gfx.Fence +export const RenderPass = gfx.RenderPass export const Queue = gfx.Queue; - -export const PipelineLayoutInfo = gfx.PipelineLayoutInfo; export const PipelineLayout = gfx.PipelineLayout; - -export const DescriptorSetLayoutBinding = gfx.DescriptorSetLayoutBinding; -export const DescriptorSetLayoutInfo = gfx.DescriptorSetLayoutInfo; export const DescriptorSetLayout = gfx.DescriptorSetLayout; -export { DESCRIPTOR_BUFFER_TYPE, DESCRIPTOR_SAMPLER_TYPE, DescriptorSetInfo } from './descriptor-set'; - -export const FramebufferInfo = gfx.FramebufferInfo; export const Framebuffer = gfx.Framebuffer; - -export const CommandBufferInfo = gfx.CommandBufferInfo; export const CommandBuffer = gfx.CommandBuffer; + legacyCC.Device = Device; legacyCC.Buffer = Buffer; legacyCC.Texture = Texture; diff --git a/port/native/engine/jsb-gfx.js b/port/native/engine/jsb-gfx.js index b7b36a8a36..3da78f69d9 100644 --- a/port/native/engine/jsb-gfx.js +++ b/port/native/engine/jsb-gfx.js @@ -170,6 +170,15 @@ deviceProtos.forEach(function(item, index) { return oldDeviceCreatTextureFun.call(this, info, false); } } + + Object.defineProperty(item, 'uboOffsetAlignment', { + get () { + if (this.cachedUboOffsetAlignment === undefined) { + this.cachedUboOffsetAlignment = this.getUboOffsetAlignment(); + } + return this.cachedUboOffsetAlignment; + } + }) } });