From 272ea90ca5e7a7f2c6e9a101b7b9e899b2757a70 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Mon, 27 Oct 2014 17:38:22 +0100 Subject: [PATCH] GeometryShaderGen: Allow stereoscopy to be disabled. Will facilitate future use of this generator for other purposes. --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 4 +++- Source/Core/VideoCommon/GeometryShaderGen.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index c8467b9f4c..e305551cd8 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -44,6 +44,7 @@ static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiTy if (ApiType == API_OPENGL) { // Insert layout parameters + uid_data->stereo = g_ActiveConfig.bStereo; out.Write("layout(triangles, invocations = %d) in;\n", g_ActiveConfig.bStereo ? 2 : 1); out.Write("layout(triangle_strip, max_vertices = 3) out;\n"); } @@ -83,7 +84,8 @@ static inline void GenerateGeometryShader(T& out, u32 components, API_TYPE ApiTy out.Write("\tfor (int i = 0; i < gl_in.length(); ++i) {\n"); out.Write("\t\to = v[i];\n"); out.Write("\t\teye = gl_InvocationID;\n"); - out.Write("\t\to.pos = float4(dot(" I_STEREOPROJECTION"[eye * 4 + 0], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 1], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 2], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 3], v[i].rawpos)); \n"); + if (g_ActiveConfig.bStereo) + out.Write("\t\to.pos = float4(dot(" I_STEREOPROJECTION"[eye * 4 + 0], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 1], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 2], v[i].rawpos), dot(" I_STEREOPROJECTION"[eye * 4 + 3], v[i].rawpos)); \n"); out.Write("\t\tgl_Position = o.pos;\n"); out.Write("\t\tgl_Layer = eye;\n"); out.Write("\t\tEmitVertex();\n"); diff --git a/Source/Core/VideoCommon/GeometryShaderGen.h b/Source/Core/VideoCommon/GeometryShaderGen.h index d5ff83684b..fffa8b34ce 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.h +++ b/Source/Core/VideoCommon/GeometryShaderGen.h @@ -13,7 +13,6 @@ struct geometry_shader_uid_data { u32 NumValues() const { return sizeof(geometry_shader_uid_data); } - u32 components : 23; u32 stereo : 1; };