diff --git a/LICENSE.md b/LICENSE.md index c56ac9a83..30d9728de 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,28 +1,20 @@ -License {#license} -======= +License and Attribution Notices {#license} +======================= -LibKTX contains code +----------------- -* © 2010 & © 2013 The Khronos Group Inc. -* © 2008 and © 2010 HI Corporation -* © 2005 Ericsson AB -* © 2003-2010, Troy D. Hanson -* © 2015-2018 Mark Callow -* © 2016 Oculus VR, LLC. +This file has two names: LICENSE.md and NOTICE.md. The former to tell GiHub users this +is the license. The latter to tell creators of derived works that they need to distribute this +with or make it available in a display generated by any Derivative Works, except for any +parts that do not pertain to the Derivative Work, in accordance with clause 4d of the +Apache 2.0 license, i.e. this is the "NOTICE" file. -The KTX load tests contain code +----------------- -* © 2013 The Khronos Group Inc. -* © 2008 and © 2010 HI Corporation -* © 1997-2014 Sam Lantinga -* © 2016 Sascha Willems -* © 2015-2018 Mark Callow - -Default License ---------------- +## Default License With the exception of the files listed explicitly below, the source -files are made available the Apache License, Version 2.0 (the "License"); +is made available under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License. You may obtain a copy of the License at @@ -34,14 +26,35 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +libKTX is the work of Mark Callow based on work by Georg Kolling, Jacob +Ström, Troy Hanson and Johannes van Waveren. The source contains +code + + © 2010 & © 2013 The Khronos Group Inc. + © 2008 and © 2010 HI Corporation + © 2005 Ericsson AB + © 2003-2010, Troy D. Hanson + © 2015-2018 Mark Callow + © 2016 Oculus VR, LLC. + +The KTX load tests are the work of Mark Callow with a few small portions taken from +Sascha Willems' Vulkan examples and use Sam Lantinga's libSDL for portability. The +source contains code + + © 2013 The Khronos Group Inc. + © 2008 and © 2010 HI Corporation + © 1997-2018 Sam Lantinga + © 2016 Sascha Willems + © 2015-2018 Mark Callow + ----------------- **IMPORTANT:** Due to GitHub Markdown limitations license text has been copied into this file from the files named below. In the event of a discrepancy, the licenses in the files shall be deemed correct. -etcdec.cxx ----------- +## libktx Exceptions +### etcdec.cxx etcdec.cxx is made available under the terms and conditions of the following License Agreement. @@ -154,18 +167,7 @@ dispute, controversy or claim arising out of or in connection with this SLA, or the breach, termination or invalidity thereof, shall be submitted to the exclusive jurisdiction of the Swedish Courts. - -hi_mark{,_sq}.ktx ------------------ - -The HI logo textures are © & ™ HI Corporation and are -provided for use only in testing the KTX loader. Any other use requires -specific prior written permission from HI. Furthermore the name HI may -not be used to endorse or promote products derived from this software -without specific prior written permission. - -uthash.h --------- +### uthash.h uthash.h is made available under the following revised BSD license. @@ -190,22 +192,37 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -include/SDL2/* --------------- +## Load Tests Exceptions + +### icons/{ios/CommonIcons*,mac,win}/ktx_{app,document}.* + +These KTX application and document icons are © & ™ The Khronos Group, Inc. +and may not be used without specific prior written permission from The Khronos Group, +except that the ktx_app icon may be distributed in a Derived Work as the icon for +the `glloadtests` and `vkloadtests` applications. + +### other_include/SDL2/* These files are part of the SDL2 source distributed by the [SDL project] (http://libsdl.org) under the terms of the [zlib license] (http://www.zlib.net/zlib_license.html). -{VulkanMeshLoader,vulkantextoverlay}.hpp, vulkandebug.* -------------------------------------------------------- +### other_include/glm + +OpenGL Mathematics is licensed under the [Happy Bunny (Modified MIT) License](https://github.com/g-truc/glm/blob/master/manual.md#section0) + +### testimages/hi_mark{,_sq}.ktx + +The HI logo textures are © & ™ HI Corporation and are +provided for use only in testing the KTX loader. Any other use requires +specific prior written permission from HI. Furthermore the name HI may +not be used to endorse or promote products derived from this software +without specific prior written permission. + +### {VulkanMeshLoader,vulkantextoverlay}.hpp, vulkandebug.* Copyright © 2016 Sascha Willems - www.saschawillems.de {VulkanMeshLoader,vulkantextoverlay}.hpp and vulkandebug.* are licensed under the [MIT license](http://opensource.org/licenses/MIT) -OpenGL Mathematics (GLM) ------------------------------------ - -OpenGL Mathematics is licensed under the [Happy Bunny (Modified MIT) License](https://github.com/g-truc/glm/blob/master/manual.md#section0) diff --git a/NOTICE.md b/NOTICE.md new file mode 120000 index 000000000..f0c429863 --- /dev/null +++ b/NOTICE.md @@ -0,0 +1 @@ +LICENSE.md \ No newline at end of file diff --git a/include/ktxvulkan.h b/include/ktxvulkan.h index 7431ddda4..a1806781c 100644 --- a/include/ktxvulkan.h +++ b/include/ktxvulkan.h @@ -4,6 +4,22 @@ #ifndef KTX_H_C54B42AEE39611E68E1E4FF8C51D1C66 #define KTX_H_C54B42AEE39611E68E1E4FF8C51D1C66 +/* + * ©2017 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file diff --git a/lib/checkheader.c b/lib/checkheader.c index b9d5530d3..8bfba1038 100644 --- a/lib/checkheader.c +++ b/lib/checkheader.c @@ -3,6 +3,22 @@ /* $Id$ */ +/* + * ©2010-2018 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file checkheader.c @@ -13,35 +29,6 @@ * @author Mark Callow, HI Corporation */ -/* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - /* * Author: Georg Kolling, Imagination Technology with modifications * by Mark Callow, HI Corporation. diff --git a/lib/errstr.c b/lib/errstr.c index ab46f929e..11f526c25 100644 --- a/lib/errstr.c +++ b/lib/errstr.c @@ -3,6 +3,22 @@ /* $Id$ */ +/* + * ©2010-2018 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @file errstr.c * @~English @@ -12,35 +28,6 @@ * @author Mark Callow, HI Corporation */ -/* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include "ktx.h" static const char* const errorStrings[] = { diff --git a/lib/etcunpack.cxx b/lib/etcunpack.cxx index bfdee04e2..9f360063f 100644 --- a/lib/etcunpack.cxx +++ b/lib/etcunpack.cxx @@ -3,6 +3,22 @@ /* $Id$ */ +/* + * ©2010 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /* @internal * @~English * @file @@ -12,35 +28,6 @@ * @author Mark Callow, HI Corporation. */ -/* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include #include diff --git a/lib/filestream.c b/lib/filestream.c index 474c5ab16..2b72af45e 100644 --- a/lib/filestream.c +++ b/lib/filestream.c @@ -1,6 +1,22 @@ /* -*- tab-width: 4; -*- */ /* vi: set sw=2 ts=4 expandtab: */ +/* + * ©2010-2018 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @file * @~English @@ -12,35 +28,6 @@ * @author Mark Callow, HI Corporation */ -/* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group". - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include #include #include diff --git a/lib/filestream.h b/lib/filestream.h index 84f52ce1f..3359cb24a 100644 --- a/lib/filestream.h +++ b/lib/filestream.h @@ -2,33 +2,20 @@ /* vi: set sw=2 ts=4 expandtab: */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group". - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * ©2010-2018 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* * Author: Maksim Kolesin from original code diff --git a/lib/gl_funcptrs.h b/lib/gl_funcptrs.h index 1521c0610..c29f4818e 100644 --- a/lib/gl_funcptrs.h +++ b/lib/gl_funcptrs.h @@ -4,33 +4,20 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * ©2010-2017 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* * Author: Mark Callow based on code from Georg Kolling diff --git a/lib/gles1_funcptrs.h b/lib/gles1_funcptrs.h index d08674f26..a9dea3dfe 100644 --- a/lib/gles1_funcptrs.h +++ b/lib/gles1_funcptrs.h @@ -4,33 +4,20 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * ©2010-2017 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* * Author: Mark Callow based on code from Georg Kolling diff --git a/lib/gles2_funcptrs.h b/lib/gles2_funcptrs.h index 11fbde71a..7a8a23fc3 100644 --- a/lib/gles2_funcptrs.h +++ b/lib/gles2_funcptrs.h @@ -4,33 +4,20 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * ©2010-2017 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* * Author: Mark Callow based on code from Georg Kolling diff --git a/lib/gles3_funcptrs.h b/lib/gles3_funcptrs.h index 711c0b8ed..81315679d 100644 --- a/lib/gles3_funcptrs.h +++ b/lib/gles3_funcptrs.h @@ -4,33 +4,20 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * ©2010-2017 The khronos Group, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ /* * Author: Mark Callow based on code from Georg Kolling diff --git a/lib/hashlist.c b/lib/hashlist.c index 59081a1f9..06c75e09a 100644 --- a/lib/hashlist.c +++ b/lib/hashlist.c @@ -1,19 +1,8 @@ /* -*- tab-width: 4; -*- */ /* vi: set sw=2 ts=4 expandtab: */ -/** - * @internal - * @file hashlist.c - * @~English - * - * @brief Functions for creating and using a hash list of key-value - * pairs. - * - * @author Mark Callow, HI Corporation - */ - /* - * Copyright (c) 2010 The Khronos Group Inc. + * Copyright (c) 2010-2018 The Khronos Group Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +17,17 @@ * limitations under the License. */ +/** + * @internal + * @file hashlist.c + * @~English + * + * @brief Functions for creating and using a hash list of key-value + * pairs. + * + * @author Mark Callow, HI Corporation + */ + #include #include #include diff --git a/lib/ktxint.h b/lib/ktxint.h index d87b3a1ef..4b7cd073a 100644 --- a/lib/ktxint.h +++ b/lib/ktxint.h @@ -4,33 +4,21 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. + * Copyright (c) 2010-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ /* * Author: Mark Callow from original code by Georg Kolling diff --git a/lib/memstream.c b/lib/memstream.c index f30ec2958..2cbaa3b17 100644 --- a/lib/memstream.c +++ b/lib/memstream.c @@ -1,7 +1,24 @@ /* -*- tab-width: 4; -*- */ /* vi: set sw=2 ts=4 expandtab: */ +/* + * Copyright (c) 2010-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** + * @internal * @file * @~English * @@ -12,35 +29,6 @@ * @author Mark Callow, HI Corporation */ -/* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group". - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include #include #include diff --git a/lib/memstream.h b/lib/memstream.h index fb0c94b7f..3cd4e03f7 100644 --- a/lib/memstream.h +++ b/lib/memstream.h @@ -2,37 +2,31 @@ /* vi: set sw=2 ts=4 expandtab: */ /* -Copyright (c) 2010 The Khronos Group Inc. + * Copyright (c) 2010-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group". - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* - * Author: Maksim Kolesin from original code - * by Mark Callow and Georg Kolling +/** + * @internal + * @file + * @~English + * + * @brief Interface of ktxStream for memory. + * + * @author Maksim Kolesin + * @author Georg Kolling, Imagination Technology + * @author Mark Callow, HI Corporation */ #ifndef MEMSTREAM_H diff --git a/lib/stream.h b/lib/stream.h index c0a0a0b00..fa5152bfa 100644 --- a/lib/stream.h +++ b/lib/stream.h @@ -2,37 +2,31 @@ /* vi: set sw=2 ts=4 expandtab: */ /* -Copyright (c) 2010 The Khronos Group Inc. + * Copyright (c) 2010-2018 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group". - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* - * Author: Maksim Kolesin from original code - * by Mark Callow and Georg Kolling +/** + * @internal + * @file + * @~English + * + * @brief Interface of ktxStream. + * + * @author Maksim Kolesin + * @author Georg Kolling, Imagination Technology + * @author Mark Callow, HI Corporation */ #ifndef KTXSTREAM_H diff --git a/lib/swap.c b/lib/swap.c index 61d17fdbb..d858975c6 100644 --- a/lib/swap.c +++ b/lib/swap.c @@ -4,33 +4,20 @@ /* $Id$ */ /* -Copyright (c) 2010 The Khronos Group Inc. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of the Khronos Group." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ + * Copyright (c) 2010 The Khronos Group Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #include "KHR/khrplatform.h" diff --git a/lib/writer_v1.c b/lib/writer_v1.c index 0f85d45a7..b5af30a90 100644 --- a/lib/writer_v1.c +++ b/lib/writer_v1.c @@ -3,6 +3,22 @@ /* $Id$ */ +/* + * ©2010-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file writer.c @@ -18,22 +34,6 @@ * @author Mark Callow, when at HI Corporation */ -/* - * ©2010 - 2018 Mark Callow. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - #ifdef _WIN32 #define _CRT_SECURE_NO_WARNINGS #endif diff --git a/tests/loadtests/appfwSDL/AppBaseSDL.cpp b/tests/loadtests/appfwSDL/AppBaseSDL.cpp index 879721d0b..a47af9c71 100644 --- a/tests/loadtests/appfwSDL/AppBaseSDL.cpp +++ b/tests/loadtests/appfwSDL/AppBaseSDL.cpp @@ -3,6 +3,22 @@ /* $Id: f63e0a9e6eed51ed84a8eea1eff0708c8a6af22b $ */ +/* + * ©2015-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file AppBaseSDL.cpp @@ -10,37 +26,10 @@ * * @brief Base class for SDL applications. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ -/* -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of Mark Callow." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include "AppBaseSDL.h" #include #include diff --git a/tests/loadtests/appfwSDL/AppBaseSDL.h b/tests/loadtests/appfwSDL/AppBaseSDL.h index 23e230aa1..bc22c1d22 100644 --- a/tests/loadtests/appfwSDL/AppBaseSDL.h +++ b/tests/loadtests/appfwSDL/AppBaseSDL.h @@ -6,6 +6,22 @@ /* $Id: f63e0a9e6eed51ed84a8eea1eff0708c8a6af22b $ */ +/* + * ©2015-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file AppBaseSDL.h @@ -13,37 +29,10 @@ * * @brief Declarations for App framework using SDL. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ -/* -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of Mark Callow." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include #include diff --git a/tests/loadtests/appfwSDL/GLAppSDL.cpp b/tests/loadtests/appfwSDL/GLAppSDL.cpp index c797b9b47..af9d61844 100644 --- a/tests/loadtests/appfwSDL/GLAppSDL.cpp +++ b/tests/loadtests/appfwSDL/GLAppSDL.cpp @@ -3,6 +3,22 @@ /* $Id: ac63511da134f2c25a9e1da86a36bc27b6198ae3 $ */ +/* + * ©2015-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file GLAppSDLGL.cpp @@ -10,35 +26,8 @@ * * @brief GLAppSDL app class. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. - */ - -/* - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. - * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ #if defined(_WIN32) diff --git a/tests/loadtests/appfwSDL/GLAppSDL.h b/tests/loadtests/appfwSDL/GLAppSDL.h index 5bc3c2b4e..2d767a973 100644 --- a/tests/loadtests/appfwSDL/GLAppSDL.h +++ b/tests/loadtests/appfwSDL/GLAppSDL.h @@ -6,6 +6,22 @@ /* $Id: ac63511da134f2c25a9e1da86a36bc27b6198ae3 $ */ +/* + * ©2015-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file GLAppSDL.h @@ -13,38 +29,10 @@ * * @brief Declaration of GLAppSDL base class for GL apps. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ -/* - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. - * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - */ - - #include "AppBaseSDL.h" diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.cpp b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.cpp index 26c42aee2..5714b0086 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.cpp +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.h b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.h index 6c24b6218..a9e98b984 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.h +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanAppSDL.h @@ -5,32 +5,19 @@ #define VULKAN_APP_SDL_H_1456211188 /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.cpp b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.cpp index 2cec1a8c0..6838983b7 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.cpp +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.cpp @@ -2,34 +2,22 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + /** * @internal * @class VulkanContext diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.h b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.h index 704543f45..f6215bb3e 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.h +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanContext.h @@ -5,32 +5,19 @@ #define VULKAN_TEXTURE_H_229895365400979164311947449304284143508 /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.cpp b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.cpp index 2e66a1819..3c1534ddb 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.cpp +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.h b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.h index 5a6787887..f4379656a 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.h +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/VulkanSwapchain.h @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #pragma once diff --git a/tests/loadtests/appfwSDL/VulkanAppSDL/vulkancheckres.h b/tests/loadtests/appfwSDL/VulkanAppSDL/vulkancheckres.h index 94d43b48b..0ec799cb4 100644 --- a/tests/loadtests/appfwSDL/VulkanAppSDL/vulkancheckres.h +++ b/tests/loadtests/appfwSDL/VulkanAppSDL/vulkancheckres.h @@ -5,32 +5,19 @@ #define VULKAN_CHECK_RES_H_1456211188 /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017-2018 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/appfwSDL/main.cpp b/tests/loadtests/appfwSDL/main.cpp index 01bcef1f4..d9b360bfc 100644 --- a/tests/loadtests/appfwSDL/main.cpp +++ b/tests/loadtests/appfwSDL/main.cpp @@ -3,6 +3,22 @@ /* $Id: f63e0a9e6eed51ed84a8eea1eff0708c8a6af22b $ */ +/* + * ©2015-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file main.c @@ -10,37 +26,10 @@ * * @brief main() function for SDL app framework. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ -/* -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -unaltered in all copies or substantial portions of the Materials. -Any additions, deletions, or changes to the original source files -must be clearly indicated in accompanying documentation. - -If only executable code is distributed, then the accompanying -documentation must state that "this software is based in part on the -work of Mark Callow." - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - #include #include "AppBaseSDL.h" #if defined(EMSCRIPTEN) diff --git a/tests/loadtests/glloadtests/GLLoadTests.cpp b/tests/loadtests/glloadtests/GLLoadTests.cpp index c996f2900..19d082ade 100644 --- a/tests/loadtests/glloadtests/GLLoadTests.cpp +++ b/tests/loadtests/glloadtests/GLLoadTests.cpp @@ -2,7 +2,7 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * ©2015 - 2018 Mark Callow, . + * ©2015-2018 Mark Callow. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ * * @brief Implementation of app for running a set of OpenGL load tests. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ #include diff --git a/tests/loadtests/glloadtests/GLLoadTests.h b/tests/loadtests/glloadtests/GLLoadTests.h index 1db48a50d..1b32cddf5 100644 --- a/tests/loadtests/glloadtests/GLLoadTests.h +++ b/tests/loadtests/glloadtests/GLLoadTests.h @@ -5,7 +5,7 @@ #define GL_LOAD_TESTS_H /* - * ©2015 - 2018 Mark Callow, . + * ©2015-2018 Mark Callow. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,8 +27,8 @@ * * @brief Definition of app for running a set of OpenGL load tests. * - * @author Mark Callow - * @copyright (c) 2015, Mark Callow. + * @author Mark Callow, www.edgewise-consulting.com + * @copyright © 2015-2018, Mark Callow. */ #include diff --git a/tests/loadtests/glloadtests/shader-based/shaders.cpp b/tests/loadtests/glloadtests/shader-based/shaders.cpp index 9ad78a113..4cd7f60d4 100644 --- a/tests/loadtests/glloadtests/shader-based/shaders.cpp +++ b/tests/loadtests/glloadtests/shader-based/shaders.cpp @@ -21,7 +21,7 @@ * @file shaders.c * @brief Shaders used by the DrawTexture and TexturedCube samples. * - * @author Mark Callow + * @author Mark Callow, www.edgewise-consulting.com */ #include "GL/glcorearb.h" diff --git a/tests/loadtests/utils/argparser.h b/tests/loadtests/utils/argparser.h index cc762f5bc..83178346d 100644 --- a/tests/loadtests/utils/argparser.h +++ b/tests/loadtests/utils/argparser.h @@ -5,32 +5,19 @@ #define ARGPARSER_H /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/vkloadtests/Texture.cpp b/tests/loadtests/vkloadtests/Texture.cpp index 09d0fa49c..96071dc28 100644 --- a/tests/loadtests/vkloadtests/Texture.cpp +++ b/tests/loadtests/vkloadtests/Texture.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab : */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/Texture.h b/tests/loadtests/vkloadtests/Texture.h index f6055979d..732adb53e 100644 --- a/tests/loadtests/vkloadtests/Texture.h +++ b/tests/loadtests/vkloadtests/Texture.h @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/vkloadtests/TextureArray.cpp b/tests/loadtests/vkloadtests/TextureArray.cpp index 20a8a288c..8f1d6f715 100644 --- a/tests/loadtests/vkloadtests/TextureArray.cpp +++ b/tests/loadtests/vkloadtests/TextureArray.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/TextureArray.h b/tests/loadtests/vkloadtests/TextureArray.h index 6d260869f..cb6b74476 100644 --- a/tests/loadtests/vkloadtests/TextureArray.h +++ b/tests/loadtests/vkloadtests/TextureArray.h @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/vkloadtests/TextureCubemap.cpp b/tests/loadtests/vkloadtests/TextureCubemap.cpp index b71ecdbb0..4dc36662c 100644 --- a/tests/loadtests/vkloadtests/TextureCubemap.cpp +++ b/tests/loadtests/vkloadtests/TextureCubemap.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/TextureCubemap.h b/tests/loadtests/vkloadtests/TextureCubemap.h index 378a1fd57..2e86fdcba 100644 --- a/tests/loadtests/vkloadtests/TextureCubemap.h +++ b/tests/loadtests/vkloadtests/TextureCubemap.h @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include diff --git a/tests/loadtests/vkloadtests/TexturedCube.cpp b/tests/loadtests/vkloadtests/TexturedCube.cpp index fe5cbd2da..c69bd3089 100644 --- a/tests/loadtests/vkloadtests/TexturedCube.cpp +++ b/tests/loadtests/vkloadtests/TexturedCube.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/TexturedCube.h b/tests/loadtests/vkloadtests/TexturedCube.h index fffb4c1cf..a9d525e4d 100644 --- a/tests/loadtests/vkloadtests/TexturedCube.h +++ b/tests/loadtests/vkloadtests/TexturedCube.h @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef TEXTURED_CUBE_H diff --git a/tests/loadtests/vkloadtests/VulkanLoadTestSample.cpp b/tests/loadtests/vkloadtests/VulkanLoadTestSample.cpp index ce2a16d21..26244037a 100644 --- a/tests/loadtests/vkloadtests/VulkanLoadTestSample.cpp +++ b/tests/loadtests/vkloadtests/VulkanLoadTestSample.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/VulkanLoadTestSample.h b/tests/loadtests/vkloadtests/VulkanLoadTestSample.h index 839c6fc3f..c68501b23 100644 --- a/tests/loadtests/vkloadtests/VulkanLoadTestSample.h +++ b/tests/loadtests/vkloadtests/VulkanLoadTestSample.h @@ -5,32 +5,19 @@ #define VULKAN_LOAD_TEST_SAMPLE_H /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #define GLM_FORCE_DEPTH_ZERO_TO_ONE diff --git a/tests/loadtests/vkloadtests/VulkanLoadTests.cpp b/tests/loadtests/vkloadtests/VulkanLoadTests.cpp index 7b3af4ce6..b6b754133 100644 --- a/tests/loadtests/vkloadtests/VulkanLoadTests.cpp +++ b/tests/loadtests/vkloadtests/VulkanLoadTests.cpp @@ -2,32 +2,19 @@ /* vi: set sw=2 ts=4 expandtab: */ /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ /** diff --git a/tests/loadtests/vkloadtests/VulkanLoadTests.h b/tests/loadtests/vkloadtests/VulkanLoadTests.h index 250d6a1c3..48c8beb78 100644 --- a/tests/loadtests/vkloadtests/VulkanLoadTests.h +++ b/tests/loadtests/vkloadtests/VulkanLoadTests.h @@ -5,32 +5,19 @@ #define VULKAN_LOAD_TESTS_H /* - * Copyright (c) 2017, Mark Callow, www.edgewise-consulting.com. + * ©2017 Mark Callow. * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and/or associated documentation files (the - * "Materials"), to deal in the Materials without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Materials, and to - * permit persons to whom the Materials are furnished to do so, subject to - * the following conditions: + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * The above copyright notice and this permission notice shall be included - * unaltered in all copies or substantial portions of the Materials. - * Any additions, deletions, or changes to the original source files - * must be clearly indicated in accompanying documentation. + * http://www.apache.org/licenses/LICENSE-2.0 * - * If only executable code is distributed, then the accompanying - * documentation must state that "this software is based in part on the - * work of Mark Callow." - * - * THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #include "VulkanAppSDL.h" diff --git a/tests/texturetests/texturetests.cc b/tests/texturetests/texturetests.cc index 10ba1e5c5..af48f212e 100644 --- a/tests/texturetests/texturetests.cc +++ b/tests/texturetests/texturetests.cc @@ -12,7 +12,7 @@ */ /* - * ©2010 - 2018 Mark Callow, . + * ©2010-2018 Mark Callow, . * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tests/toktx-tests b/tests/toktx-tests index 13d21aaea..3d8010d53 100755 --- a/tests/toktx-tests +++ b/tests/toktx-tests @@ -4,30 +4,23 @@ # Regression tests for toktx -# --------------------------------------------------------------- +# ------------------------------------------------------------------------- # -# Copyright (c) 2010 The Khronos Group Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and/or associated documentation files (the -# "Materials"), to deal in the Materials without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Materials, and to -# permit persons to whom the Materials are furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Materials. -# -# THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -# MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -# -# --------------------------------------------------------------- +# ©2010 The Khronos Group, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http:#www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ------------------------------------------------------------------------- # Depth of this script relative to the project root depth=.. diff --git a/tests/unittests/unittests.cc b/tests/unittests/unittests.cc index 4dc53c3fc..b8b5dcffd 100644 --- a/tests/unittests/unittests.cc +++ b/tests/unittests/unittests.cc @@ -1,6 +1,22 @@ /* -*- tab-width: 4; -*- */ /* vi: set sw=2 ts=4: */ +/* + * ©2010-2018 Mark Callow. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + /** * @internal * @file unittests.cc @@ -11,35 +27,6 @@ * @author Mark Callow, Edgewise Consulting */ -/* - Copyright (c) 2010 The Khronos Group Inc. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and/or associated documentation files (the - "Materials"), to deal in the Materials without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Materials, and to - permit persons to whom the Materials are furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be included - unaltered in all copies or substantial portions of the Materials. - Any additions, deletions, or changes to the original source files - must be clearly indicated in accompanying documentation. - - If only executable code is distributed, then the accompanying - documentation must state that "this software is based in part on the - work of the Khronos Group." - - THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. - */ - #if defined(_WIN32) #define _CRT_SECURE_NO_WARNINGS #if _MSC_VER < 1900 diff --git a/tests/unittests/wthelper.h b/tests/unittests/wthelper.h index ff7328992..cf22d6078 100644 --- a/tests/unittests/wthelper.h +++ b/tests/unittests/wthelper.h @@ -1,16 +1,6 @@ /* -*- tab-width: 4; -*- */ /* vi: set sw=2 ts=4 expandtab: */ -/** - * @internal - * @file wthelper.h - * @~English - * - * @brief Helper class for writer tests. - * - * @author Mark Callow, Edgewise Consulting - */ - /* * ©2018 Mark Callow. * @@ -27,6 +17,16 @@ * limitations under the License. */ +/** + * @internal + * @file wthelper.h + * @~English + * + * @brief Helper class for writer tests. + * + * @author Mark Callow, Edgewise Consulting + */ + #include "gl_format.h" #include "ktx.h" extern "C" { diff --git a/tools/toktx/image.cpp b/tools/toktx/image.cpp index 77140af06..9c3e7f8a0 100644 --- a/tools/toktx/image.cpp +++ b/tools/toktx/image.cpp @@ -3,6 +3,22 @@ // $Id$ +// +// ©2010 The Khronos Group, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + //! //! @internal //! @~English @@ -11,38 +27,9 @@ //! @brief Read netpbm format (.pam, .pbm or .pgm) files. //! //! @author Mark Callow, HI Corporation. -//! @author Jacob Ström, Ericsson AB. +//! @author Jacob Ström, Ericsson AB. //! -// -// Copyright (c) 2010 The Khronos Group Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and/or associated documentation files (the -// "Materials"), to deal in the Materials without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Materials, and to -// permit persons to whom the Materials are furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be included -// unaltered in all copies or substantial portions of the Materials. -// Any additions, deletions, or changes to the original source files -// must be clearly indicated in accompanying documentation. -// -// If only executable code is distributed, then the accompanying -// documentation must state that "this software is based in part on the -// work of the Khronos Group." -// -// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -// - #include "stdafx.h" #include #include "image.h" diff --git a/tools/toktx/image.h b/tools/toktx/image.h index bcfb7c841..2081c37df 100644 --- a/tools/toktx/image.h +++ b/tools/toktx/image.h @@ -3,6 +3,22 @@ // $Id$ +// +// ©2010 The Khronos Group, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + //! //! @internal //! @~English @@ -11,35 +27,6 @@ //! @brief Internal interface for netpbm file reader //! -// -// Copyright (c) 2010 The Khronos Group Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and/or associated documentation files (the -// "Materials"), to deal in the Materials without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Materials, and to -// permit persons to whom the Materials are furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be included -// unaltered in all copies or substantial portions of the Materials. -// Any additions, deletions, or changes to the original source files -// must be clearly indicated in accompanying documentation. -// -// If only executable code is distributed, then the accompanying -// documentation must state that "this software is based in part on the -// work of the Khronos Group." -// -// THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -// MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -// - #ifndef IMAGE_H #define IMAGE_H