diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-11 09:53:02 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-11 09:53:02 +0200 |
| commit | dca19a71dbd435f14fb0f46faf8bab707f323b68 (patch) | |
| tree | 0fc46a3e1d5612853d2e0de088bb4874fb1b5b61 /Source | |
| parent | 8e3af04d0e4c5fbe09296410f7d6cf8477a029e9 (diff) | |
| parent | fd637030e4859a676108115cc8bf34947cb8f71f (diff) | |
Merge pull request #2588 from Armada651/geom-centroid
GeometryShaderGen: Don't use `centroid in` for input variables.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoCommon/GeometryShaderGen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index 8462822511..5a590f1793 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -81,7 +81,7 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A "\tint4 " I_TEXOFFSET";\n" "};\n"); - uid_data->numTexGens = bpmem.genMode.numtexgens; + uid_data->numTexGens = xfmem.numTexGen.numTexGens; uid_data->pixel_lighting = g_ActiveConfig.bEnablePixelLighting; out.Write("struct VS_OUTPUT {\n"); @@ -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<T>(out, ApiType, g_ActiveConfig.backend_info.bSupportsBindingLayout ? "centroid" : "centroid in"); + GenerateVSOutputMembers<T>(out, ApiType); out.Write("} vs[%d];\n", vertex_in); out.Write("out VertexData {\n"); @@ -233,7 +233,7 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A out.Write("\tif (" I_TEXOFFSET"[2] != 0) {\n"); out.Write("\tfloat texOffset = 1.0 / float(" I_TEXOFFSET"[2]);\n"); - for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) + for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i) { out.Write("\tif (((" I_TEXOFFSET"[0] >> %d) & 0x1) != 0)\n", i); out.Write("\t\tr.tex%d.x += texOffset;\n", i); @@ -258,7 +258,7 @@ static inline void GenerateGeometryShader(T& out, u32 primitive_type, API_TYPE A out.Write("\tif (" I_TEXOFFSET"[3] != 0) {\n"); out.Write("\tfloat2 texOffset = float2(1.0 / float(" I_TEXOFFSET"[3]), 1.0 / float(" I_TEXOFFSET"[3]));\n"); - for (unsigned int i = 0; i < bpmem.genMode.numtexgens; ++i) + for (unsigned int i = 0; i < xfmem.numTexGen.numTexGens; ++i) { out.Write("\tif (((" I_TEXOFFSET"[1] >> %d) & 0x1) != 0) {\n", i); out.Write("\t\tll.tex%d.xy += float2(0,1) * texOffset;\n", i); |