Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Christian Butz
VTK
Commits
66931aff
Commit
66931aff
authored
Oct 04, 2018
by
Ken Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure state is accessed through method
Subclasses may override the method. Direct access violates this.
parent
9b65db4a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
+8
-8
No files found.
Rendering/OpenGL2/vtkOpenGLRenderWindow.cxx
View file @
66931aff
...
...
@@ -490,7 +490,7 @@ void vtkOpenGLRenderWindow::OpenGLInit()
void
vtkOpenGLRenderWindow
::
OpenGLInitState
()
{
this
->
State
->
Initialize
(
this
);
this
->
Get
State
()
->
Initialize
(
this
);
#ifdef GL_FRAMEBUFFER_SRGB
if
(
this
->
UseSRGBColorSpace
&&
this
->
GetUsingSRGBColorSpace
())
...
...
@@ -676,8 +676,8 @@ void vtkOpenGLRenderWindow::GetOpenGLVersion(int &major, int &minor)
if
(
this
->
Initialized
)
{
this
->
State
->
vtkglGetIntegerv
(
GL_MAJOR_VERSION
,
&
glMajorVersion
);
this
->
State
->
vtkglGetIntegerv
(
GL_MINOR_VERSION
,
&
glMinorVersion
);
this
->
Get
State
()
->
vtkglGetIntegerv
(
GL_MAJOR_VERSION
,
&
glMajorVersion
);
this
->
Get
State
()
->
vtkglGetIntegerv
(
GL_MINOR_VERSION
,
&
glMinorVersion
);
}
major
=
glMajorVersion
;
...
...
@@ -1091,7 +1091,7 @@ int vtkOpenGLRenderWindow::ReadPixels(
resolveMSAA
=
(
samples
>
0
);
}
this
->
State
->
vtkglDisable
(
GL_SCISSOR_TEST
);
this
->
Get
State
()
->
vtkglDisable
(
GL_SCISSOR_TEST
);
// Calling pack alignment ensures that we can grab the any size window
glPixelStorei
(
GL_PACK_ALIGNMENT
,
1
);
...
...
@@ -1297,8 +1297,8 @@ int vtkOpenGLRenderWindow::SetPixelData(int x1, int y1, int x2, int y2,
void
vtkOpenGLRenderWindow
::
DrawPixels
(
int
srcWidth
,
int
srcHeight
,
int
numComponents
,
int
dataType
,
void
*
data
)
{
this
->
State
->
vtkglDisable
(
GL_SCISSOR_TEST
);
this
->
State
->
vtkglDisable
(
GL_DEPTH_TEST
);
this
->
Get
State
()
->
vtkglDisable
(
GL_SCISSOR_TEST
);
this
->
Get
State
()
->
vtkglDisable
(
GL_DEPTH_TEST
);
if
(
!
this
->
DrawPixelsTextureObject
)
{
this
->
DrawPixelsTextureObject
=
vtkTextureObject
::
New
();
...
...
@@ -1319,8 +1319,8 @@ void vtkOpenGLRenderWindow::DrawPixels(
int
srcXmin
,
int
srcYmin
,
int
srcXmax
,
int
srcYmax
,
int
srcWidth
,
int
srcHeight
,
int
numComponents
,
int
dataType
,
void
*
data
)
{
this
->
State
->
vtkglDisable
(
GL_SCISSOR_TEST
);
this
->
State
->
vtkglDisable
(
GL_DEPTH_TEST
);
this
->
Get
State
()
->
vtkglDisable
(
GL_SCISSOR_TEST
);
this
->
Get
State
()
->
vtkglDisable
(
GL_DEPTH_TEST
);
if
(
!
this
->
DrawPixelsTextureObject
)
{
this
->
DrawPixelsTextureObject
=
vtkTextureObject
::
New
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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