diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-02-28 20:40:15 +0000 |
| commit | ba54fac9eb74be6f73e20e2de953cf6f355be57f (patch) | |
| tree | ee496d869da4f8a7026b94991fe33f560cb9851a /Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | |
| parent | 1b8f4760247934e3bac649d45a887d304b5eb724 (diff) | |
Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7265 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp index 1b695ded15..be98e939ab 100644 --- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp @@ -99,15 +99,15 @@ void TexDecoder_OpenCL_Initialize() cl_device_id *devices = NULL; size_t *binary_sizes = NULL; char **binaries = NULL; - char filename[1024]; + std::string filename; char dolphin_rev[HEADER_SIZE]; - sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX)); + filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin"; snprintf(dolphin_rev, HEADER_SIZE, "%-31s", svn_rev_str); FILE *input = NULL; - input = fopen(filename, "rb"); + input = fopen(filename.c_str(), "rb"); if (input == NULL) { binary_size = 0; @@ -152,10 +152,10 @@ void TexDecoder_OpenCL_Initialize() if (err) { std::string code; - sprintf(filename, "%sTextureDecoder.cl", File::GetUserPath(D_OPENCL_IDX)); - if (!File::ReadFileToString(true, filename, code)) + filename = File::GetUserPath(D_OPENCL_IDX) + "TextureDecoder.cl"; + if (!File::ReadFileToString(true, filename.c_str(), code)) { - ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename); + ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename.c_str()); return; } @@ -201,9 +201,9 @@ void TexDecoder_OpenCL_Initialize() if (!err) { - sprintf(filename, "%skernel.bin", File::GetUserPath(D_OPENCL_IDX)); + filename = File::GetUserPath(D_OPENCL_IDX) + "kernel.bin"; FILE *output = NULL; - output = fopen(filename, "wb"); + output = fopen(filename.c_str(), "wb"); if (output == NULL) { |