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

Ditch explicit linear or point sampling in gl tex display shader

Browse Source 
* It's handled already on the C++ side by binding a point or linear sampler
  to that slot, but also it seems that it's not well defined (that I can
  see) if texelFetch should sRGB decode or not. On nvidia it seems to, but
  on AMD it seems like it doesn't do the decode.
This commit is contained in:
baldurk
2014-12-05 10:00:28 +00:00
parent 9561f88fd5
commit 95a70bf0fc
3 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/glsl/histogram.comp
+2 -2
View File
@@ -128,7 +128,7 @@ void main()
{
for(uint x=topleft.x; x < min(texDim.x, topleft.x + HGRAM_PIXELS_PER_TILE); x++)
{
vec4 data = SampleTextureFloat4(vec2(x, y), RESTYPE_TEX2D, false, true,
vec4 data = SampleTextureFloat4(vec2(x, y), RESTYPE_TEX2D, false,
HistogramMip, HistogramSlice, HistogramSample, HistogramNumSamples);
if(i == 0)
@@ -351,7 +351,7 @@ void main()
}
#else
{
vec4 data = SampleTextureFloat4(vec2(x, y), texType, false, false,
vec4 data = SampleTextureFloat4(vec2(x, y), texType, false,
HistogramMip, HistogramSlice, HistogramSample, HistogramNumSamples);
float divisor = 0.0f;
renderdoc/data/glsl/texdisplay.frag
+1 -1
View File
@@ -65,7 +65,7 @@ void main(void)
}
else
{
col = SampleTextureFloat4(scr, texType, FlipY == 0, (Scale < 1.0 && MipLevel == 0.0 && !depthTex), int(MipLevel), Slice, SampleIdx, NumSamples);
col = SampleTextureFloat4(scr, texType, FlipY == 0, int(MipLevel), Slice, SampleIdx, NumSamples);
}
if(RawOutput != 0)
renderdoc/data/glsl/texsample.h
+8 -29
View File
@@ -216,26 +216,20 @@ ivec4 SampleTextureSInt4(vec2 pos, int type, bool flipY, int mipLevel, float sli
}
vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int mipLevel, float slice, int sampleIdx, int sampleCount)
vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, int mipLevel, float slice, int sampleIdx, int sampleCount)
{
vec4 col;
if (type == RESTYPE_TEX1D)
{
int size = textureSize(tex1D, mipLevel);
if (linearSample)
col = texture(tex1D, pos.x / size);
else
col = texelFetch(tex1D, int(pos.x), mipLevel);
col = textureLod(tex1D, pos.x / size, float(mipLevel));
}
else if (type == RESTYPE_TEX1DARRAY)
{
ivec2 size = textureSize(tex1DArray, mipLevel);
if (linearSample)
col = texture(tex1DArray, vec2(pos.x / size.x, slice));
else
col = texelFetch(tex1DArray, ivec2(pos.x, slice), mipLevel);
col = textureLod(tex1DArray, vec2(pos.x / size.x, slice), float(mipLevel));
}
else if (type == RESTYPE_TEX2D)
{
@@ -244,10 +238,7 @@ vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int
if (flipY)
pos.y = size.y - pos.y;
if (linearSample)
col = texture(tex2D, pos / size);
else
col = texelFetch(tex2D, ivec2(pos), mipLevel);
col = textureLod(tex2D, pos / size, float(mipLevel));
}
else if (type == RESTYPE_TEXRECT)
{
@@ -329,10 +320,7 @@ vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int
if (flipY)
pos.y = size.y - pos.y;
if (linearSample)
col = texture(tex2DArray, vec3(pos / size.xy, slice));
else
col = texelFetch(tex2DArray, ivec3(pos, slice), mipLevel);
col = textureLod(tex2DArray, vec3(pos / size.xy, slice), float(mipLevel));
}
else if (type == RESTYPE_TEX3D)
{
@@ -341,10 +329,7 @@ vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int
if (flipY)
pos.y = size.y - pos.y;
if (linearSample)
col = texture(tex3D, vec3(pos / size.xy, slice));
else
col = texelFetch(tex3D, ivec3(pos, slice), mipLevel);
col = textureLod(tex3D, vec3(pos / size.xy, slice), float(mipLevel));
}
else if (type == RESTYPE_TEXCUBE)
{
@@ -355,10 +340,7 @@ vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int
vec3 cubeCoord = CalcCubeCoord(pos / size, int(slice));
if (linearSample)
col = texture(texCube, cubeCoord);
else
col = textureLod(texCube, cubeCoord, mipLevel);
col = textureLod(texCube, cubeCoord, float(mipLevel));
}
else // type == RESTYPE_TEXCUBEARRAY
{
@@ -370,10 +352,7 @@ vec4 SampleTextureFloat4(vec2 pos, int type, bool flipY, bool linearSample, int
vec3 cubeCoord = CalcCubeCoord(pos / size.xy, int(slice) % 6);
vec4 arrayCoord = vec4(cubeCoord, int(slice) / 6);
if (linearSample)
col = texture(texCubeArray, arrayCoord);
else
col = textureLod(texCubeArray, arrayCoord, mipLevel);
col = textureLod(texCubeArray, arrayCoord, float(mipLevel));
}
return col;