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.

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

FIX bug : fix macos validation layer error bug #209

Merged
merged 22 commits into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fd9f7bd
Merge pull request #1 from BoomingTech/main
rocketman123456 Apr 8, 2022
eb362e8
Merge pull request #2 from BoomingTech/main
rocketman123456 Apr 11, 2022
f61a1ca
Merge pull request #3 from BoomingTech/main
rocketman123456 Apr 12, 2022
1cc4c81
Merge pull request #4 from BoomingTech/main
rocketman123456 Apr 15, 2022
b71cdf1
Merge pull request #5 from BoomingTech/main
rocketman123456 Apr 23, 2022
fc0b57f
Merge pull request #6 from BoomingTech/main
rocketman123456 Apr 27, 2022
cb028f0
Merge pull request #7 from BoomingTech/main
rocketman123456 May 2, 2022
58e8340
Merge branch 'BoomingTech:main' into main
rocketman123456 May 8, 2022
bb2fc08
Merge branch 'BoomingTech:main' into main
rocketman123456 May 13, 2022
b746a1c
Merge branch 'BoomingTech:main' into main
rocketman123456 May 18, 2022
2eab911
Merge branch 'BoomingTech:main' into main
rocketman123456 May 19, 2022
8e85952
Merge branch 'BoomingTech:main' into main
rocketman123456 May 21, 2022
06fd7e5
Merge branch 'BoomingTech:main' into main
rocketman123456 May 24, 2022
a56b1e8
Merge branch 'BoomingTech:main' into main
rocketman123456 May 25, 2022
db03282
Merge branch 'BoomingTech:main' into main
rocketman123456 May 26, 2022
bd50353
fix macos validation layer error bug
rocketman123456 May 28, 2022
2bbb3f9
fix macos validation layer error bug
rocketman123456 May 28, 2022
72fa1b0
fix bug
rocketman123456 May 30, 2022
ce13fab
fix confict
rocketman123456 May 30, 2022
2bfe90b
Merge branch 'BoomingTech:main' into main
rocketman123456 May 31, 2022
7dc6026
merge
rocketman123456 Jun 1, 2022
4fe22b9
Merge branch 'BoomingTech-main'
rocketman123456 Jun 1, 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
13 changes: 6 additions & 7 deletions engine/source/runtime/core/meta/reflection/reflection.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ namespace Pilot
{
friend class FieldAccessor;
friend class ArrayAccessor;
;
friend class TypeMetaRegisterinterface;

public:
Expand Down Expand Up @@ -175,13 +174,13 @@ namespace Pilot

private:
FieldFunctionTuple* m_functions;
const char* m_field_name;
const char* m_field_type_name;
const char* m_field_name;
const char* m_field_type_name;
};

/**
* Function reflection is not implemented, so use this as an std::vector accessor
*/
* Function reflection is not implemented, so use this as an std::vector accessor
*/
class ArrayAccessor
{
friend class TypeMeta;
Expand All @@ -202,8 +201,8 @@ namespace Pilot

private:
ArrayFunctionTuple* m_func;
const char* m_array_type_name;
const char* m_element_type_name;
const char* m_array_type_name;
const char* m_element_type_name;
};

class ReflectionInstance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,10 @@ namespace Pilot
{
extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
}

#if defined(__MACH__)
extensions.push_back(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);
#endif

return extensions;
}
Expand Down