mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 15:48:51 +00:00
Merge branch 'master' into separate-int-word-sizes
This commit is contained in:
Vendored
+1
-1
@@ -50,7 +50,7 @@ foreign webgl {
|
||||
AttachShader :: proc(program: Program, shader: Shader) ---
|
||||
BindAttribLocation :: proc(program: Program, index: i32, name: string) ---
|
||||
BindBuffer :: proc(target: Enum, buffer: Buffer) ---
|
||||
BindFramebuffer :: proc(target: Enum, buffer: Buffer) ---
|
||||
BindFramebuffer :: proc(target: Enum, framebuffer: Framebuffer) ---
|
||||
BindTexture :: proc(target: Enum, texture: Texture) ---
|
||||
BlendColor :: proc(red, green, blue, alpha: f32) ---
|
||||
BlendEquation :: proc(mode: Enum) ---
|
||||
|
||||
Vendored
+2
-2
@@ -313,8 +313,8 @@ class WebGLInterface {
|
||||
this.ctx.bindBuffer(target, bufferObj)
|
||||
}
|
||||
},
|
||||
BindFramebuffer: (target, buffer) => {
|
||||
// TODO: BindFramebuffer
|
||||
BindFramebuffer: (target, framebuffer) => {
|
||||
this.ctx.bindFramebuffer(target, framebuffer ? this.framebuffers[framebuffer] : null)
|
||||
},
|
||||
BindTexture: (target, texture) => {
|
||||
this.ctx.bindTexture(target, texture ? this.textures[texture] : null)
|
||||
|
||||
Reference in New Issue
Block a user