Skip to content

Commit 0a2a259

Browse files
committed
Merge pull request godotengine#98771 from stuartcarnie/update_smolv
smol-v: update to 2024 to support SPIR-V 1.6
2 parents edc60c6 + dd8582a commit 0a2a259

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

COPYRIGHT.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ License: BSD-3-clause
432432
Files: ./thirdparty/misc/smolv.cpp
433433
./thirdparty/misc/smolv.h
434434
Comment: SMOL-V
435-
Copyright: 2016-2020, Aras Pranckevicius
435+
Copyright: 2016-2024, Aras Pranckevicius
436436
License: public-domain or Unlicense or Expat
437437

438438
Files: ./thirdparty/misc/stb_rect_pack.h

thirdparty/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ Collection of single-file libraries used in Godot components.
709709
* Modifications: use `const char*` instead of `char*` for input string
710710
- `smolv.{cpp,h}`
711711
* Upstream: https://github.com/aras-p/smol-v
712-
* Version: git (4b52c165c13763051a18e80ffbc2ee436314ceb2, 2020)
712+
* Version: git (9dd54c379ac29fa148cb1b829bb939ba7381d8f4, 2024)
713713
* License: Public Domain or MIT
714714
- `stb_rect_pack.h`
715715
* Upstream: https://github.com/nothings/stb

thirdparty/misc/smolv.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// smol-v - public domain - https://github.com/aras-p/smol-v
2-
// authored 2016-2020 by Aras Pranckevicius
2+
// authored 2016-2024 by Aras Pranckevicius
33
// no warranty implied; use at your own risk
44
// See end of file for license information.
55

@@ -1197,8 +1197,8 @@ static bool smolv_CheckGenericHeader(const uint32_t* words, size_t wordCount, ui
11971197
if (headerMagic != expectedMagic)
11981198
return false;
11991199
uint32_t headerVersion = words[1] & versionMask;
1200-
if (headerVersion < 0x00010000 || headerVersion > 0x00010500)
1201-
return false; // only support 1.0 through 1.5
1200+
if (headerVersion < 0x00010000 || headerVersion > 0x00010600)
1201+
return false; // only support 1.0 through 1.6
12021202

12031203
return true;
12041204
}
@@ -2071,7 +2071,7 @@ void smolv::StatsPrint(const Stats* stats)
20712071
// This software is available under 2 licenses -- choose whichever you prefer.
20722072
// ------------------------------------------------------------------------------
20732073
// ALTERNATIVE A - MIT License
2074-
// Copyright (c) 2016-2020 Aras Pranckevicius
2074+
// Copyright (c) 2016-2024 Aras Pranckevicius
20752075
// Permission is hereby granted, free of charge, to any person obtaining a copy of
20762076
// this software and associated documentation files (the "Software"), to deal in
20772077
// the Software without restriction, including without limitation the rights to

thirdparty/misc/smolv.h

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

0 commit comments

Comments
 (0)