status-im/mobile
2
0
Fork 0
mirror of synced 2025-02-21 22:18:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

gl: support (Create|Bind|Delete)VertexArray for GL ES 3

Browse Source 
Change-Id: Ief6b7f4ab2450d7f1c3b961b19304b10b3680abd
Reviewed-on: https://go-review.googlesource.com/61370
Reviewed-by: Elias Naur <elias.naur@gmail.com>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Alexandre Parentea 2017-09-04 16:57:44 +02:00 committed by David Crawshaw
parent 9bd992d065
commit e095d655c7
9 changed files with 121 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gl/fn.go
View File

@ -38,6 +38,7 @@ const (
glfnBindFramebuffer
glfnBindRenderbuffer
glfnBindTexture
glfnBindVertexArray
glfnBlendColor
glfnBlendEquation
glfnBlendEquationSeparate
@ -65,6 +66,7 @@ const (
glfnDeleteRenderbuffer
glfnDeleteShader
glfnDeleteTexture
glfnDeleteVertexArray
glfnDepthFunc
glfnDepthRangef
glfnDepthMask
@ -84,6 +86,7 @@ const (
glfnGenFramebuffer
glfnGenRenderbuffer
glfnGenTexture
glfnGenVertexArray
glfnGenerateMipmap
glfnGetActiveAttrib
glfnGetActiveUniform

27
gl/gl.go
View File

@ -90,6 +90,15 @@ func (ctx *context) BindTexture(target Enum, t Texture) {
})
}
func (ctx *context) BindVertexArray(va VertexArray) {
ctx.enqueue(call{
args: fnargs{
fn: glfnBindVertexArray,
a0: va.c(),
},
})
}
func (ctx *context) BlendColor(red, green, blue, alpha float32) {
ctx.enqueue(call{
args: fnargs{
@ -380,6 +389,15 @@ func (ctx *context) CreateTexture() Texture {
}))}
}
func (ctx *context) CreateVertexArray() VertexArray {
return VertexArray{Value: uint32(ctx.enqueue(call{
args: fnargs{
fn: glfnGenVertexArray,
},
blocking: true,
}))}
}
func (ctx *context) CullFace(mode Enum) {
ctx.enqueue(call{
args: fnargs{
@ -443,6 +461,15 @@ func (ctx *context) DeleteTexture(v Texture) {
})
}
func (ctx *context) DeleteVertexArray(v VertexArray) {
ctx.enqueue(call{
args: fnargs{
fn: glfnDeleteVertexArray,
a0: uintptr(v.Value),
},
})
}
func (ctx *context) DepthFunc(fn Enum) {
ctx.enqueue(call{
args: fnargs{

39
gl/gldebug.go
View File

@ -1337,6 +1337,19 @@ func (ctx *context) BindTexture(target Enum, t Texture) {
blocking: true})
}
func (ctx *context) BindVertexArray(t VertexArray) {
defer func() {
errstr := ctx.errDrain()
log.Printf("gl.BindVertexArray(%v) %v", t, errstr)
}()
ctx.enqueueDebug(call{
args: fnargs{
fn: glfnBindVertexArray,
a0: t.c(),
},
blocking: true})
}
func (ctx *context) BlendColor(red, green, blue, alpha float32) {
defer func() {
errstr := ctx.errDrain()
@ -1727,6 +1740,19 @@ func (ctx *context) CreateTexture() (r0 Texture) {
}))}
}
func (ctx *context) CreateVertexArray() (r0 VertexArray) {
defer func() {
errstr := ctx.errDrain()
log.Printf("gl.CreateVertexArray() %v%v", r0, errstr)
}()
return VertexArray{Value: uint32(ctx.enqueue(call{
args: fnargs{
fn: glfnGenVertexArray,
},
blocking: true,
}))}
}
func (ctx *context) CullFace(mode Enum) {
defer func() {
errstr := ctx.errDrain()
@ -1818,6 +1844,19 @@ func (ctx *context) DeleteTexture(v Texture) {
blocking: true})
}
func (ctx *context) DeleteVertexArray(v VertexArray) {
defer func() {
errstr := ctx.errDrain()
log.Printf("gl.DeleteVertexArray(%v) %v", v, errstr)
}()
ctx.enqueueDebug(call{
args: fnargs{
fn: glfnDeleteVertexArray,
a0: v.c(),
},
blocking: true})
}
func (ctx *context) DepthFunc(fn Enum) {
defer func() {
errstr := ctx.errDrain()

15
gl/interface.go
View File

@ -56,6 +56,11 @@ type Context interface {
// http://www.khronos.org/opengles/sdk/docs/man3/html/glBindTexture.xhtml
BindTexture(target Enum, t Texture)
// BindVertexArray binds a vertex array.
//
// http://www.khronos.org/opengles/sdk/docs/man3/html/glBindVertexArray.xhtml
BindVertexArray(rb VertexArray)
// BlendColor sets the blend color.
//
// http://www.khronos.org/opengles/sdk/docs/man3/html/glBlendColor.xhtml
@ -187,6 +192,11 @@ type Context interface {
// http://www.khronos.org/opengles/sdk/docs/man3/html/glGenTextures.xhtml
CreateTexture() Texture
// CreateTVertexArray creates a vertex array.
//
// http://www.khronos.org/opengles/sdk/docs/man3/html/glGenVertexArrays.xhtml
CreateVertexArray() VertexArray
// CullFace specifies which polygons are candidates for culling.
//
// Valid modes: FRONT, BACK, FRONT_AND_BACK.
@ -224,6 +234,11 @@ type Context interface {
// http://www.khronos.org/opengles/sdk/docs/man3/html/glDeleteTextures.xhtml
DeleteTexture(v Texture)
// DeleteVertexArray deletes the given render buffer object.
//
// http://www.khronos.org/opengles/sdk/docs/man3/html/glDeleteVertexArrays.xhtml
DeleteVertexArray(v VertexArray)
// DepthFunc sets the function used for depth buffer comparisons.
//
// Valid fn values:

6
gl/types_debug.go
View File

@ -49,6 +49,10 @@ type Uniform struct {
name string
}
type VextexArray struct {
Value uint32
}
func (v Attrib) c() uintptr { return uintptr(v.Value) }
func (v Enum) c() uintptr { return uintptr(v) }
func (v Program) c() uintptr {
@ -65,6 +69,7 @@ func (v Framebuffer) c() uintptr { return uintptr(v.Value) }
func (v Renderbuffer) c() uintptr { return uintptr(v.Value) }
func (v Texture) c() uintptr { return uintptr(v.Value) }
func (v Uniform) c() uintptr { return uintptr(v.Value) }
func (v VextexArray) c() uintptr { return uintptr(v.Value) }
func (v Attrib) String() string { return fmt.Sprintf("Attrib(%d:%s)", v.Value, v.name) }
func (v Program) String() string { return fmt.Sprintf("Program(%d)", v.Value) }
@ -74,3 +79,4 @@ func (v Framebuffer) String() string { return fmt.Sprintf("Framebuffer(%d)", v.
func (v Renderbuffer) String() string { return fmt.Sprintf("Renderbuffer(%d)", v.Value) }
func (v Texture) String() string { return fmt.Sprintf("Texture(%d)", v.Value) }
func (v Uniform) String() string { return fmt.Sprintf("Uniform(%d:%s)", v.Value, v.name) }
func (v VextexArray) String() string { return fmt.Sprintf("VextexArray(%d)", v.Value) }

7
gl/types_prod.go
View File

@ -59,6 +59,11 @@ type Uniform struct {
Value int32
}
// A VertexArray is a GL object that holds vertices in an internal format.
type VertexArray struct {
Value uint32
}
func (v Attrib) c() uintptr { return uintptr(v.Value) }
func (v Enum) c() uintptr { return uintptr(v) }
func (v Program) c() uintptr {
@ -75,6 +80,7 @@ func (v Framebuffer) c() uintptr { return uintptr(v.Value) }
func (v Renderbuffer) c() uintptr { return uintptr(v.Value) }
func (v Texture) c() uintptr { return uintptr(v.Value) }
func (v Uniform) c() uintptr { return uintptr(v.Value) }
func (v VertexArray) c() uintptr { return uintptr(v.Value) }
func (v Attrib) String() string { return fmt.Sprintf("Attrib(%d)", v.Value) }
func (v Program) String() string { return fmt.Sprintf("Program(%d)", v.Value) }
@ -84,3 +90,4 @@ func (v Framebuffer) String() string { return fmt.Sprintf("Framebuffer(%d)", v.
func (v Renderbuffer) String() string { return fmt.Sprintf("Renderbuffer(%d)", v.Value) }
func (v Texture) String() string { return fmt.Sprintf("Texture(%d)", v.Value) }
func (v Uniform) String() string { return fmt.Sprintf("Uniform(%d)", v.Value) }
func (v VertexArray) String() string { return fmt.Sprintf("VertexArray(%d)", v.Value) }

12
gl/work.c
View File

@ -30,6 +30,9 @@ static void glUniform1uiv(GLint location, GLsizei count, const GLuint *value) {
static void glUniform2uiv(GLint location, GLsizei count, const GLuint *value) { gles3missing(); }
static void glUniform3uiv(GLint location, GLsizei count, const GLuint *value) { gles3missing(); }
static void glUniform4uiv(GLint location, GLsizei count, const GLuint *value) { gles3missing(); }
static void glBindVertexArray(GLuint array) { gles3missing(); }
static void glGenVertexArrays(GLsizei n, GLuint *arrays) { gles3missing(); }
static void glDeleteVertexArrays(GLsizei n, const GLuint *arrays) { gles3missing(); }
#endif
uintptr_t processFn(struct fnargs* args, char* parg) {
@ -59,6 +62,9 @@ uintptr_t processFn(struct fnargs* args, char* parg) {
case glfnBindTexture:
glBindTexture((GLenum)args->a0, (GLint)args->a1);
break;
case glfnBindVertexArray:
glBindVertexArray((GLenum)args->a0);
break;
case glfnBlendColor:
glBlendColor(*(GLfloat*)&args->a0, *(GLfloat*)&args->a1, *(GLfloat*)&args->a2, *(GLfloat*)&args->a3);
break;
@ -143,6 +149,9 @@ uintptr_t processFn(struct fnargs* args, char* parg) {
case glfnDeleteTexture:
glDeleteTextures(1, (const GLuint*)(&args->a0));
break;
case glfnDeleteVertexArray:
glDeleteVertexArrays(1, (const GLuint*)(&args->a0));
break;
case glfnDepthFunc:
glDepthFunc((GLenum)args->a0);
break;
@ -200,6 +209,9 @@ uintptr_t processFn(struct fnargs* args, char* parg) {
case glfnGenTexture:
glGenTextures(1, (GLuint*)&ret);
break;
case glfnGenVertexArray:
glGenVertexArrays(1, (GLuint*)&ret);
break;
case glfnGenerateMipmap:
glGenerateMipmap((GLenum)args->a0);
break;

3
gl/work.h
View File

@ -41,6 +41,7 @@ typedef enum {
glfnBindFramebuffer,
glfnBindRenderbuffer,
glfnBindTexture,
glfnBindVertexArray,
glfnBlendColor,
glfnBlendEquation,
glfnBlendEquationSeparate,
@ -68,6 +69,7 @@ typedef enum {
glfnDeleteRenderbuffer,
glfnDeleteShader,
glfnDeleteTexture,
glfnDeleteVertexArray,
glfnDepthFunc,
glfnDepthRangef,
glfnDepthMask,
@ -87,6 +89,7 @@ typedef enum {
glfnGenFramebuffer,
glfnGenRenderbuffer,
glfnGenTexture,
glfnGenVertexArray,
glfnGenerateMipmap,
glfnGetActiveAttrib,
glfnGetActiveUniform,

9
gl/work_windows.go
View File

@ -128,6 +128,8 @@ func (ctx *context) doWork(c call) (ret uintptr) {
syscall.Syscall(glBindRenderbuffer.Addr(), 2, c.args.a0, c.args.a1, 0)
case glfnBindTexture:
syscall.Syscall(glBindTexture.Addr(), 2, c.args.a0, c.args.a1, 0)
case glfnBindVertexArray:
syscall.Syscall(glBindVertexArray.Addr(), 1, c.args.a0, 0)
case glfnBlendColor:
syscall.Syscall6(glBlendColor.Addr(), 4, c.args.a0, c.args.a1, c.args.a2, c.args.a3, 0, 0)
case glfnBlendEquation:
@ -180,6 +182,8 @@ func (ctx *context) doWork(c call) (ret uintptr) {
syscall.Syscall(glDeleteRenderbuffers.Addr(), 2, 1, uintptr(unsafe.Pointer(&c.args.a0)), 0)
case glfnDeleteShader:
syscall.Syscall(glDeleteShader.Addr(), 1, c.args.a0, 0, 0)
case glfnDeleteVertexArray:
syscall.Syscall(glDeleteVertexArrays.Addr(), 2, 1, uintptr(unsafe.Pointer(&c.args.a0)), 0)
case glfnDeleteTexture:
syscall.Syscall(glDeleteTextures.Addr(), 2, 1, uintptr(unsafe.Pointer(&c.args.a0)), 0)
case glfnDepthFunc:
@ -218,6 +222,8 @@ func (ctx *context) doWork(c call) (ret uintptr) {
syscall.Syscall(glGenFramebuffers.Addr(), 2, 1, uintptr(unsafe.Pointer(&ret)), 0)
case glfnGenRenderbuffer:
syscall.Syscall(glGenRenderbuffers.Addr(), 2, 1, uintptr(unsafe.Pointer(&ret)), 0)
case glfnGenVertexArray:
syscall.Syscall(glVertexArrays.Addr(), 2, 1, uintptr(unsafe.Pointer(&ret)), 0)
case glfnGenTexture:
syscall.Syscall(glGenTextures.Addr(), 2, 1, uintptr(unsafe.Pointer(&ret)), 0)
case glfnGenerateMipmap:
@ -424,6 +430,7 @@ var (
glBindFramebuffer = libGLESv2.NewProc("glBindFramebuffer")
glBindRenderbuffer = libGLESv2.NewProc("glBindRenderbuffer")
glBindTexture = libGLESv2.NewProc("glBindTexture")
glBindVertexArray = libGLESv2.NewProc("glBindVertexArray")
glBlendColor = libGLESv2.NewProc("glBlendColor")
glBlendEquation = libGLESv2.NewProc("glBlendEquation")
glBlendEquationSeparate = libGLESv2.NewProc("glBlendEquationSeparate")
@ -451,6 +458,7 @@ var (
glDeleteRenderbuffers = libGLESv2.NewProc("glDeleteRenderbuffers")
glDeleteShader = libGLESv2.NewProc("glDeleteShader")
glDeleteTextures = libGLESv2.NewProc("glDeleteTextures")
glVertexArrays = libGLESv2.NewProc("glVertexArrays")
glDepthFunc = libGLESv2.NewProc("glDepthFunc")
glDepthRangef = libGLESv2.NewProc("glDepthRangef")
glDepthMask = libGLESv2.NewProc("glDepthMask")
@ -470,6 +478,7 @@ var (
glGenFramebuffers = libGLESv2.NewProc("glGenFramebuffers")
glGenRenderbuffers = libGLESv2.NewProc("glGenRenderbuffers")
glGenTextures = libGLESv2.NewProc("glGenTextures")
glGenVertexArrays = libGLESv2.NewProc("glGenVertexArrays")
glGenerateMipmap = libGLESv2.NewProc("glGenerateMipmap")
glGetActiveAttrib = libGLESv2.NewProc("glGetActiveAttrib")
glGetActiveUniform = libGLESv2.NewProc("glGetActiveUniform")