diff options
| author | Markus Wick <markus+github@selfnet.de> | 2014-12-08 09:05:22 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2014-12-08 09:05:22 +0100 |
| commit | ff4526b4a9b7dbcbdbaff35a657739e272aea637 (patch) | |
| tree | afa330fc93476afb8ffe731ec197abcaf487c0fc /Source/Core/VideoCommon/PixelShaderGen.cpp | |
| parent | 3a149c3aab63be54c5932563b2957e9e3016a8aa (diff) | |
| parent | cf7512683c04e6e9836929c34f458515928eca4b (diff) | |
Merge pull request #1657 from Tinob/master
Add HW bounding Box support to d3d backend
Diffstat (limited to 'Source/Core/VideoCommon/PixelShaderGen.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.cpp | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index 4086343699..3f1265dfc4 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -248,11 +248,20 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T if (g_ActiveConfig.backend_info.bSupportsBBox) { - out.Write( - "layout(std140, binding = 3) buffer BBox {\n" - "\tint4 bbox_data;\n" - "};\n" - ); + if (ApiType == API_OPENGL) + { + out.Write( + "layout(std140, binding = 3) buffer BBox {\n" + "\tint4 bbox_data;\n" + "};\n" + ); + } + else + { + out.Write( + "globallycoherent RWBuffer<int> bbox_data : register(u2);\n" + ); + } } GenerateVSOutputStruct(out, ApiType); @@ -569,12 +578,24 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T if (g_ActiveConfig.backend_info.bSupportsBBox && BoundingBox::active) { uid_data->bounding_box = true; - out.Write( - "\tif(bbox_data.x > int(gl_FragCoord.x)) atomicMin(bbox_data.x, int(gl_FragCoord.x));\n" - "\tif(bbox_data.y < int(gl_FragCoord.x)) atomicMax(bbox_data.y, int(gl_FragCoord.x));\n" - "\tif(bbox_data.z > int(gl_FragCoord.y)) atomicMin(bbox_data.z, int(gl_FragCoord.y));\n" - "\tif(bbox_data.w < int(gl_FragCoord.y)) atomicMax(bbox_data.w, int(gl_FragCoord.y));\n" - ); + if (ApiType == API_OPENGL) + { + out.Write( + "\tif(bbox_data.x > int(gl_FragCoord.x)) atomicMin(bbox_data.x, int(gl_FragCoord.x));\n" + "\tif(bbox_data.y < int(gl_FragCoord.x)) atomicMax(bbox_data.y, int(gl_FragCoord.x));\n" + "\tif(bbox_data.z > int(gl_FragCoord.y)) atomicMin(bbox_data.z, int(gl_FragCoord.y));\n" + "\tif(bbox_data.w < int(gl_FragCoord.y)) atomicMax(bbox_data.w, int(gl_FragCoord.y));\n" + ); + } + else + { + out.Write( + "\tif(bbox_data[0] > int(rawpos.x)) InterlockedMin(bbox_data[0], int(rawpos.x));\n" + "\tif(bbox_data[1] < int(rawpos.x)) InterlockedMax(bbox_data[1], int(rawpos.x));\n" + "\tif(bbox_data[2] > int(rawpos.y)) InterlockedMin(bbox_data[2], int(rawpos.y));\n" + "\tif(bbox_data[3] < int(rawpos.y)) InterlockedMax(bbox_data[3], int(rawpos.y));\n" + ); + } } out.Write("}\n"); |