Skip to content

Commit

Permalink
Move to new paraLLEl-RDP.
Browse files Browse the repository at this point in the history
  • Loading branch information
Hans-Kristian Arntzen committed May 11, 2020
1 parent b7e5a5d commit d2e2270
Show file tree
Hide file tree
Showing 80 changed files with 235 additions and 48,899 deletions.
Empty file added .gitmodules
Empty file.
63 changes: 54 additions & 9 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -461,22 +461,67 @@ endif
ifeq ($(HAVE_PARALLEL),1)
CFLAGS += -DHAVE_PARALLEL
CXXFLAGS += -DHAVE_PARALLEL
### Tiny Tigers's LLE renderer ###
SOURCES_CXX += \
$(VIDEODIR_PARALLEL)/parallel.cpp \
$(VIDEODIR_PARALLEL)/vi.cpp \
$(VIDEODIR_PARALLEL)/rdp.cpp \
$(VIDEODIR_PARALLEL)/rdp/vulkan.cpp \
$(VIDEODIR_PARALLEL)/rdp/vulkan_util.cpp \
$(VIDEODIR_PARALLEL)/rdp/frontend.cpp \
$(VIDEODIR_PARALLEL)/rdp/tmem.cpp \
$(VIDEODIR_PARALLEL)/rdp/rdp.cpp \
$(VIDEODIR_PARALLEL)/rdp/vulkan_symbol_wrapper.cpp
$(VIDEODIR_PARALLEL)/rdp.cpp

SOURCES_CXX += \
$(wildcard $(VIDEODIR_PARALLEL)/parallel-rdp/parallel-rdp/*.cpp)

SOURCES_CXX += \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/buffer.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/buffer_pool.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/command_buffer.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/command_pool.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/context.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/cookie.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/descriptor_set.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/device.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/event_manager.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/fence.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/fence_manager.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/image.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/memory_allocator.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/pipeline_event.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/query_pool.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/render_pass.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/sampler.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/semaphore.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/semaphore_manager.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/shader.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/texture_format.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan/thread_id.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/util/aligned_alloc.cpp

SOURCES_CXX += \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/spirv-cross/spirv_cross.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/spirv-cross/spirv_cfg.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/spirv-cross/spirv_parser.cpp \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/spirv-cross/spirv_cross_parsed_ir.cpp

SOURCES_C += \
$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/volk/volk.c

INCFLAGS += \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/parallel-rdp \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/volk \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third_party/spirv-cross \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/vulkan \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/third-party/khronos/vulkan-headers/include \
-I$(VIDEODIR_PARALLEL)/parallel-rdp/Granite/util

CXXFLAGS += -DGRANITE_VULKAN_MT

ifneq ($(findstring Haiku,$(shell uname -s)),)
LDFLAGS += -lroot
else
LDFLAGS += -pthread
ifneq ($(platform),win)
LDFLAGS += -ldl
else
CFLAGS += -DVK_USE_PLATFORM_WIN32_KHR
CXXFLAGS += -DVK_USE_PLATFORM_WIN32_KHR
endif
endif
endif

Expand Down
124 changes: 0 additions & 124 deletions libretro-common/include/vulkan/vk_icd.h

This file was deleted.

Loading

0 comments on commit d2e2270

Please sign in to comment.