Fix #132

dfranx · Oct 1, 2020 · 3ac64f7 · 3ac64f7
1 parent 6047745
commit 3ac64f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,6 +5,7 @@
 + add the ability to paste full file path in the file dialog
 + switch from Dear ImGui's 'Columns API' to 'Tables API' in "Watches" & "Breakpoints" window
 + fix a bug that would cause SHADERed to crash when using immediate mode while debugging vertex shaders
++ fix a bug that would cause SHADERed to crash if shader has a function with a texture as an argument
 + fix a bug that would keep the debugger running after "Save As"
 + fix a bug that wouldn't add a project to recents after "Save As"
 

diff --git a/src/SHADERed/Objects/DebugInformation.cpp b/src/SHADERed/Objects/DebugInformation.cpp
@@ -879,6 +879,9 @@ namespace ed {
 							sampler2Dloc++;
 						} 
 						else {
+							if (slot->members == nullptr) // if slot->members == nullptr it means that it's a pointer/function argument
+								continue;
+
 							spvm_image_t img = (spvm_image_t)malloc(sizeof(spvm_image));
 
 							if (type_info->image_info == NULL)