From 45aeeee6991923867a5cc9d330dc097f4e586384 Mon Sep 17 00:00:00 2001 From: Matthew Parlane Date: Fri, 19 Jun 2015 20:55:32 +1200 Subject: [PATCH 1/2] Fix aniso filtering on d3d to not set aniso filter when using 1x --- Source/Core/VideoBackends/D3D/D3DState.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoBackends/D3D/D3DState.cpp b/Source/Core/VideoBackends/D3D/D3DState.cpp index bd0a80b355..5bd95bc8f3 100644 --- a/Source/Core/VideoBackends/D3D/D3DState.cpp +++ b/Source/Core/VideoBackends/D3D/D3DState.cpp @@ -257,7 +257,7 @@ ID3D11SamplerState* StateCache::Get(SamplerState state) unsigned int mip = d3dMipFilters[state.min_filter & 3]; - if (state.max_anisotropy) + if (state.max_anisotropy > 1) { sampdc.Filter = D3D11_FILTER_ANISOTROPIC; sampdc.MaxAnisotropy = (u32)state.max_anisotropy; From 5bc88d5c6a58b2d4d6e5ad851ad033e8c308613a Mon Sep 17 00:00:00 2001 From: degasus Date: Thu, 18 Jun 2015 02:20:22 +0200 Subject: [PATCH 2/2] Revert "GeometryShaderGen: Don't use `centroid in` for input variables." This reverts commit 4cbaddb7ad1e84946a6fb1af1d853af15be90615. --- Source/Core/VideoCommon/GeometryShaderGen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index 5a590f1793..5ec98b3813 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -94,7 +94,7 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A out.Write("#define InstanceID gl_InvocationID\n"); out.Write("in VertexData {\n"); - GenerateVSOutputMembers(out, ApiType); + GenerateVSOutputMembers(out, ApiType, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid in"); out.Write("} vs[%d];\n", vertex_in); out.Write("out VertexData {\n");