ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4360 from VinDuv/fix-shader-compile 

VideoCommon: Fix GetInterpolationQualifier calls
This commit is contained in:
Jules Blok 2016-10-25 11:53:20 +02:00 committed by GitHub
parent 1b824da5b6 8bb459aae5
commit 9e21ac8607
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/VideoCommon/GeometryShaderGen.cpp
View File

@ -106,7 +106,7 @@ ShaderCode GenerateGeometryShaderCode(APIType ApiType, const geometry_shader_uid
out.Write("VARYING_LOCATION(0) out VertexData {\n"); out.Write("VARYING_LOCATION(0) out VertexData {\n");
GenerateVSOutputMembers<ShaderCode>( GenerateVSOutputMembers<ShaderCode>(
out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting, out, ApiType, uid_data->numTexGens, uid_data->pixel_lighting,
GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, false, true)); GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, false));
if (uid_data->stereo) if (uid_data->stereo)
out.Write("\tflat int layer;\n"); out.Write("\tflat int layer;\n");

2
Source/Core/VideoCommon/VertexShaderGen.cpp
View File

@ -130,7 +130,7 @@ ShaderCode GenerateVertexShaderCode(APIType api_type, const vertex_shader_uid_da
out.Write("VARYING_LOCATION(0) out VertexData {\n"); out.Write("VARYING_LOCATION(0) out VertexData {\n");
GenerateVSOutputMembers( GenerateVSOutputMembers(
out, api_type, uid_data->numTexGens, uid_data->pixel_lighting, out, api_type, uid_data->numTexGens, uid_data->pixel_lighting,
GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, false, true)); GetInterpolationQualifier(uid_data->msaa, uid_data->ssaa, true, false));
out.Write("} vs;\n"); out.Write("} vs;\n");
} }
else else