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

opengl: Remove type mode

Browse Source
This commit is contained in:
Hajime Hoshi 2018-10-30 22:29:54 +09:00
parent b2b09ccec0
commit 99594fe732
6 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/graphicscommand/command.go
View File

@ -246,7 +246,7 @@ func (c *drawImageCommand) Exec(indexOffsetInBytes int) error {
dw, dh := c.dst.Size() dw, dh := c.dst.Size()
sw, sh := c.src.Size() sw, sh := c.src.Size()
opengl.UseProgram(proj, c.src.texture.native, dw, dh, sw, sh, c.color, c.filter) opengl.UseProgram(proj, c.src.texture.native, dw, dh, sw, sh, c.color, c.filter)
opengl.GetContext().DrawElements(opengl.Triangles, c.nindices, indexOffsetInBytes) opengl.GetContext().DrawElements(c.nindices, indexOffsetInBytes)
// glFlush() might be necessary at least on MacBook Pro (a smilar problem at #419), // glFlush() might be necessary at least on MacBook Pro (a smilar problem at #419),
// but basically this pass the tests (esp. TestImageTooManyFill). // but basically this pass the tests (esp. TestImageTooManyFill).

2
internal/opengl/context.go
View File

@ -32,8 +32,6 @@ var (
ElementArrayBuffer bufferType ElementArrayBuffer bufferType
DynamicDraw bufferUsage DynamicDraw bufferUsage
StaticDraw bufferUsage StaticDraw bufferUsage
Triangles mode
Lines mode
Short DataType Short DataType
Float DataType Float DataType

6
internal/opengl/context_desktop.go
View File

@ -60,8 +60,6 @@ func init() {
ArrayBuffer = gl.ARRAY_BUFFER ArrayBuffer = gl.ARRAY_BUFFER
ElementArrayBuffer = gl.ELEMENT_ARRAY_BUFFER ElementArrayBuffer = gl.ELEMENT_ARRAY_BUFFER
DynamicDraw = gl.DYNAMIC_DRAW DynamicDraw = gl.DYNAMIC_DRAW
Triangles = gl.TRIANGLES
Lines = gl.LINES
Short = gl.SHORT Short = gl.SHORT
Float = gl.FLOAT Float = gl.FLOAT
@ -502,9 +500,9 @@ func (c *Context) deleteBuffer(b buffer) {
}) })
} }
func (c *Context) DrawElements(mode mode, len int, offsetInBytes int) { func (c *Context) DrawElements(len int, offsetInBytes int) {
_ = c.runOnContextThread(func() error { _ = c.runOnContextThread(func() error {
gl.DrawElements(uint32(mode), int32(len), gl.UNSIGNED_SHORT, gl.PtrOffset(offsetInBytes)) gl.DrawElements(gl.TRIANGLES, int32(len), gl.UNSIGNED_SHORT, gl.PtrOffset(offsetInBytes))
return nil return nil
}) })
} }

8
internal/opengl/context_js.go
View File

@ -63,6 +63,7 @@ var (
textureMinFilter js.Value textureMinFilter js.Value
textureWrapS js.Value textureWrapS js.Value
textureWrapT js.Value textureWrapT js.Value
triangles js.Value
rgba js.Value rgba js.Value
unpackAlignment js.Value unpackAlignment js.Value
unsignedByte js.Value unsignedByte js.Value
@ -77,8 +78,6 @@ func init() {
ArrayBuffer = bufferType(c.Get("ARRAY_BUFFER").Int()) ArrayBuffer = bufferType(c.Get("ARRAY_BUFFER").Int())
ElementArrayBuffer = bufferType(c.Get("ELEMENT_ARRAY_BUFFER").Int()) ElementArrayBuffer = bufferType(c.Get("ELEMENT_ARRAY_BUFFER").Int())
DynamicDraw = bufferUsage(c.Get("DYNAMIC_DRAW").Int()) DynamicDraw = bufferUsage(c.Get("DYNAMIC_DRAW").Int())
Triangles = mode(c.Get("TRIANGLES").Int())
Lines = mode(c.Get("LINES").Int())
Short = DataType(c.Get("SHORT").Int()) Short = DataType(c.Get("SHORT").Int())
Float = DataType(c.Get("FLOAT").Int()) Float = DataType(c.Get("FLOAT").Int())
@ -106,6 +105,7 @@ func init() {
textureMinFilter = c.Get("TEXTURE_MIN_FILTER") textureMinFilter = c.Get("TEXTURE_MIN_FILTER")
textureWrapS = c.Get("TEXTURE_WRAP_S") textureWrapS = c.Get("TEXTURE_WRAP_S")
textureWrapT = c.Get("TEXTURE_WRAP_T") textureWrapT = c.Get("TEXTURE_WRAP_T")
triangles = c.Get("TRIANGLES")
unpackAlignment = c.Get("UNPACK_ALIGNMENT") unpackAlignment = c.Get("UNPACK_ALIGNMENT")
unsignedByte = c.Get("UNSIGNED_BYTE") unsignedByte = c.Get("UNSIGNED_BYTE")
unsignedShort = c.Get("UNSIGNED_SHORT") unsignedShort = c.Get("UNSIGNED_SHORT")
@ -444,9 +444,9 @@ func (c *Context) deleteBuffer(b buffer) {
gl.Call("deleteBuffer", js.Value(b)) gl.Call("deleteBuffer", js.Value(b))
} }
func (c *Context) DrawElements(mode mode, len int, offsetInBytes int) { func (c *Context) DrawElements(len int, offsetInBytes int) {
gl := c.gl gl := c.gl
gl.Call("drawElements", int(mode), len, unsignedShort, offsetInBytes) gl.Call("drawElements", triangles, len, unsignedShort, offsetInBytes)
} }
func (c *Context) maxTextureSizeImpl() int { func (c *Context) maxTextureSizeImpl() int {

6
internal/opengl/context_mobile.go
View File

@ -57,8 +57,6 @@ func init() {
ArrayBuffer = mgl.ARRAY_BUFFER ArrayBuffer = mgl.ARRAY_BUFFER
ElementArrayBuffer = mgl.ELEMENT_ARRAY_BUFFER ElementArrayBuffer = mgl.ELEMENT_ARRAY_BUFFER
DynamicDraw = mgl.DYNAMIC_DRAW DynamicDraw = mgl.DYNAMIC_DRAW
Triangles = mgl.TRIANGLES
Lines = mgl.LINES
Short = mgl.SHORT Short = mgl.SHORT
Float = mgl.FLOAT Float = mgl.FLOAT
@ -391,9 +389,9 @@ func (c *Context) deleteBuffer(b buffer) {
gl.DeleteBuffer(mgl.Buffer(b)) gl.DeleteBuffer(mgl.Buffer(b))
} }
func (c *Context) DrawElements(mode mode, len int, offsetInBytes int) { func (c *Context) DrawElements(len int, offsetInBytes int) {
gl := c.gl gl := c.gl
gl.DrawElements(mgl.Enum(mode), len, mgl.UNSIGNED_SHORT, offsetInBytes) gl.DrawElements(mgl.TRIANGLES, len, mgl.UNSIGNED_SHORT, offsetInBytes)
} }
func (c *Context) maxTextureSizeImpl() int { func (c *Context) maxTextureSizeImpl() int {

1
internal/opengl/types.go
View File

@ -18,7 +18,6 @@ type (
shaderType int shaderType int
bufferType int bufferType int
bufferUsage int bufferUsage int
mode int
operation int operation int
) )