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

internal/graphicsdriver/opengl: Bug fix: getBufferSubData was available only with WebGL2

Browse Source
This commit is contained in:
Hajime Hoshi 2021-04-06 00:09:50 +09:00
parent bd8367588e
commit 6fe6543b4b
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -587,15 +587,15 @@ func (c *context) replacePixelsWithPBO(buffer buffer, t textureNative, width, he
} }
func (c *context) getBufferSubData(buffer buffer, width, height int) []byte { func (c *context) getBufferSubData(buffer buffer, width, height int) []byte {
if !isWebGL2Available {
panic("opengl: WebGL2 must be available when getBufferSubData is called")
}
gl := c.gl gl := c.gl
gl.bindBuffer.Invoke(gles.PIXEL_UNPACK_BUFFER, js.Value(buffer)) gl.bindBuffer.Invoke(gles.PIXEL_UNPACK_BUFFER, js.Value(buffer))
l := 4 * width * height l := 4 * width * height
arr := jsutil.TemporaryUint8Array(l, nil) arr := jsutil.TemporaryUint8Array(l, nil)
if isWebGL2Available { gl.getBufferSubData.Invoke(gles.PIXEL_UNPACK_BUFFER, 0, arr, 0, l)
gl.getBufferSubData.Invoke(gles.PIXEL_UNPACK_BUFFER, 0, arr, 0, l)
} else {
gl.getBufferSubData.Invoke(gles.PIXEL_UNPACK_BUFFER, 0, arr.Call("subarray", 0, l))
}
gl.bindBuffer.Invoke(gles.PIXEL_UNPACK_BUFFER, nil) gl.bindBuffer.Invoke(gles.PIXEL_UNPACK_BUFFER, nil)
return jsutil.Uint8ArrayToSlice(arr, l) return jsutil.Uint8ArrayToSlice(arr, l)
} }

5
internal/graphicsdriver/opengl/gl_js.go
View File

@ -112,7 +112,6 @@ func newGL(v js.Value) *gl {
enableVertexAttribArray: v.Get("enableVertexAttribArray").Call("bind", v), enableVertexAttribArray: v.Get("enableVertexAttribArray").Call("bind", v),
framebufferTexture2D: v.Get("framebufferTexture2D").Call("bind", v), framebufferTexture2D: v.Get("framebufferTexture2D").Call("bind", v),
flush: v.Get("flush").Call("bind", v), flush: v.Get("flush").Call("bind", v),
getBufferSubData: v.Get("getBufferSubData").Call("bind", v),
getParameter: v.Get("getParameter").Call("bind", v), getParameter: v.Get("getParameter").Call("bind", v),
getProgramInfoLog: v.Get("getProgramInfoLog").Call("bind", v), getProgramInfoLog: v.Get("getProgramInfoLog").Call("bind", v),
getProgramParameter: v.Get("getProgramParameter").Call("bind", v), getProgramParameter: v.Get("getProgramParameter").Call("bind", v),
@ -145,7 +144,9 @@ func newGL(v js.Value) *gl {
vertexAttribPointer: v.Get("vertexAttribPointer").Call("bind", v), vertexAttribPointer: v.Get("vertexAttribPointer").Call("bind", v),
viewport: v.Get("viewport").Call("bind", v), viewport: v.Get("viewport").Call("bind", v),
} }
if !isWebGL2Available { if isWebGL2Available {
g.getExtension = v.Get("getBufferSubData").Call("bind", v)
} else {
g.getExtension = v.Get("getExtension").Call("bind", v) g.getExtension = v.Get("getExtension").Call("bind", v)
} }
return g return g