Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.3: Update glfw to v3.3.8 #361

Merged
merged 3 commits into from
Aug 6, 2022
Merged

v3.3: Update glfw to v3.3.8 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b8c5fb
v3.3: Update to the v3.3.8 release
Jacalz Jul 23, 2022
af2cc44
scripts: Exclude the CONTRIBUTORS.md file
Jacalz Jul 23, 2022
fbd4f29
v3.3: Remove the wayland files that snuck in
Jacalz Aug 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/grab-upstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ excludes=(
--exclude=glfw-*/examples
# Deleted later because it is needed for patches:
# --exclude=glfw-*/README.md
--exclude=glfw-*/CONTRIBUTORS.md
--exclude=glfw-*/src/*.in
--exclude=glfw-*/src/CMakeLists.txt
--exclude=glfw-*/tests
Expand Down
2 changes: 1 addition & 1 deletion v3.3/glfw/GLFW_C_REVISION.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
45ce5ddd197d5c58f50fdd3296a5131c894e5527
7482de6071d21db77a7236155da44c172a7f6c9e
20 changes: 6 additions & 14 deletions v3.3/glfw/glfw/deps/glad/vk_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,9 @@
/* File: vk_platform.h */
/* */
/*
** Copyright (c) 2014-2017 The Khronos Group Inc.
** Copyright 2014-2022 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.
** SPDX-License-Identifier: Apache-2.0
*/


Expand Down Expand Up @@ -52,7 +42,7 @@ extern "C"
#define VKAPI_CALL __stdcall
#define VKAPI_PTR VKAPI_CALL
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH < 7
#error "Vulkan isn't supported for the 'armeabi' NDK ABI"
#error "Vulkan is not supported for the 'armeabi' NDK ABI"
#elif defined(__ANDROID__) && defined(__ARM_ARCH) && __ARM_ARCH >= 7 && defined(__ARM_32BIT_STATE)
/* On Android 32-bit ARM targets, Vulkan functions use the "hardfloat" */
/* calling convention, i.e. float parameters are passed in registers. This */
Expand All @@ -68,7 +58,9 @@ extern "C"
#define VKAPI_PTR
#endif

#include <stddef.h>
#if !defined(VK_NO_STDDEF_H)
#include <stddef.h>
#endif /* !defined(VK_NO_STDDEF_H) */

#if !defined(VK_NO_STDINT_H)
#if defined(_MSC_VER) && (_MSC_VER < 1600)
Expand Down
Loading