Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ShaderGen: Use interface blocks when geometry shaders are supported

Browse Source 
We don't use explicit locations in OpenGL currently, so this breaks
when we use alternative names in the geometry shaders.
This commit is contained in:
Stenzek committed 2019-04-20 23:44:33 +10:00
1 parent 4b1adab785
commit eddde3e6c8
3 files changed
+92 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Core/VideoCommon/TextureConverterShaderGen.cpp
+22 -4
View File
@@ -67,8 +67,17 @@ ShaderCode GenerateVertexShader(APIType api_type)
}
else if (api_type == APIType::OpenGL || api_type == APIType::Vulkan)
{
out.Write("VARYING_LOCATION(0) out float3 v_tex0;\n"
"#define id gl_VertexID\n"
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{
out.Write("VARYING_LOCATION(0) out VertexData {\n");
out.Write(" float3 v_tex0;\n");
out.Write("};\n");
}
else
{
out.Write("VARYING_LOCATION(0) out float3 v_tex0;\n");
}
out.Write("#define id gl_VertexID\n"
"#define opos gl_Position\n"
"void main() {\n");
}
@@ -112,8 +121,17 @@ ShaderCode GeneratePixelShader(APIType api_type, const UidData* uid_data)
"clamp_tb.x, clamp_tb.y), %s));\n"
"}\n",
mono_depth ? "0.0" : "uv.z");
out.Write("VARYING_LOCATION(0) in vec3 v_tex0;\n"
"FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;"
if (g_ActiveConfig.backend_info.bSupportsGeometryShaders)
{
out.Write("VARYING_LOCATION(0) in VertexData {\n");
out.Write(" float3 v_tex0;\n");
out.Write("};\n");
}
else
{
out.Write("VARYING_LOCATION(0) in vec3 v_tex0;\n");
}
out.Write("FRAGMENT_OUTPUT_LOCATION(0) out vec4 ocol0;"
"void main()\n{\n");
}