Data: update De Blob 1 and 2 to use explicit bloom target

These two games have some strange rendering behaviors and therefore can't use the generic bloom actions.

These games have several bloom EFB copies and they draw that on top of an already rendered game.  After doing that, they render some other draw calls to "fixup" the bloom that it drew to effectively remove it.  This isn't uncommon but there is one special thing these games do...they use a RAM EFB copy for the 'fixup'.  This means when playing with high IR, the game will look blurry in specific parts of the screen where the game was attempting to fix the copy!

Bloom removal has addressed this by removing all the draw calls related to the bloom, including the fixup draws.  The user then needs to turn on 'EFB Copy To Texture Only' for the best visuals (De Blob 2 in particular is broken without this) as the default settings.

Bloom blurred will need special attention too but Dolphin doesn't currently have enough functionality to handle it.

10 files changed, 258 insertions, 62 deletions

diff --git a/Data/Sys/Load/GraphicMods/De Blob 2/SDB.txt b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Blurred/SDB.txt
index e69de29bb2..e69de29bb2 100644
--- a/Data/Sys/Load/GraphicMods/De Blob 2/SDB.txt
+++ b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Blurred/SDB.txt
diff --git a/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Blurred/metadata.json b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Blurred/metadata.json
new file mode 100644
index 0000000000..c9f84d4335
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Blurred/metadata.json
@@ -0,0 +1,65 @@
+{
+	"meta":
+	{
+		"title": "Bloom Blurred",
+		"author": "Dolphin Team",
+		"description": "Modifies bloom effects to blur them to their native resolution.  Results in bloom looking much more natural at higher resolutions but the blur may be too intense in some games."
+	},
+	"groups":
+	[
+		{
+			"name": "CustomBloom",
+			"targets": [
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000134_20x14_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000022_40x28_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000131_80x56_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000130_160x112_6"
+				}
+			]
+		}
+	],
+	"features":
+	[
+		{
+			"group": "CustomBloom",
+			"action": "custom_pipeline",
+			"action_data":
+			{
+				"material_asset": "dolphin_bloom_blur_horizontal"
+			}
+		}
+	],
+	"assets": [
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur.rastershader",
+				"pixel_shader": "../../All Games Blurred Bloom/blur.ps.glsl",
+				"vertex_shader": "../../All Games Blurred Bloom/blur.vs.glsl"
+			},
+			"name": "dolphin_bloom_blur"
+		},
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur_horizontal.rastermaterial"
+			},
+			"name": "dolphin_bloom_blur_horizontal"
+		},
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur_vertical.rastermaterial"
+			},
+			"name": "dolphin_bloom_blur_vertical"
+		}
+	]
+}
diff --git a/Data/Sys/Load/GraphicMods/De Blob/R6B.txt b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Removal/SDB.txt
index e69de29bb2..e69de29bb2 100644
--- a/Data/Sys/Load/GraphicMods/De Blob/R6B.txt
+++ b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Removal/SDB.txt
diff --git a/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Removal/metadata.json b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Removal/metadata.json
new file mode 100644
index 0000000000..bf9255d02e
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob 2/Bloom Removal/metadata.json
@@ -0,0 +1,64 @@
+{
+	"meta":
+	{
+		"title": "Bloom Removal",
+		"author": "Dolphin Team",
+		"description": "Skips drawing bloom effects.  May be preferable when using a bloom solution from Dolphin's post processing shaders or a third party tool.  Requires enabling 'EFB Copy To Texture Only'"
+	},
+	"groups":
+	[
+		{
+			"name": "CustomBloom",
+			"targets": [
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000134_20x14_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000022_40x28_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000131_80x56_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000130_160x112_6"
+				}
+			]
+		},
+		{
+			"name": "Fixup",
+			"targets": [
+				{
+					"type": "draw_started",
+					"texture_filename": "tex1_256x179_802b7563f35b613a_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000182_640x448_5"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000380_320x224_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000380_240x224_6"
+				}
+			]
+		}
+	],
+	"features":
+	[
+		{
+			"group": "CustomBloom",
+			"action": "skip"
+		},
+		{
+			"group": "Fixup",
+			"action": "skip"
+		}
+	]
+}
diff --git a/Data/Sys/Load/GraphicMods/De Blob 2/metadata.json b/Data/Sys/Load/GraphicMods/De Blob 2/metadata.json
deleted file mode 100644
index 697d28c730..0000000000
--- a/Data/Sys/Load/GraphicMods/De Blob 2/metadata.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"meta":
-	{
-		"title": "Bloom Texture Definitions",
-		"author": "iwubcode"
-	},
-	"groups":
-	[
-		{
-			"name": "Bloom",
-			"targets": [
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000134_20x14_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000022_40x28_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000131_80x56_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000130_160x112_6"
-				}
-			]
-		}
-	]
-}
diff --git a/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/R6B.txt b/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/R6B.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/R6B.txt
diff --git a/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/metadata.json b/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/metadata.json
new file mode 100644
index 0000000000..c9f84d4335
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob/Bloom Blurred/metadata.json
@@ -0,0 +1,65 @@
+{
+	"meta":
+	{
+		"title": "Bloom Blurred",
+		"author": "Dolphin Team",
+		"description": "Modifies bloom effects to blur them to their native resolution.  Results in bloom looking much more natural at higher resolutions but the blur may be too intense in some games."
+	},
+	"groups":
+	[
+		{
+			"name": "CustomBloom",
+			"targets": [
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000134_20x14_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000022_40x28_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000131_80x56_6"
+				},
+				{
+					"type": "efb",
+					"texture_filename": "efb1_n000130_160x112_6"
+				}
+			]
+		}
+	],
+	"features":
+	[
+		{
+			"group": "CustomBloom",
+			"action": "custom_pipeline",
+			"action_data":
+			{
+				"material_asset": "dolphin_bloom_blur_horizontal"
+			}
+		}
+	],
+	"assets": [
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur.rastershader",
+				"pixel_shader": "../../All Games Blurred Bloom/blur.ps.glsl",
+				"vertex_shader": "../../All Games Blurred Bloom/blur.vs.glsl"
+			},
+			"name": "dolphin_bloom_blur"
+		},
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur_horizontal.rastermaterial"
+			},
+			"name": "dolphin_bloom_blur_horizontal"
+		},
+		{
+			"data": {
+				"metadata": "../../All Games Blurred Bloom/blur_vertical.rastermaterial"
+			},
+			"name": "dolphin_bloom_blur_vertical"
+		}
+	]
+}
diff --git a/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/R6B.txt b/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/R6B.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/R6B.txt
diff --git a/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/metadata.json b/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/metadata.json
new file mode 100644
index 0000000000..a2209dfa85
--- /dev/null
+++ b/Data/Sys/Load/GraphicMods/De Blob/Bloom Removal/metadata.json
@@ -0,0 +1,64 @@
+{
+	"meta":
+	{
+		"title": "Bloom Removal",
+		"author": "Dolphin Team",
+		"description": "Skips drawing bloom effects.  May be preferable when using a bloom solution from Dolphin's post processing shaders or a third party tool."
+	},
+	"groups":
+	[
+		{
+			"name": "CustomBloom",
+			"targets": [
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000134_20x14_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000022_40x28_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000131_80x56_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000130_160x112_6"
+				}
+			]
+		},
+		{
+			"name": "Fixup",
+			"targets": [
+				{
+					"type": "draw_started",
+					"texture_filename": "tex1_240x224_05a5e9c230d056cc_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000182_640x448_5"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000380_320x224_6"
+				},
+				{
+					"type": "draw_started",
+					"texture_filename": "efb1_n000380_240x224_6"
+				}
+			]
+		}
+	],
+	"features":
+	[
+		{
+			"group": "CustomBloom",
+			"action": "skip"
+		},
+		{
+			"group": "Fixup",
+			"action": "skip"
+		}
+	]
+}
diff --git a/Data/Sys/Load/GraphicMods/De Blob/metadata.json b/Data/Sys/Load/GraphicMods/De Blob/metadata.json
deleted file mode 100644
index 697d28c730..0000000000
--- a/Data/Sys/Load/GraphicMods/De Blob/metadata.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"meta":
-	{
-		"title": "Bloom Texture Definitions",
-		"author": "iwubcode"
-	},
-	"groups":
-	[
-		{
-			"name": "Bloom",
-			"targets": [
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000134_20x14_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000022_40x28_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000131_80x56_6"
-				},
-				{
-					"type": "efb",
-					"texture_filename": "efb1_n000130_160x112_6"
-				}
-			]
-		}
-	]
-}