80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

More sprintf and warning cleanup (#3540)

Browse Source 
Co-authored-by: cold-brewed <cold-brewed@users.noreply.github.com>
This commit is contained in:
cold-brewed
2023-08-11 15:34:06 -04:00
committed by GitHub
parent 750f0ef90e
commit bff9eea9ae
5 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/qt_vulkanrenderer.cpp
View File

@@ -938,9 +938,6 @@ VulkanRenderer2::startNextFrame()
if (err != VK_SUCCESS) if (err != VK_SUCCESS)
qFatal("Failed to map memory: %d", err); qFatal("Failed to map memory: %d", err);
QMatrix4x4 m = m_proj; QMatrix4x4 m = m_proj;
#if 0
m.rotate(m_rotation, 0, 0, 1);
#endif
memcpy(p, m.constData(), 16 * sizeof(float)); memcpy(p, m.constData(), 16 * sizeof(float));
m_devFuncs->vkUnmapMemory(dev, m_bufMem); m_devFuncs->vkUnmapMemory(dev, m_bufMem);
p = nullptr; p = nullptr;

187
src/qt/qt_vulkanrenderer.hpp
View File

@@ -1,94 +1,93 @@
#pragma once #pragma once
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2022 Cacodemon345 ** Copyright (C) 2022 Cacodemon345
** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2017 The Qt Company Ltd.
** **
** "Redistribution and use in source and binary forms, with or without ** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are ** modification, are permitted provided that the following conditions are
** met: ** met:
** * Redistributions of source code must retain the above copyright ** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer. ** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright ** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in ** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the ** the documentation and/or other materials provided with the
** distribution. ** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its ** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived ** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission. ** from this software without specific prior written permission.
** **
** **
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
** **
****************************************************************************/ ****************************************************************************/
#include <QVulkanWindow> #include <QVulkanWindow>
#include <QImage> #include <QImage>
#if QT_CONFIG(vulkan) #if QT_CONFIG(vulkan)
# include "qt_vulkanwindowrenderer.hpp" # include "qt_vulkanwindowrenderer.hpp"
class VulkanRenderer2 : public QVulkanWindowRenderer { class VulkanRenderer2 : public QVulkanWindowRenderer {
public: public:
void *mappedPtr = nullptr; void *mappedPtr = nullptr;
size_t imagePitch = 2048 * 4; size_t imagePitch = 2048 * 4;
VulkanRenderer2(QVulkanWindow *w); VulkanRenderer2(QVulkanWindow *w);
void initResources() override; void initResources() override;
void initSwapChainResources() override; void initSwapChainResources() override;
void releaseSwapChainResources() override; void releaseSwapChainResources() override;
void releaseResources() override; void releaseResources() override;
void startNextFrame() override; void startNextFrame() override;
private: private:
VkShaderModule createShader(const QString &name); VkShaderModule createShader(const QString &name);
bool createTexture(); bool createTexture();
bool createTextureImage(const QSize &size, VkImage *image, VkDeviceMemory *mem, bool createTextureImage(const QSize &size, VkImage *image, VkDeviceMemory *mem,
VkImageTiling tiling, VkImageUsageFlags usage, uint32_t memIndex); VkImageTiling tiling, VkImageUsageFlags usage, uint32_t memIndex);
bool writeLinearImage(const QImage &img, VkImage image, VkDeviceMemory memory); bool writeLinearImage(const QImage &img, VkImage image, VkDeviceMemory memory);
void ensureTexture(); void ensureTexture();
void updateSamplers(); void updateSamplers();
QVulkanWindow *m_window; QVulkanWindow *m_window;
QVulkanDeviceFunctions *m_devFuncs; QVulkanDeviceFunctions *m_devFuncs;
VkDeviceMemory m_bufMem = VK_NULL_HANDLE; VkDeviceMemory m_bufMem = VK_NULL_HANDLE;
VkBuffer m_buf = VK_NULL_HANDLE; VkBuffer m_buf = VK_NULL_HANDLE;
VkDescriptorBufferInfo m_uniformBufInfo[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT]; VkDescriptorBufferInfo m_uniformBufInfo[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT];
VkDescriptorPool m_descPool = VK_NULL_HANDLE; VkDescriptorPool m_descPool = VK_NULL_HANDLE;
VkDescriptorSetLayout m_descSetLayout = VK_NULL_HANDLE; VkDescriptorSetLayout m_descSetLayout = VK_NULL_HANDLE;
VkDescriptorSet m_descSet[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT]; VkDescriptorSet m_descSet[QVulkanWindow::MAX_CONCURRENT_FRAME_COUNT];
VkPipelineCache m_pipelineCache = VK_NULL_HANDLE; VkPipelineCache m_pipelineCache = VK_NULL_HANDLE;
VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE; VkPipelineLayout m_pipelineLayout = VK_NULL_HANDLE;
VkPipeline m_pipeline = VK_NULL_HANDLE; VkPipeline m_pipeline = VK_NULL_HANDLE;
VkSampler m_sampler = VK_NULL_HANDLE; VkSampler m_sampler = VK_NULL_HANDLE;
VkSampler m_linearSampler = VK_NULL_HANDLE; VkSampler m_linearSampler = VK_NULL_HANDLE;
VkImage m_texImage = VK_NULL_HANDLE; VkImage m_texImage = VK_NULL_HANDLE;
VkDeviceMemory m_texMem = VK_NULL_HANDLE; VkDeviceMemory m_texMem = VK_NULL_HANDLE;
bool m_texLayoutPending = false; bool m_texLayoutPending = false;
VkImageView m_texView = VK_NULL_HANDLE; VkImageView m_texView = VK_NULL_HANDLE;
VkImage m_texStaging = VK_NULL_HANDLE; VkImage m_texStaging = VK_NULL_HANDLE;
VkDeviceMemory m_texStagingMem = VK_NULL_HANDLE; VkDeviceMemory m_texStagingMem = VK_NULL_HANDLE;
bool m_texStagingPending = false; bool m_texStagingPending = false;
bool m_texStagingTransferLayout = false; bool m_texStagingTransferLayout = false;
QSize m_texSize; QSize m_texSize;
VkFormat m_texFormat; VkFormat m_texFormat;
QMatrix4x4 m_proj; QMatrix4x4 m_proj;
float m_rotation = 0.0f; };
}; #endif
#endif

6
src/qt/sdl_joystick.cpp
View File

@@ -41,15 +41,15 @@ joystick_init()
plat_joystick_state[c].nr_povs = SDL_JoystickNumHats(sdl_joy[c]); plat_joystick_state[c].nr_povs = SDL_JoystickNumHats(sdl_joy[c]);
for (d = 0; d < std::min(plat_joystick_state[c].nr_axes, 8); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_axes, 8); d++) {
sprintf(plat_joystick_state[c].axis[d].name, "Axis %i", d); snprintf(plat_joystick_state[c].axis[d].name, sizeof(plat_joystick_state[c].axis[d].name), "Axis %i", d);
plat_joystick_state[c].axis[d].id = d; plat_joystick_state[c].axis[d].id = d;
} }
for (d = 0; d < std::min(plat_joystick_state[c].nr_buttons, 8); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_buttons, 8); d++) {
sprintf(plat_joystick_state[c].button[d].name, "Button %i", d); snprintf(plat_joystick_state[c].button[d].name, sizeof(plat_joystick_state[c].button[d].name), "Button %i", d);
plat_joystick_state[c].button[d].id = d; plat_joystick_state[c].button[d].id = d;
} }
for (d = 0; d < std::min(plat_joystick_state[c].nr_povs, 4); d++) { for (d = 0; d < std::min(plat_joystick_state[c].nr_povs, 4); d++) {
sprintf(plat_joystick_state[c].pov[d].name, "POV %i", d); snprintf(plat_joystick_state[c].pov[d].name, sizeof(plat_joystick_state[c].pov[d].name), "POV %i", d);
plat_joystick_state[c].pov[d].id = d; plat_joystick_state[c].pov[d].id = d;
} }
} }

2
src/sound/munt/MidiStreamParser.cpp
View File

@@ -191,7 +191,7 @@ Bit32u MidiStreamParserImpl::parseShortMessageDataBytes(const Bit8u stream[], Bi
} else if (dataByte < 0xF8) { } else if (dataByte < 0xF8) {
// Discard invalid bytes and start over // Discard invalid bytes and start over
char s[128]; char s[128];
sprintf(s, "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize); snprintf(s, sizeof(s), "parseShortMessageDataBytes: Invalid short message: status %02x, expected length %i, actual %i -> ignored", *streamBuffer, shortMessageLength, streamBufferSize);
midiReporter.printDebug(s); midiReporter.printDebug(s);
streamBufferSize = 0; // Clear streamBuffer streamBufferSize = 0; // Clear streamBuffer
return parsedLength; return parsedLength;

2
src/sound/munt/Part.cpp
View File

@@ -54,7 +54,7 @@ Part::Part(Synth *useSynth, unsigned int usePartNum) {
// Nasty hack for rhythm // Nasty hack for rhythm
timbreTemp = NULL; timbreTemp = NULL;
} else { } else {
sprintf(name, "Part %d", partNum + 1); snprintf(name, sizeof(name), "Part %d", partNum + 1);
timbreTemp = &synth->mt32ram.timbreTemp[partNum]; timbreTemp = &synth->mt32ram.timbreTemp[partNum];
} }
currentInstr[0] = 0; currentInstr[0] = 0;