diff options
| author | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-26 22:16:29 +0100 |
|---|---|---|
| committer | NeoBrainX <NeoBrainX@gmail.com> | 2013-03-26 22:21:19 +0100 |
| commit | 3253603ae7a80860a294c11c95b3697634ac73d9 (patch) | |
| tree | 5ef2a70521939d71fb3cacbd8a47babd9bdbdba8 /Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | |
| parent | 76148a52b82cae8e6cf11b6eeeeff55345b0f12e (diff) | |
| parent | b75a617d8a2e4307ed4af06669e92fc33f6af1df (diff) | |
Merge 'master' into shader-uids-awesome.
Conflicts:
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.h
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
Diffstat (limited to 'Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp index 440e69efd6..db70640fbb 100644 --- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp @@ -98,7 +98,7 @@ void TexDecoder_OpenCL_Initialize() size_t nDevices = 0; cl_device_id *devices = NULL; size_t *binary_sizes = NULL; - char **binaries = NULL; + char **binaries = NULL; std::string filename; char dolphin_rev[HEADER_SIZE]; @@ -132,7 +132,7 @@ void TexDecoder_OpenCL_Initialize() { OpenCL::HandleCLError(err, "clCreateProgramWithBinary"); } - + if (!err) { err = clBuildProgram(g_program, 1, &OpenCL::device_id, NULL, NULL, NULL); |