From 5a54a67946b96df90fc3be96f123a1b59096cdd3 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Mon, 14 Jan 2019 23:52:57 +0100 Subject: [PATCH] project: Remove unused parameters and fix additional warnings --- source/filter-blur.cpp | 22 +++++++++------------- source/filter-custom-shader.cpp | 4 ++-- source/filter-shadow-sdf.cpp | 10 +++++----- source/filter-shape.hpp | 1 - source/filter-transform.cpp | 1 - source/gfx-effect-source.cpp | 15 +++++++-------- source/gs-mipmapper.cpp | 12 ++++++------ source/gs-vertex.cpp | 2 +- source/util-memory.hpp | 2 +- 9 files changed, 31 insertions(+), 38 deletions(-) diff --git a/source/filter-blur.cpp b/source/filter-blur.cpp index e462b19..c7a817e 100644 --- a/source/filter-blur.cpp +++ b/source/filter-blur.cpp @@ -18,12 +18,12 @@ */ #include "filter-blur.hpp" -#include +#include #include +#include #include #include "strings.hpp" #include "util-math.hpp" -#include // OBS #ifdef _MSC_VER @@ -205,12 +205,9 @@ bool filter::blur::blur_instance::apply_mask_parameters(std::shared_ptrm_source); uint32_t baseW = obs_source_get_base_width(target); uint32_t baseH = obs_source_get_base_height(target); - vec4 black = {0}; + vec4 black; + vec4_set(&black, 0, 0, 0, 0); bool failed = false; @@ -529,8 +527,8 @@ void filter::blur::blur_instance::video_render(gs_effect_t* effect) } if ((baseW == 0) || (baseH == 0)) { if (this->can_log()) { - P_LOG_ERROR(" Invalid base size from '%s': %lux%lu.", obs_source_get_name(this->m_source), - obs_source_get_name(target), baseW, baseH); + P_LOG_ERROR(" Invalid base size from '%s': %" PRIu32 "x%" PRIu32 ".", + obs_source_get_name(this->m_source), obs_source_get_name(target), baseW, baseH); } obs_source_skip_video_filter(this->m_source); return; @@ -1072,9 +1070,8 @@ void filter::blur::blur_factory::update(void* inptr, obs_data_t* settings) reinterpret_cast(inptr)->update(settings); } -const char* filter::blur::blur_factory::get_name(void* inptr) +const char* filter::blur::blur_factory::get_name(void*) { - inptr; return P_TRANSLATE(SOURCE_NAME); } @@ -1130,9 +1127,8 @@ void filter::blur::blur_factory::scene_destroy_handler(void* ptr, calldata_t* da } } -std::shared_ptr filter::blur::blur_factory::get_effect(filter::blur::type type) +std::shared_ptr filter::blur::blur_factory::get_effect(filter::blur::type) { - type; return blur_effect; } diff --git a/source/filter-custom-shader.cpp b/source/filter-custom-shader.cpp index 1379078..fea44f8 100644 --- a/source/filter-custom-shader.cpp +++ b/source/filter-custom-shader.cpp @@ -360,7 +360,7 @@ bool filter::CustomShader::Instance::is_special_parameter(std::string name, gs:: return false; } -bool filter::CustomShader::Instance::apply_special_parameters(uint32_t viewW, uint32_t viewH) +bool filter::CustomShader::Instance::apply_special_parameters(uint32_t, uint32_t) { std::unique_ptr imageTexture; m_renderTarget->get_texture(imageTexture); @@ -385,7 +385,7 @@ bool filter::CustomShader::Instance::apply_special_parameters(uint32_t viewW, ui return true; } -bool filter::CustomShader::Instance::video_tick_impl(float_t time) +bool filter::CustomShader::Instance::video_tick_impl(float_t) { return true; } diff --git a/source/filter-shadow-sdf.cpp b/source/filter-shadow-sdf.cpp index 34ba90e..02178aa 100644 --- a/source/filter-shadow-sdf.cpp +++ b/source/filter-shadow-sdf.cpp @@ -154,7 +154,7 @@ void filter::shadow_sdf::shadow_sdf_instance::update(obs_data_t* data) } this->m_inner_offset_x = float_t(obs_data_get_double(data, P_INNER_OFFSET_X)); this->m_inner_offset_y = float_t(obs_data_get_double(data, P_INNER_OFFSET_Y)); - this->m_inner_color = obs_data_get_int(data, P_INNER_COLOR) & 0x00FFFFFF + this->m_inner_color = (obs_data_get_int(data, P_INNER_COLOR) & 0x00FFFFFF) | (int32_t(obs_data_get_double(data, P_INNER_ALPHA) * 2.55) << 24); this->m_outer_shadow = obs_data_get_bool(data, P_OUTER); @@ -165,7 +165,7 @@ void filter::shadow_sdf::shadow_sdf_instance::update(obs_data_t* data) } this->m_outer_offset_x = float_t(obs_data_get_double(data, P_OUTER_OFFSET_X)); this->m_outer_offset_y = float_t(obs_data_get_double(data, P_OUTER_OFFSET_Y)); - this->m_outer_color = obs_data_get_int(data, P_OUTER_COLOR) & 0x00FFFFFF + this->m_outer_color = (obs_data_get_int(data, P_OUTER_COLOR) & 0x00FFFFFF) | (int32_t(obs_data_get_double(data, P_OUTER_ALPHA) * 2.55) << 24); } @@ -194,8 +194,9 @@ void filter::shadow_sdf::shadow_sdf_instance::video_render(gs_effect_t*) obs_source_t* target = obs_filter_get_target(this->m_self); uint32_t baseW = obs_source_get_base_width(target); uint32_t baseH = obs_source_get_base_height(target); - vec4 color_transparent = {0}; gs_effect_t* default_effect = obs_get_base_effect(obs_base_effect::OBS_EFFECT_DEFAULT); + vec4 color_transparent; + vec4_zero(&color_transparent); if (!parent || !target || (baseW == 0) || (baseH == 0)) { obs_source_skip_video_filter(this->m_self); @@ -436,9 +437,8 @@ void filter::shadow_sdf::shadow_sdf_factory::update(void* inptr, obs_data_t* set reinterpret_cast(inptr)->update(settings); } -const char* filter::shadow_sdf::shadow_sdf_factory::get_name(void* inptr) +const char* filter::shadow_sdf::shadow_sdf_factory::get_name(void*) { - inptr; return P_TRANSLATE(SOURCE_NAME); } diff --git a/source/filter-shape.hpp b/source/filter-shape.hpp index 797a11b..fb9c619 100644 --- a/source/filter-shape.hpp +++ b/source/filter-shape.hpp @@ -77,7 +77,6 @@ namespace filter { private: obs_source_t* context; - gs_effect_t* customEffect; gs::vertex_buffer* m_vertexHelper; gs_vertbuffer_t* m_vertexBuffer; gs_draw_mode drawmode; diff --git a/source/filter-transform.cpp b/source/filter-transform.cpp index e5e4322..bc0b028 100644 --- a/source/filter-transform.cpp +++ b/source/filter-transform.cpp @@ -71,7 +71,6 @@ INITIALIZER(FilterTransformInit) static const float farZ = 2097152.0f; // 2 pow 21 static const float nearZ = 1.0f / farZ; -static const float valueLimit = 65536.0f; enum class CameraMode : int32_t { Orthographic, Perspective }; diff --git a/source/gfx-effect-source.cpp b/source/gfx-effect-source.cpp index de57e2e..eec012f 100644 --- a/source/gfx-effect-source.cpp +++ b/source/gfx-effect-source.cpp @@ -96,19 +96,14 @@ bool gfx::effect_source::property_texture_type_modified(void* priv, obs_properti return true; } -bool gfx::effect_source::property_texture_input_modified(void* priv, obs_properties_t* props, obs_property_t* prop, - obs_data_t* sett) +bool gfx::effect_source::property_texture_input_modified(void*, obs_properties_t*, obs_property_t*, + obs_data_t*) { - priv; - props; - prop; - sett; return false; } -gfx::effect_source::effect_source(obs_data_t* data, obs_source_t* owner) +gfx::effect_source::effect_source(obs_data_t*, obs_source_t* owner) { - data; m_source = owner; m_timeExisting = 0; m_timeActive = 0; @@ -520,6 +515,8 @@ void gfx::effect_source::apply_parameters() case gs::effect_parameter::type::Integer4: param->param->set_int4(param->value[0], param->value[1], param->value[2], param->value[3]); break; + default: + break; } } else if (prm.first.second >= gs::effect_parameter::type::Float && prm.first.second <= gs::effect_parameter::type::Float4) { @@ -537,6 +534,8 @@ void gfx::effect_source::apply_parameters() case gs::effect_parameter::type::Float4: param->param->set_float4(param->value[0], param->value[1], param->value[2], param->value[3]); break; + default: + break; } } } diff --git a/source/gs-mipmapper.cpp b/source/gs-mipmapper.cpp index 47c08ce..1293f10 100644 --- a/source/gs-mipmapper.cpp +++ b/source/gs-mipmapper.cpp @@ -151,14 +151,14 @@ void gs::mipmapper::rebuild(std::shared_ptr source, std::shared_ptr } // Render - graphics_t* ctx = gs_get_context(); + graphics_t* ctx = gs_get_context(); #if defined(WIN32) || defined(WIN64) - gs_d3d11_device* dev = reinterpret_cast(ctx->device); + gs_d3d11_device* dev = reinterpret_cast(ctx->device); #endif - int device_type = gs_get_device_type(); - void* sobj = gs_texture_get_obj(source->get_object()); - void* tobj = gs_texture_get_obj(target->get_object()); - std::string technique = "Draw"; + int device_type = gs_get_device_type(); + void* sobj = gs_texture_get_obj(source->get_object()); + void* tobj = gs_texture_get_obj(target->get_object()); + std::string technique = "Draw"; switch (generator) { case generator::Point: diff --git a/source/gs-vertex.cpp b/source/gs-vertex.cpp index 7af34e9..5bb3872 100644 --- a/source/gs-vertex.cpp +++ b/source/gs-vertex.cpp @@ -21,7 +21,7 @@ #include "util-memory.hpp" gs::vertex::vertex() - : hasStore(true), store(nullptr), position(nullptr), normal(nullptr), tangent(nullptr), color(nullptr) + : position(nullptr), normal(nullptr), tangent(nullptr), color(nullptr), hasStore(true), store(nullptr) { store = util::malloc_aligned(16, sizeof(vec3) * 3 + sizeof(uint32_t) + sizeof(vec4) * MAXIMUM_UVW_LAYERS); diff --git a/source/util-memory.hpp b/source/util-memory.hpp index 693472f..529431a 100644 --- a/source/util-memory.hpp +++ b/source/util-memory.hpp @@ -106,7 +106,7 @@ namespace util { // Returns true if and only if storage allocated from *this // can be deallocated from other, and vice versa. // Always returns true for stateless allocators. - bool operator==(const AlignmentAllocator& other) const + bool operator==(const AlignmentAllocator& ) const { return true; }