diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-26 13:12:28 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-26 13:12:28 +0000 |
| commit | 8c3ed5dc46de6ef36ebd241af3600848a56a36ca (patch) | |
| tree | e059e4abb1b3382db008c83d6587ca3346654c83 /Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp | |
| parent | 7ce5e5d1bd0282d40d7b79f12018cb178051643c (diff) | |
Lint.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5796 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 | 44 |
1 files changed, 23 insertions, 21 deletions
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp index 4a97dca188..2cb9a13d22 100644 --- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp +++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp @@ -34,8 +34,8 @@ cl_program g_program; struct sDecoderParameter -{ - char* name; +{ + const char *name; cl_kernel kernel; float sizeOfSrc; float sizeOfDst; @@ -98,17 +98,20 @@ void TexDecoder_OpenCL_Initialize() { ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename); return; } - + g_program = OpenCL::CompileProgram(code.c_str()); - int i = 0; - for(int i = 0; i <= GX_TF_CMPR; ++i) { - if(g_DecodeParametersNative[i].name) - g_DecodeParametersNative[i].kernel = OpenCL::CompileKernel(g_program, g_DecodeParametersNative[i].name); + for (int i = 0; i <= GX_TF_CMPR; ++i) { + if (g_DecodeParametersNative[i].name) + g_DecodeParametersNative[i].kernel = + OpenCL::CompileKernel(g_program, + g_DecodeParametersNative[i].name); - if(g_DecodeParametersRGBA[i].name) - g_DecodeParametersRGBA[i].kernel = OpenCL::CompileKernel(g_program, g_DecodeParametersRGBA[i].name); - } + if (g_DecodeParametersRGBA[i].name) + g_DecodeParametersRGBA[i].kernel = + OpenCL::CompileKernel(g_program, + g_DecodeParametersRGBA[i].name); + } // Allocating maximal Wii texture size in advance, so that we don't have to allocate/deallocate per texture #ifndef DEBUG_OPENCL @@ -123,24 +126,23 @@ void TexDecoder_OpenCL_Initialize() { void TexDecoder_OpenCL_Shutdown() { #if defined(HAVE_OPENCL) && HAVE_OPENCL && !defined(DEBUG_OPENCL) - + clReleaseProgram(g_program); - int i = 0; - for(int i = 0; i < GX_TF_CMPR; ++i) { - if(g_DecodeParametersNative[i].kernel) - clReleaseKernel(g_DecodeParametersNative[i].kernel); + for (int i = 0; i < GX_TF_CMPR; ++i) { + if (g_DecodeParametersNative[i].kernel) + clReleaseKernel(g_DecodeParametersNative[i].kernel); + + if(g_DecodeParametersRGBA[i].kernel) + clReleaseKernel(g_DecodeParametersRGBA[i].kernel); + } - if(g_DecodeParametersRGBA[i].kernel) - clReleaseKernel(g_DecodeParametersRGBA[i].kernel); - } - if(g_clsrc) clReleaseMemObject(g_clsrc); if(g_cldst) clReleaseMemObject(g_cldst); - + g_Inited = false; #endif } @@ -179,7 +181,7 @@ PC_TexFormat TexDecoder_Decode_OpenCL(u8 *dst, const u8 *src, int width, int hei OpenCL::HandleCLError(err, "Failed to enqueue kernel"); clFinish(OpenCL::GetCommandQueue()); - + clEnqueueReadBuffer(OpenCL::GetCommandQueue(), g_cldst, CL_TRUE, 0, (size_t)(width * height * decoder.sizeOfDst), dst, 0, NULL, NULL); #ifdef DEBUG_OPENCL |
