Reduce jsb (#2986)

* convert BufferInfo

* convert JS object to TextureViewInfo

* convert JS object to TextureInfo

* convert JS object to DescriptorSetInfo
This commit is contained in:
minggo
2020-11-06 17:32:44 +08:00
committed by GitHub
parent 6ba1c6e477
commit aa194152e5
5 changed files with 167 additions and 46 deletions
+145 -37
View File
@@ -762,23 +762,23 @@ bool seval_to_gfx_rect(const se::Value &v, cc::gfx::Rect *rect) {
SE_PRECONDITION2(v.isObject(), false, "Convert parameter to cc::gfx::Rect failed!");
se::Object *obj = v.toObject();
se::Value val;
bool ok = obj->getProperty("x", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get x from Rect!");
rect->x = val.toUint32();
ok = obj->getProperty("y", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get y from Rect!");
rect->y = val.toUint32();
ok = obj->getProperty("width", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get width from Rect!");
rect->width = val.toUint();
ok = obj->getProperty("height", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get height from Rect!");
rect->height = val.toUint();
return true;
}
@@ -790,27 +790,27 @@ bool seval_to_gfx_viewport(const se::Value &v, cc::gfx::Viewport *viewport) {
bool ok = obj->getProperty("left", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get left from Viewport!");
viewport->left = val.toUint32();
ok = obj->getProperty("top", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get top from Viewport!");
viewport->top = val.toUint32();
ok = obj->getProperty("width", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get width from Viewport!");
viewport->top = val.toUint();
ok = obj->getProperty("height", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get height from Viewport!");
viewport->height = val.toUint();
ok = obj->getProperty("minDepth", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get minDepth from Viewport!");
viewport->minDepth = val.toFloat();
ok = obj->getProperty("maxDepth", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get maxDepth from Viewport!");
viewport->maxDepth = val.toFloat();
return true;
}
@@ -822,19 +822,19 @@ bool seval_to_gfx_color(const se::Value &v, cc::gfx::Color *color) {
bool ok = obj->getProperty("x", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get x from Color!");
color->x = val.toFloat();
ok = obj->getProperty("y", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get y from Color!");
color->y = val.toFloat();
ok = obj->getProperty("z", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get z from Color!");
color->z = val.toFloat();
ok = obj->getProperty("w", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get w from Color!");
color->w = val.toFloat();
return true;
}
@@ -842,7 +842,7 @@ bool seval_to_gfx_color_list(const se::Value &v, cc::vector<cc::gfx::Color> *col
assert(colorList != nullptr);
SE_PRECONDITION2(v.isObject() && v.toObject()->isArray(), false, "Convert parameter to cc::gfx::ColorList failed!");
se::Object *obj = v.toObject();
uint32_t len = 0;
if (obj->getArrayLength(&len)) {
colorList->resize(len);
@@ -852,7 +852,7 @@ bool seval_to_gfx_color_list(const se::Value &v, cc::vector<cc::gfx::Color> *col
seval_to_gfx_color(value, &(*colorList)[i]);
}
}
return true;
}
@@ -864,15 +864,15 @@ bool seval_to_gfx_offset(const se::Value &v, cc::gfx::Offset *offset) {
bool ok = obj->getProperty("x", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get x from Offset!");
offset->x = val.toUint32();
ok = obj->getProperty("y", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get y from Offset!");
offset->y = val.toUint32();
ok = obj->getProperty("z", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get z from Offset!");
offset->z = val.toUint32();
return true;
}
@@ -884,15 +884,15 @@ bool seval_to_gfx_extent(const se::Value &v, cc::gfx::Extent *extent) {
bool ok = obj->getProperty("width", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get x from Extent!");
extent->width = val.toUint();
ok = obj->getProperty("height", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get height from Extent!");
extent->height = val.toUint();
ok = obj->getProperty("depth", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get depth from Extent!");
extent->depth = val.toUint();
return true;
}
@@ -904,15 +904,15 @@ bool seval_to_gfx_texture_subres(const se::Value &v, cc::gfx::TextureSubres *tex
bool ok = obj->getProperty("mipLevel", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get mipLevel from TextureSubres!");
textureSubres->mipLevel = val.toUint();
ok = obj->getProperty("baseArrayLayer", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get baseArrayLayer from TextureSubres!");
textureSubres->baseArrayLayer = val.toUint();
ok = obj->getProperty("layerCount", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get layerCount from TextureSubres!");
textureSubres->layerCount = val.toUint();
return true;
}
@@ -924,23 +924,23 @@ bool seval_to_gfx_texture_copy(const se::Value &v, cc::gfx::TextureCopy *texture
bool ok = obj->getProperty("srcSubres", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get srcSubres from TextureCopy!");
seval_to_gfx_texture_subres(val, &textureCopy->srcSubres);
ok = obj->getProperty("dstSubres", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get dstSubres from TextureCopy!");
seval_to_gfx_texture_subres(val, &textureCopy->dstSubres);
ok = obj->getProperty("srcOffset", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get srcOffset from TextureCopy!");
seval_to_gfx_offset(val, &textureCopy->srcOffset);
ok = obj->getProperty("dstOffset", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get dstOffset from TextureCopy!");
seval_to_gfx_offset(val, &textureCopy->dstOffset);
ok = obj->getProperty("extent", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get extent from TextureCopy!");
seval_to_gfx_extent(val, &textureCopy->extent);
return true;
}
@@ -952,23 +952,23 @@ bool seval_to_gfx_buffer_texture_copy(const se::Value &v, cc::gfx::BufferTexture
bool ok = obj->getProperty("buffStride", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get buffStride from BufferTextureCopy!");
bufferTextureCopy->buffStride = val.toUint();
ok = obj->getProperty("buffTexHeight", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get buffTexHeight from BufferTextureCopy!");
bufferTextureCopy->buffTexHeight = val.toUint();
ok = obj->getProperty("texOffset", &val);
SE_PRECONDITION2(ok, false, "Can not get texOffset from BufferTextureCopy!");
seval_to_gfx_offset(val, &bufferTextureCopy->texOffset);
ok = obj->getProperty("texExtent", &val);
SE_PRECONDITION2(ok, false, "Can not get texExtent from BufferTextureCopy!");
seval_to_gfx_extent(val, &bufferTextureCopy->texExtent);
ok = obj->getProperty("texSubres", &val);
SE_PRECONDITION2(ok, false, "Can not get texSubres from BufferTextureCopy!");
seval_to_gfx_texture_subres(val, &bufferTextureCopy->texSubres);
return true;
}
@@ -976,7 +976,7 @@ bool seval_to_gfx_buffer_texture_copy_list(const se::Value &v, cc::vector<cc::gf
assert(bufferTextureCopyList != nullptr);
SE_PRECONDITION2(v.isObject() && v.toObject()->isArray(), false, "Convert parameter to cc::gfx::BufferTextureCopyList failed!");
se::Object *obj = v.toObject();
uint32_t len = 0;
if (obj->getArrayLength(&len)) {
bufferTextureCopyList->resize(len);
@@ -986,6 +986,114 @@ bool seval_to_gfx_buffer_texture_copy_list(const se::Value &v, cc::vector<cc::gf
seval_to_gfx_buffer_texture_copy(value, &(*bufferTextureCopyList)[i]);
}
}
return true;
}
bool seval_to_gfx_buffer_info(const se::Value &v, cc::gfx::BufferInfo *bufferInfo) {
assert(bufferInfo != nullptr);
SE_PRECONDITION2(v.isObject(), false, "Convert parameter to cc::gfx::BufferInfo failed!");
se::Object *obj = v.toObject();
se::Value val;
bool ok = obj->getProperty("usage", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get usage from BufferInfo!");
bufferInfo->usage = (cc::gfx::BufferUsage)val.toUint();
ok = obj->getProperty("memUsage", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get memUsage from BufferInfo!");
bufferInfo->memUsage = (cc::gfx::MemoryUsage)val.toUint();
ok = obj->getProperty("size", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get size from BufferInfo!");
bufferInfo->size = val.toUint();
ok = obj->getProperty("stride", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get stride from BufferInfo!");
bufferInfo->stride = val.toUint();
ok = obj->getProperty("flags", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get flags from BufferInfo!");
bufferInfo->flags = (cc::gfx::BufferFlags)val.toUint();
return true;
}
bool seval_to_gfx_buffer_view_info(const se::Value &v, cc::gfx::BufferViewInfo *bufferViewInfo) {
assert(bufferViewInfo != nullptr);
SE_PRECONDITION2(v.isObject(), false, "Convert parameter to cc::gfx::BufferViewInfo failed!");
se::Object *obj = v.toObject();
se::Value val;
bool ok = obj->getProperty("buffer", &val);
SE_PRECONDITION2(ok && val.isObject(), false, "Can not get buffer from BufferViewInfo!");
bufferViewInfo->buffer = static_cast<cc::gfx::Buffer *>(val.toObject()->getPrivateData());
ok = obj->getProperty("offset", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get offset from BufferViewInfo!");
bufferViewInfo->offset = val.toUint();
ok = obj->getProperty("range", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get range from BufferViewInfo!");
bufferViewInfo->range = val.toUint();
return true;
}
bool seval_to_gfx_texture_info(const se::Value &v, cc::gfx::TextureInfo *textureInfo) {
assert(textureInfo != nullptr);
SE_PRECONDITION2(v.isObject(), false, "Convert parameter to cc::gfx::TextureInfo failed!");
se::Object *obj = v.toObject();
se::Value val;
bool ok = obj->getProperty("type", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get type from TextureInfo!");
textureInfo->type = (cc::gfx::TextureType)val.toUint();
ok = obj->getProperty("usage", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get usage from TextureInfo!");
textureInfo->usage = (cc::gfx::TextureUsage)val.toUint();
ok = obj->getProperty("format", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get format from TextureInfo!");
textureInfo->format = (cc::gfx::Format)val.toUint();
ok = obj->getProperty("width", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get width from TextureInfo!");
textureInfo->width = val.toUint();
ok = obj->getProperty("height", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get height from TextureInfo!");
textureInfo->height = val.toUint();
ok = obj->getProperty("flags", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get flags from TextureInfo!");
textureInfo->flags = (cc::gfx::TextureFlags)val.toUint();
ok = obj->getProperty("layerCount", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get layerCount from TextureInfo!");
textureInfo->layerCount = val.toUint();
ok = obj->getProperty("levelCount", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get levelCount from TextureInfo!");
textureInfo->levelCount = val.toUint();
ok = obj->getProperty("samples", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get samples from TextureInfo!");
textureInfo->samples = (cc::gfx::SampleCount)val.toUint();
ok = obj->getProperty("depth", &val);
SE_PRECONDITION2(ok && val.isNumber(), false, "Can not get depth from TextureInfo!");
textureInfo->depth = val.toUint();
return true;
}
bool seval_to_gfx_descriptor_set_info(const se::Value &v, cc::gfx::DescriptorSetInfo *descriptorSetInfo) {
assert(descriptorSetInfo != nullptr);
SE_PRECONDITION2(v.isObject(), false, "Convert parameter to cc::gfx::DescriptorSetInfo failed!");
se::Object *obj = v.toObject();
se::Value val;
bool ok = obj->getProperty("layout", &val);
SE_PRECONDITION2(ok && val.isObject(), false, "Can not get layout from TextureInfo!");
descriptorSetInfo->layout = static_cast<cc::gfx::DescriptorSetLayout *>(val.toObject()->getPrivateData());
return true;
}
@@ -42,6 +42,10 @@ struct Extent;
struct TextureSubres;
struct TextureCopy;
struct BufferTextureCopy;
struct BufferInfo;
struct BufferViewInfo;
struct TextureInfo;
struct DescriptorSetInfo;
}
} // namespace cc
@@ -137,6 +141,10 @@ bool seval_to_gfx_texture_subres(const se::Value &v, cc::gfx::TextureSubres *tex
bool seval_to_gfx_texture_copy(const se::Value &v, cc::gfx::TextureCopy *textureCopy);
bool seval_to_gfx_buffer_texture_copy(const se::Value &v, cc::gfx::BufferTextureCopy *bufferTextureCopy);
bool seval_to_gfx_buffer_texture_copy_list(const se::Value &v, cc::vector<cc::gfx::BufferTextureCopy> *bufferTextureCopyList);
bool seval_to_gfx_buffer_info(const se::Value &v, cc::gfx::BufferInfo *bufferInfo);
bool seval_to_gfx_buffer_view_info(const se::Value &v, cc::gfx::BufferViewInfo *bufferViewInfo);
bool seval_to_gfx_texture_info(const se::Value &v, cc::gfx::TextureInfo *textureInfo);
bool seval_to_gfx_descriptor_set_info(const se::Value &v, cc::gfx::DescriptorSetInfo *descriptorSetInfo);
#if USE_GFX_RENDERER
#endif
@@ -141,11 +141,13 @@ static bool js_gfx_Device_createBuffer(se::State &s) {
seval_to_boolean(args[1], &createBufferView);
if (createBufferView) {
auto bufferViewInfo = (cc::gfx::BufferViewInfo *)(args[0].toObject()->getPrivateData());
buffer = cobj->createBuffer(*bufferViewInfo);
cc::gfx::BufferViewInfo bufferViewInfo;
seval_to_gfx_buffer_view_info(args[0], &bufferViewInfo);
buffer = cobj->createBuffer(bufferViewInfo);
} else {
auto bufferInfo = (cc::gfx::BufferInfo *)(args[0].toObject()->getPrivateData());
buffer = cobj->createBuffer(*bufferInfo);
cc::gfx::BufferInfo bufferInfo;
seval_to_gfx_buffer_info(args[0], &bufferInfo);
buffer = cobj->createBuffer(bufferInfo);
}
CC_UNUSED bool ok = native_ptr_to_seval(buffer, &s.rval());
@@ -166,16 +168,15 @@ static bool js_gfx_Device_createTexture(se::State &s) {
if (argc == 2) {
cc::gfx::Texture *texture = nullptr;
bool createTextureView = false;
seval_to_boolean(args[1], &createTextureView);
if (createTextureView) {
auto textureViewInfo = (cc::gfx::TextureViewInfo *)(args[0].toObject()->getPrivateData());
texture = cobj->createTexture(*textureViewInfo);
} else {
auto textureInfo = (cc::gfx::TextureInfo *)(args[0].toObject()->getPrivateData());
texture = cobj->createTexture(*textureInfo);
cc::gfx::TextureInfo textureInfo;
seval_to_gfx_texture_info(args[0], &textureInfo);
texture = cobj->createTexture(textureInfo);
}
CC_UNUSED bool ok = native_ptr_to_seval(texture, &s.rval());
@@ -81,6 +81,10 @@ conversions:
"TextureCopy": "ok &= seval_to_gfx_texture_copy(${in_value}, &${out_value})"
"BufferTextureCopy": "ok &= seval_to_gfx_buffer)texture_copy(${in_value}, &${out_value})"
"BufferTextureCopyList": "ok &= seval_to_gfx_buffer_texture_copy_list(${in_value}, &${out_value})"
"BufferInfo": "ok &= seval_to_gfx_buffer_info(${in_value}, &${out_value})"
"BufferViewInfo": "ok &= seval_to_gfx_buffer_view_info(${in_value}, &${out_value})"
"TextureInfo": "ok &= seval_to_gfx_texture_info(${in_value}, &${out_value})"
"DescriptorSetInfo": "ok &= seval_to_gfx_descriptor_set_info(${in_value}, &${out_value})"
from_native:
# int to jsval
+1 -1
View File
@@ -33,7 +33,7 @@ replace_headers =
# what classes to produce code for. You can use regular expressions here. When testing the regular
# expression, it will be enclosed in "^$", like this: "^Menu.*$".
classes = GFXObject Device Buffer CommandBuffer Framebuffer InputAssembler DescriptorSet DescriptorSetLayout PipelineLayout PipelineState Fence Queue RenderPass Sampler Shader Texture TextureLayout QueueType CommandBufferType TextureSubres TextureCopy BufferTextureCopy DeviceInfo ContextInfo BufferInfo BufferViewInfo DrawInfo IndirectBuffer TextureInfo TextureViewInfo SamplerInfo ShaderMacro Uniform UniformBlock UniformSampler ShaderStage ShaderInfo Attribute InputAssemblerInfo ColorAttachment DepthStencilAttachment RenderPassInfo FramebufferInfo DescriptorSetLayoutBinding DescriptorSetInfo DescriptorSetLayoutInfo PipelineLayoutInfo PushConstantRange InputState PipelineStateInfo CommandBufferInfo QueueInfo FormatInfo MemoryStatus BindingMappingInfo FenceInfo
classes = GFXObject Device Buffer CommandBuffer Framebuffer InputAssembler DescriptorSet DescriptorSetLayout PipelineLayout PipelineState Fence Queue RenderPass Sampler Shader Texture TextureLayout QueueType CommandBufferType TextureSubres TextureCopy BufferTextureCopy DeviceInfo ContextInfo DrawInfo IndirectBuffer TextureViewInfo SamplerInfo ShaderMacro Uniform UniformBlock UniformSampler ShaderStage ShaderInfo Attribute InputAssemblerInfo ColorAttachment DepthStencilAttachment RenderPassInfo FramebufferInfo DescriptorSetLayoutBinding DescriptorSetLayoutInfo PipelineLayoutInfo PushConstantRange InputState PipelineStateInfo CommandBufferInfo QueueInfo FormatInfo MemoryStatus BindingMappingInfo FenceInfo
classes_need_extend =