lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-28 04:41:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for in-program font rendering on linux

Browse Source
This commit is contained in:
baldurk
2014-11-01 17:03:19 +00:00
parent df813b6659
commit 9e817e7e19
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/Makefile
+12 -4
View File
@@ -56,13 +56,16 @@ os/linux/linux_process.o \
os/linux/linux_stringio.o \
os/linux/linux_threading.o \
hooks/linux_libentry.o
SHADERS=data/glsl/blit.frago \
DATA=data/glsl/blit.frago \
data/glsl/blit.verto \
data/glsl/texdisplay.frago \
data/glsl/checkerboard.frago \
data/glsl/generic.frago \
data/glsl/generic.verto \
data/glsl/mesh.verto
data/glsl/mesh.verto \
data/glsl/text.verto \
data/glsl/text.frago \
data/sourcecodepro.ttfo
.PHONY: all
all: librenderdoc.so
@@ -89,12 +92,17 @@ $(OBJDIR)/%.frago: %.frag
cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
@mv $$(dirname $<)/$$(basename $@) $@
$(OBJDIR)/%.ttfo: %.ttf
@mkdir -p $$(dirname $@)
cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
@mv $$(dirname $<)/$$(basename $@) $@
OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(OBJECTS))
OBJDIR_SHADERS=$(addprefix $(OBJDIR)/, $(SHADERS))
OBJDIR_DATA=$(addprefix $(OBJDIR)/, $(DATA))
-include $(OBJDIR_OBJECTS:.o=.d)
librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_SHADERS)
librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_DATA)
g++ -o librenderdoc.so $^ $(LDFLAGS)
.PHONY: clean
renderdoc/data/embedded_files.h
+3
View File
@@ -35,5 +35,8 @@ DECLARE_EMBED(checkerboard_frag);
DECLARE_EMBED(mesh_vert);
DECLARE_EMBED(generic_vert);
DECLARE_EMBED(generic_frag);
DECLARE_EMBED(text_frag);
DECLARE_EMBED(text_vert);
DECLARE_EMBED(sourcecodepro_ttf);
#undef DECLARE_EMBED
renderdoc/driver/gl/gl_driver.cpp
+1 -1
View File
@@ -704,7 +704,7 @@ void WrappedOpenGL::RenderOverlayStr(float x, float y, const char *text)
const GLHookSet &gl = m_Real;
RDCASSERT(strlen(text) < FONT_MAX_CHARS);
RDCASSERT(strlen(text) < (size_t)FONT_MAX_CHARS);
FontData &font = m_Fonts[GetCtx()];