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

Thumbnails with automatic scale shouldn't always be linear sampled on GL

Browse Source
This commit is contained in:
baldurk
2020-11-16 18:33:35 +00:00
parent e0147928f1
commit a457389937
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/gl/gl_rendertexture.cpp
+19 -19
View File
@@ -473,26 +473,8 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, TexDisplayFlags flags)
maxlevel[0] = -1;
}
TextureSamplerMode mode = TextureSamplerMode::Point;
bool intTexture = intIdx > 0 || (flags & eTexDisplay_RemapUInt) || (flags & eTexDisplay_RemapSInt);
if(cfg.subresource.mip == 0 && cfg.scale < 1.0f && dsTexMode == eGL_NONE &&
resType != RESTYPE_TEXBUFFER && resType != RESTYPE_TEXRECT && !intTexture)
{
mode = TextureSamplerMode::Linear;
}
else
{
if(resType == RESTYPE_TEXRECT || resType == RESTYPE_TEX2DMS ||
resType == RESTYPE_TEX2DMSARRAY || resType == RESTYPE_TEXBUFFER)
mode = TextureSamplerMode::PointNoMip;
else
mode = TextureSamplerMode::Point;
}
TextureSamplerState prevSampState = SetSamplerParams(target, texname, mode);
GLint tex_x = texDetails.width, tex_y = texDetails.height, tex_z = texDetails.depth;
drv.glBindBufferBase(eGL_UNIFORM_BUFFER, 0, DebugData.UBOs[0]);
@@ -513,7 +495,7 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, TexDisplayFlags flags)
float xscale = DebugData.outWidth / float(tex_x);
float yscale = DebugData.outHeight / float(tex_y);
ubo->Scale = RDCMIN(xscale, yscale);
ubo->Scale = cfg.scale = RDCMIN(xscale, yscale);
if(yscale > xscale)
{
@@ -610,6 +592,24 @@ bool GLReplay::RenderTextureInternal(TextureDisplay cfg, TexDisplayFlags flags)
drv.glUnmapBuffer(eGL_UNIFORM_BUFFER);
TextureSamplerMode mode = TextureSamplerMode::Point;
if(cfg.subresource.mip == 0 && cfg.scale < 1.0f && dsTexMode == eGL_NONE &&
resType != RESTYPE_TEXBUFFER && resType != RESTYPE_TEXRECT && !intTexture)
{
mode = TextureSamplerMode::Linear;
}
else
{
if(resType == RESTYPE_TEXRECT || resType == RESTYPE_TEX2DMS ||
resType == RESTYPE_TEX2DMSARRAY || resType == RESTYPE_TEXBUFFER)
mode = TextureSamplerMode::PointNoMip;
else
mode = TextureSamplerMode::Point;
}
TextureSamplerState prevSampState = SetSamplerParams(target, texname, mode);
HeatmapData heatmapData = {};
{