From 8c3ed5dc46de6ef36ebd241af3600848a56a36ca Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sat, 26 Jun 2010 13:12:28 +0000 Subject: [PATCH] Lint. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5796 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../Src/OpenCL/OCLTextureDecoder.cpp | 44 +- .../Plugin_GCPadNew/Plugin_GCPadNew.vcproj | 532 ------------------ Source/Plugins/Plugin_GCPadNew/Src/SConscript | 18 - 3 files changed, 23 insertions(+), 571 deletions(-) delete mode 100644 Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj delete mode 100644 Source/Plugins/Plugin_GCPadNew/Src/SConscript 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 diff --git a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj b/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj deleted file mode 100644 index 0b215bdb30..0000000000 --- a/Source/Plugins/Plugin_GCPadNew/Plugin_GCPadNew.vcproj +++ /dev/null @@ -1,532 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Plugins/Plugin_GCPadNew/Src/SConscript b/Source/Plugins/Plugin_GCPadNew/Src/SConscript deleted file mode 100644 index 8a532b8784..0000000000 --- a/Source/Plugins/Plugin_GCPadNew/Src/SConscript +++ /dev/null @@ -1,18 +0,0 @@ -# -*- python -*- - -Import('env') -import sys - -name = "Plugin_GCPadNew" -padenv = env.Clone() - -files = [ - 'GCPadNew.cpp', - 'GCPadEmu.cpp', - ] - -padenv.Append( - LIBS = [ 'inputuicommon', 'inputcommon', 'common' ], - ) - -padenv.SharedLibrary(env['plugin_dir']+name, files)