vulkan bringup on linux

cleanup: drop unused stuff

Author: kd-11

CMakeLists.txt

@@ -46,7 +46,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
 add_subdirectory( Vulkan )
 add_subdirectory( rpcs3 )
-add_subdirectory( rsx_program_decompiler )
 
 include_directories(3rdparty/hidapi/hidapi)
 if(APPLE)

rpcs3/CMakeLists.txt

@@ -155,16 +155,13 @@ ${LLVM_INCLUDE_DIRS}
 "${RPCS3_SRC_DIR}/../Utilities/yaml-cpp/include"
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
 "${RPCS3_SRC_DIR}/../3rdparty/GSL/include"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code"
 "${RPCS3_SRC_DIR}/../Vulkan/Vulkan-LoaderAndValidationLayers/include"
 "${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/Public"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/"
 "${RPCS3_SRC_DIR}/../3rdparty/hidapi/hidapi"
 # Includes 3rdparty stuff that isn't included yet
 "${RPCS3_SRC_DIR}/../3rdparty/GL"
 "${RPCS3_SRC_DIR}/../3rdparty/stblib"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code"
 "${RPCS3_SRC_DIR}/../3rdparty/cereal/include"
 )
 if(WIN32)
@@ -217,20 +214,33 @@ GLOB_RECURSE
 RPCS3_SRC
 "${RPCS3_SRC_DIR}/*.cpp"
 "${RPCS3_SRC_DIR}/../Utilities/*.cpp"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler/*.cpp"
-"${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*.cpp"
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/GenericCodeGen/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp"
+"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
 )
 
-if(NOT WIN32)
-	set (EXCLUDE_DIR "/RSX/VK/")
-	foreach (TMP_PATH ${RPCS3_SRC})
-		string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
-		if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
+#File exclusion section
+
+#Ignore vulkan if not on windows or linux
+if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
+	set (EXCLUDE_FILES "/RSX/VK/")
+endif()
+
+#Do not compile the Qt moc files, they are compiled when generating automoc
+set (EXCLUDE_FILES ${EXLUDE_FILES} "moc_")
+
+foreach (TMP_PATH ${RPCS3_SRC})
+	foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
+		string (FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND)
+		if (NOT ${EXCLUDE_FILE_FOUND} EQUAL -1)
 			list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH})
 		endif ()
-	endforeach(TMP_PATH)
-endif()
+	endforeach(EXCLUDE_PATH)
+endforeach(TMP_PATH)
 
 # The Gui folder contains wxWidgets stuff, which we no longer want.
 foreach (TMP_PATH ${RPCS3_SRC})
@@ -261,10 +271,8 @@ if(WIN32)
 	endif()
 	target_link_libraries(rpcs3  avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS})
 else()
-
 	target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES} hidapi-hidraw udev)
-	target_link_libraries(rpcs3  -ldl -latomic -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS})
-
+	target_link_libraries(rpcs3  -ldl -latomic -lpthread -lvulkan ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS})
 	if (USE_SYSTEM_FFMPEG)
 		link_libraries(${FFMPEG_LIBRARY_DIR})
 		target_link_libraries(rpcs3  libavformat.so libavcodec.so libavutil.so libswresample.so libswscale.so)
@@ -281,8 +289,6 @@ if(LLVM_FOUND)
 	target_link_libraries(rpcs3  ${LLVM_LIBS})
 endif()
 
-target_link_libraries(rpcs3 rsx_decompiler shader_code)
-
 set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h")
 cotire(rpcs3)
 

rpcs3/Emu/RSX/GL/GLGSRender.cpp

@@ -24,7 +24,8 @@ namespace
 
 GLGSRender::GLGSRender() : GSRender()
 {
-	shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl);
+	//TODO
+	//shaders_cache.load(rsx::old_shaders_cache::shader_language::glsl);
 }
 
 u32 GLGSRender::enable(u32 condition, u32 cap)

rpcs3/Emu/RSX/RSXThread.cpp

@@ -27,51 +27,7 @@ namespace rsx
 {
 	std::function<bool(u32 addr, bool is_writing)> g_access_violation_handler;
 
-	void old_shaders_cache::shaders_cache::load(const std::string &path, shader_language lang)
-	{
-		const std::string lang_name(lang == shader_language::glsl ? "glsl" : "hlsl");
-
-		auto extract_hash = [](const std::string &string)
-		{
-			return std::stoull(string.substr(0, string.find('.')).c_str(), 0, 16);
-		};
-
-		for (const auto& entry : fs::dir(path))
-		{
-			if (entry.name == "." || entry.name == "..")
-				continue;
-
-			u64 hash;
-
-			try
-			{
-				hash = extract_hash(entry.name);
-			}
-			catch (...)
-			{
-				continue;
-			}
-
-			if (fmt::match(entry.name, "*.fs." + lang_name))
-			{
-				fs::file file{ path + entry.name };
-				decompiled_fragment_shaders.insert(hash, { file.to_string() });
-				continue;
-			}
-
-			if (fmt::match(entry.name, "*.vs." + lang_name))
-			{
-				fs::file file{ path + entry.name };
-				decompiled_vertex_shaders.insert(hash, { file.to_string() });
-				continue;
-			}
-		}
-	}
-
-	void old_shaders_cache::shaders_cache::load(shader_language lang)
-	{
-		load(Emu.GetCachePath(), lang);
-	}
+	//TODO: Restore a working shaders cache
 
 	u32 get_address(u32 offset, u32 location)
 	{
@@ -1046,102 +1002,6 @@ namespace rsx
 		return result;
 	}
 
-	raw_program thread::get_raw_program() const
-	{
-		raw_program result{};
-
-		u32 fp_info = rsx::method_registers.shader_program_address();
-
-		result.state.input_attributes = rsx::method_registers.vertex_attrib_input_mask();
-		result.state.output_attributes = rsx::method_registers.vertex_attrib_output_mask();
-		result.state.ctrl = rsx::method_registers.shader_control();
-		result.state.divider_op = rsx::method_registers.frequency_divider_operation_mask();
-		result.state.alpha_func = (u32)rsx::method_registers.alpha_func();
-		result.state.fog_mode = (u32)rsx::method_registers.fog_equation();
-		result.state.is_int = 0;
-
-		for (u8 index = 0; index < rsx::limits::vertex_count; ++index)
-		{
-			bool is_int = false;
-
-			if (rsx::method_registers.vertex_arrays_info[index].size() > 0)
-			{
-				is_int                        = is_int_type(rsx::method_registers.vertex_arrays_info[index].type());
-				result.state.frequency[index] = rsx::method_registers.vertex_arrays_info[index].frequency();
-			}
-			else if (rsx::method_registers.register_vertex_info[index].size > 0)
-			{
-				is_int = is_int_type(rsx::method_registers.register_vertex_info[index].type);
-				result.state.frequency[index] = rsx::method_registers.register_vertex_info[index].frequency;
-				result.state.divider_op |= (1 << index);
-			}
-			else
-			{
-				result.state.frequency[index] = 0;
-			}
-
-			if (is_int)
-			{
-				result.state.is_int |= 1 << index;
-			}
-		}
-
-		for (u8 index = 0; index < rsx::limits::fragment_textures_count; ++index)
-		{
-			if (!rsx::method_registers.fragment_textures[index].enabled())
-			{
-				result.state.textures_alpha_kill[index] = 0;
-				result.state.textures_zfunc[index] = 0;
-				result.state.textures[index] = rsx::texture_target::none;
-				continue;
-			}
-
-			result.state.textures_alpha_kill[index] = rsx::method_registers.fragment_textures[index].alpha_kill_enabled() ? 1 : 0;
-			result.state.textures_zfunc[index] = rsx::method_registers.fragment_textures[index].zfunc();
-
-			switch (rsx::method_registers.fragment_textures[index].get_extended_texture_dimension())
-			{
-			case rsx::texture_dimension_extended::texture_dimension_1d: result.state.textures[index] = rsx::texture_target::_1; break;
-			case rsx::texture_dimension_extended::texture_dimension_2d: result.state.textures[index] = rsx::texture_target::_2; break;
-			case rsx::texture_dimension_extended::texture_dimension_3d: result.state.textures[index] = rsx::texture_target::_3; break;
-			case rsx::texture_dimension_extended::texture_dimension_cubemap: result.state.textures[index] = rsx::texture_target::cube; break;
-
-			default:
-				result.state.textures[index] = rsx::texture_target::none;
-				break;
-			}
-		}
-
-		for (u8 index = 0; index < rsx::limits::vertex_textures_count; ++index)
-		{
-			if (!rsx::method_registers.fragment_textures[index].enabled())
-			{
-				result.state.vertex_textures[index] = rsx::texture_target::none;
-				continue;
-			}
-
-			switch (rsx::method_registers.fragment_textures[index].get_extended_texture_dimension())
-			{
-			case rsx::texture_dimension_extended::texture_dimension_1d: result.state.vertex_textures[index] = rsx::texture_target::_1; break;
-			case rsx::texture_dimension_extended::texture_dimension_2d: result.state.vertex_textures[index] = rsx::texture_target::_2; break;
-			case rsx::texture_dimension_extended::texture_dimension_3d: result.state.vertex_textures[index] = rsx::texture_target::_3; break;
-			case rsx::texture_dimension_extended::texture_dimension_cubemap: result.state.vertex_textures[index] = rsx::texture_target::cube; break;
-
-			default:
-				result.state.vertex_textures[index] = rsx::texture_target::none;
-				break;
-			}
-		}
-
-		result.vertex_shader.ucode_ptr = rsx::method_registers.transform_program.data();
-		result.vertex_shader.offset = rsx::method_registers.transform_program_start();
-
-		result.fragment_shader.ucode_ptr = vm::base(rsx::get_address(fp_info & ~0x3, (fp_info & 0x3) - 1));
-		result.fragment_shader.offset = 0;
-
-		return result;
-	}
-
 	void thread::reset()
 	{
 		rsx::method_registers.reset();

rpcs3/Emu/RSX/RSXThread.h

@@ -26,18 +26,6 @@ extern u64 get_system_time();
 extern bool user_asked_for_frame_capture;
 extern rsx::frame_capture_data frame_debug;
 
-namespace rsx
-{
-	namespace old_shaders_cache
-	{
-		enum class shader_language
-		{
-			glsl,
-			hlsl,
-		};
-	}
-}
-
 namespace rsx
 {
 	namespace limits
@@ -54,54 +42,6 @@ namespace rsx
 		};
 	}
 
-	namespace old_shaders_cache
-	{
-		struct decompiled_shader
-		{
-			std::string code;
-		};
-
-		struct finalized_shader
-		{
-			u64 ucode_hash;
-			std::string code;
-		};
-
-		template<typename Type, typename KeyType = u64, typename Hasher = std::hash<KeyType>>
-		struct cache
-		{
-		private:
-			std::unordered_map<KeyType, Type, Hasher> m_entries;
-
-		public:
-			const Type* find(u64 key) const
-			{
-				auto found = m_entries.find(key);
-
-				if (found == m_entries.end())
-					return nullptr;
-
-				return &found->second;
-			}
-
-			void insert(KeyType key, const Type &shader)
-			{
-				m_entries.insert({ key, shader });
-			}
-		};
-
-		struct shaders_cache
-		{
-			cache<decompiled_shader> decompiled_fragment_shaders;
-			cache<decompiled_shader> decompiled_vertex_shaders;
-			cache<finalized_shader> finailized_fragment_shaders;
-			cache<finalized_shader> finailized_vertex_shaders;
-
-			void load(const std::string &path, shader_language lang);
-			void load(shader_language lang);
-		};
-	}
-
 	u32 get_vertex_type_size_on_host(vertex_base_type type, u32 size);
 
 	u32 get_address(u32 offset, u32 location);
@@ -172,9 +112,6 @@ namespace rsx
 		std::vector<u32> element_push_buffer;
 
 	public:
-		old_shaders_cache::shaders_cache shaders_cache;
-		rsx::programs_cache programs_cache;
-
 		CellGcmControl* ctrl = nullptr;
 
 		Timer timer_sync;
@@ -356,7 +293,6 @@ namespace rsx
 
 		virtual bool scaled_image_from_memory(blit_src_info& src_info, blit_dst_info& dst_info, bool interpolate){ return false;  }
 
-		struct raw_program get_raw_program() const;
 	public:
 		void reset();
 		void init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress);