diff options
| author | Nolan Check <Nolan.Check@gmail.com> | 2010-10-23 19:55:19 +0000 |
|---|---|---|
| committer | Nolan Check <Nolan.Check@gmail.com> | 2010-10-23 19:55:19 +0000 |
| commit | 2ec3db44edd83ef4d8a6b9db6ac9092f45b63acc (patch) | |
| tree | 305b3b3fd4517f6b07bf978a87ec41a453e62955 /Source/Core | |
| parent | 91186d2b8a714da4ddaa10b85a4d0165b615c4de (diff) | |
OpenGL plugin: Support for dual-source blending, CURRENTLY DISABLED. It doesn't work yet. To fix it, we may need to convert all our shaders to GLSL so that we can use glBindFragDataLocation.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6306 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/Src/LinearDiskCache.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/LinearDiskCache.cpp b/Source/Core/Common/Src/LinearDiskCache.cpp index 1df7614b6d..5e634ce3a8 100644 --- a/Source/Core/Common/Src/LinearDiskCache.cpp +++ b/Source/Core/Common/Src/LinearDiskCache.cpp @@ -22,7 +22,7 @@ static const char ID[4] = {'D', 'C', 'A', 'C'}; // Update this to the current SVN revision every time you change shader generation code. // We don't automatically get this from SVN_REV because that would mean regenerating the // shader cache for every revision, graphics-related or not, which is simply annoying. -const int version = 6296; +const int version = 6306; LinearDiskCache::LinearDiskCache() : file_(NULL), num_entries_(0) { diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index 288af0d386..616318db84 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -519,8 +519,8 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType WRITE(p, "void main(\n"); if(ApiType != API_D3D11) { - // TODO: Support DSTALPHA_DUAL_SOURCE_BLEND for non-D3D11 shaders - WRITE(p, " out float4 ocol0 : COLOR0,%s\n in float4 rawpos : %s,\n", + WRITE(p, " out float4 ocol0 : COLOR0,%s%s\n in float4 rawpos : %s,\n", + dstAlphaMode == DSTALPHA_DUAL_SOURCE_BLEND ? "\n out float4 ocol1 : COLOR1," : "", DepthTextureEnable ? "\n out float depth : DEPTH," : "", ApiType == API_OPENGL ? "WPOS" : "POSITION"); } |