mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fix flat buffer generation (#7751)
This commit is contained in:
+14
-17
@@ -262,23 +262,24 @@ export class RenderingSubMesh {
|
||||
const vbCount = prim.indexView ? prim.indexView.count : vertexBundle.view.count;
|
||||
const vbStride = vertexBundle.view.stride;
|
||||
const vbSize = vbStride * vbCount;
|
||||
const view = new Uint8Array(mesh.data.buffer, vertexBundle.view.offset, vertexBundle.view.length);
|
||||
|
||||
const rawBufferSize = prim.indexView ? vertexBundle.view.length : vbSize;
|
||||
const hBuffer = RawBufferPool.alloc(rawBufferSize);
|
||||
const buffer = RawBufferPool.getBuffer(hBuffer);
|
||||
const view = prim.indexView ? new Uint8Array(buffer) : new Uint8Array(rawBufferSize);
|
||||
const hBuffer = RawBufferPool.alloc(prim.indexView ? vbSize : vertexBundle.view.length);
|
||||
const hFlatBuffer = FlatBufferPool.alloc();
|
||||
view.set(mesh.data.subarray(vertexBundle.view.offset, vertexBundle.view.offset + vertexBundle.view.length));
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.STRIDE, vbStride);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.AMOUNT, vbCount);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.BUFFER, hBuffer);
|
||||
FlatBufferArrayPool.push(fbArrayHandle, hFlatBuffer);
|
||||
|
||||
const buffer = RawBufferPool.getBuffer(hBuffer);
|
||||
const sharedView = new Uint8Array(buffer);
|
||||
|
||||
if (!prim.indexView) {
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.STRIDE, vbStride);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.AMOUNT, vbCount);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.BUFFER, hBuffer);
|
||||
this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: view });
|
||||
FlatBufferArrayPool.push(fbArrayHandle, hFlatBuffer);
|
||||
sharedView.set(mesh.data.subarray(vertexBundle.view.offset, vertexBundle.view.offset + vertexBundle.view.length));
|
||||
this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView });
|
||||
continue;
|
||||
}
|
||||
const vbView = new Uint8Array(buffer);
|
||||
|
||||
const ibView = mesh.readIndices(this.subMeshIdx)!;
|
||||
// transform to flat buffer
|
||||
for (let n = 0; n < idxCount; ++n) {
|
||||
@@ -286,14 +287,10 @@ export class RenderingSubMesh {
|
||||
const offset = n * vbStride;
|
||||
const srcOffset = idx * vbStride;
|
||||
for (let m = 0; m < vbStride; ++m) {
|
||||
vbView[offset + m] = view[srcOffset + m];
|
||||
sharedView[offset + m] = view[srcOffset + m];
|
||||
}
|
||||
}
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.STRIDE, vbStride);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.AMOUNT, vbCount);
|
||||
FlatBufferPool.set(hFlatBuffer, FlatBufferView.BUFFER, hBuffer);
|
||||
FlatBufferArrayPool.push(fbArrayHandle, hFlatBuffer);
|
||||
this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: vbView });
|
||||
this._flatBuffers.push({ stride: vbStride, count: vbCount, buffer: sharedView });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,8 @@
|
||||
* @hidden
|
||||
*/
|
||||
|
||||
import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler, InputAssemblerInfo, Attribute, Buffer, BufferInfo } from '../gfx';
|
||||
import { BufferUsageBit, Format, MemoryUsageBit, Device, DescriptorSet, InputAssembler,
|
||||
InputAssemblerInfo, Attribute, Buffer, BufferInfo } from '../gfx';
|
||||
import { Mat4 } from '../math';
|
||||
import { SubModel } from '../renderer/scene/submodel';
|
||||
import { IRenderObject, UBOLocalBatched } from './define';
|
||||
@@ -51,7 +52,6 @@ export interface IBatchedItem {
|
||||
}
|
||||
|
||||
export class BatchedBuffer {
|
||||
|
||||
private static _buffers = new Map<Pass, Record<number, BatchedBuffer>>();
|
||||
|
||||
public static get (pass: Pass, extraKey = 0) {
|
||||
@@ -184,7 +184,7 @@ export class BatchedBuffer {
|
||||
vbIdx.update(vbIdxData);
|
||||
totalVBs.push(vbIdx);
|
||||
|
||||
const attributes = subModel.inputAssembler!.attributes;
|
||||
const attributes = subModel.inputAssembler.attributes;
|
||||
const attrs = new Array<Attribute>(attributes.length + 1);
|
||||
for (let a = 0; a < attributes.length; ++a) {
|
||||
attrs[a] = attributes[a];
|
||||
@@ -209,7 +209,17 @@ export class BatchedBuffer {
|
||||
|
||||
this.batches.push({
|
||||
mergeCount: 1,
|
||||
vbs, vbDatas, vbIdx, vbIdxData, vbCount, ia, ubo, uboData, pass, hShader, descriptorSet,
|
||||
vbs,
|
||||
vbDatas,
|
||||
vbIdx,
|
||||
vbIdxData,
|
||||
vbCount,
|
||||
ia,
|
||||
ubo,
|
||||
uboData,
|
||||
pass,
|
||||
hShader,
|
||||
descriptorSet,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -23,6 +23,9 @@ CCEffect %{
|
||||
metallicRoughnessMap: { value: grey }
|
||||
occlusionMap: { value: white }
|
||||
emissiveMap: { value: grey }
|
||||
migrations:
|
||||
properties:
|
||||
pbrParams: { removeImmediately: true }
|
||||
- &forward-add
|
||||
vert: standard-vs:vert
|
||||
frag: standard-fs:frag
|
||||
|
||||
Reference in New Issue
Block a user