TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass std::span to g3_validate_polygon_model

Browse source
This commit is contained in:
Kp 2022-09-24 17:47:52 +00:00
parent 928834fdf8
commit e69f219539
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/include/interp.h
View file

@ -47,7 +47,7 @@ void g3_draw_polygon_model(grs_bitmap *const *model_bitmaps, polygon_model_point
//init code for bitmap models
int16_t g3_init_polygon_model(std::span<uint8_t> model);
#if defined(DXX_BUILD_DESCENT_I)
void g3_validate_polygon_model(uint8_t *model_ptr, std::size_t model_size);
void g3_validate_polygon_model(std::span<uint8_t> model);
#endif
}
#endif

4
similar/3d/interp.cpp
View file

@ -967,12 +967,12 @@ static void validate_model_sub(uint8_t *const model_sub_ptr, const std::span<con
}
void g3_validate_polygon_model(uint8_t *const model_ptr, const std::size_t model_size)
void g3_validate_polygon_model(const std::span<uint8_t> model)
{
#ifndef NDEBUG
nest_count = 0;
#endif
return validate_model_sub(model_ptr, std::span{model_ptr, model_size});
return validate_model_sub(model.data(), model);
}
#endif

2
similar/main/polyobj.cpp
View file

@ -645,7 +645,7 @@ void polygon_model_data_read(polymodel *pm, PHYSFS_File *fp)
if constexpr (words_bigendian)
swap_polygon_model_data(pm->model_data.get());
#if defined(DXX_BUILD_DESCENT_I)
g3_validate_polygon_model(pm->model_data.get(), model_data_size);
g3_validate_polygon_model(std::span{pm->model_data.get(), model_data_size});
#elif defined(DXX_BUILD_DESCENT_II)
g3_init_polygon_model(std::span{pm->model_data.get(), model_data_size});
#endif