aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-05-12 17:59:04 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-05-12 17:59:04 -0700
commitc4a559e14fac206aa42d112aee7eb62af4e5df9c (patch)
tree7cb29991bf254526df2e65a72ebad13ebbd94162
parent4ae90dc790fa001008953f7bf062c07a58192dcb (diff)
glGetString
-rw-r--r--src/library_gl.js17
-rw-r--r--src/library_sdl.js4
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)
};