From 427e0af73c6606fb726c88b48f5531b7832eb970 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Wed, 3 Mar 2021 23:40:47 +0000 Subject: [PATCH] Reverted to repr_c vek --- voxygen/anim/src/vek.rs | 8 ++++---- voxygen/src/render/renderer.rs | 2 +- voxygen/src/scene/math.rs | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/voxygen/anim/src/vek.rs b/voxygen/anim/src/vek.rs index ee9bda3c45..e12d02e73e 100644 --- a/voxygen/anim/src/vek.rs +++ b/voxygen/anim/src/vek.rs @@ -1,8 +1,8 @@ -pub use ::vek::{ +/*pub use ::vek::{ bezier::repr_simd::*, geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, quaternion::repr_simd::*, transform::repr_simd::*, transition::*, vec::repr_simd::*, -}; -/* pub use ::vek::{ +};*/ +pub use ::vek::{ bezier::repr_c::*, geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, quaternion::repr_c::*, transform::repr_c::*, transition::*, vec::repr_c::*, -}; */ +}; diff --git a/voxygen/src/render/renderer.rs b/voxygen/src/render/renderer.rs index 15ffdb7761..f1ae11e340 100644 --- a/voxygen/src/render/renderer.rs +++ b/voxygen/src/render/renderer.rs @@ -1015,7 +1015,7 @@ impl Renderer { /// NOTE: Apparently Macs aren't the only machines that lie. /// /// TODO: Find a way to let graphics cards that don't lie do better. - const MAX_TEXTURE_SIZE_MAX: u16 = 8192 << 1; + const MAX_TEXTURE_SIZE_MAX: u16 = 8192; // NOTE: Many APIs for textures require coordinates to fit in u16, which is why // we perform this conversion. u16::try_from(factory.get_capabilities().max_texture_size) diff --git a/voxygen/src/scene/math.rs b/voxygen/src/scene/math.rs index f228b33ebe..53ac8371ca 100644 --- a/voxygen/src/scene/math.rs +++ b/voxygen/src/scene/math.rs @@ -1,8 +1,8 @@ use core::{iter, mem}; use hashbrown::HashMap; use num::traits::Float; -pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*}; -//pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*}; +//pub use vek::{geom::repr_simd::*, mat::repr_simd::column_major::Mat4, ops::*, vec::repr_simd::*}; +pub use vek::{geom::repr_c::*, mat::repr_c::column_major::Mat4, ops::*, vec::repr_c::*}; pub fn aabb_to_points(bounds: Aabb) -> [Vec3; 8] { [