Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Christian Butz
VTK
Commits
46a51e1c
Commit
46a51e1c
authored
Jul 12, 2013
by
Burlen Loring
Committed by
Code Review
Jul 12, 2013
Browse files
Merge topic 'opengl-error-hunt' into master
6455c581
OpenGL error hunt -- dashboard cleanup
parents
7e49ccd4
6455c581
Changes
4
Hide whitespace changes
Inline
Side-by-side
Accelerators/Piston/vtkPistonMapper.cxx
View file @
46a51e1c
...
...
@@ -60,7 +60,7 @@ namespace vtkpiston {
~
PistonGLRAII
()
{
glPopAttrib
();
vtkOpenGLCheckErrorMacro
(
"failed after ~PistonGLRAII"
);
vtkOpenGL
Static
CheckErrorMacro
(
"failed after ~PistonGLRAII"
);
}
};
}
...
...
IO/Export/vtkGL2PSExporter.cxx
View file @
46a51e1c
...
...
@@ -116,8 +116,6 @@ void vtkGL2PSExporter::WriteData()
return
;
}
vtkOpenGLClearErrorMacro
();
// Get the renderers. We'll be walking through them a lot later.
vtkRendererCollection
*
renCol
=
this
->
RenderWindow
->
GetRenderers
();
...
...
@@ -299,7 +297,6 @@ void vtkGL2PSExporter::WriteData()
// Cleanup memory
delete
[]
fName
;
vtkOpenGLCheckErrorMacro
(
"failed after WriteData"
);
vtkDebugMacro
(
<<
"Finished writing file using GL2PS"
);
vtkGL2PSUtilities
::
FinishExport
();
}
...
...
Rendering/OpenGL/vtkFrameBufferObject2.cxx
View file @
46a51e1c
...
...
@@ -592,8 +592,8 @@ void vtkFrameBufferObject2::Download(
vtkPixelBufferObject
*
pbo
)
{
unsigned
int
extentSize
[
2
]
=
{
extent
[
1
]
-
extent
[
0
]
+
1
,
extent
[
3
]
-
extent
[
2
]
+
1
static_cast
<
unsigned
int
>
(
extent
[
1
]
-
extent
[
0
]
+
1
)
,
static_cast
<
unsigned
int
>
(
extent
[
3
]
-
extent
[
2
]
+
1
)
};
unsigned
int
nTups
=
extentSize
[
0
]
*
extentSize
[
1
];
...
...
Rendering/OpenGL/vtkOpenGLImageSliceMapper.cxx
View file @
46a51e1c
...
...
@@ -962,6 +962,8 @@ bool vtkOpenGLImageSliceMapper::TextureSizeOK(const int size[2])
glGetTexLevelParameteriv
(
GL_PROXY_TEXTURE_2D
,
0
,
GL_TEXTURE_WIDTH
,
&
params
);
vtkOpenGLCheckErrorMacro
(
"failed after TextureSizeOK"
);
// if it does fit, we will render it later
return
(
params
==
0
?
0
:
1
);
#else
...
...
@@ -969,8 +971,6 @@ bool vtkOpenGLImageSliceMapper::TextureSizeOK(const int size[2])
// can do 1024x1024
return
(
size
[
0
]
<=
1024
&&
size
[
1
]
<=
1024
);
#endif
vtkOpenGLCheckErrorMacro
(
"failed after TextureSizeOK"
);
}
//----------------------------------------------------------------------------
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment