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

gsdx-ogl: drop useless parameter of OMSetDepthStencilState

This commit is contained in:
Gregory Hainaut 2015-08-01 11:35:21 +02:00
parent b7e16b5989
commit 921b22ac31
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -964,9 +964,9 @@ void GSDeviceOGL::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture
// ************************************ // ************************************
if (draw_in_depth) if (draw_in_depth)
OMSetDepthStencilState(m_convert.dss_write, 0); OMSetDepthStencilState(m_convert.dss_write);
else else
OMSetDepthStencilState(m_convert.dss, 0); OMSetDepthStencilState(m_convert.dss);
if (draw_in_depth) if (draw_in_depth)
OMSetRenderTargets(NULL, dTex); OMSetRenderTargets(NULL, dTex);
@ -1210,7 +1210,7 @@ void GSDeviceOGL::SetupDATE(GSTexture* rt, GSTexture* ds, const GSVertexPT1* ver
// om // om
OMSetDepthStencilState(m_date.dss, 1); OMSetDepthStencilState(m_date.dss);
if (GLState::blend) { if (GLState::blend) {
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
@ -1335,7 +1335,7 @@ void GSDeviceOGL::OMSetWriteBuffer(GLenum buffer)
gl_DrawBuffers(1, target); gl_DrawBuffers(1, target);
} }
void GSDeviceOGL::OMSetDepthStencilState(GSDepthStencilOGL* dss, uint8 sref) void GSDeviceOGL::OMSetDepthStencilState(GSDepthStencilOGL* dss)
{ {
dss->SetupDepth(); dss->SetupDepth();
dss->SetupStencil(); dss->SetupStencil();

2
plugins/GSdx/GSDeviceOGL.h
View File

@ -561,7 +561,7 @@ class GSDeviceOGL : public GSDevice
void PSSetShaderResources(GSTexture* sr0, GSTexture* sr1); void PSSetShaderResources(GSTexture* sr0, GSTexture* sr1);
void PSSetSamplerState(GLuint ss); void PSSetSamplerState(GLuint ss);
void OMSetDepthStencilState(GSDepthStencilOGL* dss, uint8 sref); void OMSetDepthStencilState(GSDepthStencilOGL* dss);
void OMSetBlendState(int blend_index = 0, float blend_factor = 0.0f, bool is_blend_constant = false); void OMSetBlendState(int blend_index = 0, float blend_factor = 0.0f, bool is_blend_constant = false);
void OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4i* scissor = NULL); void OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4i* scissor = NULL);
void OMSetWriteBuffer(GLenum buffer = GL_COLOR_ATTACHMENT0); void OMSetWriteBuffer(GLenum buffer = GL_COLOR_ATTACHMENT0);

4
plugins/GSdx/GSTextureFXOGL.cpp
View File

@ -158,7 +158,5 @@ GLuint GSDeviceOGL::GetPaletteSamplerID()
void GSDeviceOGL::SetupOM(OMDepthStencilSelector dssel) void GSDeviceOGL::SetupOM(OMDepthStencilSelector dssel)
{ {
GSDepthStencilOGL* dss = m_om_dss[dssel]; OMSetDepthStencilState(m_om_dss[dssel]);
OMSetDepthStencilState(dss, 1);
} }