diff options
| -rw-r--r-- | src/core/file_sys/disk_archive.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/mutex.h | 7 | ||||
| -rw-r--r-- | src/core/hle/kernel/semaphore.h | 1 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.h | 1 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.h | 2 | ||||
| -rw-r--r-- | src/core/hw/y2r.cpp | 9 | ||||
| -rw-r--r-- | src/core/loader/loader.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/ncch.h | 4 | ||||
| -rw-r--r-- | src/core/tracer/recorder.h | 3 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 3 | ||||
| -rw-r--r-- | src/video_core/shader/shader.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/shader/shader_jit_x64.cpp | 1 | 
14 files changed, 18 insertions, 26 deletions
| diff --git a/src/core/file_sys/disk_archive.h b/src/core/file_sys/disk_archive.h index c5da07508..aaac65b17 100644 --- a/src/core/file_sys/disk_archive.h +++ b/src/core/file_sys/disk_archive.h @@ -51,7 +51,6 @@ protected:  class DiskFile : public FileBackend {  public: -    DiskFile();      DiskFile(const DiskArchive& archive, const Path& path, const Mode mode);      bool Open() override; @@ -73,7 +72,6 @@ protected:  class DiskDirectory : public DirectoryBackend {  public: -    DiskDirectory();      DiskDirectory(const DiskArchive& archive, const Path& path);      ~DiskDirectory() override { diff --git a/src/core/hle/kernel/mutex.h b/src/core/hle/kernel/mutex.h index d6d5328be..1746360e4 100644 --- a/src/core/hle/kernel/mutex.h +++ b/src/core/hle/kernel/mutex.h @@ -38,10 +38,9 @@ public:      void Acquire() override;      /** -    * Acquires the specified mutex for the specified thread -    * @param mutex Mutex that is to be acquired -    * @param thread Thread that will acquire the mutex -    */ +     * Acquires the specified mutex for the specified thread +     * @param thread Thread that will acquire the mutex +     */      void Acquire(SharedPtr<Thread> thread);      void Release(); diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h index d8dc1fd78..390f5e495 100644 --- a/src/core/hle/kernel/semaphore.h +++ b/src/core/hle/kernel/semaphore.h @@ -17,7 +17,6 @@ class Semaphore final : public WaitObject {  public:      /**       * Creates a semaphore. -     * @param handle Pointer to the handle of the newly created object       * @param initial_count Number of slots reserved for other threads       * @param max_count Maximum number of slots the semaphore can have       * @param name Optional name of semaphore diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h index 1ff1d9b97..97ba57fc5 100644 --- a/src/core/hle/kernel/thread.h +++ b/src/core/hle/kernel/thread.h @@ -57,7 +57,6 @@ public:       * @param arg User data to pass to the thread       * @param processor_id The ID(s) of the processors on which the thread is desired to be run       * @param stack_top The address of the thread's stack top -     * @param stack_size The size of the thread's stack       * @return A shared pointer to the newly created thread       */      static ResultVal<SharedPtr<Thread>> Create(std::string name, VAddr entry_point, s32 priority, diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index f61125953..6f7048710 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -87,7 +87,7 @@ ResultCode CloseArchive(ArchiveHandle handle);  /**   * Registers an Archive type, instances of which can later be opened using its IdCode. - * @param backend File system backend interface to the archive + * @param factory File system backend interface to the archive   * @param id_code Id code used to access this type of archive   */  ResultCode RegisterArchiveType(std::unique_ptr<FileSys::ArchiveFactory>&& factory, ArchiveIdCode id_code); diff --git a/src/core/hw/y2r.cpp b/src/core/hw/y2r.cpp index 082a4db82..15f96ced8 100644 --- a/src/core/hw/y2r.cpp +++ b/src/core/hw/y2r.cpp @@ -33,7 +33,9 @@ static void ConvertYUVToRGB(InputFormat input_format,      for (unsigned int y = 0; y < height; ++y) {          for (unsigned int x = 0; x < width; ++x) { -            s32 Y, U, V; +            s32 Y = 0; +            s32 U = 0; +            s32 V = 0;              switch (input_format) {              case InputFormat::YUV422_Indiv8:              case InputFormat::YUV422_Indiv16: @@ -269,7 +271,7 @@ void PerformConversion(ConversionConfiguration& cvt) {      // LUT used to remap writes to a tile. Used to allow linear or swizzled output without      // requiring two different code paths. -    const u8* tile_remap; +    const u8* tile_remap = nullptr;      switch (cvt.block_alignment) {      case BlockAlignment::Linear:          tile_remap = linear_lut; break; @@ -323,7 +325,8 @@ void PerformConversion(ConversionConfiguration& cvt) {          u32* output_buffer = reinterpret_cast<u32*>(data_buffer.get());          for (int i = 0; i < num_tiles; ++i) { -            int image_strip_width, output_stride; +            int image_strip_width = 0; +            int output_stride = 0;              switch (cvt.rotation) {              case Rotation::None: diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index 062291006..74eb6e871 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -50,7 +50,7 @@ static FileType IdentifyFile(FileUtil::IOFile& file) {  /**   * Guess the type of a bootable file from its extension - * @param extension String extension of bootable file + * @param extension_ String extension of bootable file   * @return FileType of file   */  static FileType GuessFromExtension(const std::string& extension_) { diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index b4374a476..d875e4cf3 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h @@ -209,7 +209,9 @@ public:      /**       * Get the RomFS of the application -     * @param buffer Reference to buffer to store data +     * @param romfs_file Reference to buffer to store data +     * @param offset     Offset in the file to the RomFS +     * @param size       Size of the RomFS in bytes       * @return ResultStatus result of function       */      ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset, u64& size) override; diff --git a/src/core/tracer/recorder.h b/src/core/tracer/recorder.h index 6e4b70015..a42ccc45f 100644 --- a/src/core/tracer/recorder.h +++ b/src/core/tracer/recorder.h @@ -32,8 +32,7 @@ public:      /**       * Recorder constructor -     * @param default_attributes Pointer to an array of 32-bit-aligned 24-bit floating point values. -     * @param vs_float_uniforms Pointer to an array of 32-bit-aligned 24-bit floating point values. +     * @param initial_state Initial recorder state       */      Recorder(const InitialState& initial_state); diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 059445f7d..9a61e700b 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -298,7 +298,6 @@ void DumpShader(const std::string& filename, const Regs::ShaderConfig& config, c      }      // Write data to file -    static int dump_index = 0;      std::ofstream file(filename, std::ios_base::out | std::ios_base::binary);      for (auto& chunk : writing_queue) { @@ -695,7 +694,6 @@ void DumpTexture(const Pica::Regs::TextureConfig& texture_config, u8* data) {      for (unsigned y = 0; y < texture_config.height; ++y)      {          u8* row_ptr = (u8*)buf + y * row_stride; -        u8* ptr = row_ptr;          png_write_row(png_ptr, row_ptr);      } diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 0260a28ce..62ca18317 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -212,9 +212,9 @@ void RasterizerOpenGL::Reset() {  void RasterizerOpenGL::AddTriangle(const Pica::Shader::OutputVertex& v0,                                     const Pica::Shader::OutputVertex& v1,                                     const Pica::Shader::OutputVertex& v2) { -    vertex_batch.push_back(HardwareVertex(v0)); -    vertex_batch.push_back(HardwareVertex(v1)); -    vertex_batch.push_back(HardwareVertex(v2)); +    vertex_batch.emplace_back(v0); +    vertex_batch.emplace_back(v1); +    vertex_batch.emplace_back(v2);  }  void RasterizerOpenGL::DrawTriangles() { diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 4b023dc98..fd6d7c964 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -64,9 +64,6 @@ private:      void LoadColorToActiveGLTexture(u8 color_r, u8 color_g, u8 color_b,                                      const TextureInfo& texture); -    /// Computes the viewport rectangle -    MathUtil::Rectangle<unsigned> GetViewportExtent(); -      EmuWindow*  render_window;                    ///< Handle to render window      u32         last_mode;                        ///< Last render mode diff --git a/src/video_core/shader/shader.cpp b/src/video_core/shader/shader.cpp index f89117521..59f54236b 100644 --- a/src/video_core/shader/shader.cpp +++ b/src/video_core/shader/shader.cpp @@ -146,7 +146,6 @@ OutputVertex Run(UnitState<false>& state, const InputVertex& input, int num_attr  DebugData<true> ProduceDebugInfo(const InputVertex& input, int num_attributes, const Regs::ShaderConfig& config, const State::ShaderSetup& setup) {      UnitState<true> state; -    const auto& shader_memory = setup.program_code;      state.program_counter = config.main_offset;      state.debug.max_offset = 0;      state.debug.max_opdesc_id = 0; diff --git a/src/video_core/shader/shader_jit_x64.cpp b/src/video_core/shader/shader_jit_x64.cpp index 0c02976ac..00415e402 100644 --- a/src/video_core/shader/shader_jit_x64.cpp +++ b/src/video_core/shader/shader_jit_x64.cpp @@ -749,7 +749,6 @@ void JitCompiler::Compile_NextInstr(unsigned* offset) {  CompiledShader* JitCompiler::Compile() {      const u8* start = GetCodePtr(); -    const auto& code = g_state.vs.program_code;      unsigned offset = g_state.regs.vs.main_offset;      // The stack pointer is 8 modulo 16 at the entry of a procedure | 
