Commit d9c51d65 authored by Matthew Letter's avatar Matthew Letter
Browse files

increased the number of arguments to worklets

increase the number of arguments to worklets that we support to 10 from 20.
parent 96c22747
...@@ -51,7 +51,7 @@ $# Ignore the following comment. It is meant for the generated file. ...@@ -51,7 +51,7 @@ $# Ignore the following comment. It is meant for the generated file.
#include <vtkm/exec/arg/Fetch.h> #include <vtkm/exec/arg/Fetch.h>
$# This needs to match the max_parameters in FunctionInterfaceDetailPre.h.in $# This needs to match the max_parameters in FunctionInterfaceDetailPre.h.in
$py(max_parameters=10)\ $py(max_parameters=20)\
#if VTKM_MAX_FUNCTION_PARAMETERS != $(max_parameters) #if VTKM_MAX_FUNCTION_PARAMETERS != $(max_parameters)
#error Mismatch of maximum parameters between FunctionInterfaceDatailPre.h.in and WorkletInvokeFunctorDetail.h.in #error Mismatch of maximum parameters between FunctionInterfaceDatailPre.h.in and WorkletInvokeFunctorDetail.h.in
#endif #endif
......
This diff is collapsed.
...@@ -42,7 +42,7 @@ $# Ignore the following comment. It is meant for the generated file. ...@@ -42,7 +42,7 @@ $# Ignore the following comment. It is meant for the generated file.
#include <vtkm/internal/FunctionInterface.h> #include <vtkm/internal/FunctionInterface.h>
$# This needs to match the max_parameters in FunctionInterfaceDetailPre.h.in $# This needs to match the max_parameters in FunctionInterfaceDetailPre.h.in
$py(max_parameters=10)\ $py(max_parameters=20)\
#if VTKM_MAX_FUNCTION_PARAMETERS != $(max_parameters) #if VTKM_MAX_FUNCTION_PARAMETERS != $(max_parameters)
#error Mismatch of maximum parameters between FunctionInterfaceDatailPre.h.in and FunctionInterfaceDetailPost.h.in #error Mismatch of maximum parameters between FunctionInterfaceDatailPre.h.in and FunctionInterfaceDetailPost.h.in
#endif #endif
......
This diff is collapsed.
...@@ -46,7 +46,7 @@ $# Ignore the following comment. It is meant for the generated file. ...@@ -46,7 +46,7 @@ $# Ignore the following comment. It is meant for the generated file.
#include <vtkm/internal/brigand.hpp> #include <vtkm/internal/brigand.hpp>
$py(max_parameters=10)\ $py(max_parameters=20)\
#define VTKM_MAX_FUNCTION_PARAMETERS $(max_parameters) #define VTKM_MAX_FUNCTION_PARAMETERS $(max_parameters)
$# Python commands used in template expansion. $# Python commands used in template expansion.
......
...@@ -86,6 +86,39 @@ struct _8 : Arg<8> ...@@ -86,6 +86,39 @@ struct _8 : Arg<8>
struct _9 : Arg<9> struct _9 : Arg<9>
{ {
}; };
struct _10 : Arg<10>
{
};
struct _11 : Arg<11>
{
};
struct _12 : Arg<12>
{
};
struct _13 : Arg<13>
{
};
struct _14 : Arg<14>
{
};
struct _15 : Arg<15>
{
};
struct _16 : Arg<16>
{
};
struct _17 : Arg<17>
{
};
struct _18 : Arg<18>
{
};
struct _19 : Arg<19>
{
};
struct _20 : Arg<20>
{
};
} }
namespace worklet namespace worklet
...@@ -109,6 +142,17 @@ public: ...@@ -109,6 +142,17 @@ public:
typedef vtkm::placeholders::_7 _7; typedef vtkm::placeholders::_7 _7;
typedef vtkm::placeholders::_8 _8; typedef vtkm::placeholders::_8 _8;
typedef vtkm::placeholders::_9 _9; typedef vtkm::placeholders::_9 _9;
typedef vtkm::placeholders::_10 _10;
typedef vtkm::placeholders::_11 _11;
typedef vtkm::placeholders::_12 _12;
typedef vtkm::placeholders::_13 _13;
typedef vtkm::placeholders::_14 _14;
typedef vtkm::placeholders::_15 _15;
typedef vtkm::placeholders::_16 _16;
typedef vtkm::placeholders::_17 _17;
typedef vtkm::placeholders::_18 _18;
typedef vtkm::placeholders::_19 _19;
typedef vtkm::placeholders::_20 _20;
/// \c ExecutionSignature tag for getting the work index. /// \c ExecutionSignature tag for getting the work index.
/// ///
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment