diff options
| author | degasus <wickmarkus@web.de> | 2014-12-09 19:32:24 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-12-09 19:32:24 +0100 |
| commit | bf65c49609b7c5498323de8b3b24c68710993473 (patch) | |
| tree | 17e84957dd6c5e8bef230b465bf58cba64b95ea0 /Source/Core/VideoCommon/PixelShaderGen.cpp | |
| parent | 1ad8d4629c36caecacdba33a609b403c5b6cb68d (diff) | |
PixelShaderGen: merge OGL+D3D bbox
Diffstat (limited to 'Source/Core/VideoCommon/PixelShaderGen.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index 3f1265dfc4..0e0e9d214c 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -252,7 +252,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T { out.Write( "layout(std140, binding = 3) buffer BBox {\n" - "\tint4 bbox_data;\n" + "\tint bbox_data[4];\n" "};\n" ); } @@ -578,24 +578,13 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T if (g_ActiveConfig.backend_info.bSupportsBBox && BoundingBox::active) { uid_data->bounding_box = true; - 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" - ); - } + const char* atomic_op = ApiType == API_OPENGL ? "atomic" : "Interlocked"; + out.Write( + "\tif(bbox_data[0] > int(rawpos.x)) %sMin(bbox_data[0], int(rawpos.x));\n" + "\tif(bbox_data[1] < int(rawpos.x)) %sMax(bbox_data[1], int(rawpos.x));\n" + "\tif(bbox_data[2] > int(rawpos.y)) %sMin(bbox_data[2], int(rawpos.y));\n" + "\tif(bbox_data[3] < int(rawpos.y)) %sMax(bbox_data[3], int(rawpos.y));\n", + atomic_op, atomic_op, atomic_op, atomic_op); } out.Write("}\n"); |