diff --git a/model/Texture.cpp b/model/Texture.cpp index 4ea7eed7..57b661c4 100644 --- a/model/Texture.cpp +++ b/model/Texture.cpp @@ -982,11 +982,11 @@ opengl_texture::create( bool const Static ) { if (Global.gfx_usegles) { if( target == GL_TEXTURE_2D ) - glTexStorage2D(target, count_trailing_zeros(std::max(data_width, data_height)) + 1, data_format, data_width, data_height); + glTexStorage2D(target, std::countr_zero(static_cast(std::max(data_width, data_height))) + 1, data_format, data_width, data_height); else if( target == GL_TEXTURE_2D_MULTISAMPLE ) glTexStorage2DMultisample( target, samples, data_format, data_width, data_height, GL_FALSE ); else if( target == GL_TEXTURE_2D_ARRAY ) - glTexStorage3D( target, count_trailing_zeros( std::max( data_width, data_height ) ) + 1, data_format, data_width, data_height, layers ); + glTexStorage3D(target, std::countr_zero(static_cast(std::max(data_width, data_height))) + 1, data_format, data_width, data_height, layers); else if( target == GL_TEXTURE_2D_MULTISAMPLE_ARRAY ) glTexStorage3DMultisample( target, samples, data_format, data_width, data_height, layers, GL_FALSE ); } diff --git a/utilities/utilities.cpp b/utilities/utilities.cpp index c157935f..2c95d652 100644 --- a/utilities/utilities.cpp +++ b/utilities/utilities.cpp @@ -457,14 +457,4 @@ std::string deserialize_random_set(cParser &Input, char const *Break) // shouldn't ever get here but, eh return ""; } -} - -int count_trailing_zeros(uint32_t val) -{ - int r = 0; - - for (uint32_t shift = 1; !(val & shift); shift <<= 1) - r++; - - return r; -} +} \ No newline at end of file diff --git a/utilities/utilities.h b/utilities/utilities.h index 26445a90..d715c1c8 100644 --- a/utilities/utilities.h +++ b/utilities/utilities.h @@ -380,8 +380,6 @@ glm::dvec3 LoadPoint(class cParser &Input); // extracts a group of tokens from provided data stream std::string deserialize_random_set(cParser &Input, char const *Break = "\n\r\t ;"); -int count_trailing_zeros(uint32_t val); - // extracts a group of pairs from provided data stream // NOTE: expects no more than single pair per line template void deserialize_map(MapType_ &Map, cParser &Input)