From 8696fb0b7149691ec4ecc7a28e9b5de452634116 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 10 Dec 2023 15:29:32 +0200 Subject: [PATCH] Make boolean conversion operators explicit --- source/backends/opengl/batch_backend.cpp | 2 +- source/backends/opengl/device_backend.cpp | 18 +++++++++--------- source/backends/opengl/extension.h | 2 +- source/backends/opengl/sampler_backend.cpp | 2 +- source/core/backend.h | 2 +- source/glsl/compiler.cpp | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/backends/opengl/batch_backend.cpp b/source/backends/opengl/batch_backend.cpp index 2bd3c837..78d398e6 100644 --- a/source/backends/opengl/batch_backend.cpp +++ b/source/backends/opengl/batch_backend.cpp @@ -17,7 +17,7 @@ bool OpenGLBatch::check_restart(bool require) { if(require) static Require _req(MSP_primitive_restart); - return MSP_primitive_restart; + return static_cast(MSP_primitive_restart); } void OpenGLBatch::set_index_type(DataType t) diff --git a/source/backends/opengl/device_backend.cpp b/source/backends/opengl/device_backend.cpp index d8b75011..001387c1 100644 --- a/source/backends/opengl/device_backend.cpp +++ b/source/backends/opengl/device_backend.cpp @@ -87,15 +87,15 @@ void OpenGLDevice::fill_info() SL::Features &feat = info.glsl_features; feat.target_api = get_backend_api(); feat.glsl_version = get_glsl_version(); - feat.arb_enhanced_layouts = ARB_enhanced_layouts; - feat.arb_explicit_attrib_location = ARB_explicit_attrib_location; - feat.arb_explicit_uniform_location = ARB_explicit_uniform_location; - feat.arb_gpu_shader5 = ARB_gpu_shader5; - feat.arb_separate_shader_objects = ARB_separate_shader_objects; - feat.arb_uniform_buffer_object = ARB_uniform_buffer_object; - feat.arb_shader_storage_buffer_object = ARB_shader_storage_buffer_object; - feat.ext_gpu_shader4 = EXT_gpu_shader4; - feat.ext_texture_array = EXT_texture_array; + feat.arb_enhanced_layouts = static_cast(ARB_enhanced_layouts); + feat.arb_explicit_attrib_location = static_cast(ARB_explicit_attrib_location); + feat.arb_explicit_uniform_location = static_cast(ARB_explicit_uniform_location); + feat.arb_gpu_shader5 = static_cast(ARB_gpu_shader5); + feat.arb_separate_shader_objects = static_cast(ARB_separate_shader_objects); + feat.arb_uniform_buffer_object = static_cast(ARB_uniform_buffer_object); + feat.arb_shader_storage_buffer_object = static_cast(ARB_shader_storage_buffer_object); + feat.ext_gpu_shader4 = static_cast(EXT_gpu_shader4); + feat.ext_texture_array = static_cast(EXT_texture_array); feat.uniform_binding_range = lim.max_uniform_bindings; feat.texture_binding_range = lim.max_texture_bindings; feat.storage_texture_binding_range = lim.max_storage_texture_bindings; diff --git a/source/backends/opengl/extension.h b/source/backends/opengl/extension.h index f1edec3e..9033ba11 100644 --- a/source/backends/opengl/extension.h +++ b/source/backends/opengl/extension.h @@ -40,7 +40,7 @@ public: Extension(const char *, InitFunc); const char *get_name() const { return name; } - operator bool() const; + explicit operator bool() const; }; diff --git a/source/backends/opengl/sampler_backend.cpp b/source/backends/opengl/sampler_backend.cpp index 161429f0..2afd691b 100644 --- a/source/backends/opengl/sampler_backend.cpp +++ b/source/backends/opengl/sampler_backend.cpp @@ -44,7 +44,7 @@ bool OpenGLSampler::check_anisotropic(bool require) { if(require) static Require _req(EXT_texture_filter_anisotropic); - return EXT_texture_filter_anisotropic; + return static_cast(EXT_texture_filter_anisotropic); } void OpenGLSampler::update(unsigned mask) const diff --git a/source/core/backend.h b/source/core/backend.h index db027454..5080cebf 100644 --- a/source/core/backend.h +++ b/source/core/backend.h @@ -25,7 +25,7 @@ struct MSPGL_API Version bool operator>=(const Version &) const; bool operator<(const Version &o) const { return !(*this>=o); } - operator bool() const { return major || minor; } + explicit operator bool() const { return major || minor; } }; /** Returns the backend for which the library was compiled. */ diff --git a/source/glsl/compiler.cpp b/source/glsl/compiler.cpp index e61cf10d..7da7fcd9 100644 --- a/source/glsl/compiler.cpp +++ b/source/glsl/compiler.cpp @@ -282,7 +282,7 @@ void Compiler::append_stage(const Stage &stage) target = &*i; } - if(stage.required_features.glsl_version>target->required_features.glsl_version) + if(target->required_features.glsl_versionrequired_features.glsl_version = stage.required_features.glsl_version; for(const RefPtr &s: stage.content.body) if(!dynamic_cast(s.get())) @@ -301,7 +301,7 @@ void Compiler::import(ModuleCache &mod_cache, const string &name) void Compiler::generate(Stage &stage) { stage.required_features.target_api = features.target_api; - if(module->shared.required_features.glsl_version>stage.required_features.glsl_version) + if(stage.required_features.glsl_versionshared.required_features.glsl_version) stage.required_features.glsl_version = module->shared.required_features.glsl_version; inject_block(stage.content, module->shared.content); -- 2.45.2