Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 829b6a0

Browse files
AaronOSkia Commit-Bot
authored andcommitted
Fix Metal includes breaking macOS local builds
Before this fix, skia (and thus Chrome) would fail to compile on macOS when the user (developer) had a case-sensitive file-system. So I've replaced the incorrect includes of <metal/metal.h> by <Metal/Metal.h> Change-Id: I6ebcc0f46608f6d840d80d18e5f5baf0744a7f16 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225776 Reviewed-by: Jim Van Verth <[email protected]> Commit-Queue: Mike Klein <[email protected]>
1 parent e192c4c commit 829b6a0

9 files changed

+9
-8
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212
# Please keep the list sorted alphabetically.
1313

14+
Aaron O'Mullan <[email protected]>
1415
ACCESS CO., LTD. <*@access-company.com>
1516
Amazon, Inc <*@amazon.com>
1617
Anthony Catel <[email protected]>

src/gpu/mtl/GrMtlBuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "src/gpu/GrGpuBuffer.h"
1212
#include "src/gpu/mtl/GrMtlUniformHandler.h"
1313

14-
#import <metal/metal.h>
14+
#import <Metal/Metal.h>
1515

1616
class GrMtlCaps;
1717
class GrMtlGpu;

src/gpu/mtl/GrMtlDepthStencil.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef GrMtlDepthStencil_DEFINED
99
#define GrMtlDepthStencil_DEFINED
1010

11-
#import <metal/metal.h>
11+
#import <Metal/Metal.h>
1212

1313
#include "include/gpu/GrTypes.h"
1414
#include "src/core/SkOpts.h"

src/gpu/mtl/GrMtlGpuCommandBuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "src/gpu/GrOpFlushState.h"
1414
#include "src/gpu/mtl/GrMtlGpu.h"
1515

16-
#import <metal/metal.h>
16+
#import <Metal/Metal.h>
1717

1818
typedef uint32_t GrColor;
1919
class GrMtlBuffer;

src/gpu/mtl/GrMtlPipelineState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "src/gpu/mtl/GrMtlBuffer.h"
1515
#include "src/gpu/mtl/GrMtlPipelineStateDataManager.h"
1616

17-
#import <metal/metal.h>
17+
#import <Metal/Metal.h>
1818

1919
class GrMtlGpu;
2020
class GrMtlPipelineStateDataManager;

src/gpu/mtl/GrMtlPipelineStateBuilder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "src/gpu/mtl/GrMtlVaryingHandler.h"
1616
#include "src/sksl/SkSLCompiler.h"
1717

18-
#import <metal/metal.h>
18+
#import <Metal/Metal.h>
1919

2020
class GrMtlGpu;
2121
class GrMtlPipelineState;

src/gpu/mtl/GrMtlResourceProvider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "src/gpu/mtl/GrMtlPipelineStateBuilder.h"
1616
#include "src/gpu/mtl/GrMtlSampler.h"
1717

18-
#import <metal/metal.h>
18+
#import <Metal/Metal.h>
1919

2020
class GrMtlGpu;
2121
class GrMtlCommandBuffer;

src/gpu/mtl/GrMtlSampler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#ifndef GrMtlSampler_DEFINED
99
#define GrMtlSampler_DEFINED
1010

11-
#import <metal/metal.h>
11+
#import <Metal/Metal.h>
1212

1313
#include "src/core/SkOpts.h"
1414
#include <atomic>

tests/MtlBackendAllocationTest.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "src/gpu/GrContextPriv.h"
1010
#include "tests/Test.h"
1111

12-
#import <metal/metal.h>
12+
#import <Metal/Metal.h>
1313
#include "src/gpu/mtl/GrMtlCaps.h"
1414

1515
// In BackendAllocationTest.cpp

0 commit comments

Comments
 (0)