mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 10:48:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/opengl: Return an error when initializing OpenGL fails

Browse Source 
Updates #1838
This commit is contained in:
Hajime Hoshi 2021-10-06 00:38:44 +09:00
parent 2fd97767ff
commit 3f5d1762bb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/graphicsdriver/opengl/context_js.go
View File

@ -109,7 +109,7 @@ func (c *context) usesWebGL2() bool {
return c.webGLVersion == webGLVersion2 return c.webGLVersion == webGLVersion2
} }
func (c *context) initGL() { func (c *context) initGL() error {
c.webGLVersion = webGLVersionUnknown c.webGLVersion = webGLVersionUnknown
var gl js.Value var gl js.Value
@ -141,7 +141,7 @@ func (c *context) initGL() {
} }
if !gl.Truthy() { if !gl.Truthy() {
panic("opengl: getContext failed") return fmt.Errorf("opengl: getContext failed")
} }
} else if go2cpp := js.Global().Get("go2cpp"); go2cpp.Truthy() { } else if go2cpp := js.Global().Get("go2cpp"); go2cpp.Truthy() {
gl = go2cpp.Get("gl") gl = go2cpp.Get("gl")
@ -149,6 +149,7 @@ func (c *context) initGL() {
} }
c.gl = c.newGL(gl) c.gl = c.newGL(gl)
return nil
} }
func (c *context) reset() error { func (c *context) reset() error {
@ -159,7 +160,9 @@ func (c *context) reset() error {
c.lastViewportHeight = 0 c.lastViewportHeight = 0
c.lastCompositeMode = driver.CompositeModeUnknown c.lastCompositeMode = driver.CompositeModeUnknown
c.initGL() if err := c.initGL(); err != nil {
return err
}
if c.gl.isContextLost.Invoke().Bool() { if c.gl.isContextLost.Invoke().Bool() {
return driver.GraphicsNotReady return driver.GraphicsNotReady