Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
build/

CMakeUserPresets.json

# VS project and working files
*.vcxproj.user
Expand Down
30 changes: 0 additions & 30 deletions .reuse/dep5

This file was deleted.

375 changes: 203 additions & 172 deletions CMakeLists.txt

Large diffs are not rendered by default.

File renamed without changes.
20 changes: 0 additions & 20 deletions LICENSES/Zlib.txt

This file was deleted.

39 changes: 39 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version = 1
SPDX-PackageName = "basis_universal"
SPDX-PackageDownloadLocation = "https://github.com/BinomialLLC/basis_universal"

[[annotations]]
path = "**"
precedence = "aggregate"
SPDX-FileCopyrightText = ["2019-2024 Binomial LLC", "2016 The Android Open Source Project"]
SPDX-License-Identifier = "Apache-2.0"

[[annotations]]
path = "OpenCL/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2008-2020 The Khronos Group Inc."
SPDX-License-Identifier = "Apache-2.0"

[[annotations]]
path = "zstd/**"
precedence = "aggregate"
SPDX-FileCopyrightText = "2016-present Facebook, Inc."
SPDX-License-Identifier = "BSD-3-Clause"

[[annotations]]
path = "encoder/3rdparty/tinyexr.h"
precedence = "aggregate"
SPDX-FileCopyrightText = ["2014 - 2021, Syoyo Fujita and many contributors.", "2002 Industrial Light & Magic, a division of Lucas"]
SPDX-License-Identifier = "BSD-3-Clause"

[[annotations]]
path = "encoder/3rdparty/qoi.h"
precedence = "aggregate"
SPDX-FileCopyrightText = "2021 Dominic Szablewski - https://phoboslab.org"
SPDX-License-Identifier = "MIT"

[[annotations]]
path = "encoder/3rdparty/tinydds.h"
precedence = "aggregate"
SPDX-FileCopyrightText = "2019 DeanoC"
SPDX-License-Identifier = "MIT"
4 changes: 2 additions & 2 deletions basisu_tool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4670,10 +4670,10 @@ static int main_internal(int argc, const char **argv)
opencl_force_serialization = true;
}

#ifndef BASISU_SUPPORT_OPENCL
#if !BASISU_SUPPORT_OPENCL
if (use_opencl)
{
fprintf(stderr, "WARNING: -opencl specified, but OpenCL support was not enabled at compile time! With cmake, use -D OPENCL=1. Falling back to CPU compression.\n");
fprintf(stderr, "WARNING: -opencl specified, but OpenCL support was not enabled at compile time! With cmake, use -D BASISU_OPENCL=1. Falling back to CPU compression.\n");
}
#endif

Expand Down
7 changes: 7 additions & 0 deletions bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

*

!.gitignore
!ocl_kernels.cl
!clean.bat
!readme.txt
5 changes: 5 additions & 0 deletions build/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@

*

!.gitignore
!readme.txt