lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-24 23:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only flip Y co-ordinates in texture viewer when clip origin is default

Browse Source
This commit is contained in:
baldurk
2021-03-01 11:38:29 +00:00
parent dc35083392
commit 527c662fb2
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/TextureViewer.cpp
+16 -5
View File
@@ -974,7 +974,7 @@ void TextureViewer::UI_UpdateStatusText()
uint32_t mipWidth = qMax(1U, tex.width >> (int)m_TexDisplay.subresource.mip);
uint32_t mipHeight = qMax(1U, tex.height >> (int)m_TexDisplay.subresource.mip);
if(m_Ctx.APIProps().pipelineType == GraphicsAPI::OpenGL)
if(ShouldFlipForGL())
y = (int)(mipHeight - 1) - y;
if(m_TexDisplay.flipY)
y = (int)(mipHeight - 1) - y;
@@ -1010,7 +1010,7 @@ void TextureViewer::UI_UpdateStatusText()
{
x = m_PickedPoint.x() >> (int)m_TexDisplay.subresource.mip;
y = m_PickedPoint.y() >> (int)m_TexDisplay.subresource.mip;
if(m_Ctx.APIProps().pipelineType == GraphicsAPI::OpenGL)
if(ShouldFlipForGL())
y = (int)(mipHeight - 1) - y;
if(m_TexDisplay.flipY)
y = (int)(mipHeight - 1) - y;
@@ -2158,10 +2158,10 @@ void TextureViewer::GotoLocation(uint32_t x, uint32_t y)
m_PickedPoint = QPoint(x, y);
if(m_Ctx.APIProps().pipelineType == GraphicsAPI::OpenGL)
if(ShouldFlipForGL())
m_PickedPoint.setY((int)(tex->height - 1) - m_PickedPoint.y());
if(m_TexDisplay.flipY)
m_PickedPoint.setY((int)(tex->height - 1) - m_PickedPoint.x());
m_PickedPoint.setY((int)(tex->height - 1) - m_PickedPoint.y());
// centre the picked point.
QPoint scrollPos;
@@ -3831,7 +3831,7 @@ void TextureViewer::ShowGotoPopup()
uint32_t mipHeight = qMax(1U, texptr->height >> (int)m_TexDisplay.subresource.mip);
if(m_Ctx.APIProps().pipelineType == GraphicsAPI::OpenGL)
if(ShouldFlipForGL())
p.setY((int)(mipHeight - 1) - p.y());
if(m_TexDisplay.flipY)
p.setY((int)(mipHeight - 1) - p.y());
@@ -3840,6 +3840,17 @@ void TextureViewer::ShowGotoPopup()
}
}
bool TextureViewer::ShouldFlipForGL()
{
if(m_Ctx.APIProps().pipelineType == GraphicsAPI::OpenGL)
{
// lower left is the default clip origin, which needs the Y flip
return m_Ctx.CurGLPipelineState()->vertexProcessing.clipOriginLowerLeft;
}
return false;
}
void TextureViewer::on_viewTexBuffer_clicked()
{
TextureDescription *texptr = GetCurrentTexture();
qrenderdoc/Windows/TextureViewer.h
+2
View File
@@ -307,6 +307,8 @@ private:
void ShowGotoPopup();
bool ShouldFlipForGL();
void UI_UpdateFittedScale();
void UI_SetScale(float s);
void UI_SetScale(float s, int x, int y);