Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove direct dependence on nightly features #213

Merged
merged 2 commits into from Mar 1, 2016
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -34,7 +34,7 @@ git = "https://github.com/ecoal95/rust-offscreen-rendering-context"
[dependencies]
gleam = "0.2"
euclid = {version = "0.6.2", features = ["plugins"]}
num = {version = "0.1.24", default-features = false}
num = {version = "0.1.31", default-features = false}
time = "0.1"
fnv="1.0"
scoped_threadpool = "0.1.6"
@@ -432,16 +432,17 @@ impl RasterBatch {
origin.y as f32),
Size2D::new(dest_rect.size.width as f32,
dest_rect.size.height as f32)));

for i in (0..vertices.len()).step_by(4) {
let index_offset = self.vertices.len();
let mut i = 0;
let index_offset = self.vertices.len();
while i < index_offset {
let index_base = (index_offset + i) as u16;
self.indices.push(index_base + 0);
self.indices.push(index_base + 1);
self.indices.push(index_base + 2);
self.indices.push(index_base + 2);
self.indices.push(index_base + 3);
self.indices.push(index_base + 1);
i += 4;
}

self.vertices.extend_from_slice(&vertices);
@@ -2,7 +2,6 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

#![feature(step_by, zero_one)]
//#![feature(mpsc_select)]

#[macro_use]
@@ -4,7 +4,7 @@

use euclid::{Matrix4, Point2D, Rect, Size2D};
use internal_types::{RectColors};
use std::num::Zero;
use num::Zero;
use time::precise_time_ns;
use webrender_traits::ColorF;

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.