Improve gl.getParameter

Author: raub

js/webgl.js

@@ -288,12 +288,103 @@ if (!gl.__isInited) {
 
 	// Misc OpenGL Functions
 
+	// https://developer.mozilla.org/en-US/docs/Web/API/WebGLRenderingContext/getParameter
+	// https://registry.khronos.org/OpenGL-Refpages/gl4/html/glGet.xhtml
 	const _getParameter = gl.getParameter;
 	gl.getParameter = (pname) => {
 		if (pname === gl.VERSION) {
 			return gl._versionString;
 		}
-		return _getParameter(pname);
+		
+		// null
+		// FIXME: Do these have OpenGL-based values?
+		if (
+			pname === gl.COPY_READ_BUFFER_BINDING ||
+			pname === gl.COPY_WRITE_BUFFER_BINDING
+		) {
+			return null;
+		}
+		
+		const result = _getParameter(pname);
+		
+		// Float32Array
+		if (
+			pname === gl.ALIASED_LINE_WIDTH_RANGE ||
+			pname === gl.ALIASED_POINT_SIZE_RANGE ||
+			pname === gl.BLEND_COLOR ||
+			pname === gl.COLOR_CLEAR_VALUE ||
+			pname === gl.DEPTH_RANGE
+		) {
+			return wrapF32(result);
+		}
+		
+		// Uint32Array
+		if (pname === gl.COMPRESSED_TEXTURE_FORMATS) {
+			return wrapUi32(result);
+		}
+		
+		// Int32Array
+		if (pname === gl.MAX_VIEWPORT_DIMS || pname === gl.SCISSOR_BOX || pname === gl.VIEWPORT) {
+			return wrapI32(result);
+		}
+		
+		// WebGLFramebuffer
+		if (
+			pname === gl.FRAMEBUFFER_BINDING ||
+			pname === gl.DRAW_FRAMEBUFFER_BINDING ||
+			pname === gl.READ_FRAMEBUFFER_BINDING
+		) {
+			return result ? new gl.WebGLFramebuffer(result) : null;
+		}
+		
+		// WebGLRenderbuffer
+		if (pname === gl.RENDERBUFFER_BINDING) {
+			return result ? new gl.WebGLRenderbuffer(result) : null;
+		}
+		
+		// WebGLSampler
+		if (pname === gl.SAMPLER_BINDING) {
+			return result ? new gl.WebGLSampler(result) : null;
+		}
+		
+		// WebGLTransformFeedback
+		if (pname === gl.TRANSFORM_FEEDBACK_BINDING) {
+			return result ? new gl.WebGLTransformFeedback(result) : null;
+		}
+		
+		// WebGLVertexArrayObject
+		if (pname === gl.VERTEX_ARRAY_BINDING) {
+			return result ? new gl.WebGLVertexArrayObject(result) : null;
+		}
+		
+		// WebGLProgram
+		if (pname === gl.CURRENT_PROGRAM) {
+			return result ? new gl.WebGLProgram(result) : null;
+		}
+		
+		// WebGLBuffer
+		if (
+			pname === gl.ARRAY_BUFFER_BINDING ||
+			pname === gl.ELEMENT_ARRAY_BUFFER_BINDING ||
+			pname === gl.PIXEL_PACK_BUFFER_BINDING ||
+			pname === gl.PIXEL_UNPACK_BUFFER_BINDING ||
+			pname === gl.TRANSFORM_FEEDBACK_BUFFER_BINDING ||
+			pname === gl.UNIFORM_BUFFER_BINDING
+		) {
+			return result ? new gl.WebGLBuffer(result) : null;
+		}
+		
+		// WebGLTexture
+		if (
+			pname === gl.TEXTURE_BINDING_2D ||
+			pname === gl.TEXTURE_BINDING_CUBE_MAP ||
+			pname === gl.TEXTURE_BINDING_2D_ARRAY ||
+			pname === gl.TEXTURE_BINDING_3D
+		) {
+			return result ? new gl.WebGLTexture(result) : null;
+		}
+		
+		return result;
 	};
 
 

package-lock.json

@@ -1,7 +1,7 @@
 {
 	"author": "Luis Blanco <[email protected]>",
 	"name": "webgl-raub",
-	"version": "5.2.0",
+	"version": "5.3.0",
 	"description": "WebGL for Node.js",
 	"license": "MIT",
 	"main": "index.js",

package.json

@@ -94,7 +94,7 @@ DBG_EXPORT JS_METHOD(bufferData) { NAPI_ENV;
 DBG_EXPORT JS_METHOD(bufferSubData) { NAPI_ENV;
 	REQ_INT32_ARG(0, target);
 	REQ_INT32_ARG(1, offset);
-	REQ_TYPED_ARRAY_ARG(2, arr);
+	REQ_OBJ_ARG(2, arr);
 
 	GLsizei count = 0;
 	void* data = getArrayData(env, arr, &count);

src/cpp/buffers.cpp

@@ -161,7 +161,6 @@ DBG_EXPORT JS_METHOD(getParameter) { NAPI_ENV;
 	const char *cParams;
 	GLint iParams[4];
 	GLfloat fParams[4];
-	Napi::Array arr = JS_ARRAY;
 	int32_t boundFeedback;
 
 	switch(name) {
@@ -182,42 +181,47 @@ DBG_EXPORT JS_METHOD(getParameter) { NAPI_ENV;
 			RET_WEBGL_VOID;
 		}
 
-	CASES_PARAM_INT2
+	CASES_PARAM_INT2 {
+		Napi::Array arr = JS_ARRAY;
 		glGetIntegerv(name, iParams);
 		arr.Set(0U, JS_NUM(iParams[0]));
 		arr.Set(1U, JS_NUM(iParams[1]));
 		RET_VALUE(arr);
-	
-	CASES_PARAM_INT4
+	}
+	CASES_PARAM_INT4 {
+		Napi::Array arr = JS_ARRAY;
 		glGetIntegerv(name, iParams);
 		arr.Set(0U, JS_NUM(iParams[0]));
 		arr.Set(1U, JS_NUM(iParams[1]));
 		arr.Set(2U, JS_NUM(iParams[2]));
 		arr.Set(3U, JS_NUM(iParams[3]));
 		RET_VALUE(arr);
-	
-	CASES_PARAM_FLOAT2
+	}
+	CASES_PARAM_FLOAT2 {
+		Napi::Array arr = JS_ARRAY;
 		glGetFloatv(name, fParams);
 		arr.Set(0U, JS_NUM(fParams[0]));
 		arr.Set(1U, JS_NUM(fParams[1]));
 		RET_VALUE(arr);
-	
-	CASES_PARAM_FLOAT4
+	}
+	CASES_PARAM_FLOAT4 {
+		Napi::Array arr = JS_ARRAY;
 		glGetFloatv(name, fParams);
 		arr.Set(0U, JS_NUM(fParams[0]));
 		arr.Set(1U, JS_NUM(fParams[1]));
 		arr.Set(2U, JS_NUM(fParams[2]));
 		arr.Set(3U, JS_NUM(fParams[3]));
 		RET_VALUE(arr);
-	
-	CASES_PARAM_BOOL4
+	}
+	CASES_PARAM_BOOL4 {
+		Napi::Array arr = JS_ARRAY;
 		glGetBooleanv(name, bParams);
 		arr.Set(0U, JS_BOOL(bParams[0] != 0));
 		arr.Set(1U, JS_BOOL(bParams[1] != 0));
 		arr.Set(2U, JS_BOOL(bParams[2] != 0));
 		arr.Set(3U, JS_BOOL(bParams[3] != 0));
 		RET_VALUE(arr);
-	
+	}
 	CASES_PARAM_INT
 		glGetIntegerv(name, iParams);
 		RET_NUM(iParams[0]);