[opengtl-commits] [433] don't pass types arugment to generateEvaluatePixeles

[subversion@xxxxxxxxxxxxx]

Revision: 433
Author:   cyrille
Date:     2008-10-09 09:29:00 +0200 (Thu, 09 Oct 2008)

Log Message:
-----------
don't pass types arugment to generateEvaluatePixeles 

Modified Paths:
--------------
    trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.cpp
    trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.h
    trunk/OpenGTL/OpenShiva/OpenShiva/Kernel.cpp


Modified: trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.cpp	2008-10-08 11:26:00 UTC (rev 432)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.cpp	2008-10-09 07:29:00 UTC (rev 433)
@@ -167,7 +167,7 @@
   new llvm::StoreInst( result, ptr, "", _currentBlock );
 }
 
-llvm::Function* CodeGenerator::generateEvaluatePixeles( const std::vector<const GTLCore::Type*>& _inputTypes, const GTLCore::Type* _outputType, Kernel* _kernel, GTLCore::ModuleData* _moduleData, int _channels)
+llvm::Function* CodeGenerator::generateEvaluatePixeles( Kernel* _kernel, GTLCore::ModuleData* _moduleData, int _channels)
 {
   GTLCore::CodeGenerator codeGenerator( _moduleData );
   

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.h
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.h	2008-10-08 11:26:00 UTC (rev 432)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/CodeGenerator_p.h	2008-10-09 07:29:00 UTC (rev 433)
@@ -51,7 +51,7 @@
        */
       static llvm::BasicBlock* memToPixel( GTLCore::GenerationContext& _gc, llvm::BasicBlock* _currentBlock, llvm::Value* _dataPointer, llvm::Value* _pixel, llvm::Value* _image );
       static llvm::BasicBlock* pixelToMem( GTLCore::GenerationContext& _gc, llvm::BasicBlock* _currentBlock, llvm::Value* _pixel, llvm::Value* _dataPointer, llvm::Value* _image );
-      static llvm::Function* generateEvaluatePixeles( const std::vector<const GTLCore::Type*>& _inputTypes, const GTLCore::Type* _outputType, Kernel* _kernel, GTLCore::ModuleData* _moduleData, int _channels );
+      static llvm::Function* generateEvaluatePixeles( Kernel* _kernel, GTLCore::ModuleData* _moduleData, int _channels );
       static llvm::Function* generateMemToVec( GTLCore::ModuleData* _moduleData, const GTLCore::PixelDescription& _pixelDescription );
       static llvm::Function* generateVecToMem( GTLCore::ModuleData* _moduleData, const GTLCore::PixelDescription& _pixelDescription );
       /**

Modified: trunk/OpenGTL/OpenShiva/OpenShiva/Kernel.cpp
===================================================================
--- trunk/OpenGTL/OpenShiva/OpenShiva/Kernel.cpp	2008-10-08 11:26:00 UTC (rev 432)
+++ trunk/OpenGTL/OpenShiva/OpenShiva/Kernel.cpp	2008-10-09 07:29:00 UTC (rev 433)
@@ -141,7 +141,7 @@
     // Create a wrapper
     d->wrapper = new Wrapper(this, d->moduleData);
     // Create the generateEvaluatePixeles LLVM function
-    d->evaluatePixelesFunction = CodeGenerator::generateEvaluatePixeles( std::vector<const GTLCore::Type*>(), d->moduleData->typeManager()->getStructure("image"), this, d->moduleData, d->count_channels_generic ); // TODO call with correct types
+    d->evaluatePixelesFunction = CodeGenerator::generateEvaluatePixeles( this, d->moduleData, d->count_channels_generic );
     d->name = nameSpace;
   } else {
     cleanup();