This repository was archived by the owner on Aug 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 258
Explicit Resource Bindings in OpenGL #51
Open
Jorgemagic
wants to merge
17
commits into
microsoft:master
Choose a base branch
from
Jorgemagic:ExplicitResourceBindings
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Added Options parameters to C# wrapper
- Added Vulkan Shift resource binding options - Fixed issue packMatricesInRowMajor is inverted
- Added explicit resources layout bindings in GLSL/ESSL
Fixed load shader conductor dependencies
…gic/ShaderConductor into ExplicitResourceBindings
gongminmin
suggested changes
Jan 14, 2020
@@ -128,7 +128,23 @@ namespace | |||
const char* functionName = "DxcCreateInstance"; | |||
|
|||
#ifdef _WIN32 | |||
m_dxcompilerDll = ::LoadLibraryA(dllName); | |||
HMODULE hm = NULL; | |||
if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, (LPCSTR) "DllMain", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(LPCSTR)"DllMain"
can be changed to
TEXT("DllMain")
to make it compatible to both MBCS and UNICODE. Or just use GetModuleHandleExA without C-style case to DllMain. Same as GetModuleFileName below.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think that it is interesting.
gongminmin
suggested changes
Sep 26, 2020
@@ -22,24 +22,28 @@ add_dependencies(${DLL_NAME} ShaderConductor) | |||
|
|||
set_target_properties(${DLL_NAME} PROPERTIES FOLDER "Wrapper") | |||
|
|||
set(CSHARP_TEST CSharpPinvoke) | |||
if(SC_WITH_CSHARP) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be:
if(NOT SC_WITH_CSHARP)
return()
endif()
to avoid indent most lines in this file.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi @gongminmin,
In this pull request I added several things:
Added Explicit resource bindings in OpenGL translation
HLSL
Produced explicit layout bindings in GLSL
This ensures the resource bindings are the same that in original HLSL.
More flexible load dependencies (dxcompiler) on windows
Before:
m_dxcompilerDll = ::LoadLibraryA(dllName);
Issue: Only search dxcompiler library in executable path and system paths, now is possible load library from ShaderConductor library path.
Included libShaderConductorWrapper to cmake compilation
Now the AzurePipeline artifacts will include libdxcompiler, libShaderConductor, and libShaderConductorWrapper libraries.