Skip to content

Commit

Permalink
Merge branch 'gh-pages' into doc-mipmap-of-regl.texture
Browse files Browse the repository at this point in the history
  • Loading branch information
Erkaman authored Jul 23, 2016
2 parents 5f8f134 + b231643 commit a92b63a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion API.md
Original file line number Diff line number Diff line change
Expand Up @@ -1343,7 +1343,7 @@ var starElements = regl.elements({
| Primitive type | Description |
|-------|-------------|
| `'points'` | `gl.POINTS` |
| `'lines'` | gl.LINES` |
| `'lines'` | `gl.LINES` |
| `'line strip'` | `gl.LINE_STRIP` |
| `'line loop` | `gl.LINE_LOOP` |
| `'triangles` | `gl.TRIANGLES` |
Expand Down
1 change: 1 addition & 0 deletions test/texture2d.js
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,7 @@ tape('texture 2d', function (t) {
}, 'float missing')
}

// TODO Test 'mipmapHint'
// TODO test compressed textures
// TODO test half float

Expand Down

0 comments on commit a92b63a

Please sign in to comment.