diff options
| -rw-r--r-- | src/library_gl.js | 17 | ||||
| -rw-r--r-- | src/library_sdl.js | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/src/library_gl.js b/src/library_gl.js index a20611c9..f69d3301 100644 --- a/src/library_gl.js +++ b/src/library_gl.js @@ -1,8 +1,19 @@ mergeInto(Library, { - glGetString: function() {}, + glGetString: function(name_) { + switch(name_) { + case Module.contextGL.VENDOR: + case Module.contextGL.RENDERER: + case Module.contextGL.VERSION: + return Pointer_make(intArrayFromString(Module.contextGL.getParameter(name_)), null, ALLOC_NORMAL); + case 0x1F03: // Extensions + return Pointer_make(intArrayFromString(Module.contextGL.getSupportedExtensions().join(' ')), null, ALLOC_NORMAL); + default: + throw 'Failure: Invalid glGetString value: ' + name_; + } + } - glGenVertexArrays: function() {}, +// glGenVertexArrays: function() {}, - glBindVertexArray: function() {}, +// glBindVertexArray: function() {}, }); diff --git a/src/library_sdl.js b/src/library_sdl.js index 525a04d2..310ff68c 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -1,5 +1,5 @@ // To use emscripten's SDL library here, you need to define -// Module.canvas and Module.context. +// Module.canvas and at least one of Module.context2D, Module.contextGL. mergeInto(Library, { SDL_INFO: { @@ -40,7 +40,7 @@ mergeInto(Library, { width: width, height: height, canvas: Module.canvas, - context: Module.context, + context: Module.context2D, surf: surf, buffer: _malloc(width*height*4) }; |