mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 11:12:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "internal/glfwwin: ignore errors from DWM functions""

Browse Source 
This reverts commit 991cec993c.

Reason: Reverted a wrong commit
This commit is contained in:
Hajime Hoshi 2022-06-03 13:59:16 +09:00
parent 991cec993c
commit c6c45aadfa
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/glfwwin/wglcontext_windows.go
View File

@ -242,9 +242,8 @@ func swapBuffersWGL(window *Window) error {
// HACK: Use DwmFlush when desktop composition is enabled // HACK: Use DwmFlush when desktop composition is enabled
if enabled { if enabled {
for i := 0; i < window.context.wgl.interval; i++ { for i := 0; i < window.context.wgl.interval; i++ {
if err := _DwmFlush(); err != nil { // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
return err _ = _DwmFlush()
}
} }
} }
} }
@ -269,10 +268,10 @@ func swapIntervalWGL(interval int) error {
enabled := _IsWindows8OrGreater() enabled := _IsWindows8OrGreater()
if !enabled { if !enabled {
var err error e, err := _DwmIsCompositionEnabled()
enabled, err = _DwmIsCompositionEnabled() // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
if err != nil { if err == nil {
return err enabled = e
} }
} }

18
internal/glfwwin/win32window_windows.go
View File

@ -368,7 +368,8 @@ func (w *Window) updateFramebufferTransparency() error {
composition, err := _DwmIsCompositionEnabled() composition, err := _DwmIsCompositionEnabled()
if err != nil { if err != nil {
return err // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
return nil
} }
if !composition { if !composition {
return nil return nil
@ -378,7 +379,8 @@ func (w *Window) updateFramebufferTransparency() error {
if !_IsWindows8OrGreater() { if !_IsWindows8OrGreater() {
_, opaque, err = _DwmGetColorizationColor() _, opaque, err = _DwmGetColorizationColor()
if err != nil { if err != nil {
return err // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
return nil
} }
} }
@ -394,9 +396,9 @@ func (w *Window) updateFramebufferTransparency() error {
hRgnBlur: region, hRgnBlur: region,
fEnable: 1, // true fEnable: 1, // true
} }
if err := _DwmEnableBlurBehindWindow(w.win32.handle, &bb); err != nil {
return err // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
} _ = _DwmEnableBlurBehindWindow(w.win32.handle, &bb)
} else { } else {
// HACK: Disable framebuffer transparency on Windows 7 when the // HACK: Disable framebuffer transparency on Windows 7 when the
// colorization color is opaque, because otherwise the window // colorization color is opaque, because otherwise the window
@ -405,9 +407,9 @@ func (w *Window) updateFramebufferTransparency() error {
bb := _DWM_BLURBEHIND{ bb := _DWM_BLURBEHIND{
dwFlags: _DWM_BB_ENABLE, dwFlags: _DWM_BB_ENABLE,
} }
if err := _DwmEnableBlurBehindWindow(w.win32.handle, &bb); err != nil {
return err // Ignore an error from DWM functions as they might not be implemented e.g. on Proton (#2113).
} _ = _DwmEnableBlurBehindWindow(w.win32.handle, &bb)
} }
return nil return nil
} }