fix particle issue (#2308)

* fix particle issue

* keep GFXIndirectBuffer

* revert GFXIndirectBuffer
This commit is contained in:
coulsonwang
2020-03-19 18:28:04 +08:00
committed by GitHub
parent dc2d278383
commit fab59fdff0
8 changed files with 28 additions and 15 deletions
+1 -1
View File
@@ -703,7 +703,7 @@ struct GFXDrawInfo {
typedef vector<GFXDrawInfo>::type GFXDrawInfoList;
struct GFXIndirectBuffer {
GFXDrawInfoList draws;
GFXDrawInfoList drawInfos;
};
struct GFXTextureInfo {
@@ -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;
@@ -15,7 +15,7 @@ class GLES2GPUBuffer : public Object {
GLenum glTarget = 0;
GLuint glBuffer = 0;
uint8_t* buffer = nullptr;
GFXIndirectBuffer indirectBuff;
GFXDrawInfoList indirects;
};
typedef vector<GLES2GPUBuffer*>::type GLES2GPUBufferList;
@@ -35,6 +35,8 @@ bool GLES2InputAssembler::initialize(const GFXInputAssemblerInfo &info) {
if(info.indexBuffer)
_gpuInputAssembler->gpuIndexBuffer = static_cast<GLES2Buffer*>(info.indexBuffer)->gpuBuffer();
if(info.indirectBuffer)
_gpuInputAssembler->gpuIndirectBuffer = static_cast<GLES2Buffer*>(info.indirectBuffer)->gpuBuffer();
GLES2CmdFuncCreateInputAssembler((GLES2Device*)_device, _gpuInputAssembler);
_status = GFXStatus::SUCCESS;
@@ -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;
@@ -15,7 +15,7 @@ class GLES3GPUBuffer : public Object {
GLenum glTarget = 0;
GLuint glBuffer = 0;
uint8_t* buffer = nullptr;
GFXIndirectBuffer indirectBuff;
GFXDrawInfoList indirectBuff;
};
typedef vector<GLES3GPUBuffer*>::type GLES3GPUBufferList;
@@ -34,6 +34,9 @@ bool GLES3InputAssembler::initialize(const GFXInputAssemblerInfo &info) {
}
if(info.indexBuffer)
_gpuInputAssembler->gpuIndexBuffer = static_cast<GLES3Buffer*>(info.indexBuffer)->gpuBuffer();
if(info.indirectBuffer)
_gpuInputAssembler->gpuIndirectBuffer = static_cast<GLES3Buffer*>(info.indirectBuffer)->gpuBuffer();
GLES3CmdFuncCreateInputAssembler((GLES3Device*)_device, _gpuInputAssembler);
_status = GFXStatus::SUCCESS;
@@ -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<uint>(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<uint>(dataLength));
return true;
}
if (argc == 3) {