lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 16:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Localise addressing mode state display for GL

Browse Source 
* On GL addressing modes are called wrap modes, and the wrap value is then known
  as repeat. If we don't 'localise' this then it can be confusing to show that
  it is "Wrap".
This commit is contained in:
baldurk
2019-05-17 12:04:45 +01:00
parent 96cc08b960
commit 51c50e0da3
8 changed files with 70 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/QRDUtils.cpp
+30
View File
@@ -807,6 +807,36 @@ QString ToQStr(const ShaderStage stage, const GraphicsAPI apitype)
return lit("Unknown");
}
QString ToQStr(const AddressMode addr, const GraphicsAPI apitype)
{
if(IsD3D(apitype))
{
switch(addr)
{
case AddressMode::Wrap: return lit("Wrap");
case AddressMode::Mirror: return lit("Mirror");
case AddressMode::MirrorOnce: return lit("MirrorOnce");
case AddressMode::ClampEdge: return lit("ClampEdge");
case AddressMode::ClampBorder: return lit("ClampBorder");
default: break;
}
}
else
{
switch(addr)
{
case AddressMode::Repeat: return lit("Repeat");
case AddressMode::MirrorRepeat: return lit("MirrorRepeat");
case AddressMode::MirrorClamp: return lit("MirrorClamp");
case AddressMode::ClampEdge: return lit("ClampEdge");
case AddressMode::ClampBorder: return lit("ClampBorder");
default: break;
}
}
return lit("Unknown");
}
QString TypeString(const SigParameter &sig)
{
QString ret = lit("");
qrenderdoc/Code/QRDUtils.h
+3
View File
@@ -61,6 +61,9 @@ QString ToQStr(const ResourceUsage usage, const GraphicsAPI apitype);
// overload for a couple of things that need to know the pipeline type when converting
QString ToQStr(const ShaderStage stage, const GraphicsAPI apitype);
// overload for a couple of things that need to know the pipeline type when converting
QString ToQStr(const AddressMode addr, const GraphicsAPI apitype);
inline QMetaType::Type GetVariantMetatype(const QVariant &v)
{
// this is explicitly called out by the documentation as the recommended process:
qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp
+6 -2
View File
@@ -1006,7 +1006,9 @@ void D3D11PipelineStateViewer::setShaderState(const D3D11Pipe::Shader &stage, RD
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressU), ToQStr(s.addressV), ToQStr(s.addressW)};
QString addr[] = {ToQStr(s.addressU, GraphicsAPI::D3D11),
ToQStr(s.addressV, GraphicsAPI::D3D11),
ToQStr(s.addressW, GraphicsAPI::D3D11)};
// arrange like either UVW: WRAP or UV: WRAP, W: CLAMP
for(int a = 0; a < 3; a++)
@@ -2625,7 +2627,9 @@ void D3D11PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const D3D11Pipe
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressU), ToQStr(s.addressV), ToQStr(s.addressW)};
QString addr[] = {ToQStr(s.addressU, GraphicsAPI::D3D11),
ToQStr(s.addressV, GraphicsAPI::D3D11),
ToQStr(s.addressW, GraphicsAPI::D3D11)};
// arrange like either UVW: WRAP or UV: WRAP, W: CLAMP
for(int a = 0; a < 3; a++)
qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp
+6 -2
View File
@@ -1062,7 +1062,9 @@ void D3D12PipelineStateViewer::setShaderState(const D3D12Pipe::Shader &stage, RD
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressU), ToQStr(s.addressV), ToQStr(s.addressW)};
QString addr[] = {ToQStr(s.addressU, GraphicsAPI::D3D12),
ToQStr(s.addressV, GraphicsAPI::D3D12),
ToQStr(s.addressW, GraphicsAPI::D3D12)};
// arrange like either UVW: WRAP or UV: WRAP, W: CLAMP
for(int a = 0; a < 3; a++)
@@ -2569,7 +2571,9 @@ void D3D12PipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const D3D12Pipe
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressU), ToQStr(s.addressV), ToQStr(s.addressW)};
QString addr[] = {ToQStr(s.addressU, GraphicsAPI::D3D12),
ToQStr(s.addressV, GraphicsAPI::D3D12),
ToQStr(s.addressW, GraphicsAPI::D3D12)};
// arrange like either UVW: WRAP or UV: WRAP, W: CLAMP
for(int a = 0; a < 3; a++)
qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp
+6 -2
View File
@@ -793,7 +793,9 @@ void GLPipelineStateViewer::setShaderState(const GLPipe::Shader &stage, RDLabel
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressS), ToQStr(s.addressT), ToQStr(s.addressR)};
QString addr[] = {ToQStr(s.addressS, GraphicsAPI::OpenGL),
ToQStr(s.addressT, GraphicsAPI::OpenGL),
ToQStr(s.addressR, GraphicsAPI::OpenGL)};
// arrange like either STR: WRAP or ST: WRAP, R: CLAMP
for(int a = 0; a < 3; a++)
@@ -2670,7 +2672,9 @@ void GLPipelineStateViewer::exportHTML(QXmlStreamWriter &xml, const GLPipe::Shad
QString addPrefix;
QString addVal;
QString addr[] = {ToQStr(s.addressS), ToQStr(s.addressT), ToQStr(s.addressR)};
QString addr[] = {ToQStr(s.addressS, GraphicsAPI::OpenGL),
ToQStr(s.addressT, GraphicsAPI::OpenGL),
ToQStr(s.addressR, GraphicsAPI::OpenGL)};
// arrange like either STR: WRAP or ST: WRAP, R: CLAMP
for(int a = 0; a < 3; a++)
qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp
+3 -2
View File
@@ -738,8 +738,9 @@ QVariantList VulkanPipelineStateViewer::makeSampler(const QString &bindset, cons
QString filter;
QString addr[] = {ToQStr(descriptor.addressU), ToQStr(descriptor.addressV),
ToQStr(descriptor.addressW)};
QString addr[] = {ToQStr(descriptor.addressU, GraphicsAPI::Vulkan),
ToQStr(descriptor.addressV, GraphicsAPI::Vulkan),
ToQStr(descriptor.addressW, GraphicsAPI::Vulkan)};
// arrange like either UVW: WRAP or UV: WRAP, W: CLAMP
for(int a = 0; a < 3; a++)
renderdoc/api/replay/renderdoc_tostr.inl
+1 -1
View File
@@ -424,7 +424,7 @@ rdcstr DoStringise(const TextureFilter &el)
if(a == 0 || filters[a] == filters[a - 1])
{
if(filtPrefix != "")
filtPrefix += "/";
filtPrefix += "&";
filtPrefix += filterPrefixes[a];
}
else
renderdoc/api/replay/replay_enums.h
+15
View File
@@ -327,15 +327,27 @@ DOCUMENT(R"(A texture addressing mode in a single direction (U,V or W).
The texture is tiled at every multiple of 1.0.
.. data:: Repeat
Alias of :data:`Wrap`.
.. data:: Mirror
The texture is tiled as with :data:`Wrap`, but with the absolute value of the texture co-ordinate.
.. data:: MirrorRepeat
Alias of :data:`Mirror`.
.. data:: MirrorOnce
The texture is mirrored with :data:`Mirror`, but the texture does not tile as with
:data:`ClampEdge`.
.. data:: MirrorClamp
Alias of :data:`MirrorOnce`.
.. data:: ClampEdge
The texture is clamped to the range of ``[0.0, 1.0]`` and the texture value at each end used.
@@ -348,8 +360,11 @@ DOCUMENT(R"(A texture addressing mode in a single direction (U,V or W).
enum class AddressMode : uint32_t
{
Wrap,
Repeat = Wrap,
Mirror,
MirrorRepeat = Mirror,
MirrorOnce,
MirrorClamp = MirrorOnce,
ClampEdge,
ClampBorder,
};