lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-10 07:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes for linux building

Browse Source
This commit is contained in:
baldurk
2014-11-01 17:26:07 +00:00
parent 9e817e7e19
commit d4f31f9f42
3 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/Makefile
+7 -1
View File
@@ -56,7 +56,8 @@ os/linux/linux_process.o \
os/linux/linux_stringio.o \
os/linux/linux_threading.o \
hooks/linux_libentry.o
DATA=data/glsl/blit.frago \
DATA=data/glsl/debuguniforms.ho \
data/glsl/blit.frago \
data/glsl/blit.verto \
data/glsl/texdisplay.frago \
data/glsl/checkerboard.frago \
@@ -97,6 +98,11 @@ $(OBJDIR)/%.ttfo: %.ttf
cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
@mv $$(dirname $<)/$$(basename $@) $@
$(OBJDIR)/%.ho: %.h
@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_DATA=$(addprefix $(OBJDIR)/, $(DATA))
renderdoc/data/embedded_files.h
+1
View File
@@ -28,6 +28,7 @@
extern char CONCAT( CONCAT(_binary_, filename) , _start) ; \
extern char CONCAT( CONCAT(_binary_, filename) , _end) ;
DECLARE_EMBED(debuguniforms_h);
DECLARE_EMBED(blit_vert);
DECLARE_EMBED(blit_frag);
DECLARE_EMBED(texdisplay_frag);
renderdoc/driver/gl/gl_debug.cpp
+24 -22
View File
@@ -273,22 +273,22 @@ bool GLReplay::RenderTexture(TextureDisplay cfg)
float rangeScale;
switch (tex.format.rawType)
{
case eGL_STENCIL_INDEX1:
rangeScale = 1.0f;
break;
case eGL_STENCIL_INDEX4:
rangeScale = 16.0f;
break;
default:
RDCWARN("Unexpected raw format for stencil visualization");
case eGL_DEPTH24_STENCIL8:
case eGL_DEPTH32F_STENCIL8:
case eGL_STENCIL_INDEX8:
rangeScale = 256.0f;
break;
case eGL_STENCIL_INDEX16:
rangeScale = 65536.0f;
break;
case eGL_STENCIL_INDEX1:
rangeScale = 1.0f;
break;
case eGL_STENCIL_INDEX4:
rangeScale = 16.0f;
break;
default:
RDCWARN("Unexpected raw format for stencil visualization");
case eGL_DEPTH24_STENCIL8:
case eGL_DEPTH32F_STENCIL8:
case eGL_STENCIL_INDEX8:
rangeScale = 256.0f;
break;
case eGL_STENCIL_INDEX16:
rangeScale = 65536.0f;
break;
}
cfg.rangemin *= rangeScale;
cfg.rangemax *= rangeScale;
@@ -300,12 +300,14 @@ bool GLReplay::RenderTexture(TextureDisplay cfg)
{
switch (tex.format.compType)
{
case eCompType_UInt:
resType |= TEXDISPLAY_UINT_TEX;
break;
case eCompType_SNorm:
resType |= TEXDISPLAY_SINT_TEX;
break;
case eCompType_UInt:
resType |= TEXDISPLAY_UINT_TEX;
break;
case eCompType_SNorm:
resType |= TEXDISPLAY_SINT_TEX;
break;
default:
break;
}
}