H3cJP/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SyncAlphaTest and clang format

Browse Source
This commit is contained in:
FernandoS27 2018-10-10 09:45:22 -04:00
parent 7b39107e3a
commit bcb5b924fd
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/renderer_opengl/gl_rasterizer.cpp
View File

@ -572,8 +572,8 @@ void RasterizerOpenGL::DrawArrays() {
SyncBlendState(); SyncBlendState();
SyncLogicOpState(); SyncLogicOpState();
SyncCullMode(); SyncCullMode();
SyncAlphaTest();
SyncScissorTest(); SyncScissorTest();
// Alpha Testing is synced on shaders.
SyncTransformFeedback(); SyncTransformFeedback();
SyncPointState(); SyncPointState();
@ -886,7 +886,7 @@ void RasterizerOpenGL::SetupAlphaTesting(Shader& shader) {
const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
glProgramUniform1ui(shader->GetProgramHandle(), shader->GetAlphaTestingEnableLocation(), glProgramUniform1ui(shader->GetProgramHandle(), shader->GetAlphaTestingEnableLocation(),
regs.alpha_test_enabled); regs.alpha_test_enabled);
glProgramUniform1f(shader->GetProgramHandle(), shader->GetAlphaTestingRefLocation(), glProgramUniform1f(shader->GetProgramHandle(), shader->GetAlphaTestingRefLocation(),
regs.alpha_test_ref); regs.alpha_test_ref);
@ -1026,6 +1026,7 @@ void RasterizerOpenGL::SyncLogicOpState() {
state.logic_op.operation = MaxwellToGL::LogicOp(regs.logic_op.operation); state.logic_op.operation = MaxwellToGL::LogicOp(regs.logic_op.operation);
} }
<<<<<<< HEAD
void RasterizerOpenGL::SyncAlphaTest() { void RasterizerOpenGL::SyncAlphaTest() {
const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;
@ -1053,6 +1054,8 @@ void RasterizerOpenGL::SyncScissorTest() {
} }
} }
=======
>>>>>>> Remove SyncAlphaTest and clang format
void RasterizerOpenGL::SyncTransformFeedback() { void RasterizerOpenGL::SyncTransformFeedback() {
const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs; const auto& regs = Core::System::GetInstance().GPU().Maxwell3D().regs;

4
src/video_core/renderer_opengl/gl_rasterizer.h
View File

@ -132,6 +132,7 @@ private:
u32 SetupTextures(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, Shader& shader, u32 SetupTextures(Tegra::Engines::Maxwell3D::Regs::ShaderStage stage, Shader& shader,
GLenum primitive_mode, u32 current_unit); GLenum primitive_mode, u32 current_unit);
/// Syncs the alpha test state to match the guest state
void SetupAlphaTesting(Shader& shader); void SetupAlphaTesting(Shader& shader);
/// Syncs the viewport to match the guest state /// Syncs the viewport to match the guest state
@ -164,9 +165,6 @@ private:
/// Syncs the LogicOp state to match the guest state /// Syncs the LogicOp state to match the guest state
void SyncLogicOpState(); void SyncLogicOpState();
/// Syncs the alpha test state to match the guest state
void SyncAlphaTest();
/// Syncs the scissor test state to match the guest state /// Syncs the scissor test state to match the guest state
void SyncScissorTest(); void SyncScissorTest();

1
src/video_core/renderer_opengl/gl_shader_cache.h
View File

@ -73,7 +73,6 @@ public:
/// Gets the GL uniform location for the specified resource, caching as needed /// Gets the GL uniform location for the specified resource, caching as needed
GLint GetUniformLocation(const GLShader::SamplerEntry& sampler); GLint GetUniformLocation(const GLShader::SamplerEntry& sampler);
GLint GetAlphaTestingEnableLocation(); GLint GetAlphaTestingEnableLocation();
GLint GetAlphaTestingFuncLocation(); GLint GetAlphaTestingFuncLocation();
GLint GetAlphaTestingRefLocation(); GLint GetAlphaTestingRefLocation();

5
src/video_core/renderer_opengl/gl_shader_decompiler.cpp
View File

@ -1280,8 +1280,9 @@ private:
header.ps.IsColorComponentOutputEnabled(render_target, 1) || header.ps.IsColorComponentOutputEnabled(render_target, 1) ||
header.ps.IsColorComponentOutputEnabled(render_target, 2) || header.ps.IsColorComponentOutputEnabled(render_target, 2) ||
header.ps.IsColorComponentOutputEnabled(render_target, 3)) { header.ps.IsColorComponentOutputEnabled(render_target, 3)) {
shader.AddLine(fmt::format("if (AlphaFunc({}, alpha_testing_ref, alpha_testing_func)) discard;", shader.AddLine(fmt::format(
regs.GetRegisterAsFloat(current_reg))); "if (AlphaFunc({}, alpha_testing_ref, alpha_testing_func)) discard;",
regs.GetRegisterAsFloat(current_reg)));
current_reg += 4; current_reg += 4;
} }
} }