Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 11:32:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

smol-v: update to 2024 to support SPIR-V 1.6

Browse Source
This commit is contained in:
Stuart Carnie 2024-11-03 07:08:48 +11:00
parent c6c464cf9a
commit dd8582a319
No known key found for this signature in database
GPG Key ID: 848D9C9718D78B4F
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT.txt
View File

@ -432,7 +432,7 @@ License: BSD-3-clause
Files: ./thirdparty/misc/smolv.cpp Files: ./thirdparty/misc/smolv.cpp
./thirdparty/misc/smolv.h ./thirdparty/misc/smolv.h
Comment: SMOL-V Comment: SMOL-V
Copyright: 2016-2020, Aras Pranckevicius Copyright: 2016-2024, Aras Pranckevicius
License: public-domain or Unlicense or Expat License: public-domain or Unlicense or Expat
Files: ./thirdparty/misc/stb_rect_pack.h Files: ./thirdparty/misc/stb_rect_pack.h

2
thirdparty/README.md vendored
View File

@ -709,7 +709,7 @@ Collection of single-file libraries used in Godot components.
* Modifications: use `const char*` instead of `char*` for input string * Modifications: use `const char*` instead of `char*` for input string
- `smolv.{cpp,h}` - `smolv.{cpp,h}`
* Upstream: https://github.com/aras-p/smol-v * Upstream: https://github.com/aras-p/smol-v
* Version: git (4b52c165c13763051a18e80ffbc2ee436314ceb2, 2020) * Version: git (9dd54c379ac29fa148cb1b829bb939ba7381d8f4, 2024)
* License: Public Domain or MIT * License: Public Domain or MIT
- `stb_rect_pack.h` - `stb_rect_pack.h`
* Upstream: https://github.com/nothings/stb * Upstream: https://github.com/nothings/stb

8
thirdparty/misc/smolv.cpp vendored
View File

@ -1,5 +1,5 @@
// smol-v - public domain - https://github.com/aras-p/smol-v // smol-v - public domain - https://github.com/aras-p/smol-v
// authored 2016-2020 by Aras Pranckevicius // authored 2016-2024 by Aras Pranckevicius
// no warranty implied; use at your own risk // no warranty implied; use at your own risk
// See end of file for license information. // See end of file for license information.
@ -1197,8 +1197,8 @@ static bool smolv_CheckGenericHeader(const uint32_t* words, size_t wordCount, ui
if (headerMagic != expectedMagic) if (headerMagic != expectedMagic)
return false; return false;
uint32_t headerVersion = words[1] & versionMask; uint32_t headerVersion = words[1] & versionMask;
if (headerVersion < 0x00010000 || headerVersion > 0x00010500) if (headerVersion < 0x00010000 || headerVersion > 0x00010600)
return false; // only support 1.0 through 1.5 return false; // only support 1.0 through 1.6
return true; return true;
} }
@ -2071,7 +2071,7 @@ void smolv::StatsPrint(const Stats* stats)
// This software is available under 2 licenses -- choose whichever you prefer. // This software is available under 2 licenses -- choose whichever you prefer.
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// ALTERNATIVE A - MIT License // ALTERNATIVE A - MIT License
// Copyright (c) 2016-2020 Aras Pranckevicius // Copyright (c) 2016-2024 Aras Pranckevicius
// Permission is hereby granted, free of charge, to any person obtaining a copy of // Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in // this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to // the Software without restriction, including without limitation the rights to

4
thirdparty/misc/smolv.h vendored
View File

@ -1,5 +1,5 @@
// smol-v - public domain - https://github.com/aras-p/smol-v // smol-v - public domain - https://github.com/aras-p/smol-v
// authored 2016-2020 by Aras Pranckevicius // authored 2016-2024 by Aras Pranckevicius
// no warranty implied; use at your own risk // no warranty implied; use at your own risk
// See end of file for license information. // See end of file for license information.
// //
@ -132,7 +132,7 @@ namespace smolv
// This software is available under 2 licenses -- choose whichever you prefer. // This software is available under 2 licenses -- choose whichever you prefer.
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// ALTERNATIVE A - MIT License // ALTERNATIVE A - MIT License
// Copyright (c) 2016-2020 Aras Pranckevicius // Copyright (c) 2016-2024 Aras Pranckevicius
// Permission is hereby granted, free of charge, to any person obtaining a copy of // Permission is hereby granted, free of charge, to any person obtaining a copy of
// this software and associated documentation files (the "Software"), to deal in // this software and associated documentation files (the "Software"), to deal in
// the Software without restriction, including without limitation the rights to // the Software without restriction, including without limitation the rights to