Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

This commit is contained in:
halx99 2021-06-09 12:28:33 +08:00
parent fe26435e06
commit cfd471f53a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/base/astc.cpp
View File

@ -34,8 +34,9 @@ uint8_t astc_decompress_image(
init_block_size_descriptor(block_x, block_y, 1, false, 0 /*unused for decompress*/, *bsd);
image_block blk;
astcenc_image image_out{dim_x, dim_y, 1, ASTCENC_TYPE_U8, (void**) &out};
const int total_blocks = zblocks * yblocks * xblocks;
void* data[1] = {out};
astcenc_image image_out{dim_x, dim_y, 1, ASTCENC_TYPE_U8, data};
const auto total_blocks = zblocks * yblocks * xblocks;
const astcenc_swizzle swz_decode{ASTCENC_SWZ_R, ASTCENC_SWZ_G, ASTCENC_SWZ_B, ASTCENC_SWZ_A};
for (unsigned int i = 0; i < total_blocks; ++i) {
// Decode i into x, y, z block indices

2
thirdparty/CMakeLists.txt vendored
View File

@ -41,7 +41,7 @@ function(configure_target_outdir target)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
FOLDER "ThirdParty"
)
endfunction(configure_lib_outdir)
endfunction()
if(NOT DEFINED LUA_ENGINE)
set(LUA_ENGINE "plainlua" CACHE INTERNAL "The lua core lib, luajit or plainlua")