aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-01-19 16:31:47 -0800
committerAlon Zakai <alonzakai@gmail.com>2013-01-19 16:31:47 -0800
commit1223a5423d608d5dcf0e2f5b0445b4a7280bc450 (patch)
tree9fcadb629ec66dc4bf8a17fc00cd18553b7d14b7 /src
parente809edad676e1cf4d93e624b39bbaca80318cbf6 (diff)
support glBegin on GL_POINTS; fixes #793
Diffstat (limited to 'src')
-rw-r--r--src/library_gl.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library_gl.js b/src/library_gl.js
index 2a6ec92f..f68ce065 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -1393,7 +1393,7 @@ var LibraryGL = {
tempData: null,
indexData: null,
vertexCounter: 0,
- mode: 0,
+ mode: -1,
rendererCache: null,
rendererCacheItemTemplate: [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null], // 16 nulls
@@ -1896,7 +1896,7 @@ var LibraryGL = {
GL.immediate.lastVertex = first + count;
}
GL.immediate.flush(null, first);
- GL.immediate.mode = 0;
+ GL.immediate.mode = -1;
};
_glDrawElements = function(mode, count, type, indices, start, end) { // start, end are given if we come from glDrawRangeElements
@@ -1915,7 +1915,7 @@ var LibraryGL = {
GL.immediate.vertexData = {{{ makeHEAPView('F32', 'GL.immediate.vertexPointer', '(end ? GL.immediate.vertexPointer + (end+1)*GL.immediate.stride : TOTAL_MEMORY)') }}}; // XXX assuming float
}
GL.immediate.flush(count, 0, indices);
- GL.immediate.mode = 0;
+ GL.immediate.mode = -1;
};
},
@@ -2060,12 +2060,12 @@ var LibraryGL = {
GL.immediate.lastVertex = GL.immediate.vertexCounter / (GL.immediate.stride >> 2);
GL.immediate.flush();
GL.immediate.disableBeginEndClientAttributes();
- GL.immediate.mode = 0;
+ GL.immediate.mode = -1;
},
glVertex3f: function(x, y, z) {
#if ASSERTIONS
- assert(GL.immediate.mode); // must be in begin/end
+ assert(GL.immediate.mode >= 0); // must be in begin/end
#endif
GL.immediate.vertexData[GL.immediate.vertexCounter++] = x;
GL.immediate.vertexData[GL.immediate.vertexCounter++] = y;
@@ -2088,7 +2088,7 @@ var LibraryGL = {
glTexCoord2i: function(u, v) {
#if ASSERTIONS
- assert(GL.immediate.mode); // must be in begin/end
+ assert(GL.immediate.mode >= 0); // must be in begin/end
#endif
GL.immediate.vertexData[GL.immediate.vertexCounter++] = u;
GL.immediate.vertexData[GL.immediate.vertexCounter++] = v;