Implement glDrawEements

Author: codefrau

jasmine-opengl.js

@@ -34,7 +34,7 @@ function GL_Symbol(constant) { return GL_Symbols[constant] || constant; }
 function OpenGL() {
     "use strict";
 
-    var DEBUG = 0; // 0 = off, 1 = some, 2 = lots
+    var DEBUG = 1; // 0 = off, 1 = some, 2 = lots
 
     var identity = new Float32Array([
         1, 0, 0, 0,
@@ -1579,7 +1579,7 @@ function OpenGL() {
             var numLights = (shaderFlags & NUM_LIGHTS_MASK) >> NUM_LIGHTS_SHIFT;
             if (numLights > 0) {
                 if (shaderFlags & HAS_NORMAL) {
-                    src.push("varying vec3 vNormal;");
+                    src.push("attribute vec3 aNormal;");
                 } else {
                     src.push("uniform vec3 uNormal;");
                 }
@@ -1607,7 +1607,7 @@ function OpenGL() {
             src.push("  vec4 position = uModelView * vec4(aPosition, 1.0);");
             if (numLights > 0) {
                 if (shaderFlags & HAS_NORMAL) {
-                    src.push("  vec3 normal = normalize(vNormal);");
+                    src.push("  vec3 normal = normalize(aNormal);");
                 } else {
                     src.push("  vec3 normal = normalize(uNormal);");
                 }

squeak.js

@@ -117,7 +117,7 @@
     "version", {
         // system attributes
         vmVersion: "SqueakJS 1.1.2",
-        vmDate: "2023-12-20",               // Maybe replace at build time?
+        vmDate: "2023-12-22",               // Maybe replace at build time?
         vmBuild: "unknown",                 // or replace at runtime by last-modified?
         vmPath: "unknown",                  // Replace at runtime
         vmFile: "vm.js",
@@ -9788,16 +9788,55 @@
         //   - other ffi* for private methods of this module
         //   - primitiveCalloutToFFI: old callout primitive (not in SqueakFFIPrims)
         ffi_lastError: 0,
+
+        ffiModules: {}, // map library name to module name
+
         ffiDoCallout: function(argCount, extLibFunc, stArgs) {
             this.ffi_lastError = Squeak.FFIErrorGenericError;
-            var modName = extLibFunc.pointers[Squeak.ExtLibFunc_module].bytesAsString();
+            var libName = extLibFunc.pointers[Squeak.ExtLibFunc_module].bytesAsString();
             var funcName = extLibFunc.pointers[Squeak.ExtLibFunc_name].bytesAsString();
+
+            if (!libName) libName = "libc"; // default to libc
+
+            var modName = this.ffiModules[libName];
+            if (modName === undefined) {
+                if (!Squeak.externalModules[libName]) {
+                    var prefixes = ["", "lib"];
+                    var suffixes = ["", ".so",
+                        ".so.9", ".9", ".so.8", ".8", ".so.7", ".7",
+                        ".so.6", ".6", ".so.5", ".5", ".so.4", ".4",
+                        ".so.3", ".3", ".so.2", ".2", ".so.1", ".1"];
+                    loop: for (var p = 0; p < prefixes.length; p++) {
+                        var prefix = prefixes[p];
+                        for (var s = 0; s < suffixes.length; s++) {
+                            var suffix = suffixes[s];
+                            if (Squeak.externalModules[prefix + libName + suffix]) {
+                                modName = prefix + libName + suffix;
+                                break loop;
+                            }
+                            if (prefix && libName.startsWith(prefix) && Squeak.externalModules[libName.slice(prefix.length) + suffix]) {
+                                modName = libName.slice(prefix.length) + suffix;
+                                break loop;
+                            }
+                            if (suffix && libName.endsWith(suffix) && Squeak.externalModules[prefix + libName.slice(0, -suffix.length)]) {
+                                modName = prefix + libName.slice(0, -suffix.length);
+                                break loop;
+                            }
+                        }
+                    }
+                    if (modName) console.log("FFI: found library " + libName + " as module " + modName);
+                    // there still is a chance loadModuleDynamically will find it under libName
+                }
+                if (!modName) modName = libName; // default to libName
+                this.ffiModules[libName] = modName;
+            }
+
             var mod = this.loadedModules[modName];
             if (mod === undefined) { // null if earlier load failed
                 mod = this.loadModule(modName);
                 this.loadedModules[modName] = mod;
                 if (!mod) {
-                    this.vm.warnOnce('FFI: module not found: ' + modName);
+                    this.vm.warnOnce('FFI: library not found: ' + libName);
                 }
             }
             if (!mod) {
@@ -9812,7 +9851,7 @@
             }
             var jsResult;
             if (!(funcName in mod)) {
-                if (this.vm.warnOnce('FFI: function not found: ' + modName + '::' + funcName)) {
+                if (this.vm.warnOnce('FFI: function not found: ' + libName + '::' + funcName)) {
                     console.warn(jsArgs);
                 }
                 if (mod.ffiFunctionNotFoundHandler) {