Fix for Linux

dfranx · May 17, 2020 · 80415ac · 80415ac
1 parent 5f3e87d
commit 80415ac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,10 @@ VSProject
 vsproject32
 Makefile
 libs/**/*.cmake
+SPIRV-Tools-linkConfig.cmake
+SPIRV-Tools-optConfig.cmake
+SPIRV-Tools-reduceConfig.cmake
+SPIRV-ToolsConfig.cmake
 
 # Generated files
 libs/**/*.tcl

diff --git a/.gitmodules b/.gitmodules
@@ -25,6 +25,8 @@
 [submodule "libs/spirv-tools"]
 	path = libs/spirv-tools
 	url = https://github.com/KhronosGroup/SPIRV-Tools.git
+	ignore = dirty
 [submodule "libs/spirv-headers"]
 	path = libs/spirv-headers
 	url = https://github.com/KhronosGroup/SPIRV-Headers
+	ignore = dirty
diff --git a/libs/SPIRV-VM b/libs/SPIRV-VM
diff --git a/src/SHADERed/UI/PixelInspectUI.cpp b/src/SHADERed/UI/PixelInspectUI.cpp
@@ -227,7 +227,7 @@ namespace ed {
 								spvm_image_t tex = res->image_data;
 
 								if (isCube) {
-									m_cubePrev.Draw((GLuint)tex->user_data);
+									m_cubePrev.Draw((GLuint)((uintptr_t)tex->user_data));
 									ImGui::Image((ImTextureID)m_cubePrev.GetTexture(), ImVec2(128.0f, 128.0f * (375.0f / 512.0f)), ImVec2(0, 1), ImVec2(1, 0));
 								} else
 									ImGui::Image((ImTextureID)tex->user_data, ImVec2(128.0f, 128.0f * (tex->height / (float)tex->width)), ImVec2(0, 1), ImVec2(1, 0));
+3 −1		.gitignore
+3 −0		OPCODES.txt
+10 −2		src/ext/GLSL450.c