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

gsdx-ogl: add a blend parameter to shader

This commit is contained in:
Gregory Hainaut 2015-05-08 19:30:48 +02:00
parent 9023f5f0db
commit 380e420cdd
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/GSdx/GSDeviceOGL.cpp
View File

@ -632,6 +632,7 @@ GLuint GSDeviceOGL::CompilePS(PSSelector sel)
+ format("#define PS_DATE %d\n", sel.date)
+ format("#define PS_TCOFFSETHACK %d\n", sel.tcoffsethack)
//+ format("#define PS_POINT_SAMPLER %d\n", sel.point_sampler)
+ format("#define PS_BLEND %d\n", sel.blend)
+ format("#define PS_IIP %d\n", sel.iip)
;

8
plugins/GSdx/GSDeviceOGL.h
View File

@ -65,6 +65,8 @@ public:
void SetBogus(char bogus) { m_bogus = bogus; }
int GetBogus() { return m_bogus; }
void RevertOp()
{
if(m_equation_RGB == GL_FUNC_ADD)
@ -318,14 +320,14 @@ class GSDeviceOGL : public GSDevice
uint32 wmt:2;
uint32 ltf:1;
uint32 _free:4;
uint32 blend:4;
};
uint32 key;
};
// FIXME is the & useful ?
operator uint32() {return key & 0x0fffffff;}
operator uint32() {return key & 0xffffffff;}
PSSelector() : key(0) {}
};
@ -623,7 +625,7 @@ class GSDeviceOGL : public GSDevice
void SetupPS(PSSelector sel);
void SetupCB(const VSConstantBuffer* vs_cb, const PSConstantBuffer* ps_cb);
void SetupSampler(PSSamplerSelector ssel);
void SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uint8 afix);
int SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uint8 afix);
GLuint GetSamplerID(PSSamplerSelector ssel);
GLuint GetPaletteSamplerID();

2
plugins/GSdx/GSRendererOGL.cpp
View File

@ -543,7 +543,7 @@ void GSRendererOGL::DrawPrims(GSTexture* rt, GSTexture* ds, GSTextureCache::Sour
GL_POP();
dev->OMSetColorMaskState(om_csel);
dev->SetupOM(om_dssel, om_bsel, afix);
int bogus_blend = dev->SetupOM(om_dssel, om_bsel, afix);
dev->SetupCB(&vs_cb, &ps_cb);
if (DATE_GL42) {

4
plugins/GSdx/GSTextureFXOGL.cpp
View File

@ -230,7 +230,7 @@ GLuint GSDeviceOGL::GetPaletteSamplerID()
return m_palette_ss;
}
void GSDeviceOGL::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uint8 afix)
int GSDeviceOGL::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, uint8 afix)
{
GSDepthStencilOGL* dss = m_om_dss[dssel];
@ -254,4 +254,6 @@ void GSDeviceOGL::SetupOM(OMDepthStencilSelector dssel, OMBlendSelector bsel, ui
// Dynamic
// *************************************************************
OMSetBlendState(bs, (float)(int)afix / 0x80);
return bs->GetBogus();
}