diff options
| author | Jules Blok <jules.blok@gmail.com> | 2015-06-13 01:12:12 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2015-06-13 01:12:12 +0200 |
| commit | 4042945ee57dcaede8488e6546b8a987ca597998 (patch) | |
| tree | a5089415097bbb785a701219c83a742791364fb5 /Source | |
| parent | bcc8c78e4a19b84e3939b36f145c3d083e6ccb78 (diff) | |
| parent | d914c11ee5903d6bf69c42ea32d884f9b1b59096 (diff) | |
Merge branch 'stable'
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/Render.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/GeometryShaderGen.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index e5240d19d4..a522c2d1a6 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -1017,7 +1017,7 @@ void Renderer::ApplyState(bool bUseDstAlpha) for (unsigned int stage = 0; stage < 8; stage++) { // TODO: cache SamplerState directly, not d3d object - gx_state.sampler[stage].max_anisotropy = g_ActiveConfig.iMaxAnisotropy; + gx_state.sampler[stage].max_anisotropy = 1 << g_ActiveConfig.iMaxAnisotropy; D3D::stateman->SetSampler(stage, gx_state_cache.Get(gx_state.sampler[stage])); } 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); |