diff --git a/Rendering/Core/vtkProperty.cxx b/Rendering/Core/vtkProperty.cxx index b6cafd57caa8d21a95881b33743c2d0fb5340e7f..91c5069bb04e1687e8c80c6c0c895ce5a758097c 100644 --- a/Rendering/Core/vtkProperty.cxx +++ b/Rendering/Core/vtkProperty.cxx @@ -386,15 +386,6 @@ void vtkProperty::PostRender(vtkActor*, vtkRenderer* renderer) } } -//------------------------------------------------------------------------------ -void vtkProperty::AddShaderVariable(const char*, int, int*) {} - -//------------------------------------------------------------------------------ -void vtkProperty::AddShaderVariable(const char*, int, float*) {} - -//------------------------------------------------------------------------------ -void vtkProperty::AddShaderVariable(const char*, int, double*) {} - //------------------------------------------------------------------------------ void vtkProperty::ReleaseGraphicsResources(vtkWindow*) { diff --git a/Rendering/Core/vtkProperty.h b/Rendering/Core/vtkProperty.h index 3e9647d692f83ff681d9f4a23dfa6be1045299b8..55a5fb074d1c54e074325464a623c144b86785e4 100644 --- a/Rendering/Core/vtkProperty.h +++ b/Rendering/Core/vtkProperty.h @@ -553,11 +553,17 @@ public: * - \p x - values */ VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - virtual void AddShaderVariable(const char* name, int numVars, int* x); + virtual void AddShaderVariable(const char*, int, int*) + { /* noop */ + } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - virtual void AddShaderVariable(const char* name, int numVars, float* x); + virtual void AddShaderVariable(const char*, int, float*) + { /* noop */ + } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - virtual void AddShaderVariable(const char* name, int numVars, double* x); + virtual void AddShaderVariable(const char*, int, double*) + { /* noop */ + } ///@} ///@{ @@ -565,46 +571,40 @@ public: * Methods to provide to add shader variables from wrappers. */ VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, int v) { this->AddShaderVariable(name, 1, &v); } + void AddShaderVariable(const char*, int) + { /* noop */ + } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, float v) { this->AddShaderVariable(name, 1, &v); } + void AddShaderVariable(const char*, float) + { /* noop */ + } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, double v) { this->AddShaderVariable(name, 1, &v); } + void AddShaderVariable(const char*, double) + { /* noop */ + } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, int v1, int v2) - { - int v[2] = { v1, v2 }; - this->AddShaderVariable(name, 2, v); + void AddShaderVariable(const char*, int, int) + { /* noop */ } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, float v1, float v2) - { - float v[2] = { v1, v2 }; - this->AddShaderVariable(name, 2, v); + void AddShaderVariable(const char*, float, float) + { /* noop */ } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, double v1, double v2) - { - double v[2] = { v1, v2 }; - this->AddShaderVariable(name, 2, v); + void AddShaderVariable(const char*, double, double) + { /* noop */ } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, int v1, int v2, int v3) - { - int v[3] = { v1, v2, v3 }; - this->AddShaderVariable(name, 3, v); + void AddShaderVariable(const char*, int, int, int) + { /* noop */ } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, float v1, float v2, float v3) - { - float v[3] = { v1, v2, v3 }; - this->AddShaderVariable(name, 3, v); + void AddShaderVariable(const char*, float, float, float) + { /* noop */ } VTK_DEPRECATED_IN_9_4_0("AddShaderVariable is a no-op and will be removed") - void AddShaderVariable(const char* name, double v1, double v2, double v3) - { - double v[3] = { v1, v2, v3 }; - this->AddShaderVariable(name, 3, v); + void AddShaderVariable(const char*, double, double, double) + { /* noop */ } ///@}