Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
NiranV
Black Dragon Viewer
Commits
9212c1f3
Commit
9212c1f3
authored
Jun 04, 2019
by
AndreyL ProductEngine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SL-11341 Skip storing the previous gamma value on Intel GPUs + more logging
parent
b996c95f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
indra/llwindow/llwindowwin32.cpp
indra/llwindow/llwindowwin32.cpp
+10
-2
No files found.
indra/llwindow/llwindowwin32.cpp
View file @
9212c1f3
...
...
@@ -2994,6 +2994,7 @@ BOOL LLWindowWin32::restoreGamma()
{
if
(
mCustomGammaSet
!=
FALSE
)
{
LL_DEBUGS
(
"Window"
)
<<
"Restoring gamma"
<<
LL_ENDL
;
mCustomGammaSet
=
FALSE
;
return
SetDeviceGammaRamp
(
mhDC
,
mPrevGammaRamp
);
}
...
...
@@ -3007,8 +3008,15 @@ BOOL LLWindowWin32::setGamma(const F32 gamma)
//Get the previous gamma ramp to restore later.
if
(
mCustomGammaSet
==
FALSE
)
{
if
(
GetDeviceGammaRamp
(
mhDC
,
mPrevGammaRamp
)
==
FALSE
)
return
FALSE
;
if
(
!
gGLManager
.
mIsIntel
)
// skip for Intel GPUs (see SL-11341)
{
LL_DEBUGS
(
"Window"
)
<<
"Getting the previous gamma ramp to restore later"
<<
LL_ENDL
;
if
(
GetDeviceGammaRamp
(
mhDC
,
mPrevGammaRamp
)
==
FALSE
)
{
LL_WARNS
(
"Window"
)
<<
"Failed to get the previous gamma ramp"
<<
LL_ENDL
;
return
FALSE
;
}
}
mCustomGammaSet
=
TRUE
;
}
...
...
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