From 940b89cd739164d51d70723f325cb30057480fb7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 20 Sep 2015 01:54:23 +0200
Subject: [PATCH] Move capture layer into librenderdoc.so on linux

---
 renderdoc/driver/vulkan/Makefile       | 38 ++++----------------------
 renderdoc/driver/vulkan/renderdoc.json |  4 +--
 2 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/renderdoc/driver/vulkan/Makefile b/renderdoc/driver/vulkan/Makefile
index 47868dcdf..cf200c041 100644
--- a/renderdoc/driver/vulkan/Makefile
+++ b/renderdoc/driver/vulkan/Makefile
@@ -10,29 +10,19 @@ CFLAGS=-c -Wall -Werror -Wno-unused -Wno-unknown-pragmas -fPIC $(MACROS) -I../..
 CPPFLAGS=-std=c++11 -g -Wno-reorder -fvisibility=hidden -fvisibility-inlines-hidden
 LDFLAGS=-lpthread -lrt -shared -ldl -lX11
 OBJDIR=.obj
-OBJECTS=rdtrace.o \
+OBJECTS=vk_dispatchtables.o \
+vk_tracelayer.o \
 vk_core.o \
 vk_common.o \
 vk_manager.o \
 vk_resources.o \
 vk_debug.o \
-LoaderAndTools/layers/vk_layer_table.o \
 vk_replay.o \
 vk_info.o \
 vk_replay_linux.o \
 
-DOBJDIR=../../.obj/data/spv
-DATA=blitvs.spvo \
-checkerboardfs.spvo \
-texdisplayfs.spvo \
-textvs.spvo \
-textfs.spvo \
-../sourcecodepro.ttfo
-
-OBJDIR_DATA=$(addprefix $(DOBJDIR)/, $(DATA))
-
 .PHONY: all
-all: libVKLayerRenderdoc.so rdoc_vulkan.a
+all: rdoc_vulkan.a
 
 $(OBJDIR)/%.o: %.cpp
 	@mkdir -p $$(dirname $@)
@@ -48,25 +38,9 @@ OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(OBJECTS))
 
 -include $(OBJDIR_OBJECTS:.o=.d)
 
-STATIC_OBJECTS=$(addprefix $(OBJDIR)/, vk_core.o \
-vk_common.o \
-vk_manager.o \
-vk_resources.o \
-LoaderAndTools/layers/vk_layer_table.o \
-vk_replay.o \
-vk_debug.o \
-vk_info.o \
-vk_replay_linux.o \
-)
-
-EXTRA_OBJECTS=../../.obj/3rdparty/stb/stb_impl.o ../../.obj/3rdparty/jpeg-compressor/jpge.o
-
-rdoc_vulkan.a: $(STATIC_OBJECTS)
-	ar rcs rdoc_vulkan.a $(STATIC_OBJECTS)
-
-libVKLayerRenderdoc.so: $(OBJDIR_OBJECTS) $(EXTRA_OBJECTS) $(OBJDIR_DATA) $(VULKAN_SDK_SRC)/build/layers/liblayer_utils.so
-	/usr/bin/c++  -fPIC -std=c++11 -DVK_PROTOTYPES -Wpointer-arith -g -Wl,-Bsymbolic -shared -Wl,-soname,libVKLayerRenderdoc.so -o libVKLayerRenderdoc.so $(OBJDIR_OBJECTS) $(EXTRA_OBJECTS) $(OBJDIR_DATA) ../../.obj/os/linux/linux_threading.o ../../.obj/os/linux/linux_stringio.o ../../.obj/os/linux/linux_network.o ../../.obj/os/os_specific.o ../../.obj/serialise/utf8printf.o ../../.obj/serialise/grisu2.o ../../.obj/core/core.o ../../.obj/core/remote_access.o ../../.obj/replay/capture_options.o ../../.obj/replay/type_helpers.o ../../.obj/serialise/serialiser.o ../../.obj/core/resource_manager.o ../../.obj/common/common.o $(VULKAN_SDK_SRC)/build/layers/liblayer_utils.so -Wl,-rpath,$(VULKAN_SDK_SRC)/build/layers -lpthread -lrt -ldl -lX11
+rdoc_vulkan.a: $(OBJDIR_OBJECTS)
+	ar rcs rdoc_vulkan.a $(OBJDIR_OBJECTS)
 
 .PHONY: clean
 clean:
-	rm -rf rdoc_vulkan.a libVKLayerRenderdoc.so $(OBJDIR)
+	rm -rf rdoc_vulkan.a $(OBJDIR)
diff --git a/renderdoc/driver/vulkan/renderdoc.json b/renderdoc/driver/vulkan/renderdoc.json
index 023c43bb5..0ec8dfb07 100644
--- a/renderdoc/driver/vulkan/renderdoc.json
+++ b/renderdoc/driver/vulkan/renderdoc.json
@@ -1,11 +1,11 @@
 {
     "file_format_version" : "0.9.0",
     "layer" : {
-        "name": "Renderdoc",
+        "name": "RenderDoc",
         "type": "GLOBAL",
         "library_path": "./libVKLayerRenderdoc.so",
         "abi_versions": "1.0.0",
         "implementation_version": "1.0.0",
-        "description": "LunarG Renderdoc Trace Layer"
+        "description": "Debugging capture layer for RenderDoc"
     }
 }