diff --git a/native/cocos/renderer/core/gfx/GFXDef.h b/native/cocos/renderer/core/gfx/GFXDef.h index 6f12a9191e..c01971119e 100755 --- a/native/cocos/renderer/core/gfx/GFXDef.h +++ b/native/cocos/renderer/core/gfx/GFXDef.h @@ -703,7 +703,7 @@ struct GFXDrawInfo { typedef vector::type GFXDrawInfoList; struct GFXIndirectBuffer { - GFXDrawInfoList draws; + GFXDrawInfoList drawInfos; }; struct GFXTextureInfo { diff --git a/native/cocos/renderer/gfx-gles2/GLES2Commands.cc b/native/cocos/renderer/gfx-gles2/GLES2Commands.cc index e3577963da..c8567347bf 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2Commands.cc +++ b/native/cocos/renderer/gfx-gles2/GLES2Commands.cc @@ -465,7 +465,6 @@ void GLES2CmdFuncCreateBuffer(GLES2Device* device, GLES2GPUBuffer* gpuBuffer) { gpuBuffer->buffer = (uint8_t*)CC_MALLOC(gpuBuffer->size); gpuBuffer->glTarget = GL_NONE; } else if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT){ - gpuBuffer->indirectBuff.draws.resize(gpuBuffer->count); gpuBuffer->glTarget = GL_NONE; } else if ((gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_DST) || (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC)) { @@ -542,7 +541,7 @@ void GLES2CmdFuncResizeBuffer(GLES2Device* device, GLES2GPUBuffer* gpuBuffer) { gpuBuffer->buffer = (uint8_t*)CC_MALLOC(gpuBuffer->size); gpuBuffer->glTarget = GL_NONE; } else if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT) { - gpuBuffer->indirectBuff.draws.resize(gpuBuffer->count); + gpuBuffer->indirects.resize(gpuBuffer->count); gpuBuffer->glTarget = GL_NONE; } else if ((gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_DST) || (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC)) { @@ -562,7 +561,12 @@ void GLES2CmdFuncUpdateBuffer(GLES2Device* device, GLES2GPUBuffer* gpuBuffer, vo if (gpuBuffer->usage & GFXBufferUsageBit::UNIFORM) { memcpy(gpuBuffer->buffer + offset, buffer, size); } else if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT) { - memcpy((uint8_t*)gpuBuffer->indirectBuff.draws.data() + offset, buffer, size); + auto count = size / sizeof(GFXDrawInfo); + if(gpuBuffer->indirects.size() < count) + { + gpuBuffer->indirects.resize(count); + } + memcpy((uint8_t*)gpuBuffer->indirects.data() + offset, buffer, size); } else if (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC) { memcpy(gpuBuffer->buffer + offset, buffer, size); } else { @@ -1924,8 +1928,8 @@ void GLES2CmdFuncExecuteCmds(GLES2Device* device, GLES2CmdPackage* cmd_package) } } } else { - for (size_t j = 0; j < gpuInputAssembler->gpuIndirectBuffer->indirectBuff.draws.size(); ++j) { - GFXDrawInfo& draw = gpuInputAssembler->gpuIndirectBuffer->indirectBuff.draws[j]; + for (size_t j = 0; j < gpuInputAssembler->gpuIndirectBuffer->indirects.size(); ++j) { + const GFXDrawInfo& draw = gpuInputAssembler->gpuIndirectBuffer->indirects[j]; if (gpuInputAssembler->gpuIndexBuffer && draw.indexCount >= 0) { uint8_t* offset = 0; offset += draw.firstIndex * gpuInputAssembler->gpuIndexBuffer->stride; diff --git a/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h b/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h index 45b19e4fe8..7d3576aa8a 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h +++ b/native/cocos/renderer/gfx-gles2/GLES2GPUObjects.h @@ -15,7 +15,7 @@ class GLES2GPUBuffer : public Object { GLenum glTarget = 0; GLuint glBuffer = 0; uint8_t* buffer = nullptr; - GFXIndirectBuffer indirectBuff; + GFXDrawInfoList indirects; }; typedef vector::type GLES2GPUBufferList; diff --git a/native/cocos/renderer/gfx-gles2/GLES2InputAssembler.cc b/native/cocos/renderer/gfx-gles2/GLES2InputAssembler.cc index 11feddda60..a0369edd29 100644 --- a/native/cocos/renderer/gfx-gles2/GLES2InputAssembler.cc +++ b/native/cocos/renderer/gfx-gles2/GLES2InputAssembler.cc @@ -35,6 +35,8 @@ bool GLES2InputAssembler::initialize(const GFXInputAssemblerInfo &info) { if(info.indexBuffer) _gpuInputAssembler->gpuIndexBuffer = static_cast(info.indexBuffer)->gpuBuffer(); + if(info.indirectBuffer) + _gpuInputAssembler->gpuIndirectBuffer = static_cast(info.indirectBuffer)->gpuBuffer(); GLES2CmdFuncCreateInputAssembler((GLES2Device*)_device, _gpuInputAssembler); _status = GFXStatus::SUCCESS; diff --git a/native/cocos/renderer/gfx-gles3/GLES3Commands.cc b/native/cocos/renderer/gfx-gles3/GLES3Commands.cc index ca2a49b70f..569a99babc 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3Commands.cc +++ b/native/cocos/renderer/gfx-gles3/GLES3Commands.cc @@ -525,7 +525,6 @@ void GLES3CmdFuncCreateBuffer(GLES3Device* device, GLES3GPUBuffer* gpuBuffer) { device->stateCache->glUniformBuffer = 0; } } else if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT){ - gpuBuffer->indirectBuff.draws.resize(gpuBuffer->count); gpuBuffer->glTarget = GL_NONE; } else if ((gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_DST) || (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC)) { @@ -619,7 +618,7 @@ void GLES3CmdFuncResizeBuffer(GLES3Device* device, GLES3GPUBuffer* gpuBuffer) { device->stateCache->glUniformBuffer = 0; } } else if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT) { - gpuBuffer->indirectBuff.draws.resize(gpuBuffer->count); + gpuBuffer->indirects.resize(gpuBuffer->count); gpuBuffer->glTarget = GL_NONE; } else if ((gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_DST) || (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC)) { @@ -637,7 +636,12 @@ void GLES3CmdFuncResizeBuffer(GLES3Device* device, GLES3GPUBuffer* gpuBuffer) { void GLES3CmdFuncUpdateBuffer(GLES3Device* device, GLES3GPUBuffer* gpuBuffer, void* buffer, uint offset, uint size) { if (gpuBuffer->usage & GFXBufferUsageBit::INDIRECT) { - memcpy((uint8_t*)gpuBuffer->indirectBuff.draws.data() + offset, buffer, size); + auto count = size / sizeof(GFXDrawInfo); + if(gpuBuffer->indirects.size() < count) + { + gpuBuffer->indirects.resize(count); + } + memcpy((uint8_t*)gpuBuffer->indirects.data() + offset, buffer, size); } else if (gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_SRC || gpuBuffer->usage & GFXBufferUsageBit::TRANSFER_DST) @@ -1893,8 +1897,8 @@ void GLES3CmdFuncExecuteCmds(GLES3Device* device, GLES3CmdPackage* cmd_package) } } } else { - for (size_t j = 0; j < gpuInputAssembler->gpuIndirectBuffer->indirectBuff.draws.size(); ++j) { - GFXDrawInfo& draw = gpuInputAssembler->gpuIndirectBuffer->indirectBuff.draws[j]; + for (size_t j = 0; j < gpuInputAssembler->gpuIndirectBuffer->indirects.size(); ++j) { + const GFXDrawInfo& draw = gpuInputAssembler->gpuIndirectBuffer->indirects[j]; if (gpuInputAssembler->gpuIndexBuffer && draw.indexCount >= 0) { uint8_t* offset = 0; offset += draw.firstIndex * gpuInputAssembler->gpuIndexBuffer->stride; diff --git a/native/cocos/renderer/gfx-gles3/GLES3GPUObjects.h b/native/cocos/renderer/gfx-gles3/GLES3GPUObjects.h index 362e8d565c..15b4f1526a 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3GPUObjects.h +++ b/native/cocos/renderer/gfx-gles3/GLES3GPUObjects.h @@ -15,7 +15,7 @@ class GLES3GPUBuffer : public Object { GLenum glTarget = 0; GLuint glBuffer = 0; uint8_t* buffer = nullptr; - GFXIndirectBuffer indirectBuff; + GFXDrawInfoList indirectBuff; }; typedef vector::type GLES3GPUBufferList; diff --git a/native/cocos/renderer/gfx-gles3/GLES3InputAssembler.cc b/native/cocos/renderer/gfx-gles3/GLES3InputAssembler.cc index bc4eca8409..1c878477c5 100644 --- a/native/cocos/renderer/gfx-gles3/GLES3InputAssembler.cc +++ b/native/cocos/renderer/gfx-gles3/GLES3InputAssembler.cc @@ -34,6 +34,9 @@ bool GLES3InputAssembler::initialize(const GFXInputAssemblerInfo &info) { } if(info.indexBuffer) _gpuInputAssembler->gpuIndexBuffer = static_cast(info.indexBuffer)->gpuBuffer(); + + if(info.indirectBuffer) + _gpuInputAssembler->gpuIndirectBuffer = static_cast(info.indirectBuffer)->gpuBuffer(); GLES3CmdFuncCreateInputAssembler((GLES3Device*)_device, _gpuInputAssembler); _status = GFXStatus::SUCCESS; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp index 6453b84bd6..e05a6a1441 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp @@ -145,14 +145,14 @@ static bool js_gfx_GFXBuffer_update(se::State& s) if (argc == 1) { SE_PRECONDITION2(ok, false, "js_gfx_GFXBuffer_update : Error processing arguments"); - cobj->update(arg0, 0, dataLength); + cobj->update(arg0, 0, static_cast(dataLength)); return true; } if (argc == 2) { unsigned int arg1 = 0; ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); SE_PRECONDITION2(ok, false, "js_gfx_GFXBuffer_update : Error processing arguments"); - cobj->update(arg0, arg1, dataLength); + cobj->update(arg0, arg1, static_cast(dataLength)); return true; } if (argc == 3) {