Commit 44019fcf authored by Aashish Chaudhary's avatar Aashish Chaudhary

Made static methods for querying textures size

parent 0a6f3760
Pipeline #1574 passed with stage
......@@ -44,13 +44,12 @@ int TestMaximumTextureSize(int vtkNotUsed(argc),
if (glContext)
{
vtkNew<vtkTextureObject> textureObject;
int maxTextureSize1D =
textureObject->GetMaximumTextureSize1D(glContext);
vtkTextureObject::GetMaximumTextureSize1D(glContext);
int maxTextureSize2D =
textureObject->GetMaximumTextureSize1D(glContext);
vtkTextureObject::GetMaximumTextureSize1D(glContext);
int maxTextureSize3D =
textureObject->GetMaximumTextureSize1D(glContext);
vtkTextureObject::GetMaximumTextureSize1D(glContext);
#if GL_ES_VERSION_2_0 != 1 || GL_ES_VERSION_3_0 == 1
if (maxTextureSize1D != -1 && maxTextureSize2D != -1 &&
......
......@@ -228,7 +228,7 @@ public:
// Query maximum texture size
//--------------------------------------------------------------------------
int GetMaximumTextureSize(int param, vtkRenderWindow* context)
static int GetMaximumTextureSize(int param, vtkRenderWindow* context)
{
int maxSize = -1;
if (context and context->IsCurrent())
......@@ -2075,20 +2075,20 @@ void vtkTextureObject::CopyFromFrameBuffer(int srcXmin,
//----------------------------------------------------------------------------
int vtkTextureObject::GetMaximumTextureSize1D(vtkOpenGLRenderWindow* context)
{
return this->Impl->GetMaximumTextureSize(GL_TEXTURE_1D, context);
return vtkInternal::GetMaximumTextureSize(GL_TEXTURE_1D, context);
}
#endif
//----------------------------------------------------------------------------
int vtkTextureObject::GetMaximumTextureSize2D(vtkOpenGLRenderWindow* context)
{
return this->Impl->GetMaximumTextureSize(GL_TEXTURE_2D, context);
return vtkInternal::GetMaximumTextureSize(GL_TEXTURE_2D, context);
}
//----------------------------------------------------------------------------
int vtkTextureObject::GetMaximumTextureSize3D(vtkOpenGLRenderWindow* context)
{
return this->Impl->GetMaximumTextureSize(GL_TEXTURE_3D, context);
return vtkInternal::GetMaximumTextureSize(GL_TEXTURE_3D, context);
}
//----------------------------------------------------------------------------
......
......@@ -532,18 +532,18 @@ public:
// Description:
// Query and return maximum 1D texture size supported by the OpenGL
// driver for a particular context.
int GetMaximumTextureSize1D(vtkOpenGLRenderWindow* context);
static int GetMaximumTextureSize1D(vtkOpenGLRenderWindow* context);
#endif
// Description:
// Query and return maximum 2D texture size supported by the OpenGL
// driver for a particular context.
int GetMaximumTextureSize2D(vtkOpenGLRenderWindow* context);
static int GetMaximumTextureSize2D(vtkOpenGLRenderWindow* context);
// Description:
// Query and return maximum 3D texture size supported by the OpenGL
// driver for a particular context.
int GetMaximumTextureSize3D(vtkOpenGLRenderWindow* context);
static int GetMaximumTextureSize3D(vtkOpenGLRenderWindow* context);
// Description:
// Returns if the context supports the required extensions. If flags
......
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