diff --git a/Common/GPU/OpenGL/thin3d_gl.cpp b/Common/GPU/OpenGL/thin3d_gl.cpp index fcce3aabbdc9..7c1708fb63a0 100644 --- a/Common/GPU/OpenGL/thin3d_gl.cpp +++ b/Common/GPU/OpenGL/thin3d_gl.cpp @@ -302,7 +302,7 @@ class OpenGLPipeline : public Pipeline { // TODO: Optimize by getting the locations first and putting in a custom struct UniformBufferDesc dynamicUniforms; - GLint samplerLocs_[8]; + GLint samplerLocs_[8]{}; std::vector dynamicUniformLocs_; GLRProgram *program_ = nullptr; @@ -1038,8 +1038,8 @@ Pipeline *OpenGLContext::CreateGraphicsPipeline(const PipelineDesc &desc) { ERROR_LOG(G3D, "Pipeline requires at least one shader"); return nullptr; } - if ((int)desc.prim >= (int)Primitive::PRIMITIVE_TYPE_COUNT) { - ERROR_LOG(G3D, "Invalid primitive type"); + if ((uint32_t)desc.prim >= (uint32_t)Primitive::PRIMITIVE_TYPE_COUNT) { + ERROR_LOG(G3D, "Invalid primitive type"); return nullptr; } if (!desc.depthStencil || !desc.blend || !desc.raster) { diff --git a/Common/UI/Context.h b/Common/UI/Context.h index 944d31e4d8f8..29635b74fdec 100644 --- a/Common/UI/Context.h +++ b/Common/UI/Context.h @@ -99,7 +99,7 @@ class UIContext { Bounds TransformBounds(const Bounds &bounds); private: - Draw::DrawContext *draw_; + Draw::DrawContext *draw_ = nullptr; Bounds bounds_; float fontScaleX_ = 1.0f; @@ -107,7 +107,7 @@ class UIContext { UI::FontStyle *fontStyle_ = nullptr; TextDrawer *textDrawer_ = nullptr; - Draw::SamplerState *sampler_; + Draw::SamplerState *sampler_ = nullptr; Draw::Pipeline *ui_pipeline_ = nullptr; Draw::Pipeline *ui_pipeline_notex_ = nullptr; std::unique_ptr uitexture_; diff --git a/UI/BackgroundAudio.cpp b/UI/BackgroundAudio.cpp index ba03df8ca29f..7d6ff7732e9d 100644 --- a/UI/BackgroundAudio.cpp +++ b/UI/BackgroundAudio.cpp @@ -343,14 +343,12 @@ int BackgroundAudio::Play() { int sz = lastPlaybackTime_ <= 0.0 ? 44100 / 60 : (int)((now - lastPlaybackTime_) * 44100); sz = std::min(BUFSIZE / 2, sz); if (at3Reader_) { - if (sz >= 16) { - if (at3Reader_->Read(buffer, sz)) { - if (fadingOut_) { - for (int i = 0; i < sz*2; i += 2) { - buffer[i] *= volume_; - buffer[i + 1] *= volume_; - volume_ += delta_; - } + if (at3Reader_->Read(buffer, sz)) { + if (fadingOut_) { + for (int i = 0; i < sz*2; i += 2) { + buffer[i] *= volume_; + buffer[i + 1] *= volume_; + volume_ += delta_; } } } diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index 55a46dce27ef..bb472b41c643 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -516,8 +516,8 @@ void LogoScreen::render() { const Bounds &bounds = dc.GetBounds(); - float xres = dc.GetBounds().w; - float yres = dc.GetBounds().h; + float xres = bounds.w; + float yres = bounds.h; dc.Begin();