From 9bd5fabe1a6b9d7ad409d904f6fafbc5f4493c07 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Sun, 25 Jan 2015 21:11:56 +0000
Subject: [PATCH] Implement axis markers and frustum helper on GL mesh view

---
 renderdoc/driver/d3d11/d3d11_debug.cpp |   2 +-
 renderdoc/driver/gl/gl_debug.cpp       | 110 +++++++++++++++++++++++--
 renderdoc/driver/gl/gl_replay.h        |   3 +
 renderdocui/Code/FormatElement.cs      |   3 +
 renderdocui/Windows/BufferViewer.cs    |   9 +-
 5 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/renderdoc/driver/d3d11/d3d11_debug.cpp b/renderdoc/driver/d3d11/d3d11_debug.cpp
index 3ad12fcf2..ec7ec913d 100644
--- a/renderdoc/driver/d3d11/d3d11_debug.cpp
+++ b/renderdoc/driver/d3d11/d3d11_debug.cpp
@@ -5341,7 +5341,7 @@ void D3D11DebugManager::RenderMesh(uint32_t frameID, uint32_t eventID, const vec
 		m_pImmediateContext->IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_LINELIST);
 		m_pImmediateContext->IASetInputLayout(m_DebugRender.GenericLayout);
 
-		pixelData.WireframeColour = Vec3f(0.5f, 0.5f, 0.5f);
+		pixelData.WireframeColour = Vec3f(1.0f, 1.0f, 1.0f);
 		FillCBuffer(m_DebugRender.GenericPSCBuffer, (float *)&pixelData, sizeof(DebugPixelCBufferData));
 
 		m_pImmediateContext->Draw(24, 0);
diff --git a/renderdoc/driver/gl/gl_debug.cpp b/renderdoc/driver/gl/gl_debug.cpp
index 073bb5387..8ce3a472c 100644
--- a/renderdoc/driver/gl/gl_debug.cpp
+++ b/renderdoc/driver/gl/gl_debug.cpp
@@ -341,11 +341,64 @@ void GLReplay::InitDebugData()
 		gl.glNamedBufferStorageEXT(DebugData.histogramBuf, sizeof(uint32_t)*HGRAM_NUM_BUCKETS, NULL, GL_MAP_READ_BIT);
 	}
 
-	MakeCurrentReplayContext(&m_ReplayCtx);
-
 	gl.glGenVertexArrays(1, &DebugData.meshVAO);
 	gl.glBindVertexArray(DebugData.meshVAO);
+
+	gl.glGenVertexArrays(1, &DebugData.axisVAO);
+	gl.glBindVertexArray(DebugData.axisVAO);
+
+	gl.glGenVertexArrays(1, &DebugData.frustumVAO);
+	gl.glBindVertexArray(DebugData.frustumVAO);
 	
+	gl.glGenBuffers(1, &DebugData.axisFrustumBuffer);
+	gl.glBindBuffer(eGL_ARRAY_BUFFER, DebugData.axisFrustumBuffer);
+	
+	Vec3f TLN = Vec3f(-1.0f,  1.0f, 0.0f); // TopLeftNear, etc...
+	Vec3f TRN = Vec3f( 1.0f,  1.0f, 0.0f);
+	Vec3f BLN = Vec3f(-1.0f, -1.0f, 0.0f);
+	Vec3f BRN = Vec3f( 1.0f, -1.0f, 0.0f);
+
+	Vec3f TLF = Vec3f(-1.0f,  1.0f, 1.0f);
+	Vec3f TRF = Vec3f( 1.0f,  1.0f, 1.0f);
+	Vec3f BLF = Vec3f(-1.0f, -1.0f, 1.0f);
+	Vec3f BRF = Vec3f( 1.0f, -1.0f, 1.0f);
+
+	Vec3f axisFrustum[] = {
+		// axis marker vertices
+		Vec3f(0.0f, 0.0f, 0.0f),
+		Vec3f(1.0f, 0.0f, 0.0f),
+		Vec3f(0.0f, 0.0f, 0.0f),
+		Vec3f(0.0f, 1.0f, 0.0f),
+		Vec3f(0.0f, 0.0f, 0.0f),
+		Vec3f(0.0f, 0.0f, 1.0f),
+
+		// frustum vertices
+		TLN, TRN,
+		TRN, BRN,
+		BRN, BLN,
+		BLN, TLN,
+
+		TLN, TLF,
+		TRN, TRF,
+		BLN, BLF,
+		BRN, BRF,
+
+		TLF, TRF,
+		TRF, BRF,
+		BRF, BLF,
+		BLF, TLF,
+	};
+
+	gl.glNamedBufferStorageEXT(DebugData.axisFrustumBuffer, sizeof(axisFrustum), axisFrustum, 0);
+	
+	gl.glBindVertexArray(DebugData.axisVAO);
+	gl.glVertexAttribPointer(0, 3, eGL_FLOAT, GL_FALSE, sizeof(Vec3f), NULL);
+	gl.glEnableVertexAttribArray(0);
+	
+	gl.glBindVertexArray(DebugData.frustumVAO);
+	gl.glVertexAttribPointer(0, 3, eGL_FLOAT, GL_FALSE, sizeof(Vec3f), (const void *)( sizeof(Vec3f) * 6 ));
+	gl.glEnableVertexAttribArray(0);
+
 	DebugData.replayQuadProg = CreateShaderProgram(DebugData.blitvsSource.c_str(), DebugData.genericfsSource.c_str());
 }
 
@@ -398,10 +451,11 @@ void GLReplay::DeleteDebugData()
 	gl.glDeleteBuffers(1, &DebugData.minmaxResult);
 	gl.glDeleteBuffers(1, &DebugData.histogramBuf);
 
-	MakeCurrentReplayContext(&m_ReplayCtx);
-
 	gl.glDeleteVertexArrays(1, &DebugData.meshVAO);
-
+	gl.glDeleteVertexArrays(1, &DebugData.axisVAO);
+	gl.glDeleteVertexArrays(1, &DebugData.frustumVAO);
+	gl.glDeleteBuffers(1, &DebugData.axisFrustumBuffer);
+	
 	gl.glDeleteProgram(DebugData.replayQuadProg);
 }
 
@@ -1503,6 +1557,7 @@ void GLReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector<MeshF
 	Matrix4f camMat = cam.GetMatrix();
 
 	Matrix4f ModelViewProj = projMat.Mul(camMat);
+	Matrix4f guessProjInv;
 	
 	gl.glBindVertexArray(DebugData.meshVAO);
 
@@ -1606,9 +1661,22 @@ void GLReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector<MeshF
 	
 	gl.glUseProgram(prog);
 
+	gl.glEnable(eGL_FRAMEBUFFER_SRGB);
+
 	if(cfg.position.unproject)
 	{
-		// calc reproject matrix
+		// the derivation of the projection matrix might not be right (hell, it could be an
+		// orthographic projection). But it'll be close enough likely.
+		Matrix4f guessProj = Matrix4f::Perspective(cfg.fov, cfg.position.nearPlane, cfg.position.farPlane, cfg.aspect);
+
+		if(cfg.ortho)
+		{
+			guessProj = Matrix4f::Orthographic(cfg.position.nearPlane, cfg.position.farPlane);
+		}
+		
+		guessProjInv = guessProj.Inverse();
+
+		ModelViewProj = projMat.Mul(camMat.Mul(guessProjInv));
 	}
 	
 	gl.glUniformMatrix4fv(mvpLoc, 1, GL_FALSE, ModelViewProj.Data());
@@ -1660,6 +1728,8 @@ void GLReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector<MeshF
 		
 		if(cfg.solidShadeMode == eShade_Lit)
 		{
+			prog = DebugData.meshProg;
+
 			colLoc = gl.glGetUniformLocation(prog, "RENDERDOC_GenericFS_Color");
 			mvpLoc = gl.glGetUniformLocation(prog, "ModelViewProj");
 			fmtLoc = gl.glGetUniformLocation(prog, "Mesh_DisplayFormat");
@@ -1701,19 +1771,41 @@ void GLReplay::RenderMesh(uint32_t frameID, uint32_t eventID, const vector<MeshF
 		}
 	}
 	
+	// draw axis helpers
 	if(!cfg.position.unproject)
 	{
-		// draw axis markers
+		gl.glBindVertexArray(DebugData.axisVAO);
+
+		Vec4f wireCol(1.0f, 0.0f, 0.0f, 1.0f);
+		gl.glUniform4fv(colLoc, 1, &wireCol.x);
+		gl.glDrawArrays(eGL_LINES, 0, 2);
+
+		wireCol = Vec4f(0.0f, 1.0f, 0.0f, 1.0f);
+		gl.glUniform4fv(colLoc, 1, &wireCol.x);
+		gl.glDrawArrays(eGL_LINES, 2, 2);
+
+		wireCol = Vec4f(0.0f, 0.0f, 1.0f, 1.0f);
+		gl.glUniform4fv(colLoc, 1, &wireCol.x);
+		gl.glDrawArrays(eGL_LINES, 4, 2);
 	}
 	
 	if(cfg.highlightVert != ~0U)
 	{
 		// show highlighted vertex
 	}
-
+	
+	// 'fake' helper frustum
 	if(cfg.position.unproject)
 	{
-		// 'fake' helper frustum
+		gl.glBindVertexArray(DebugData.frustumVAO);
+		
+		float wireCol[] = { 1.0f, 1.0f, 1.0f, 1.0f };
+		gl.glUniform4fv(colLoc, 1, wireCol);
+
+		ModelViewProj = projMat.Mul(camMat.Mul(guessProjInv));
+		gl.glUniformMatrix4fv(mvpLoc, 1, GL_FALSE, ModelViewProj.Data());
+		
+		gl.glDrawArrays(eGL_LINES, 0, 24);
 	}
 
 	// set this back as most other things want fill, and we don't want to have to a) track it
diff --git a/renderdoc/driver/gl/gl_replay.h b/renderdoc/driver/gl/gl_replay.h
index 1b3be4f6d..b8fa46dfb 100644
--- a/renderdoc/driver/gl/gl_replay.h
+++ b/renderdoc/driver/gl/gl_replay.h
@@ -205,6 +205,9 @@ class GLReplay : public IReplayDriver
 			GLuint meshProg;
 			GLuint meshgsProg;
 			GLuint meshVAO;
+			GLuint axisVAO;
+			GLuint frustumVAO;
+			GLuint axisFrustumBuffer;
 
 			GLuint outlineStripVB;
 			GLuint outlineStripVAO;
diff --git a/renderdocui/Code/FormatElement.cs b/renderdocui/Code/FormatElement.cs
index 17c85fcb6..b94166358 100644
--- a/renderdocui/Code/FormatElement.cs
+++ b/renderdocui/Code/FormatElement.cs
@@ -44,6 +44,7 @@ namespace renderdocui.Code
             matrixdim = 0;
             format = new ResourceFormat();
             hex = false;
+            systemValue = SystemAttribute.None;
         }
 
         public FormatElement(string Name, int buf, uint offs, bool pi, bool rowMat, uint matDim, ResourceFormat f, bool h)
@@ -56,6 +57,7 @@ namespace renderdocui.Code
             rowmajor = rowMat;
             matrixdim = matDim;
             hex = h;
+            systemValue = SystemAttribute.None;
         }
 
         public override bool Equals(Object obj)
@@ -580,5 +582,6 @@ namespace renderdocui.Code
         public uint matrixdim;
         public ResourceFormat format;
         public bool hex;
+        public SystemAttribute systemValue;
     }
 }
diff --git a/renderdocui/Windows/BufferViewer.cs b/renderdocui/Windows/BufferViewer.cs
index 0e3e20e55..a892a28f8 100644
--- a/renderdocui/Windows/BufferViewer.cs
+++ b/renderdocui/Windows/BufferViewer.cs
@@ -758,6 +758,7 @@ namespace renderdocui.Windows
                     f[i].perinstance = false;
                     f[i].rowmajor = false;
                     f[i].matrixdim = 1;
+                    f[i].systemValue = sig.systemValue;
 
                     offset += details.OutputSig[i].compCount * sizeof(float);
                 }
@@ -1385,7 +1386,7 @@ namespace renderdocui.Windows
                             if (bytes.Length != bytesToRead)
                                 continue;
 
-                            if (elname == "POSITION" || elname == "SV_POSITION")
+                            if (elname == "POSITION" || bufferFormats[el].systemValue == SystemAttribute.Position)
                             {
                                 for (int i = 0; i < fmt.compCount; i++)
                                 {
@@ -2130,12 +2131,12 @@ namespace renderdocui.Windows
 
                 if (ui.m_Input != null && ui.m_Input.BufferFormats != null)
                 {
-                    // prioritise SV_Position over general POSITION
+                    // prioritise system value over general "POSITION" string matching
                     for (int i = 0; i < ui.m_Input.BufferFormats.Length; i++)
                     {
                         FormatElement el = ui.m_Input.BufferFormats[i];
 
-                        if (el.name.ToUpperInvariant() == "SV_POSITION")
+                        if (el.systemValue == SystemAttribute.Position)
                         {
                             posEl = i;
                             break;
@@ -2287,7 +2288,7 @@ namespace renderdocui.Windows
 
                 if ((ui.m_Stage == MeshDataStage.VSOut && !m_Core.CurPipelineState.IsTessellationEnabled) || ui.m_Stage == MeshDataStage.GSOut)
                 {
-                    m_MeshDisplay.position.unproject = pos.name.ToUpperInvariant() == "SV_POSITION";
+                    m_MeshDisplay.position.unproject = pos.systemValue == SystemAttribute.Position;
                 }
             }