Skip to content

Commit 1d3492b

Browse files
committed
Fix mac build
1 parent cac7811 commit 1d3492b

File tree

14 files changed

+36
-37
lines changed

14 files changed

+36
-37
lines changed

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ This is a part of [Node3D](https://github.com/node-3d) project.
1111
npm i -s webgl-raub
1212
```
1313

14+
> This addon is ABI-compatible across Node.js versions. **There is no compilation** during the `npm install`.
15+
1416
![Example](examples/screenshot.jpg)
1517

1618
**TL;DR**: For a quick start, use [3d-core-raub](https://github.com/node-3d/3d-core-raub)
@@ -28,9 +30,7 @@ Here `webgl` contains the **WebGL/OpenGL** API, like a `WebGLRenderingContext` i
2830
* The addon **does not provide** a window control system, you can use
2931
[glfw-raub](https://github.com/node-3d/glfw-raub) (or anything else!) to create a window.
3032

31-
> This addon is ABI-compatible across Node.js versions. **There is no compilation** during the `npm install`.
32-
33-
The JS API mostly maps the native OpenGL function calls to their JS counterparts. E.g.:
33+
The JS API mostly maps the native OpenGL function calls. E.g.:
3434

3535
```cpp
3636
// gl.clear(target)
@@ -56,7 +56,7 @@ and additional browser-like interfaces.
5656
See [this example](/examples/textured.mjs) using both **GLFW** and **Image**.
5757
The main idea being as follows:
5858
59-
```
59+
```js
6060
import Image from 'image-raub';
6161
import webgl from 'webgl-raub';
6262
import glfw from 'glfw-raub';

index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ declare module "webgl-raub" {
528528
const getUniformIndices: (program: WebGLProgram, uniformNames: string[]) => number[];
529529
const drawRangeElements: (mode: number, start: number, end: number, count: number, type: number, offset: number) => void;
530530
const releaseShaderCompiler: () => void;
531-
const shaderBinary: (count: number, shaders: WebGLShader[], binaryFormat: number, binary: string) => void;
531+
const shaderBinary: (shaders: WebGLShader[], binaryFormat: number, binary: string) => void;
532532
const compressedTexImage2D: (
533533
target: number, level: number, internalformat: number, width: number,
534534
height: number, border: number, image: TImage,

src/cpp/buffers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DBG_EXPORT JS_METHOD(createBuffer) { NAPI_ENV;
1313
}
1414

1515

16-
DBG_EXPORT JS_METHOD(deleteBuffer) { NAPI_ENV;
16+
DBG_EXPORT JS_METHOD(deleteBuffer) {
1717
LET_ID_ARG(0, buffer);
1818

1919
GLuint buffers[1] = { buffer };
@@ -124,7 +124,7 @@ DBG_EXPORT JS_METHOD(getBufferSubData) { NAPI_ENV;
124124
LET_OFFS_ARG(4, length);
125125

126126
size_t elementSize = dest.ElementSize();
127-
size_t size = std::min(dest.ByteLength(), length * elementSize);
127+
size_t size = std::min(dest.ByteLength(), elementSize * length);
128128
size_t offset = destByteOffset * elementSize;
129129

130130
void* data = getArrayData<uint8_t>(env, dest) + offset;

src/cpp/framebuffers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DBG_EXPORT JS_METHOD(createFramebuffer) { NAPI_ENV;
1414
}
1515

1616

17-
DBG_EXPORT JS_METHOD(deleteFramebuffer) { NAPI_ENV;
17+
DBG_EXPORT JS_METHOD(deleteFramebuffer) {
1818
LET_ID_ARG(0, buffer);
1919

2020
GLuint buffers[1] = { buffer };

src/cpp/programs.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DBG_EXPORT JS_METHOD(createProgram) { NAPI_ENV;
1414
}
1515

1616

17-
DBG_EXPORT JS_METHOD(deleteProgram) { NAPI_ENV;
17+
DBG_EXPORT JS_METHOD(deleteProgram) {
1818
LET_ID_ARG(0, program);
1919

2020
glDeleteProgram(program);
@@ -68,23 +68,23 @@ DBG_EXPORT JS_METHOD(getProgramParameter) { NAPI_ENV;
6868
}
6969

7070

71-
DBG_EXPORT JS_METHOD(linkProgram) { NAPI_ENV;
71+
DBG_EXPORT JS_METHOD(linkProgram) {
7272
LET_ID_ARG(0, program);
7373

7474
glLinkProgram(program);
7575
RET_WEBGL_VOID;
7676
}
7777

7878

79-
DBG_EXPORT JS_METHOD(useProgram) { NAPI_ENV;
79+
DBG_EXPORT JS_METHOD(useProgram) {
8080
LET_ID_ARG(0, program);
8181

8282
glUseProgram(program);
8383
RET_WEBGL_VOID;
8484
}
8585

8686

87-
DBG_EXPORT JS_METHOD(validateProgram) { NAPI_ENV;
87+
DBG_EXPORT JS_METHOD(validateProgram) {
8888
LET_ID_ARG(0, program);
8989

9090
glValidateProgram(program);

src/cpp/queries.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ DBG_EXPORT JS_METHOD(createQuery) { NAPI_ENV;
1414
}
1515

1616

17-
DBG_EXPORT JS_METHOD(deleteQuery) { NAPI_ENV;
17+
DBG_EXPORT JS_METHOD(deleteQuery) {
1818
LET_ID_ARG(0, query);
1919
GLuint queries[1] = { query };
2020
glDeleteQueries(1, queries);

src/cpp/renderbuffers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ DBG_EXPORT JS_METHOD(createRenderbuffer) { NAPI_ENV;
1212
}
1313

1414

15-
DBG_EXPORT JS_METHOD(deleteRenderbuffer) { NAPI_ENV;
15+
DBG_EXPORT JS_METHOD(deleteRenderbuffer) {
1616
LET_ID_ARG(0, buffer);
1717
GLuint buffers[1] = { buffer };
1818
glDeleteRenderbuffers(1, buffers);

src/cpp/sampler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DBG_EXPORT JS_METHOD(createSampler) { NAPI_ENV;
1111
}
1212

1313

14-
DBG_EXPORT JS_METHOD(deleteSampler) { NAPI_ENV;
14+
DBG_EXPORT JS_METHOD(deleteSampler) {
1515
LET_ID_ARG(0, sampler);
1616
GLuint samplers[1] = { sampler };
1717
glDeleteSamplers(1, samplers);

src/cpp/shaders.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DBG_EXPORT JS_METHOD(createShader) { NAPI_ENV;
1717
}
1818

1919

20-
DBG_EXPORT JS_METHOD(deleteShader) { NAPI_ENV;
20+
DBG_EXPORT JS_METHOD(deleteShader) {
2121
LET_ID_ARG(0, shader);
2222

2323
glDeleteShader(shader);
@@ -32,7 +32,7 @@ DBG_EXPORT JS_METHOD(isShader) { NAPI_ENV;
3232
}
3333

3434

35-
DBG_EXPORT JS_METHOD(attachShader) { NAPI_ENV;
35+
DBG_EXPORT JS_METHOD(attachShader) {
3636
LET_ID_ARG(0, program);
3737
LET_ID_ARG(1, shader);
3838

@@ -41,15 +41,15 @@ DBG_EXPORT JS_METHOD(attachShader) { NAPI_ENV;
4141
}
4242

4343

44-
DBG_EXPORT JS_METHOD(compileShader) { NAPI_ENV;
44+
DBG_EXPORT JS_METHOD(compileShader) {
4545
LET_ID_ARG(0, shader);
4646

4747
glCompileShader(shader);
4848
RET_WEBGL_VOID;
4949
}
5050

5151

52-
DBG_EXPORT JS_METHOD(detachShader) { NAPI_ENV;
52+
DBG_EXPORT JS_METHOD(detachShader) {
5353
LET_ID_ARG(0, program);
5454
LET_ID_ARG(1, shader);
5555

@@ -156,16 +156,15 @@ DBG_EXPORT JS_METHOD(shaderSource) { NAPI_ENV;
156156
RET_WEBGL_VOID;
157157
}
158158

159-
DBG_EXPORT JS_METHOD(releaseShaderCompiler) { NAPI_ENV;
159+
DBG_EXPORT JS_METHOD(releaseShaderCompiler) {
160160
glReleaseShaderCompiler();
161161
RET_WEBGL_VOID;
162162
}
163163

164164
DBG_EXPORT JS_METHOD(shaderBinary) { NAPI_ENV;
165-
REQ_INT32_ARG(0, count);
166-
REQ_ARRAY_ARG(1, jsShaders);
167-
REQ_INT32_ARG(2, binaryFormat);
168-
REQ_STR_ARG(3, binary);
165+
REQ_ARRAY_ARG(0, jsShaders);
166+
REQ_INT32_ARG(1, binaryFormat);
167+
REQ_STR_ARG(2, binary);
169168

170169
GLuint cppShaders[COUNT_SHADERS_MAX];
171170
uint32_t shaderCount = std::min(COUNT_SHADERS_MAX, jsShaders.Length());

src/cpp/textures.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ DBG_EXPORT JS_METHOD(createTexture) { NAPI_ENV;
1111
}
1212

1313

14-
DBG_EXPORT JS_METHOD(deleteTexture) { NAPI_ENV;
14+
DBG_EXPORT JS_METHOD(deleteTexture) {
1515
LET_ID_ARG(0, texture);
1616
GLuint textures[1] = { texture };
1717
glDeleteTextures(1, textures);

0 commit comments

Comments
 (0)