Skip to content

Commit

Permalink
Merge pull request #11 from yukiny0811/fix-access
Browse files Browse the repository at this point in the history
Fix access modifier issue
yukiny0811 authored Feb 3, 2024
2 parents 074036b + e4132f4 commit d482c6d
Showing 4 changed files with 15 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -9,18 +9,18 @@ env:
DEVELOPER_DIR: /Applications/Xcode_15.2.app
jobs:
build:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: Build macOS
run: xcodebuild -scheme EasyMetalShader build -destination "generic/platform=macOS"
run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShader build -destination "generic/platform=macOS,arch=arm64,variant=macOS" | xcpretty
- name: Build iOS
run: xcodebuild -scheme EasyMetalShader build -destination "generic/platform=iOS"
run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShader build -destination "generic/platform=iOS" | xcpretty
test:
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- name: Test macOS
run: xcodebuild -scheme EasyMetalShaderTests test -destination "platform=macOS,arch=x86_64"
run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShaderTests test -destination "platform=macOS,arch=arm64" | xcpretty
- name: Test iOS
run: xcodebuild -scheme EasyMetalShaderTests test -destination "name=iPhone 14 Pro"
run: set -o pipefail && xcodebuild -skipMacroValidation -scheme EasyMetalShaderTests test -destination "platform=iOS" | xcpretty
Original file line number Diff line number Diff line change
@@ -125,12 +125,12 @@ extension EMComputeShader: MemberMacro {

let thisDecl1: DeclSyntax =
"""
var computePipelineState: MTLComputePipelineState!
public var computePipelineState: MTLComputePipelineState!
"""

let thisDecl2: DeclSyntax =
"""
var args: [String: EMMetalArgument] = [:]
public var args: [String: EMMetalArgument] = [:]
"""

let thisDecl3: DeclSyntax = .init(stringLiteral: ComputeFunctionStrings.initFunc(variableInitStrings: initStringList, gidTypeString: "ushort2"))
@@ -140,7 +140,7 @@ extension EMComputeShader: MemberMacro {
if !hasInitInImplementation {
thisDecl4 =
"""
init() {
public init() {
setup()
}
"""
Original file line number Diff line number Diff line change
@@ -125,12 +125,12 @@ extension EMComputeShader3D: MemberMacro {

let thisDecl1: DeclSyntax =
"""
var computePipelineState: MTLComputePipelineState!
public var computePipelineState: MTLComputePipelineState!
"""

let thisDecl2: DeclSyntax =
"""
var args: [String: EMMetalArgument] = [:]
public var args: [String: EMMetalArgument] = [:]
"""

let thisDecl3: DeclSyntax = .init(stringLiteral: ComputeFunctionStrings.initFunc(variableInitStrings: initStringList, gidTypeString: "ushort3"))
@@ -140,7 +140,7 @@ extension EMComputeShader3D: MemberMacro {
if !hasInitInImplementation {
thisDecl4 =
"""
init() {
public init() {
setup()
}
"""
Original file line number Diff line number Diff line change
@@ -136,12 +136,12 @@ extension EMRenderShader: MemberMacro {

let thisDecl1: DeclSyntax =
"""
var renderPipelineState: MTLRenderPipelineState!
public var renderPipelineState: MTLRenderPipelineState!
"""

let thisDecl2: DeclSyntax =
"""
var args: [String: EMMetalArgument] = [:]
public var args: [String: EMMetalArgument] = [:]
"""

let thisDecl3: DeclSyntax = .init(stringLiteral: RenderFunctionStrings.initFunc(variableInitStrings: initStringList))
@@ -151,7 +151,7 @@ extension EMRenderShader: MemberMacro {
if !hasInitInImplementation {
thisDecl4 =
"""
init(targetPixelFormat: MTLPixelFormat) {
public init(targetPixelFormat: MTLPixelFormat) {
setup(targetPixelFormat: targetPixelFormat)
}
"""

0 comments on commit d482c6d

Please sign in to comment.