summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-06-19 01:59:02 +0200
committerPierre Bourdon <delroth@gmail.com>2014-06-19 01:59:02 +0200
commit591a27e32894f9454ebbdae040f61e60fa1ebf87 (patch)
treea8a50407af01bd5da5b9ba122e02a756ac73119d /Source/Core/VideoBackends
parentdccd9ead7dd23bf3b463a8e4043bdc63de6a7a9f (diff)
parentce54c1e571a7f79c173dd8f949003255ba95670a (diff)
Merge pull request #456 from lioncash/adios-sprintf
Kill off replaceable usages of s[n]printf.
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/D3D/D3DShader.cpp28
-rw-r--r--Source/Core/VideoBackends/D3D/PixelShaderCache.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D/VertexShaderCache.cpp6
-rw-r--r--Source/Core/VideoBackends/D3D/main.cpp17
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp34
-rw-r--r--Source/Core/VideoBackends/OGL/TextureConverter.cpp8
-rw-r--r--Source/Core/VideoBackends/OGL/VertexManager.cpp17
-rw-r--r--Source/Core/VideoBackends/Software/SWRenderer.cpp36
8 files changed, 80 insertions, 72 deletions
diff --git a/Source/Core/VideoBackends/D3D/D3DShader.cpp b/Source/Core/VideoBackends/D3D/D3DShader.cpp
index c6c6c28fe9..a1d2011780 100644
--- a/Source/Core/VideoBackends/D3D/D3DShader.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DShader.cpp
@@ -4,6 +4,7 @@
#include <string>
+#include "Common/StringUtil.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoCommon/VideoConfig.h"
@@ -47,17 +48,16 @@ bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
if (FAILED(hr))
{
static int num_failures = 0;
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+ std::string filename = StringFromFormat("%sbad_vs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file;
- OpenFStream(file, szTemp, std::ios_base::out);
+ OpenFStream(file, filename, std::ios_base::out);
file << code;
file.close();
PanicAlert("Failed to compile vertex shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
- szTemp,
+ filename.c_str(),
D3D::VertexShaderVersionString(),
- (char*)errorBuffer->GetBufferPointer());
+ (const char*)errorBuffer->GetBufferPointer());
*blob = nullptr;
errorBuffer->Release();
@@ -105,17 +105,16 @@ bool CompileGeometryShader(const char* code, unsigned int len, D3DBlob** blob,
if (FAILED(hr))
{
static int num_failures = 0;
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%sbad_gs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+ std::string filename = StringFromFormat("%sbad_gs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file;
- OpenFStream(file, szTemp, std::ios_base::out);
+ OpenFStream(file, filename, std::ios_base::out);
file << code;
file.close();
PanicAlert("Failed to compile geometry shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
- szTemp,
+ filename.c_str(),
D3D::GeometryShaderVersionString(),
- (char*)errorBuffer->GetBufferPointer());
+ (const char*)errorBuffer->GetBufferPointer());
*blob = nullptr;
errorBuffer->Release();
@@ -165,17 +164,16 @@ bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob,
if (FAILED(hr))
{
static int num_failures = 0;
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%sbad_ps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+ std::string filename = StringFromFormat("%sbad_ps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file;
- OpenFStream(file, szTemp, std::ios_base::out);
+ OpenFStream(file, filename, std::ios_base::out);
file << code;
file.close();
PanicAlert("Failed to compile pixel shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s):\n%s",
- szTemp,
+ filename.c_str(),
D3D::PixelShaderVersionString(),
- (char*)errorBuffer->GetBufferPointer());
+ (const char*)errorBuffer->GetBufferPointer());
*blob = nullptr;
errorBuffer->Release();
diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
index d4d3e392b4..3531ec1389 100644
--- a/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
@@ -2,8 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
+#include <string>
+
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
+#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
@@ -396,8 +399,7 @@ void PixelShaderCache::Init()
SETSTAT(stats.numPixelShadersCreated, 0);
SETSTAT(stats.numPixelShadersAlive, 0);
- char cache_filename[MAX_PATH];
- sprintf(cache_filename, "%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+ std::string cache_filename = StringFromFormat("%sdx11-%s-ps.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
PixelShaderCacheInserter inserter;
g_ps_disk_cache.OpenAndRead(cache_filename, inserter);
diff --git a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
index e58526504c..f62d0f74e3 100644
--- a/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
+++ b/Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
@@ -2,8 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
+#include <string>
+
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
+#include "Common/StringUtil.h"
#include "Core/ConfigManager.h"
@@ -143,8 +146,7 @@ void VertexShaderCache::Init()
SETSTAT(stats.numVertexShadersCreated, 0);
SETSTAT(stats.numVertexShadersAlive, 0);
- char cache_filename[MAX_PATH];
- sprintf(cache_filename, "%sdx11-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+ std::string cache_filename = StringFromFormat("%sdx11-%s-vs.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
VertexShaderCacheInserter inserter;
g_vs_disk_cache.OpenAndRead(cache_filename, inserter);
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp
index 043b22e35f..6e6505ffea 100644
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@@ -108,15 +108,18 @@ void InitBackendInfo()
// TODO: These don't get updated on adapter change, yet
if (adapter_index == g_Config.iAdapter)
{
- char buf[32];
- std::vector<DXGI_SAMPLE_DESC> modes;
- modes = DX11::D3D::EnumAAModes(ad);
+ std::string samples;
+ std::vector<DXGI_SAMPLE_DESC> modes = DX11::D3D::EnumAAModes(ad);
for (unsigned int i = 0; i < modes.size(); ++i)
{
- if (i == 0) sprintf_s(buf, 32, _trans("None"));
- else if (modes[i].Quality) sprintf_s(buf, 32, _trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality);
- else sprintf_s(buf, 32, _trans("%d samples"), modes[i].Count);
- g_Config.backend_info.AAModes.push_back(buf);
+ if (i == 0)
+ samples = _trans("None");
+ else if (modes[i].Quality)
+ samples = StringFromFormat(_trans("%d samples (quality level %d)"), modes[i].Count, modes[i].Quality);
+ else
+ samples = StringFromFormat(_trans("%d samples"), modes[i].Count);
+
+ g_Config.backend_info.AAModes.push_back(samples);
}
// Requires the earlydepthstencil attribute (only available in shader model 5)
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 5f9028c021..b1499c791a 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -5,6 +5,7 @@
#include <string>
#include "Common/MathUtil.h"
+#include "Common/StringUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
@@ -204,13 +205,14 @@ SHADER* ProgramShaderCache::SetShader ( DSTALPHA_MODE dstAlphaMode, u32 componen
}
#if defined(_DEBUG) || defined(DEBUGFAST)
- if (g_ActiveConfig.iLog & CONF_SAVESHADERS) {
+ if (g_ActiveConfig.iLog & CONF_SAVESHADERS)
+ {
static int counter = 0;
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
- SaveData(szTemp, vcode.GetBuffer());
- sprintf(szTemp, "%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
- SaveData(szTemp, pcode.GetBuffer());
+ std::string filename = StringFromFormat("%svs_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+ SaveData(filename, vcode.GetBuffer());
+
+ filename = StringFromFormat("%sps_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+ SaveData(filename, pcode.GetBuffer());
}
#endif
@@ -265,16 +267,16 @@ bool ProgramShaderCache::CompileShader ( SHADER& shader, const char* vcode, cons
GLchar* infoLog = new GLchar[length];
glGetProgramInfoLog(pid, length, &charsWritten, infoLog);
ERROR_LOG(VIDEO, "Program info log:\n%s", infoLog);
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
+
+ std::string filename = StringFromFormat("%sbad_p_%d.txt", File::GetUserPath(D_DUMP_IDX).c_str(), num_failures++);
std::ofstream file;
- OpenFStream(file, szTemp, std::ios_base::out);
+ OpenFStream(file, filename, std::ios_base::out);
file << s_glsl_header << vcode << s_glsl_header << pcode << infoLog;
file.close();
if (linkStatus != GL_TRUE)
PanicAlert("Failed to link shaders!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
- szTemp,
+ filename.c_str(),
g_ogl_config.gl_vendor,
g_ogl_config.gl_renderer,
g_ogl_config.gl_version,
@@ -319,21 +321,20 @@ GLuint ProgramShaderCache::CompileSingleShader (GLuint type, const char* code )
GLchar* infoLog = new GLchar[length];
glGetShaderInfoLog(result, length, &charsWritten, infoLog);
ERROR_LOG(VIDEO, "%s Shader info log:\n%s", type==GL_VERTEX_SHADER ? "VS" : "PS", infoLog);
- char szTemp[MAX_PATH];
- sprintf(szTemp,
- "%sbad_%s_%04i.txt",
+
+ std::string filename = StringFromFormat("%sbad_%s_%04i.txt",
File::GetUserPath(D_DUMP_IDX).c_str(),
type==GL_VERTEX_SHADER ? "vs" : "ps",
num_failures++);
std::ofstream file;
- OpenFStream(file, szTemp, std::ios_base::out);
+ OpenFStream(file, filename, std::ios_base::out);
file << s_glsl_header << code << infoLog;
file.close();
if (compileStatus != GL_TRUE)
PanicAlert("Failed to compile %s shader!\nThis usually happens when trying to use Dolphin with an outdated GPU or integrated GPU like the Intel GMA series.\n\nIf you're sure this is Dolphin's error anyway, post the contents of %s along with this error message at the forums.\n\nDebug info (%s, %s, %s):\n%s",
type==GL_VERTEX_SHADER ? "vertex" : "pixel",
- szTemp,
+ filename.c_str(),
g_ogl_config.gl_vendor,
g_ogl_config.gl_renderer,
g_ogl_config.gl_version,
@@ -405,8 +406,7 @@ void ProgramShaderCache::Init(void)
if (!File::Exists(File::GetUserPath(D_SHADERCACHE_IDX)))
File::CreateDir(File::GetUserPath(D_SHADERCACHE_IDX));
- char cache_filename[MAX_PATH];
- sprintf(cache_filename, "%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
+ std::string cache_filename = StringFromFormat("%sogl-%s-shaders.cache", File::GetUserPath(D_SHADERCACHE_IDX).c_str(),
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strUniqueID.c_str());
ProgramShaderCacheInserter inserter;
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
index 08211cd2bd..f4300db292 100644
--- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp
@@ -4,7 +4,10 @@
// Fast image conversion using OpenGL shaders.
+#include <string>
+
#include "Common/FileUtil.h"
+#include "Common/StringUtil.h"
#include "Core/HW/Memmap.h"
@@ -145,10 +148,9 @@ static SHADER &GetOrCreateEncodingShader(u32 format)
if (g_ActiveConfig.iLog & CONF_SAVESHADERS && shader)
{
static int counter = 0;
- char szTemp[MAX_PATH];
- sprintf(szTemp, "%senc_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
+ std::string filename = StringFromFormat("%senc_%04i.txt", File::GetUserPath(D_DUMP_IDX).c_str(), counter++);
- SaveData(szTemp, shader);
+ SaveData(filename, shader);
}
#endif
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp
index 29079ddf4e..b32c6adadd 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp
@@ -3,10 +3,12 @@
// Refer to the license.txt file included.
#include <fstream>
+#include <string>
#include <vector>
#include "Common/FileUtil.h"
#include "Common/MemoryUtil.h"
+#include "Common/StringUtil.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
@@ -185,27 +187,26 @@ void VertexManager::vFlush(bool useDstAlpha)
{
// save the shaders
ProgramShaderCache::PCacheEntry prog = ProgramShaderCache::GetShaderProgram();
- char strfile[255];
- sprintf(strfile, "%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+ std::string filename = StringFromFormat("%sps%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
std::ofstream fps;
- OpenFStream(fps, strfile, std::ios_base::out);
+ OpenFStream(fps, filename, std::ios_base::out);
fps << prog.shader.strpprog.c_str();
- sprintf(strfile, "%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+
+ filename = StringFromFormat("%svs%.3d.txt", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
std::ofstream fvs;
- OpenFStream(fvs, strfile, std::ios_base::out);
+ OpenFStream(fvs, filename, std::ios_base::out);
fvs << prog.shader.strvprog.c_str();
}
if (g_ActiveConfig.iLog & CONF_SAVETARGETS)
{
- char str[128];
- sprintf(str, "%starg%.3d.png", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
+ std::string filename = StringFromFormat("%starg%.3d.png", File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), g_ActiveConfig.iSaveTargetId);
TargetRectangle tr;
tr.left = 0;
tr.right = Renderer::GetTargetWidth();
tr.top = 0;
tr.bottom = Renderer::GetTargetHeight();
- g_renderer->SaveScreenshot(str, tr);
+ g_renderer->SaveScreenshot(filename, tr);
}
#endif
g_Config.iSaveTargetId++;
diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp
index ea26a94139..ef6c491449 100644
--- a/Source/Core/VideoBackends/Software/SWRenderer.cpp
+++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp
@@ -3,8 +3,10 @@
// Refer to the license.txt file included.
#include <algorithm>
+#include <string>
#include "Common/Common.h"
+#include "Common/StringUtil.h"
#include "Core/Core.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/Software/RasterFont.h"
@@ -126,30 +128,28 @@ void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
void SWRenderer::DrawDebugText()
{
- char debugtext_buffer[8192];
- char *p = debugtext_buffer;
- p[0] = 0;
+ std::string debugtext;
if (g_SWVideoConfig.bShowStats)
{
- p+=sprintf(p,"Objects: %i\n",swstats.thisFrame.numDrawnObjects);
- p+=sprintf(p,"Primitives: %i\n",swstats.thisFrame.numPrimatives);
- p+=sprintf(p,"Vertices Loaded: %i\n",swstats.thisFrame.numVerticesLoaded);
-
- p+=sprintf(p,"Triangles Input: %i\n",swstats.thisFrame.numTrianglesIn);
- p+=sprintf(p,"Triangles Rejected: %i\n",swstats.thisFrame.numTrianglesRejected);
- p+=sprintf(p,"Triangles Culled: %i\n",swstats.thisFrame.numTrianglesCulled);
- p+=sprintf(p,"Triangles Clipped: %i\n",swstats.thisFrame.numTrianglesClipped);
- p+=sprintf(p,"Triangles Drawn: %i\n",swstats.thisFrame.numTrianglesDrawn);
-
- p+=sprintf(p,"Rasterized Pix: %i\n",swstats.thisFrame.rasterizedPixels);
- p+=sprintf(p,"TEV Pix In: %i\n",swstats.thisFrame.tevPixelsIn);
- p+=sprintf(p,"TEV Pix Out: %i\n",swstats.thisFrame.tevPixelsOut);
+ debugtext += StringFromFormat("Objects: %i\n", swstats.thisFrame.numDrawnObjects);
+ debugtext += StringFromFormat("Primitives: %i\n", swstats.thisFrame.numPrimatives);
+ debugtext += StringFromFormat("Vertices Loaded: %i\n", swstats.thisFrame.numVerticesLoaded);
+
+ debugtext += StringFromFormat("Triangles Input: %i\n", swstats.thisFrame.numTrianglesIn);
+ debugtext += StringFromFormat("Triangles Rejected: %i\n", swstats.thisFrame.numTrianglesRejected);
+ debugtext += StringFromFormat("Triangles Culled: %i\n", swstats.thisFrame.numTrianglesCulled);
+ debugtext += StringFromFormat("Triangles Clipped: %i\n", swstats.thisFrame.numTrianglesClipped);
+ debugtext += StringFromFormat("Triangles Drawn: %i\n", swstats.thisFrame.numTrianglesDrawn);
+
+ debugtext += StringFromFormat("Rasterized Pix: %i\n", swstats.thisFrame.rasterizedPixels);
+ debugtext += StringFromFormat("TEV Pix In: %i\n", swstats.thisFrame.tevPixelsIn);
+ debugtext += StringFromFormat("TEV Pix Out: %i\n", swstats.thisFrame.tevPixelsOut);
}
// Render a shadow, and then the text.
- SWRenderer::RenderText(debugtext_buffer, 21, 21, 0xDD000000);
- SWRenderer::RenderText(debugtext_buffer, 20, 20, 0xFFFFFF00);
+ SWRenderer::RenderText(debugtext.c_str(), 21, 21, 0xDD000000);
+ SWRenderer::RenderText(debugtext.c_str(), 20, 20, 0xFFFFFF00);
}
u8* SWRenderer::getColorTexture() {