From 098fed65d5cc110b76e95760cd3be050b9b6bd41 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Wed, 16 Nov 2022 23:59:28 +0900 Subject: [PATCH] internal/graphicsdriver/opengl/gl: refactoring: replace GetIntegerv -> GetInteger --- internal/graphicsdriver/opengl/context_notjs.go | 8 ++------ internal/graphicsdriver/opengl/gl/default_notpurego.go | 4 +++- internal/graphicsdriver/opengl/gl/default_purego.go | 4 +++- internal/graphicsdriver/opengl/gl/gomobile.go | 4 ++-- internal/graphicsdriver/opengl/gl/interface.go | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/graphicsdriver/opengl/context_notjs.go b/internal/graphicsdriver/opengl/context_notjs.go index fa5f91184..8a3451105 100644 --- a/internal/graphicsdriver/opengl/context_notjs.go +++ b/internal/graphicsdriver/opengl/context_notjs.go @@ -105,9 +105,7 @@ func (c *context) reset() error { c.ctx.Enable(gl.BLEND) c.ctx.Enable(gl.SCISSOR_TEST) c.blend(graphicsdriver.BlendSourceOver) - f := make([]int32, 1) - c.ctx.GetIntegerv(f, gl.FRAMEBUFFER_BINDING) - c.screenFramebuffer = framebufferNative(f[0]) + c.screenFramebuffer = framebufferNative(c.ctx.GetInteger(gl.FRAMEBUFFER_BINDING)) // TODO: Need to update screenFramebufferWidth/Height? return nil } @@ -441,9 +439,7 @@ func (c *context) drawElements(len int, offsetInBytes int) { } func (c *context) maxTextureSizeImpl() int { - v := make([]int32, 1) - c.ctx.GetIntegerv(v, gl.MAX_TEXTURE_SIZE) - return int(v[0]) + return c.ctx.GetInteger(gl.MAX_TEXTURE_SIZE) } func (c *context) flush() { diff --git a/internal/graphicsdriver/opengl/gl/default_notpurego.go b/internal/graphicsdriver/opengl/gl/default_notpurego.go index 0d6ed385d..70ae3bd85 100644 --- a/internal/graphicsdriver/opengl/gl/default_notpurego.go +++ b/internal/graphicsdriver/opengl/gl/default_notpurego.go @@ -584,8 +584,10 @@ func (c *defaultContext) GetError() uint32 { return uint32(ret) } -func (c *defaultContext) GetIntegerv(dst []int32, pname uint32) { +func (c *defaultContext) GetInteger(pname uint32) int { + dst := make([]int32, 1) C.glowGetIntegerv(c.gpGetIntegerv, (C.GLenum)(pname), (*C.GLint)(unsafe.Pointer(&dst[0]))) + return int(dst[0]) } func (c *defaultContext) GetProgramInfoLog(program uint32) string { diff --git a/internal/graphicsdriver/opengl/gl/default_purego.go b/internal/graphicsdriver/opengl/gl/default_purego.go index 08bf6e42e..7893d524e 100644 --- a/internal/graphicsdriver/opengl/gl/default_purego.go +++ b/internal/graphicsdriver/opengl/gl/default_purego.go @@ -283,8 +283,10 @@ func (c *defaultContext) GetError() uint32 { return uint32(ret) } -func (c *defaultContext) GetIntegerv(dst []int32, pname uint32) { +func (c *defaultContext) GetInteger(pname uint32) int { + dst := make([]int32, 1) purego.SyscallN(c.gpGetIntegerv, uintptr(pname), uintptr(unsafe.Pointer(&dst[0]))) + return int(dst[0]) } func (c *defaultContext) GetProgramInfoLog(program uint32) string { diff --git a/internal/graphicsdriver/opengl/gl/gomobile.go b/internal/graphicsdriver/opengl/gl/gomobile.go index 00b4d1e7b..95198b376 100644 --- a/internal/graphicsdriver/opengl/gl/gomobile.go +++ b/internal/graphicsdriver/opengl/gl/gomobile.go @@ -218,8 +218,8 @@ func (g *gomobileContext) GetError() uint32 { return uint32(g.ctx.GetError()) } -func (g *gomobileContext) GetIntegerv(dst []int32, pname uint32) { - g.ctx.GetIntegerv(dst, gl.Enum(pname)) +func (g *gomobileContext) GetInteger(pname uint32) int { + return g.ctx.GetInteger(gl.Enum(pname)) } func (g *gomobileContext) GetProgramInfoLog(program uint32) string { diff --git a/internal/graphicsdriver/opengl/gl/interface.go b/internal/graphicsdriver/opengl/gl/interface.go index f06a81186..d2a878d8c 100644 --- a/internal/graphicsdriver/opengl/gl/interface.go +++ b/internal/graphicsdriver/opengl/gl/interface.go @@ -58,7 +58,7 @@ type Context interface { GenRenderbuffers(n int32) []uint32 GenTextures(n int32) []uint32 GetError() uint32 - GetIntegerv(dst []int32, pname uint32) + GetInteger(pname uint32) int GetProgramInfoLog(program uint32) string GetProgramiv(dst []int32, program uint32, pname uint32) GetShaderInfoLog(shader uint32) string