From 71d1eb3c313535b5003884bb862635d4d2f8aae9 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Tue, 3 Nov 2015 03:47:05 +0100 Subject: VideoCommon: return code/uid from shader gens rather than passing in non-const references --- Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp') diff --git a/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp b/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp index 97db9f912a..53a74c758f 100644 --- a/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp +++ b/Source/Core/VideoBackends/D3D/GeometryShaderCache.cpp @@ -190,12 +190,10 @@ void GeometryShaderCache::Shutdown() bool GeometryShaderCache::SetShader(u32 primitive_type) { - GeometryShaderUid uid; - GetGeometryShaderUid(uid, primitive_type, API_D3D); + GeometryShaderUid uid = GetGeometryShaderUid(primitive_type, API_D3D); if (g_ActiveConfig.bEnableShaderDebugging) { - ShaderCode code; - GenerateGeometryShaderCode(code, primitive_type, API_D3D); + ShaderCode code = GenerateGeometryShaderCode(primitive_type, API_D3D); geometry_uid_checker.AddToIndexAndCheck(code, uid, "Geometry", "g"); } @@ -231,8 +229,7 @@ bool GeometryShaderCache::SetShader(u32 primitive_type) } // Need to compile a new shader - ShaderCode code; - GenerateGeometryShaderCode(code, primitive_type, API_D3D); + ShaderCode code = GenerateGeometryShaderCode(primitive_type, API_D3D); D3DBlob* pbytecode; if (!D3D::CompileGeometryShader(code.GetBuffer(), &pbytecode)) -- cgit v1.2.3