Commit 3ed64fc0 authored by Ben Boeckel's avatar Ben Boeckel

warnings: resolve unused variables

Change-Id: I23752fa1c7f5f6b15f3737eb35c78231f023bfa3
parent 37aad40d
......@@ -139,7 +139,7 @@ inline int vtkPadToFour(int n)
template <class T>
void vtkOpenGLImageMapperRenderDouble(vtkOpenGLImageMapper *self, vtkImageData *data,
T *dataPtr, double shift, double scale,
int *actorPos, int *actorPos2, int front, int *vsize,
int *vtkUnused(actorPos), int *vtkUnused(actorPos2), int vtkUnused(front), int *vtkUnused(vsize),
vtkViewport *viewport)
{
vtkOpenGLClearErrorMacro();
......@@ -253,8 +253,8 @@ void vtkOpenGLImageMapperRenderDouble(vtkOpenGLImageMapper *self, vtkImageData *
template <class T>
void vtkOpenGLImageMapperRenderShort(vtkOpenGLImageMapper *self, vtkImageData *data,
T *dataPtr, double shift, double scale,
int *actorPos, int *actorPos2, int front,
int *vsize, vtkViewport *viewport)
int *vtkUnused(actorPos), int *vtkUnused(actorPos2), int vtkUnused(front),
int *vtkUnused(vsize), vtkViewport *viewport)
{
vtkOpenGLClearErrorMacro();
......@@ -384,8 +384,8 @@ void vtkOpenGLImageMapperRenderShort(vtkOpenGLImageMapper *self, vtkImageData *d
template <class T>
void vtkOpenGLImageMapperRenderChar(vtkOpenGLImageMapper *self, vtkImageData *data,
T *dataPtr, int *actorPos, int *actorPos2,
int front, int *vsize, vtkViewport *viewport)
T *dataPtr, int *vtkUnused(actorPos), int *vtkUnused(actorPos2),
int vtkUnused(front), int *vtkUnused(vsize), vtkViewport *viewport)
{
vtkOpenGLClearErrorMacro();
......
......@@ -1018,7 +1018,6 @@ int vtkOpenGLRenderWindow::SetRGBAPixelData(int x1, int y1, int x2, int y2,
{
int y_low, y_hi;
int x_low, x_hi;
int width, height;
// set the current window
this->MakeCurrent();
......@@ -1066,9 +1065,6 @@ int vtkOpenGLRenderWindow::SetRGBAPixelData(int x1, int y1, int x2, int y2,
x_hi = x1;
}
width = abs(x_hi-x_low) + 1;
height = abs(y_hi-y_low) + 1;
if (!blend)
{
glDisable(GL_BLEND);
......@@ -1468,7 +1464,7 @@ int vtkOpenGLRenderWindow::SetZbufferData( int x1, int y1, int x2, int y2,
{
int y_low;
int x_low;
int width, height;
//int width, height;
// set the current window
this->MakeCurrent();
......@@ -1491,8 +1487,8 @@ int vtkOpenGLRenderWindow::SetZbufferData( int x1, int y1, int x2, int y2,
x_low = x2;
}
width = abs(x2 - x1)+1;
height = abs(y2 - y1)+1;
//width = abs(x2 - x1)+1;
//height = abs(y2 - y1)+1;
// Error checking
// Must clear previous errors first.
......
......@@ -399,7 +399,6 @@ void vtkOpenGLRenderer::DeviceRenderTranslucentPolygonalGeometry()
bool done = false;
GLuint nbPixels = 0;
GLuint previousNbPixels = 0;
int peelCount = 0;
while(!done)
{
......@@ -417,7 +416,6 @@ void vtkOpenGLRenderer::DeviceRenderTranslucentPolygonalGeometry()
this->TranslucentZTexture->CopyFromFrameBuffer(this->ViewportX, this->ViewportY,
this->ViewportX, this->ViewportY,
this->ViewportWidth, this->ViewportHeight);
previousNbPixels = nbPixels;
#if GL_ES_VERSION_2_0 != 1
glEndQuery(GL_SAMPLES_PASSED);
......
......@@ -62,8 +62,8 @@ void vtkRenderPass::UpdateCamera(vtkRenderer *renderer)
void vtkRenderPass::ClearLights(vtkRenderer *renderer)
{
assert("pre: renderer_exists" && renderer != 0);
vtkOpenGLRenderer *oRenderer = vtkOpenGLRenderer::SafeDownCast(renderer);
/// FIXME: What to do if there is no clear lights? Remove this API?
//vtkOpenGLRenderer *oRenderer = vtkOpenGLRenderer::SafeDownCast(renderer);
//oRenderer->ClearLights();
}
......
......@@ -1757,8 +1757,8 @@ void vtkTextureObject::CopyToFrameBuffer(int srcXmin,
// \pre is2D: GetNumberOfDimensions()==2
void vtkTextureObject::CopyFromFrameBuffer(int srcXmin,
int srcYmin,
int dstXmin,
int dstYmin,
int vtkUnused(dstXmin),
int vtkUnused(dstYmin),
int width,
int height)
{
......
......@@ -258,6 +258,7 @@ bool vtkXOpenGLRenderDevice::CreateNewWindow(const vtkRecti &geometry,
// to create a GL 3/4 context. The error handler is global, so care must be
// taken to nesure no other threads issue X commands while this is running.
ctxErrorOccurred = false;
// FIXME: Restore old handler?
int (*oldHandler)(Display*, XErrorEvent*) = XSetErrorHandler(&ctxErrorHandler);
// Get the default screen's GLX extension list
......
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