VideoCommon: Merge LineGeometryShader into GeometryShaderGen. #1706

CrossVR · 2014-12-15T21:30:55Z

This adds line-width emulation support to OpenGL, with stereoscopy support to boot!

To-Do

Disable the geometry shader stage if it is not needed.
Check for geometry shader support in the API (OpenGL ES).

…or regardless of stereoscopy.

Source/Core/VideoBackends/D3D/VertexManager.cpp


-			D3D::stateman->SetGeometryShader(nullptr);
-		}
+		D3D::stateman->SetGeometryShader(nullptr);
 	}


…riable name in both backends.

And make more stereoscopy code optional.

…reoscopy.

This adds line-width emulation support to OpenGL.

This adds point-width emulation support to OpenGL.

Source/Core/VideoCommon/GeometryShaderGen.cpp

+	"triangle"
+};
+
+template<class T> static inline void EmitVertex(T& out, const char *vertex, API_TYPE ApiType);


magumagu · 2014-12-15T21:55:48Z

"Check for geometry shader support in the API (OpenGL ES)." And what do we do if a game tries to draw a line or point without geometry shader support? Draw nothing? Do vertex processing on the CPU? Something else? Or should Dolphin just refuse to start without geometry shader support?

CrossVR · 2014-12-15T21:57:09Z

IIRC OpenGL ES didn't support the old method either, so we just don't draw anything which is what happens now when you try to draw lines or points on OpenGL ES.

degasus · 2014-12-15T22:05:56Z

@Armada651 No, we just don't use the geometry shader and hope that no feature will be used. It's very often wrong for points, but lines usually works fine.

CrossVR · 2014-12-15T22:08:05Z

@degasus Also good, either way nothing changes in the to-do list. ;)

Source/Core/VideoBackends/OGL/VertexManager.cpp

@@ -97,13 +97,17 @@ void VertexManager::Draw(u32 stride)
 	u32 max_index = IndexGenerator::GetNumVerts();
 	GLenum primitive_mode = 0;

+	glPushAttrib(GL_CULL_FACE);


CrossVR · 2014-12-16T23:28:25Z

@Sonicadvance1 Please test if OpenGL ES is currently compatible with this branch.

Source/Core/VideoCommon/GeometryShaderManager.cpp

+	}
+	else
+	{
+		constants.stereoparams[0] = constants.stereoparams[1] = 0;


degasus · 2014-12-17T09:24:19Z

code LGTM, but I still want to test it first.

JMC47 · 2014-12-17T13:52:03Z

NVM, I'm an idiot of course the savestates would be different, I think.

LGTM again on testing otherwise.

Source/Core/VideoCommon/GeometryShaderManager.cpp

+#include "VideoCommon/XFMemory.h"
+
+// track changes
+static bool s_projection_changed, s_viewport_changed, s_lineptwidth_changed;


degasus · 2014-12-17T18:54:44Z

damn mesa: http://pastie.org/

Source/Core/VideoBackends/OGL/Render.cpp

 		}
 		else if (strstr(g_ogl_config.glsl_version, "1.40"))
 		{
 			g_ogl_config.eSupportedGLSLVersion = GLSL_140;
 			g_Config.backend_info.bSupportsEarlyZ = false; // layout keyword is only supported on glsl150+
-			g_Config.backend_info.bSupportsStereoscopy = false; // geometry shaders are only supported on glsl150+
+			g_Config.backend_info.bSupportsGeometryShaders = false; // geometry shaders are only supported on glsl150+
 		}
 		else


…ough shader.

…aming conflicts.

This commit repurposes the bSupportsStereoscopy flag as the bSupportsGeometryShaders flag.

And refactor the VertexManager draw call.

…orted.

…haders are unsupported.

CrossVR · 2014-12-19T01:26:06Z

This branch is ready for merge.

VideoCommon: Merge LineGeometryShader into GeometryShaderGen.

CrossVR added 2 commits December 14, 2014 21:23

VideoCommon: Add a separate constants buffer for the geometry shader.

b406e4e

GeometryShaderGen: Pass the primitive type and always run the generat…

aa4242f

…or regardless of stereoscopy.

magumagu reviewed Dec 15, 2014
View reviewed changes

Source/Core/VideoBackends/D3D/VertexManager.cpp

D3D::stateman->SetGeometryShader(nullptr);

}

D3D::stateman->SetGeometryShader(nullptr);

}

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

CrossVR added 7 commits December 15, 2014 22:47

GeometryShaderManager: Upload Line/Point width constants.

332ba4b

GeometryShaderGen: Redefine gl_InvocationID so we can use the same va…

887c669

…riable name in both backends.

GeometryShaderGen: Support multiple primitive types.

382e1c2

And make more stereoscopy code optional.

VideoCommon: Assume we always use a geometry shader, not just for ste…

275af9c

…reoscopy.

VideoCommon: Merge LineGeometryShader into GeometryShaderGen.

55e60a9

This adds line-width emulation support to OpenGL.

VideoCommon: Merge PointGeometryShader into GeometryShaderGen.

8ae738f

This adds point-width emulation support to OpenGL.

GeometryShaderGen: Declare a prototype for EmitVertex().

861fa1a

CrossVR force-pushed the line-width branch from 11f8c35 to 861fa1a Compare December 15, 2014 21:47

rohit-n reviewed Dec 15, 2014
View reviewed changes

Source/Core/VideoCommon/GeometryShaderGen.cpp

"triangle"

};

template<class T> static inline void EmitVertex(T& out, const char *vertex, API_TYPE ApiType);

This comment was marked as off-topic.

Sign in to view

GeometryShaderGen: Use signed integers for the texture offset flags.

16af00d

GeometryShaderGen: Remove redundant declaration.

d115048

CrossVR force-pushed the line-width branch 2 times, most recently from 51606b3 to bf1ee9e Compare December 16, 2014 01:24

degasus reviewed Dec 16, 2014
View reviewed changes

CrossVR force-pushed the line-width branch 2 times, most recently from 333e3e5 to d5ccb7e Compare December 17, 2014 08:39

degasus reviewed Dec 17, 2014
View reviewed changes

Source/Core/VideoCommon/GeometryShaderManager.cpp

}

else

{

constants.stereoparams[0] = constants.stereoparams[1] = 0;

This comment was marked as off-topic.

Sign in to view

This comment was marked as off-topic.

Sign in to view

degasus reviewed Dec 17, 2014
View reviewed changes

Source/Core/VideoCommon/GeometryShaderManager.cpp

#include "VideoCommon/XFMemory.h"

// track changes

static bool s_projection_changed, s_viewport_changed, s_lineptwidth_changed;

This comment was marked as off-topic.

Sign in to view

degasus reviewed Dec 17, 2014
View reviewed changes

CrossVR added 12 commits December 18, 2014 00:36

GeometryShaderGen: Pack uniforms more tightly.

0ac7103

VertexManager: Disable culling for lines and points.

2850c9a

GeometryShaderGen: Cosmetics.

f2e52b4

GeometryShader: Disable the geometry shader stage if it is a pass-thr…

bd6d229

…ough shader.

VideoCommon: Pass interface blocks between shader stages to resolve n…

782a5ad

…aming conflicts.

OGL: Don't generate a geometry shader if the backend doesn't support it.

7e8f96f

This commit repurposes the bSupportsStereoscopy flag as the bSupportsGeometryShaders flag.

D3D: Set the geometry shader before every draw call.

3d9dfad

And refactor the VertexManager draw call.

GeometryShaderManager: Set the constants within the callbacks.

1af3d84

VideoCommon: Only use interface blocks when geometry shaders are supp…

69df23f

…orted.

D3D: Use ROUND_UP macro for rounding buffer sizes.

93ce95b

OGL: Check OpenGL version for geometry shader support.

1f84f46

VideoCommon: Don't pass structs between shader stages when geometry s…

8dc3653

…haders are unsupported.

CrossVR force-pushed the line-width branch from 879e87c to 8dc3653 Compare December 17, 2014 23:41

GeometryShaderGen: Don't use the reserved keyword "point" in D3D.

e7e8a4f

CrossVR force-pushed the line-width branch from 53a8242 to e7e8a4f Compare December 19, 2014 01:25

Sonicadvance1 added a commit that referenced this pull request Dec 19, 2014

Merge pull request #1706 from Armada651/line-width

02f2215

VideoCommon: Merge LineGeometryShader into GeometryShaderGen.

Sonicadvance1 merged commit 02f2215 into dolphin-emu:master Dec 19, 2014

ADormant mentioned this pull request Oct 29, 2015

Specification of the OpenGL renderer architecture simias/rustation#10

Open

ADormant mentioned this pull request Jan 4, 2016

Draw lines and points using triangles hrydgard/ppsspp#8276

Closed

Pokechu22 mentioned this pull request Dec 23, 2020

Software: Implement line-width and point-width #9352

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VideoCommon: Merge LineGeometryShader into GeometryShaderGen. #1706

VideoCommon: Merge LineGeometryShader into GeometryShaderGen. #1706

CrossVR commented Dec 15, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

magumagu commented Dec 15, 2014

CrossVR commented Dec 15, 2014

degasus commented Dec 15, 2014

CrossVR commented Dec 15, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

CrossVR commented Dec 16, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

degasus commented Dec 17, 2014

JMC47 commented Dec 17, 2014

This comment was marked as off-topic.

degasus commented Dec 17, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

CrossVR commented Dec 19, 2014

VideoCommon: Merge LineGeometryShader into GeometryShaderGen. #1706

VideoCommon: Merge LineGeometryShader into GeometryShaderGen. #1706

Conversation

CrossVR commented Dec 15, 2014

To-Do

This comment was marked as off-topic.

This comment was marked as off-topic.

This comment was marked as off-topic.

magumagu commented Dec 15, 2014

CrossVR commented Dec 15, 2014

degasus commented Dec 15, 2014

CrossVR commented Dec 15, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

CrossVR commented Dec 16, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

degasus commented Dec 17, 2014

JMC47 commented Dec 17, 2014

This comment was marked as off-topic.

degasus commented Dec 17, 2014

This comment was marked as off-topic.

This comment was marked as off-topic.

CrossVR commented Dec 19, 2014