Skip to content

Commit

Permalink
Breaking change: _nima is now buffer, not array.
Browse files Browse the repository at this point in the history
  • Loading branch information
@yglukhov
yglukhov committed Mar 26, 2024
1 parent a7ca9b6 commit ebba3fd
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions wasmrt.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ proc to*(o: sink JSObj, T: typedesc[JSObj]): T {.inline.} =
T(o: r)

const initCode = (""";
var W = WebAssembly, f = W.Module.imports(m), o = {}, g = globalThis, q, b;
var W = WebAssembly, f = W.Module.imports(m), o = {}, g = globalThis, q;
for (i of f) {
var n = i.name;
if (n[0] == '^') {
Expand Down Expand Up @@ -341,22 +341,22 @@ g._nimoi = -1;
g._nimok = o =>
o ? ( _nimoi < 0 ? r = _nimo.length : _nimoi = _nimo[r = _nimoi], _nimo[r] = o, r ) : 0;
g._nimmu = () => g._nima = b = new Int8Array(q.buffer);
g._nimmu = () => g._nima = q.buffer;
// function _nims(address, length): string
// Create JS string from string at `address` with `length`
g._nims = (a, l) =>
new TextDecoder().decode(new Uint8Array(q.buffer, a, l));
new TextDecoder().decode(new Uint8Array(_nima, a, l));
// function _nimsj(address): string
// Create JS string from null-terminated string at `address`
g._nimsj = a =>
_nims(a, b.indexOf(0, a) - a);
_nims(a, new Int8Array(_nima).indexOf(0, a) - a);
// function _nimws(string, address, length)
// Write js string to buffer at `address` with `length`. The output is not null-terminated
g._nimws = (s, a, l) =>
new TextEncoder().encodeInto(s, new Uint8Array(q.buffer, a, l)).written;
new TextEncoder().encodeInto(s, new Uint8Array(_nima, a, l)).written;
// function _nimwi(int32Array, address)
// Write `int32Array` at `address`
Expand Down Expand Up @@ -603,7 +603,7 @@ proc isNodejs(): bool {.inline.} =
else:
isNodejsAux()

proc nodejsWriteToStream(s: int, b: pointer, l: int) {.importwasmraw:"process[$0?'stderr':'stdout'].write(_nims($1,$2))".}
proc nodejsWriteToStream(s: int, b: pointer, l: int) {.importwasmraw:"process[$0?'stderr':'stdout'].write(new Uint8Array(_nima, $1, $2))".}

proc consoleAppend(b: pointer, l: int) {.importwasmraw: "_nimc += _nims($0,$1)".}
proc consoleFlush(s: int) {.importwasmraw: "console[$0?'error':'log'](_nimc); _nimc = ''".}
Expand Down
20 changes: 10 additions & 10 deletions wasmrt/gl.nim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,17 @@ proc glVertexAttribPointerI(i: uint32, s: int32, t: uint32, n: bool, r: int32, o
proc glVertexAttribPointer(i: uint32, s: int32, t: uint32, n: bool, r: int32, o: pointer) {.exportc.} =
glVertexAttribPointerI(i, s, t, n, r, o)

proc glUniformMatrix4fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix4fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima.buffer, $2, 16))".}
proc glUniformMatrix4fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix4fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima, $2, 16))".}
proc glUniformMatrix4fv(l, c: uint32, t: bool, v: ptr float32) {.exportc.} =
assert(c == 1, "c != 1 not supported in glUniformMatrix4")
glUniformMatrix4fvI(l, t, v)

proc glUniformMatrix3fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix3fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima.buffer, $2, 9))".}
proc glUniformMatrix3fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix3fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima, $2, 9))".}
proc glUniformMatrix3fv(l, c: uint32, t: bool, v: ptr float32) {.exportc.} =
assert(c == 1, "c != 1 not supported in glUniformMatrix3")
glUniformMatrix3fvI(l, t, v)

proc glUniformMatrix2fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix2fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima.buffer, $2, 4))".}
proc glUniformMatrix2fvI(l: uint32, t: bool, v: ptr float32) {.importwasmraw: "GLCtx.uniformMatrix2fv(_wrtglap._nimu[$0], $1, new Float32Array(_nima, $2, 4))".}
proc glUniformMatrix2fv(l, c: uint32, t: bool, v: ptr float32) {.exportc.} =
assert(c == 1, "c != 1 not supported in glUniformMatrix2")
glUniformMatrix2fvI(l, t, v)
Expand All @@ -132,16 +132,16 @@ proc glUniform1f(l: uint32, v: float32) {.exportc.} = glUniform1fI(l, v)
proc glUniform1iI(l: uint32, v: int32) {.importwasmraw: "GLCtx.uniform1i(_wrtglap._nimu[$0], $1)".}
proc glUniform1i(l: uint32, v: int32) {.exportc.} = glUniform1iI(l, v)

proc glUniform1fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform1fv(_wrtglap._nimu[$0], new Float32Array(_nima.buffer, $1, $2))".}
proc glUniform1fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform1fv(_wrtglap._nimu[$0], new Float32Array(_nima, $1, $2))".}
proc glUniform1fv(l, c: uint32, v: ptr float32) {.exportc.} = glUniform1fvI(l, v, c * 1)

proc glUniform2fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform2fv(_wrtglap._nimu[$0], new Float32Array(_nima.buffer, $1, $2))".}
proc glUniform2fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform2fv(_wrtglap._nimu[$0], new Float32Array(_nima, $1, $2))".}
proc glUniform2fv(l, c: uint32, v: ptr float32) {.exportc.} = glUniform2fvI(l, v, c * 2)

proc glUniform3fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform3fv(_wrtglap._nimu[$0], new Float32Array(_nima.buffer, $1, $2))".}
proc glUniform3fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform3fv(_wrtglap._nimu[$0], new Float32Array(_nima, $1, $2))".}
proc glUniform3fv(l, c: uint32, v: ptr float32) {.exportc.} = glUniform3fvI(l, v, c * 3)

proc glUniform4fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform4fv(_wrtglap._nimu[$0], new Float32Array(_nima.buffer, $1, $2))".}
proc glUniform4fvI(l: uint32, b: ptr float32, s: uint32) {.importwasmraw: "GLCtx.uniform4fv(_wrtglap._nimu[$0], new Float32Array(_nima, $1, $2))".}
proc glUniform4fv(l, c: uint32, v: ptr float32) {.exportc.} = glUniform4fvI(l, v, c * 4)

proc glDrawArraysI(m, f, c: uint32) {.importwasmf: "GLCtx.drawArrays".}
Expand Down Expand Up @@ -177,7 +177,7 @@ proc glBlendFunc(a, b: uint32) {.exportc.} = glBlendFuncI(a, b)
proc glActiveTextureI(a: uint32) {.importwasmf: "GLCtx.activeTexture".}
proc glActiveTexture(a: uint32) {.exportc.} = glActiveTextureI(a)

proc glBufferDataI(t, s: uint32, d: pointer, u: uint32) {.importwasmraw: "GLCtx.bufferData($0, new DataView(_nima.buffer, $2, $1), $3)".}
proc glBufferDataI(t, s: uint32, d: pointer, u: uint32) {.importwasmraw: "GLCtx.bufferData($0, new DataView(_nima, $2, $1), $3)".}
proc glBufferData(t, s: uint32, d: pointer, u: uint32) {.exportc.} = glBufferDataI(t, s, d, u)

proc glDrawElementsI(a, b, c, d: uint32) {.importwasmf: "GLCtx.drawElements".}
Expand All @@ -190,7 +190,7 @@ proc glPixelStoreiI(a, b: uint32) {.importwasmf: "GLCtx.pixelStorei".}
proc glPixelStorei(a, b: uint32) {.exportc.} = glPixelStoreiI(a, b)

proc glTexImage2DUint8I(t: uint32, l, i: int32, w, h, b: int32, f, k: uint32, s: int32, p: pointer) {.importwasmraw: """
GLCtx.texImage2D($0, $1, $2, $3, $4, $5, $6, $7, new Uint8Array(_nima.buffer, $9, $8))
GLCtx.texImage2D($0, $1, $2, $3, $4, $5, $6, $7, new Uint8Array(_nima, $9, $8))
""".}
import strutils

Expand Down Expand Up @@ -218,7 +218,7 @@ proc glTexImage2D(target: uint32, level, internalFormat: int32, width, height, b
assert(false, "Unknown typ " & $format)

proc glTexSubImage2DUint8I(t: uint32, l, x, y: int32, w, h: int32, f, k: uint32, s: int32, p: pointer) {.importwasmraw: """
GLCtx.texSubImage2D($0, $1, $2, $3, $4, $5, $6, $7, new Uint8Array(_nima.buffer, $9, $8))
GLCtx.texSubImage2D($0, $1, $2, $3, $4, $5, $6, $7, new Uint8Array(_nima, $9, $8))
""".}

proc glTexSubImage2D(target: uint32, level, xoffset, yoffset: int32, width, height: int32, format, typ: uint32, data: pointer) {.exportc.} =
Expand Down

0 comments on commit ebba3fd

Please sign in to comment.