Output debugger - Use built-in shaders

This commit is contained in:
Emmanuel BENOîT 2017-11-24 13:46:43 +01:00
parent 8e73f81ecd
commit d846fac3f6
11 changed files with 96 additions and 33 deletions

View file

@ -12,7 +12,14 @@ BUILDER_LIBS = $(LIBEBCL) -latomic
TOOL_LIBS = $(shell sdl2-config --libs) -lGL -lGLEW -ldl $(BUILDER_LIBS)
FILEDUMPS =
BUILTIN_SHADERS = \
copy \
dbg-alpha \
dbg-depth-linear \
dbg-depth-reinhard \
dbg-reinhard \
fullscreen \
# END BUILTIN_SHADERS
IMGUI = imgui.cpp imgui_draw.cpp
@ -60,6 +67,9 @@ BUILDER = \
# END BUILDER
BUILTIN_SHADERS_SRC = $(addprefix toolshaders/, $(addsuffix .glsl, $(BUILTIN_SHADERS)))
BUILTIN_SHADERS_H = $(addprefix $(OUTDIR)/bs-, $(addsuffix .inl, $(BUILTIN_SHADERS)))
IMGUI_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(IMGUI))))
COMMON_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(COMMON))))
TOOL_OBJS = $(addprefix $(OUTDIR)/, $(addsuffix .o, $(basename $(TOOL))))
@ -91,7 +101,7 @@ tourista-builder: $(LIBEBCL) $(BUILDER_BUILD)
$(BUILDER_BUILD) $(BUILDER_LIBS)
clean:
rm -f $(ALL_OBJS) $(FILEDUMPS) tourista tourista-builder $(PCH) $(OUTDIR)/font-awesome.inl
rm -f $(ALL_OBJS) $(BUILTIN_SHADERS_H) tourista tourista-builder $(PCH) $(OUTDIR)/font-awesome.inl
depclean: clean
rm -f $(ALL_DEPS)
@ -103,10 +113,6 @@ fullclean: depclean
.PHONY: all clean fullclean
$(FILEDUMPS): fd-%.h: %
xxd -i $< $@
outdir:
@if ! [ -d "$(OUTDIR)" ]; then mkdir "$(OUTDIR)"; fi
.PHONY: outdir
@ -119,21 +125,21 @@ $(IMGUI_OBJS): $(OUTDIR)/%.o: 3rdparty/imgui/%.cpp | outdir
#-------------------------------------------------------------------------------
-include $(DEMO_DEPS)
$(TOOL_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(TOOL_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(BUILTIN_SHADERS_H)
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
#-------------------------------------------------------------------------------
-include $(COMMON_DEPS)
$(COMMON_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(COMMON_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
#-------------------------------------------------------------------------------
-include $(BUILDER_DEPS)
$(BUILDER_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir $(FILEDUMPS)
$(BUILDER_OBJS): $(OUTDIR)/%.o: %.cc $(PCH) | outdir
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $<
$(CXX) $(CXXFLAGS) $(CPPFLAGS) -M -MF $(@:%.o=%.d) -MT $@ $<
@ -147,6 +153,11 @@ $(PCH): externals.hh
#-------------------------------------------------------------------------------
$(BUILTIN_SHADERS_H): $(OUTDIR)/bs-%.inl: toolshaders/%.glsl | outdir
xxd -i < $< > $@
#-------------------------------------------------------------------------------
$(OUTDIR)/ui-app.o: ui-app.cc $(OUTDIR)/font-awesome.inl
$(OUTDIR)/font-awesome.inl: 3rdparty/font-awesome/fonts/fontawesome-webfont.ttf $(OUTDIR)/font-to-c