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.

Sign up for GitHub

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

Add feature for basis u compilation with SSE 4.1 on supported platforms #14

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Add feature for basis u compilation with SSE 4.1 on supported platforms #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
38f0110
Updateted to latetest upstream.
julhe May 1, 2023
be76b82
Updated to most recent up-stream (1.16.x)
julhe May 1, 2023
ce2cbbb
Bumped version to 0.3.0
julhe May 1, 2023
4ce8f17
Merge branch 'aclysma:master' into master
julhe May 7, 2023
2e14eb9
+ Compile with SSE 4.1 on supported platforms.
julhe May 20, 2023
92d554d
Version bump to 0.3.1
julhe May 20, 2023
8ed56d8
Exposed SEE 4.1 as a regular feature.
julhe May 30, 2023
29863c0
ran cargo fmt --all
julhe May 30, 2023
bf7a47b
Revert "ran cargo fmt --all"
julhe May 30, 2023
8364e76
cargo fmt --all
julhe May 30, 2023
857353f
Fixed build.rs
julhe May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion basis-universal-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "basis-universal-sys"
version = "0.3.0"
version = "0.3.1"
authors = ["Philip Degarmo <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand All @@ -16,3 +16,6 @@ exclude = ["vendor/basis_universal/test_files", "vendor/basis_universal/webgl",

[build-dependencies]
cc = "1.0"

[features]
hint_sse4_1 = []
13 changes: 12 additions & 1 deletion basis-universal-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,21 @@ fn build_with_common_settings() -> cc::Build {
}

fn main() {
// Only allow the SSE flag if we compile for x86/x86_64
// See: https://github.com/aclysma/basis-universal-rs/pull/14#discussion_r1200978360
let build_with_sse4_1 = cfg!(feature = "hint_sse4_1")
&& std::env::var("CARGO_CFG_TARGET_ARCH")
.expect("Cargo didn't set the CARGO_CFG_TARGET_ARCH env var")
.split(',')
.any(|arch| arch == "x86_64" || arch == "x86");

build_with_common_settings()
.cpp(true)
.define("BASISD_SUPPORT_KTX2_ZSTD", "0")
//.define("BASISU_SUPPORT_SSE", "1") TODO: expose this in a futher release
.define(
"BASISU_SUPPORT_SSE",
if build_with_sse4_1 { "1" } else { "0" },
)
.flag_if_supported("--std=c++11")
.file("vendor/basis_universal/encoder/pvpngreader.cpp")
.file("vendor/basis_universal/encoder/jpgd.cpp")
Expand Down
7 changes: 5 additions & 2 deletions basis-universal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "basis-universal"
version = "0.3.0"
version = "0.3.1"
authors = ["Philip Degarmo <[email protected]>"]
edition = "2018"
license = "MIT OR Apache-2.0"
Expand All @@ -12,10 +12,13 @@ keywords = ["game", "basis-universal", "texture", "compression", "gpu"]
categories = ["game-development", "graphics", "api-bindings", "compression", "encoding"]

[dependencies]
basis-universal-sys = { version = "0.3.0", path = "../basis-universal-sys" }
basis-universal-sys = { version = "0.3.1", path = "../basis-universal-sys" }
lazy_static = "1.4.0"
bitflags = "1.2.1"

[dev-dependencies]
image = "0.23.13"
lz4 = "1.23"

[features]
hint_sse4_1 = ["basis-universal-sys/hint_sse4_1"]