mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-19 18:05:31 +00:00
Skip BufferZeroInitTests.ResolveQuerySet if not on MacOS 10
Bug: dawn:940 Change-Id: I830cebf2247b65ea0be58a10e02fbcc0542ff73b Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/59040 Reviewed-by: Stephen White <senorblanco@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
@@ -213,6 +213,10 @@ if (is_win || is_linux || is_chromeos || is_mac || is_fuchsia || is_android) {
|
||||
"xlib_with_undefs.h",
|
||||
]
|
||||
|
||||
if (is_mac) {
|
||||
sources += [ "SystemUtils_mac.mm" ]
|
||||
}
|
||||
|
||||
public_configs = [ ":dawn_internal" ]
|
||||
deps = [
|
||||
"${dawn_root}/src/dawn:dawn_headers",
|
||||
|
||||
@@ -24,6 +24,11 @@ std::string GetEnvironmentVar(const char* variableName);
|
||||
bool SetEnvironmentVar(const char* variableName, const char* value);
|
||||
std::string GetExecutableDirectory();
|
||||
|
||||
#ifdef DAWN_PLATFORM_APPLE
|
||||
void GetMacOSVersion(int32_t* majorVersion, int32_t* minorVersion = nullptr);
|
||||
bool IsMacOSVersionAtLeast(uint32_t majorVersion, uint32_t minorVersion = 0);
|
||||
#endif
|
||||
|
||||
class ScopedEnvironmentVar {
|
||||
public:
|
||||
ScopedEnvironmentVar() = default;
|
||||
|
||||
33
src/common/SystemUtils_mac.mm
Normal file
33
src/common/SystemUtils_mac.mm
Normal file
@@ -0,0 +1,33 @@
|
||||
// Copyright 2021 The Dawn Authors
|
||||
//
|
||||
// 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 "common/SystemUtils.h"
|
||||
|
||||
#include "common/Assert.h"
|
||||
|
||||
#import <Foundation/NSProcessInfo.h>
|
||||
|
||||
void GetMacOSVersion(int32_t* majorVersion, int32_t* minorVersion) {
|
||||
NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
|
||||
ASSERT(majorVersion != nullptr);
|
||||
*majorVersion = version.majorVersion;
|
||||
if (minorVersion != nullptr) {
|
||||
*minorVersion = version.minorVersion;
|
||||
}
|
||||
}
|
||||
|
||||
bool IsMacOSVersionAtLeast(uint32_t majorVersion, uint32_t minorVersion) {
|
||||
return
|
||||
[NSProcessInfo.processInfo isOperatingSystemAtLeastVersion:{majorVersion, minorVersion, 0}];
|
||||
}
|
||||
Reference in New Issue
Block a user